Revision: 2703
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=2703&view=rev
Author: rorthomas
Date: 2012-05-26 11:45:42 +0000 (Sat, 26 May 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/source/main/gameplay/Road.cpp
trunk/source/main/gfx/DustManager.cpp
trunk/source/main/gfx/DustPool.cpp
trunk/source/main/gfx/DustPool.h
Modified: trunk/source/main/gameplay/Road.cpp
===================================================================
--- trunk/source/main/gameplay/Road.cpp 2012-05-26 11:41:48 UTC (rev 2702)
+++ trunk/source/main/gameplay/Road.cpp 2012-05-26 11:45:42 UTC (rev 2703)
@@ -24,7 +24,7 @@
using namespace Ogre;
Road::Road(Vector3 start) :
- , cur_rtype(0)
+ cur_rtype(0)
, free_rtype(0)
, lastpturn(0)
, ppitch(0)
Modified: trunk/source/main/gfx/DustManager.cpp
===================================================================
--- trunk/source/main/gfx/DustManager.cpp 2012-05-26 11:41:48 UTC (rev
2702)
+++ trunk/source/main/gfx/DustManager.cpp 2012-05-26 11:45:42 UTC (rev
2703)
@@ -38,12 +38,12 @@
if (mEnabled)
{
- dustpools["dust"] = new DustPool((char *)"tracks/Dust", 20 );
- dustpools["clump"] = new DustPool((char *)"tracks/Clump", 20 );
- dustpools["sparks"] = new DustPool((char *)"tracks/Sparks", 10
);
- dustpools["drip"] = new DustPool((char *)"tracks/Drip", 50 );
- dustpools["splash"] = new DustPool((char *)"tracks/Splash", 20
);
- dustpools["ripple"] = new DustPool((char *)"tracks/Ripple", 20
);
+ dustpools["dust"] = new DustPool("tracks/Dust", 20 );
+ dustpools["clump"] = new DustPool("tracks/Clump", 20 );
+ dustpools["sparks"] = new DustPool("tracks/Sparks", 10 );
+ dustpools["drip"] = new DustPool("tracks/Drip", 50 );
+ dustpools["splash"] = new DustPool("tracks/Splash", 20 );
+ dustpools["ripple"] = new DustPool("tracks/Ripple", 20 );
}
}
Modified: trunk/source/main/gfx/DustPool.cpp
===================================================================
--- trunk/source/main/gfx/DustPool.cpp 2012-05-26 11:41:48 UTC (rev 2702)
+++ trunk/source/main/gfx/DustPool.cpp 2012-05-26 11:45:42 UTC (rev 2703)
@@ -21,7 +21,7 @@
#include "IWater.h"
#include "RoRPrerequisites.h"
-DustPool::DustPool(char* dname, int dsize, SceneNode *parent)
+DustPool::DustPool(const char* dname, int dsize)
{
size=dsize;
allocated=0;
@@ -30,8 +30,8 @@
{
char dename[256];
sprintf(dename,"Dust %s %i", dname, i);
- sns[i]=parent->createChildSceneNode();
- pss[i]=smgr->createParticleSystem(dename, dname);
+
sns[i]=gEnv->ogreSceneManager->getRootSceneNode()->createChildSceneNode();
+ pss[i]=gEnv->ogreSceneManager->createParticleSystem(dename,
dname);
if (pss[i])
{
sns[i]->attachObject(pss[i]);
Modified: trunk/source/main/gfx/DustPool.h
===================================================================
--- trunk/source/main/gfx/DustPool.h 2012-05-26 11:41:48 UTC (rev 2702)
+++ trunk/source/main/gfx/DustPool.h 2012-05-26 11:45:42 UTC (rev 2703)
@@ -55,7 +55,7 @@
float rates[MAX_DUSTS];
public:
- DustPool(char* dname, int dsize, SceneNode *parent);
+ DustPool(const char* dname, int dsize);
void setVisible(bool s);
//Dust
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Rigsofrods-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/rigsofrods-devel
