Properly sync window resize/move events from core to sim thread

BansheeCore/BansheeCore.vcxproj.filters

@@ -16,9 +16,6 @@
     <Filter Include="Header Files\Utility">
       <UniqueIdentifier>{2c09857e-4a4a-480f-8ebb-1661a9ce78dd}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source Files\RenderSystem">
-      <UniqueIdentifier>{e0bdc5fc-afd1-46f9-9e3e-f85ca3e220b8}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Header Files\Importer">
       <UniqueIdentifier>{f1fb2bc5-43c6-476a-89e3-b7de86c5aebe}</UniqueIdentifier>
     </Filter>
@@ -88,6 +85,9 @@
     <Filter Include="Header Files\RenderAPI">
       <UniqueIdentifier>{3480589d-111c-44b8-b0f1-a178cd00f31e}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Source Files\RenderAPI">
+      <UniqueIdentifier>{e0bdc5fc-afd1-46f9-9e3e-f85ca3e220b8}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Include\BsRenderStats.h">
@@ -630,94 +630,94 @@
       <Filter>Source Files\Resources</Filter>
     </ClCompile>
     <ClCompile Include="Source\BsBlendState.cpp">
-      <Filter>Source Files\RenderSystem</Filter>
+      <Filter>Source Files\RenderAPI</Filter>
     </ClCompile>
     <ClCompile Include="Source\BsDepthStencilState.cpp">
-      <Filter>Source Files\RenderSystem</Filter>
+      <Filter>Source Files\RenderAPI</Filter>
     </ClCompile>
     <ClCompile Include="Source\BsEventQuery.cpp">
-      <Filter>Source Files\RenderSystem</Filter>
+      <Filter>Source Files\RenderAPI</Filter>
     </ClCompile>
     <ClCompile Include="Source\BsGpuBuffer.cpp">
-      <Filter>Source Files\RenderSystem</Filter>
+      <Filter>Source Files\RenderAPI</Filter>
     </ClCompile>
     <ClCompile Include="Source\BsGpuBufferView.cpp">
-      <Filter>Source Files\RenderSystem</Filter>
+      <Filter>Source Files\RenderAPI</Filter>
     </ClCompile>
     <ClCompile Include="Source\BsGpuParam.cpp">
-      <Filter>Source Files\RenderSystem</Filter>
+      <Filter>Source Files\RenderAPI</Filter>
     </ClCompile>
     <ClCompile Include="Source\BsGpuParamBlockBuffer.cpp">
-      <Filter>Source Files\RenderSystem</Filter>
+      <Filter>Source Files\RenderAPI</Filter>
     </ClCompile>
     <ClCompile Include="Source\BsGpuParams.cpp">
-      <Filter>Source Files\RenderSystem</Filter>
+      <Filter>Source Files\RenderAPI</Filter>
     </ClCompile>
     <ClCompile Include="Source\BsGpuProgram.cpp">
-      <Filter>Source Files\RenderSystem</Filter>
+      <Filter>Source Files\RenderAPI</Filter>
     </ClCompile>
     <ClCompile Include="Source\BsGpuProgramManager.cpp">
-      <Filter>Source Files\RenderSystem</Filter>
+      <Filter>Source Files\RenderAPI</Filter>
     </ClCompile>
     <ClCompile Include="Source\BsHardwareBufferManager.cpp">
-      <Filter>Source Files\RenderSystem</Filter>
+      <Filter>Source Files\RenderAPI</Filter>
     </ClCompile>
     <ClCompile Include="Source\BsIndexBuffer.cpp">
-      <Filter>Source Files\RenderSystem</Filter>
+      <Filter>Source Files\RenderAPI</Filter>
     </ClCompile>
     <ClCompile Include="Source\BsMeshManager.cpp">
-      <Filter>Source Files\RenderSystem</Filter>
+      <Filter>Source Files\RenderAPI</Filter>
     </ClCompile>
     <ClCompile Include="Source\BsMultiRenderTexture.cpp">
-      <Filter>Source Files\RenderSystem</Filter>
+      <Filter>Source Files\RenderAPI</Filter>
     </ClCompile>
     <ClCompile Include="Source\BsOcclusionQuery.cpp">
