Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 11954 for code


Ignore:
Timestamp:
May 8, 2018, 1:20:49 PM (7 years ago)
Author:
dreherm
Message:

Added Ghostchange

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

Legend:

Unmodified
Added
Removed

  • code/branches/3DPacman_FS18/New Material/meshes/OgreXMLConverter.log

    r11896 r11954  
    1 11:29:05: Creating resource group General
    2 11:29:05: Creating resource group Internal
    3 11:29:05: Creating resource group Autodetect
    4 11:29:05: Registering ResourceManager for type Mesh
    5 11:29:05: Registering ResourceManager for type Material
    6 11:29:05: Registering ResourceManager for type Skeleton
    7 11:29:08: XMLMeshSerializer reading mesh data from PacmanMap.mesh.xml...
    8 11:29:11: Reading geometry...
    9 11:29:15: Geometry done...
    10 11:29:15: Reading submeshes...
    11 11:29:15: Submeshes done.
    12 11:29:15: Reading mesh names...
    13 11:29:15: Mesh names done.
    14 11:29:15: XMLMeshSerializer import successful.
    15 11:29:15: Reorganising vertex buffers to automatic layout..
    16 11:29:16: MeshSerializer writing mesh data to stream ...
    17 11:29:16: File header written.
    18 11:29:16: Writing mesh data...
    19 11:29:16: Writing submesh...
    20 11:29:16: Exporting submesh texture aliases...
    21 11:29:16: Submesh texture aliases exported.
    22 11:29:16: Submesh exported.
    23 11:29:16: Exporting bounds information....
    24 11:29:16: Bounds information exported.
    25 11:29:16: Exporting submesh name table...
    26 11:29:16: Submesh name table exported.
    27 11:29:16: Exporting edge lists...
    28 11:29:16: Edge lists exported
    29 11:29:16: Mesh data exported.
    30 11:29:16: MeshSerializer export successful.
    31 11:29:16: Unregistering ResourceManager for type Skeleton
    32 11:29:16: Unregistering ResourceManager for type Material
    33 11:29:16: Unregistering ResourceManager for type Mesh
     111:54:27: Creating resource group General
     211:54:27: Creating resource group Internal
     311:54:27: Creating resource group Autodetect
     411:54:27: Registering ResourceManager for type Mesh
     511:54:27: Registering ResourceManager for type Material
     611:54:27: Registering ResourceManager for type Skeleton
     711:54:27: XMLMeshSerializer reading mesh data from PacmanPointAfraid.mesh.xml...
     811:54:27: Reading geometry...
     911:54:27: Geometry done...
     1011:54:27: Reading submeshes...
     1111:54:27: Submeshes done.
     1211:54:27: Reading mesh names...
     1311:54:27: Mesh names done.
     1411:54:27: XMLMeshSerializer import successful.
     1511:54:27: Reorganising vertex buffers to automatic layout..
     1611:54:27: MeshSerializer writing mesh data to stream ...
     1711:54:27: File header written.
     1811:54:27: Writing mesh data...
     1911:54:27: Writing submesh...
     2011:54:27: Exporting submesh texture aliases...
     2111:54:27: Submesh texture aliases exported.
     2211:54:27: Submesh exported.
     2311:54:27: Exporting bounds information....
     2411:54:27: Bounds information exported.
     2511:54:27: Exporting submesh name table...
     2611:54:27: Submesh name table exported.
     2711:54:27: Exporting edge lists...
     2811:54:27: Edge lists exported
     2911:54:27: Mesh data exported.
     3011:54:27: MeshSerializer export successful.
     3111:54:27: Unregistering ResourceManager for type Skeleton
     3211:54:27: Unregistering ResourceManager for type Material
     3311:54:27: Unregistering ResourceManager for type Mesh

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

    r11949 r11954  
    6262<PacmanGhost position="0,-20,0" >
    6363    <attached>
    64         <Model position="0,0,0" mesh="PacmanGhostAfraid.mesh" scale="5" />
     64        <Model position="0,0,0" mesh="PacmanAfraidGhost.mesh" scale="5" />
    6565    </attached>
    6666</PacmanGhost>
    … …  
    6868<PacmanGhost position="0,-20,0" >
    6969    <attached>
    70         <Model position="0,0,0" mesh="PacmanGhostAfraid.mesh" scale="5" />
     70        <Model position="0,0,0" mesh="PacmanAfraidGhost.mesh" scale="5" />
    7171    </attached>
    7272</PacmanGhost>
    … …  
    7474<PacmanGhost position="0,-20,0" >
    7575    <attached>
    76         <Model position="0,0,0" mesh="PacmanGhostAfraid.mesh" scale="5" />
     76        <Model position="0,0,0" mesh="PacmanAfraidGhost.mesh" scale="5" />
    7777    </attached>
    7878</PacmanGhost>
    … …  
    8080<PacmanGhost position="0,-20,0" >
    8181    <attached>
    82         <Model position="0,0,0" mesh="PacmanGhostAfraid.mesh" scale="5" />
     82        <Model position="0,0,0" mesh="PacmanAfraidGhost.mesh" scale="5" />
    8383    </attached>
    8484</PacmanGhost>
    … …  
    109109<PacmanPointAfraid position="215,10,195">
    110110    <attached>
    111         <Model position="0,0,0" mesh="PacmanPointAfraid.mesh" scale="5" />
     111        <Model position="0,0,0" mesh="PacmanPointAfraid.mesh" scale="10" />
    112112    </attached>
    113113</PacmanPointAfraid>

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

    r11953 r11954  
    6666        SUPER(Pacman, tick, dt);
    6767
    68         if(!timer){
     68        //orxout() << timer << endl;
     69        //orxout() << afraid << endl;
     70
     71
     72        if(afraid){
    6973            timer = timer - dt;
    7074            if(timer<=0){
    71                 afraid = false;
    72                 this->setNormal();
     75                setNormal();
    7376            }
    7477        }
    … …  
    105108
    106109        for(PacmanPointAfraid* next : ObjectList<PacmanPointAfraid>()){
    107             if(collis(next->getPosition(), currentPosition)){
     110            if(next->taken(currentPosition)){
    108111                setAfraid();
    109112            }
    … …  
    155158
    156159        //Change normal Ghosts with afraid ones
    157         if(afraid){
    158160            ghosts[4]->changewith(ghosts[0]);
    159161            ghosts[5]->changewith(ghosts[1]);
    160162            ghosts[6]->changewith(ghosts[2]);
    161163            ghosts[7]->changewith(ghosts[3]);
    162         }
    163164
    164165        afraid = false;
    … …  
    198199    {
    199200        Deathmatch::start();
     201
     202        int i = 0;
     203        for(PacmanGhost* nextghost : ObjectList<PacmanGhost>()){
     204            if(3<i){
     205                nextghost->setPosition(0,-20,0);
     206                nextghost->dontmove =  true;
     207            };
     208           
     209            i++;
     210        }
    200211    }
    201212

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

    r11939 r11954  
    7474    bool PacmanPointAfraid::taken(Vector3 playerpos)
    7575    {
    76       if((abs(this->resetposition.x - playerpos.x)<0.1) && (abs(this->resetposition.z - playerpos.z)<0.1)){
     76      Vector3 resetposition = this->getPosition(); 
     77     
     78      if((abs(resetposition.x - playerpos.x)<1) && (abs(resetposition.z - playerpos.z)<1)){
    7779        this->setPosition(Vector3(resetposition.x, -50, resetposition.z));
    7880        return true;
Note: See TracChangeset for help on using the changeset viewer.