misc fixes

getnamo · Mar 13, 2020 · 264055a · 264055a
1 parent 167b1d0
commit 264055a
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 4 deletions.
diff --git a/Content/BluiWidget.uasset b/Content/BluiWidget.uasset
diff --git a/Content/BluiWorldWidgetActorExample.uasset b/Content/BluiWorldWidgetActorExample.uasset
diff --git a/Content/InteractableBluiWidgetActor.uasset b/Content/InteractableBluiWidgetActor.uasset
diff --git a/Source/Blu/Private/BluEye.cpp b/Source/Blu/Private/BluEye.cpp
@@ -42,6 +42,8 @@ void UBluEye::init()
 	browserSettings.universal_access_from_file_urls = STATE_ENABLED;
 	browserSettings.file_access_from_file_urls = STATE_ENABLED;
 
+	browserSettings.web_security = STATE_DISABLED;
+
 	info.width = Width;
 	info.height = Height;
 
@@ -99,11 +101,12 @@ void UBluEye::ResetTexture()
 
 	ResetMatInstance();
 
+	bValidTexture = true;
 }
 
 void UBluEye::DestroyTexture()
 {
-	// Here we destory the texture and its resource
+	// Here we destroy the texture and its resource
 	if (Texture)
 	{
 		Texture->RemoveFromRoot();
@@ -116,6 +119,7 @@ void UBluEye::DestroyTexture()
 
 		Texture->MarkPendingKill();
 		Texture = nullptr;
+		bValidTexture = false;
 	}
 }
 
@@ -128,7 +132,7 @@ void UBluEye::TextureUpdate(const void *buffer, FUpdateTextureRegion2D *updateRe
 	}
 
 	//todo: remove debug address hack
-	if (Texture && (int64)Texture != 0xdddddddddddddddd && Texture->IsValidLowLevel() && Texture->Resource)
+	if (bValidTexture)
 	{
 
 		if (buffer == nullptr)
@@ -320,10 +324,14 @@ UTexture2D* UBluEye::ResizeBrowser(const int32 NewWidth, const int32 NewHeight)
 	renderer->Width = NewWidth;
 	renderer->Height = NewHeight;
 
+	bValidTexture = false;
+
 	Texture = UTexture2D::CreateTransient(Width, Height, PF_B8G8R8A8);
 	Texture->AddToRoot();
 	Texture->UpdateResource();
 
+	bValidTexture = true;
+
 	// Let the browser's host know we resized it
 	browser->GetHost()->WasResized();
 
@@ -350,10 +358,14 @@ UTexture2D* UBluEye::CropWindow(const int32 Y, const int32 X, const int32 NewWid
 	renderer->Width = NewWidth;
 	renderer->Height = NewHeight;
 
+	bValidTexture = false;
+
 	Texture = UTexture2D::CreateTransient(Width, Height, PF_B8G8R8A8);
 	Texture->AddToRoot();
 	Texture->UpdateResource();
 
+	bValidTexture = true;
+
 	// Now we can keep going
 	bEnabled = true;
 
@@ -582,7 +594,7 @@ UTexture2D* UBluEye::GetTexture() const
 {
 	if (!Texture)
 	{
-		return UTexture2D::CreateTransient(Width, Height);
+		return UTexture2D::CreateTransient(Width, Height, PF_B8G8R8A8);
 	}
 
 	return Texture;
@@ -621,7 +633,7 @@ void UBluEye::ResetMatInstance()
 		return;
 	}
 
-	MaterialInstance->SetTextureParameterValue(TextureParameterName, GetTexture());
+	MaterialInstance->SetTextureParameterValue(TextureParameterName, Texture);
 }
 
 void UBluEye::CloseBrowser()

diff --git a/Source/Blu/Public/BluEye.h b/Source/Blu/Public/BluEye.h
@@ -297,4 +297,6 @@ class BLU_API UBluEye : public UObject
 
 	FBluTextureParams RenderParams;
 
+	FThreadSafeBool bValidTexture;
+
 };
Original file line number	Diff line number	Diff line change
Expand Up		@@ -297,4 +297,6 @@ class BLU_API UBluEye : public UObject

		FBluTextureParams RenderParams;

		FThreadSafeBool bValidTexture;

		};