Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 12003


Ignore:
Timestamp:
May 24, 2018, 4:22:49 PM (7 years ago)
Author:
dreherm
Message:

Test 2

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

Legend:

Unmodified
Added
Removed

  • code/branches/3DPacman_FS18/data/levels/templates/PacmanGelb.oxt

    r11931 r12003  
    4444    <attached>
    4545      <Model position="0,0,0" yaw=180 pitch=0 roll=0 scale=5 mesh="PacmanGelb.mesh" />
    46 <!--Model mesh="cube.mesh" mass=10 position="0,0,3" scale3D="10,4,8" />
    47 <Model mesh="cube.mesh" mass=10 position="12.6,-2,3" scale3D="2.8,2.8,11" />
    48 <Model mesh="cube.mesh" mass=10 position="-12.6,-2,3" scale3D="2.8,2.8,11" />
    49 <Model mesh="cube.mesh" mass=10 position="0,0,-12" scale3D="4,4,7" /-->
    5046    </attached>
    5147    <collisionShapes>
    52       <BoxCollisionShape position="0    ,0 ,  0" halfExtents="1,1,1" />
     48      <BoxCollisionShape position="0    ,0 ,  0" halfExtents="1,50,1" />
    5349    </collisionShapes>
    5450
    55 <?lua
    56   include("../includes/weaponSettingsEscort.oxi")
    57 ?>
    5851  </PacmanGelb>
    5952</Template>
    … …  
    6255  <PacmanGelb>
    6356    <camerapositions>
    64       <CameraPosition position="0,7, 5" drag=true mouselook=true />
     57      <CameraPosition position="0,7, 10" drag=true mouselook=true />
    6558    </camerapositions>
    6659  </PacmanGelb>
    … …  
    7164   boostfactor    = 1.0
    7265
    73    speedfront     = 60
    74    speedback      = 20
     66   speedfront     = 80
     67   speedback      = 40
    7568   speedleftright =  1
    7669   speedupdown    =  1
    7770
    78    defEngineSndNormal = "sounds/Engine_low.ogg"
    79    defEngineSndBoost = "sounds/Engine_high.ogg"
    80 
    81    accelerationfront     = 500
     71   accelerationfront     = 100
    8272   accelerationbrake     = 5
    83    accelerationback      =  500
     73   accelerationback      =  100
    8474   accelerationleftright =  5
    8575   accelerationupdown    =  5
    8676  >
    87     <EffectContainer condition="idle">
    88       <WorldSound mainstate="activity" source="sounds/Engine_idle.ogg" looping=1 active=false/>
    89        />
    90       <Backlight mainstate=activity active=false scale=0.33 name=bltest position=" 12, -2, 14" colour="0.2, 0.5, 0.65, 1.0" width=150 length=15 lifetime=2 elements=1 trailmaterial="Trail/backlighttrail" turnontime=2 turnofftime=1 material="Flares/ThrusterFlare1" />
    91       <Backlight mainstate=activity active=false scale=0.33 name=bltest position="-12, -2, 14" colour="0.2, 0.5, 0.65, 1.0" width=15 length=15 lifetime=2 elements=1 trailmaterial="Trail/backlighttrail" turnontime=2 turnofftime=1 material="Flares/ThrusterFlare1" />
    92     </EffectContainer>
    93     <EffectContainer condition="not idle">
    94       <FadingBillboard mainstate=activity active=false scale=0.09 position="12, -2, 13" colour="0.2, 1.0, 0.65, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
    95       <FadingBillboard mainstate=activity active=false scale=0.09 position="-12, -2, 13" colour="0.2, 1.0, 0.65, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
    96     </EffectContainer>
    97     <EffectContainer condition="normal or brake">
    98 
    99     </EffectContainer>
    100     <EffectContainer condition="normal or boost">
    101       <Backlight mainstate=activity active=false scale=0.33 name=bltest position=" 12, -2, 14" colour="0.2, 1.0, 0.65, 1.0" width=5 length=1500 lifetime=2 elements=1 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
    102       <Backlight mainstate=activity active=false scale=0.33 name=bltest position="-12, -2, 14" colour="0.2, 1.0, 0.65, 1.0" width=15 length=1500 lifetime=2 elements=1 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
    103     </EffectContainer>
    10477
    10578  </MultiStateEngine>

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

    r11992 r12003  
    121121
    122122            //Check for collision with PointSpheres and PacmanPointAfraid
    123             i = 0;
    124123            for(PacmanPointSphere* nextsphere : ObjectList<PacmanPointSphere>()){
    125                 if(collis(nextsphere->getPosition(), currentPosition))
    126                  takePoint(nextsphere);
     124                 if(nextsphere->taken(currentPosition))
     125                    takePoint(nextsphere);
    127126            }
    128127
    … …  
    208207            return;
    209208        }
    210         //Set PointSphere under map
    211         Vector3 postaken = taken->getPosition();
    212         postaken.y = -50;
    213         taken->setPosition(postaken);
    214209    }
    215210

  • code/branches/3DPacman_FS18/src/modules/pacman/PacmanPointSphere.cc

    r11992 r12003  
    7676    {
    7777        resetposition = this->getPosition();
    78       if((abs(this->resetposition.x - playerpos.x)<5) && (abs(this->resetposition.z - playerpos.z)<5)){
     78      if((abs(this->resetposition.x - playerpos.x)<5) && (abs(this->resetposition.y - playerpos.y)<5) && (abs(this->resetposition.z - playerpos.z)<5)){
    7979        this->setPosition(Vector3(resetposition.x, -50, resetposition.z));
    8080        return true;
    8181      }
    82 
    8382      return false;
    8483    }
Note: See TracChangeset for help on using the changeset viewer.