iceflower/speed-dreams-code
1
0
Fork 0
forked from speed-dreams/speed-dreams-code
Code Pull requests Activity

update OsgGraph (search for pb textures on second race)

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

Former-commit-id: 4468872aa1c10940fccc82ed3c9e62398e0dc83d
Former-commit-id: e09e3c552a35ff9388186e63167ac0ff8573b30d
This commit is contained in:
torcs-ng 2013-05-12 23:26:46 +00:00
parent 74387c320c
commit c9e926d892
4 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/modules/graphic/osggraph/OsgBackground.cpp
View file

@ -54,7 +54,7 @@ osg::Node *SDBackground::build(bool type, int grWrldX, int grWrldY, int grWrldZ,
if (!land)
{
osg::Node *m_background = osgDB::readNodeFile("background-sky.ac");
osg::ref_ptr<osg::Node> m_background = osgDB::readNodeFile("background-sky.ac");
//_background_transform->setMatrix(mat);
osg::Matrix t = osg::Matrix::translate(grWrldX /2, grWrldY /2, grWrldZ /2);
mat = mat * t;
@ -63,7 +63,7 @@ osg::Node *SDBackground::build(bool type, int grWrldX, int grWrldY, int grWrldZ,
}
else
{
osg::Node *m_background = osgDB::readNodeFile("land.ac");
osg::ref_ptr<osg::Node> m_background = osgDB::readNodeFile("land.ac");
_background_transform->setMatrix(mat);
_background_transform->addChild( m_background );
}

8
src/modules/graphic/osggraph/OsgCar.cpp
View file

@ -249,18 +249,18 @@ SDCar::loadCar(tCarElt *car)
strPath+=buf;
GfOut("Chemin Textures : %s\n", strTPath.c_str());
osg::Node * pCar = loader.Load3dFile(strPath, true);
osg::ref_ptr<osg::Node> pCar = loader.Load3dFile(strPath, true);
osg::ref_ptr<osg::MatrixTransform> transform1 = new osg::MatrixTransform;
transform1->addChild(pCar);
SDCarShader::initiateShaderProgram();
this->shader = new SDCarShader(pCar);
this->shader = new SDCarShader(pCar.get());
GfOut("loaded car %d",pCar);
this->car_branch = transform1;
GfOut("loaded car %d",pCar.get());
this->car_branch = transform1.get();
this->car_branch->addChild(wheels.initWheels(car,handle));

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

@ -503,6 +503,7 @@ SDScreens::~SDScreens()
{
root->removeChildren(0, root->getNumChildren());
root = NULL;
for (unsigned i=0;i< Screens.size();i++)
{
delete Screens[i];
@ -512,4 +513,5 @@ SDScreens::~SDScreens()
//delete viewer->getSceneData();
delete viewer;
viewer = NULL;
}

2
src/modules/graphic/osggraph/OsgScreens.h
View file

@ -36,7 +36,7 @@
class SDScreens
{
protected:
osgViewer::Viewer *viewer;
osgViewer::Viewer* viewer;
std::vector<SDView *> Screens;
osg::ref_ptr<osg::Group> root;