Changeset 439 for cafu/trunk

Timestamp:

12/04/11 13:06:30 (6 months ago)

Author:

Carsten

Message:

CaWE: The models of static_detail_model entities now show their GUI panel in the 3D views of the editor (if they have any).

Location:

cafu/trunk

Files:

• Ca3DE/MainCanvas.cpp (modified) (1 diff)
• CaWE/MapHelperModel.cpp (modified) (7 diffs)
• CaWE/MapHelperModel.hpp (modified) (3 diffs)
• CaWE/ModelEditor/ModelDocument.cpp (modified) (1 diff)
• CaWE/ParentFrame.cpp (modified) (1 diff)
• Games/DeathMatch/Code/StaticDetailModel.cpp (modified) (1 diff)
• Games/Game.hpp (modified) (1 diff)
• Libs/GuiSys/Gui.hpp (modified) (1 diff)
• Libs/GuiSys/GuiImpl.cpp (modified) (8 diffs)
• Libs/GuiSys/GuiImpl.hpp (modified) (2 diffs)
• Libs/MaterialSystem/MaterialManagerImpl.cpp (modified) (1 diff)
• Libs/MaterialSystem/MaterialManagerImpl.hpp (modified) (1 diff)

cafu/trunk/Ca3DE/MainCanvas.cpp

@@ -453 +453 @@
         if (MainMenuGui==NULL)
         {
-            MainMenuGui=new cf::GuiSys::GuiImplT(*m_GuiResources, "Err=gui:new('WindowT'); gui:SetRootWindow(Err); gui:activate(true); gui:setInteractive(true); gui:showMouse(true); Err:set('rect', 0, 0, 640, 480); Err:set('text', 'Error loading MainMenu_main.cgui,\\nsee console <F1> for details.');", true);
+            MainMenuGui=new cf::GuiSys::GuiImplT(*m_GuiResources, "Err=gui:new('WindowT'); gui:SetRootWindow(Err); gui:activate(true); gui:setInteractive(true); gui:showMouse(false); Err:set('rect', 0, 0, 640, 480); Err:set('textScale', 0.8); Err:set('text', 'Error loading MainMenu_main.cgui,\\nsee console <F1> for details.');", true);
             cf::GuiSys::GuiMan->Register(MainMenuGui);
         }

cafu/trunk/CaWE/MapHelperModel.cpp

@@ -57 +57 @@
       m_Model(NULL),
       m_ModelFrameNr(0.0f),
+      m_GuiNames(),
+      m_Guis(),
       m_Timer()
 {
@@ -67 +69 @@
       m_Model(Model.m_Model),
       m_ModelFrameNr(0.0f),
+      m_GuiNames(),
+      m_Guis(),
       m_Timer(Model.m_Timer)
 {
+}
+
+
+MapHelperModelT::~MapHelperModelT()
+{
+    ClearGuis();
 }
 
@@ -93 +103 @@
     m_ModelFrameNr=Model->m_ModelFrameNr;
     m_Timer       =Model->m_Timer;
+
+    ClearGuis();
 }
 
@@ -167 +179 @@
         Pose->Draw(-1 /*default skin*/, CAFU_ENG_SCALE*ModelDist);
 
+        const MatrixT ModelToWorld=MatSys::Renderer->GetMatrix(MatSys::RendererI::MODEL_TO_WORLD);
+
+        for (unsigned long GFNr=0; GFNr<m_Model->GetGuiFixtures().Size(); GFNr++)
+        {
+            Vector3fT GuiOrigin;
+            Vector3fT GuiAxisX;
+            Vector3fT GuiAxisY;
+
+            if (Pose->GetGuiPlane(GFNr, GuiOrigin, GuiAxisX, GuiAxisY))
+            {
+                // It's pretty easy to derive this matrix geometrically, see my TechArchive note from 2006-08-22.
+                MatrixT M(GuiAxisX.x/640.0f, GuiAxisY.x/480.0f, 0.0f, GuiOrigin.x,
+                          GuiAxisX.y/640.0f, GuiAxisY.y/480.0f, 0.0f, GuiOrigin.y,
+                          GuiAxisX.z/640.0f, GuiAxisY.z/480.0f, 0.0f, GuiOrigin.z,
+                                       0.0f,              0.0f, 0.0f,        1.0f);
+
+                MatSys::Renderer->SetMatrix(MatSys::RendererI::MODEL_TO_WORLD, ModelToWorld*M);
+
+                m_Guis[GFNr]->Render(true /*zLayerCoating*/);
+            }
+        }
+
         MatSys::Renderer->PopMatrix(MatSys::RendererI::MODEL_TO_WORLD);
 
