Changeset 187 for trunk/VUT/work/IVReader

Timestamp:

07/31/05 11:16:09 (20 years ago)

Author:

mattausch

Message:

added animationbug fix (deleting while animation)fixed visibilityQueriesadditive shadow volumes fixed for octree
hack to fully empty queue after traversal
added demo for vienna model

Location:

trunk/VUT/work/IVReader

Files:

• include/ivmeshdata.h (modified) (2 diffs)
• include/ivreader.h (modified) (2 diffs)
• src/ivmanualmeshloader.cpp (modified) (1 diff)
• src/ivmeshdata.cpp (modified) (1 diff)
• src/ivnode.cpp (modified) (1 diff)
• src/ivreader.cpp (modified) (4 diffs)

trunk/VUT/work/IVReader/include/ivmeshdata.h

@@ -5 +5 @@
 #include <Ogre.h>
 
-enum IVRenderOperationType
+enum mIVReaderenderOperationType
 {
         IV_ROT_INVALID = -1,
@@ -25 +25 @@
                 Ogre::Real *vertices, *normals, *texCoords, *indices, *normalIndices, *texCoordIndices;
                 int vcnt, ncnt, tcnt, icnt, nicnt, ticnt;
-                IVRenderOperationType roType;
+                mIVReaderenderOperationType roType;
                 Ogre::AxisAlignedBox *boundingBox;
 

trunk/VUT/work/IVReader/include/ivreader.h

@@ -1 @@
-#ifndef __IVReader_H__
-#define __IVReader_H__
+#ifndef __mIVReader_H__
+#define __mIVReader_H__
 
 
@@ -120 +120 @@
                 Ogre::Entity *createEntity(Ogre::SceneManager* sceneMgr, std::string name, IVMeshData *mData, Ogre::Vector3 *translation = NULL);
 
-                void buildTree(Ogre::SceneManager *sceneMgr, Ogre::SceneNode *sceneNodeRoot, IVNode *ivRoot, IVMeshData *mData = NULL, Ogre::Material *material = NULL);
+                void buildTree(Ogre::SceneManager *sceneMgr, Ogre::SceneNode *sceneNodeRoot, IVNode *mIVReaderoot, IVMeshData *mData = NULL, Ogre::Material *material = NULL);
 
                 IVDefListNode *defList;

trunk/VUT/work/IVReader/src/ivmanualmeshloader.cpp

@@ -1 +1 @@
 #include "ivmanualmeshloader.h"
-#include "IVReader.h"
+#include "ivreader.h"
 
 IVManualMeshLoader::IVManualMeshLoader()

trunk/VUT/work/IVReader/src/ivmeshdata.cpp

@@ -1 +1 @@
 #include "ivmeshdata.h"
-#include "IVReader.h"
+#include "ivreader.h"
 
 

trunk/VUT/work/IVReader/src/ivnode.cpp

@@ -1 +1 @@
 #include "ivnode.h"
-#include "IVReader.h"
+#include "ivreader.h"
 
 IVField::IVField()

trunk/VUT/work/IVReader/src/ivreader.cpp

@@ -1 @@
-#include "ivreader.h"
+#include "IVReader.h"
 #include <string>
 #include <stdlib.h>
@@ -571 +571 @@
 }
 
-void IVReader::buildTree(Ogre::SceneManager* sceneMgr,  Ogre::SceneNode *sceneNodeRoot, IVNode *ivRoot, IVMeshData *mData, Ogre::Material *material)
+void IVReader::buildTree(Ogre::SceneManager* sceneMgr,  Ogre::SceneNode *sceneNodeRoot, IVNode *IVReaderoot, IVMeshData *mData, Ogre::Material *material)
 {
         using namespace Ogre;
@@ -586 +586 @@
         IVType t; int i;
         
-        IVNode *help = ivRoot->getNextChildNode(true);
+        IVNode *help = IVReaderoot->getNextChildNode(true);
         while (help != NULL)
         {       
@@ -766 +766 @@
                 }
 
-                help = ivRoot->getNextChildNode();
+                help = IVReaderoot->getNextChildNode();
         }
         if (meshDataCreated) if (mData != NULL) delete mData;