Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 11392


Ignore:
Timestamp:
Apr 6, 2017, 3:32:35 PM (3 years ago)
Author:
jkindle
Message:

Lululululululululu

Location:
code/branches/SuperOrxoBros_FS17
Files:
2 added
8 edited

Legend:

Unmodified
Added
Removed
  • code/branches/SuperOrxoBros_FS17/data/levels/SOB.oxw

    r11383 r11392  
    44 tags = "minigame"
    55 screenshot = "jump.png"
    6 />
     6 />
    77
    8 <?lua
    9   include("HUDTemplates3.oxo") 
    10   include("jumpHUD.oxo")
    11   include("stats.oxo")
    12   include("templates/lodInformation.oxt")
    13 ?>
     8 <?lua
     9 include("HUDTemplates3.oxo") 
     10 include("jumpHUD.oxo")
     11 include("stats.oxo")
     12 include("templates/lodInformation.oxt")
     13 ?>
    1414
    15 <Template name=sobfigurecameras defaults=0>
     15 <Template name=sobfigurecameras defaults=0>
    1616  <SOBFigure>
    1717    <camerapositions>
    18       <CameraPosition position="0,-150,0" absolute=true mouselook=false drag=false lookat="0,0,0"/>
     18      <CameraPosition position="0,-150,30" absolute=true mouselook=false drag=false direction="0,1,0"/>
    1919    </camerapositions>
    2020  </SOBFigure>
     
    2525
    2626<Template name=sobFigureTemplate>
    27   <SOBFigure camerapositiontemplate=sobfigurecameras collisionType="dynamic">
     27  <SOBFigure camerapositiontemplate=sobfigurecameras collisionType="dynamic" position="0,0,30">
    2828    <attached>
    29       <Model position="0,0,0" mesh="JumpFigure.mesh" scale=1 pitch=90/>
     29      <Model  mesh="Orxo.mesh" scale=2.5 pitch=0 roll=90 yaw=90/>
    3030    </attached>
    3131
    32        <collisionShapes>
    33 <!--         <BoxCollisionShape position="0,0,0" halfExtents="3,3,3" />
    34  -->        <SphereCollisionShape   yaw="20" pitch="20" roll="20" position="0,0,0" radius="10" /> 
    35       </collisionShapes>
     32    <collisionShapes>
     33    <BoxCollisionShape position="-2,0,2" halfExtents="3,1,10" />
     34<!--      <SphereCollisionShape yaw="20" pitch="20" roll="20"  radius="10" position="0,0,10" />   -->
     35   </collisionShapes>
    3636
    37    
    38   </SOBFigure>
     37
     38 </SOBFigure>
    3939</Template>
    4040
     
    4242 plugins = "superorxobros"
    4343 gametype = "SOB"
    44 >-
     44 >-
    4545
    4646
    47   <templates>
    48     <Template link=lodtemplate_default />
    49   </templates>
    50   <?lua include("includes/notifications.oxi") ?>
     47 <templates>
     48  <Template link=lodtemplate_default />
     49</templates>
     50<?lua include("includes/notifications.oxi") ?>
    5151
    52   <WorldAmbientSound source="Ganymede.ogg" looping="true" playOnLoad="true"/>
    53  
    54 
    55   <Scene ambientlight="1.0, 1.0, 1.0" skybox="Orxonox/skyBoxBasic">
    56     <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" />
    57 
    58     <SpawnPoint position="991.729, -110.11, 435.404" orientation="0.534038, 0.563456, 0.212168, 0.593553" />
    59 
    60     <MovableEntity>
    61       <attached>
    62         <SOBCenterpoint
    63           name=jumpcenter
    64  
    65           cameraOffset="10"
    66 
    67          
    68           figureTemplate=sobFigureTemplate
    69          
    70           >
    71 
    72           <attached>
     52<WorldAmbientSound source="Ganymede.ogg" looping="true" playOnLoad="true"/>
    7353
    7454
    75    
    76 
    77           </attached>
    78         </SOBCenterpoint>
    79       </attached>
    80     </MovableEntity>
    81 
    82     <StaticEntity position="0,-1,-10" collisionType="static">
    83       <attached>
    84          <Model  mesh="cube.mesh" scale3D="110,76,1" />
    85       </attached>
    86 
    87       <collisionShapes>
    88         <BoxCollisionShape position="0,0,0" halfExtents="110,76,1" />
    89       </collisionShapes>
    90     </StaticEntity>
    91 
    92      
     55<Scene ambientlight="1.0, 1.0, 1.0" skybox="Orxonox/skyBoxBasic">
     56  <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" />
     57  <SpawnPoint position="991.729, -110.11, 435.404" orientation="0.534038, 0.563456, 0.212168, 0.593553" />
    9358
    9459
    95   </Scene>
     60
     61
     62
     63
     64
     65  <MovableEntity>
     66    <attached>
     67      <SOBCenterpoint name=jumpcenter cameraOffset="10" figureTemplate=sobFigureTemplate>
     68        <attached> 
     69        </attached>
     70      </SOBCenterpoint>
     71
     72    </attached>
     73  </MovableEntity>
     74
     75
     76
     77
     78
     79<?lua
     80      for i = 0, 100, 1
     81      do
     82      j = math.random()
     83    ?>
     84
     85     <SOBItem position="<?lua print(i*10) ?>,0,-20" collisionType="static">
     86    <attached>
     87      <Model  mesh="MarioCube.mesh" scale="10" />
     88   </attached>
     89
     90</SOBItem>
     91
     92    <?lua
     93      end
     94    ?>
     95
     96<StaticEntity collisionType="static">
     97    <collisionShapes>
     98    <BoxCollisionShape position="500,0,-20" halfExtents="500,5,5" />
     99  </collisionShapes>
     100</StaticEntity>
     101
     102
     103</Scene>
    96104</Level>
  • code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/CMakeLists.txt

    r11378 r11392  
    44  SOB.cc
    55  SOBFigure.cc
     6  SOBItem.cc
    67 
    78
  • code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/Orxo.h

    r11370 r11392  
    4949            virtual void tick(float dt) override;
    5050
     51
    5152            // overwrite for 2d movement
    5253            virtual void moveFrontBack(const Vector2& value) override;
     
    5758
    5859            //no rotation!
    59             virtual void rotateYaw(const Vector2& value) override{}; 
     60            virtual void rotateYaw(const Vector2& value) override{};
    6061            virtual void rotatePitch(const Vector2& value) override{};
    6162            //return to main menu if game has ended.
  • code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOB.cc

    r11383 r11392  
    5050namespace orxonox
    5151{
    52  
     52
    5353    RegisterUnloadableClass(SOB);
    5454
     
    8989            {
    9090                figure_ = new SOBFigure(center_->getContext());
    91                 figure_->addTemplate(center_->getFigureTemplate()); 
     91                figure_->addTemplate(center_->getFigureTemplate());
    9292               // figure_->InitializeAnimation(center_->getContext()); //@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
    9393            }
    9494
    95             center_->attach(figure_);   
     95            center_->attach(figure_);
    9696            figure_->setPosition(0, 0, 0);
    9797        }
     
    111111        }
    112112
    113        // totalScreenShift_ = 0.0;
    114        // screenShiftSinceLastUpdate_ = 0.0;
    115         //sectionNumber_ = 0;
    116         //adventureNumber_ = 0;
    117 
    118         //addStartSection();
    119        // addSection();
    120        // addSection();
    121113    }
    122114
     
    125117        cleanup();
    126118        GSLevel::startMainMenu();
    127  
     119
    128120        Deathmatch::end();
    129121    }
     
    153145
    154146
    155    
    156  
     147
     148
    157149}
  • code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBCenterpoint.h

    r11381 r11392  
    4848           
    4949            void setFigureTemplate(const std::string& newTemplate)
    50                 { this->figureTemplate_ = newTemplate; }
     50                { this->figureTemplate_ = newTemplate;
     51                }
    5152            const std::string& getFigureTemplate() const
    5253                { return this->figureTemplate_; }
     
    5758            float getCameraOffset() const
    5859                { return cameraOffset_; }
     60
     61
    5962        private:
    6063            void checkGametype();
  • code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBFigure.cc

    r11383 r11392  
    3939#include "graphics/Camera.h"
    4040
    41 
    4241namespace orxonox
    4342{
     
    5857        lastSpeed_z = 0.0;
    5958
    60         gravityAcceleration_ = 250.0;//8.0
     59        gravityAcceleration_ = 250.0;
     60        pitch_ = 0.0;
    6161
    6262        dead_ = false;
     
    9999        if (firePressed_ && std::abs(velocity.z) < 0.07 && std::abs(lastSpeed_z) < 0.07) {
    100100            velocity.z = 150;
    101         }
     101        }
     102
     103      // rotate(1,getOrientation()* WorldEntity::FRONT)
    102104
    103105        //Left-right movement with acceleration
     
    105107            if (std::abs(velocity.x) < maxvelocity_x) {
    106108                velocity.x += speedAddedPerTick;
     109                // if (pitch_ > 0.0) {
     110                //     pitch -= turn_fac*dt);
     111                // }
    107112            }
    108113        } else if (moveLeftPressed_) {
     
    112117        } else {
    113118            velocity.x /= 1.1;
    114         } 
    115        
     119        }
     120
    116121
    117122        velocity.z -= gravityAcceleration_*dt;
     
    134139
    135140
     141
    136142    }
    137143
     
    149155
    150156}
    151 
    152 
    153 
    154 
    155 
    156    /* void SOBFigure::CollisionWithEnemy(SOBEnemy* enemy)
    157     {
    158         if (rocketActive_ == nullptr && propellerActive_ == nullptr && shieldActive_ == nullptr)
    159         {
    160             dead_ = true;
    161         }
    162     }*/
    163157
    164158
  • code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBFigure.h

    r11383 r11392  
    4848            virtual void boost(bool boost) override;
    4949           
     50       
    5051            //virtual void CollisionWithEnemy(SOBEnemy* enemy);
    5152           
     
    6667            float timeSinceLastFire_;
    6768            float lastSpeed_z;
     69            SOBCenterpoint* sobcenterpoint;
     70            float pitch_;
    6871
    6972           
  • code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBPrereqs.h

    r11379 r11392  
    7777    class SOB;
    7878    class SOBFigure;
     79    class SOBItem;
    7980    /*
    8081    class PongScore;*/
Note: See TracChangeset for help on using the changeset viewer.