@@ -180 +214 @@
 
 
+void MapHelperModelT::ClearGuis() const
+{
+    for (unsigned long GuiNr=0; GuiNr<m_Guis.Size(); GuiNr++)
+    {
+        delete m_Guis[GuiNr];
+        m_Guis[GuiNr]=NULL;
+    }
+
+    m_GuiNames.Overwrite();
+    m_Guis.Overwrite();
+}
+
+
 void MapHelperModelT::UpdateModelCache() const
 {
+    GameConfigT& GameConfig=const_cast<GameConfigT&>(m_ParentEntity->GetClass()->GetGameConfig());
+
     wxString ModelName="";
     wxString ErrorMsg ="";
@@ -198 +247 @@
     }
 
-    const CafuModelT* Model=m_ParentEntity->GetClass()->GetGameConfig().GetModel(ModelName, &ErrorMsg);
+    const CafuModelT* Model=GameConfig.GetModel(ModelName, &ErrorMsg);
 
     if (m_Model!=Model)
@@ -208 +257 @@
         m_Model       =Model;
         m_ModelFrameNr=0.0f;
+
+        ClearGuis();
+    }
+
+
+    while (m_GuiNames.Size() < m_Model->GetGuiFixtures().Size()) m_GuiNames.PushBack("");
+    while (m_Guis.Size()     < m_Model->GetGuiFixtures().Size()) m_Guis.PushBack(NULL);
+
+    for (unsigned long GFNr=0; GFNr<m_Model->GetGuiFixtures().Size(); GFNr++)
+    {
+        const EntPropertyT* GuiProp=m_ParentEntity->FindProperty("gui");
+
+        if (!GuiProp || GFNr>0)
+            GuiProp=m_ParentEntity->FindProperty(wxString::Format("gui%lu", GFNr+1));
+
+        const wxString NewGuiName=GuiProp ? GuiProp->Value : "";
+
+        if (!m_Guis[GFNr] || NewGuiName!=m_GuiNames[GFNr])
+        {
+            m_GuiNames[GFNr]=NewGuiName;
+            delete m_Guis[GFNr];
+            m_Guis[GFNr]=NULL;
+
+            try
+            {
+                if (m_GuiNames[GFNr]=="")
+                {
+                    m_Guis[GFNr]=new cf::GuiSys::GuiImplT(GameConfig.GetGuiResources(),
+                        "Win1=gui:new('WindowT'); gui:SetRootWindow(Win1); gui:activate(true); "
+                        "gui:setInteractive(true); gui:showMouse(false); Win1:set('rect', 0, 0, 640, 480); "
+                        "Win1:set('backColor', 150/255, 170/255, 204/255, 0.8); "
+                        "Win1:set('textAlignHor', 2); Win1:set('textAlignVer', 2); "
+                        "Win1:set('textColor', 15/255, 49/255, 106/255); "
+                        "Win1:set('text', 'This is a\\nfull-scale sample GUI.\\n\\n"
+                        "Set the \\\""+ std::string(GuiProp->Key) +"\\\" entity property\\nto assign the true GUI.');", true);
+                }
+                else
+                {
+                    m_Guis[GFNr]=new cf::GuiSys::GuiImplT(GameConfig.GetGuiResources(), std::string(GameConfig.ModDir + "/" + m_GuiNames[GFNr]));
+                }
+            }
+            catch (const cf::GuiSys::GuiImplT::InitErrorT& IE)
+            {
+                // This one must not throw again...
+                m_Guis[GFNr]=new cf::GuiSys::GuiImplT(GameConfig.GetGuiResources(),
+                    "Win1=gui:new('WindowT'); gui:SetRootWindow(Win1); gui:activate(true); "
+                    "gui:setInteractive(true); gui:showMouse(false); Win1:set('rect', 0, 0, 640, 480); "
+                    "Win1:set('backColor', 150/255, 170/255, 204/255, 0.8); "
+                    "Win1:set('textAlignHor', 2); Win1:set('textAlignVer', 2); "
+                    "Win1:set('textColor', 15/255, 49/255, 106/255); "
+                    "Win1:set('textScale', 0.6); "
+                    "Win1:set('text', [=====[Could not load GUI\n" +
+                    std::string(GameConfig.ModDir + "/" + m_GuiNames[GFNr]) + "\n\n" + IE.what() + "]=====]);", true);
+            }
+        }
     }
 }