-      <Filter>Source Files\RenderSystem</Filter>
+      <Filter>Source Files\RenderAPI</Filter>
     </ClCompile>
     <ClCompile Include="Source\BsPixelBuffer.cpp">
-      <Filter>Source Files\RenderSystem</Filter>
+      <Filter>Source Files\RenderAPI</Filter>
     </ClCompile>
     <ClCompile Include="Source\BsQueryManager.cpp">
-      <Filter>Source Files\RenderSystem</Filter>
+      <Filter>Source Files\RenderAPI</Filter>
     </ClCompile>
     <ClCompile Include="Source\BsRasterizerState.cpp">
-      <Filter>Source Files\RenderSystem</Filter>
+      <Filter>Source Files\RenderAPI</Filter>
     </ClCompile>
     <ClCompile Include="Source\BsRenderStateManager.cpp">
-      <Filter>Source Files\RenderSystem</Filter>
+      <Filter>Source Files\RenderAPI</Filter>
     </ClCompile>
     <ClCompile Include="Source\BsRenderTarget.cpp">
-      <Filter>Source Files\RenderSystem</Filter>
+      <Filter>Source Files\RenderAPI</Filter>
     </ClCompile>
     <ClCompile Include="Source\BsRenderTexture.cpp">
-      <Filter>Source Files\RenderSystem</Filter>
+      <Filter>Source Files\RenderAPI</Filter>
     </ClCompile>
     <ClCompile Include="Source\BsRenderWindow.cpp">
-      <Filter>Source Files\RenderSystem</Filter>
+      <Filter>Source Files\RenderAPI</Filter>
     </ClCompile>
     <ClCompile Include="Source\BsRenderWindowManager.cpp">
-      <Filter>Source Files\RenderSystem</Filter>
+      <Filter>Source Files\RenderAPI</Filter>
     </ClCompile>
     <ClCompile Include="Source\BsSamplerState.cpp">
-      <Filter>Source Files\RenderSystem</Filter>
+      <Filter>Source Files\RenderAPI</Filter>
     </ClCompile>
     <ClCompile Include="Source\BsTextureView.cpp">
-      <Filter>Source Files\RenderSystem</Filter>
+      <Filter>Source Files\RenderAPI</Filter>
     </ClCompile>
     <ClCompile Include="Source\BsTimerQuery.cpp">
-      <Filter>Source Files\RenderSystem</Filter>
+      <Filter>Source Files\RenderAPI</Filter>
     </ClCompile>
     <ClCompile Include="Source\BsVertexBuffer.cpp">
-      <Filter>Source Files\RenderSystem</Filter>
+      <Filter>Source Files\RenderAPI</Filter>
     </ClCompile>
     <ClCompile Include="Source\BsVertexData.cpp">
-      <Filter>Source Files\RenderSystem</Filter>
+      <Filter>Source Files\RenderAPI</Filter>
     </ClCompile>
     <ClCompile Include="Source\BsVertexDeclaration.cpp">
-      <Filter>Source Files\RenderSystem</Filter>
+      <Filter>Source Files\RenderAPI</Filter>
     </ClCompile>
     <ClCompile Include="Source\BsVideoModeInfo.cpp">
-      <Filter>Source Files\RenderSystem</Filter>
+      <Filter>Source Files\RenderAPI</Filter>
     </ClCompile>
     <ClCompile Include="Source\BsRendererManager.cpp">
       <Filter>Source Files\Renderer</Filter>
@@ -810,13 +810,13 @@
       <Filter>Source Files\Renderer</Filter>
     </ClCompile>
     <ClCompile Include="Source\BsRenderAPI.cpp">
-      <Filter>Source Files\RenderSystem</Filter>
+      <Filter>Source Files\RenderAPI</Filter>
     </ClCompile>
     <ClCompile Include="Source\BsRenderAPIManager.cpp">
-      <Filter>Source Files\RenderSystem</Filter>
+      <Filter>Source Files\RenderAPI</Filter>
     </ClCompile>
     <ClCompile Include="Source\BsRenderAPICapabilities.cpp">
