- Timestamp:
- Dec 27, 2005, 12:20:32 AM (19 years ago)
- Location:
- trunk/src
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/lib/coord/p_node.cc
r6299 r6307 628 628 void PNode::setParentMode(PARENT_MODE parentMode) 629 629 { 630 this->parentMode &= (0xfff0| parentMode);630 this->parentMode = ((this->parentMode & 0xfff0) | parentMode); 631 631 } 632 632 … … 745 745 746 746 747 if( this->parentMode & PNODE_LOCAL_ROTATE && this->bRelDirChanged)747 if(this->bRelDirChanged && this->parentMode & PNODE_LOCAL_ROTATE ) 748 748 { 749 749 /* update the current absDirection - remember * means rotation around sth.*/ … … 752 752 } 753 753 754 if(likely(this-> parentMode & PNODE_MOVEMENT && this->bRelCoorChanged))754 if(likely(this->bRelCoorChanged && this->parentMode & PNODE_MOVEMENT)) 755 755 { 756 756 /* update the current absCoordinate */ 757 this->prevRelCoordinate = this->relCoordinate;758 this->absCoordinate = this->parent->getAbsCoor() + this->relCoordinate;757 this->prevRelCoordinate = this->relCoordinate; 758 this->absCoordinate = this->parent->getAbsCoor() + this->relCoordinate; 759 759 } 760 760 else if( this->parentMode & PNODE_ROTATE_MOVEMENT && this->bRelCoorChanged) 761 761 { 762 762 /* update the current absCoordinate */ 763 this->prevRelCoordinate = this->relCoordinate;764 this->absCoordinate = this->parent->getAbsCoor() + parent->getAbsDir().apply(this->relCoordinate);763 this->prevRelCoordinate = this->relCoordinate; 764 this->absCoordinate = this->parent->getAbsCoor() + parent->getAbsDir().apply(this->relCoordinate); 765 765 } 766 766 ///////////////////////////////////////////////// -
trunk/src/lib/graphics/render2D/element_2d.cc
r6299 r6307 704 704 void Element2D::setParentMode2D(E2D_PARENT_MODE parentMode) 705 705 { 706 this->parentMode &= (0xfff0| parentMode);706 this->parentMode = ((this->parentMode & 0xfff0) | parentMode); 707 707 } 708 708 -
trunk/src/story_entities/world.cc
r6241 r6307 349 349 if (this->sky != NULL) 350 350 { 351 this->sky->setParent(this->localCamera); 352 this->sky->setParentMode(PNODE_MOVEMENT); 351 this->localCamera->addChild(sky); 353 352 } 354 353 SoundEngine::getInstance()->setListener(this->localCamera); -
trunk/src/world_entities/skybox.cc
r6142 r6307 68 68 this->size = 100.0; 69 69 70 this->material = new Material*[6];71 70 for (int i = 0; i < 6; i++) 72 71 { … … 95 94 for (int i = 0; i < 6; i++) 96 95 delete this->material[i]; 97 delete[] this->material; 98 } 96 } 99 97 100 98 /** -
trunk/src/world_entities/skybox.h
r5511 r6307 44 44 void rebuild(); 45 45 46 Material* * material;//!< Materials for the SkyBox. sorted by number (0-5) top, bottom, left, right, front, back46 Material* material[6]; //!< Materials for the SkyBox. sorted by number (0-5) top, bottom, left, right, front, back 47 47 float size; //!< Size of the SkyBox. This should match the frustum maximum range. 48 48
Note: See TracChangeset
for help on using the changeset viewer.