Changeset 10603

Timestamp:

Sep 27, 2015, 10:29:59 PM (9 years ago)

Author:

landauf

Message:

cleanup: empty level is empty again & tabs→spaces.

Location:

code/branches/ParticleEffectsFS15

Files:

• data/DefaultResources.oxr (modified) (1 diff)
• data/levels/emptyLevel.oxw (modified) (2 diffs)
• src/external/CMakeLists.txt (modified) (1 diff)
• src/modules/weapons/projectiles/Rocket.cc (modified) (1 diff)
• src/orxonox/worldentities/CMakeLists.txt (modified) (1 diff)

code/branches/ParticleEffectsFS15/data/DefaultResources.oxr

@@ -10 +10 @@
     <ResourceLocation path = "gui/schemes" />
     <ResourceLocation path = "gui/scripts" />
-    
 </ResourceCollection>

code/branches/ParticleEffectsFS15/data/levels/emptyLevel.oxw

@@ -13 +13 @@
 
 <?lua
-  include("templates/spaceshipAssff.oxt")
+  include("templates/spaceshipAssff2.oxt")
   include("templates/spaceshipPirate.oxt")
   include("templates/spaceshipEscort.oxt")
@@ -30 +30 @@
 
     <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 />
-    
-    
-    
-    <SpaceShip position="0,500,500" lookat="0,0,0" team=1 >
-      <templates>
-        <Template link=spaceshipassff />
-      </templates>
-    </SpaceShip>
+    <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipescort />
     
   </Scene>

code/branches/ParticleEffectsFS15/src/external/CMakeLists.txt

@@ -27 +27 @@
 ADD_SUBDIRECTORY(gtest)
 ADD_SUBDIRECTORY(loki)
-
 IF(CEGUI_OGRE_RENDERER_BUILD_REQUIRED)
   ADD_SUBDIRECTORY(ogreceguirenderer)

code/branches/ParticleEffectsFS15/src/modules/weapons/projectiles/Rocket.cc

@@ -86 +86 @@
             
             // 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();

code/branches/ParticleEffectsFS15/src/orxonox/worldentities/CMakeLists.txt

@@ -12 +12 @@
   SpawnPoint.cc
   TeamSpawnPoint.cc
-  
 )