-      <Filter>Source Files\RenderSystem</Filter>
+      <Filter>Source Files\RenderAPI</Filter>
     </ClCompile>
     <ClCompile Include="Source\BsIResourceListener.cpp">
       <Filter>Source Files</Filter>

BansheeCore/Include/BsRenderTarget.h

@@ -180,6 +180,7 @@ namespace BansheeEngine
     class BS_CORE_EXPORT RenderTarget : public CoreObject
     {
     public:
+		RenderTarget();
 		virtual ~RenderTarget() { }
 
 		/**

BansheeCore/Include/BsRenderWindow.h

@@ -161,17 +161,17 @@ namespace BansheeEngine
 		 */
 		const RenderWindowProperties& getProperties() const;
 
-	protected:
-		friend class RenderWindow;
-		friend class RenderWindowManager;
-
 		/**
 		 * @brief	Called when window is moved or resized.
 		 *
-		 * @note	Core thread.
+		 * @note	Core thread. Internal method.
 		 */
 		virtual void _windowMovedOrResized();
 
+	protected:
+		friend class RenderWindow;
+		friend class RenderWindowManager;
+
 		/**
 		 * @brief	Called when window has received focus.
 		 *

BansheeCore/Include/BsRenderWindowManager.h

@@ -68,14 +68,14 @@ namespace BansheeEngine
 		void windowFocusLost(RenderWindowCore* window);
 
 		/**
-		 * @brief	Called by the core thread when window is moved or resized.
+		 * @brief	Called by the core thread when mouse leaves a window.
 		 */
-		void windowMovedOrResized(RenderWindowCore* window);
+		void windowMouseLeft(RenderWindowCore* window);
 
 		/**
-		 * @brief	Called by the core thread when mouse leaves a window.
+		 * @brief	Called by the sim thread when window is moved or resized.
 		 */
-		void windowMouseLeft(RenderWindowCore* window);
+		void windowMovedOrResized(RenderWindow* window);
 
 		/**
 		 * @brief	Finds a sim thread equivalent of the provided core thread window implementation.

BansheeCore/Source/BsRenderTarget.cpp

@@ -38,6 +38,12 @@ namespace BansheeEngine
 		BS_EXCEPT(InvalidParametersException, "Attribute not found.");
 	}
 
+	RenderTarget::RenderTarget()
+	{
+		// We never sync from sim to core, so mark it clean to avoid overwriting core thread changes
+		markCoreClean();
+	}
+
 	void RenderTarget::setPriority(CoreAccessor& accessor, INT32 priority)
 	{
 		std::function<void(SPtr<RenderTargetCore>, INT32)> windowedFunc =

BansheeCore/Source/BsRenderWindow.cpp

@@ -210,7 +210,15 @@ namespace BansheeEngine
 	void RenderWindow::syncFromCore(const CoreSyncData& data)
 	{
 		RenderWindowProperties& props = const_cast<RenderWindowProperties&>(getProperties());
-		props = data.getData<RenderWindowProperties>();
+
+		const RenderWindowProperties& newProps = data.getData<RenderWindowProperties>();
+
+		bool movedOrResized = props.getHeight() != newProps.getHeight() || props.getWidth() != newProps.getWidth() || props.getLeft() != newProps.getLeft()
+			|| props.getTop() != newProps.getTop() || props.isFullScreen() != newProps.isFullScreen();
+
+		props = newProps;
+		if (movedOrResized)
+			RenderWindowManager::instance().windowMovedOrResized(this);
 	}
 
 	const RenderWindowProperties& RenderWindow::getProperties() const

BansheeCore/Source/BsRenderWindowManager.cpp

@@ -10,7 +10,6 @@ namespace BansheeEngine
 	{
 		Platform::onWindowFocusReceived.connect(std::bind(&RenderWindowManager::windowFocusReceived, this, _1));
 		Platform::onWindowFocusLost.connect(std::bind(&RenderWindowManager::windowFocusLost, this, _1));
-		Platform::onWindowMovedOrResized.connect(std::bind(&RenderWindowManager::windowMovedOrResized, this, _1));
 		Platform::onMouseLeftWindow.connect(std::bind(&RenderWindowManager::windowMouseLeft, this, _1));
 	}
 
@@ -68,9 +67,8 @@ namespace BansheeEngine
 		mNewWindowInFocus = nullptr;
 	}
 
-	void RenderWindowManager::windowMovedOrResized(RenderWindowCore* coreWindow)
+	void RenderWindowManager::windowMovedOrResized(RenderWindow* window)
 	{
-		RenderWindow* window = getNonCore(coreWindow);
 		bool isValidWindow = false;
 		{
 			BS_LOCK_MUTEX(mWindowMutex);
@@ -81,8 +79,6 @@ namespace BansheeEngine
 		if(!isValidWindow)
 			return;
 
-		coreWindow->_windowMovedOrResized();
-
 		BS_LOCK_MUTEX(mWindowMutex);
 
 		auto iterFind = std::find(begin(mMovedOrResizedWindows), end(mMovedOrResizedWindows), window);

BansheeCore/Source/Win32/BsPlatformWndProc.cpp

@@ -135,12 +135,15 @@ namespace BansheeEngine
 				return 0;
 			break;
 		case WM_MOVE:
+			win->_windowMovedOrResized();
 			windowMovedOrResized(win);
 			break;
 		case WM_DISPLAYCHANGE:
+			win->_windowMovedOrResized();
 			windowMovedOrResized(win);
 			break;
 		case WM_SIZE:
+			win->_windowMovedOrResized();
 			windowMovedOrResized(win);
 			break;
 		case WM_SETCURSOR:

BansheeD3D11RenderSystem/Source/BsD3D11RenderWindow.cpp

@@ -294,8 +294,7 @@ namespace BansheeEngine
 			props.mTop = top;
 			props.mLeft = left;
 
-			SetWindowPos(mHWnd, 0, top, left, 0, 0, SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE);
-			markCoreDirty();			
+			SetWindowPos(mHWnd, 0, top, left, 0, 0, SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE);		
 		}
 	}
 
@@ -316,7 +315,6 @@ namespace BansheeEngine
 			height = rc.bottom - rc.top;
 
 			SetWindowPos(mHWnd, 0, 0, 0, width, height, SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE);
-			markCoreDirty();
 		}
 	}
 

BansheeD3D9RenderSystem/Source/BsD3D9RenderWindow.cpp

@@ -359,7 +359,6 @@ namespace BansheeEngine
 			props.mTop = top;
 
 			SetWindowPos(mHWnd, 0, top, left, 0, 0, SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE);
-			markCoreDirty();
 		}
 	}
 
@@ -379,8 +378,6 @@ namespace BansheeEngine
 
 			SetWindowPos(mHWnd, 0, 0, 0, winWidth, winHeight,
 				SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE);
-
-			markCoreDirty();
 		}
 	}
 

BansheeGLRenderSystem/Source/BsWin32Window.cpp

@@ -467,8 +467,6 @@ namespace BansheeEngine
 
 			SetWindowPos(mHWnd, 0, left, top, 0, 0,
 				SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE);
-
-			markCoreDirty();
 		}
 	}
 
@@ -488,8 +486,6 @@ namespace BansheeEngine
 			height = rc.bottom - rc.top;
 			SetWindowPos(mHWnd, 0, 0, 0, width, height,
 				SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE);
-
-			markCoreDirty();
 		}
 	}
 

MBansheeEditor/EditorApplication.cs

@@ -69,7 +69,7 @@ namespace BansheeEditor
             // Register controls
             InputConfiguration inputConfig = VirtualInput.KeyConfig;
 
-		    inputConfig.RegisterButton(SceneCamera.MoveForwardBinding, ButtonCode.W);
+            inputConfig.RegisterButton(SceneCamera.MoveForwardBinding, ButtonCode.W);
             inputConfig.RegisterButton(SceneCamera.MoveBackBinding, ButtonCode.S);
             inputConfig.RegisterButton(SceneCamera.MoveLeftBinding, ButtonCode.A);
             inputConfig.RegisterButton(SceneCamera.MoveRightBinding, ButtonCode.D);

MBansheeEditor/Scene/SceneWindow.cs

@@ -61,7 +61,7 @@ namespace BansheeEditor
                 {
                     bool ctrlHeld = Input.IsButtonHeld(ButtonCode.LeftControl) || Input.IsButtonHeld(ButtonCode.RightControl);
 
-                    if(sceneViewHandler.IsHandleActive())
+                    if (sceneViewHandler.IsHandleActive())
                         sceneViewHandler.ClearHandleSelection();
                     else
                         sceneViewHandler.PickObject(Input.PointerPosition, ctrlHeld);
@@ -105,32 +105,32 @@ namespace BansheeEditor
 
         private void UpdateRenderTexture(int width, int height)
 	    {
-		    width = Math.Max(20, width);
-		    height = Math.Max(20, height);
+            width = Math.Max(20, width);
+            height = Math.Max(20, height);
 
             renderTexture = new RenderTexture2D(PixelFormat.R8G8B8A8, width, height);
             renderTexture.Priority = 1;
 
 		    if (camera == null)
 		    {
-			    SceneObject sceneCameraSO = new SceneObject("SceneCamera");
-			    camera = sceneCameraSO.AddComponent<Camera>();
-		        camera.target = renderTexture;
-		        camera.viewportRect = new Rect2(0.0f, 0.0f, 1.0f, 1.0f);
+                SceneObject sceneCameraSO = new SceneObject("SceneCamera");
+                camera = sceneCameraSO.AddComponent<Camera>();
+                camera.target = renderTexture;
+                camera.viewportRect = new Rect2(0.0f, 0.0f, 1.0f, 1.0f);
 
-			    sceneCameraSO.position = new Vector3(0, 0.5f, 1);
-			    sceneCameraSO.LookAt(new Vector3(0, 0, 0));
+                sceneCameraSO.position = new Vector3(0, 0.5f, 1);
+                sceneCameraSO.LookAt(new Vector3(0, 0, 0));
 
-		        camera.priority = 1;
-		        camera.nearClipPlane = 0.005f;
-		        camera.farClipPlane = 1000.0f;
+                camera.priority = 1;
+                camera.nearClipPlane = 0.005f;
+                camera.farClipPlane = 1000.0f;
 
-			    cameraController = sceneCameraSO.AddComponent<SceneCamera>();
+                cameraController = sceneCameraSO.AddComponent<SceneCamera>();
 
                 renderTextureGUI = new GUIRenderTexture(renderTexture);
-		        GUI.layout.AddElement(renderTextureGUI);
+                GUI.layout.AddElement(renderTextureGUI);
 
-		        sceneViewHandler = new SceneViewHandler(this, camera);
+                sceneViewHandler = new SceneViewHandler(this, camera);
 		    }
 		    else
 		    {

MBansheeEngine/Math/MathEx.cs

@@ -118,11 +118,15 @@ namespace BansheeEngine
 
         public static float Abs(float f)
         {
+            // TODO - Try newer mono version
+            throw new NotImplementedException("Mono seems to have a problem calling Math.Abs()? Call it directly if you need it.");
             return Math.Abs(f);
         }
 
         public static int Abs(int value)
         {
+            // TODO - Try newer mono version
+            throw new NotImplementedException("Mono seems to have a problem calling Math.Abs()? Call it directly if you need it.");
             return Math.Abs(value);
         }
 
@@ -266,7 +270,7 @@ namespace BansheeEngine
         {
             const float inv360 = 1.0f/360.0f;
             float angleVal = angle.GetDegrees();
-            float wrapCount = MathEx.Floor(MathEx.Abs(angleVal*inv360));
+            float wrapCount = (float)MathEx.Floor(Math.Abs(angleVal * inv360));
 
             if (angleVal > 0.0f)
                 angleVal -= 360.0f * wrapCount;

TODO.txt

@@ -12,12 +12,11 @@
 
 See GDrive/Resources doc for resources refactor
 
-Fix the weird Mono crash that seems to happen in SceneCamera but gets fixed by commenting out various bits of code. However it can be consistently reproduced.
 Scene view initial viewport size isn't valid size
+ - Window resize message arrives before sync happens
 Screen grid isn't rendered
 Handles aren't properly rendered
 Icon gizmo seems to sometimes get struck to the side of the camera
-Clicking the screen causes a white flash
 
 Other:
 Window resize end callback