speed-dreams/speed-dreams-code
6
0
Fork 1
Code Issues 8 Pull requests Projects Releases Packages Wiki Activity Actions

fix ration screen bug with OSG

Browse source 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@5041 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: ae193199463543dac00594b60ca82ea1767b3411
Former-commit-id: 832ff44f5f80395427c06ae6d59c340ee8ad6f43
This commit is contained in:
torcs-ng 2012-11-11 11:55:56 +00:00
parent 33bd58cfd6
commit eb808f5d28
2 changed files with 57 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/modules/graphic/osggraph/OsgMain.cpp
View file

@ -462,7 +462,7 @@ initView(int x, int y, int width, int height, int /* flag */, void *screen)
m_sceneViewer->getCamera()->setName("Cam one");
m_sceneViewer->getCamera()->setViewport(new osg::Viewport(0, 0, grWinw, grWinh));
m_sceneViewer->getCamera()->setGraphicsContext(gw.get());
m_sceneViewer->getCamera()->setProjectionMatrixAsPerspective(67.5, ratio, 1, 12000.0);
m_sceneViewer->getCamera()->setProjectionMatrixAsPerspective(67.5, static_cast<double>(ratio), 1, 12000.0);
m_sceneViewer->realize();

93
src/modules/graphic/osggraph/OsgScene.cpp
View file

@ -164,9 +164,10 @@ OsgInitScene(void)
// create a local light.
osg::Light* myLight2 = new osg::Light;
myLight2->setLightNum(1);
myLight2->setPosition(osg::Vec4(0.0f, 0.0f, 0.0f,1.0f));
myLight2->setAmbient(osg::Vec4(0.0f, 1.0f, 1.0f, 1.0f));
myLight2->setDiffuse(osg::Vec4(0.0f, 1.0f, 1.0f, 1.0f));
myLight2->setPosition(osg::Vec4(900.0f, -3220.0f, 1543.0f,1.0f));
myLight2->setAmbient(osg::Vec4(0.2f, 0.2f, 0.2f, 1.0f));
myLight2->setDiffuse(osg::Vec4(1.0f, 1.0f, 1.0f, 1.0f));
myLight2->setSpecular(osg::Vec4(0.5f, 0.5f, 0.5f, 1.0f));
myLight2->setConstantAttenuation(1.0f);
//myLight2->setLinearAttenuation(2.0f/m_sceneroot);
@ -238,7 +239,6 @@ bool LoadTrack(std::string strTrack)
{
GfOut("Chemin Track : %s\n", strTrack.c_str());
osgLoader loader;
//osg::ref_ptr<osg::Group> m_sceneroot = new osg::Group;
GfOut("Chemin Textures : %s\n", m_strTexturePath.c_str());
loader.AddSearchPath(m_strTexturePath);
osg::Node *pTrack = loader.Load3dFile(strTrack);
@ -284,20 +284,6 @@ bool LoadBackground(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)
{
@ -307,15 +293,10 @@ grLoadScene(tTrack *track)
grTrack = track;
osg::ref_ptr<osg::Group> m_sceneroot = new osg::Group;
setSceneRoot(m_sceneroot);
//ssgEntity *desc;
// Load graphics options.
grLoadGraphicsOptions();
/*if (maxTextureUnits == 0) {
InitMultiTex();
}*/
if(grHandle == NULL)
{
sprintf(buf, "%s%s", GetLocalDir(), GR_PARAM_FILE);
@ -338,7 +319,13 @@ grLoadScene(tTrack *track)
{
GfLogError("No specified track 3D model file\n");
return -1;
}
}
osgDB::FilePathList filePathList = osgDB::Registry::instance()->getDataFilePathList();
//filePathList.push_back(globals->get_fg_root());
std::string PathTmp = GetDataDir();
//filePathList.push_back(path_list[i]);
if (grSkyDomeDistance > 0 && grTrack->skyversion > 0)
{
@ -348,9 +335,24 @@ grLoadScene(tTrack *track)
grBGType = strcmp(GfParmGetStr(grHandle, GR_SCT_GRAPHIC, GR_ATT_BGSKYTYPE, GR_ATT_BGSKY_RING), GR_ATT_BGSKY_LAND) == 0;
if (grBGType)
{
std::string strTPath = GetDataDir();
strTPath+="data/textures";
std::string strTPath = PathTmp;
sprintf(buf, "tracks/%s/%s", grTrack->category, grTrack->internalname);
strTPath+=buf;
//filePathList.push_back(strTPath);
SetTexturePaths(strTPath.c_str());
strTPath = PathTmp;
strTPath+="data/objects";
//filePathList.push_back(strTPath);
SetTexturePaths(strTPath.c_str());
strTPath = PathTmp;
strTPath+="data/textures";
//filePathList.push_back(strTPath);
SetTexturePaths(strTPath.c_str());
//osgDB::Registry::instance()->getDataFilePathList() = filePathList;
//SetTexturePaths(filePathList);
std::string strPath = GetDataDir();
sprintf(buf, "tracks/%s/%s/land.ac", grTrack->category, grTrack->internalname);
@ -359,11 +361,20 @@ grLoadScene(tTrack *track)
}
else
{
std::string strTPath = GetDataDir();
std::string strTPath = PathTmp;
sprintf(buf, "tracks/%s/%s", grTrack->category, grTrack->internalname);
strTPath+=buf;
strTPath+="/";
//filePathList.push_back(strTPath);
SetTexturePaths(strTPath.c_str());
strTPath = PathTmp;
strTPath+="data/objects";
//filePathList.push_back(strTPath);
SetTexturePaths(strTPath.c_str());
//osgDB::Registry::instance()->getDataFilePathList() = filePathList;
//SetTexturePaths(filePathList);
std::string strPath = GetDataDir();
//sprintf(buf, "tracks/%s/%s/background-sky.ac", grTrack->category, grTrack->internalname);
@ -373,21 +384,29 @@ grLoadScene(tTrack *track)
}
}
std::string strTPath = GetDataDir();
std::string strTPath = PathTmp;
//sprintf(buf, "tracks/%s/%s:", grTrack->category, grTrack->internalname);
//strTPath+=buf;
//sprintf(buf, "%sdata/textures", GetDataDir());
std::string strPath = GetDataDir();
sprintf(buf, "tracks/%s/%s", grTrack->category, grTrack->internalname);
strPath+=buf;
strTPath = strPath;
filePathList.push_back(strTPath);
strPath+="/";
strPath+=acname;
strTPath = PathTmp;
//sprintf(buf, "tracks/%s/%s:", grTrack->category, grTrack->internalname);
//strTPath+=buf;
//sprintf(buf, "%sdata/textures", GetDataDir());
strTPath+="data/textures";
SetTexturePaths(strTPath.c_str());
filePathList.push_back(strTPath);
//SetTexturePaths(strTPath.c_str());
//osgDB::Registry::instance()->getDataFilePathList() = filePathList;
//SetTexturePaths(filePathList);
std::string strPath = GetDataDir();
sprintf(buf, "tracks/%s/%s", grTrack->category, grTrack->internalname);
strPath+=buf;
strPath+="/";
strPath+=acname;
//ClearScene();
//osgBackground back;
//GetOSG()->SetBackGround(back.CreateBackground(grTrack));
LoadTrack(strPath);
//GfOut("Track = %d\n", m_sceneroot);