Changeset 9434

Timestamp:

Nov 5, 2012, 4:06:21 PM (12 years ago)

Author:

mottetb

Message:

aimMarkerSize aendert nichts im Spiel

Location:

code/branches/spaceNavigation/src/modules/overlays/hud

Files:

• HUDNavigation.cc (modified) (4 diffs)
• HUDNavigation.h (modified) (1 diff)

code/branches/spaceNavigation/src/modules/overlays/hud/HUDNavigation.cc

@@ -203 +203 @@
                     it->second.text_->setCaption(it->first->getRadarName());
                     textLength = it->first->getRadarName().size() * it->second.text_->getCharHeight() * 0.3f;
+                }
+
+                // TODO : closest object is selected
+                if(listIt == this->sortedObjectList_.begin())
+                {
+                    it->second.selected_ = true;
+                } else {
+                    it->second.selected_ = false;
                 }
 
@@ -293 +301 @@
                         it->second.panel_->setMaterialName(TextureGenerator::getMaterialName("tdc.png", it->first->getRadarObjectColour()));
                         it->second.panel_->setDimensions(this->navMarkerSize_ * this->getActualSize().x, this->navMarkerSize_ * this->getActualSize().y);
-                        it->second.target_->setDimensions(aimMarkerSize_ * this->getActualSize().x, this->aimMarkerSize_ * this->getActualSize().y);
+                        it->second.target_->setDimensions(this->aimMarkerSize_ * this->getActualSize().x, this->aimMarkerSize_ * this->getActualSize().y);
                         it->second.wasOutOfView_ = false;
                     }
@@ -307 +315 @@
 
                     // Target marker
-                    Vector3* targetPos = this->toAimPosition(it->first);
-                    Vector3 screenPos = camTransform * *targetPos;
-                    // Check if the target marker is in view too
-                    if(screenPos.z > 1 || screenPos.x < -1.0 || screenPos.x > 1.0
-                            || screenPos.y < -1.0 || screenPos.y > 1.0)
+                    if(it->second.selected_)
                     {
+                        Vector3* targetPos = this->toAimPosition(it->first);
+                        Vector3 screenPos = camTransform * *targetPos;
+                        // Check if the target marker is in view too
+                        if(screenPos.z > 1 || screenPos.x < -1.0 || screenPos.x > 1.0
+                                || screenPos.y < -1.0 || screenPos.y > 1.0)
+                        {
+                            it->second.target_->hide();
+                        }
+                        else
+                        {
+                            it->second.target_->setLeft((screenPos.x + 1.0f - it->second.target_->getWidth()) * 0.5f);
+                            it->second.target_->setTop((-screenPos.y + 1.0f - it->second.target_->getHeight()) * 0.5f);
+                            it->second.target_->show();
+                        }
+
+                        delete targetPos;
+                    }
+                    else // don't show marker for not selected enemies
                         it->second.target_->hide();
-                    }
-                    else
-                    {
-                        it->second.target_->setLeft((screenPos.x + 1.0f - it->second.target_->getWidth()) * 0.5f);
-                        it->second.target_->setTop((-screenPos.y + 1.0f - it->second.target_->getHeight()) * 0.5f);
-                        it->second.target_->show();
-                    }
-
-                    delete targetPos;
                 }
 
@@ -405 +418 @@
 
         ObjectInfo tempStruct =
-        {   panel, target, text, false /*, TODO: initialize wasOutOfView_ */};
+        {   panel, target, text, false, false, false};
         this->activeObjectList_[object] = tempStruct;
 

code/branches/spaceNavigation/src/modules/overlays/hud/HUDNavigation.h

@@ -79 +79 @@
                 bool outOfView_;
                 bool wasOutOfView_;
+                bool selected_;
             };