Changeset 183 for trunk/VUT/work

Timestamp:

07/19/05 17:39:30 (19 years ago)

Author:

mattausch

Message:

added iv-reader library, testing code, and resources

Location:

trunk/VUT/work

Files:

• IVReader (added)
• IVReader/include (added)
• IVReader/include/ivmanualmeshloader.h (added)
• IVReader/include/ivmeshdata.h (added)
• IVReader/include/ivnode.h (added)
• IVReader/include/ivreader.h (added)
• IVReader/scripts (added)
• IVReader/scripts/IVReader.vcproj (added)
• IVReader/src (added)
• IVReader/src/ivmanualmeshloader.cpp (added)
• IVReader/src/ivmeshdata.cpp (added)
• IVReader/src/ivnode.cpp (added)
• IVReader/src/ivreader.cpp (added)
• TestCullingTerrain/TerrainFrameListener.cpp (modified) (1 diff)
• TestCullingTerrain/TestCullingTerrainApplication.h (modified) (1 diff)
• iv (added)
• iv/scripts (added)
• iv/scripts/Demo_IV.dsp (added)
• iv/scripts/Demo_IV.plg (added)
• iv/scripts/Demo_IV.vcproj (added)
• iv/src (added)
• iv/src/IV.cpp (added)
• iv/src/IV.h (added)
• ogre_changes/OgreMain/include/OgreSceneManager.h (modified) (1 diff)
• ogre_changes/OgreMain/src/OgreSceneManager.cpp (modified) (1 diff)
• ogre_changes/Plugins/OctreeSceneManager/src/OgreOctreeNode.cpp (modified) (1 diff)
• ogre_changes/RenderSystems/Direct3D9/src/OgreD3D9RenderWindow.cpp (modified) (7 diffs)

trunk/VUT/work/TestCullingTerrain/TerrainFrameListener.cpp

@@ -42 +42 @@
 {
         0,
-        0,
+        -0.1,
         //7,
         0

trunk/VUT/work/TestCullingTerrain/TestCullingTerrainApplication.h

@@ -156 +156 @@
         Vector3 mTerrainMinPos;
         Vector3 mTerrainMaxPos;
+
+
 private:
         void chooseSceneManager(void);

trunk/VUT/work/ogre_changes/OgreMain/include/OgreSceneManager.h

@@ -161 +161 @@
                 */
                 void _renderMovableObject(MovableObject *mov, const int leavePassesInQueue);
+
+                /** Renders a single renderable using pass 0 of the renderable.
+                */
+                void _renderSingleRenderable(Renderable *rend);
 
                 /** Tells the scene manager that the frame ends (i.e.,

trunk/VUT/work/ogre_changes/OgreMain/src/OgreSceneManager.cpp

@@ -4248 +4248 @@
         SceneManager::_renderVisibleObjects();
 }
+//-----------------------------------------------------------------------
+void SceneManager::_renderSingleRenderable(Renderable *rend)
+{
+        Pass *pass = rend->getTechnique()->getPass(0);
+        setPass(pass);
+        renderSingleObject(rend, pass, false);
+}
 #endif //GTP_VISIBILITY_MODIFIED_OGRE
 }

trunk/VUT/work/ogre_changes/Plugins/OctreeSceneManager/src/OgreOctreeNode.cpp

@@ -189 +189 @@
         AxisAlignedBox box = mLocalAABB;
         // HACK: scale should not be done here
-        box.scale(Vector3(10,10,10));
+        box.scale(Vector3(3, 3, 3));
         mWireBoundingBox->setupBoundingBox(box);
         mWireBoundingBox->getRenderOperation(rend);

trunk/VUT/work/ogre_changes/RenderSystems/Direct3D9/src/OgreD3D9RenderWindow.cpp

@@ -366 +366 @@
                 md3dpp.BackBufferHeight                 = mHeight;
 #ifdef GTP_VISIBILITY_MODIFIED_OGRE
-        md3dpp.Flags |= D3DPRESENTFLAG_LOCKABLE_BACKBUFFER;
+        //md3dpp.Flags |= D3DPRESENTFLAG_LOCKABLE_BACKBUFFER;
 #endif
                 if (mVSync)
@@ -938 +938 @@
                 // this will be the dimensions of the front buffer
                 if (FAILED(hr = mpD3DDevice->GetDisplayMode(0, &dm)))
-                        OGRE_EXCEPT(hr, "Can't get display mode!", "D3D9RenderWindow::writeContentsToFile");
+                        OGRE_EXCEPT(hr, "Can't get display mode!", "D3D9RenderWindow::getBufferContents");
 
                 desc.Width = dm.Width;
@@ -951 +951 @@
                                                 NULL)))
                 {
-                        OGRE_EXCEPT(hr, "Cannot create offscreen buffer 1!", "D3D9RenderWindow::writeContentsToFile");
+                        OGRE_EXCEPT(hr, "Cannot create offscreen buffer 1!", "D3D9RenderWindow::getBufferContents");
                 }
 
@@ -971 +971 @@
                         desc.Format = D3DFMT_A8R8G8B8;         // this is what we get from the screen, so stick with it
 
-                        // NB we can't lock the back buffer direct because it's no created that way
+                        // NB we can't lock the back buffer direct because it's not created that way
                         // and to do so hits performance, so copy to another surface
                         // Must be the same format as the source surface
@@ -983 +983 @@
                         {
                                 SAFE_RELEASE(pSurf);
-                                OGRE_EXCEPT(hr, "Cannot create offscreen buffer 2!", "D3D9RenderWindow::writeContentsToFile");
+                                OGRE_EXCEPT(hr, "Cannot create offscreen buffer 2!", "D3D9RenderWindow::getBufferContents");
                         }
 
@@ -991 +991 @@
                                 SAFE_RELEASE(pTempSurf);
                                 SAFE_RELEASE(pSurf);
-                                OGRE_EXCEPT(hr, "Cannot update surface!", "D3D9RenderWindow::writeContentsToFile");
+                                OGRE_EXCEPT(hr, "Cannot update surface!", "D3D9RenderWindow::getBufferContents");
                         }
 
@@ -1003 +1003 @@
                         D3DLOCK_READONLY | D3DLOCK_NOSYSLOCK)))
                 {
-                        OGRE_EXCEPT(hr, "can't lock rect!", "D3D9RenderWindow::writeContentsToFile");
+                        OGRE_EXCEPT(hr, "can't lock rect!", "D3D9RenderWindow::getBufferContents");
                 }