Removed CanvasObject->AddToRoot(), fixed problem in UJavascriptEditorViewport::ProjectWorldToScreen/DeprojectSceneToWorld()

Author: arthursw

Source/JavascriptEditor/JavascriptEdMode.cpp

@@ -9,6 +9,28 @@ PRAGMA_DISABLE_SHADOW_VARIABLE_WARNINGS
 
 #if WITH_EDITOR
 
+/** Util to find named canvas in transient package, and create if not found */
+static UCanvas* GetCanvasByName(FName CanvasName)
+{
+    // Cache to avoid FString/FName conversions/compares
+    static TMap<FName, UCanvas*> CanvasMap;
+    UCanvas** FoundCanvas = CanvasMap.Find(CanvasName);
+    if (!FoundCanvas)
+    {
+        UCanvas* CanvasObject = FindObject<UCanvas>(GetTransientPackage(), *CanvasName.ToString());
+        if (!CanvasObject)
+        {
+            CanvasObject = NewObject<UCanvas>(GetTransientPackage(), CanvasName);
+            CanvasObject->AddToRoot();
+        }
+        
+        CanvasMap.Add(CanvasName, CanvasObject);
+        return CanvasObject;
+    }
+    
+    return *FoundCanvas;
+}
+
 class FJavascriptEdToolkit : public FModeToolkit, public FGCObject
 {
 public:
@@ -364,4 +386,4 @@ void UJavascriptEdMode::Unregister()
 
 #endif
 
-PRAGMA_ENABLE_SHADOW_VARIABLE_WARNINGS
+PRAGMA_ENABLE_SHADOW_VARIABLE_WARNINGS

Source/JavascriptEditor/JavascriptEditorLibrary.h

@@ -102,28 +102,6 @@ struct FJavascriptExtensibilityManager
 #endif
 };
 
-/** Util to find named canvas in transient package, and create if not found */
-static UCanvas* GetCanvasByName(FName CanvasName)
-{
-    // Cache to avoid FString/FName conversions/compares
-    static TMap<FName, UCanvas*> CanvasMap;
-    UCanvas** FoundCanvas = CanvasMap.Find(CanvasName);
-    if (!FoundCanvas)
-    {
-        UCanvas* CanvasObject = FindObject<UCanvas>(GetTransientPackage(), *CanvasName.ToString());
-        if (!CanvasObject)
-        {
-            CanvasObject = NewObject<UCanvas>(GetTransientPackage(), CanvasName);
-            CanvasObject->AddToRoot();
-        }
-        
-        CanvasMap.Add(CanvasName, CanvasObject);
-        return CanvasObject;
-    }
-    
-    return *FoundCanvas;
-}
-
 /**
  * 
  */

Source/JavascriptEditor/JavascriptEditorViewport.cpp

@@ -131,17 +131,17 @@ class FJavascriptEditorViewportClient : public FEditorViewportClient
 
         if (Widget.IsValid() && Widget->OnDrawCanvas.IsBound())
         {
-            // Create a temporary canvas if there isn't already one.
-            static FName CanvasObjectName(TEXT("ViewportCanvasObject"));
-            UCanvas* CanvasObject = GetCanvasByName(CanvasObjectName);
-            CanvasObject->Canvas = &Canvas;
+            if(Widget->Canvas == nullptr){
+                Widget->Canvas = NewObject<UCanvas>(Widget.Get());
+            }
 
-            CanvasObject->Init(View.UnscaledViewRect.Width(), View.UnscaledViewRect.Height(), const_cast<FSceneView*>(&View));
-            CanvasObject->ApplySafeZoneTransform();
+            Widget->Canvas->Canvas = &Canvas;
+            Widget->Canvas->Init(View.UnscaledViewRect.Width(), View.UnscaledViewRect.Height(), const_cast<FSceneView*>(&View));
+            Widget->Canvas->ApplySafeZoneTransform();
 
-            Widget->OnDrawCanvas.Execute(CanvasObject, Widget.Get());
+            Widget->OnDrawCanvas.Execute(Widget->Canvas, Widget.Get());
 
-            CanvasObject->PopSafeZoneTransform();
+            Widget->Canvas->PopSafeZoneTransform();
         }
     }
 
