From 9dcc8110cf527c612ed522c48c0bf921a3214b01 Mon Sep 17 00:00:00 2001
From: Sascha Willems <webmaster@saschawillems.de>
Date: Sun, 16 Jul 2023 16:03:29 +0200
Subject: [PATCH] Renamed particle fire sample

---
 README.md                                           |   2 +-
 .../{particlefire => particlesystem}/CMakeLists.txt |   2 +-
 .../{particlefire => particlesystem}/build.gradle   |   6 +++---
 .../src/main/AndroidManifest.xml                    |   2 +-
 .../saschawillems/vulkanSample/VulkanActivity.java  |   0
 examples/CMakeLists.txt                             |   2 +-
 .../particlesystem.cpp}                             |  10 +++++-----
 .../{particlefire => particlesystem}/normalmap.frag |   0
 .../normalmap.frag.spv                              | Bin
 .../{particlefire => particlesystem}/normalmap.vert |   0
 .../normalmap.vert.spv                              | Bin
 .../{particlefire => particlesystem}/particle.frag  |   0
 .../particle.frag.spv                               | Bin
 .../{particlefire => particlesystem}/particle.vert  |   0
 .../particle.vert.spv                               | Bin
 shaders/hlsl/README.md                              |   2 +-
 .../{particlefire => particlesystem}/normalmap.frag |   0
 .../normalmap.frag.spv                              | Bin
 .../{particlefire => particlesystem}/normalmap.vert |   0
 .../normalmap.vert.spv                              | Bin
 .../{particlefire => particlesystem}/particle.frag  |   0
 .../particle.frag.spv                               | Bin
 .../{particlefire => particlesystem}/particle.vert  |   0
 .../particle.vert.spv                               | Bin
 xcode/examples.h                                    |   4 ++--
 25 files changed, 15 insertions(+), 15 deletions(-)
 rename android/examples/{particlefire => particlesystem}/CMakeLists.txt (97%)
 rename android/examples/{particlefire => particlesystem}/build.gradle (91%)
 rename android/examples/{particlefire => particlesystem}/src/main/AndroidManifest.xml (94%)
 rename android/examples/{particlefire => particlesystem}/src/main/java/de/saschawillems/vulkanSample/VulkanActivity.java (100%)
 rename examples/{particlefire/particlefire.cpp => particlesystem/particlesystem.cpp} (97%)
 rename shaders/glsl/{particlefire => particlesystem}/normalmap.frag (100%)
 rename shaders/glsl/{particlefire => particlesystem}/normalmap.frag.spv (100%)
 rename shaders/glsl/{particlefire => particlesystem}/normalmap.vert (100%)
 rename shaders/glsl/{particlefire => particlesystem}/normalmap.vert.spv (100%)
 rename shaders/glsl/{particlefire => particlesystem}/particle.frag (100%)
 rename shaders/glsl/{particlefire => particlesystem}/particle.frag.spv (100%)
 rename shaders/glsl/{particlefire => particlesystem}/particle.vert (100%)
 rename shaders/glsl/{particlefire => particlesystem}/particle.vert.spv (100%)
 rename shaders/hlsl/{particlefire => particlesystem}/normalmap.frag (100%)
 rename shaders/hlsl/{particlefire => particlesystem}/normalmap.frag.spv (100%)
 rename shaders/hlsl/{particlefire => particlesystem}/normalmap.vert (100%)
 rename shaders/hlsl/{particlefire => particlesystem}/normalmap.vert.spv (100%)
 rename shaders/hlsl/{particlefire => particlesystem}/particle.frag (100%)
 rename shaders/hlsl/{particlefire => particlesystem}/particle.frag.spv (100%)
 rename shaders/hlsl/{particlefire => particlesystem}/particle.vert (100%)
 rename shaders/hlsl/{particlefire => particlesystem}/particle.vert.spv (100%)

diff --git a/README.md b/README.md
index b25d671a..ea7f6541 100644
--- a/README.md
+++ b/README.md
@@ -152,7 +152,7 @@ Advanced example that uses sub passes and input attachments to write and read ba
 
 Basic offscreen rendering in two passes. First pass renders the mirrored scene to a separate framebuffer with color and depth attachments, second pass samples from that color attachment for rendering a mirror surface.
 
