[Orxonox-commit 7495] r12101 - in code/branches/WorldMap_HS18: data/gui/layouts data/gui/scripts data/levels data/levels/templates src/modules/towerdefense src/orxonox/controllers
linggj at orxonox.net
linggj at orxonox.net
Wed Nov 14 10:01:05 CET 2018
Author: linggj
Date: 2018-11-14 10:01:05 +0100 (Wed, 14 Nov 2018)
New Revision: 12101
Modified:
code/branches/WorldMap_HS18/data/gui/layouts/CampaignMenu.layout
code/branches/WorldMap_HS18/data/gui/scripts/CampaignMenu.lua
code/branches/WorldMap_HS18/data/levels/NC_StoryModeLevel.oxw
code/branches/WorldMap_HS18/data/levels/StoryModeMap.oxw
code/branches/WorldMap_HS18/data/levels/StoryModeMapDev.oxw
code/branches/WorldMap_HS18/data/levels/templates/StoryMode.oxt
code/branches/WorldMap_HS18/src/modules/towerdefense/TowerDefense.cc
code/branches/WorldMap_HS18/src/modules/towerdefense/TowerDefenseSelecter.cc
code/branches/WorldMap_HS18/src/orxonox/controllers/StoryModeController.cc
code/branches/WorldMap_HS18/src/orxonox/controllers/StoryModeController.h
Log:
12
Modified: code/branches/WorldMap_HS18/data/gui/layouts/CampaignMenu.layout
===================================================================
--- code/branches/WorldMap_HS18/data/gui/layouts/CampaignMenu.layout 2018-11-14 08:29:00 UTC (rev 12100)
+++ code/branches/WorldMap_HS18/data/gui/layouts/CampaignMenu.layout 2018-11-14 09:01:05 UTC (rev 12101)
@@ -6,8 +6,21 @@
<Property name="MaxSize" value="{{1,0},{1,0}}" />
<Property name="Area" value="{{0,0},{0,0},{1.0,0},{1.0,0}}" />
<Property name="BackgroundEnabled" value="False" />
-
+
+ <Window name="ForwardText" type="MenuWidgets/Button">
+ <Property name="Text" value="Forward" />
+ <Property name="Visible" value="True" />
+ <Property name="Area" value="{{0.1,0},{0.6,0},{0.3,0},{0.65,0}}" />
+ <Event function="CampaignMenu.forwardButton_clicked" name="Clicked" />
+ </Window>
+ <Window name="ForwardButton" type="MenuWidgets/JuuButton">
+ <Property name="Visible" value="True" />
+ <Property name="MaxSize" value="{{1,0},{1,0}}" />
+ <Property name="Area" value="{{0.1,0},{0.75,0},{0.25,0},{0.95,0}}" />
+ <Event function="CampaignMenu.forwardButton_clicked" name="Clicked" />
+ </Window>
+
<Window name="Mission1Text" type="MenuWidgets/Button">
<Property name="Text" value="Mission One" />
<Property name="Visible" value="False" />
@@ -14,6 +27,7 @@
<Property name="Area" value="{{0.1,0},{0.6,0},{0.3,0},{0.65,0}}" />
<Event function="CampaignMenu.Mission1Button_clicked" name="Clicked" />
</Window>
+
<Window name="Mission1Button" type="MenuWidgets/JuuButton">
<Property name="Visible" value="False" />
<Property name="MaxSize" value="{{1,0},{1,0}}" />
@@ -28,6 +42,7 @@
<Property name="Disabled" value="True" />
<Event function="CampaignMenu.Mission2Button_clicked" name="Clicked" />
</Window>
+
<Window name="Mission2Button" type="MenuWidgets/JuuButton">
<Property name="Visible" value="True" />
<Property name="MaxSize" value="{{1,0},{1,0}}" />
@@ -148,6 +163,8 @@
<Property name="Area" value="{{0.75,0},{0.9,0},{0.95,0},{0.95,0}}" />
<Event function="CampaignMenu.CampaignMenuBackButton_clicked" name="Clicked" />
</Window>
+
+
<Window name="CampaignMenuCongratulation" type="MenuWidgets/StaticText">
<Property name="Text" value="Campaign Completed!!!" />
<Property name="Visible" value="False" />
Modified: code/branches/WorldMap_HS18/data/gui/scripts/CampaignMenu.lua
===================================================================
--- code/branches/WorldMap_HS18/data/gui/scripts/CampaignMenu.lua 2018-11-14 08:29:00 UTC (rev 12100)
+++ code/branches/WorldMap_HS18/data/gui/scripts/CampaignMenu.lua 2018-11-14 09:01:05 UTC (rev 12101)
@@ -74,9 +74,16 @@
return -1
end
+function P.forwardButton_clicked(e)
+ P.loadMap()
+end
+
function P.Mission1Button_clicked(e)
P.loadLevel(P.FindLevel(0))
end
+function P.KeyPressed(e)
+ P.loadLevel(P.FindLevel(0))
+end
function P.Mission2Button_clicked(e)
P.loadLevel(P.FindLevel(1))
@@ -115,6 +122,10 @@
hideAllMenuSheets()
end
+function P.loadMap()
+ orxonox.execute("change Game NC_StoryModeLevel")
+end
+
function P.FindLevel(index)
local filename = orxonox.LevelManager:getInstance():getCampaignMission(index)
local level = nil
Modified: code/branches/WorldMap_HS18/data/levels/NC_StoryModeLevel.oxw
===================================================================
--- code/branches/WorldMap_HS18/data/levels/NC_StoryModeLevel.oxw 2018-11-14 08:29:00 UTC (rev 12100)
+++ code/branches/WorldMap_HS18/data/levels/NC_StoryModeLevel.oxw 2018-11-14 09:01:05 UTC (rev 12101)
@@ -1,4 +1,4 @@
-a<LevelInfo
+<LevelInfo
name = "NC StoryMode"
description = "A level in which the Campaign Menu is defined, which opens other levels."
tags = "test"
Modified: code/branches/WorldMap_HS18/data/levels/StoryModeMap.oxw
===================================================================
--- code/branches/WorldMap_HS18/data/levels/StoryModeMap.oxw 2018-11-14 08:29:00 UTC (rev 12100)
+++ code/branches/WorldMap_HS18/data/levels/StoryModeMap.oxw 2018-11-14 09:01:05 UTC (rev 12101)
@@ -36,7 +36,7 @@
<Model position="550,300,0" mesh="assff.mesh" scale=20 visible="true" orientation="-0.015,0.091,0.038,-0.995"/>
- <Model position="600,370,0" mesh="Coordinates.mesh" scale=10 />
+ <Model position="600,370,0" mesh="Coordinates.mesh" scale=10 />
<Billboard colour="1,1,0.05" position="600,370,-80" material="Flares/lensflare" scale=4.5 />
Modified: code/branches/WorldMap_HS18/data/levels/StoryModeMapDev.oxw
===================================================================
--- code/branches/WorldMap_HS18/data/levels/StoryModeMapDev.oxw 2018-11-14 08:29:00 UTC (rev 12100)
+++ code/branches/WorldMap_HS18/data/levels/StoryModeMapDev.oxw 2018-11-14 09:01:05 UTC (rev 12101)
@@ -37,8 +37,8 @@
<Model name="a" position="600,370,0" mesh="planets/moon.mesh" scale=100 visible="false" />
- <Model position="550,300,0" mesh="assff.mesh" scale=20 visible="true" orientation="-0.015,0.091,0.038,-0.995"/>
- <Model position="600,370,0" mesh="Coordinates.mesh" scale=10 />
+ <Model position="550,300,0" mesh="assff.mesh" scale=20 visible="true" orientation="-0.015,0.091,0.038,-0.995"/>
+ <Model position="600,370,0" mesh="Coordinates.mesh" scale=10 />
<Billboard colour="1,1,0.05" position="600,370,-80" material="Flares/lensflare" scale=4.5 />
@@ -76,20 +76,12 @@
<Template link=spaceshipescort />
</templates>
<controller>
- <StoryModeController accuracy=10 team=3>
- <waypoints>
- <Model mesh="cube.mesh" scale=8 position="100,350,-250" />
- <Model mesh="cube.mesh" scale=8 position="-900,-400,-1000" />
- <Model mesh="cube.mesh" scale=8 position="0,500,0" />
- <StaticEntity position="0,0,0" />
- </waypoints>
- </StoryModeController>
+
</controller>
</SpaceShip>
-
<Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/>
<SpawnPoint position="000.000, 000.000, 1000.000" orientation="0, 0, 0, -1" pawndesign=StoryMode />
Modified: code/branches/WorldMap_HS18/data/levels/templates/StoryMode.oxt
===================================================================
--- code/branches/WorldMap_HS18/data/levels/templates/StoryMode.oxt 2018-11-14 08:29:00 UTC (rev 12100)
+++ code/branches/WorldMap_HS18/data/levels/templates/StoryMode.oxt 2018-11-14 09:01:05 UTC (rev 12101)
@@ -1,5 +1,5 @@
<Template name=StoryMode>
- <Pawn
+ <StoryModeController
hudtemplate = StoryModeMap
/>
</Template>
Modified: code/branches/WorldMap_HS18/src/modules/towerdefense/TowerDefense.cc
===================================================================
--- code/branches/WorldMap_HS18/src/modules/towerdefense/TowerDefense.cc 2018-11-14 08:29:00 UTC (rev 12100)
+++ code/branches/WorldMap_HS18/src/modules/towerdefense/TowerDefense.cc 2018-11-14 09:01:05 UTC (rev 12101)
@@ -271,8 +271,11 @@
if (hasStarted() == false || player_ == nullptr)
{
+ orxout(internal_warning) << "Heere" << endl;
return;
}
+
+ orxout(internal_warning) << "2" << endl;
timeUntilNextWave_ -= dt;
timeSinceLastSpawn_ += dt;
@@ -279,6 +282,7 @@
//build/upgrade tower at selecter position
if (selecter != nullptr && selecter->buildTower_ == true)
{
+ orxout(internal_warning) << "3" << endl;
selecter->buildTower_ = false;
if (getField(selecter->selectedPos_)->canUpgrade() == true)
Modified: code/branches/WorldMap_HS18/src/modules/towerdefense/TowerDefenseSelecter.cc
===================================================================
--- code/branches/WorldMap_HS18/src/modules/towerdefense/TowerDefenseSelecter.cc 2018-11-14 08:29:00 UTC (rev 12100)
+++ code/branches/WorldMap_HS18/src/modules/towerdefense/TowerDefenseSelecter.cc 2018-11-14 09:01:05 UTC (rev 12101)
@@ -107,6 +107,7 @@
void TowerDefenseSelecter::moveFrontBack(const Vector2& value)
{
+
if (value.x > 0)
{
moveUpPressed_ = true;
Modified: code/branches/WorldMap_HS18/src/orxonox/controllers/StoryModeController.cc
===================================================================
--- code/branches/WorldMap_HS18/src/orxonox/controllers/StoryModeController.cc 2018-11-14 08:29:00 UTC (rev 12100)
+++ code/branches/WorldMap_HS18/src/orxonox/controllers/StoryModeController.cc 2018-11-14 09:01:05 UTC (rev 12101)
@@ -35,33 +35,61 @@
{
RegisterClass(StoryModeController);
- StoryModeController::StoryModeController(Context* context) : ArtificialController(context)
+ StoryModeController::StoryModeController(Context* context) : Pawn(context)
{
RegisterObject(StoryModeController);
- this->setAccuracy(100);
+ moveRight_ = false;
+ moveLeft_ = false;
+ //this->setAccuracy(50);
}
StoryModeController::~StoryModeController()
{
- for (WorldEntity* waypoint : this->waypoints_)
+ /*for (WorldEntity* waypoint : this->waypoints_)
{
if(waypoint)
waypoint->destroy();
- }
+ }*/
+
}
void StoryModeController::tick(float dt)
{
- if (!this->isActive())
+ orxout(internal_error) << "Hi" << endl;
+
+ /*if (!this->isActive())
return;
if (this->waypoints_.size() == 0 || !this->getControllableEntity())
return;
- if (false /* this->waypoints_[this->currentWaypoint_]->getWorldPosition().squaredDistance(this->getControllableEntity()->getPosition()) <= this->squaredaccuracy_*/)
- this->currentWaypoint_ = (this->currentWaypoint_ + 1) % this->waypoints_.size();
+ if (false /* this->waypoints_[this->currentWaypoint_]->getWorldPosition().squaredDistance(this->getControllableEntity()->getPosition()) <= this->squaredaccuracy_*///)
+ //this->currentWaypoint_ = (this->currentWaypoint_ + 1) % this->waypoints_.size();
//this->moveToPosition(this->waypoints_[this->currentWaypoint_]->getWorldPosition());
}
+ void StoryModeController::moveFrontBack(const Vector2& value)
+ {
+ orxout(internal_error) << "FrontBack" << endl;
+
+
+ }
+ void StoryModeController::moveRightLeft(const Vector2& value)
+ {
+ orxout(internal_error) << "RightLeft" << endl;
+ if (value.x>0){
+ moveRight_ =false;
+ moveLeft_ =true;
+
+ }
+
+ }
+
+ void StoryModeController::rotateYaw(const Vector2& value){}
+ void StoryModeController::rotatePitch(const Vector2& value){}
+ void StoryModeController::rotateRoll(const Vector2& value){}
+ void StoryModeController::fire(unsigned int a){}
+ void StoryModeController::fired(unsigned int b){}
+ void StoryModeController::boost(bool bBoost){}
}
Modified: code/branches/WorldMap_HS18/src/orxonox/controllers/StoryModeController.h
===================================================================
--- code/branches/WorldMap_HS18/src/orxonox/controllers/StoryModeController.h 2018-11-14 08:29:00 UTC (rev 12100)
+++ code/branches/WorldMap_HS18/src/orxonox/controllers/StoryModeController.h 2018-11-14 09:01:05 UTC (rev 12101)
@@ -33,18 +33,28 @@
#include <vector>
#include "tools/interfaces/Tickable.h"
-#include "ArtificialController.h"
+#include "worldentities/ControllableEntity.h"
+#include "worldentities/pawns/SpaceShip.h"
namespace orxonox
{
- class _OrxonoxExport StoryModeController : public ArtificialController, public Tickable
+ class _OrxonoxExport StoryModeController : public Pawn
{
public:
StoryModeController(Context* context);
virtual ~StoryModeController();
- virtual void tick(float dt) override;
-
+ virtual void tick(float dt) override;
+ virtual void moveFrontBack(const Vector2& value) override;
+ virtual void moveRightLeft(const Vector2& value) override;
+ virtual void rotateYaw(const Vector2& value) override;
+ virtual void rotatePitch(const Vector2& value) override;
+ virtual void rotateRoll(const Vector2& value) override;
+ void fire(unsigned int firemode);
+ virtual void fired(unsigned int firemode) override;
+ virtual void boost(bool bBoost) override;
+ bool moveRight_ ;
+ bool moveLeft_ ;
protected:
};
More information about the Orxonox-commit
mailing list