Revision: 2484
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=2484&view=rev
Author: rorthomas
Date: 2012-04-28 18:47:43 +0000 (Sat, 28 Apr 2012)
Log Message:
-----------
removed skia again
removed threading tests
Modified Paths:
--------------
trunk/source/main/CMakeLists.txt
trunk/source/main/gameplay/RoRFrameListener.cpp
trunk/source/main/gameplay/RoRFrameListener.h
trunk/source/main/physics/BeamFactory.cpp
Removed Paths:
-------------
trunk/source/main/physics/threading/
Modified: trunk/source/main/CMakeLists.txt
===================================================================
--- trunk/source/main/CMakeLists.txt 2012-04-28 18:17:06 UTC (rev 2483)
+++ trunk/source/main/CMakeLists.txt 2012-04-28 18:47:43 UTC (rev 2484)
@@ -48,14 +48,7 @@
setup_lib(PAGED)
setup_lib(CAELUM)
setup_lib(ANGELSCRIPT)
-
- if(ROR_USE_SKIA)
- setup_lib(SKIA)
- add_definitions("-DOGRE_CANVAS_LIB")
- set(optional_libs ${optional_libs};${SKIA_LIBRARIES};OgreCanvas)
- endif()
-
if(ROR_USE_ANGELSCRIPT)
# CLEAR_FPU_STACK prevents angelscript from breaking our physics engine
add_definitions("-DAS_USE_NAMESPACE")
Modified: trunk/source/main/gameplay/RoRFrameListener.cpp
===================================================================
--- trunk/source/main/gameplay/RoRFrameListener.cpp 2012-04-28 18:17:06 UTC
(rev 2483)
+++ trunk/source/main/gameplay/RoRFrameListener.cpp 2012-04-28 18:47:43 UTC
(rev 2484)
@@ -1264,8 +1264,6 @@
#endif // MYGUI
}
- initGFXDebugging();
-
initialized=true;
}
@@ -5306,11 +5304,6 @@
// update GUI
INPUTENGINE.Capture();
-#ifdef USE_SKIA
- if(mCanvasTextureClock1)
- updateGFXDebugging(dt);
-#endif // USE_SKIA
-
//if(collisions) printf("> ground model used: %s\n",
collisions->last_used_ground_model->name);
// exit frame started method when just displaying the GUI
@@ -5872,77 +5865,3 @@
//camRotX = camRotX_saved;
//camRotY = camRotY_saved;
}
-
-
-
-void RoRFrameListener::updateGFXDebugging(float dt)
-{
-#ifdef USE_SKIA
- rot += dt;
-
- // paint
- Ogre::Canvas::Context* ctx = mCanvasTextureClock1->getContext();
-
- x--;
- if(x<0)
- x = ctx->width();
-
- ctx->save();
- ctx->clearRect(0, 0, 200, 150);
- ctx->strokeStyle(Ogre::ColourValue::Black);
- ctx->fillStyle(Ogre::ColourValue::White);
- ctx->fillRect(0, 0, 200, 150);
- ctx->translate(75, 75);
- ctx->scale(0.4f, 0.4f);
- ctx->rotate(-Ogre::Math::PI/2.0f + rot);
- ctx->lineWidth(8);
- ctx->lineCap(Ogre::Canvas::LineCap_Round);
- // Hour marks
- //ctx->save();
- for (float i=0; i<12; i++)
- {
- ctx->beginPath();
- ctx->rotate(Ogre::Math::PI/6.0f);
- ctx->moveTo(100, 0);
- ctx->lineTo(120, 0);
- ctx->stroke();
- }
- ctx->restore();
-
- ctx->fillText("dt: " + TOSTRING(dt), 10, 10);
-
- const RenderTarget::FrameStats &stats =
Ogre::Root::getSingleton().getAutoCreatedWindow()->getStatistics();
- ctx->fillText("fps: " + TOSTRING(stats.lastFPS), 10, 20);
-
- ctx->lineWidth(2);
- ctx->strokeStyle(Ogre::ColourValue::Black);
- ctx->fillStyle(Ogre::ColourValue::Black);
- ctx->lineCap(Ogre::Canvas::LineCap_Square);
- ctx->beginPath();
- ctx->moveTo(x, ctx->height());
- int h = ctx->height() - (ctx->height() / 120.0f) * (float)stats.lastFPS;
- ctx->lineTo(x, h);
- ctx->stroke();
-
- mCanvasTextureClock1->uploadTexture();
-#endif // USE_SKIA
-}
-
-void RoRFrameListener::initGFXDebugging()
-{
-#ifdef USE_SKIA
- // first, create skia texture
- mCanvasTextureClock1 = new Ogre::Canvas::Texture("CanvasClock1", 600,
150);
- mCanvasTextureClock1->createMaterial();
-
- // the ogre overlay
- Ogre::Overlay* overlay =
Ogre::OverlayManager::getSingleton().create("Canvas/Overlay");
- Ogre::PanelOverlayElement* panel =
static_cast<Ogre::PanelOverlayElement*>(Ogre::OverlayManager::getSingleton().createOverlayElement("Panel",
"CanvasClock1/Panel"));
- panel->setMetricsMode(Ogre::GMM_PIXELS);
- panel->setMaterialName("CanvasClock1");
- panel->setDimensions(600.0f, 150.0f);
- panel->setPosition(0, 0);
- overlay->add2D(panel);
- overlay->show();
-#endif // USE_SKIA
-}
Modified: trunk/source/main/gameplay/RoRFrameListener.h
===================================================================
--- trunk/source/main/gameplay/RoRFrameListener.h 2012-04-28 18:17:06 UTC
(rev 2483)
+++ trunk/source/main/gameplay/RoRFrameListener.h 2012-04-28 18:47:43 UTC
(rev 2484)
@@ -54,10 +54,6 @@
# include "TreeLoader2D.h"
#endif
-#ifdef USE_SKIA
-#include <CanvasTexture.h>
-#endif // USE_SKIA
-
#include "OgreTerrainGroup.h"
@@ -410,12 +406,6 @@
RenderWindow* renderwin;
-#ifdef USE_SKIA
- Ogre::Canvas::Texture *mCanvasTextureClock1;
- float rot;
- int x;
-#endif // USE_SKIA
-
char screenshotformat[256];
bool useCaelumSky;
float farclip;
@@ -426,9 +416,7 @@
std::vector<animated_object_t> animatedObjects;
bool updateAnimatedObjects(float dt);
- void initGFXDebugging();
- void updateGFXDebugging(float dt);
};
-#endif
+#endif // __RoRFrameListener_H__
Modified: trunk/source/main/physics/BeamFactory.cpp
===================================================================
--- trunk/source/main/physics/BeamFactory.cpp 2012-04-28 18:17:06 UTC (rev
2483)
+++ trunk/source/main/physics/BeamFactory.cpp 2012-04-28 18:47:43 UTC (rev
2484)
@@ -29,7 +29,6 @@
#include "collisions.h"
#include "Settings.h"
#include "BeamEngine.h"
-#include "BeamWorker.h"
#ifdef USE_MYGUI
#include "gui_mp.h"
@@ -78,10 +77,6 @@
if (BSETTING("2DReplay", false))
tdr = new TwoDReplay();
-
-
- // TEST for Beamworker
- //BeamWorkerManager::createThread();
}
BeamFactory::~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
[email protected]
https://lists.sourceforge.net/lists/listinfo/rigsofrods-devel