cafu/trunk/CaWE/MapHelperModel.hpp

@@ -33 +33 @@
 
 class CafuModelT;
+namespace cf { namespace GuiSys { class GuiImplT; } }
 namespace cf { namespace TypeSys { class TypeInfoT; } }
 namespace cf { namespace TypeSys { class TypeInfoManT; } }
@@ -48 +49 @@
     /// @param Model   The model to copy-construct this model from.
     MapHelperModelT(const MapHelperModelT& Model);
+
+    /// The destructor.
+    ~MapHelperModelT();
 
 
@@ -68 +72 @@
     protected:
 
+    void ClearGuis() const;
     void UpdateModelCache() const;
     int  GetSequenceNr() const;
 
-    const HelperInfoT*        m_HelperInfo;     ///< The HelperInfoT instance that caused the instantiation of this helper.
-    mutable const CafuModelT* m_Model;          ///< Our model (obtained from the game config's model manager).
-    mutable float             m_ModelFrameNr;   ///< The frame number of the sequence to render this model in.
-    mutable TimerT            m_Timer;
+    const HelperInfoT*                    m_HelperInfo;     ///< The HelperInfoT instance that caused the instantiation of this helper.
+    mutable const CafuModelT*             m_Model;          ///< Our model (obtained from the game config's model manager).
+    mutable float                         m_ModelFrameNr;   ///< The frame number of the sequence to render this model in.
+    mutable ArrayT<wxString>              m_GuiNames;       ///< The names of the GUIs in m_Guis.
+    mutable ArrayT<cf::GuiSys::GuiImplT*> m_Guis;           ///< The GUIs that are rendered where the model has GUI fixtures.
+    mutable TimerT                        m_Timer;
 };
 

cafu/trunk/CaWE/ModelEditor/ModelDocument.cpp

