diff options
author | Brad Davis <[email protected]> | 2014-10-24 12:56:30 -0700 |
---|---|---|
committer | Brad Davis <[email protected]> | 2014-10-24 12:56:30 -0700 |
commit | 496894ecced1b0a4ae5ab176902bbd0f43a31ed1 (patch) | |
tree | 8b7d4be1fc8508253d399d98da6143212ceb8f3c /Samples/CommonSrc/Render/Render_XmlSceneLoader.cpp | |
parent | 911239601768bacf9420ab9cfeffed7e861844ac (diff) |
Updating to 0.4.3 SDK0.4.3-official
Diffstat (limited to 'Samples/CommonSrc/Render/Render_XmlSceneLoader.cpp')
-rw-r--r-- | Samples/CommonSrc/Render/Render_XmlSceneLoader.cpp | 97 |
1 files changed, 55 insertions, 42 deletions
diff --git a/Samples/CommonSrc/Render/Render_XmlSceneLoader.cpp b/Samples/CommonSrc/Render/Render_XmlSceneLoader.cpp index 0eea8eb..d011ee9 100644 --- a/Samples/CommonSrc/Render/Render_XmlSceneLoader.cpp +++ b/Samples/CommonSrc/Render/Render_XmlSceneLoader.cpp @@ -5,7 +5,7 @@ Content : Imports and exports XML files - implementation Created : January 21, 2013 Authors : Robotic Arm Software - Peter Hoff, Dan Goodman, Bryan Croteau -Copyright : Copyright 2012 Oculus VR, Inc. All Rights reserved. +Copyright : Copyright 2012 Oculus VR, LLC All Rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -26,7 +26,12 @@ limitations under the License. namespace OVR { namespace Render { -XmlHandler::XmlHandler() : pXmlDocument(NULL) +XmlHandler::XmlHandler() : + pXmlDocument(NULL), + textureCount(0), + modelCount(0), + collisionModelCount(0), + groundCollisionModelCount(0) { pXmlDocument = new tinyxml2::XMLDocument(); } @@ -63,6 +68,7 @@ bool XmlHandler::ReadFile(const char* fileName, OVR::Render::RenderDevice* pRend // Load the textures OVR_DEBUG_LOG_TEXT(("Loading textures...")); XMLElement* pXmlTexture = pXmlDocument->FirstChildElement("scene")->FirstChildElement("textures"); + OVR_ASSERT(pXmlTexture); if (pXmlTexture) { pXmlTexture->QueryIntAttribute("count", &textureCount); @@ -299,61 +305,68 @@ bool XmlHandler::ReadFile(const char* fileName, OVR::Render::RenderDevice* pRend { Ptr<CollisionModel> cm = *new CollisionModel(); int planeCount = 0; - pXmlCollisionModel->QueryIntAttribute("planeCount", &planeCount); - - pXmlPlane = pXmlCollisionModel->FirstChildElement("plane"); - for(int j = 0; j < planeCount; ++j) + + OVR_ASSERT(pXmlCollisionModel != NULL); // collisionModelCount should guarantee this. + if (pXmlCollisionModel) { - Vector3f norm; - pXmlPlane->QueryFloatAttribute("nx", &norm.x); - pXmlPlane->QueryFloatAttribute("ny", &norm.y); - pXmlPlane->QueryFloatAttribute("nz", &norm.z); - float D; - pXmlPlane->QueryFloatAttribute("d", &D); - D -= 0.5f; - if (i == 26) - D += 0.5f; // tighten the terrace collision so player can move right up to rail - Planef p(norm.z, norm.y, norm.x * -1.0f, D); - cm->Add(p); - pXmlPlane = pXmlPlane->NextSiblingElement("plane"); - } + pXmlCollisionModel->QueryIntAttribute("planeCount", &planeCount); + + pXmlPlane = pXmlCollisionModel->FirstChildElement("plane"); + for(int j = 0; j < planeCount; ++j) + { + Vector3f norm; + pXmlPlane->QueryFloatAttribute("nx", &norm.x); + pXmlPlane->QueryFloatAttribute("ny", &norm.y); + pXmlPlane->QueryFloatAttribute("nz", &norm.z); + float D; + pXmlPlane->QueryFloatAttribute("d", &D); + D -= 0.5f; + if (i == 26) + D += 0.5f; // tighten the terrace collision so player can move right up to rail + Planef p(norm.z, norm.y, norm.x * -1.0f, D); + cm->Add(p); + pXmlPlane = pXmlPlane->NextSiblingElement("plane"); + } - pCollisions->PushBack(cm); - pXmlCollisionModel = pXmlCollisionModel->NextSiblingElement("collisionModel"); + pCollisions->PushBack(cm); + pXmlCollisionModel = pXmlCollisionModel->NextSiblingElement("collisionModel"); + } } OVR_DEBUG_LOG(("done.")); //load the ground collision models OVR_DEBUG_LOG(("Loading ground collision models...")); pXmlCollisionModel = pXmlDocument->FirstChildElement("scene")->FirstChildElement("groundCollisionModels"); + OVR_ASSERT(pXmlCollisionModel); if (pXmlCollisionModel) { pXmlCollisionModel->QueryIntAttribute("count", &groundCollisionModelCount); pXmlCollisionModel = pXmlCollisionModel->FirstChildElement("collisionModel"); - } - pXmlPlane = NULL; - for(int i = 0; i < groundCollisionModelCount; ++i) - { - Ptr<CollisionModel> cm = *new CollisionModel(); - int planeCount = 0; - pXmlCollisionModel->QueryIntAttribute("planeCount", &planeCount); - pXmlPlane = pXmlCollisionModel->FirstChildElement("plane"); - for(int j = 0; j < planeCount; ++j) + pXmlPlane = NULL; + for (int i = 0; i < groundCollisionModelCount; ++i) { - Vector3f norm; - pXmlPlane->QueryFloatAttribute("nx", &norm.x); - pXmlPlane->QueryFloatAttribute("ny", &norm.y); - pXmlPlane->QueryFloatAttribute("nz", &norm.z); - float D; - pXmlPlane->QueryFloatAttribute("d", &D); - Planef p(norm.z, norm.y, norm.x * -1.0f, D); - cm->Add(p); - pXmlPlane = pXmlPlane->NextSiblingElement("plane"); - } + Ptr<CollisionModel> cm = *new CollisionModel(); + int planeCount = 0; + pXmlCollisionModel->QueryIntAttribute("planeCount", &planeCount); - pGroundCollisions->PushBack(cm); - pXmlCollisionModel = pXmlCollisionModel->NextSiblingElement("collisionModel"); + pXmlPlane = pXmlCollisionModel->FirstChildElement("plane"); + for (int j = 0; j < planeCount; ++j) + { + Vector3f norm; + pXmlPlane->QueryFloatAttribute("nx", &norm.x); + pXmlPlane->QueryFloatAttribute("ny", &norm.y); + pXmlPlane->QueryFloatAttribute("nz", &norm.z); + float D = 0.f; + pXmlPlane->QueryFloatAttribute("d", &D); + Planef p(norm.z, norm.y, norm.x * -1.0f, D); + cm->Add(p); + pXmlPlane = pXmlPlane->NextSiblingElement("plane"); + } + + pGroundCollisions->PushBack(cm); + pXmlCollisionModel = pXmlCollisionModel->NextSiblingElement("collisionModel"); + } } OVR_DEBUG_LOG(("done.")); return true; |