[Orxonox-commit 7468] r12074 - in code/branches/OrxoKart_HS18: data/levels src/modules src/modules/orxokart
ottka at orxonox.net
ottka at orxonox.net
Wed Nov 7 10:14:37 CET 2018
Author: ottka
Date: 2018-11-07 10:14:37 +0100 (Wed, 07 Nov 2018)
New Revision: 12074
Modified:
code/branches/OrxoKart_HS18/data/levels/OrxoKart1.oxw
code/branches/OrxoKart_HS18/src/modules/CMakeLists.txt
code/branches/OrxoKart_HS18/src/modules/orxokart/CMakeLists.txt
code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.cc
code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.h
code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartOrigin.cc
code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartOrigin.h
code/branches/OrxoKart_HS18/src/modules/orxokart/TimeHUD.cc
code/branches/OrxoKart_HS18/src/modules/orxokart/TimeHUD.h
Log:
makefile update
Modified: code/branches/OrxoKart_HS18/data/levels/OrxoKart1.oxw
===================================================================
--- code/branches/OrxoKart_HS18/data/levels/OrxoKart1.oxw 2018-11-07 09:13:31 UTC (rev 12073)
+++ code/branches/OrxoKart_HS18/data/levels/OrxoKart1.oxw 2018-11-07 09:14:37 UTC (rev 12074)
@@ -1,6 +1,6 @@
<LevelInfo
- name = "Hover 2"
- description = "Level for Minigame Hover"
+ name = "OrxoKart"
+ description = "Level for Minigame OrxoKart"
tags = "minigame"
screenshot = "emptylevel.png"
/>
@@ -12,7 +12,7 @@
?>
<?lua
- include("templates/spaceshipPirate.oxt")
+ --include("templates/spaceshipPirate.oxt")
include("templates/OrxoKartKart.oxt")
include("overlays/HoverHUD.oxo")
?>
@@ -31,8 +31,8 @@
?>
<Level
-plugins = hover
-gametype = Hover
+plugins = orxokart
+gametype = OrxoKart
>
<templates>
<Template link=lodtemplate_default />
@@ -48,13 +48,16 @@
<StaticEntity position="0,0,0" collisionType="static">
<attached>
<!-- Walls and flags (physics and design)-->
- <!--
+ <!--
<HoverOrigin
+ -->
+ <OrxoKartOrigin
+
numCells="<?lua print(N)?>"
cellSize="<?lua print(S)?>"
cellHeight="<?lua print(MAZE_CELL_HEIGHT)?>"
/>
- -->
+
<!-- floor design -->
Modified: code/branches/OrxoKart_HS18/src/modules/CMakeLists.txt
===================================================================
--- code/branches/OrxoKart_HS18/src/modules/CMakeLists.txt 2018-11-07 09:13:31 UTC (rev 12073)
+++ code/branches/OrxoKart_HS18/src/modules/CMakeLists.txt 2018-11-07 09:14:37 UTC (rev 12074)
@@ -49,3 +49,4 @@
ADD_SUBDIRECTORY(asteroids2D)
ADD_SUBDIRECTORY(flappyorx)
ADD_SUBDIRECTORY(orxyroad)
+ADD_SUBDIRECTORY(orxokart)
Modified: code/branches/OrxoKart_HS18/src/modules/orxokart/CMakeLists.txt
===================================================================
--- code/branches/OrxoKart_HS18/src/modules/orxokart/CMakeLists.txt 2018-11-07 09:13:31 UTC (rev 12073)
+++ code/branches/OrxoKart_HS18/src/modules/orxokart/CMakeLists.txt 2018-11-07 09:14:37 UTC (rev 12074)
@@ -1,4 +1,4 @@
-SET_SOURCE_FILES(Hover_SRC_FILES
+SET_SOURCE_FILES(OrxoKart_SRC_FILES
OrxoKart.cc
OrxoKartKart.cc
OrxoKartTile.cc
@@ -6,7 +6,7 @@
TimeHUD.cc
)
-ORXONOX_ADD_LIBRARY(hover
+ORXONOX_ADD_LIBRARY(orxokart
PLUGIN
FIND_HEADER_FILES
LINK_LIBRARIES
@@ -13,5 +13,5 @@
orxonox
objects
overlays
- SOURCE_FILES ${Hover_SRC_FILES}
+ SOURCE_FILES ${OrxoKart_SRC_FILES}
)
Modified: code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.cc
===================================================================
--- code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.cc 2018-11-07 09:13:31 UTC (rev 12073)
+++ code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.cc 2018-11-07 09:14:37 UTC (rev 12074)
@@ -46,10 +46,10 @@
RegisterObject(OrxoKart);
this->origin_ = nullptr;
- this->numberOfFlags_ = 1;
+ // this->numberOfFlags_ = 1;
this->firstTick_ = true;
- this->nullptr
+ this->setHUDTemplate("HoverHUD");
}
void OrxoKart::tick(float dt)
@@ -64,10 +64,7 @@
int cellSize = this->origin_->getCellSize();
int cellHeight = this->origin_->getCellHeight();
- MazeGenerator generator(numCells);
- generator.generateMaze();
- generator.renderMaze();
- int levelcodeArray[] = {1,1,1,1,1,1,1,1,0,0,0
+ int levelcodeArray[] = {1,1,1,1,1,1,1,1,0,0,0
,1,0,0,0,0,0,0,1,1,1,0
,1,0,1,1,1,1,0,0,0,1,1
,1,1,1,0,0,1,1,0,0,0,1
@@ -78,7 +75,6 @@
,1,1,1,1,1,0,0,0,1,1,1
,0,0,0,0,1,0,0,0,0,0,1
,0,0,0,0,1,1,1,1,1,1,1};
- //int* levelcode = generator.getLevelcode();
int* levelcode = levelcodeArray;
//Outer Walls
@@ -105,7 +101,7 @@
}//firsttick end
-
+ /*
// Check if ship collided with one of the flags
for ( unsigned int i = 0; i < flags_.size(); i++ ){
if(flags_[i]->getCollided()){
@@ -113,7 +109,7 @@
flags_.erase (flags_.begin()+i);
}
}
- numberOfFlags_ = flags_.size();
+ numberOfFlags_ = flags_.size(); */
}
}
Modified: code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.h
===================================================================
--- code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.h 2018-11-07 09:13:31 UTC (rev 12073)
+++ code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.h 2018-11-07 09:14:37 UTC (rev 12074)
@@ -59,8 +59,8 @@
private:
WeakPtr<OrxoKartOrigin> origin_;
- std::vector<OrxoKartFlag*> flags_;
- int numberOfFlags_;
+ //std::vector<OrxoKartFlag*> flags_;
+ //int numberOfFlags_;
bool firstTick_;
};
}
Modified: code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartOrigin.cc
===================================================================
--- code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartOrigin.cc 2018-11-07 09:13:31 UTC (rev 12073)
+++ code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartOrigin.cc 2018-11-07 09:14:37 UTC (rev 12074)
@@ -52,7 +52,7 @@
XMLPortParam(OrxoKartOrigin, "numCells", setNumCells, getNumCells, xmlelement, mode);
XMLPortParam(OrxoKartOrigin, "cellSize", setCellSize, getCellSize, xmlelement, mode);
- XMLPortParam(OrxoKartOrigin, "mapMatrix", setMapMatrix, getMapMatrix, xmlelement, mode);
+ XMLPortParam(OrxoKartOrigin, "cellHeight", setCellHeight, getCellHeight, xmlelement, mode);
}
void OrxoKartOrigin::checkGametype()
Modified: code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartOrigin.h
===================================================================
--- code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartOrigin.h 2018-11-07 09:13:31 UTC (rev 12073)
+++ code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartOrigin.h 2018-11-07 09:14:37 UTC (rev 12074)
@@ -60,10 +60,10 @@
inline int getCellSize() const
{ return this->cellSize_; }
- inline void setMapMatrix(int mapMatrix)
- { this->mapMatrix_ = mapMatrix; }
- inline int getMapMatrix() const
- { return this->mapMatrix_; }
+ inline void setCellHeight(int cellHeight)
+ { this->cellHeight_ = cellHeight; }
+ inline int getCellHeight() const
+ { return this->cellHeight_; }
private:
void checkGametype();
@@ -70,7 +70,7 @@
int numCells_;
int cellSize_;
- int mapMatrix_;
+ int cellHeight_;
};
}
Modified: code/branches/OrxoKart_HS18/src/modules/orxokart/TimeHUD.cc
===================================================================
--- code/branches/OrxoKart_HS18/src/modules/orxokart/TimeHUD.cc 2018-11-07 09:13:31 UTC (rev 12073)
+++ code/branches/OrxoKart_HS18/src/modules/orxokart/TimeHUD.cc 2018-11-07 09:14:37 UTC (rev 12074)
@@ -34,7 +34,7 @@
#include "core/CoreIncludes.h"
#include "util/Convert.h"
-#include "Hover.h"
+#include "OrxoKart.h"
namespace orxonox
{
@@ -46,7 +46,7 @@
this->time_ = 0.0f;
this->running_ = false;
- this->hoverGame_ = nullptr;
+ this->orxokartGame_ = nullptr;
setRunning(true);
}
@@ -78,11 +78,11 @@
if(this->running_) {
this->time_ += dt;
}
- if (this->hoverGame_)
+ if (this->orxokartGame_)
{
this->setCaption(getTimeString(this->time_));
- if (this->hoverGame_->getNumberOfFlags() == 0)
- setRunning(false);
+ //if (this->orxokartGame_->getNumberOfFlags() == 0)
+ // setRunning(false);
}
}
@@ -93,11 +93,11 @@
if (this->getOwner() && this->getOwner()->getGametype())
{
- this->hoverGame_ = orxonox_cast<Hover*>(this->getOwner()->getGametype());
+ this->orxokartGame_ = orxonox_cast<OrxoKart*>(this->getOwner()->getGametype());
}
else
{
- this->hoverGame_ = nullptr;
+ this->orxokartGame_ = nullptr;
}
}
Modified: code/branches/OrxoKart_HS18/src/modules/orxokart/TimeHUD.h
===================================================================
--- code/branches/OrxoKart_HS18/src/modules/orxokart/TimeHUD.h 2018-11-07 09:13:31 UTC (rev 12073)
+++ code/branches/OrxoKart_HS18/src/modules/orxokart/TimeHUD.h 2018-11-07 09:14:37 UTC (rev 12074)
@@ -32,7 +32,7 @@
#ifndef _TimeHUD_H__
#define _TimeHUD_H__
-#include "HoverPrereqs.h"
+#include "OrxoKartPrereqs.h"
#include "tools/interfaces/Tickable.h"
#include "overlays/OverlayText.h"
@@ -39,7 +39,7 @@
namespace orxonox
{
- class _HoverExport TimeHUD : public OverlayText, public Tickable
+ class _OrxoKartExport TimeHUD : public OverlayText, public Tickable
{
public:
TimeHUD(Context* context);
@@ -57,7 +57,7 @@
void reset();
private:
- Hover* hoverGame_;
+ OrxoKart* orxokartGame_;
float time_;
bool running_;
};
More information about the Orxonox-commit
mailing list