@@ -71 +71 @@
       m_Gui(new cf::GuiSys::GuiImplT(GameConfig->GetGuiResources(),
           "Win1=gui:new('WindowT'); gui:SetRootWindow(Win1); gui:activate(true); "
-          "gui:setInteractive(true); gui:showMouse(true); Win1:set('rect', 0, 0, 640, 480); "
+          "gui:setInteractive(true); gui:showMouse(false); Win1:set('rect', 0, 0, 640, 480); "
           "Win1:set('backColor', 150/255, 170/255, 204/255, 0.8); "
           "Win1:set('textAlignHor', 2); Win1:set('textAlignVer', 2); "

cafu/trunk/CaWE/ParentFrame.cpp

@@ -558 +558 @@
         wxMessageBox(wxString("The model file \"")+FileName+"\" could not be loaded:\n"+LE.what(), "Couldn't load or import model");
     }
-    catch (const cf::GuiSys::GuiImplT::InitErrorT& /*E*/)
-    {
-        wxMessageBox(wxString("The GUI script \"")+FileName+"\" could not be loaded!", "Couldn't load GUI script");
+    catch (const cf::GuiSys::GuiImplT::InitErrorT& IE)
+    {
+        wxMessageBox(wxString("The GUI script \"")+FileName+"\" could not be loaded:\n"+IE.what(), "Couldn't load GUI script");
     }
 

cafu/trunk/Games/DeathMatch/Code/StaticDetailModel.cpp

@@ -312 +312 @@
             MatSys::Renderer->SetMatrix(MatSys::RendererI::MODEL_TO_WORLD, ModelToWorld*M);
 
-            Gui->Render();
+            Gui->Render();      // Set the zLayerCoating parameter to true here?
 #else
             MatSys::Renderer->SetCurrentMaterial(cf::GuiSys::GuiMan->GetDefaultRM());

cafu/trunk/Games/Game.hpp

@@ -52 +52 @@
             /// @param AsClient     Tells whether we're running as client.
             /// @param AsServer     Tells whether we're running as server.
+            /// @param ModelMan     The manager for all models that are used in this game.
             virtual void Initialize(bool AsClient, bool AsServer, ModelManagerT& ModelMan)=0;
 

cafu/trunk/Libs/GuiSys/Gui.hpp

@@ -87 +87 @@
 
             /// Renders this GUI.
-            /// Note that this method does *not* setup any of the MatSys's model, view or projection matrices: it's up to the caller to do that!
-            virtual void Render() const=0;
+            /// Note that this method does *not* setup any of the MatSys's model, view or projection matrices:
+            /// it's up to the caller to do that.
+            /// @param zLayerCoating   Whether a z-layer coating should be applied to the GUI screen when finishing the rendering.
+            ///     This is useful whenever the z-ordering of scene elements can be imperfect, e.g. in the Map Editor.
+            ///     Generally, 3D world GUIs should use \c true, 2D GUIs should use \c false.
+            virtual void Render(bool zLayerCoating=false) const=0;
 
             /// Processes a keyboard event by forwarding it to the window that currently has the input focus.

cafu/trunk/Libs/GuiSys/GuiImpl.cpp

@@ -116 +116 @@
       m_GuiDefaultRM(NULL),
       m_GuiPointerRM(NULL),
+      m_GuiFinishZRM(NULL),
       m_GuiResources(GuiRes),
       RootWindow(NULL),
@@ -137 +138 @@
     }
 
-    if (!m_MaterialMan.GetMaterial("Gui/Default"))
+    if (!m_MaterialMan.HasMaterial("Gui/Default"))
     {
         // This material has either not been defined in the .cmat file, or we're dealing with inline code.
@@ -151 +152 @@
     }
 
-    if (!m_MaterialMan.GetMaterial("Gui/Cursors/Pointer"))
+    if (!m_MaterialMan.HasMaterial("Gui/Cursors/Pointer"))
     {
         // This material has either not been defined in the .cmat file, or we're dealing with inline code.
@@ -165 +166 @@
     }
 
+    if (!m_MaterialMan.HasMaterial("Gui/FinishZ"))
+    {
+        // This material has either not been defined in the .cmat file, or we're dealing with inline code.
+        MaterialT Mat;
+
+        Mat.Name          ="Gui/FinishZ";
+     // Mat.DiffMapComp   =...;
+        Mat.UseMeshColors =true;
+        Mat.AmbientMask[0]=false;
+        Mat.AmbientMask[1]=false;
+        Mat.AmbientMask[2]=false;
+        Mat.AmbientMask[3]=false;
+
+        m_MaterialMan.RegisterMaterial(Mat);
+    }
+
     m_GuiDefaultRM=MatSys::Renderer->RegisterMaterial(m_MaterialMan.GetMaterial("Gui/Default"));
     m_GuiPointerRM=MatSys::Renderer->RegisterMaterial(m_MaterialMan.GetMaterial("Gui/Cursors/Pointer"));
+    m_GuiFinishZRM=MatSys::Renderer->RegisterMaterial(m_MaterialMan.GetMaterial("Gui/FinishZ"));
 
 
@@ -320 +338 @@
         MatSys::Renderer->FreeMaterial(m_GuiDefaultRM);
         MatSys::Renderer->FreeMaterial(m_GuiPointerRM);
+        MatSys::Renderer->FreeMaterial(m_GuiFinishZRM);
         throw InitErrorT("No root window set. Probable cause:\n"+ScriptInitResult);
     }
@@ -363 +382 @@
     MatSys::Renderer->FreeMaterial(m_GuiDefaultRM);
     MatSys::Renderer->FreeMaterial(m_GuiPointerRM);
+    MatSys::Renderer->FreeMaterial(m_GuiFinishZRM);
 }
 
