😴 Sleepy Commit

wobbier · Aug 17, 2024 · 10af8c0 · 10af8c0
1 parent e58c9a8
commit 10af8c0
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 5 deletions.
diff --git a/Modules/Dementia/Source/Mathf.h b/Modules/Dementia/Source/Mathf.h
@@ -65,4 +65,14 @@ namespace Mathf
         const float bestRatio = std::min( inSizeConstraints.x / inSize.x, inSizeConstraints.y / inSize.y );
         return { inSize.x * bestRatio, inSize.y * bestRatio };
     }
+
+    inline float Min( float x, float y )
+    {
+        return std::min( x, y );
+    }
+
+    inline float Max( float x, float y )
+    {
+        return std::max( x, y );
+    }
 }
diff --git a/Modules/Dementia/Source/Types/AssetType.h b/Modules/Dementia/Source/Types/AssetType.h
@@ -34,6 +34,8 @@ namespace {
             return "Level";
         case AssetType::Shader:
             return "Shader";
+        case AssetType::ShaderGraph:
+            return "ShaderGraph";
         case AssetType::Prefab:
             return "Prefab";
         case AssetType::UI:

diff --git a/Modules/Moonlight/Source/Device/FrameBuffer.cpp b/Modules/Moonlight/Source/Device/FrameBuffer.cpp
@@ -1,5 +1,6 @@
 #include "FrameBuffer.h"
 #include <CLog.h>
+#include "Mathf.h"
 
 Moonlight::FrameBuffer::FrameBuffer( uint32_t width, uint32_t height )
     : Width( width )
@@ -20,8 +21,8 @@ void Moonlight::FrameBuffer::Resize( Vector2 newSize )
 {
     CLog::Log( CLog::LogType::Warning, "[TODO] Trying to resize frame buffer." );
 
-    Width = newSize.x;
-    Height = newSize.y;
+    Width = Mathf::Max( newSize.x, 1.f );
+    Height = Mathf::Max( newSize.y, 1.f );
     ReCreate( m_resetFlags );
 }
 

diff --git a/Source/Components/UI/BasicUIView.cpp b/Source/Components/UI/BasicUIView.cpp
@@ -62,6 +62,7 @@ void BasicUIView::OnDOMReady( ultralight::View* caller,
     GlobalWindow["PlaySound"] = BindJSCallback( &BasicUIView::PlaySound );
     GlobalWindow["LoadScene"] = BindJSCallback( &BasicUIView::LoadScene );
     GlobalWindow["Quit"] = BindJSCallback( &BasicUIView::Quit );
+    GlobalWindow["AreToolsEnabled"] = BindJSCallbackWithRetval( &BasicUIView::AreToolsEnabled );
 
     OnUILoad( GlobalWindow, caller );
 }
@@ -102,6 +103,7 @@ void BasicUIView::PlaySound( const ultralight::JSObject& thisObject, const ultra
     evt.Fire();
 }
 
+
 void BasicUIView::LoadScene( const ultralight::JSObject& thisObject, const ultralight::JSArgs& args )
 {
     SharedPtr<LoadSceneEvent> evt = MakeShared<LoadSceneEvent>();
@@ -116,6 +118,16 @@ void BasicUIView::Quit( const ultralight::JSObject& thisObject, const ultralight
 {
     GetEngine().Quit();
 }
+
+ultralight::JSValue BasicUIView::AreToolsEnabled( const ultralight::JSObject& thisObject, const ultralight::JSArgs& args )
+{
+#if USING( ME_TOOLS )
+    return ultralight::JSValue( true );
+#else
+    return ultralight::JSValue( false );
+#endif
+}
+
 #endif
 
 #if USING( ME_EDITOR )

diff --git a/Source/Components/UI/BasicUIView.h b/Source/Components/UI/BasicUIView.h
@@ -60,6 +60,7 @@ class BasicUIView
     void PlaySound( const ultralight::JSObject& thisObject, const ultralight::JSArgs& args );
     void LoadScene( const ultralight::JSObject& thisObject, const ultralight::JSArgs& args );
     void Quit( const ultralight::JSObject& thisObject, const ultralight::JSArgs& args );
+    ultralight::JSValue AreToolsEnabled( const ultralight::JSObject& thisObject, const ultralight::JSArgs& args );
 #endif
 
 private:

diff --git a/Source/Cores/UI/UICore.cpp b/Source/Cores/UI/UICore.cpp
@@ -146,7 +146,7 @@ void UICore::Update( const UpdateContext& inUpdateContext )
         {
             InitUIView( view );
         }
-        
+
         view.OnUpdate();
     }
 #if USING( ME_UI )
@@ -341,8 +341,8 @@ void UICore::OnResize( const Vector2& NewSize )
             bgfx::destroy( m_uiTexture );
         }
 
-        m_uiTexture = bgfx::createTexture2D( static_cast<uint16_t>( NewSize.x )
-            , static_cast<uint16_t>( Mathf::Abs( NewSize.y ) )
+        m_uiTexture = bgfx::createTexture2D( static_cast<uint16_t>( Mathf::Max( NewSize.x, 1.f ) )
+            , static_cast<uint16_t>( Mathf::Abs( Mathf::Max( NewSize.y, 1.f ) ) )
             , false
             , 1
             , bgfx::TextureFormat::BGRA8