@@ -621,15 +621,21 @@ void UJavascriptEditorViewport::DeprojectScreenToWorld(const FVector2D &ScreenPo
 {
     if (ViewportWidget.IsValid())
     {
-        FSceneView::DeprojectScreenToWorld(ScreenPosition, ViewRect, ViewMatrices.GetInvViewProjMatrix(), OutRayOrigin, OutRayDirection);
+        FSceneViewFamilyContext ViewFamily(FSceneViewFamily::ConstructionValues( ViewportWidget->EditorViewportClient->Viewport, ViewportWidget->EditorViewportClient->GetScene(), ViewportWidget->EditorViewportClient->EngineShowFlags ));
+        FSceneView* View = ViewportWidget->EditorViewportClient->CalcSceneView(&ViewFamily);
+        
+        FSceneView::DeprojectScreenToWorld(ScreenPosition, View->ViewRect, View->ViewMatrices.GetInvViewProjMatrix(), OutRayOrigin, OutRayDirection);
     }
 }
 
 void UJavascriptEditorViewport::ProjectWorldToScreen(const FVector &WorldPosition, FVector2D &OutScreenPosition)
 {
     if (ViewportWidget.IsValid())
     {
-        FSceneView::ProjectWorldToScreen(WorldPosition, ViewRect, ViewMatrices.GetViewProjMatrix(), OutScreenPosition);
+        FSceneViewFamilyContext ViewFamily(FSceneViewFamily::ConstructionValues( ViewportWidget->EditorViewportClient->Viewport, ViewportWidget->EditorViewportClient->GetScene(), ViewportWidget->EditorViewportClient->EngineShowFlags ));
+        FSceneView* View = ViewportWidget->EditorViewportClient->CalcSceneView(&ViewFamily);
+        
+        FSceneView::ProjectWorldToScreen(WorldPosition, View->ViewRect, View->ViewMatrices.GetViewProjMatrix(), OutScreenPosition);
     }
 }
 

Source/JavascriptEditor/JavascriptEditorViewport.h

@@ -31,7 +31,7 @@ class JAVASCRIPTEDITOR_API UJavascriptEditorViewport : public UPanelWidget
 	DECLARE_DYNAMIC_DELEGATE_RetVal_ThreeParams(bool, FOnMouseMove, int32, x, int32, y, UJavascriptEditorViewport*, Instance);
 	DECLARE_DYNAMIC_DELEGATE_RetVal_OneParam(bool, FOnMouseLeave, UJavascriptEditorViewport*, Instance);
 	DECLARE_DYNAMIC_DELEGATE_TwoParams(FOnViewportDraw, const FJavascriptPDI&, PDI, UJavascriptEditorViewport*, Instance);
-    	DECLARE_DYNAMIC_DELEGATE_TwoParams(FOnViewportDrawCanvas, UCanvas*, Canvas, UJavascriptEditorViewport*, Instance);
+    DECLARE_DYNAMIC_DELEGATE_TwoParams(FOnViewportDrawCanvas, UCanvas*, Canvas, UJavascriptEditorViewport*, Instance);
 	DECLARE_DYNAMIC_DELEGATE_RetVal_OneParam(FVector, FOnGetWidgetLocation, UJavascriptEditorViewport*, Instance);
 	DECLARE_DYNAMIC_DELEGATE_RetVal_OneParam(FRotator, FOnGetWidgetRotation, UJavascriptEditorViewport*, Instance);
 	DECLARE_DYNAMIC_DELEGATE_RetVal_OneParam(EJavascriptWidgetMode, FOnGetWidgetMode, UJavascriptEditorViewport*, Instance);
@@ -66,8 +66,8 @@ class JAVASCRIPTEDITOR_API UJavascriptEditorViewport : public UPanelWidget
 	UPROPERTY(EditAnywhere, Category = Events, meta = (IsBindableEvent = "True"))
 	FOnViewportDraw OnDraw;
 
-    	UPROPERTY(EditAnywhere, Category = Events, meta = (IsBindableEvent = "True"))
-    	FOnViewportDrawCanvas OnDrawCanvas;
+    UPROPERTY(EditAnywhere, Category = Events, meta = (IsBindableEvent = "True"))
+    FOnViewportDrawCanvas OnDrawCanvas;
 
 	UPROPERTY(EditAnywhere, Category = Events, meta = (IsBindableEvent = "True"))
 	FOnGetWidgetLocation OnGetWidgetLocation;
@@ -78,9 +78,9 @@ class JAVASCRIPTEDITOR_API UJavascriptEditorViewport : public UPanelWidget
 	UPROPERTY(EditAnywhere, Category = Events, meta = (IsBindableEvent = "True"))
 	FOnGetWidgetMode OnGetWidgetMode;
 
-	FIntRect ViewRect;
-	FViewMatrices ViewMatrices;
-
+    UPROPERTY()
+    UCanvas* Canvas;
+    
 	UFUNCTION(BlueprintCallable, Category = "Viewport")
 	UWorld* GetViewportWorld() const;