bulldog_physics 0.1.0 → 0.1.1

data/Rakefile

@@ -21,8 +21,8 @@ Jeweler::Tasks.new do |gem|
   gem.description = %Q{3D Physics Engine written in pure ruby that can be used for creating 3d simulations or games}
   gem.email = "conner.wingard@gmail.com"
   gem.authors = ["Conner Wingard"]
-
   gem.add_dependency 'require_all'
+  
   # dependencies defined in Gemfile
 end
 Jeweler::RubygemsDotOrgTasks.new

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/bulldog_physics.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "bulldog_physics"
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Conner Wingard"]
-  s.date = "2012-04-24"
+  s.date = "2012-04-26"
   s.description = "3D Physics Engine written in pure ruby that can be used for creating 3d simulations or games"
   s.email = "conner.wingard@gmail.com"
   s.extra_rdoc_files = [

data/lib/Particles/particle_gravity.rb

@@ -15,11 +15,8 @@ module BulldogPhysics
         #override
         def update_force(particle, duration)
           unless particle.has_infinite_mass
-            #puts "update_force"
-            #puts particle.mass
             force_to_add = @gravity * particle.mass
-            particle.addForce(@gravity * particle.mass)
-            #puts particle.object_id
+            particle.addForce(force_to_add)
           end
           particle
         end

data/lib/bulldog_physics.rb

@@ -1,5 +1,4 @@
 # make life easier by including all Physics files here
-require 'rubygems'
 require 'require_all'
 
 
@@ -21,10 +20,10 @@ class Module
 	end
 end
 
-require './vector3.rb'
-require './matrix3.rb'
-require './matrix4.rb'
-require './quaternion.rb'
+#require 'vector3.rb'
+#require 'matrix3.rb'
+#require 'matrix4.rb'
+#require 'quaternion.rb'
 
 module BulldogPhysics
 	
@@ -40,4 +39,9 @@ module BulldogPhysics
 	
 end
 
-require_all 'Particles'
+#require_all 'Particles'
+require 'vector3'
+require 'matrix3'
+require 'quaternion'
+require 'matrix4'
+require_all File.dirname(__FILE__) + '/Particles'

data/lib/examples/simple_game.rb

@@ -44,7 +44,7 @@ class Game
     @clock = Clock.new
     @lighting = Lighting.new
     @x_trans = 0; @y_trans = -5; @z_trans = -25
-    @font = TTF.new "/Library/Fonts/Times New Roman.ttf",point_size
+
     
     @world = ParticleWorld.new(20, 1)
     
@@ -67,8 +67,8 @@ class Game
     @ball.damping = 1
     @ball.material.specular = BALL_SPECULAR
     @ball.material.diffuse = PARTICLE_DIFFUSE
-		@ball.frozen = true
-    		
+    @ball.frozen = true
+        
     
     @current_ball = Particle.new
     @current_ball.position = @ball.position
@@ -79,7 +79,7 @@ class Game
     @world.registry.add( @current_ball, ParticleGravity.new())
     @world.particles << @current_ball
    
-   	 
+     
    particle1 = Particle.new
    particle1.mass = 1
    particle1.position = Vector3.new(5,2,0)
@@ -98,25 +98,25 @@ class Game
    
    prod = ParticleRod.new(particle1, particle2, 2.0)
    
-   #@world.particles << particle1 
-   #@world.particles << particle2
-		#@world.contact_generators << prod
+    @world.particles << particle1 
+    @world.particles << particle2
+    @world.contact_generators << prod
    
-   	@world.contact_generators << ParticleGroundContacts.new(@world.particles)
-   	@world.contact_generators << ParticleParticleContacts.new(@world.particles)
+    @world.contact_generators << ParticleGroundContacts.new(@world.particles)
+    @world.contact_generators << ParticleParticleContacts.new(@world.particles)
    
     for i in 1..5
-	    for j in 1..5
-		    part = Particle.new
-		    part.mass = 0
-		    offset = j % 2 == 0 ? 1 : 0
-		    part.position = Vector3.new( -5 + i * 2 + offset, j * 2, 0)
-		    part.material.specular = SPRING_SPECULAR
-		    part.material.diffuse = PARTICLE_DIFFUSE
-		    @world.particles << part
-		  end
-		end
-		
+      for j in 1..5
+        part = Particle.new
+        part.mass = 0
+        offset = j % 2 == 0 ? 1 : 0
+        part.position = Vector3.new( -5 + i * 2 + offset, j * 2, 0)
+        part.material.specular = SPRING_SPECULAR
+        part.material.diffuse = PARTICLE_DIFFUSE
+        @world.particles << part
+      end
+    end
+    
 
     puts "PARTICLE COUNT [ #{@world.particles.size} ] "
     puts "Contact Generators count: #{@world.contact_generators.size}"
@@ -134,8 +134,8 @@ class Game
     Rubygame::GL.set_attrib(Rubygame::GL::BLUE_SIZE, 5)
     Rubygame::GL.set_attrib(Rubygame::GL::DEPTH_SIZE, 16)
     Rubygame::GL.set_attrib(Rubygame::GL::DOUBLEBUFFER, 1)
-		
-	@maximum_resolution = Screen.get_resolution
+    
+  @maximum_resolution = Screen.get_resolution
     @screen = Screen.new([@width,@height], 16, [OPENGL])
     @clock.target_framerate = 30
     @clock.calibrate
@@ -167,41 +167,41 @@ class Game
   
   def run()
     catch(:rubygame_quit) do
-    	loop do
-    		@queue.each do |event|
-    			case event
-    			when Rubygame::Events::KeyPressed
+      loop do
+        @queue.each do |event|
+          case event
+          when Rubygame::Events::KeyPressed
 #            puts event.key
-    				case event.key
-    				when :escape
-    					throw :rubygame_quit 
-    				when :q
-    					throw :rubygame_quit 
-    				when :w
-    				  @w_down = true
-    			  when :s
-    			    @s_down = true 
-    		    when :a
-    		      @a_down = true
-    	      when :d
-    	        @d_down = true
-		        when :l
-		          @world.particles.each do |part|
-		            puts part.position
-		            puts "NUM CONTACTS: #{@world.contacts.size}"
-	            end
-    	      when :space
-	    	      @current_ball.frozen = !@current_ball.frozen
+            case event.key
+            when :escape
+              throw :rubygame_quit 
+            when :q
+              throw :rubygame_quit 
+            when :w
+              @w_down = true
+            when :s
+              @s_down = true 
+            when :a
+              @a_down = true
+            when :d
+              @d_down = true
+            when :l
+              @world.particles.each do |part|
+                puts part.position
+                puts "NUM CONTACTS: #{@world.contacts.size}"
+              end
+            when :space
+              @current_ball.frozen = !@current_ball.frozen
             when :r
-	            puts "RESET"
-	            @current_ball = Particle.new
-	            @current_ball.position = START_POSITION.dup
-	            @current_ball.velocity = @ball.velocity.dup
-	            @current_ball.mass = @ball.mass
-	            @current_ball.damping = @ball.damping
-	            @current_ball.frozen = true
-	            @world.registry.add( @current_ball, ParticleGravity.new())
-	            @world.particles << @current_ball
+              puts "RESET"
+              @current_ball = Particle.new
+              @current_ball.position = START_POSITION.dup
+              @current_ball.velocity = @ball.velocity.dup
+              @current_ball.mass = @ball.mass
+              @current_ball.damping = @ball.damping
+              @current_ball.frozen = true
+              @world.registry.add( @current_ball, ParticleGravity.new())
+              @world.particles << @current_ball
             end
           when Rubygame::Events::KeyReleased
             case event.key
@@ -237,7 +237,7 @@ class Game
         @world.start_frame
 
         glClearColor(0.0, 0.0, 0.0, -1.0)
-    	glClear(GL::COLOR_BUFFER_BIT|GL::DEPTH_BUFFER_BIT)
+      glClear(GL::COLOR_BUFFER_BIT|GL::DEPTH_BUFFER_BIT)
         glLoadIdentity()
         
         glTranslatef(@x_trans,@y_trans,@z_trans)
@@ -252,7 +252,7 @@ class Game
         glPopMatrix()
 
         
-        draw_skybox()
+        #draw_skybox()
 
         #glClear(GL::COLOR_BUFFER_BIT|GL::DEPTH_BUFFER_BIT)
         @world.particles.each do |particle|
@@ -266,12 +266,12 @@ class Game
 
         @world.run_physics(seconds_elapsed)
 
-    	Rubygame::GL.swap_buffers()
-		@screen.update
+      Rubygame::GL.swap_buffers()
+    @screen.update
         @screen.flip
-    	ObjectSpace.garbage_collect
+      ObjectSpace.garbage_collect
 
-    	end
+      end
     end
   
   end

data/lib/vector3.rb

@@ -21,10 +21,11 @@ module BulldogPhysics
    
      ## Gets the magnitude of this vector.
      def magnitude
-      num = (@x*@x) + (@y * @y) + (@z * @z)
-      return 0 if num.nan?
+       num = (@x*@x) + (@y * @y) + (@z * @z)
+       #return 0 if num.nan?
        Math.sqrt((@x*@x)+(@y*@y)+(@z*@z))
-     end
+    end
+
    
      def squareMagnitude
        return (@x*@x)+(@y*@y)+(@z*@z)
@@ -34,11 +35,12 @@ module BulldogPhysics
      def normalize
        length = self.magnitude
        if length > 0
-         @x /= length
-         @y /= length
-         @z /= length
+         @x *= 1.0/length
+         @y *= 1.0/length
+         @z *= 1.0/length
        end
      end
+
    
      def unit
        length = self.magnitude
@@ -90,7 +92,7 @@ module BulldogPhysics
      end
    
      def *(scalar)
-       if scalar.kind_of? Float
+       if scalar.kind_of? Numeric
         Vector3.new(@x*scalar, @y*scalar, @z*scalar)
        elsif scalar.kind_of? Vector3
         return @x * scalar.x + @y * scalar.y + @z * scalar.z

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bulldog_physics
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Conner Wingard
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-24 00:00:00 Z
+date: 2012-04-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime