[Examples] Minor changes in examples.

LukasBanana · Sep 7, 2024 · 95ff758 · 95ff758
1 parent 794ed2d
commit 95ff758
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 13 deletions.
diff --git a/examples/Cpp/ExampleBase/Stopwatch.cpp b/examples/Cpp/ExampleBase/Stopwatch.cpp
@@ -23,14 +23,14 @@ void Stopwatch::Start()
 std::uint64_t Stopwatch::Stop()
 {
     isRunning_ = false;
-    auto endTick = LLGL::Timer::Tick();
+    const std::uint64_t endTick = LLGL::Timer::Tick();
     return endTick - startTick_;
 }
 
 void Stopwatch::MeasureTime()
 {
     const bool wasRunning = IsRunning();
-    auto elapsed = Stop();
+    const std::uint64_t elapsed = Stop();
     Start();
     if (wasRunning)
         deltaTime_ = static_cast<double>(elapsed) / static_cast<double>(GetFrequency());

diff --git a/examples/Cpp/PBR/Example.Sky.vert b/examples/Cpp/PBR/Example.Sky.vert
@@ -41,7 +41,7 @@ This function generates the coordinates for a fullscreen triangle with its verte
    *----------*--------*
 (-1,-1)    (+1,-1)  (+3,-1)
 */
-vec4 GetFullscreenTriangleVertex(uint id)
+vec4 GetFullscreenTriangleVertex(int id)
 {
     return vec4(
         (id == 2 ? 3.0 : -1.0),

diff --git a/examples/Cpp/PostProcessing/Example.cpp b/examples/Cpp/PostProcessing/Example.cpp
@@ -13,7 +13,7 @@
 #endif
 
 // Enables custom render pass to clear at the begin of a render pass section (more efficient)
-#define ENABLE_CUSTOM_RENDER_PASS
+#define ENABLE_CUSTOM_RENDER_PASS 1
 
 
 class Example_PostProcessing : public ExampleBase
@@ -59,7 +59,7 @@ class Example_PostProcessing : public ExampleBase
     LLGL::RenderTarget*     renderTargetBlurX   = nullptr;
     LLGL::RenderTarget*     renderTargetBlurY   = nullptr;
 
-    #ifdef ENABLE_CUSTOM_RENDER_PASS
+    #if ENABLE_CUSTOM_RENDER_PASS
     LLGL::RenderPass*       renderPassScene     = nullptr;
     #endif
 
@@ -99,7 +99,7 @@ class Example_PostProcessing : public ExampleBase
         CreateSamplers();
         CreateTextures();
         CreateRenderTargets();
-        #ifdef ENABLE_CUSTOM_RENDER_PASS
+        #if ENABLE_CUSTOM_RENDER_PASS
         CreateRenderPasses();
         #endif
         CreatePipelineLayouts();
@@ -168,7 +168,7 @@ class Example_PostProcessing : public ExampleBase
 
             // Load final shader program
             shaderPipelineFinal.vs = LoadShader({ LLGL::ShaderType::Vertex,   "PostProcess.vert" });
-            shaderPipelineFinal.ps = LoadShader({ LLGL::ShaderType::Fragment, "Final.frag" });
+            shaderPipelineFinal.ps = LoadShader({ LLGL::ShaderType::Fragment, "Final.frag"       });
         }
         else if (Supported(LLGL::ShadingLanguage::SPIRV))
         {
@@ -282,7 +282,7 @@ class Example_PostProcessing : public ExampleBase
         renderTargetBlurY = renderer->CreateRenderTarget(renderTargetBlurYDesc);
     }
 
-    #ifdef ENABLE_CUSTOM_RENDER_PASS
+    #if ENABLE_CUSTOM_RENDER_PASS
 
     void CreateRenderPasses()
     {
@@ -524,7 +524,7 @@ class Example_PostProcessing : public ExampleBase
             // Set graphics pipeline and vertex buffer for scene rendering
             commands->SetVertexBuffer(*vertexBufferScene);
 
-            #ifdef ENABLE_CUSTOM_RENDER_PASS
+            #if ENABLE_CUSTOM_RENDER_PASS
 
             // Clear scene render target with render pass and initial clear values
             LLGL::ClearValue clearValues[3];
@@ -547,7 +547,7 @@ class Example_PostProcessing : public ExampleBase
                 // Set viewport to full size
                 commands->SetViewport(viewportFull);
 
-                #ifndef ENABLE_CUSTOM_RENDER_PASS
+                #if !ENABLE_CUSTOM_RENDER_PASS
 
                 // Clear individual buffers in render target (color, glossiness, depth)
                 constexpr float glossinessColor[4] = { 0, 0, 0, 0 };

diff --git a/examples/Cpp/Texturing/Example.cpp b/examples/Cpp/Texturing/Example.cpp
@@ -10,6 +10,11 @@
 #include <LLGL/Utils/TypeNames.h>
 #include <ImageReader.h>
 #include <DDSImageReader.h>
+#include <LLGL/Platform/Platform.h>
+
+#if !defined(LLGL_OS_ANDROID) && !defined(LLGL_OS_WASM)
+#   define ENABLE_COMPRESSED_TEXTURE_DDX 1
+#endif
 
 
 class Example_Texturing : public ExampleBase
@@ -130,7 +135,7 @@ class Example_Texturing : public ExampleBase
                 texDesc.type        = LLGL::TextureType::Texture2D;
 
                 // Texture hardware format: RGBA with normalized 8-bit unsigned char type
-                texDesc.format      = LLGL::Format::BGRA8UNorm;//RGBA8UNorm; //BGRA8UNorm
+                texDesc.format      = LLGL::Format::RGBA8UNorm; //BGRA8UNorm
 
                 // Texture size
                 texDesc.extent      = reader.GetTextureDesc().extent;
@@ -179,8 +184,13 @@ class Example_Texturing : public ExampleBase
 
     void CreateTextures()
     {
+        #if ENABLE_COMPRESSED_TEXTURE_DDX
         LoadCompressedTexture("Crate-DXT1-MipMapped.dds");
         LoadUncompressedTexture("Crate.jpg");
+        #else
+        LoadUncompressedTexture("Crate.jpg");
+        colorMaps[0] = colorMaps[1];
+        #endif
     }
 
     void CreateSamplers()
@@ -218,10 +228,14 @@ class Example_Texturing : public ExampleBase
         if (input.KeyDown(LLGL::Key::Tab))
         {
             // Switch to next resource we want to present
+#if defined(LLGL_OS_ANDROID) || defined(LLGL_OS_IOS) || defined(LLGL_OS_WASM)
+            resourceIndex = 3 - resourceIndex;
+#else
             if (input.KeyPressed(LLGL::Key::Shift))
                 resourceIndex = ((resourceIndex - 1) % 4 + 4) % 4;
             else
                 resourceIndex = (resourceIndex + 1) % 4;
+#endif
 
             const std::string spaces(30, ' ');
             LLGL::Log::Printf(

diff --git a/sources/Renderer/DXCommon/DXManagedComPtrArray.h b/sources/Renderer/DXCommon/DXManagedComPtrArray.h
@@ -36,7 +36,7 @@ class DXManagedComPtrArray
         // Emplaces the specified object into the first available entry.
         T* Emplace(const ComPtr<T>& object, std::size_t* outIndex = nullptr)
         {
-            auto index = FindFreeIndex();
+            const std::size_t index = FindFreeIndex();
             if (index < container_.size())
                 container_[index] = object;
             else
@@ -49,7 +49,7 @@ class DXManagedComPtrArray
         // Emplaces the specified object into the first available entry.
         T* Emplace(ComPtr<T>&& object, std::size_t* outIndex = nullptr)
         {
-            auto index = FindFreeIndex();
+            const std::size_t index = FindFreeIndex();
             if (index < container_.size())
                 container_[index] = std::forward<ComPtr<T>&&>(object);
             else