Changeset 6828 for code/branches/lod/src/orxonox
- Timestamp:
- May 3, 2010, 11:34:44 AM (15 years ago)
- Location:
- code/branches/lod/src/orxonox
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/lod/src/orxonox/Level.cc
r6786 r6828 32 32 #include "core/CoreIncludes.h" 33 33 #include "core/Loader.h" 34 #include "core/ template.h"34 #include "core/Template.h" 35 35 #include "core/XMLFile.h" 36 36 #include "core/XMLPort.h" … … 126 126 this->objects_.push_back(object); 127 127 object->setGametype(this->getGametype()); 128 object->setLevel(this); 128 129 } 129 130 -
code/branches/lod/src/orxonox/graphics/Model.cc
r6794 r6828 29 29 #include "Model.h" 30 30 31 #include <O greEntity.h>31 #include <OGRE/OgreEntity.h> 32 32 33 33 #include "core/CoreIncludes.h" … … 92 92 &&this->lodLevel_!=0) 93 93 { 94 94 Vector3 scale3d = this->getScale3D(); 95 95 float scaleFactor = scale3d.x; 96 97 98 99 100 96 if(scale3d.y>scaleFactor) 97 scaleFactor = scale3d.y; 98 if(scale3d.z>scaleFactor) 99 scaleFactor = scale3d.z; 100 101 101 COUT(0) << this->meshSrc_<< " lodLevel_: " << this->lodLevel_ <<" scale: "<< scaleFactor << std::endl; 102 //F ür Asteroiden perfekt102 //Fuer Asteroiden perfekt 103 103 104 104 #if OGRE_VERSION >= 0x010700 … … 108 108 #endif 109 109 110 111 110 float factor = scaleFactor; 111 COUT(0)<<"scaleFactor:"<<scaleFactor<<std::endl; 112 112 113 113 distList.push_back(70.0f*factor);
Note: See TracChangeset
for help on using the changeset viewer.