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

Major refactor

Browse Source
This commit is contained in:
Cyberarm
2018-03-22 19:26:02 -05:00
parent 632830503b
commit bdbb5f2e94
10 changed files with 193 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/wavefront/model.rb
View File

@@ -14,9 +14,10 @@ class IMICFPS
attr_accessor :x, :y, :z, :scale
attr_reader :bounding_box
def initialize(file_path:, x: 0, y: 0, z: 0, scale: MODEL_METER_SCALE)
@x, @y, @z = x, y, z
@scale = scale
def initialize(file_path:, game_object:)
@game_object = game_object
@x, @y, @z = game_object.x, game_object.y, game_object.z
@scale = game_object.scale
@file_path = file_path
@file = File.open(file_path, 'r')
@material_file = nil
@@ -34,16 +35,12 @@ class IMICFPS
@bounding_box = BoundingBox.new(0,0,0, 0,0,0)
start_time = Time.now
parse
# point = rand(1.0..10.0)
# @bounding_box = BoundingBox.new(point.to_f/2, point.to_f/2, point.to_f/2, point, point, point)
# puts "!!!!!!!!!!!!!!"
# puts @bounding_box
puts "#{@file_path.split('/').last} took #{(Time.now-start_time).round(2)} seconds to parse"
face_count = 0
@objects.each {|o| face_count+=o.faces.size}
@objects.each_with_index do |o, i|
puts "Model::Object Name: #{o.name} Faces: #{o.faces.size}, array size divided by 3: #{o.faces.size.to_f/3.0}"
puts " Model::Object Name: #{o.name} Faces: #{o.faces.size}"
end
$window.number_of_faces+=face_count
@model_has_texture = false
@@ -56,6 +53,7 @@ class IMICFPS
end
def draw(x,y,z, scale, back_face_culling)
@x,@y,@z,@scale,@back_face_culling = x,y,z, scale, back_face_culling
@objects.each_with_index do |o, i|
glEnable(GL_CULL_FACE) if back_face_culling
glEnable(GL_COLOR_MATERIAL)

10
lib/wavefront/object.rb
View File

@@ -12,7 +12,7 @@ class IMICFPS
@normals = []
@faces = []
@bounding_box = BoundingBox.new(0,0,0, 0,0,0)
@debug_color = Color.new(1.0,0.0,0.0)
@debug_color = Color.new(1.0,1.0,1.0)
@x,@y,@z = 0,0,0
# Faces array packs everything:
@@ -25,7 +25,7 @@ class IMICFPS
def at_same_position?
if @x == @parent.x
if @x == @parent.x
if @x == @parent.x
if @z == @parent.z
true
end
end
@@ -41,9 +41,9 @@ class IMICFPS
@faces.each do |face|
[face[0]].each do |v|
next unless v
list << v.x*@parent.scale+@parent.x
list << v.y*@parent.scale+@parent.y
list << v.z*@parent.scale+@parent.z
list << v.x*@parent.scale#+@parent.x
list << v.y*@parent.scale#+@parent.y
list << v.z*@parent.scale#+@parent.z
list << v.weight
end
end