rglviewer 0.0.1 → 0.0.2

data/examples/simpleviewer.rb

@@ -6,6 +6,8 @@ require 'opengl'
 
 include GLViewer,Gl
 
+@start_angle = 0.0
+	
 init = Proc.new do |v|
 	v.display_fps  = true
 	v.display_grid = true
@@ -18,10 +20,10 @@ paint = Proc.new do |v|
 	up = Math.sqrt(1.0 - nor * nor )
 
 	glBegin(GL_QUAD_STRIP)
-
+	@start_angle += Math::PI / 500
 	(1..nb_steps).each do |i|
 		ratio = i.to_f/nb_steps;
-		angle = 21.0 * ratio;
+		angle = 21.0 * ratio + @start_angle;
 		c = Math.cos(angle)
 		s = Math.sin(angle)
 		r_1 = 1.0 - 0.8 * ratio
@@ -37,6 +39,7 @@ paint = Proc.new do |v|
 
 end
 
+
 viewer =  GLViewer::GLViewer.new :render => paint , :init => init
 
 viewer.main_loop

data/lib/rglviewer/camera.rb

@@ -0,0 +1,90 @@
+require 'opengl'
+require 'gslng'
+require 'rglviewer/frame'
+
+
+include Gl,Glu,GSLng
+
+module GLViewer
+	class Camera
+		
+		
+		attr_reader :width, :height
+		attr_accessor :scene_radius, :scene_center, :type, :field_of_view
+		
+		def initialize args = {}
+			@width         = args[:width]  || 640
+			@height        = args[:height] || 480
+			@scene_radius  = args[:scene_radius] || 1.0
+			@scene_center  = args[:scene_center] || [0.0,0.0,0.0]
+			@type          = args[:type] || :perspective
+			@field_of_view = args[:field_of_view] || Math::PI / 4.0
+			@z_clipping_coefficient = args[:z_clipping_coefficient] || Math.sqrt(3.0)
+			@z_near_coefficient     = args[:z_near_corefficient] || 0.005
+			#@frame                  = args[:frame]
+			#unless @frame
+			#	t = Vector.from_array [0.0, 0.0, 2 * @scene_radius]
+			#	@frame.new :translation => t
+			#end
+		end
+		
+		def load_projection_matrix
+			glMatrixMode(GL_PROJECTION)
+			glLoadIdentity
+			method("load_" + @type.to_s).call
+		end
+		
+		def load_model_view_matrix
+			glMatrixMode(GL_MODELVIEW)
+			glLoadIdentity
+			glTranslatef(0.0,0.0, -5.0 * @scene_radius)
+		end
+		
+		def width= w
+			@width = w > 0 ? w : 1
+		end
+		
+		def height= h
+			@height = h > 0 ? h : 1
+		end 
+		
+		protected
+		
+		def load_perspective
+			gluPerspective(180.0 * @field_of_view / Math::PI,
+			               @width / @height,
+			               z_near,
+			               z_far)
+		end
+		
+		def load_ortho
+			raise RuntimeError, "Unimplemented yet"
+		end
+		
+		def distance_to_scene_center
+			2.0
+		end
+		
+		def z_near
+			z = self.distance_to_scene_center - @z_clipping_coefficient * @scene_radius
+			
+			z_min = @z_near_coefficient * @z_clipping_coefficient  * @scene_radius
+			
+			if z < z_min
+				if @type == :perspective
+					z = z_min
+				end
+				if @type == :orthographic
+					z = 0.0
+				end
+			end
+		end
+		
+		def z_far
+			self.distance_to_scene_center + @z_clipping_coefficient * @scene_radius
+		end
+		
+		
+		
+	end
+end

data/lib/rglviewer/frame.rb

