Renamed lighting shader to default, shoehorned in glsl 3.30 support for Intel on Linux, removed duplicate handleGlError methods, added OpenGL and GLU to Object namespace, removed redundant includes for OpenGL and GLU, VBO and VAO now render (all be it incorrectly)

This commit is contained in:
2019-08-11 14:53:15 -05:00
parent 73478b7e37
commit f11b091fe0
17 changed files with 142 additions and 89 deletions

View File

@@ -1,8 +1,6 @@
class IMICFPS
class Camera
include CommonMethods
include OpenGL
include GLU
attr_accessor :field_of_view, :pitch, :yaw, :roll, :mouse_sensitivity
attr_reader :entity, :position

View File

@@ -3,8 +3,6 @@ class IMICFPS
# A game object is any renderable thing
class Entity
include OpenGL
include GLU
include CommonMethods
attr_accessor :scale, :visible, :renderable, :backface_culling
@@ -104,13 +102,5 @@ class IMICFPS
def normalize_bounding_box
@bound_model.model.bounding_box.normalize(self)
end
def handleGlError
e = glGetError()
if e != GL_NO_ERROR
$stderr.puts "OpenGL error in: #{gluErrorString(e)} (#{e})\n"
exit
end
end
end
end

View File

@@ -1,6 +1,5 @@
class IMICFPS
class Light
include OpenGL
attr_reader :ambient, :diffuse, :specular, :position, :light_id
attr_accessor :x, :y, :z, :intensity
def initialize(x:,y:,z:, game_state:,