[Opengate-svn] SF.net SVN: opengate: [613] branches/ogsector/src

[<spo...@us...>]

Revision: 613
          http://svn.sourceforge.net/opengate/?rev=613&view=rev
Author:   spom_spom
Date:     2007-07-05 13:17:15 -0700 (Thu, 05 Jul 2007)

Log Message:
-----------
Minor laser related fix

Modified Paths:
--------------
    branches/ogsector/src/Projectile.cpp
    branches/ogsector/src/Sector.cpp

Modified: branches/ogsector/src/Projectile.cpp
===================================================================
--- branches/ogsector/src/Projectile.cpp	2007-07-05 20:16:17 UTC (rev 612)
+++ branches/ogsector/src/Projectile.cpp	2007-07-05 20:17:15 UTC (rev 613)
@@ -194,8 +194,13 @@
       }
     } else {
       if ( beam_ ){
-	shape_->scale( 1.0, 1.0, max( 1.0f, ( shape_->getScale()[2]-(vel_ * elapsedTime).length()) )
-		       /shape_->getScale()[2] );
+	Ogre::Real beamLength = min( (vel_ * lifeTime_).length(), 300.0f );
+	beamLength -= ( parent_->mainNode()->getWorldPosition() + ( vel_ * lifeTime_ ) - 
+			mainNode_->getWorldPosition() ).length();
+
+	if ( beamLength > 0 ){
+	  shape_->scale( 1.0, 1.0, beamLength / shape_->getScale()[ 2 ] );
+	}
       }
     }
   }

Modified: branches/ogsector/src/Sector.cpp
===================================================================
--- branches/ogsector/src/Sector.cpp	2007-07-05 20:16:17 UTC (rev 612)
+++ branches/ogsector/src/Sector.cpp	2007-07-05 20:17:15 UTC (rev 613)
@@ -148,10 +148,6 @@
   populate( "testsector.xml" );
 //   createCircle();
 
-  SectorObject *obj = createStaticObject( "lady_kickstart.mesh", "lady_kickstart", Ogre::Vector3( 0,0,450) );
-  obj->setBaseRot( -90, -90, 0 );
-  obj->setBaseSize( Ogre::Vector3( 10, 3.4, 10.9 ) );
-
   itTarget_ = sectorObjects_.begin();
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.