Changeset 9869 in orxonox.OLD for trunk/src/world_entities/environments/water.cc

Timestamp:

Oct 3, 2006, 12:19:30 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

File:

• trunk/src/world_entities/environments/water.cc (modified) (4 diffs)

trunk/src/world_entities/environments/water.cc

@@ -23 +23 @@
 #include "material.h"
 
-#include "util/loading/resource_manager.h"
-#include "shader.h"
+#include "resource_shader.h"
 
 #include "skybox.h"
@@ -33 +32 @@
 
 
-
-CREATE_FACTORY(Water, CL_WATER);
+#include "class_id_DEPRECATED.h"
+ObjectListDefinitionID(Water, CL_WATER);
+CREATE_FACTORY(Water);
 
 
 Water::Water(const TiXmlElement* root)
 {
-  this->setClassID(CL_WATER, "Water");
+  this->registerObject(this, Water::_objectList);
   this->toList(OM_ENVIRON);
 
@@ -55 +55 @@
 
   this->rebuildGrid();
-  this->waterShader = (Shader*)ResourceManager::getInstance()->load("shaders/water.vert", SHADER, RP_GAME, "shaders/water.frag");
+  this->waterShader = ResourceShader("shaders/water.vert", "shaders/water.frag");
 
   // To test the Wave equation
@@ -217 +217 @@
 void Water::tick(float dt)
 {
-  ObjectManager::EntityList entityList = State::getObjectManager()->getObjectList(OM_GROUP_01_PROJ);
+  ObjectManager::EntityList entityList = State::getObjectManager()->getEntityList(OM_GROUP_01_PROJ);
   ObjectManager::EntityList::iterator entity = entityList.begin();
   while (entity != entityList.end())