[Opde-commits] SF.net SVN: opde:[1085] trunk/src/services/physics

[<pa...@us...>]

Revision: 1085
          http://opde.svn.sourceforge.net/opde/?rev=1085&view=rev
Author:   patryn
Date:     2009-01-03 22:53:05 +0000 (Sat, 03 Jan 2009)

Log Message:
-----------
Added a couple of lines to verify that ODE includes and links properly unde Windows. Filip could you please check to see if it also builds under Linux?

Modified Paths:
--------------
    trunk/src/services/physics/PhysicsService.cpp
    trunk/src/services/physics/PhysicsService.h

Modified: trunk/src/services/physics/PhysicsService.cpp
===================================================================
--- trunk/src/services/physics/PhysicsService.cpp	2009-01-03 22:48:52 UTC (rev 1084)
+++ trunk/src/services/physics/PhysicsService.cpp	2009-01-03 22:53:05 UTC (rev 1085)
@@ -33,18 +33,30 @@
 	/*----------------------------------------------------*/
 	/*-------------------- Physics Service ---------------*/
 	/*----------------------------------------------------*/
-	PhysicsService::PhysicsService(ServiceManager *manager, const std::string& name) : Service(manager, name) {
+	PhysicsService::PhysicsService(ServiceManager *manager, const std::string& name) : Service(manager, name) 
+	{
 	}
 
 	//------------------------------------------------------
-	bool PhysicsService::init() {
+	bool PhysicsService::init() 
+	{
 		mDbService = GET_SERVICE(DatabaseService);
 
-		return (!mDbService.isNull());
+		if(mDbService.isNull())
+			return false;
+
+		// create world
+		dInitODE2(0);
+		dDarkWorldID = dWorldCreate();
+
+		return true;
 	}
 
 	//------------------------------------------------------
-	PhysicsService::~PhysicsService() {
+	PhysicsService::~PhysicsService() 
+	{
+		dWorldDestroy(dDarkWorldID);
+		dCloseODE();
 	}
 
 	//-------------------------- Factory implementation

Modified: trunk/src/services/physics/PhysicsService.h
===================================================================
--- trunk/src/services/physics/PhysicsService.h	2009-01-03 22:48:52 UTC (rev 1084)
+++ trunk/src/services/physics/PhysicsService.h	2009-01-03 22:53:05 UTC (rev 1085)
@@ -33,6 +33,8 @@
 #include "FileGroup.h"
 #include "SharedPtr.h"
 
+#include "ode/ode.h"
+
 namespace Opde {
 
 	/** @brief Physics service - service defining game states (Temporary code. Will be filled with a high level state management - screens)
@@ -46,6 +48,9 @@
 			bool init();
 
 			DatabaseServicePtr mDbService;
+
+			//Dark World
+			dWorldID dDarkWorldID;
 	};
 
 	/// Shared pointer to Physics service


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.