Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 11894


Ignore:
Timestamp:
Apr 20, 2018, 10:18:23 AM (7 years ago)
Author:
dreherm
Message:

Load Backup

Location:
code/branches/3DPacman_FS18
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • code/branches/3DPacman_FS18/data/levels/3DPacman.oxw

    r11862 r11894  
    3131
    3232
    33 <PacmanGhost position="0,20,245">
     33<PacmanGhost position="215,10,220" resetposition="215,10,220">
    3434    <attached>
    3535        <Model position="0,0,0" mesh="PacmanGhostRed.mesh" scale="5" />
    … …  
    3737</PacmanGhost>
    3838
     39<PacmanGhost position="215,10,220" resetposition="215,10,220">
     40    <attached>
     41        <Model position="0,0,0" mesh="PacmanGhostBlue.mesh" scale="5" />
     42    </attached>
     43</PacmanGhost>
     44
     45<PacmanGhost position="215,10,220" resetposition="215,10,220">
     46    <attached>
     47        <Model position="0,0,0" mesh="PacmanGhostOrange.mesh" scale="5" />
     48    </attached>
     49</PacmanGhost>
     50
     51<PacmanGhost position="215,10,220" resetposition="215,10,220">
     52    <attached>
     53        <Model position="0,0,0" mesh="PacmanGhostPink.mesh" scale="5" />
     54    </attached>
     55</PacmanGhost>
     56
     57<PacmanPointSphere position="0,10,0" resetposition="0,10,0">
     58    <attached>
     59        <Model position="0,0,0" mesh="PacmanGhostRed.mesh" scale="5" />
     60    </attached>
     61</PacmanPointSphere>
    3962
    4063<StaticEntity position="0,0,25" direction="0,0,0" collisionType=static mass=100000 friction=0.01 >
    … …  
    4366    </attached>
    4467    <collisionShapes>
    45         <BoxCollisionShape position="0,0,0" halfExtents="250,1,250" />
    46         <BoxCollisionShape position="0,200000,0" halfExtents="250,1,250" />
    4768
    4869        <BoxCollisionShape position="250,10,0" halfExtents="1,15,250" />
    … …  
    6384</StaticEntity>
    6485
    65 
    66 <StaticEntity position="-10,10,-10" direction="0,0,0" collisionType=static mass=100000 friction=0.01 >
    67     <attached>
    68         <Model position="0,0,0" mesh="PacmanGhostBlue.mesh" scale="5" />
    69     </attached>
    70     <collisionShapes>
    71         <BoxCollisionShape position="0,0,0" halfExtents="0.5,0.5,0.5" />
    72     </collisionShapes>
    73 </StaticEntity>
    74 
    75 <StaticEntity position="10,10,-10" direction="0,0,0" collisionType=static mass=100000 friction=0.01 >
    76     <attached>
    77         <Model position="0,0,0" mesh="PacmanGhostOrange.mesh" scale="5" />
    78     </attached>
    79     <collisionShapes>
    80         <BoxCollisionShape position="0,0,0" halfExtents="0.5,0.5,0.5" />
    81     </collisionShapes>
    82 </StaticEntity>
    83 
    84 <StaticEntity position="-10,10,10" direction="0,0,0" collisionType=static mass=100000 friction=0.01 >
    85     <attached>
    86         <Model position="0,0,0" mesh="PacmanGhostPink.mesh" scale="5" />
    87     </attached>
    88     <collisionShapes>
    89         <BoxCollisionShape position="0,0,0" halfExtents="0.5,0.5,0.5" />
    90     </collisionShapes>
    91 </StaticEntity>
    92 
    9386<PortalEndPoint position="-240,10,0" id="1" distance="40" target="Pawn"/>
    9487<PortalEndPoint position="240,10,0" id="2" distance="40" target="Pawn"/>

  • code/branches/3DPacman_FS18/src/modules/Pacman/PacmanGelb.cc

    r11859 r11894  
    4646    void PacmanGelb::tick(float dt)
    4747    {
     48        SUPER(PacmanGelb, tick, dt);
    4849        //bring player back to ground
    4950        actuelposition = this->getPosition();
    50         actuelposition.y = 0;
     51        actuelposition.y = 10;
    5152        this->setPosition(actuelposition);
    52 
    53         // Camera
    54         Camera* camera = this->getCamera();
    55         if (camera != nullptr)
    56         {
    57             actuelorient = camera->getOrientation();
    58             actuelorient.y = 0;
    59             camera->setOrientation(actuelorient);
    60         }
    61 
    62         SUPER(PacmanGelb, tick, dt);
    6353    }
    6454}

  • code/branches/3DPacman_FS18/src/modules/Pacman/PacmanGelb.h

    r11862 r11894  
    5151            virtual void tick(float dt);
    5252
     53            //no rotation
     54            virtual void rotateYaw(const Vector2& value) override{};
     55            virtual void rotateYaw(const Vector2& value) override{};
     56
    5357        private:
    5458            Vector3 actuelposition;
Note: See TracChangeset for help on using the changeset viewer.