Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 11646 for code/branches


Ignore:
Timestamp:
Dec 11, 2017, 1:02:41 PM (7 years ago)
Author:
remartin
Message:

Fisch

Location:
code/branches/AsteroidMining_HS17
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • code/branches/AsteroidMining_HS17/data/levels/AsteroidFarming.oxw

    r11640 r11646  
    22 name = "AsteroidFarming"
    33 description = "Testing the Asteroid Mining Project, PPS HS 17"
    4  tags = "test"
     4 tags = "test, showcase"
    55 screenshot = "AsteroidFarming.png"
    66/>
     
    1515  include("templates/spaceshipAssff.oxt")
    1616  include("templates/spaceshipPirate.oxt")
    17     include("templates/pickupRepresentationTemplates.oxt")
     17  include("templates/pickupRepresentationTemplates.oxt")
    1818?>
     19
     20<WorldAmbientSound source="Asteroid_rocks.ogg" looping="true" playOnLoad="true" />
    1921
    2022<Level>
     
    2224    <Template link=lodtemplate_default />
    2325  </templates>
     26
    2427  <?lua include("includes/notifications.oxi") ?>
    25 
    2628
    2729  <Scene
    2830    ambientlight = "0.8, 0.8, 0.8"
    2931    skybox       = "Orxonox/Starbox"
     32    hasPhysics = true
    3033  >
    3134
     
    3538
    3639    <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"/>
     40
    3741    <SpawnPoint team=0 position="0,0,0" direction="1,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
    3842   
    39 
    40 
    4143
    4244     <!-- Asteroid Display: -->
     
    104106
    105107
     108
    106109  </Scene>
    107110</Level>
  • code/branches/AsteroidMining_HS17/src/modules/asteroidmining/AsteroidMinable.h

    r11640 r11646  
    4848
    4949        public:
    50             AsteroidMinable(Context* context);// This constructor is for XML access only!
    51             AsteroidMinable(Context* c, float size, Vector3 position, Vector3 velocity, bool dS);// Call this Constructor from other C-files.
     50            AsteroidMinable(Context* context);// @brief This constructor is for XML access only!
     51            AsteroidMinable(Context* c, float size, Vector3 position, Vector3 velocity, bool dS);// @brief Call this Constructor from other C-files.
    5252
    5353            virtual ~AsteroidMinable();
     
    5656            virtual void tick(float dt) override;
    5757
    58             // Overwrite to prevet 'self-collision' of generated stuff
     58            // @brief Overwrite to prevet 'self-collision' of generated stuff
    5959            virtual void hit(Pawn* originator, const Vector3& force, const btCollisionShape* cs, float damage, float healthdamage = 0.0f, float shielddamage = 0.0f);
    6060            virtual void hit(Pawn* originator, btManifoldPoint& contactpoint, const btCollisionShape* cs, float damage, float healthdamage = 0.0f, float shielddamage = 0.0f);
  • code/branches/AsteroidMining_HS17/src/modules/asteroidmining/SpicedAsteroidField.cc

    r11640 r11646  
    9292        this->foggy = true;
    9393        this->fogDensity = 0.5;
     94        this->count = 0;
    9495
    9596        // Old from Pawn
     
    121122            size = round(rnd()*(this->maxSize - this->minSize)) + this->minSize;
    122123            a->setSize(size);
    123 
    124124            pX = round(rnd()*2*this->radius) - radius;
    125125            pY = round(rnd()*2*this->radius) - radius;
     
    201201
    202202        this->create();
     203        // orxout() << "SpicedAsteroidField is done. " << endl;
     204
    203205        this->bAlive_ = false;
    204206        this->destroyLater();
Note: See TracChangeset for help on using the changeset viewer.