Ticket #3724: t3724_v1.2.patch
File t3724_v1.2.patch, 5.8 KB (added by , 8 years ago) |
---|
-
ps/trunk/binaries/data/config/default.cfg
144 144 wireframe = "Alt+W" ; Toggle wireframe mode 145 145 silhouettes = "Alt+S" ; Toggle unit silhouettes 146 146 showsky = "Alt+Z" ; Toggle sky 147 territory.showborder = "Alt+B" ; Toggle territory border 147 148 148 149 ; > CLIPBOARD CONTROLS 149 150 copy = "Ctrl+C" ; Copy to clipboard -
ps/trunk/binaries/data/mods/public/gui/session/input.js
850 850 g_ShowGuarded = (ev.type == "hotkeydown"); 851 851 updateAdditionalHighlight(); 852 852 } 853 else if (ev.hotkey == "territory.showborder") 854 { 855 if (ev.type == "hotkeydown") 856 { 857 Engine.GuiInterfaceCall("ToggleTerritoryBorderVisibility"); 858 var visible = Engine.GuiInterfaceCall("GetTerritoryBorderVisibility"); 859 Engine.SetOverlayVisibility(visible); 860 } 861 } 853 862 854 863 // State-machine processing: 855 864 -
ps/trunk/binaries/data/mods/public/simulation/components/GuiInterface.js
854 854 } 855 855 }; 856 856 857 GuiInterface.prototype.ToggleTerritoryBorderVisibility = function() 858 { 859 var cmpTerritoryManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_TerritoryManager); 860 if (cmpTerritoryManager) 861 { 862 let visible = cmpTerritoryManager.GetVisibility(); 863 cmpTerritoryManager.SetVisibility(!visible); 864 } 865 }; 866 867 GuiInterface.prototype.GetTerritoryBorderVisibility = function() 868 { 869 var cmpTerritoryManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_TerritoryManager); 870 if (cmpTerritoryManager) 871 return cmpTerritoryManager.GetVisibility(); 872 873 return false; 874 }; 875 857 876 GuiInterface.prototype.GetPlayerEntities = function(player) 858 877 { 859 878 return Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager).GetEntitiesByPlayer(player); … … 1858 1877 "GetAllBuildableEntities": 1, 1859 1878 "SetStatusBars": 1, 1860 1879 "GetPlayerEntities": 1, 1880 "ToggleTerritoryBorderVisibility": 1, 1881 "GetTerritoryBorderVisibility" : 1, 1861 1882 "GetNonGaiaEntities": 1, 1862 1883 "DisplayRallyPoint": 1, 1863 1884 "SetBuildingPlacementPreview": 1, -
ps/trunk/source/gui/scripting/ScriptFunctions.cpp
66 66 #include "simulation2/components/ICmpRangeManager.h" 67 67 #include "simulation2/components/ICmpSelectable.h" 68 68 #include "simulation2/components/ICmpTemplateManager.h" 69 #include "simulation2/components/ICmpOverlayRenderer.h" 69 70 #include "simulation2/helpers/Selection.h" 70 71 #include "soundmanager/SoundManager.h" 71 72 #include "soundmanager/scripting/JSInterface_Sound.h" … … 931 932 js_start_times[slot].SetFromTimer(); 932 933 } 933 934 935 void SetOverrideVisibility(ScriptInterface::CxPrivate* UNUSED(pCxPrivate), bool visible) 936 { 937 ICmpOverlayRenderer::SetOverrideVisibility(visible); 938 } 939 934 940 void StopJsTimer(ScriptInterface::CxPrivate* UNUSED(pCxPrivate), unsigned int slot) 935 941 { 936 942 if (slot >= MAX_JS_TIMERS) … … 1071 1077 scriptInterface.RegisterFunction<void, unsigned int, &EnableTimeWarpRecording>("EnableTimeWarpRecording"); 1072 1078 scriptInterface.RegisterFunction<void, &RewindTimeWarp>("RewindTimeWarp"); 1073 1079 scriptInterface.RegisterFunction<void, bool, &SetBoundingBoxDebugOverlay>("SetBoundingBoxDebugOverlay"); 1080 scriptInterface.RegisterFunction<void, bool, &SetOverrideVisibility>("SetOverlayVisibility"); 1074 1081 } -
ps/trunk/source/simulation2/components/CCmpTerritoryManager.cpp
282 282 m_Visible = visible; 283 283 } 284 284 285 bool GetVisibility() 286 { 287 return m_Visible; 288 } 285 289 private: 286 290 287 291 bool m_Visible; -
ps/trunk/source/simulation2/components/ICmpTerritoryManager.cpp
27 27 DEFINE_INTERFACE_METHOD_2("IsConnected", bool, ICmpTerritoryManager, IsConnected, entity_pos_t, entity_pos_t) 28 28 DEFINE_INTERFACE_METHOD_2("SetTerritoryBlinking", void, ICmpTerritoryManager, SetTerritoryBlinking, entity_pos_t, entity_pos_t) 29 29 DEFINE_INTERFACE_METHOD_1("GetTerritoryPercentage", u8, ICmpTerritoryManager, GetTerritoryPercentage, player_id_t) 30 DEFINE_INTERFACE_METHOD_1("SetVisibility", void, ICmpTerritoryManager, SetVisibility, bool) 31 DEFINE_INTERFACE_METHOD_0("GetVisibility", bool, ICmpTerritoryManager, GetVisibility) 30 32 END_INTERFACE_WRAPPER(TerritoryManager) -
ps/trunk/source/simulation2/components/ICmpTerritoryManager.h
83 83 */ 84 84 virtual void SetVisibility(bool visible) = 0; 85 85 86 /** 87 * Return current state of an territory borders rendering. 88 */ 89 virtual bool GetVisibility() = 0; 90 86 91 DECLARE_INTERFACE_TYPE(TerritoryManager) 87 92 }; 88 93