[Orxonox-commit 5944] r10603 - in code/branches/ParticleEffectsFS15: data data/levels src/external src/modules/weapons/projectiles src/orxonox/worldentities

[landauf at orxonox.net]

Author: landauf
Date: 2015-09-27 22:29:59 +0200 (Sun, 27 Sep 2015)
New Revision: 10603

Modified:
   code/branches/ParticleEffectsFS15/data/DefaultResources.oxr
   code/branches/ParticleEffectsFS15/data/levels/emptyLevel.oxw
   code/branches/ParticleEffectsFS15/src/external/CMakeLists.txt
   code/branches/ParticleEffectsFS15/src/modules/weapons/projectiles/Rocket.cc
   code/branches/ParticleEffectsFS15/src/orxonox/worldentities/CMakeLists.txt
Log:
cleanup: empty level is empty again & tabs->spaces.

Modified: code/branches/ParticleEffectsFS15/data/DefaultResources.oxr
===================================================================
--- code/branches/ParticleEffectsFS15/data/DefaultResources.oxr	2015-09-27 20:15:01 UTC (rev 10602)
+++ code/branches/ParticleEffectsFS15/data/DefaultResources.oxr	2015-09-27 20:29:59 UTC (rev 10603)
@@ -9,5 +9,4 @@
     <ResourceLocation path = "gui/layouts" />
     <ResourceLocation path = "gui/schemes" />
     <ResourceLocation path = "gui/scripts" />
-    
 </ResourceCollection>

Modified: code/branches/ParticleEffectsFS15/data/levels/emptyLevel.oxw
===================================================================
--- code/branches/ParticleEffectsFS15/data/levels/emptyLevel.oxw	2015-09-27 20:15:01 UTC (rev 10602)
+++ code/branches/ParticleEffectsFS15/data/levels/emptyLevel.oxw	2015-09-27 20:29:59 UTC (rev 10603)
@@ -12,7 +12,7 @@
 ?>
 
 <?lua
-  include("templates/spaceshipAssff.oxt")
+  include("templates/spaceshipAssff2.oxt")
   include("templates/spaceshipPirate.oxt")
   include("templates/spaceshipEscort.oxt")
 ?>
@@ -29,16 +29,8 @@
   >
 
     <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/>
-    <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
+    <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipescort />
     
-    
-    
-    <SpaceShip position="0,500,500" lookat="0,0,0" team=1 >
-      <templates>
-        <Template link=spaceshipassff />
-      </templates>
-    </SpaceShip>
-    
   </Scene>
 </Level>
 

Modified: code/branches/ParticleEffectsFS15/src/external/CMakeLists.txt
===================================================================
--- code/branches/ParticleEffectsFS15/src/external/CMakeLists.txt	2015-09-27 20:15:01 UTC (rev 10602)
+++ code/branches/ParticleEffectsFS15/src/external/CMakeLists.txt	2015-09-27 20:29:59 UTC (rev 10603)
@@ -26,7 +26,6 @@
 ADD_SUBDIRECTORY(gmock)
 ADD_SUBDIRECTORY(gtest)
 ADD_SUBDIRECTORY(loki)
-
 IF(CEGUI_OGRE_RENDERER_BUILD_REQUIRED)
   ADD_SUBDIRECTORY(ogreceguirenderer)
 ENDIF()

Modified: code/branches/ParticleEffectsFS15/src/modules/weapons/projectiles/Rocket.cc
===================================================================
--- code/branches/ParticleEffectsFS15/src/modules/weapons/projectiles/Rocket.cc	2015-09-27 20:15:01 UTC (rev 10602)
+++ code/branches/ParticleEffectsFS15/src/modules/weapons/projectiles/Rocket.cc	2015-09-27 20:29:59 UTC (rev 10603)
@@ -85,9 +85,9 @@
             fire->setSource("Orxonox/rocketfire");
             
             // Add Particle Universe Effects
-    		//ParticleUniverse::ParticleSystemManager* pManager = ParticleUniverse::ParticleSystemManager::getSingletonPtr();
-    		//ParticleUniverse::ParticleSystem* pSys1 = pManager->createParticleSystem("pSys1", "bubbles", this->getScene()->getSceneManager());
-    		//this->attachOgreObject(pSys1);
+            //ParticleUniverse::ParticleSystemManager* pManager = ParticleUniverse::ParticleSystemManager::getSingletonPtr();
+            //ParticleUniverse::ParticleSystem* pSys1 = pManager->createParticleSystem("pSys1", "bubbles", this->getScene()->getSceneManager());
+            //this->attachOgreObject(pSys1);
 
             this->enableCollisionCallback();
             this->setCollisionResponse(false);

Modified: code/branches/ParticleEffectsFS15/src/orxonox/worldentities/CMakeLists.txt
===================================================================
--- code/branches/ParticleEffectsFS15/src/orxonox/worldentities/CMakeLists.txt	2015-09-27 20:15:01 UTC (rev 10602)
+++ code/branches/ParticleEffectsFS15/src/orxonox/worldentities/CMakeLists.txt	2015-09-27 20:29:59 UTC (rev 10603)
@@ -11,7 +11,6 @@
   CameraPosition.cc
   SpawnPoint.cc
   TeamSpawnPoint.cc
-  
 )
 
 ADD_SUBDIRECTORY(pawns)