Skip to content

Added bindings to JavascriptEditorViewport #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Sep 16, 2016
Merged

Added bindings to JavascriptEditorViewport #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4d099d2
Added bindings to JavascriptEditorViewport to react to mouse moves an…
arthursw Aug 26, 2016
01c94c9
Exposed DrawCanvas to EditorViewport
arthursw Sep 15, 2016
a4b35cc
Merge remote-tracking branch 'upstream/master'
arthursw Sep 15, 2016
fec2db2
Merge branch 'ucanvas'
arthursw Sep 15, 2016
fda52a1
reformat/align code.
arthursw Sep 15, 2016
cf41d20
Update JavascriptEditorViewport.h
arthursw Sep 15, 2016
d7eb9c1
renamed DrawHUD into DrawCanvas
arthursw Sep 15, 2016
256dcf5
added GetWidgetMode()
arthursw Sep 15, 2016
ac845cb
Removed CanvasObject->AddToRoot(), fixed problem in UJavascriptEditor…
arthursw Sep 16, 2016
4571a2d
create a private object which inherits from FGCObject to hold UCanvas…
arthursw Sep 16, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions Source/JavascriptEditor/JavascriptEdMode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,23 @@ PRAGMA_DISABLE_SHADOW_VARIABLE_WARNINGS
/** 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;
// 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
Expand Down Expand Up @@ -386,4 +386,4 @@ void UJavascriptEdMode::Unregister()

#endif

PRAGMA_ENABLE_SHADOW_VARIABLE_WARNINGS
PRAGMA_ENABLE_SHADOW_VARIABLE_WARNINGS
165 changes: 163 additions & 2 deletions Source/JavascriptEditor/JavascriptEditorViewport.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,25 @@

PRAGMA_DISABLE_SHADOW_VARIABLE_WARNINGS


class FCanvasOwner : public FGCObject
{

public:
FCanvasOwner(): FGCObject()
{
Canvas = nullptr;
}

virtual void AddReferencedObjects(FReferenceCollector& Collector) override
{
Collector.AddReferencedObject(Canvas);
}

public:
UCanvas* Canvas;
};

#if WITH_EDITOR
class FJavascriptEditorViewportClient : public FEditorViewportClient
{
Expand Down Expand Up @@ -49,6 +68,60 @@ class FJavascriptEditorViewportClient : public FEditorViewportClient
}
}

virtual bool InputKey(FViewport* Viewport, int32 ControllerId, FKey Key, EInputEvent Event, float AmountDepressed = 1.f, bool bGamepad = false)
{
FEditorViewportClient::InputKey(Viewport, ControllerId, Key, Event, AmountDepressed, bGamepad);
if (Widget.IsValid() && Widget->OnInputKey.IsBound())
{
return Widget->OnInputKey.Execute(ControllerId, Key, Event, Widget.Get());
}
else
{
return false;
}
}

virtual bool InputAxis(FViewport* Viewport, int32 ControllerId, FKey Key, float Delta, float DeltaTime, int32 NumSamples = 1, bool bGamepad = false) override
{
FEditorViewportClient::InputAxis(Viewport, ControllerId, Key, Delta, DeltaTime, NumSamples, bGamepad);
if (Widget.IsValid() && Widget->OnInputAxis.IsBound())
{
return Widget->OnInputAxis.Execute(ControllerId, Key, Delta, DeltaTime, Widget.Get());
}
else
{
return false;
}
}

virtual void MouseEnter(FViewport* Viewport, int32 x, int32 y) override
{

FEditorViewportClient::MouseEnter(Viewport, x, y);
if (Widget.IsValid() && Widget->OnMouseEnter.IsBound())
{
Widget->OnMouseEnter.Execute(x, y, Widget.Get());
}
}

virtual void MouseMove(FViewport* Viewport, int32 x, int32 y) override
{
FEditorViewportClient::MouseMove(Viewport, x, y);
if (Widget.IsValid() && Widget->OnMouseMove.IsBound())
{
Widget->OnMouseMove.Execute(x, y, Widget.Get());
}
}

virtual void MouseLeave(FViewport* Viewport) override
{
FEditorViewportClient::MouseLeave(Viewport);
if (Widget.IsValid() && Widget->OnMouseLeave.IsBound())
{
Widget->OnMouseLeave.Execute(Widget.Get());
}
}

virtual bool InputWidgetDelta(FViewport* InViewport, EAxisList::Type CurrentAxis, FVector& Drag, FRotator& Rot, FVector& Scale) override
{
if (Widget.IsValid() && Widget->OnInputWidgetDelta.IsBound())
Expand All @@ -70,6 +143,26 @@ class FJavascriptEditorViewportClient : public FEditorViewportClient
Widget->OnDraw.Execute(FJavascriptPDI(PDI),Widget.Get());
}
}

virtual void DrawCanvas(FViewport& InViewport, FSceneView& View, FCanvas& Canvas) override
{
FEditorViewportClient::DrawCanvas(InViewport, View, Canvas);

if (Widget.IsValid() && Widget->OnDrawCanvas.IsBound())
{
if(CanvasOwner.Canvas == nullptr){
CanvasOwner.Canvas = NewObject<UCanvas>(Widget.Get());
}

CanvasOwner.Canvas->Canvas = &Canvas;
CanvasOwner.Canvas->Init(View.UnscaledViewRect.Width(), View.UnscaledViewRect.Height(), const_cast<FSceneView*>(&View));
CanvasOwner.Canvas->ApplySafeZoneTransform();

Widget->OnDrawCanvas.Execute(CanvasOwner.Canvas, Widget.Get());

CanvasOwner.Canvas->PopSafeZoneTransform();
}
}

virtual FWidget::EWidgetMode GetWidgetMode() const override
{
Expand Down Expand Up @@ -141,6 +234,9 @@ class FJavascriptEditorViewportClient : public FEditorViewportClient
FPostProcessSettings PostProcessSettings;
float PostProcessSettingsWeight;
FLinearColor BackgroundColor;

private:
FCanvasOwner CanvasOwner;
};

class SAutoRefreshEditorViewport : public SEditorViewport
Expand Down Expand Up @@ -223,6 +319,16 @@ class SAutoRefreshEditorViewport : public SEditorViewport
return EditorViewportClient->GetCameraSpeedSetting();
}

void SetViewportType(ELevelViewportType InViewportType)
{
EditorViewportClient->SetViewportType(InViewportType);
}

void SetViewMode(EViewModeIndex InViewModeIndex)
{
EditorViewportClient->SetViewMode(InViewModeIndex);
}

void OverridePostProcessSettings(const FPostProcessSettings& PostProcessSettings, float Weight)
{
EditorViewportClient->PostProcessSettings = PostProcessSettings;
Expand Down Expand Up @@ -259,7 +365,13 @@ class SAutoRefreshEditorViewport : public SEditorViewport
void SetWidgetMode(EJavascriptWidgetMode WidgetMode)
{
EditorViewportClient->SetWidgetMode(WidgetMode == EJavascriptWidgetMode::WM_None ? FWidget::WM_None : (FWidget::EWidgetMode)WidgetMode);
}
}

EJavascriptWidgetMode GetWidgetMode()
{
FWidget::EWidgetMode WidgetMode = EditorViewportClient->GetWidgetMode();
return FWidget::WM_None ? EJavascriptWidgetMode::WM_None : (EJavascriptWidgetMode)WidgetMode;
}

FString GetEngineShowFlags()
{
Expand Down Expand Up @@ -500,6 +612,55 @@ void UJavascriptEditorViewport::SetWidgetMode(EJavascriptWidgetMode WidgetMode)
}
}

EJavascriptWidgetMode UJavascriptEditorViewport::GetWidgetMode()
{
if (ViewportWidget.IsValid())
{
return ViewportWidget->GetWidgetMode();
}
else {
return EJavascriptWidgetMode::WM_None;
}
}

void UJavascriptEditorViewport::SetViewportType(ELevelViewportType InViewportType)
{
if (ViewportWidget.IsValid())
{
ViewportWidget->SetViewportType(InViewportType);
}
}

void UJavascriptEditorViewport::SetViewMode(EViewModeIndex InViewModeIndex)
{
if (ViewportWidget.IsValid())
{
ViewportWidget->SetViewMode(InViewModeIndex);
}
}

void UJavascriptEditorViewport::DeprojectScreenToWorld(const FVector2D &ScreenPosition, FVector &OutRayOrigin, FVector& OutRayDirection)
{
if (ViewportWidget.IsValid())
{
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())
{
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);
}
}

FString UJavascriptEditorViewport::GetEngineShowFlags()
{
if (ViewportWidget.IsValid())
Expand All @@ -526,4 +687,4 @@ bool UJavascriptEditorViewport::SetEngineShowFlags(const FString& In)

PRAGMA_ENABLE_SHADOW_VARIABLE_WARNINGS

#undef LOCTEXT_NAMESPACE
#undef LOCTEXT_NAMESPACE
43 changes: 41 additions & 2 deletions Source/JavascriptEditor/JavascriptEditorViewport.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,13 @@ class JAVASCRIPTEDITOR_API UJavascriptEditorViewport : public UPanelWidget
DECLARE_DYNAMIC_DELEGATE_FourParams(FOnViewportTrackingStarted, const FJavascriptInputEventState&, InputState, bool, bIsDraggingWidget, bool, bNudge, UJavascriptEditorViewport*, Instance);
DECLARE_DYNAMIC_DELEGATE_OneParam(FOnViewportTrackingStopped, UJavascriptEditorViewport*, Instance);
DECLARE_DYNAMIC_DELEGATE_RetVal_FourParams(bool, FOnInputWidgetDelta, FVector&, Drag, FRotator&, Rot, FVector&, Scale, UJavascriptEditorViewport*, Instance);
DECLARE_DYNAMIC_DELEGATE_RetVal_FourParams(bool, FOnInputKey, int32, ControllerId, FKey, Key, EInputEvent, Event, UJavascriptEditorViewport*, Instance);
DECLARE_DYNAMIC_DELEGATE_RetVal_FiveParams(bool, FOnInputAxis, int32, ControllerId, FKey, Key, float, Delta, float, DeltaTime, UJavascriptEditorViewport*, Instance);
DECLARE_DYNAMIC_DELEGATE_RetVal_ThreeParams(bool, FOnMouseEnter, int32, x, int32, y, UJavascriptEditorViewport*, Instance);
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_RetVal_OneParam(FVector, FOnGetWidgetLocation, UJavascriptEditorViewport*, Instance);
DECLARE_DYNAMIC_DELEGATE_RetVal_OneParam(FRotator, FOnGetWidgetRotation, UJavascriptEditorViewport*, Instance);
DECLARE_DYNAMIC_DELEGATE_RetVal_OneParam(EJavascriptWidgetMode, FOnGetWidgetMode, UJavascriptEditorViewport*, Instance);
Expand All @@ -42,9 +48,27 @@ class JAVASCRIPTEDITOR_API UJavascriptEditorViewport : public UPanelWidget
UPROPERTY(EditAnywhere, Category = Events, meta = (IsBindableEvent = "True"))
FOnInputWidgetDelta OnInputWidgetDelta;

UPROPERTY(EditAnywhere, Category = Events, meta = (IsBindableEvent = "True"))
FOnInputKey OnInputKey;

UPROPERTY(EditAnywhere, Category = Events, meta = (IsBindableEvent = "True"))
FOnInputAxis OnInputAxis;

UPROPERTY(EditAnywhere, Category = Events, meta = (IsBindableEvent = "True"))
FOnMouseEnter OnMouseEnter;

UPROPERTY(EditAnywhere, Category = Events, meta = (IsBindableEvent = "True"))
FOnMouseMove OnMouseMove;

UPROPERTY(EditAnywhere, Category = Events, meta = (IsBindableEvent = "True"))
FOnMouseLeave OnMouseLeave;

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"))
FOnGetWidgetLocation OnGetWidgetLocation;

Expand All @@ -53,7 +77,7 @@ class JAVASCRIPTEDITOR_API UJavascriptEditorViewport : public UPanelWidget

UPROPERTY(EditAnywhere, Category = Events, meta = (IsBindableEvent = "True"))
FOnGetWidgetMode OnGetWidgetMode;

UFUNCTION(BlueprintCallable, Category = "Viewport")
UWorld* GetViewportWorld() const;

Expand Down Expand Up @@ -107,13 +131,28 @@ class JAVASCRIPTEDITOR_API UJavascriptEditorViewport : public UPanelWidget

UFUNCTION(BlueprintCallable, Category = "Viewport")
void SetWidgetMode(EJavascriptWidgetMode WidgetMode);


UFUNCTION(BlueprintCallable, Category = "Viewport")
EJavascriptWidgetMode GetWidgetMode();

UFUNCTION(BlueprintCallable, Category = "Viewport")
FString GetEngineShowFlags();

UFUNCTION(BlueprintCallable, Category = "Viewport")
bool SetEngineShowFlags(const FString& In);

UFUNCTION(BlueprintCallable, Category = "Viewport")
void SetViewportType(ELevelViewportType InViewportType);

UFUNCTION(BlueprintCallable, Category = "Viewport")
void SetViewMode(EViewModeIndex InViewModeIndex);

UFUNCTION(BlueprintCallable, Category = "Viewport")
void DeprojectScreenToWorld(const FVector2D &ScreenPosition, FVector &OutRayOrigin, FVector& OutRayDirection);

UFUNCTION(BlueprintCallable, Category = "Viewport")
void ProjectWorldToScreen(const FVector &WorldPosition, FVector2D &OutScreenPosition);

// UPanelWidget
virtual UClass* GetSlotClass() const override;
virtual void OnSlotAdded(UPanelSlot* Slot) override;
Expand Down