[Orxonox-commit 6939] r11560 - in code/branches/CampaignMap_HS17: data/levels data/levels/templates data/overlays src/modules/overlays/hud
fanconic at orxonox.net
fanconic at orxonox.net
Mon Nov 13 16:20:31 CET 2017
Author: fanconic
Date: 2017-11-13 16:20:31 +0100 (Mon, 13 Nov 2017)
New Revision: 11560
Modified:
code/branches/CampaignMap_HS17/data/levels/NC_StoryModeLevel.oxw
code/branches/CampaignMap_HS17/data/levels/emptyLevel.oxw
code/branches/CampaignMap_HS17/data/levels/templates/StoryMode.oxt
code/branches/CampaignMap_HS17/data/overlays/HUDTemplates3.oxo
code/branches/CampaignMap_HS17/data/overlays/StoryModeHUD2.oxo
code/branches/CampaignMap_HS17/src/modules/overlays/hud/CMakeLists.txt
code/branches/CampaignMap_HS17/src/modules/overlays/hud/StoryModeHUD.cc
Log:
Das StoryModeHUD.cc wurde kompiliert und ist momentan bugfrei. Es funktioniert ein Text an einer gewuenschten Stelle im Spiel zu generieren,
Modified: code/branches/CampaignMap_HS17/data/levels/NC_StoryModeLevel.oxw
===================================================================
--- code/branches/CampaignMap_HS17/data/levels/NC_StoryModeLevel.oxw 2017-11-13 15:16:35 UTC (rev 11559)
+++ code/branches/CampaignMap_HS17/data/levels/NC_StoryModeLevel.oxw 2017-11-13 15:20:31 UTC (rev 11560)
@@ -10,13 +10,13 @@
include("StoryModeHUD2.oxo")
include("templates/lodInformation.oxt")
include("templates/StoryMode.oxt")
-
+ include("HUDTemplates3.oxo")
include("templates/spaceshipAssff.oxt")
include("templates/spaceshipEscort.oxt")
include("templates/endurancetest_template.oxt")
?>
-<Level>
+<Level gametype = StoryMode>
<templates>
<Template link=lodtemplate_default />
@@ -28,11 +28,11 @@
skybox = "Orxonox/Starbox"
>
- <SpawnPoint position="000.000, 000.000, 1000.000" orientation="0, 0, 0, -1" pawndesign= StoryMode />
+ <SpawnPoint position="000.000, 000.000, 1000.000" spawnclass=SpaceShip orientation="0, 0, 0, -1" pawndesign= spaceshipescort />
<StaticEntity position="0,0,0" direction="0,0,0" >
- <attached>
+ <attached>
<Model position="600,370,0" mesh="planets/moon.mesh" scale=100 />
<Billboard colour="1,1,0.05" position="600,370,-80" material="Flares/lensflare" scale=4.5 />
@@ -61,18 +61,13 @@
<Model position="1500,-1300,-2000" mesh="planets/moon.mesh" scale=100 />
<Billboard colour="1,1,0.05" position="1500,-1300,-2080" material="Flares/lensflare" scale=5 />
+ <Model position="0,0,0" mesh="planets/moon.mesh" scale=100 />
+
+
</attached>
</StaticEntity>
-<MovableEntity>
-
- <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 team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipescort />
-
-</MovableEntity>
-
-
</Scene>
</Level>
Modified: code/branches/CampaignMap_HS17/data/levels/emptyLevel.oxw
===================================================================
--- code/branches/CampaignMap_HS17/data/levels/emptyLevel.oxw 2017-11-13 15:16:35 UTC (rev 11559)
+++ code/branches/CampaignMap_HS17/data/levels/emptyLevel.oxw 2017-11-13 15:20:31 UTC (rev 11560)
@@ -9,6 +9,8 @@
include("stats.oxo")
include("HUDTemplates3.oxo")
include("templates/lodInformation.oxt")
+ include("StoryModeHUD2")
+ include("StoryMode.oxt")
?>
<?lua
@@ -59,10 +61,7 @@
</attached>
</StoryModePlanet>
-
- <MovableEntity>
- <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"/>
- </MovableEntity>
+ <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 team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipescort />
</Scene>
</Level>
Modified: code/branches/CampaignMap_HS17/data/levels/templates/StoryMode.oxt
===================================================================
--- code/branches/CampaignMap_HS17/data/levels/templates/StoryMode.oxt 2017-11-13 15:16:35 UTC (rev 11559)
+++ code/branches/CampaignMap_HS17/data/levels/templates/StoryMode.oxt 2017-11-13 15:20:31 UTC (rev 11560)
@@ -1,6 +1,6 @@
<Template name=StoryMode>
<SpaceShip
- hudtemplate = StoryModeMap
+ hudtemplate = StoryModeHUD2
camerapositiontemplate = spaceshipghostcameras
>
Modified: code/branches/CampaignMap_HS17/data/overlays/HUDTemplates3.oxo
===================================================================
--- code/branches/CampaignMap_HS17/data/overlays/HUDTemplates3.oxo 2017-11-13 15:16:35 UTC (rev 11559)
+++ code/branches/CampaignMap_HS17/data/overlays/HUDTemplates3.oxo 2017-11-13 15:20:31 UTC (rev 11560)
@@ -48,6 +48,18 @@
<OverlayGroup name = "spaceshiphud" scale = "1, 1">
<Map />
+
+
+ <StoryModeHUD
+ name = "StoryMode"
+ correctaspect = false
+ font = "Monofur"
+ textSize = 0.05
+ align = "center"
+ />
+
+
+
<HUDHealthBar
name = "HealthBar1"
background = "Orxonox/HealthBarBackground"
Modified: code/branches/CampaignMap_HS17/data/overlays/StoryModeHUD2.oxo
===================================================================
--- code/branches/CampaignMap_HS17/data/overlays/StoryModeHUD2.oxo 2017-11-13 15:16:35 UTC (rev 11559)
+++ code/branches/CampaignMap_HS17/data/overlays/StoryModeHUD2.oxo 2017-11-13 15:20:31 UTC (rev 11560)
@@ -21,14 +21,9 @@
</Template>
-->
-<Template name="spectatorhud">
- <OverlayGroup name = "spectatorhud" scale = "1, 1">
- </OverlayGroup>
-</Template>
-<Template name="spaceshiphud">
+<Template name="StoryModeHUD2">
<OverlayGroup name = "spaceshiphud" scale = "1, 1">
- <Map />
<!--
<HUDNavigation
@@ -45,27 +40,9 @@
<StoryModeHUD
name = "StoryMode"
correctaspect = true
- font = "Verdana"
+ font = "Monofur"
textSize = 0.05
/>
- <GUIOverlay
- name = "QuestGUI"
- guiname = "QuestGUI"
- visible = "false"
- />
-
- <GUIOverlay
- name = "PickupInventory"
- guiname = "PickupInventory"
- visible = "false"
- />
-
- <GUIOverlay
- name = "Dialogue"
- guiname = "Dialogue"
- visible = "false"
- />
-
</OverlayGroup>
</Template>
Modified: code/branches/CampaignMap_HS17/src/modules/overlays/hud/CMakeLists.txt
===================================================================
--- code/branches/CampaignMap_HS17/src/modules/overlays/hud/CMakeLists.txt 2017-11-13 15:16:35 UTC (rev 11559)
+++ code/branches/CampaignMap_HS17/src/modules/overlays/hud/CMakeLists.txt 2017-11-13 15:20:31 UTC (rev 11560)
@@ -26,4 +26,5 @@
PauseNotice.cc
LastTeamStandingInfos.cc
CountDown.cc
+ StoryModeHUD.cc
)
Modified: code/branches/CampaignMap_HS17/src/modules/overlays/hud/StoryModeHUD.cc
===================================================================
--- code/branches/CampaignMap_HS17/src/modules/overlays/hud/StoryModeHUD.cc 2017-11-13 15:16:35 UTC (rev 11559)
+++ code/branches/CampaignMap_HS17/src/modules/overlays/hud/StoryModeHUD.cc 2017-11-13 15:20:31 UTC (rev 11560)
@@ -67,10 +67,25 @@
StoryModeHUD::StoryModeHUD(Context* context) : OrxonoxOverlay(context)
{
RegisterObject(StoryModeHUD);
-
+
// Set default values
- this->setFont("Monofur");
- this->setTextSize(0.5f);
+ //this->setFont("Monofur");
+ //this->setTextSize(0.5f);
+
+ // Scales used for dimensions and text size
+ float xScale = this->getActualSize().x;
+ float yScale = this->getActualSize().y;
+
+ // Create text
+ text_ = static_cast<Ogre::TextAreaOverlayElement*>( Ogre::OverlayManager::getSingleton()
+ .createOverlayElement("TextArea", "StoryModeHUD_navText_" + getUniqueNumberString()));
+ //text->setFontName(this->fontName_);
+ //text->setCharHeight(this->textSize_ * yScale);
+ text_->setDimensions(xScale, yScale);
+
+ text_->hide();
+
+ this->background_->addChild(text_);
}
// TODO:
@@ -101,11 +116,8 @@
return;
}
this->fontName_ = font;
- for (const auto& mapEntry : this->activeObjectList_)
- {
- if (mapEntry.second.text_ != nullptr)
- mapEntry.second.text_->setFontName(this->fontName_);
- }
+ if(text_ != nullptr)
+ text_->setFontName(this->fontName_);
}
// Gets the Font of the Text
@@ -123,11 +135,7 @@
return;
}
this->textSize_ = size;
- for (const auto& mapEntry : this->activeObjectList_)
- {
- if (mapEntry.second.text_)
- mapEntry.second.text_->setCharHeight(size);
- }
+
}
// returns the Size of the Text
@@ -150,42 +158,30 @@
const Matrix4& camTransform = cam->getOgreCamera()->getProjectionMatrix() * cam->getOgreCamera()->getViewMatrix();
- //display name next to cursor
- //TODO: Planet.getName()
- text_->setCaption("Hello Muthafuckin' World!");
+ //display name next to cursor
+ //TODO: Planet.getName()
+ text_->setCaption("Was geht ab?");
- // Transform to screen coordinates
- Vector3 pos = camTransform * planet->getRVWorldPosition();
+ // Transform to screen coordinates
+ Vector3 pos = camTransform * Vector3(0,0,0); // planet->getRVWorldPosition();
+
+ // If you fly passed the description, it gets out of sight
+ if (pos.z > 1.0)
+ return;
- // Position text
- text_->setLeft((pos.x + 1.0f + it->second.panel_->getWidth()) * 0.5f);
- it->second.text_->setTop((-pos.y + 1.0f + it->second.panel_->getHeight()) * 0.5f);
+ // Position text
+ text_->setLeft((pos.x+1)/2); // The (0,0) Coordinate is in the upper left corner.
+ text_->setTop((-pos.y+1)/2); // With those two calculations we set the desired positions
- // Make sure the overlays are shown
- it->second.text_->show();
+ // Make sure the overlays are shown
+ text_->show();
}
- void StoryModeHUD::addObject()
- {
- // Scales used for dimensions and text size
- float xScale = this->getActualSize().x;
- float yScale = this->getActualSize().y;
+ //void StoryModeHUD::addObject()
- // Create text
- Ogre::TextAreaOverlayElement* text = static_cast<Ogre::TextAreaOverlayElement*>( Ogre::OverlayManager::getSingleton()
- .createOverlayElement("TextArea", "StoryModeHUD_navText_" + getUniqueNumberString()));
- text->setFontName(this->fontName_);
- text->setCharHeight(this->textSize_ * yScale);
- text->setColour(object->getRadarObjectColour());
-
- text->hide();
-
- this->background_->addChild(text);
- }
-
- void StoryModeHUD::removeObject(RadarViewable* viewable)
+ /*void StoryModeHUD::removeObject(RadarViewable* viewable)
{
Ogre::OverlayManager::getSingleton().destroyOverlayElement(it->second.text_);
- }
+ }*/
}
\ No newline at end of file
More information about the Orxonox-commit
mailing list