Bit of cleanup

napframework · Feb 5, 2025 · 9490ade · 9490ade · cklosters · Feb 6, 2025
1 parent 624e7c7
commit 9490ade
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 24 deletions.
diff --git a/demos/skybox/data/shaders/environment.frag → demos/skybox/data/shaders/reflection.frag b/demos/skybox/data/shaders/environment.frag → demos/skybox/data/shaders/reflection.frag
diff --git a/demos/skybox/data/shaders/environment.vert → demos/skybox/data/shaders/reflection.vert b/demos/skybox/data/shaders/environment.vert → demos/skybox/data/shaders/reflection.vert
diff --git a/demos/skybox/data/skybox.json b/demos/skybox/data/skybox.json
@@ -92,15 +92,15 @@
                     "Type": "nap::OrbitController",
                     "mID": "OrbitController",
                     "MovementSpeed": 0.004999999888241291,
-                    "RotateSpeed": 0.0010000001639127732,
+                    "RotateSpeed": 0.0010000001639127731,
                     "PerspCameraComponent": "./PerspCamera",
+                    "LimitZoomDistance": true,
+                    "MinimumZoomDistance": 1.5,
                     "LookAtPosition": {
                         "x": 0.0,
                         "y": 0.0,
                         "z": 0.0
-                    },
-                    "MinimumZoomDistance": 1.5,
-                    "LimitZoomDistance": true
+                    }
                 },
                 {
                     "Type": "nap::PointerInputComponent",
@@ -198,13 +198,13 @@
                     "Visible": true,
                     "Tags": [],
                     "Layer": "RenderLayer_Default",
-                    "Mesh": "TorusMesh",
+                    "Mesh": "ReflectionMesh",
                     "MaterialInstance": {
                         "Uniforms": [],
                         "Samplers": [],
                         "Buffers": [],
                         "Constants": [],
-                        "Material": "TorusMaterial",
+                        "Material": "ReflectionMaterial",
                         "BlendMode": "Opaque",
                         "DepthMode": "ReadWrite"
                     },
@@ -312,7 +312,7 @@
             "Mode": "Immediate",
             "ClearColor": {
                 "Values": [
-                    0.16078431904315949,
+                    0.16078431904315948,
                     0.3450980484485626,
                     1.0,
                     1.0
@@ -325,18 +325,18 @@
         },
         {
             "Type": "nap::ResourceGroup",
-            "mID": "Torus",
+            "mID": "Reflection",
             "Members": [
                 {
                     "Type": "nap::ShaderFromFile",
-                    "mID": "TorusShader",
-                    "VertShader": "shaders/environment.vert",
-                    "FragShader": "shaders/environment.frag",
+                    "mID": "ReflectionShader",
+                    "VertShader": "shaders/reflection.vert",
+                    "FragShader": "shaders/reflection.frag",
                     "RestrictModuleIncludes": false
                 },
                 {
                     "Type": "nap::TorusMesh",
-                    "mID": "TorusMesh",
+                    "mID": "ReflectionMesh",
                     "Radius": 0.75,
                     "TubeRadius": 0.25,
                     "Segments": 64,
@@ -356,7 +356,7 @@
                 },
                 {
                     "Type": "nap::Material",
-                    "mID": "TorusMaterial",
+                    "mID": "ReflectionMaterial",
                     "Uniforms": [
                         {
                             "Type": "nap::UniformStruct",
@@ -407,7 +407,7 @@
                     ],
                     "Buffers": [],
                     "Constants": [],
-                    "Shader": "TorusShader",
+                    "Shader": "ReflectionShader",
                     "VertexAttributeBindings": [],
                     "BlendMode": "Opaque",
                     "DepthMode": "InheritFromBlendMode"

diff --git a/system_modules/naprender/src/rendertexture2d.h b/system_modules/naprender/src/rendertexture2d.h
@@ -19,7 +19,7 @@ namespace nap
 	/**
 	 * Empty 2D GPU texture that can be declared as a resource in JSON or created at runtime.
 	 * You can use this texture to store the result of a render pass by a nap::RenderTarget or
-	 * any other type of render operation. The texture is cleared to 'ClearColor the before first use.
+	 * any other type of render operation. The texture is cleared to 'ClearColor before first use.
 	 */
 	class NAPAPI RenderTexture2D : public Texture2D
 	{

diff --git a/tools/napkin/resources/applets/texturepreview/data/fallback_2d_texture.jpg b/tools/napkin/resources/applets/texturepreview/data/fallback_2d_texture.jpg
diff --git a/tools/napkin/resources/applets/texturepreview/data/preview.json b/tools/napkin/resources/applets/texturepreview/data/preview.json
@@ -965,13 +965,6 @@
                     "Type": "nap::ResourceGroup",
                     "mID": "Textures",
                     "Members": [
-                        {
-                            "Type": "nap::ImageFromFile",
-                            "mID": "Fallback2DTexture",
-                            "Usage": "Static",
-                            "ImagePath": "fallback_2d_texture.jpg",
-                            "GenerateLods": false
-                        },
                         {
                             "Type": "nap::CubeMapFromFile",
                             "mID": "FallbackCubeTexture",
@@ -990,6 +983,12 @@
                             "ImagePath": "fallback_cube_texture.jpg",
                             "SampleShading": false,
                             "GenerateLODs": false
+                        },
+                        {
+                            "Type": "nap::UVTestTexture",
+                            "mID": "Fallback2DTexture",
+                            "Usage": "Static",
+                            "GenerateLods": false
                         }
                     ],
                     "Children": []

diff --git a/tools/napkin/src/panels/texturepreviewpanel.h b/tools/napkin/src/panels/texturepreviewpanel.h
@@ -93,5 +93,3 @@ namespace napkin
 		Loader findLoader(const PropertyPath& path);
 	};
 }
-
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -93,5 +93,3 @@ namespace napkin
		Loader findLoader(const PropertyPath& path);
		};
		}