Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 12074


Ignore:
Timestamp:
Nov 7, 2018, 10:14:37 AM (5 years ago)
Author:
ottka
Message:

makefile update

Location:
code/branches/OrxoKart_HS18
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • code/branches/OrxoKart_HS18/data/levels/OrxoKart1.oxw

    r12070 r12074  
    11<LevelInfo
    2  name = "Hover 2"
    3  description = "Level for Minigame Hover"
     2 name = "OrxoKart"
     3 description = "Level for Minigame OrxoKart"
    44 tags = "minigame"
    55 screenshot = "emptylevel.png"
     
    1313
    1414<?lua
    15   include("templates/spaceshipPirate.oxt")
     15  --include("templates/spaceshipPirate.oxt")
    1616  include("templates/OrxoKartKart.oxt")
    1717  include("overlays/HoverHUD.oxo")
     
    3232
    3333<Level
    34 plugins = hover
    35 gametype = Hover
     34plugins = orxokart
     35gametype = OrxoKart
    3636>
    3737  <templates>
     
    4949      <attached>
    5050        <!-- Walls and flags (physics and design)-->
    51         <!-- 
     51        <!--
    5252        <HoverOrigin
     53        -->
     54        <OrxoKartOrigin
     55
    5356          numCells="<?lua print(N)?>"
    5457          cellSize="<?lua print(S)?>"
    5558          cellHeight="<?lua print(MAZE_CELL_HEIGHT)?>"
    5659        />
    57         -->
     60       
    5861
    5962        <!-- floor design -->
  • code/branches/OrxoKart_HS18/src/modules/CMakeLists.txt

    r12030 r12074  
    5050ADD_SUBDIRECTORY(flappyorx)
    5151ADD_SUBDIRECTORY(orxyroad)
     52ADD_SUBDIRECTORY(orxokart)
  • code/branches/OrxoKart_HS18/src/modules/orxokart/CMakeLists.txt

    r12057 r12074  
    1 SET_SOURCE_FILES(Hover_SRC_FILES
     1SET_SOURCE_FILES(OrxoKart_SRC_FILES
    22  OrxoKart.cc
    33  OrxoKartKart.cc
     
    77)
    88
    9 ORXONOX_ADD_LIBRARY(hover
     9ORXONOX_ADD_LIBRARY(orxokart
    1010  PLUGIN
    1111  FIND_HEADER_FILES
     
    1414    objects
    1515    overlays
    16   SOURCE_FILES ${Hover_SRC_FILES}
     16  SOURCE_FILES ${OrxoKart_SRC_FILES}
    1717)
  • code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.cc

    r12062 r12074  
    4747
    4848        this->origin_ = nullptr;
    49         this->numberOfFlags_ = 1;
     49        // this->numberOfFlags_ = 1;
    5050        this->firstTick_ = true;
    5151
    52         this->nullptr
     52        this->setHUDTemplate("HoverHUD");
    5353    }
    5454
     
    6565            int cellHeight = this->origin_->getCellHeight();
    6666
    67             MazeGenerator generator(numCells);
    68             generator.generateMaze();
    69             generator.renderMaze();
    70             int levelcodeArray[] = {1,1,1,1,1,1,1,1,0,0,0
     67            int levelcodeArray[] =  {1,1,1,1,1,1,1,1,0,0,0
    7168                                    ,1,0,0,0,0,0,0,1,1,1,0
    7269                                    ,1,0,1,1,1,1,0,0,0,1,1
     
    7976                                    ,0,0,0,0,1,0,0,0,0,0,1
    8077                                    ,0,0,0,0,1,1,1,1,1,1,1};
    81             //int* levelcode = generator.getLevelcode();
    8278            int* levelcode = levelcodeArray;
    8379
     
    106102
    107103        }//firsttick end
    108 
     104            /*
    109105        // Check if ship collided with one of the flags
    110106        for ( unsigned int i = 0; i < flags_.size(); i++ ){
     
    114110            }
    115111        }
    116         numberOfFlags_ = flags_.size();
     112        numberOfFlags_ = flags_.size(); */
    117113       
    118114    }
  • code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.h

    r12062 r12074  
    6060        private:
    6161            WeakPtr<OrxoKartOrigin> origin_;
    62             std::vector<OrxoKartFlag*> flags_;
    63             int numberOfFlags_;
     62            //std::vector<OrxoKartFlag*> flags_;
     63            //int numberOfFlags_;
    6464            bool firstTick_;
    6565    };
  • code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartOrigin.cc

    r12062 r12074  
    5353        XMLPortParam(OrxoKartOrigin, "numCells", setNumCells, getNumCells, xmlelement, mode);
    5454        XMLPortParam(OrxoKartOrigin, "cellSize", setCellSize, getCellSize, xmlelement, mode);
    55         XMLPortParam(OrxoKartOrigin, "mapMatrix", setMapMatrix, getMapMatrix, xmlelement, mode);
     55        XMLPortParam(OrxoKartOrigin, "cellHeight", setCellHeight, getCellHeight, xmlelement, mode);
    5656    }
    5757
  • code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartOrigin.h

    r12062 r12074  
    6161                { return this->cellSize_; }
    6262
    63             inline void setMapMatrix(int mapMatrix)
    64                 { this->mapMatrix_ = mapMatrix; }
    65             inline int getMapMatrix() const
    66                 { return this->mapMatrix_; }
     63            inline void setCellHeight(int cellHeight)
     64                { this->cellHeight_ = cellHeight; }
     65            inline int getCellHeight() const
     66                { return this->cellHeight_; }
    6767
    6868        private:
     
    7171            int numCells_;
    7272            int cellSize_;
    73             int mapMatrix_;
     73            int cellHeight_;
    7474    };
    7575}
  • code/branches/OrxoKart_HS18/src/modules/orxokart/TimeHUD.cc

    r12057 r12074  
    3535#include "core/CoreIncludes.h"
    3636#include "util/Convert.h"
    37 #include "Hover.h"
     37#include "OrxoKart.h"
    3838
    3939namespace orxonox
     
    4747        this->time_ = 0.0f;
    4848        this->running_ = false;
    49         this->hoverGame_ = nullptr;
     49        this->orxokartGame_ = nullptr;
    5050        setRunning(true);
    5151    }
     
    7979            this->time_ += dt;
    8080        }
    81         if (this->hoverGame_)
     81        if (this->orxokartGame_)
    8282        {
    8383            this->setCaption(getTimeString(this->time_));
    84             if (this->hoverGame_->getNumberOfFlags() == 0)
    85                 setRunning(false);
     84            //if (this->orxokartGame_->getNumberOfFlags() == 0)
     85              //  setRunning(false);
    8686        }
    8787       
     
    9494        if (this->getOwner() && this->getOwner()->getGametype())
    9595        {
    96             this->hoverGame_ = orxonox_cast<Hover*>(this->getOwner()->getGametype());
     96            this->orxokartGame_ = orxonox_cast<OrxoKart*>(this->getOwner()->getGametype());
    9797        }
    9898        else
    9999        {
    100             this->hoverGame_ = nullptr;
     100            this->orxokartGame_ = nullptr;
    101101        }
    102102    }
  • code/branches/OrxoKart_HS18/src/modules/orxokart/TimeHUD.h

    r12057 r12074  
    3333#define _TimeHUD_H__
    3434
    35 #include "HoverPrereqs.h"
     35#include "OrxoKartPrereqs.h"
    3636
    3737#include "tools/interfaces/Tickable.h"
     
    4040namespace orxonox
    4141{
    42     class _HoverExport TimeHUD : public OverlayText, public Tickable
     42    class _OrxoKartExport TimeHUD : public OverlayText, public Tickable
    4343    {
    4444        public:
     
    5858
    5959        private:
    60             Hover* hoverGame_;
     60            OrxoKart* orxokartGame_;
    6161            float time_;
    6262            bool running_;
Note: See TracChangeset for help on using the changeset viewer.