test new lazy shader

meta4d-me · Oct 25, 2023 · 43de71b · 43de71b
1 parent 2677d33
commit 43de71b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/Engine/Source/Runtime/Rendering/ParticleRenderer.cpp b/Engine/Source/Runtime/Rendering/ParticleRenderer.cpp
@@ -8,17 +8,18 @@ namespace engine {
 
 void ParticleRenderer::Init()
 {
-	constexpr const char* particleTexture = "Textures/Particle.png";
-	m_particleTextureHandle = GetRenderContext()->CreateTexture(particleTexture);
-
-	GetRenderContext()->CreateUniform("s_texColor", bgfx::UniformType::Sampler);
-	GetRenderContext()->CreateProgram("ParticleProgram", "vs_particle.bin", "fs_particle.bin");
+	constexpr StringCrc ParticleProgram = StringCrc{ "ParticleProgram" };
+	GetRenderContext()->RegisterShaderProgram(ParticleProgram, { "vs_PBR", "fs_PBR" });
+	//GetRenderContext()->CreateProgram("ParticleProgram", "vs_particle.bin", "fs_particle.bin");
 	bgfx::setViewName(GetViewID(), "ParticleRenderer");
 }
 
 void ParticleRenderer::Warmup()
 {
-
+	constexpr const char* particleTexture = "Textures/Particle.png";
+	m_particleTextureHandle = GetRenderContext()->CreateTexture(particleTexture);
+	GetRenderContext()->CreateUniform("s_texColor", bgfx::UniformType::Sampler);
+	GetRenderContext()->UploadShaderProgram("ParticleProgram");
 }
 
 void ParticleRenderer::UpdateView(const float* pViewMatrix, const float* pProjectionMatrix)
@@ -71,8 +72,7 @@ void ParticleRenderer::Render(float deltaTime)
 			BGFX_STATE_BLEND_FUNC(BGFX_STATE_BLEND_SRC_ALPHA, BGFX_STATE_BLEND_INV_SRC_ALPHA) | BGFX_STATE_PT_TRISTRIP;
 		bgfx::setState(state);
 
-		constexpr StringCrc ParticleProgram("ParticleProgram");
-		bgfx::submit(GetViewID(), GetRenderContext()->GetProgram(ParticleProgram));
+		GetRenderContext()->Submit(GetViewID(), "ParticleProgram");
 	}
 }
 

diff --git a/Engine/Source/ThirdParty/AssetPipeline b/Engine/Source/ThirdParty/AssetPipeline
+1 −1		examples/Prototype/Effekseer/EffekseerToCD/Main.cpp
+48 −15		private/Producers/EffekseerProducer/EffekseerProducerImpl.cpp
+13 −0		private/Producers/EffekseerProducer/EffekseerProducerImpl.h
+115 −0		private/Scene/ParticleEmitter.cpp
+17 −0		private/Scene/ParticleEmitterImpl.cpp
+75 −0		private/Scene/ParticleEmitterImpl.h
+38 −0		private/Scene/SceneDatabase.cpp
+25 −0		private/Scene/SceneDatabaseImpl.cpp
+28 −2		private/Scene/SceneDatabaseImpl.h
+1 −0		public/Scene/ObjectID.h
+1 −0		public/Scene/ObjectType.h
+53 −0		public/Scene/ParticleEmitter.h
+10 −0		public/Scene/SceneDatabase.h