-#### [CPU particle system](examples/particlefire/)
+#### [CPU particle system](examples/particlesystem/)
 
 Implements a simple CPU based particle system. Particle data is stored in host memory, updated on the CPU per-frame and synchronized with the device before it's rendered using pre-multiplied alpha.
 
diff --git a/android/examples/particlefire/CMakeLists.txt b/android/examples/particlesystem/CMakeLists.txt
similarity index 97%
rename from android/examples/particlefire/CMakeLists.txt
rename to android/examples/particlesystem/CMakeLists.txt
index f107918e..6f02a2f8 100644
--- a/android/examples/particlefire/CMakeLists.txt
+++ b/android/examples/particlesystem/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.4.1 FATAL_ERROR)
 
-set(NAME particlefire)
+set(NAME particlesystem)
 
 set(SRC_DIR ../../../examples/${NAME})
 set(BASE_DIR ../../../base)
diff --git a/android/examples/particlefire/build.gradle b/android/examples/particlesystem/build.gradle
similarity index 91%
rename from android/examples/particlefire/build.gradle
rename to android/examples/particlesystem/build.gradle
index 4b264e5c..054da9c9 100644
--- a/android/examples/particlefire/build.gradle
+++ b/android/examples/particlesystem/build.gradle
@@ -4,7 +4,7 @@ apply from: '../gradle/outputfilename.gradle'
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
     defaultConfig {
-        applicationId "de.saschawillems.vulkanParticlefire"
+        applicationId "de.saschawillems.vulkanParticlesystem"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
@@ -49,8 +49,8 @@ task copyTask {
     }
 
     copy {
-       from rootProject.ext.shaderPath + 'glsl/particlefire'
-       into 'assets/shaders/glsl/particlefire'
+       from rootProject.ext.shaderPath + 'glsl/particlesystem'
+       into 'assets/shaders/glsl/particlesystem'
        include '*.*'
     }
 
diff --git a/android/examples/particlefire/src/main/AndroidManifest.xml b/android/examples/particlesystem/src/main/AndroidManifest.xml
similarity index 94%
rename from android/examples/particlefire/src/main/AndroidManifest.xml
rename to android/examples/particlesystem/src/main/AndroidManifest.xml
index c8f97268..4c7d04e4 100644
--- a/android/examples/particlefire/src/main/AndroidManifest.xml
+++ b/android/examples/particlesystem/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.saschawillems.vulkanParticlefire">
+    package="de.saschawillems.vulkanParticlesystem">
 
     <application
         android:label="Vulkan CPU particles"
diff --git a/android/examples/particlefire/src/main/java/de/saschawillems/vulkanSample/VulkanActivity.java b/android/examples/particlesystem/src/main/java/de/saschawillems/vulkanSample/VulkanActivity.java
similarity index 100%
rename from android/examples/particlefire/src/main/java/de/saschawillems/vulkanSample/VulkanActivity.java
rename to android/examples/particlesystem/src/main/java/de/saschawillems/vulkanSample/VulkanActivity.java
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index d8d2b6a6..630fa5dd 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -121,7 +121,7 @@ set(EXAMPLES
 	offscreen
 	oit
 	parallaxmapping
-	particlefire
+	particlesystem
 	pbrbasic
 	pbribl
 	pbrtexture
diff --git a/examples/particlefire/particlefire.cpp b/examples/particlesystem/particlesystem.cpp
similarity index 97%
rename from examples/particlefire/particlefire.cpp
rename to examples/particlesystem/particlesystem.cpp
index 49a8b44e..3493a5db 100644
--- a/examples/particlefire/particlefire.cpp
+++ b/examples/particlesystem/particlesystem.cpp
@@ -1,5 +1,5 @@
 /*
-* Vulkan Example - CPU based fire particle system
+* Vulkan Example - CPU based particle system
 *
 * Copyright (C) 2016-2023 by Sascha Willems - www.saschawillems.de
 *
@@ -478,8 +478,8 @@ public:
 			blendAttachmentState.alphaBlendOp = VK_BLEND_OP_ADD;
 			blendAttachmentState.colorWriteMask = VK_COLOR_COMPONENT_R_BIT | VK_COLOR_COMPONENT_G_BIT | VK_COLOR_COMPONENT_B_BIT | VK_COLOR_COMPONENT_A_BIT;
 
-			shaderStages[0] = loadShader(getShadersPath() + "particlefire/particle.vert.spv", VK_SHADER_STAGE_VERTEX_BIT);
-			shaderStages[1] = loadShader(getShadersPath() + "particlefire/particle.frag.spv", VK_SHADER_STAGE_FRAGMENT_BIT);
+			shaderStages[0] = loadShader(getShadersPath() + "particlesystem/particle.vert.spv", VK_SHADER_STAGE_VERTEX_BIT);
+			shaderStages[1] = loadShader(getShadersPath() + "particlesystem/particle.frag.spv", VK_SHADER_STAGE_FRAGMENT_BIT);
 			VK_CHECK_RESULT(vkCreateGraphicsPipelines(device, pipelineCache, 1, &pipelineCI, nullptr, &pipelines.particles));
 		}
 
@@ -492,8 +492,8 @@ public:
 			depthStencilState.depthWriteEnable = VK_TRUE;
 			inputAssemblyState.topology = VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST;
 
-			shaderStages[0] = loadShader(getShadersPath() + "particlefire/normalmap.vert.spv", VK_SHADER_STAGE_VERTEX_BIT);
-			shaderStages[1] = loadShader(getShadersPath() + "particlefire/normalmap.frag.spv", VK_SHADER_STAGE_FRAGMENT_BIT);
+			shaderStages[0] = loadShader(getShadersPath() + "particlesystem/normalmap.vert.spv", VK_SHADER_STAGE_VERTEX_BIT);
+			shaderStages[1] = loadShader(getShadersPath() + "particlesystem/normalmap.frag.spv", VK_SHADER_STAGE_FRAGMENT_BIT);
 			VK_CHECK_RESULT(vkCreateGraphicsPipelines(device, pipelineCache, 1, &pipelineCI, nullptr, &pipelines.environment));
 		}
 	}
diff --git a/shaders/glsl/particlefire/normalmap.frag b/shaders/glsl/particlesystem/normalmap.frag
similarity index 100%
rename from shaders/glsl/particlefire/normalmap.frag
rename to shaders/glsl/particlesystem/normalmap.frag
diff --git a/shaders/glsl/particlefire/normalmap.frag.spv b/shaders/glsl/particlesystem/normalmap.frag.spv
similarity index 100%
rename from shaders/glsl/particlefire/normalmap.frag.spv
rename to shaders/glsl/particlesystem/normalmap.frag.spv
diff --git a/shaders/glsl/particlefire/normalmap.vert b/shaders/glsl/particlesystem/normalmap.vert
similarity index 100%
rename from shaders/glsl/particlefire/normalmap.vert
rename to shaders/glsl/particlesystem/normalmap.vert
diff --git a/shaders/glsl/particlefire/normalmap.vert.spv b/shaders/glsl/particlesystem/normalmap.vert.spv
similarity index 100%
rename from shaders/glsl/particlefire/normalmap.vert.spv
rename to shaders/glsl/particlesystem/normalmap.vert.spv
diff --git a/shaders/glsl/particlefire/particle.frag b/shaders/glsl/particlesystem/particle.frag
similarity index 100%
rename from shaders/glsl/particlefire/particle.frag
rename to shaders/glsl/particlesystem/particle.frag
diff --git a/shaders/glsl/particlefire/particle.frag.spv b/shaders/glsl/particlesystem/particle.frag.spv
similarity index 100%
rename from shaders/glsl/particlefire/particle.frag.spv
rename to shaders/glsl/particlesystem/particle.frag.spv
diff --git a/shaders/glsl/particlefire/particle.vert b/shaders/glsl/particlesystem/particle.vert
similarity index 100%
rename from shaders/glsl/particlefire/particle.vert
rename to shaders/glsl/particlesystem/particle.vert
diff --git a/shaders/glsl/particlefire/particle.vert.spv b/shaders/glsl/particlesystem/particle.vert.spv
similarity index 100%
rename from shaders/glsl/particlefire/particle.vert.spv
rename to shaders/glsl/particlesystem/particle.vert.spv
diff --git a/shaders/hlsl/README.md b/shaders/hlsl/README.md
index 20a3de5b..8aec80f1 100644
--- a/shaders/hlsl/README.md
+++ b/shaders/hlsl/README.md
@@ -6,7 +6,7 @@ These can be compiled with [DXC](https://github.com/microsoft/DirectXShaderCompi
 ### Known issues
 
 - specialization constants can't be used to specify array size.
-- `gl_PointCoord` not supported. HLSL has no equivalent. We changed the shaders to calulate the PointCoord manually in the shader. (`computenbody`, `computeparticles`, `particlefire` examples).
+- `gl_PointCoord` not supported. HLSL has no equivalent. We changed the shaders to calulate the PointCoord manually in the shader. (`computenbody`, `computeparticles`, `particlesystem` examples).
 - HLSL doesn't have inverse operation (`deferred`, `hdr`, `instancing`, `skeletalanimation` & `texturecubemap` examples).
 - `modf` causes compilation to fail without errors or warnings. (`modf` not used by any examples, easily confused with fmod)
 - In `specializationconstants` example, shader compilation fails with error:
diff --git a/shaders/hlsl/particlefire/normalmap.frag b/shaders/hlsl/particlesystem/normalmap.frag
similarity index 100%
rename from shaders/hlsl/particlefire/normalmap.frag
rename to shaders/hlsl/particlesystem/normalmap.frag
diff --git a/shaders/hlsl/particlefire/normalmap.frag.spv b/shaders/hlsl/particlesystem/normalmap.frag.spv
similarity index 100%
rename from shaders/hlsl/particlefire/normalmap.frag.spv
rename to shaders/hlsl/particlesystem/normalmap.frag.spv
diff --git a/shaders/hlsl/particlefire/normalmap.vert b/shaders/hlsl/particlesystem/normalmap.vert
similarity index 100%
rename from shaders/hlsl/particlefire/normalmap.vert
rename to shaders/hlsl/particlesystem/normalmap.vert
diff --git a/shaders/hlsl/particlefire/normalmap.vert.spv b/shaders/hlsl/particlesystem/normalmap.vert.spv
similarity index 100%
rename from shaders/hlsl/particlefire/normalmap.vert.spv
rename to shaders/hlsl/particlesystem/normalmap.vert.spv
diff --git a/shaders/hlsl/particlefire/particle.frag b/shaders/hlsl/particlesystem/particle.frag
similarity index 100%
rename from shaders/hlsl/particlefire/particle.frag
rename to shaders/hlsl/particlesystem/particle.frag
diff --git a/shaders/hlsl/particlefire/particle.frag.spv b/shaders/hlsl/particlesystem/particle.frag.spv
similarity index 100%
rename from shaders/hlsl/particlefire/particle.frag.spv
rename to shaders/hlsl/particlesystem/particle.frag.spv
diff --git a/shaders/hlsl/particlefire/particle.vert b/shaders/hlsl/particlesystem/particle.vert
similarity index 100%
rename from shaders/hlsl/particlefire/particle.vert
rename to shaders/hlsl/particlesystem/particle.vert
diff --git a/shaders/hlsl/particlefire/particle.vert.spv b/shaders/hlsl/particlesystem/particle.vert.spv
similarity index 100%
rename from shaders/hlsl/particlefire/particle.vert.spv
rename to shaders/hlsl/particlesystem/particle.vert.spv
diff --git a/xcode/examples.h b/xcode/examples.h
index 15787981..79e177b9 100644
--- a/xcode/examples.h
+++ b/xcode/examples.h
@@ -110,8 +110,8 @@
 #   include "../examples/textoverlay/textoverlay.cpp"
 #endif
 
-#ifdef MVK_particlefire
-#   include "../examples/particlefire/particlefire.cpp"
+#ifdef MVK_particlesystem
+#   include "../examples/particlesystem/particlesystem.cpp"
 #endif
 
 // No headless target when using xcode examples project, builds/runs fine using vulkanExamples project.