unify(worldbuilder): Merge WorldBuilder

Author: OmarAglan

Generals/Code/Tools/WorldBuilder/CMakeLists.txt

@@ -60,6 +60,8 @@ set(WORLDBUILDER_SRC
     "src/RampTool.cpp"
     "src/RoadOptions.cpp"
     "src/RoadTool.cpp"
+    "src/RulerOptions.cpp"
+    "src/RulerTool.cpp"
     "src/SaveMap.cpp"
     "src/ScorchOptions.cpp"
     "src/ScorchTool.cpp"
@@ -75,6 +77,7 @@ set(WORLDBUILDER_SRC
     "src/TeamBehavior.cpp"
     "src/TeamGeneric.cpp"
     "src/TeamIdentity.cpp"
+    "src/TeamObjectProperties.cpp"
     "src/TeamReinforcement.cpp"
     "src/teamsdialog.cpp"
     "src/TerrainMaterial.cpp"
@@ -156,6 +159,8 @@ set(WORLDBUILDER_SRC
     "include/RampTool.h"
     "include/RoadOptions.h"
     "include/RoadTool.h"
+    "include/RulerOptions.h"
+    "include/RulerTool.h"
     "include/SaveMap.h"
     "include/ScorchOptions.h"
     "include/ScorchTool.h"
@@ -171,6 +176,7 @@ set(WORLDBUILDER_SRC
     "include/TeamBehavior.h"
     "include/TeamGeneric.h"
     "include/TeamIdentity.h"
+    "include/TeamObjectProperties.h"
     "include/TeamReinforcement.h"
     "include/teamsdialog.h"
     "include/TerrainMaterial.h"
@@ -184,6 +190,7 @@ set(WORLDBUILDER_SRC
     "include/WaypointTool.h"
     "include/WBFrameWnd.h"
     "include/WBHeightMap.h"
+    "include/WBPopupSlider.h"
     "include/wbview.h"
     "include/wbview3d.h"
     "include/WHeightMapEdit.h"

Generals/Code/Tools/WorldBuilder/include/CUndoable.h

@@ -384,3 +384,27 @@ class DeletePolygonUndoable : public Undoable
 		virtual void Do() override;
 		virtual void Undo() override;
 };
+
+///                            MultipleUndoable
+/**
+  * An undoable that doesn't do anything; it just consolidates a number of other
+  * Undoables in a single logical undo step.
+  */
+class MultipleUndoable : public Undoable
+{
+protected:
+  Undoable * m_undoableList; //< The head of the list of undoables, in the order they should be done. Reverse order for undoes
+public:
+		MultipleUndoable();
+    // destructor.
+    virtual ~MultipleUndoable() override;
+
+    /** Add other undoables in the order you would want them UNdone; e.g. in the reverse order you want them done
+      * The MultipleUndoable object will then own the pointers.
+      */
+    void addUndoable( Undoable * undoable );
+
+    virtual void Do() override;
+    virtual void Undo() override;
+    virtual void Redo() override;
+};

Generals/Code/Tools/WorldBuilder/include/CameraOptions.h

@@ -53,6 +53,8 @@ class CameraOptions : public CDialog, public PopupSliderOwner
 	// Generated message map functions
 	//{{AFX_MSG(CameraOptions)
 	afx_msg void OnCameraReset();
+	afx_msg void OnDropWaypointButton();
+	afx_msg void OnCenterOnSelectedButton();
 	afx_msg void OnMove(int x, int y);
 	virtual BOOL OnInitDialog() override;
 	afx_msg void OnChangePitchEdit();

Generals/Code/Tools/WorldBuilder/include/DrawObject.h

@@ -34,6 +34,8 @@
 class MeshClass;
 class PolygonTrigger;
 class WaterRenderObjClass;
+class MapObject;
+class Render2DClass;
 //
 // DrawObject: Draws 3d feedback for tools & objects.
 //
@@ -77,12 +79,14 @@ class DrawObject : public RenderObjClass
 //	void								Set_Flag(unsigned int flag, Bool onoff) { Flags &= (~flag); if (onoff) Flags |= flag; }
 
 	Int freeMapResources();
+	int initData();
 
-	void setDrawObjects(Bool val, Bool waypoints, Bool poly) { m_drawObjects = val; m_drawWaypoints=waypoints; m_drawPolygonAreas = poly;}
+  void setDrawObjects(Bool val, Bool waypoints, Bool poly, Bool bounding, Bool sight, Bool weapon, Bool sound, Bool testart, Bool letterbox) { m_drawObjects = val; m_drawWaypoints=waypoints; m_drawPolygonAreas = poly; m_drawBoundingBoxes = bounding; m_drawSightRanges = sight; m_drawWeaponRanges = weapon; m_drawSoundRanges = sound; m_drawTestArtHighlight = testart, m_drawLetterbox = letterbox;}
 	static void setDoBrushFeedback(Bool val) { m_toolWantsFeedback = val; m_meshFeedback=false;}
 	static void setDoMeshFeedback(Bool val) { m_meshFeedback = val; }
 	static void setDoRampFeedback(Bool val) { m_rampFeedback = val; }
 	static void setDoBoundaryFeedback(Bool val) { m_boundaryFeedback = val; }
+
 	static void setDoAmbientSoundFeedback(Bool val) { m_ambientSoundFeedback = val; }
 
 	static void setBrushFeedbackParms(Bool square, Int width, Int featherWidth)
@@ -122,6 +126,12 @@ class DrawObject : public RenderObjClass
 	Bool											m_drawObjects;
 	Bool											m_drawWaypoints;
 	Bool											m_drawPolygonAreas;
+	Bool											m_drawBoundingBoxes;
+	Bool											m_drawSightRanges;
+	Bool											m_drawWeaponRanges;
+  Bool                      m_drawSoundRanges;
+	Bool											m_drawTestArtHighlight;
+	Bool											m_drawLetterbox;
 
 	DX8VertexBufferClass			*m_vertexFeedback;	///< Vertex buffer for brush feedback.
 	DX8IndexBufferClass				*m_indexFeedback;	///< indices defining a triangle strip for the feedback on terrain
@@ -132,6 +142,8 @@ class DrawObject : public RenderObjClass
 
 	MeshClass									*m_moldMesh;		///< W3D mesh model for the mold.
 	SphereClass								m_moldMeshBounds;				///< Bounding sphere for mold mesh.
+	Render2DClass							*m_lineRenderer;		//< Used to render 2D lines for bounding boxes.
+	CPoint										m_winSize;				//< Holds the size of the window.
 
 protected: // static state vars.
 	static Bool								m_squareFeedback;	///< True for square brush feedback, false for round.
@@ -155,7 +167,7 @@ class DrawObject : public RenderObjClass
 	static Real								m_rampWidth;
 
 protected:
-	int initData();
+  void addCircleToLineRenderer( const Coord3D & center, Real radius, Real width, unsigned long color, CameraClass* camera );
 	Int updateVB(DX8VertexBufferClass	*vertexBufferTile, Int color, Bool doArrow, Bool doDiamond);
 	void updatePolygonVB(PolygonTrigger *pTrig, Bool selected, Bool isOpen);
 	void updateFeedbackVB();
@@ -165,6 +177,12 @@ class DrawObject : public RenderObjClass
 	void updateForWater();
 	void updateBoundaryVB();
 	void updateAmbientSoundVB();
+	void updateVBWithBoundingBox(MapObject *pMapObj, CameraClass* camera);
+	void updateVBWithSightRange(MapObject *pMapObj, CameraClass* camera);
+	void updateVBWithWeaponRange(MapObject *pMapObj, CameraClass* camera);
+	void updateVBWithTestArtHighlight(MapObject *pMapObj, CameraClass* camera);
+  void updateVBWithSoundRanges(MapObject *pMapObj, CameraClass* camera);
+	bool worldToScreen(const Coord3D *w, ICoord2D *s, CameraClass* camera);
 
 };
 

Generals/Code/Tools/WorldBuilder/include/EditAction.h

@@ -62,6 +62,7 @@ class EditAction : public CDialog
 	CRichEditCtrl m_myEditCtrl;
 	CHARRANGE m_curLinkChrg;
 	Int				m_curEditParameter;
+	CTreeCtrl	m_actionTreeView;
 
 protected:
 

Generals/Code/Tools/WorldBuilder/include/EditCondition.h

@@ -24,6 +24,13 @@
 
 class Condition;
 class SidesList;
+
+class CMyTreeCtrl : public CTreeCtrl
+{
+public:
+	virtual LRESULT WindowProc( UINT message, WPARAM wParam, LPARAM lParam ) override;
+};
+
 /////////////////////////////////////////////////////////////////////////////
 // EditCondition dialog
 
@@ -61,6 +68,7 @@ class EditCondition : public CDialog
 	CRichEditCtrl m_myEditCtrl;
 	CHARRANGE m_curLinkChrg;
 	Int				m_curEditParameter;
+	CTreeCtrl	m_conditionTreeView;
 
 protected:
 

Generals/Code/Tools/WorldBuilder/include/EditObjectParameter.h

@@ -44,6 +44,7 @@ friend class EditParameter;
 	//{{AFX_VIRTUAL(EditObjectParameter)
 	protected:
 	virtual void DoDataExchange(CDataExchange* pDX) override;    // DDX/DDV support
+	virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) override;
 	//}}AFX_VIRTUAL
 
 // Implementation

Generals/Code/Tools/WorldBuilder/include/EditParameter.h

@@ -50,8 +50,8 @@ class EditParameter : public CDialog
 // Implementation
 
 public:
-	static Int edit( Parameter *pParm, AsciiString unitName = AsciiString::TheEmptyString );
-	static AsciiString getWarningText(Parameter *pParm);
+	static Int edit( Parameter *pParm, Int keyPressed, AsciiString unitName = AsciiString::TheEmptyString );
+	static AsciiString getWarningText(Parameter *pParm, Bool isAction);
 	static AsciiString getInfoText(Parameter *pParm);
 	static void setCurSidesList(SidesList *sidesListP) {m_sidesListP = sidesListP;};
 	static Bool loadScripts(CComboBox *pCombo, Bool subr, AsciiString match = AsciiString::TheEmptyString);
@@ -93,10 +93,10 @@ class EditParameter : public CDialog
 	static Bool loadEmoticons( CComboBox *pCombo, AsciiString match = AsciiString::TheEmptyString );
 	static AsciiString getCreatedUnitTemplateName(AsciiString unitName);
 
-	void loadCounters(CComboBox *pCombo);
-	void loadConditionParameter(Script *pScr, Parameter::ParameterType type, CComboBox *pCombo);
-	void loadActionParameter(Script *pScr, Parameter::ParameterType type, 	CComboBox *pCombo);
-	void loadFlags(CComboBox *pCombo);
+	static Bool loadCounters(CComboBox *pCombo, AsciiString match = AsciiString::TheEmptyString);
+	static void loadConditionParameter(Script *pScr, Parameter::ParameterType type, CComboBox *pCombo);
+	static Bool loadActionParameter(Script *pScr, Parameter::ParameterType type, CComboBox *pCombo, AsciiString match);
+	static Bool loadFlags(CComboBox *pCombo, AsciiString match = AsciiString::TheEmptyString);
 
 
 protected:
@@ -106,11 +106,15 @@ class EditParameter : public CDialog
 	Int					m_int;
 	Real				m_real;
 
+	Int					m_key; // key pressed to invoke the edit parameter dialog.
+
 	static SidesList *m_sidesListP;
 	static AsciiString m_selectedLocalizedString;
 
 protected:
+	Bool scanReal(CEdit *pEdit, Real scale);
 
+protected:
 	// Generated message map functions
 	//{{AFX_MSG(EditParameter)
 	afx_msg void OnChangeEdit();

Generals/Code/Tools/WorldBuilder/include/ExportScriptsOptions.h

@@ -50,12 +50,14 @@ class ExportScriptsOptions : public CDialog
 	static Bool m_waypoints;
 	static Bool m_triggers;
 	static Bool m_allScripts;
+	static Bool m_sides;
 
 public:
 	Bool getDoUnits() {return m_units;}
 	Bool getDoWaypoints() {return m_waypoints;}
 	Bool getDoTriggers() {return m_triggers;}
 	Bool getDoAllScripts() {return m_allScripts;}
+	Bool getDoSides() {return m_sides;}
 
 protected:
 

Generals/Code/Tools/WorldBuilder/include/LayersList.h

@@ -42,15 +42,20 @@
 
 // FORWARD DECLARATIONS ///////////////////////////////////////////////////////
 class MapObject;
+class PolygonTrigger;
 
 // TYPE DEFINES ///////////////////////////////////////////////////////////////
 typedef std::list<MapObject*> ListMapObjectPtr;
 typedef ListMapObjectPtr::iterator ListMapObjectPtrIt;
 
+typedef std::list<PolygonTrigger*> ListPolygonTriggerPtr;
+typedef ListPolygonTriggerPtr::iterator ListPolygonTriggerPtrIt;
+
 struct Layer
 {
 	AsciiString layerName;
 	ListMapObjectPtr objectsInLayer;
+	ListPolygonTriggerPtr polygonTriggersInLayer;
 	Bool show;
 };
 
@@ -86,9 +91,12 @@ class LayersList : public CDialog
 
 		void resetLayers();
 		void addMapObjectToLayersList(IN MapObject *objToAdd, AsciiString layerToAddTo = AsciiString(TheDefaultLayerName.c_str()));
+		void addPolygonTriggerToLayersList(IN PolygonTrigger *triggerToAdd, AsciiString layerToAddTo = AsciiString(TheDefaultLayerName.c_str()));
 		AsciiString removeMapObjectFromLayersList(IN MapObject *objToRemove);
+		AsciiString removePolygonTriggerFromLayersList(IN PolygonTrigger *triggerToRemove);
 
 		void changeMapObjectLayer(IN MapObject *objToChange, AsciiString layerToPlaceOn);
+		void changePolygonTriggerLayer(IN PolygonTrigger *triggerToChange, AsciiString layerToPlaceOn);
 
 		void addLayerNamed(IN AsciiString layerToAdd);
 		void removeLayerNamed(IN AsciiString layerToRemove);
@@ -105,29 +113,40 @@ class LayersList : public CDialog
 		const ListLayer& GetAllLayers() const { return mLayers; }
 
 		static MapObject *findObjectByUID(AsciiString objectIDToFind);
+		static PolygonTrigger *findPolygonTriggerByUID(AsciiString objectIDToFind);
+		static Bool findAndSelectMapObject(AsciiString selectedItemAsciiString);
+		static Bool findAndSelectPolygonTrigger(AsciiString selectedItemAsciiString);
+		static void unselectAllMapObjects();
+		static void unselectAllPolygonTriggers();
+
+	public:
+		// This is a string because making it an AsciiString makes us barf on construction. :-(
+		static std::string TheDefaultLayerName;
+		static std::string ThePolygonTriggerLayerName;
+		static std::string TheDefaultNewLayerName;
+		static std::string TheActiveLayerName;
+		static const std::string TheUnmutableDefaultLayerName;
 
 	protected:
 		AsciiString mCurrentlyEditingLabel;
+
 		ListLayer mLayers;
 		CLLTreeCtrl *mTree;
 		CImageList mImageList;
 		Bool m_performUpdates;
+		Bool m_activatedLayer;
 
 
 		HTREEITEM findTreeLayerNamed(const AsciiString& nameToFind);
 		HTREEITEM findTreeObjectNamed(const AsciiString& objectToFind, HTREEITEM layerItem);
 
-		// This is a string because making it an AsciiString makes us barf on construction. :-(
-		static std::string TheDefaultLayerName;
-		static std::string TheDefaultNewLayerName;
-		static const std::string TheUnmutableDefaultLayerName;
-
 		// This function takes an MapObject, and does one of the following:
 		// 1) Return true if the MapObject can be found, and
 		//    layerIt points to a valid layer iterator in which the MapObject was found
 		//    MapObjectIt points to a valid MapObject iterator on the layerIts MapObjectsInLayer member
 		// 2) Returns false if the MapObject cannot be found.
 		Bool findMapObjectAndList(IN MapObject *MapObjectToFind, OUT ListLayerIt *layerIt = nullptr, OUT ListMapObjectPtrIt *MapObjectIt = nullptr);
+		Bool findPolygonTriggerAndList(IN PolygonTrigger *PolygonTriggerToFind, OUT ListLayerIt *layerIt = nullptr, OUT ListPolygonTriggerPtrIt *PolygonTriggerIt = nullptr);
 
 		// This function takes a layer name, and does one of the following:
 		// 1) Return true if the layer can be found, and
@@ -136,7 +155,11 @@ class LayersList : public CDialog
 		Bool findLayerNamed(IN AsciiString layerName, OUT ListLayerIt *layerIt = nullptr);
 
 		void addMapObjectToLayer(IN MapObject *objToAdd, IN ListLayerIt *layerIt);
+		void addPolygonTriggerToLayer(IN PolygonTrigger *objToAdd, IN ListLayerIt *layerIt);
 		void removeMapObjectFromLayer(IN MapObject *objToRemove, IN ListLayerIt *layerIt = nullptr, IN ListMapObjectPtrIt *MapObjectIt = nullptr);
+		void removePolygonTriggerFromLayer(IN PolygonTrigger *triggerToRemove, IN ListLayerIt *layerIt = nullptr, IN ListPolygonTriggerPtrIt *PolygonTriggerIt = nullptr);
+		void updateObjectRenderFlags(IN ListLayerIt *layerIt);
+		void updateTreeImages();
 
 	protected:
 		virtual void OnOK() override;
@@ -149,8 +172,10 @@ class LayersList : public CDialog
 		afx_msg void OnMergeLayer(UINT commandID);
 		afx_msg void OnMergeObject(UINT commandID);
 		afx_msg void OnMergeViewSelection(UINT commandID);
+		afx_msg void OnSelectActiveLayer();
 
 
+		afx_msg void OnSelectLayerObject();
 		afx_msg void OnNewLayer();
 		afx_msg void OnDeleteLayer();
 		afx_msg void OnHideShowLayer();