@@ -0,0 +1,48 @@
+require 'gslng'
+
+include GSLng
+
+module GLViewer
+	class Frame
+		def initialize args = {}
+			translation = args[:translation] || Vector.new(3,true)
+			rotation    = args[:rotation]    || Matrix.new(3,3)
+			@direct = Matrix.new(4,4,false).identity
+			@indirect = @direct.clone
+			#@direct.view(0,3,3,1) = translation
+			#@direct.view(0,0,3,3) = rotation
+			#t_rotation = rotation.transpose
+			#@indirect.view(0,0,3,3) = t_rotation
+			#@indirect.view(0,3,3,1) = - t_rotation * translation
+		end
+		
+		
+		def direct_transform vec 
+			@direct * vec
+		end
+		
+		def reverse_transform vec
+			@indirect * vec
+		end
+		
+		def self.rotate_x a
+			Matrix.from_array [1.0 , 0.0        ,   0.0        ,
+			                   0.0 , Math.cos(a), - Math.sin(a),
+			                   0.0 , Math.sin(a),   Math.cos(a)]
+		end
+		
+		def self.rotate_y a
+			Matrix.from_array [ Math.cos(a) , 0.0 , Math.sin(a),
+			                    0.0         , 1.0 , 0.0        ,
+			                   -Math.sin(a) , 0.0 , Math.cos(a)]
+		end
+		
+		def self.rotate_z a
+			Matrix.from_array [Math.cos(a) , - Math.sin(a) , 0.0 ,
+			                   Math.sin(a) ,   Math.cos(a) , 0.0 ,
+			                   0.0         ,   0.0         , 1.0 ]
+		end
+		
+		
+	end
+end

data/lib/rglviewer/gl2dviewer.rb

@@ -0,0 +1,91 @@
+require 'opengl'
+
+include Gl,Glu,Glut
+
+module GLViewer
+	class GL2DViewer
+		
+		attr_accessor :width,:height, :init,:render, :background
+		
+		def initialize args = {}
+			@width      = args[:width]  || 640
+			@height     = args[:height] || 480
+			@background = args[:background] || [255,255,255]
+			@init       = args[:init]   || Proc.new {}
+			@render     = args[:render] || Proc.new {}
+			@width  = 1 if @width  <= 0
+			@height = 1 if @height <= 0
+		end
+		
+
+
+		def main_loop
+			glutInit
+			glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_ALPHA )
+			glutInitWindowSize(@width,@height)
+			glutInitWindowPosition(0,0)
+			@window = glutCreateWindow("RGLViewer")
+			glutDisplayFunc(method(:gl_draw).to_proc)
+			glutIdleFunc(method(:gl_idle).to_proc)
+			glutReshapeFunc(method(:gl_reshape).to_proc)
+
+			gl_init
+
+			glutMainLoop
+		end
+
+		
+		protected
+		
+		
+		def gl_reshape width, height
+			@width  = [1,width ].max
+			@height = [1,height].max
+			
+			glViewport(0, 0, @width, @height)
+			glMatrixMode(GL_PROJECTION)
+			
+			glLoadIdentity
+			glOrtho(0 , @width, @height, 0, 0, 1);
+			glMatrixMode(GL_MODELVIEW)
+			glLoadIdentity
+			
+			gl_draw
+		end
+		
+		def gl_init
+			glClearColor(*(@background.collect{|c| c / 255.0}),1)
+			
+			glDisable(GL_DEPTH_TEST)
+			
+			gl_reshape @width, @height
+			
+			@init.call self
+			
+		end
+		
+		def gl_draw
+			gl_pre_draw
+			
+			@render.call(self)
+			
+			gl_post_draw
+		end
+		
+		def gl_idle
+			glutPostRedisplay
+		end
+		
+		def gl_pre_draw
+			glClear(GL_COLOR_BUFFER_BIT)
+			
+			glMatrixMode(GL_MODELVIEW)
+			glLoadIdentity
+		end
+		
+		def gl_post_draw
+			glutSwapBuffers
+		end
+
+	end
+end

data/lib/rglviewer/glviewer.rb

