diff --git a/src/modules/graphic/osggraph/OsgLoader.cpp b/src/modules/graphic/osggraph/OsgLoader.cpp index 4f8ae84e9..f30e3cb5c 100644 --- a/src/modules/graphic/osggraph/OsgLoader.cpp +++ b/src/modules/graphic/osggraph/OsgLoader.cpp @@ -1,6 +1,8 @@ #include "OsgLoader.h" //#include "ReaderWriterACC.h" +#include + osgLoader::osgLoader(void) { m_pOpt = new osgDB::ReaderWriter::Options(); @@ -45,6 +47,7 @@ osg::Node *osgLoader::Load3dFile(std::string strFile) { pNode = osgDB::readNodeFile(strFile, m_pOpt); } - + + GfOut("le test %d \n",pNode); return pNode; } diff --git a/src/modules/graphic/osggraph/OsgScene.cpp b/src/modules/graphic/osggraph/OsgScene.cpp index 68293b3d8..b9bbc22dd 100644 --- a/src/modules/graphic/osggraph/OsgScene.cpp +++ b/src/modules/graphic/osggraph/OsgScene.cpp @@ -174,11 +174,12 @@ void setViewer(osg::ref_ptr msV) bool LoadTrack(std::string strTrack) { + GfOut("Chemin Track : %s\n", strTrack.c_str()); osgLoader loader; loader.AddSearchPath(m_strTexturePath); osg::Node *pTrack = loader.Load3dFile(strTrack); - //osgDB::writeNodeFile(*pTrack,"c:\\users\\gavin\\mytrack.osg"); + //osgDB::writeNodeFile(*pTrack,"mytrack.osg"); if (pTrack) { @@ -199,6 +200,19 @@ bool LoadTrack(std::string strTrack) return true; } +/*void grOSG::SetCamera(osg::Matrixf projMat,osg::Matrixf modelMat) +{ + m_pCamera->setProjectionMatrix(projMat); + m_pCamera->setViewMatrix(modelMat); +} + +void grOSG::SetCamera(osg::Vec3 center,osg::Vec3 eye,osg::Vec3 up,float fov,float aspect,float znear,float zfar) +{ + + m_pCamera->setProjectionMatrixAsPerspective(fov,aspect,znear,zfar); + m_pCamera->setViewMatrixAsLookAt(eye,center,up); +}*/ + int grLoadScene(tTrack *track) { @@ -246,6 +260,7 @@ grLoadScene(tTrack *track) std::string strPath = GetDataDir(); sprintf(buf, "tracks/%s/%s", grTrack->category, grTrack->internalname); + strPath+=buf; //strPath+="tracks/speedway/milky-five"; strPath+="/"; strPath+=acname;