Changeset 3539 in orxonox.OLD for orxonox/trunk/src
- Timestamp:
- Mar 14, 2005, 12:35:46 AM (20 years ago)
- Location:
- orxonox/trunk/src
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
orxonox/trunk/src/story_entities/world.cc
r3538 r3539 235 235 this->spawn(env); 236 236 237 /* 237 238 Vector* es = new Vector (50, 2, 0); 238 239 Quaternion* qs = new Quaternion (); … … 240 241 pr->setName("primitive"); 241 242 this->spawn(pr, this->localPlayer, es, qs, ROTATION); 242 243 */ 244 243 245 244 246 /*monitor progress*/ … … 246 248 247 249 // trackManager->setBindSlave(env); 248 TrackNode::getInstance()->addChild(myPlayer); 250 TrackNode* tn = TrackNode::getInstance(); 251 tn->addChild(myPlayer); 252 253 //Vector v(1.0, 0.0, 0.0); 254 //Quaternion* q = new Quaternion(90.0, v); 255 //this->relDirection = this->relDirection * q; 256 257 //tn->setAbsDir(q); 258 249 259 //localCamera->setParent(TrackNode::getInstance()); 250 260 this->localPlayer->addChild (this->localCamera); -
orxonox/trunk/src/track_manager.cc
r3528 r3539 661 661 Vector tmp = this->calcPos(); 662 662 Quaternion quat = Quaternion(this->calcDir(), Vector(this->currentTrackElem->curve->calcAcc((localTime-this->currentTrackElem->startingTime)/this->currentTrackElem->duration).x,1,this->currentTrackElem->curve->calcAcc((localTime-this->currentTrackElem->startingTime)/this->currentTrackElem->duration).z)); 663 664 Vector v(0.0, 1.0, 0.0); 665 Quaternion q(-90.0, v); 666 //this->relDirection = this->relDirection * q; 667 quat = quat * q; 668 663 669 this->bindSlave->setAbsCoor(&tmp); 664 670 this->bindSlave->setAbsDir(&quat);
Note: See TracChangeset
for help on using the changeset viewer.