@@ -0,0 +1,114 @@
+require 'opengl'
+
+include Gl, Glu, Glut
+
+module GLViewer
+	class GLViewer
+		attr_accessor :camera, :render, :init
+		attr_writer :display_grid,:display_frame, :display_fps
+
+		def initialize args = {}
+			@background_color = args[:background_color] || [180, 180, 180]
+			@foreground_color = args[:background_color] || [51, 51, 51]
+			@display_grid     = args[:display_grid]  || false
+			@display_fps      = args[:display_fps]   || false
+			@display_frame    = args[:display_frame] || false
+			@init             = args[:init]   || Proc.new {}
+			@render           = args[:render] || Proc.new {}
+			self.camera       = args[:camera] || Camera.new
+		end
+		
+		def camera= cam
+			unless cam.is_a?(Camera)
+				raise ArgumentError "You should pass a GLViewer::Camera object as a camera."
+			end
+			@camera = cam
+		end
+		def display_grid?
+			@display_grid
+		end
+		
+		def display_frame?
+			@display_frame
+		end
+		
+		def display_fps?
+			@display_fps
+		end
+
+		def main_loop
+			glutInit
+			glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_ALPHA | GLUT_DEPTH)
+			glutInitWindowSize(@camera.width,@camera.height)
+			glutInitWindowPosition(0,0)
+			@window = glutCreateWindow("RGLViewer")
+			glutDisplayFunc(method(:gl_draw).to_proc)
+			glutIdleFunc(method(:gl_idle).to_proc)
+			glutReshapeFunc(method(:gl_reshape).to_proc)
+			
+			gl_init
+			
+			glutMainLoop
+		end
+
+		protected
+		def gl_init
+
+			glClearColor(*(@background_color.collect{|c| c / 255.0}),1)
+			# Enables clearing of depth buffer
+			glClearDepth(1.0)
+			# Set type of depth test
+			glDepthFunc(GL_LEQUAL)
+			# Enable depth testing
+			glEnable(GL_DEPTH_TEST)
+			# Enable smooth color shading
+			glShadeModel(GL_SMOOTH)
+			
+			glEnable(GL_COLOR_MATERIAL)
+			
+			glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT)
+			
+			gl_reshape @camera.width, @camera.height
+			
+			@init.call(self)
+
+			gl_draw
+		end
+		
+		def gl_pre_draw
+			
+			glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT)
+			
+			@camera.load_projection_matrix
+			@camera.load_model_view_matrix
+			
+		end
+		
+		def gl_post_draw
+			glutSwapBuffers
+		end
+		
+		def gl_draw
+			
+			gl_pre_draw
+			
+			@render.call(self)
+			
+			gl_post_draw
+			
+		end
+		
+		def gl_idle
+			glutPostRedisplay
+		end
+		
+		def gl_reshape width, height
+			@camera.width = width
+			@camera.height = height
+
+			glViewport(0,0,@camera.width,@camera.height)
+			glutPostRedisplay
+		end
+		
+	end
+end

data/lib/rglviewer/version.rb

@@ -1,3 +1,3 @@
 module GLViewer
-	VERSION = "0.0.1"
+	VERSION = "0.0.2"
 end

data/rglviewer.gemspec

@@ -21,4 +21,6 @@ Gem::Specification.new do |s|
 
 	s.add_development_dependency "rspec"
 	s.add_dependency 'ruby-opengl2'
+	s.add_dependency 'ruby-gsl-ng'
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rglviewer
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-20 00:00:00.000000000Z
+date: 2012-01-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &10341080 !ruby/object:Gem::Requirement
+  requirement: &9686040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10341080
+  version_requirements: *9686040
 - !ruby/object:Gem::Dependency
   name: ruby-opengl2
-  requirement: &10291940 !ruby/object:Gem::Requirement
+  requirement: &9685620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,18 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10291940
+  version_requirements: *9685620
+- !ruby/object:Gem::Dependency
+  name: ruby-gsl-ng
+  requirement: &9685080 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *9685080
 description: libQGLViewer clone using glut
 email:
 - alexandre.tuleu.2005@polytechnique.org
@@ -51,6 +62,10 @@ files:
 - examples/simpleviewer.rb
 - examples/test.rb
 - lib/rglviewer.rb
+- lib/rglviewer/camera.rb
+- lib/rglviewer/frame.rb
+- lib/rglviewer/gl2dviewer.rb
+- lib/rglviewer/glviewer.rb
 - lib/rglviewer/version.rb
 - rglviewer.gemspec
 - spec/glviewer_spec.rb