@@ -445 +465 @@
 
 
-void GuiImplT::Render() const
+void GuiImplT::Render(bool zLayerCoating) const
 {
     RootWindow->Render();
 
+    static MatSys::MeshT Mesh(MatSys::MeshT::TriangleFan);
+
+    if (Mesh.Vertices.Size()<4)
+    {
+        Mesh.Vertices.PushBackEmpty(4);
+
+        for (unsigned long VNr=0; VNr<Mesh.Vertices.Size(); VNr++)
+        {
+            Mesh.Vertices[VNr].SetColor(1.0f, 1.0f, 1.0f, 1.0f);
+            Mesh.Vertices[VNr].SetTextureCoord(VNr==0 || VNr==3 ? 0.0f : 1.0f, VNr<2 ? 0.0f : 1.0f);
+        }
+    }
+
     if (MouseIsShown)
     {
-        static MatSys::MeshT Mesh(MatSys::MeshT::TriangleFan);
-
-        if (Mesh.Vertices.Size()<4)
-        {
-            Mesh.Vertices.PushBackEmpty(4);
-
-            for (unsigned long VNr=0; VNr<Mesh.Vertices.Size(); VNr++)
-            {
-                Mesh.Vertices[VNr].SetColor(1.0f, 1.0f, 1.0f, 1.0f);
-                Mesh.Vertices[VNr].SetTextureCoord(VNr==0 || VNr==3 ? 0.0f : 1.0f, VNr<2 ? 0.0f : 1.0f);
-            }
-        }
-
         const float b=(EntityName=="") ? 20.0f : 40.0f;     // The mouse cursor size (double for world GUIs).
 
@@ -472 +492 @@
 
         MatSys::Renderer->SetCurrentMaterial(m_GuiPointerRM);
+        MatSys::Renderer->RenderMesh(Mesh);
+    }
+
+    if (zLayerCoating)
+    {
+        // Finish by applying a z-layer coating to the GUI screen.
+        // This is important whenever the z-ordering of scene elements can be imperfect, e.g. in the Map Editor.
+        Mesh.Vertices[0].SetOrigin(  0.0f,   0.0f);
+        Mesh.Vertices[1].SetOrigin(640.0f,   0.0f);
+        Mesh.Vertices[2].SetOrigin(640.0f, 480.0f);
+        Mesh.Vertices[3].SetOrigin(  0.0f, 480.0f);
+
+        MatSys::Renderer->SetCurrentMaterial(m_GuiFinishZRM);
         MatSys::Renderer->RenderMesh(Mesh);
     }

cafu/trunk/Libs/GuiSys/GuiImpl.hpp

@@ -131 +131 @@
             void SetShowMouse(bool ShowMouse_);
             bool IsMouseShown() const { return MouseIsShown; }
-            void Render() const;
+            void Render(bool zLayerCoating=false) const;
             bool ProcessDeviceEvent(const CaKeyboardEventT& KE);
             bool ProcessDeviceEvent(const CaMouseEventT& ME);
@@ -173 +173 @@
             MatSys::RenderMaterialT* m_GuiDefaultRM;    ///< Used for the window borders and the backgrounds if no other material is specified.
             MatSys::RenderMaterialT* m_GuiPointerRM;    ///< Used for the mouse pointer.
+            MatSys::RenderMaterialT* m_GuiFinishZRM;    ///< Used for laying-down z-buffer values after all GUI elements have been rendered.
             GuiResourcesT&           m_GuiResources;    ///< The provider for resources (fonts and models) that are used in this GUI.
 

cafu/trunk/Libs/MaterialSystem/MaterialManagerImpl.cpp

@@ -354 +354 @@
 
 
+bool MaterialManagerImplT::HasMaterial(const std::string& MaterialName) const
+{
+    std::map<std::string, MaterialT*>::const_iterator It=Materials.find(MaterialName);
+
+    return It!=Materials.end();
+}
+
+
 MaterialT* MaterialManagerImplT::GetMaterial(const std::string& MaterialName) const
 {

cafu/trunk/Libs/MaterialSystem/MaterialManagerImpl.hpp

@@ -46 +46 @@
     /// If a material with the same name \c Mat.Name is already registered with the material manager,
     /// \c Mat is not registered, but a pointer to the already registered instance with the same name is returned
-    /// (use GetMaterial() in advance to unambigiously distingush between the two cases).
+    /// (use HasMaterial() in advance to unambigiously distingush between the two cases).
     ///
     /// @param Mat   The material of which a copy is to be registered with the material manager.
     /// @returns A pointer to the registered material instance (or a previously existing instance with the same name).
     MaterialT* RegisterMaterial(const MaterialT& Mat);
+
+    /// Returns whether the material with the given name is registered with the material manager,
+    /// i.e. if a call to <code>GetMaterial(MaterialName)</code> will return successfully.
+    /// Use this to avoid warning messages to the console if the material is not registered.
+    bool HasMaterial(const std::string& MaterialName) const;
 
     // The MaterialManagerI interface.