Revision: 2486
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=2486&view=rev
Author: rorthomas
Date: 2012-04-28 20:00:49 +0000 (Sat, 28 Apr 2012)
Log Message:
-----------
removed old things
removed skia from build system
Modified Paths:
--------------
trunk/CMakeDependenciesConfig.txt
trunk/source/main/RoRPrerequisites.h
trunk/source/main/gameplay/Savegame.cpp
trunk/source/main/physics/Beam.cpp
trunk/source/main/physics/Beam.h
trunk/source/main/physics/BeamFactory.cpp
trunk/source/main/physics/BeamFactory.h
Modified: trunk/CMakeDependenciesConfig.txt
===================================================================
--- trunk/CMakeDependenciesConfig.txt 2012-04-28 19:52:33 UTC (rev 2485)
+++ trunk/CMakeDependenciesConfig.txt 2012-04-28 20:00:49 UTC (rev 2486)
@@ -17,7 +17,6 @@
# set some defaults
IF(WIN32)
- set(ROR_USE_SKIA "FALSE" CACHE BOOL "EXPERIMENTAL: use skia,
the google 2D vector drawing lib")
macro(importLib libName dirName)
message(STATUS "adding imported lib: ${libName} :
${ROR_DEPENDENCIES_DIR}/libs/${ARCH_DIR}/${dirName}/Release/${libName}.lib")
add_library(${libName} STATIC IMPORTED)
@@ -58,11 +57,7 @@
set(ROR_USE_OIS_G27 "FALSE" CACHE BOOL "use OIS With G27 patches")
set(ROR_USE_MOFILEREADER "TRUE" CACHE BOOL "use mofilereader")
- set(ROR_USE_SKIA "FALSE" CACHE BOOL "EXPERIMENTAL: use skia,
the google 2D vector drawing lib")
- #TODO: fix skia paths and finding
-
-
set(ROR_USE_CRASHRPT "FALSE" CACHE BOOL "use crash report tool")
# check if dependencies dir is in here
set(DEPENDENCIES_DIR_CHECK "${RoR_SOURCE_DIR}/dependencies")
@@ -106,13 +101,6 @@
set(CURL_LIBRARIES "libcurl_imp" CACHE STRING "The curl lib to
link against")
importLib(libcurl_imp curl)
endif(ROR_USE_CURL)
-
- if(ROR_USE_SKIA)
- set(SKIA_INCLUDE_DIRS
"${ROR_DEPENDENCIES_DIR}/includes/${ARCH_DIR}/Skia;${ROR_DEPENDENCIES_DIR}/includes/${ARCH_DIR}/Skia/config;${ROR_DEPENDENCIES_DIR}/includes/${ARCH_DIR}/Skia/core;${RoR_SOURCE_DIR}/source/OgreCanvas"
CACHE PATH "The Skia include path to use")
- set(SKIA_LIBRARY_DIRS
"${ROR_DEPENDENCIES_DIR}/libs/${ARCH_DIR}/Skia/Release" CACHE PATH "The Skia
lib path to use")
- set(SKIA_LIBRARIES
"core;animator;gr;effects;views;utils;svg;pdf;images;skgr;ports;xps;opts;xml;experimental;libtess;zlib;usp10;windowscodecs"
CACHE STRING "The skia libs to link against")
- importLib(core Skia)
- endif(ROR_USE_SKIA)
set(PThread_INCLUDE_DIRS
"${ROR_DEPENDENCIES_DIR}/includes/${ARCH_DIR}/pthread" CACHE PATH "The pthread
include path to use")
set(PThread_LIBRARIES
"optimized;${ROR_DEPENDENCIES_DIR}/libs/${ARCH_DIR}/pthread/Release/pthreadVC2.lib"
CACHE STRING "The pthread lib to link against")
Modified: trunk/source/main/RoRPrerequisites.h
===================================================================
--- trunk/source/main/RoRPrerequisites.h 2012-04-28 19:52:33 UTC (rev
2485)
+++ trunk/source/main/RoRPrerequisites.h 2012-04-28 20:00:49 UTC (rev
2486)
@@ -106,8 +106,6 @@
class Axle;
class Beam;
class BeamEngine;
-class BeamWaitAndLock;
-class BeamWaitNoLock;
class BeamThreadStats;
class Buoyance;
class ChatSystem;
Modified: trunk/source/main/gameplay/Savegame.cpp
===================================================================
--- trunk/source/main/gameplay/Savegame.cpp 2012-04-28 19:52:33 UTC (rev
2485)
+++ trunk/source/main/gameplay/Savegame.cpp 2012-04-28 20:00:49 UTC (rev
2486)
@@ -23,7 +23,6 @@
#include "Savegame.h"
#include "BeamFactory.h"
-//#include "BeamWaitAndLock.h"
#include "RoRVersion.h"
#include <Ogre.h>
Modified: trunk/source/main/physics/Beam.cpp
===================================================================
--- trunk/source/main/physics/Beam.cpp 2012-04-28 19:52:33 UTC (rev 2485)
+++ trunk/source/main/physics/Beam.cpp 2012-04-28 20:00:49 UTC (rev 2486)
@@ -26,7 +26,6 @@
#include "BeamEngine.h"
#include "BeamFactory.h"
#include "BeamStats.h"
-//#include "BeamWaitAndLock.h"
#include "buoyance.h"
#include "CmdKeyInertia.h"
#include "collisions.h"
@@ -1905,32 +1904,29 @@
}
//this is called by the threads
-void Beam::threadentry(int id)
+void Beam::threadentryMulti(int id)
{
- if (thread_mode == THREAD_MULTI)
- {
- Beam **trucks=ttrucks;
- int steps=tsteps;
- int numtrucks=tnumtrucks;
- float dt=tdt;
- float dtperstep = dt / (Real)steps;
+ Beam **trucks=ttrucks;
+ int steps=tsteps;
+ int numtrucks=tnumtrucks;
+ float dt=tdt;
+ float dtperstep = dt / (Real)steps;
- for (int i=0; i<steps; i++)
+ for (int i=0; i<steps; i++)
+ {
+ for (int t=0; t<numtrucks; t++)
{
- for (int t=0; t<numtrucks; t++)
- {
- if(!trucks[t]) continue;
+ if(!trucks[t]) continue;
- if (trucks[t]->state!=SLEEPING &&
trucks[t]->state!=NETWORKED && trucks[t]->state!=RECYCLE)
- trucks[t]->calcForcesEuler(i==0,
dtperstep, i, steps);
- }
- truckTruckCollisions(dtperstep);
+ if (trucks[t]->state!=SLEEPING &&
trucks[t]->state!=NETWORKED && trucks[t]->state!=RECYCLE)
+ trucks[t]->calcForcesEuler(i==0, dtperstep, i,
steps);
}
-
- ffforce = affforce / steps;
- ffhydro = affhydro / steps;
- if (free_hydro) ffhydro = ffhydro / free_hydro;
+ truckTruckCollisions(dtperstep);
}
+
+ ffforce = affforce / steps;
+ ffhydro = affhydro / steps;
+ if (free_hydro) ffhydro = ffhydro / free_hydro;
}
//integration loop
@@ -5239,7 +5235,7 @@
pthread_cond_wait(&beam->work_cv, &beam->work_mutex);
MUTEX_UNLOCK(&beam->work_mutex);
//do work
- beam->threadentry(id);
+ beam->threadentryMulti(id);
}
} catch(Ogre::Exception& e)
{
@@ -5248,7 +5244,7 @@
INPUTENGINE.prepareShutdown();
String url =
"http://wiki.rigsofrods.com/index.php?title=Error_"; +
TOSTRING(e.getNumber())+"#"+e.getSource();
- showOgreWebError("An exception has occured!",
e.getFullDescription(), url);
+ showOgreWebError("An exception has occurred!",
e.getFullDescription(), url);
}
pthread_exit(NULL);
return NULL;
Modified: trunk/source/main/physics/Beam.h
===================================================================
--- trunk/source/main/physics/Beam.h 2012-04-28 19:52:33 UTC (rev 2485)
+++ trunk/source/main/physics/Beam.h 2012-04-28 20:00:49 UTC (rev 2486)
@@ -94,7 +94,7 @@
void reset(bool keepPosition = false); //call this one to reset a truck
from any context
void SyncReset(); //this one should be called only synchronously
(without physics running in background)
//this is called by the threads
- void threadentry(int id);
+ void threadentryMulti(int id);
//integration loop
//bool frameStarted(const FrameEvent& evt)
//this will be called once by frame and is responsible for animation of
all the trucks!
Modified: trunk/source/main/physics/BeamFactory.cpp
===================================================================
--- trunk/source/main/physics/BeamFactory.cpp 2012-04-28 19:52:33 UTC (rev
2485)
+++ trunk/source/main/physics/BeamFactory.cpp 2012-04-28 20:00:49 UTC (rev
2486)
@@ -35,7 +35,6 @@
#include "gui_menu.h"
#include "DashBoardManager.h"
#endif // USE_MYGUI
-//#include "BeamWaitAndLock.h"
using namespace Ogre;
@@ -767,7 +766,7 @@
//beamLock->syncBeamThreads();
//do work
- beam->threadentry(id);
+ beam->threadentryMulti(id);
}
} catch(Ogre::Exception& e)
{
Modified: trunk/source/main/physics/BeamFactory.h
===================================================================
--- trunk/source/main/physics/BeamFactory.h 2012-04-28 19:52:33 UTC (rev
2485)
+++ trunk/source/main/physics/BeamFactory.h 2012-04-28 20:00:49 UTC (rev
2486)
@@ -32,8 +32,6 @@
{
friend class Network;
friend class RoRFrameListener;
- friend class BeamWaitAndLock;
- friend class BeamWaitNoLock;
public:
BeamFactory(SceneManager *manager, SceneNode *parent, RenderWindow*
win, Network *net, float *mapsizex, float *mapsizez, Collisions *icollisions,
HeightFinder *mfinder, Water *w, Camera *pcam);
~BeamFactory();
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
Rigsofrods-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/rigsofrods-devel
