Changeset 6501 for code/trunk/src/modules

Timestamp:

Mar 11, 2010, 11:32:01 AM (15 years ago)

Author:

rgrieder

Message:

Ensured OGRE v1.7 "Cthugha" code compatibility. Does not yet seem to run run though.

Location:

code/trunk/src/modules/objects

Files:

• Planet.cc (modified) (1 diff)
• Planet.h (modified) (1 diff)

code/trunk/src/modules/objects/Planet.cc

@@ -91 +91 @@
         float scaleFactor = this->getScale();
 
-        this->distList.push_back(10.0f*scaleFactor);
-        this->distList.push_back(19.0f*scaleFactor);
-        this->distList.push_back(27.0f*scaleFactor);
-        this->distList.push_back(34.0f*scaleFactor);
-        this->distList.push_back(40.0f*scaleFactor);
-        this->distList.push_back(45.0f*scaleFactor);
-        this->distList.push_back(49.0f*scaleFactor);
-        this->distList.push_back(52.0f*scaleFactor);
-        this->distList.push_back(54.0f*scaleFactor);
-        this->distList.push_back(55.0f*scaleFactor);
+#if OGRE_VERSION >= 0x010700
+        Ogre::Mesh::LodValueList distList;
+#else
+        Ogre::Mesh::LodDistanceList distList;
+#endif
+
+        distList.push_back(10.0f*scaleFactor);
+        distList.push_back(19.0f*scaleFactor);
+        distList.push_back(27.0f*scaleFactor);
+        distList.push_back(34.0f*scaleFactor);
+        distList.push_back(40.0f*scaleFactor);
+        distList.push_back(45.0f*scaleFactor);
+        distList.push_back(49.0f*scaleFactor);
+        distList.push_back(52.0f*scaleFactor);
+        distList.push_back(54.0f*scaleFactor);
+        distList.push_back(55.0f*scaleFactor);
 
         float reductionValue = 0.2f;

code/trunk/src/modules/objects/Planet.h

@@ -106 +106 @@
             float atmosphereSize;
             float imageSize;
-            std::vector<float> distList;
             BillboardSet billboard_;
             bool bCastShadows_;