Changeset 3438

Timestamp:

02/21/10 14:47:32 (5 months ago)

Author:

trichards

Message:

Added a lot more debugging statements in an effort to track down an initialization bug. Final bug was fixed by calling setActive().
Also implemented pumpSystemMessages() in ZOgre.

Location:

plugins/branches/0185_GEN_PHYSICS_REFACTOR_2/ZOgre/src

Files:

• Camera.cpp (modified) (9 diffs)
• RenderingCanvas.cpp (modified) (10 diffs)
• RenderingCanvas.hpp (modified) (2 diffs)
• RenderingService.cpp (modified) (2 diffs)
• RenderingView.cpp (modified) (3 diffs)
• SceneService.cpp (modified) (1 diff)
• ZOgreModule.cpp (modified) (5 diffs)

plugins/branches/0185_GEN_PHYSICS_REFACTOR_2/ZOgre/src/Camera.cpp

@@ -31 +31 @@
 #include <Zen/Core/Math/Vector3.hpp>
 
+#include <iostream>
+
 //-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~
 namespace Zen {
@@ -59 +61 @@
 Camera::setAspectRatio(const Math::Real& _ratio)
 {
+    std::cout << "OGRE: Ogre::Camera::setAspectRatio(_ratio);" << std::endl;;
     m_camera.setAspectRatio(_ratio);
 }
@@ -67 +70 @@
 {
     Ogre::Radian fov(_fov);
+    std::cout << "OGRE: Ogre::Camera::setFOVy(fov);" << std::endl;;
     m_camera.setFOVy(fov);
 }
@@ -74 +78 @@
 Camera::setNearClipDistance(const Math::Real _nearDistance)
 {
+    std::cout << "OGRE: Ogre::Camera::setNearClipDistance(_nearDistance);" << std::endl;;
     m_camera.setNearClipDistance(_nearDistance);
 }
@@ -81 +86 @@
 Camera::setFarClipDistance(const Math::Real _farDistance)
 {
+    std::cout << "OGRE: Ogre::Camera::setFarClipDistance(_farDistance);" << std::endl;;
     m_camera.setFarClipDistance(_farDistance);
 }
@@ -97 +103 @@
     if (m_pSceneNode)
     {
+        std::cout << "OGRE: Ogre::SceneNode::setPosition(_x, _y, _z);" << std::endl;;
         m_pSceneNode->setPosition(_x, _y, _z);
     }
     else
     {
+        std::cout << "OGRE: Ogre::Camera::setPosition(_x, _y, _z);" << std::endl;;
         m_camera.setPosition(_x, _y, _z);
     }
@@ -127 +135 @@
 Camera::setDirection(const Math::Real _x, const Math::Real _y, const Math::Real _z)
 {
+    std::cout << "OGRE: Ogre::SceneNode::setDirection(_x, _y, _z);" << std::endl;;
     m_camera.setDirection(_x, _y, _z);
 }
@@ -156 +165 @@
 Camera::lookAt(const Math::Real _x, const Math::Real _y, const Math::Real _z)
 {
+    std::cout << "OGRE: Ogre::SceneNode::lookAt(_x, _y, _z);" << std::endl;;
     m_camera.lookAt(_x, _y, _z);
 }
@@ -246 +256 @@
     if(m_pSceneNode)
     {
+        std::cout << "OGRE: Ogre::SceneNode::_update(true, false);" << std::endl;;
+
         m_pSceneNode->getParentSceneNode()->_update(true,false);
     }

plugins/branches/0185_GEN_PHYSICS_REFACTOR_2/ZOgre/src/RenderingCanvas.cpp

@@ -36 +36 @@
 
 #include <OgreRenderSystem.h>
+#include <OgreWindowEventUtilities.h>
 
 #include <stddef.h>
@@ -53 +54 @@
 {
     // Get the default scene manager
+    std::cout << "OGRE: Ogre::Root::getSingleton().getSceneManager(\"default\");" << std::endl;
     m_pSceneManager = Ogre::Root::getSingleton().getSceneManager("default");
 
     assert(m_pSceneManager != NULL);
+
+    std::cout << "Using scene type " << m_pSceneManager->getTypeName() << std::endl;
 
     // Create the default camera
@@ -61 +65 @@
 
     std::cout << "adding Viewport" << std::endl;
+    std::cout << "OGRE: Ogre::RenderWindow::addViewPort(&m_pCurrentCamera->getOgreCamera());" << std::endl;
     m_pViewPort = _pView->getRenderWindow().addViewport(&m_pCurrentCamera->getOgreCamera());
 
-    m_pSceneManager->setViewport(m_pViewPort);
-
-    // Select the camera, just in case somehow another camera was created.
-    std::cout << "selectCamera" << std::endl;
-    selectCamera("default");
+    //m_pSceneManager->setViewport(m_pViewPort);
+
+    //// Select the camera, just in case somehow another camera was created.
+    //std::cout << "selectCamera" << std::endl;
+    //selectCamera("default");
 
     // HACK Why do we have to do this on Linux?
@@ -73 +78 @@
     {
         std::cout << "RenderingCanvas::RenderingCanvas(): Warning!  OGRE RenderSystem viewPort was not set.  Why not?" << std::endl;
+        std::cout << "OGRE: Ogre::Root::getSingleton().getRenderSystem()->_setViewport(m_pViewPort);" << std::endl;
         Ogre::Root::getSingleton().getRenderSystem()->_setViewport(m_pViewPort);
         assert(m_pViewPort);
@@ -78 +84 @@
     }
 
+    // HACK This should only be done for windows apps
+    Ogre::RenderSystem* const pRenderSystem = Ogre::Root::getSingleton().getRenderSystem();
+    pRenderSystem->setWaitForVerticalBlank(false);
+    m_pRenderingView->getRenderWindow().setActive(true);
+    m_pRenderingView->getRenderWindow().setVisible(true);
+
     std::cout << "setting background color" << std::endl;
+    std::cout << "OGRE: Ogre::Viewport::setBackgroundColour(Ogre::ColourValue(0.5f, 0.0f, 0.0f));" << std::endl;
     m_pViewPort->setBackgroundColour(Ogre::ColourValue(0.5f, 0.0f, 0.0f));
 
@@ -123 +136 @@
 {
     std::cout << "RenderingCanvas::resize(): " << _x << " " << _y << " " << _width << " " << _height << std::endl;
+    std::cout << "OGRE: Ogre::RenderWindow::reposition(_x, _y);" << std::endl;
     m_pRenderingView->getRenderWindow().reposition(_x, _y);
+    std::cout << "OGRE: Ogre::RenderWindow::resize(_width, _height);" << std::endl;
     m_pRenderingView->getRenderWindow().resize(_width, _height);
 
+    std::cout << "OGRE: Ogre::RenderWindow::windowMovedOrResized();" << std::endl;
     m_pRenderingView->getRenderWindow().windowMovedOrResized();
 
@@ -228 +244 @@
     {
         // Camera wasn't found, so create it
+        std::cout << "OGRE: Ogre::SceneManager::createCamera(_name);" << std::endl;
         Ogre::Camera* pOgreCamera = m_pSceneManager->createCamera(_name);
         assert(pOgreCamera);
@@ -236 +253 @@
 
         // Default the aspect ratio
-        pCamera->setAspectRatio((Ogre::Real)getWidth() / (Ogre::Real)getHeight());
-
-        std::cout << "Creating camera " << getWidth() << " x " << getHeight() << std::endl;
+        //pCamera->setAspectRatio((Ogre::Real)getWidth() / (Ogre::Real)getHeight());
 
         // If the current camera hasn't been set, set it
@@ -300 +315 @@
         std::cout << "found it, getting the ogre camera" << std::endl;
         // Set the current camera for this viewport
+        std::cout << "OGRE: Ogre::Viewport::setCamera(&iter->second->getOgreCamera());" << std::endl;
         m_pViewPort->setCamera(&iter->second->getOgreCamera());
 
@@ -439 +455 @@
 
 //-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~
+void
+RenderingCanvas::pumpSystemMessages()
+{
+    Ogre::WindowEventUtilities::messagePump();
+}
+
+//-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~
 }   // namespace ZOgre
 }   // namespace Zen

plugins/branches/0185_GEN_PHYSICS_REFACTOR_2/ZOgre/src/RenderingCanvas.hpp

@@ -74 +74 @@
 
     virtual void querySceneNodes(Math::Real _x, Math::Real _y, I_SceneNodeVisitor& _visitor);
+
+    virtual void pumpSystemMessages();
     /// @}
 
@@ -122 +124 @@
     // TODO This should be abstracted into an I_InputService
     OIS::Keyboard*      m_pKeyboard;
-#endif // deprecated 
+#endif // deprecated
 
     std::map< std::string, bool >   m_compositors;

plugins/branches/0185_GEN_PHYSICS_REFACTOR_2/ZOgre/src/RenderingService.cpp

@@ -47 +47 @@
 
     // TODO Where should this go?
-
+    std::cout << "OGRE: m_root.restoreConfig()" << std::endl;
     if (m_root.restoreConfig())
     {
@@ -53 +53 @@
         std::cout << "Rendering configuration loaded from file 'ogre.cfg'.  Delete it to show dialog at startup." << std::endl;
         m_root.initialise(false);
+        Ogre::ResourceGroupManager::getSingleton().addResourceLocation("./materials/textures", "FileSystem", "General", false);
         return;
     }
 
     // there was no valid ogre.cfg file to read from, so let's show the dialog
+    std::cout << "OGRE: m_root.showConfigDialog()" << std::endl;
     if (m_root.showConfigDialog())
     {
         std::cout << "Rendering configuration loaded from on-screen dialog." << std::endl;
         m_root.initialise(false);
+        Ogre::ResourceGroupManager::getSingleton().addResourceLocation("./materials/textures", "FileSystem", "General", false);
         return;
     }

plugins/branches/0185_GEN_PHYSICS_REFACTOR_2/ZOgre/src/RenderingView.cpp

@@ -31 +31 @@
 
 #include <iostream>
+#include <sstream>
 
 //-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~
@@ -78 +79 @@
     {
         Ogre::Root::getSingleton().getRenderSystem()->setConfigOption("Full Screen", "No");
-        Ogre::Root::getSingleton().getRenderSystem()->setConfigOption("Video Mode", "800 x 600");
+
+        std::stringstream str;
+        str << _width << " x " << _height;
+        Ogre::Root::getSingleton().getRenderSystem()->setConfigOption("Video Mode", str.str());
     }
 
+    std::cout << "OGRE: Ogre::Root::getSingleton().initialise(!useParentWindow, _windowName.c_str());" << std::endl;
     Ogre::Root::getSingleton().initialise(!useParentWindow, _windowName.c_str());
 
     if (useParentWindow)
     {
+        std::cout << "OGRE: m_root.createRenderWindow(_windowName.c_str(), _width, _height, false, &nvpl);" << std::endl;
         m_pRenderWindow = m_root.createRenderWindow(_windowName.c_str(), _width, _height, false, &nvpl);
     }
     else
     {
+        std::cout << "OGRE: m_root.getAutoCreatedWindow();" << std::endl;
         m_pRenderWindow = m_root.getAutoCreatedWindow();
     }
+
+    // Dunno why this is done.
+    std::cout << "OGRE: Ogre::RenderWindow::removeAllViewports()" << std::endl;
+    m_pRenderWindow->removeAllViewports();
 
     // Set the window value in the _context
@@ -100 +111 @@
     {
         // TODO This might be different depending on the OS.
+        std::cout << "OGRE: Ogre::RenderWindow::getCustomAttribute(\"WINDOW\", &pContext->m_pHandle);" << std::endl;
         m_pRenderWindow->getCustomAttribute("WINDOW", &pContext->m_pHandle);
     }

plugins/branches/0185_GEN_PHYSICS_REFACTOR_2/ZOgre/src/SceneService.cpp

@@ -51 +51 @@
     assert(!sm_bCreated);
     sm_bCreated = true;
+    std::cout << "OGRE: Ogre::Root::getSingleton().createSceneManager(_sceneType, _name);" << std::endl;
     m_pSceneManager = Ogre::Root::getSingleton().createSceneManager(_sceneType, _name);
     assert(m_pSceneManager != NULL);
+
 }
 

plugins/branches/0185_GEN_PHYSICS_REFACTOR_2/ZOgre/src/ZOgreModule.cpp

@@ -89 +89 @@
 
 //-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~
-ZOgreModule& 
+ZOgreModule&
 ZOgreModule::instance()
 {
@@ -100 +100 @@
     if (pRoot == NULL)
     {
+        std::cout << "OGRE: new Ogre::Root();" << std::endl;
 #ifdef _DEBUG
             pRoot = new Ogre::Root("plugins-debug.cfg", "ogre.cfg", "Ogre.log");
@@ -111 +112 @@
 
 //-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~
-Zen::Plugins::I_Module::plugin_name_collection_type& 
+Zen::Plugins::I_Module::plugin_name_collection_type&
 ZOgreModule::getPluginNames()
 {
@@ -121 +122 @@
 ZOgreModule::getPlugin(const plugin_name_type& _PluginName)
 {
-    // TODO: Return the appropriate plugin; 
+    // TODO: Return the appropriate plugin;
     // For now since only one type is supported then return that.
     return m_pPlugin;
@@ -127 +128 @@
 
 //-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~
-void 
+void
 ZOgreModule::destroyPlugin(Plugins::I_Module::plugin_ptr_type _pPlugin)
 {