cyberarm/i-mic-fps
1
0
Fork 0
mirror of https://github.com/cyberarm/i-mic-fps.git synced 2025-12-15 23:52:35 +00:00
Code Issues Projects Releases Wiki Activity

Sync

Browse Source
This commit is contained in:
Cyberarm
2018-12-12 09:02:33 -06:00
parent 5843a9b0ae
commit c142bd2392
6 changed files with 46 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/states/game_states/game.rb
View File

@@ -108,15 +108,14 @@ eos
# Expensive AABB collision detection
ObjectManager.objects.each do |object|
ObjectManager.objects.each do |b|
next if b == object
next if object.is_a?(Terrain)
next if b.is_a?(Terrain)
next if object == b
next if object.is_a?(Terrain) || b.is_a?(Terrain)
if object.intersect(object, b)
object.debug_color = Color.new(1.0,0.0,0.0)
b.debug_color = Color.new(1.0,0.0,0.0)
# ObjectManager.objects.delete(object)
# ObjectManager.objects.delete(object) unless object.is_a?(Player)
# puts "#{object} is intersecting #{b}" if object.is_a?(Player)
else
object.debug_color = Color.new(0,1,0)

2
lib/states/game_states/loading_state.rb
View File

@@ -15,7 +15,7 @@ class IMICFPS
add_asset(:obj, "objects/biped.obj")
# Currently broken
# Shader.new(name: "lighting", vertex_file: "shaders/vertex/lighting.glsl", fragment_file: "shaders/fragment/lighting.glsl")
Shader.new(name: "lighting", vertex_file: "shaders/vertex/lighting.glsl", fragment_file: "shaders/fragment/lighting.glsl")
@act = false
@cycled = false