From 7247316777f807d036b8059b994477ed1e10f224 Mon Sep 17 00:00:00 2001 From: durswd Date: Sat, 18 Nov 2023 17:36:17 +0900 Subject: [PATCH 1/4] Change directory structures to improve cmake usability --- Dev/Cpp/Effekseer/CMakeLists.txt | 4 +- .../Graphics/efkMat.Graphics.cpp | 10 +- .../EffekseerMaterialEditor/efkMat.Editor.cpp | 4 +- .../EffekseerRendererCommon/CMakeLists.txt | 78 +-- .../EffekseerRenderer.CommonUtils.cpp | 0 .../EffekseerRenderer.CommonUtils.h | 0 .../EffekseerRenderer.DDSTextureLoader.cpp | 0 .../EffekseerRenderer.DDSTextureLoader.h | 0 .../EffekseerRenderer.ModelRendererBase.cpp | 0 .../EffekseerRenderer.ModelRendererBase.h | 0 .../EffekseerRenderer.PngTextureLoader.cpp | 0 .../EffekseerRenderer.PngTextureLoader.h | 0 .../EffekseerRenderer.RenderStateBase.cpp | 0 .../EffekseerRenderer.RenderStateBase.h | 0 .../EffekseerRenderer.Renderer.cpp | 0 .../EffekseerRenderer.Renderer.h | 0 .../EffekseerRenderer.Renderer_Impl.cpp | 0 .../EffekseerRenderer.Renderer_Impl.h | 0 .../EffekseerRenderer.RibbonRendererBase.cpp | 0 .../EffekseerRenderer.RibbonRendererBase.h | 0 .../EffekseerRenderer.RingRendererBase.cpp | 0 .../EffekseerRenderer.RingRendererBase.h | 0 .../EffekseerRenderer.ShaderBase.h | 0 .../EffekseerRenderer.SpriteRendererBase.cpp | 0 .../EffekseerRenderer.SpriteRendererBase.h | 0 .../EffekseerRenderer.StandardRenderer.h | 0 .../EffekseerRenderer.TGATextureLoader.cpp | 0 .../EffekseerRenderer.TGATextureLoader.h | 0 .../EffekseerRenderer.TrackRendererBase.cpp | 0 .../EffekseerRenderer.TrackRendererBase.h | 0 .../EffekseerRendererFlags.h | 0 .../GraphicsDeviceCPU.cpp | 0 .../GraphicsDeviceCPU.h | 0 .../ModelLoader.cpp | 0 .../ModelLoader.h | 0 .../TextureLoader.cpp | 0 .../TextureLoader.h | 0 .../VertexBuffer.cpp | 0 .../VertexBuffer.h | 0 Dev/Cpp/EffekseerRendererDX11/CMakeLists.txt | 12 +- .../EffekseerRendererDX11.h | 4 +- .../EffekseerRendererDX11.Base.Pre.h | 0 .../EffekseerRendererDX11.Base.h | 0 .../EffekseerRendererDX11.DeviceObject.cpp | 0 .../EffekseerRendererDX11.DeviceObject.h | 0 .../EffekseerRendererDX11.GPUTimer.cpp | 0 .../EffekseerRendererDX11.GPUTimer.h | 0 .../EffekseerRendererDX11.MaterialLoader.cpp | 0 .../EffekseerRendererDX11.MaterialLoader.h | 0 .../EffekseerRendererDX11.ModelRenderer.cpp | 0 .../EffekseerRendererDX11.ModelRenderer.h | 2 +- .../EffekseerRendererDX11.RenderState.cpp | 0 .../EffekseerRendererDX11.RenderState.h | 2 +- .../EffekseerRendererDX11.Renderer.cpp | 14 +- .../EffekseerRendererDX11.Renderer.h | 2 +- ...ffekseerRendererDX11.RendererImplemented.h | 4 +- .../EffekseerRendererDX11.Shader.cpp | 0 .../EffekseerRendererDX11.Shader.h | 2 +- .../GraphicsDevice.cpp | 2 +- .../GraphicsDevice.h | 2 +- .../Shader/Distortion_Common_PS.fx | 0 .../Shader/FlipbookInterpolationUtils.fx | 0 .../Shader/FlipbookInterpolationUtils_PS.fx | 0 .../Shader/Linear_sRGB.fx | 0 .../Shader/SoftParticle_PS.fx | 0 .../Shader/TextureBlendingUtils_PS.fx | 0 .../Shader/UVDistortionUtils_PS.fx | 0 .../Shader/ad_common_ps.fx | 0 .../Shader/ad_model_common_vs.fx | 0 .../Shader/ad_model_distortion_ps.fx | 0 .../Shader/ad_model_distortion_vs.fx | 0 .../Shader/ad_model_lit_ps.fx | 0 .../Shader/ad_model_lit_vs.fx | 0 .../Shader/ad_model_ps.fx | 0 .../Shader/ad_model_unlit_ps.fx | 0 .../Shader/ad_model_unlit_vs.fx | 0 .../Shader/ad_model_vs.fx | 0 .../Shader/ad_sprite_common_vs.fx | 0 .../Shader/ad_sprite_distortion_vs.fx | 0 .../Shader/ad_sprite_lit_vs.fx | 0 .../Shader/ad_sprite_unlit_vs.fx | 0 .../Shader/model_distortion_ps.fx | 0 .../Shader/model_distortion_vs.fx | 0 .../Shader/model_lit_ps.fx | 0 .../Shader/model_lit_vs.fx | 0 .../Shader/model_ps.fx | 0 .../Shader/model_unlit_ps.fx | 0 .../Shader/model_unlit_vs.fx | 0 .../Shader/model_vs.fx | 0 .../Shader/sprite_distortion_vs.fx | 0 .../Shader/sprite_lit_vs.fx | 0 .../Shader/sprite_unlit_vs.fx | 0 .../ShaderHeader/ad_model_distortion_ps.h | 0 .../ShaderHeader/ad_model_distortion_vs.h | 0 .../ShaderHeader/ad_model_lit_ps.h | 0 .../ShaderHeader/ad_model_lit_vs.h | 0 .../ShaderHeader/ad_model_unlit_ps.h | 0 .../ShaderHeader/ad_model_unlit_vs.h | 0 .../ShaderHeader/ad_sprite_distortion_vs.h | 0 .../ShaderHeader/ad_sprite_lit_vs.h | 0 .../ShaderHeader/ad_sprite_unlit_vs.h | 0 .../ShaderHeader/model_distortion_ps.h | 0 .../ShaderHeader/model_distortion_vs.h | 0 .../ShaderHeader/model_lit_ps.h | 0 .../ShaderHeader/model_lit_vs.h | 0 .../ShaderHeader/model_unlit_ps.h | 0 .../ShaderHeader/model_unlit_vs.h | 0 .../ShaderHeader/sprite_distortion_vs.h | 0 .../ShaderHeader/sprite_lit_vs.h | 0 .../ShaderHeader/sprite_unlit_vs.h | 0 .../compile_effect.bat | 0 Dev/Cpp/EffekseerRendererDX12/CMakeLists.txt | 10 +- .../EffekseerRendererDX12.h | 6 +- .../EffekseerRendererDX12.Base.Pre.h | 0 .../EffekseerRendererDX12.Base.h | 2 +- .../EffekseerRendererDX12.Renderer.cpp | 602 +++++++++--------- .../EffekseerRendererDX12.Renderer.h | 2 +- .../Shader/ad_model_distortion_ps.fx | 0 .../Shader/ad_model_distortion_vs.fx | 0 .../Shader/ad_model_lit_ps.fx | 0 .../Shader/ad_model_lit_vs.fx | 0 .../Shader/ad_model_unlit_ps.fx | 0 .../Shader/ad_model_unlit_vs.fx | 0 .../Shader/ad_sprite_distortion_vs.fx | 0 .../Shader/ad_sprite_lit_vs.fx | 0 .../Shader/ad_sprite_unlit_vs.fx | 0 .../Shader/model_distortion_ps.fx | 0 .../Shader/model_distortion_vs.fx | 0 .../Shader/model_lit_ps.fx | 0 .../Shader/model_lit_vs.fx | 0 .../Shader/model_unlit_ps.fx | 0 .../Shader/model_unlit_vs.fx | 0 .../Shader/sprite_distortion_vs.fx | 0 .../Shader/sprite_lit_vs.fx | 0 .../Shader/sprite_unlit_vs.fx | 0 .../ShaderHeader/ad_model_distortion_ps.h | 0 .../ShaderHeader/ad_model_distortion_vs.h | 0 .../ShaderHeader/ad_model_lit_ps.h | 0 .../ShaderHeader/ad_model_lit_vs.h | 0 .../ShaderHeader/ad_model_unlit_ps.h | 0 .../ShaderHeader/ad_model_unlit_vs.h | 0 .../ShaderHeader/ad_sprite_distortion_vs.h | 0 .../ShaderHeader/ad_sprite_lit_vs.h | 0 .../ShaderHeader/ad_sprite_unlit_vs.h | 0 .../ShaderHeader/model_distortion_ps.h | 0 .../ShaderHeader/model_distortion_vs.h | 0 .../ShaderHeader/model_lit_ps.h | 0 .../ShaderHeader/model_lit_vs.h | 0 .../ShaderHeader/model_unlit_ps.h | 0 .../ShaderHeader/model_unlit_vs.h | 0 .../ShaderHeader/sprite_distortion_vs.h | 0 .../ShaderHeader/sprite_lit_vs.h | 0 .../ShaderHeader/sprite_unlit_vs.h | 0 .../compile_effect.bat | 0 Dev/Cpp/EffekseerRendererDX9/CMakeLists.txt | 10 +- .../EffekseerRendererDX9.h | 4 +- .../EffekseerRendererDX9.Base.Pre.h | 0 .../EffekseerRendererDX9.Base.h | 0 .../EffekseerRendererDX9.MaterialLoader.cpp | 0 .../EffekseerRendererDX9.MaterialLoader.h | 0 .../EffekseerRendererDX9.ModelRenderer.cpp | 0 .../EffekseerRendererDX9.ModelRenderer.h | 2 +- .../EffekseerRendererDX9.RenderState.cpp | 0 .../EffekseerRendererDX9.RenderState.h | 2 +- .../EffekseerRendererDX9.Renderer.cpp | 20 +- .../EffekseerRendererDX9.Renderer.h | 2 +- ...EffekseerRendererDX9.RendererImplemented.h | 4 +- .../EffekseerRendererDX9.Shader.cpp | 0 .../EffekseerRendererDX9.Shader.h | 2 +- .../GraphicsDevice.cpp | 2 +- .../GraphicsDevice.h | 2 +- .../Shader/ad_model_distortion_ps.fx | 0 .../Shader/ad_model_distortion_vs.fx | 0 .../Shader/ad_model_lit_ps.fx | 0 .../Shader/ad_model_lit_vs.fx | 0 .../Shader/ad_model_unlit_ps.fx | 0 .../Shader/ad_model_unlit_vs.fx | 0 .../Shader/ad_sprite_distortion_vs.fx | 0 .../Shader/ad_sprite_lit_vs.fx | 0 .../Shader/ad_sprite_unlit_vs.fx | 0 .../Shader/model_distortion_ps.fx | 0 .../Shader/model_distortion_vs.fx | 0 .../Shader/model_lit_ps.fx | 0 .../Shader/model_lit_vs.fx | 0 .../Shader/model_unlit_ps.fx | 0 .../Shader/model_unlit_vs.fx | 0 .../Shader/sprite_distortion_vs.fx | 0 .../Shader/sprite_lit_vs.fx | 0 .../Shader/sprite_unlit_vs.fx | 0 .../ShaderHeader/ad_model_distortion_ps.h | 0 .../ShaderHeader/ad_model_distortion_vs.h | 0 .../ShaderHeader/ad_model_lit_ps.h | 0 .../ShaderHeader/ad_model_lit_vs.h | 0 .../ShaderHeader/ad_model_unlit_ps.h | 0 .../ShaderHeader/ad_model_unlit_vs.h | 0 .../ShaderHeader/ad_sprite_distortion_vs.h | 0 .../ShaderHeader/ad_sprite_lit_vs.h | 0 .../ShaderHeader/ad_sprite_unlit_vs.h | 0 .../ShaderHeader/model_distortion_ps.h | 0 .../ShaderHeader/model_distortion_vs.h | 0 .../ShaderHeader/model_lit_ps.h | 0 .../ShaderHeader/model_lit_vs.h | 0 .../ShaderHeader/model_unlit_ps.h | 0 .../ShaderHeader/model_unlit_vs.h | 0 .../ShaderHeader/sprite_distortion_vs.h | 0 .../ShaderHeader/sprite_lit_vs.h | 0 .../ShaderHeader/sprite_unlit_vs.h | 0 .../compile_effect.bat | 0 Dev/Cpp/EffekseerRendererGL/CMakeLists.txt | 11 +- .../EffekseerRendererGL/EffekseerRendererGL.h | 4 +- .../EffekseerRendererGL.Base.Pre.h | 0 .../EffekseerRendererGL.Base.h | 0 .../EffekseerRendererGL.DeviceObject.cpp | 0 .../EffekseerRendererGL.DeviceObject.h | 0 .../EffekseerRendererGL.GLExtension.cpp | 0 .../EffekseerRendererGL.GLExtension.h | 0 .../EffekseerRendererGL.GPUTimer.cpp | 0 .../EffekseerRendererGL.GPUTimer.h | 0 .../EffekseerRendererGL.MaterialLoader.cpp | 0 .../EffekseerRendererGL.MaterialLoader.h | 0 .../EffekseerRendererGL.ModelRenderer.cpp | 0 .../EffekseerRendererGL.ModelRenderer.h | 4 +- .../EffekseerRendererGL.RenderState.cpp | 0 .../EffekseerRendererGL.RenderState.h | 2 +- .../EffekseerRendererGL.Renderer.cpp | 14 +- .../EffekseerRendererGL.Renderer.h | 2 +- .../EffekseerRendererGL.RendererImplemented.h | 4 +- .../EffekseerRendererGL.Shader.cpp | 0 .../EffekseerRendererGL.Shader.h | 2 +- .../GraphicsDevice.cpp | 0 .../GraphicsDevice.h | 2 +- .../ShaderHeader/ad_model_distortion_ps.h | 0 .../ShaderHeader/ad_model_distortion_vs.h | 0 .../ShaderHeader/ad_model_lit_ps.h | 0 .../ShaderHeader/ad_model_lit_vs.h | 0 .../ShaderHeader/ad_model_unlit_ps.h | 0 .../ShaderHeader/ad_model_unlit_vs.h | 0 .../ShaderHeader/ad_sprite_distortion_vs.h | 0 .../ShaderHeader/ad_sprite_lit_vs.h | 0 .../ShaderHeader/ad_sprite_unlit_vs.h | 0 .../ShaderHeader/model_distortion_ps.h | 0 .../ShaderHeader/model_distortion_vs.h | 0 .../ShaderHeader/model_lit_ps.h | 0 .../ShaderHeader/model_lit_vs.h | 0 .../ShaderHeader/model_unlit_ps.h | 0 .../ShaderHeader/model_unlit_vs.h | 0 .../ShaderHeader/sprite_distortion_vs.h | 0 .../ShaderHeader/sprite_lit_vs.h | 0 .../ShaderHeader/sprite_unlit_vs.h | 0 .../Shader_2/ad_model_distortion_ps.fx | 0 .../Shader_2/ad_model_distortion_vs.fx | 0 .../Shader_2/ad_model_lit_ps.fx | 0 .../Shader_2/ad_model_lit_vs.fx | 0 .../Shader_2/ad_model_unlit_ps.fx | 0 .../Shader_2/ad_model_unlit_vs.fx | 0 .../Shader_2/ad_sprite_distortion_vs.fx | 0 .../Shader_2/ad_sprite_lit_vs.fx | 0 .../Shader_2/ad_sprite_unlit_vs.fx | 0 .../Shader_2/model_distortion_ps.fx | 0 .../Shader_2/model_distortion_vs.fx | 0 .../Shader_2/model_lit_ps.fx | 0 .../Shader_2/model_lit_vs.fx | 0 .../Shader_2/model_unlit_ps.fx | 0 .../Shader_2/model_unlit_vs.fx | 0 .../Shader_2/sprite_distortion_vs.fx | 0 .../Shader_2/sprite_lit_vs.fx | 0 .../Shader_2/sprite_unlit_vs.fx | 0 .../Shader_3/ad_model_distortion_ps.fx | 0 .../Shader_3/ad_model_distortion_vs.fx | 0 .../Shader_3/ad_model_lit_ps.fx | 0 .../Shader_3/ad_model_lit_vs.fx | 0 .../Shader_3/ad_model_unlit_ps.fx | 0 .../Shader_3/ad_model_unlit_vs.fx | 0 .../Shader_3/ad_sprite_distortion_vs.fx | 0 .../Shader_3/ad_sprite_lit_vs.fx | 0 .../Shader_3/ad_sprite_unlit_vs.fx | 0 .../Shader_3/model_distortion_ps.fx | 0 .../Shader_3/model_distortion_vs.fx | 0 .../Shader_3/model_lit_ps.fx | 0 .../Shader_3/model_lit_vs.fx | 0 .../Shader_3/model_unlit_ps.fx | 0 .../Shader_3/model_unlit_vs.fx | 0 .../Shader_3/sprite_distortion_vs.fx | 0 .../Shader_3/sprite_lit_vs.fx | 0 .../Shader_3/sprite_unlit_vs.fx | 0 .../Shader_ES2/ad_model_distortion_ps.fx | 0 .../Shader_ES2/ad_model_distortion_vs.fx | 0 .../Shader_ES2/ad_model_lit_ps.fx | 0 .../Shader_ES2/ad_model_lit_vs.fx | 0 .../Shader_ES2/ad_model_unlit_ps.fx | 0 .../Shader_ES2/ad_model_unlit_vs.fx | 0 .../Shader_ES2/ad_sprite_distortion_vs.fx | 0 .../Shader_ES2/ad_sprite_lit_vs.fx | 0 .../Shader_ES2/ad_sprite_unlit_vs.fx | 0 .../Shader_ES2/model_distortion_ps.fx | 0 .../Shader_ES2/model_distortion_vs.fx | 0 .../Shader_ES2/model_lit_ps.fx | 0 .../Shader_ES2/model_lit_vs.fx | 0 .../Shader_ES2/model_unlit_ps.fx | 0 .../Shader_ES2/model_unlit_vs.fx | 0 .../Shader_ES2/sprite_distortion_vs.fx | 0 .../Shader_ES2/sprite_lit_vs.fx | 0 .../Shader_ES2/sprite_unlit_vs.fx | 0 .../Shader_ES3/ad_model_distortion_ps.fx | 0 .../Shader_ES3/ad_model_distortion_vs.fx | 0 .../Shader_ES3/ad_model_lit_ps.fx | 0 .../Shader_ES3/ad_model_lit_vs.fx | 0 .../Shader_ES3/ad_model_unlit_ps.fx | 0 .../Shader_ES3/ad_model_unlit_vs.fx | 0 .../Shader_ES3/ad_sprite_distortion_vs.fx | 0 .../Shader_ES3/ad_sprite_lit_vs.fx | 0 .../Shader_ES3/ad_sprite_unlit_vs.fx | 0 .../Shader_ES3/model_distortion_ps.fx | 0 .../Shader_ES3/model_distortion_vs.fx | 0 .../Shader_ES3/model_lit_ps.fx | 0 .../Shader_ES3/model_lit_vs.fx | 0 .../Shader_ES3/model_unlit_ps.fx | 0 .../Shader_ES3/model_unlit_vs.fx | 0 .../Shader_ES3/sprite_distortion_vs.fx | 0 .../Shader_ES3/sprite_lit_vs.fx | 0 .../Shader_ES3/sprite_unlit_vs.fx | 0 .../combine_shader.py | 0 Dev/Cpp/EffekseerRendererLLGI/CMakeLists.txt | 41 +- .../{ => EffekseerRendererLLGI}/Common.cpp | 0 .../{ => EffekseerRendererLLGI}/Common.h | 2 +- .../EffekseerRendererLLGI.Base.Pre.h | 0 .../EffekseerRendererLLGI.Base.h | 0 .../EffekseerRendererLLGI.MaterialLoader.cpp | 0 .../EffekseerRendererLLGI.MaterialLoader.h | 0 .../EffekseerRendererLLGI.ModelRenderer.cpp | 0 .../EffekseerRendererLLGI.ModelRenderer.h | 2 +- .../EffekseerRendererLLGI.RenderState.cpp | 0 .../EffekseerRendererLLGI.RenderState.h | 2 +- .../EffekseerRendererLLGI.Renderer.cpp | 12 +- .../EffekseerRendererLLGI.Renderer.h | 2 +- ...ffekseerRendererLLGI.RendererImplemented.h | 442 ++++++------- .../EffekseerRendererLLGI.Shader.cpp | 0 .../EffekseerRendererLLGI.Shader.h | 2 +- .../GraphicsDevice.cpp | 0 .../GraphicsDevice.h | 0 Dev/Cpp/EffekseerRendererMetal/CMakeLists.txt | 11 +- .../EffekseerRendererMetal.h | 6 +- .../EffekseerRendererMetal.Base.Pre.h | 0 .../EffekseerRendererMetal.Base.h | 0 .../EffekseerRendererMetal.Renderer.h | 0 .../EffekseerRendererMetal.Renderer.mm | 0 .../Shader/ad_model_distortion_ps.fx | 0 .../Shader/ad_model_distortion_vs.fx | 0 .../Shader/ad_model_lit_ps.fx | 0 .../Shader/ad_model_lit_vs.fx | 0 .../Shader/ad_model_unlit_ps.fx | 0 .../Shader/ad_model_unlit_vs.fx | 0 .../Shader/ad_sprite_distortion_vs.fx | 0 .../Shader/ad_sprite_lit_vs.fx | 0 .../Shader/ad_sprite_unlit_vs.fx | 0 .../Shader/model_distortion_ps.fx | 0 .../Shader/model_distortion_vs.fx | 0 .../Shader/model_lit_ps.fx | 0 .../Shader/model_lit_vs.fx | 0 .../Shader/model_unlit_ps.fx | 0 .../Shader/model_unlit_vs.fx | 0 .../Shader/sprite_distortion_vs.fx | 0 .../Shader/sprite_lit_vs.fx | 0 .../Shader/sprite_unlit_vs.fx | 0 .../ShaderHeader/ad_model_distortion_ps.h | 0 .../ShaderHeader/ad_model_distortion_vs.h | 0 .../ShaderHeader/ad_model_lit_ps.h | 0 .../ShaderHeader/ad_model_lit_vs.h | 0 .../ShaderHeader/ad_model_unlit_ps.h | 0 .../ShaderHeader/ad_model_unlit_vs.h | 0 .../ShaderHeader/ad_sprite_distortion_vs.h | 0 .../ShaderHeader/ad_sprite_lit_vs.h | 0 .../ShaderHeader/ad_sprite_unlit_vs.h | 0 .../ShaderHeader/model_distortion_ps.h | 0 .../ShaderHeader/model_distortion_vs.h | 0 .../ShaderHeader/model_lit_ps.h | 0 .../ShaderHeader/model_lit_vs.h | 0 .../ShaderHeader/model_unlit_ps.h | 0 .../ShaderHeader/model_unlit_vs.h | 0 .../ShaderHeader/sprite_distortion_vs.h | 0 .../ShaderHeader/sprite_lit_vs.h | 0 .../ShaderHeader/sprite_unlit_vs.h | 0 .../combine_shader.py | 0 .../EffekseerRendererVulkan/CMakeLists.txt | 11 +- .../EffekseerRendererVulkan.h | 6 +- .../EffekseerMaterialCompilerVulkan.cpp | 0 .../EffekseerMaterialCompilerVulkan.h | 0 .../EffekseerRendererVulkan.Base.Pre.h | 0 .../EffekseerRendererVulkan.Base.h | 2 +- .../EffekseerRendererVulkan.Renderer.cpp | 326 +++++----- .../EffekseerRendererVulkan.Renderer.h | 14 +- .../Shader/ad_model_distortion_ps.fx.frag | 0 .../Shader/ad_model_distortion_vs.fx.vert | 0 .../Shader/ad_model_lit_ps.fx.frag | 0 .../Shader/ad_model_lit_vs.fx.vert | 0 .../Shader/ad_model_unlit_ps.fx.frag | 0 .../Shader/ad_model_unlit_vs.fx.vert | 0 .../Shader/ad_sprite_distortion_vs.fx.vert | 0 .../Shader/ad_sprite_lit_vs.fx.vert | 0 .../Shader/ad_sprite_unlit_vs.fx.vert | 0 .../Shader/model_distortion_ps.fx.frag | 0 .../Shader/model_distortion_vs.fx.vert | 0 .../Shader/model_lit_ps.fx.frag | 0 .../Shader/model_lit_vs.fx.vert | 0 .../Shader/model_unlit_ps.fx.frag | 0 .../Shader/model_unlit_vs.fx.vert | 0 .../Shader/sprite_distortion_vs.fx.vert | 0 .../Shader/sprite_lit_vs.fx.vert | 0 .../Shader/sprite_unlit_vs.fx.vert | 0 .../ShaderHeader/ad_model_distortion_ps.h | 0 .../ShaderHeader/ad_model_distortion_vs.h | 0 .../ShaderHeader/ad_model_lit_ps.h | 0 .../ShaderHeader/ad_model_lit_vs.h | 0 .../ShaderHeader/ad_model_unlit_ps.h | 0 .../ShaderHeader/ad_model_unlit_vs.h | 0 .../ShaderHeader/ad_sprite_distortion_vs.h | 0 .../ShaderHeader/ad_sprite_lit_vs.h | 0 .../ShaderHeader/ad_sprite_unlit_vs.h | 0 .../ShaderHeader/model_distortion_ps.h | 0 .../ShaderHeader/model_distortion_vs.h | 0 .../ShaderHeader/model_lit_ps.h | 0 .../ShaderHeader/model_lit_vs.h | 0 .../ShaderHeader/model_unlit_ps.h | 0 .../ShaderHeader/model_unlit_vs.h | 0 .../ShaderHeader/sprite_distortion_vs.h | 0 .../ShaderHeader/sprite_lit_vs.h | 0 .../ShaderHeader/sprite_unlit_vs.h | 0 .../compile.py | 0 Dev/Cpp/EffekseerSoundAL/CMakeLists.txt | 20 +- .../EffekseerSoundAL.Sound.cpp | 0 .../EffekseerSoundAL.SoundImplemented.h | 0 .../EffekseerSoundAL.SoundLoader.cpp | 0 .../EffekseerSoundAL.SoundLoader.h | 0 .../EffekseerSoundAL.SoundPlayer.cpp | 0 .../EffekseerSoundAL.SoundPlayer.h | 0 .../EffekseerSoundAL.SoundVoice.cpp | 0 .../EffekseerSoundAL.SoundVoice.h | 0 Dev/Cpp/EffekseerSoundDSound/CMakeLists.txt | 20 +- .../EffekseerSoundDSound.Sound.cpp | 0 .../EffekseerSoundDSound.SoundImplemented.h | 0 .../EffekseerSoundDSound.SoundLoader.cpp | 0 .../EffekseerSoundDSound.SoundLoader.h | 0 .../EffekseerSoundDSound.SoundPlayer.cpp | 0 .../EffekseerSoundDSound.SoundPlayer.h | 0 .../EffekseerSoundDSound.SoundVoice.cpp | 0 .../EffekseerSoundDSound.SoundVoice.h | 0 Dev/Cpp/EffekseerSoundOSMixer/CMakeLists.txt | 16 +- .../EffekseerSoundOSMixer.Sound.cpp | 0 .../EffekseerSoundOSMixer.SoundImplemented.h | 0 .../EffekseerSoundOSMixer.SoundLoader.cpp | 0 .../EffekseerSoundOSMixer.SoundLoader.h | 0 .../EffekseerSoundOSMixer.SoundPlayer.cpp | 0 .../EffekseerSoundOSMixer.SoundPlayer.h | 0 Dev/Cpp/EffekseerSoundXAudio2/CMakeLists.txt | 20 +- .../EffekseerSoundXAudio2.Sound.cpp | 0 .../EffekseerSoundXAudio2.SoundImplemented.h | 0 .../EffekseerSoundXAudio2.SoundLoader.cpp | 0 .../EffekseerSoundXAudio2.SoundLoader.h | 0 .../EffekseerSoundXAudio2.SoundPlayer.cpp | 0 .../EffekseerSoundXAudio2.SoundPlayer.h | 0 .../EffekseerSoundXAudio2.SoundVoice.cpp | 0 .../EffekseerSoundXAudio2.SoundVoice.h | 0 Dev/Cpp/Test/Backend/Mesh.cpp | 12 +- Dev/Cpp/Test/Backend/OpenGL.cpp | 5 +- Dev/Cpp/Test/Runtime/Vertex.cpp | 12 +- .../RenderingEnvironmentDX11.cpp | 3 +- .../Runtime/EffectPlatform.h | 2 +- Dev/Cpp/Viewer/3D/EffectRenderer.cpp | 13 +- .../Viewer/3D/MainScreenEffectRenderer.cpp | 2 +- Dev/Cpp/Viewer/GUI/efk.GUIManager.cpp | 10 +- Dev/Cpp/Viewer/GUI/efk.Window.cpp | 9 +- .../Graphics/Platform/DX11/efk.GraphicsDX11.h | 6 +- .../Graphics/Platform/GL/efk.GraphicsGL.cpp | 4 +- .../Graphics/Platform/GL/efk.GraphicsGL.h | 6 +- Dev/Cpp/Viewer/Graphics/efk.Graphics.h | 2 +- 475 files changed, 954 insertions(+), 948 deletions(-) rename Dev/Cpp/EffekseerRendererCommon/{ => EffekseerRendererCommon}/EffekseerRenderer.CommonUtils.cpp (100%) rename Dev/Cpp/EffekseerRendererCommon/{ => EffekseerRendererCommon}/EffekseerRenderer.CommonUtils.h (100%) rename Dev/Cpp/EffekseerRendererCommon/{ => EffekseerRendererCommon}/EffekseerRenderer.DDSTextureLoader.cpp (100%) rename Dev/Cpp/EffekseerRendererCommon/{ => EffekseerRendererCommon}/EffekseerRenderer.DDSTextureLoader.h (100%) rename Dev/Cpp/EffekseerRendererCommon/{ => EffekseerRendererCommon}/EffekseerRenderer.ModelRendererBase.cpp (100%) rename Dev/Cpp/EffekseerRendererCommon/{ => EffekseerRendererCommon}/EffekseerRenderer.ModelRendererBase.h (100%) rename Dev/Cpp/EffekseerRendererCommon/{ => EffekseerRendererCommon}/EffekseerRenderer.PngTextureLoader.cpp (100%) rename Dev/Cpp/EffekseerRendererCommon/{ => EffekseerRendererCommon}/EffekseerRenderer.PngTextureLoader.h (100%) rename Dev/Cpp/EffekseerRendererCommon/{ => EffekseerRendererCommon}/EffekseerRenderer.RenderStateBase.cpp (100%) rename Dev/Cpp/EffekseerRendererCommon/{ => EffekseerRendererCommon}/EffekseerRenderer.RenderStateBase.h (100%) rename Dev/Cpp/EffekseerRendererCommon/{ => EffekseerRendererCommon}/EffekseerRenderer.Renderer.cpp (100%) rename Dev/Cpp/EffekseerRendererCommon/{ => EffekseerRendererCommon}/EffekseerRenderer.Renderer.h (100%) rename Dev/Cpp/EffekseerRendererCommon/{ => EffekseerRendererCommon}/EffekseerRenderer.Renderer_Impl.cpp (100%) rename Dev/Cpp/EffekseerRendererCommon/{ => EffekseerRendererCommon}/EffekseerRenderer.Renderer_Impl.h (100%) rename Dev/Cpp/EffekseerRendererCommon/{ => EffekseerRendererCommon}/EffekseerRenderer.RibbonRendererBase.cpp (100%) rename Dev/Cpp/EffekseerRendererCommon/{ => EffekseerRendererCommon}/EffekseerRenderer.RibbonRendererBase.h (100%) rename Dev/Cpp/EffekseerRendererCommon/{ => EffekseerRendererCommon}/EffekseerRenderer.RingRendererBase.cpp (100%) rename Dev/Cpp/EffekseerRendererCommon/{ => EffekseerRendererCommon}/EffekseerRenderer.RingRendererBase.h (100%) rename Dev/Cpp/EffekseerRendererCommon/{ => EffekseerRendererCommon}/EffekseerRenderer.ShaderBase.h (100%) rename Dev/Cpp/EffekseerRendererCommon/{ => EffekseerRendererCommon}/EffekseerRenderer.SpriteRendererBase.cpp (100%) rename Dev/Cpp/EffekseerRendererCommon/{ => EffekseerRendererCommon}/EffekseerRenderer.SpriteRendererBase.h (100%) rename Dev/Cpp/EffekseerRendererCommon/{ => EffekseerRendererCommon}/EffekseerRenderer.StandardRenderer.h (100%) rename Dev/Cpp/EffekseerRendererCommon/{ => EffekseerRendererCommon}/EffekseerRenderer.TGATextureLoader.cpp (100%) rename Dev/Cpp/EffekseerRendererCommon/{ => EffekseerRendererCommon}/EffekseerRenderer.TGATextureLoader.h (100%) rename Dev/Cpp/EffekseerRendererCommon/{ => EffekseerRendererCommon}/EffekseerRenderer.TrackRendererBase.cpp (100%) rename Dev/Cpp/EffekseerRendererCommon/{ => EffekseerRendererCommon}/EffekseerRenderer.TrackRendererBase.h (100%) rename Dev/Cpp/EffekseerRendererCommon/{ => EffekseerRendererCommon}/EffekseerRendererFlags.h (100%) rename Dev/Cpp/EffekseerRendererCommon/{ => EffekseerRendererCommon}/GraphicsDeviceCPU.cpp (100%) rename Dev/Cpp/EffekseerRendererCommon/{ => EffekseerRendererCommon}/GraphicsDeviceCPU.h (100%) rename Dev/Cpp/EffekseerRendererCommon/{ => EffekseerRendererCommon}/ModelLoader.cpp (100%) rename Dev/Cpp/EffekseerRendererCommon/{ => EffekseerRendererCommon}/ModelLoader.h (100%) rename Dev/Cpp/EffekseerRendererCommon/{ => EffekseerRendererCommon}/TextureLoader.cpp (100%) rename Dev/Cpp/EffekseerRendererCommon/{ => EffekseerRendererCommon}/TextureLoader.h (100%) rename Dev/Cpp/EffekseerRendererCommon/{ => EffekseerRendererCommon}/VertexBuffer.cpp (100%) rename Dev/Cpp/EffekseerRendererCommon/{ => EffekseerRendererCommon}/VertexBuffer.h (100%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/EffekseerRendererDX11.Base.Pre.h (100%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/EffekseerRendererDX11.Base.h (100%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/EffekseerRendererDX11.DeviceObject.cpp (100%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/EffekseerRendererDX11.DeviceObject.h (100%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/EffekseerRendererDX11.GPUTimer.cpp (100%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/EffekseerRendererDX11.GPUTimer.h (100%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/EffekseerRendererDX11.MaterialLoader.cpp (100%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/EffekseerRendererDX11.MaterialLoader.h (100%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/EffekseerRendererDX11.ModelRenderer.cpp (100%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/EffekseerRendererDX11.ModelRenderer.h (96%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/EffekseerRendererDX11.RenderState.cpp (100%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/EffekseerRendererDX11.RenderState.h (96%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/EffekseerRendererDX11.Renderer.cpp (98%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/EffekseerRendererDX11.Renderer.h (98%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/EffekseerRendererDX11.RendererImplemented.h (97%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/EffekseerRendererDX11.Shader.cpp (100%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/EffekseerRendererDX11.Shader.h (96%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/GraphicsDevice.cpp (99%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/GraphicsDevice.h (99%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/Shader/Distortion_Common_PS.fx (100%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/Shader/FlipbookInterpolationUtils.fx (100%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/Shader/FlipbookInterpolationUtils_PS.fx (100%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/Shader/Linear_sRGB.fx (100%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/Shader/SoftParticle_PS.fx (100%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/Shader/TextureBlendingUtils_PS.fx (100%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/Shader/UVDistortionUtils_PS.fx (100%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/Shader/ad_common_ps.fx (100%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/Shader/ad_model_common_vs.fx (100%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/Shader/ad_model_distortion_ps.fx (100%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/Shader/ad_model_distortion_vs.fx (100%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/Shader/ad_model_lit_ps.fx (100%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/Shader/ad_model_lit_vs.fx (100%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/Shader/ad_model_ps.fx (100%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/Shader/ad_model_unlit_ps.fx (100%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/Shader/ad_model_unlit_vs.fx (100%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/Shader/ad_model_vs.fx (100%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/Shader/ad_sprite_common_vs.fx (100%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/Shader/ad_sprite_distortion_vs.fx (100%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/Shader/ad_sprite_lit_vs.fx (100%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/Shader/ad_sprite_unlit_vs.fx (100%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/Shader/model_distortion_ps.fx (100%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/Shader/model_distortion_vs.fx (100%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/Shader/model_lit_ps.fx (100%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/Shader/model_lit_vs.fx (100%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/Shader/model_ps.fx (100%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/Shader/model_unlit_ps.fx (100%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/Shader/model_unlit_vs.fx (100%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/Shader/model_vs.fx (100%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/Shader/sprite_distortion_vs.fx (100%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/Shader/sprite_lit_vs.fx (100%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/Shader/sprite_unlit_vs.fx (100%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/ShaderHeader/ad_model_distortion_ps.h (100%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/ShaderHeader/ad_model_distortion_vs.h (100%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/ShaderHeader/ad_model_lit_ps.h (100%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/ShaderHeader/ad_model_lit_vs.h (100%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/ShaderHeader/ad_model_unlit_ps.h (100%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/ShaderHeader/ad_model_unlit_vs.h (100%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/ShaderHeader/ad_sprite_distortion_vs.h (100%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/ShaderHeader/ad_sprite_lit_vs.h (100%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/ShaderHeader/ad_sprite_unlit_vs.h (100%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/ShaderHeader/model_distortion_ps.h (100%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/ShaderHeader/model_distortion_vs.h (100%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/ShaderHeader/model_lit_ps.h (100%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/ShaderHeader/model_lit_vs.h (100%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/ShaderHeader/model_unlit_ps.h (100%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/ShaderHeader/model_unlit_vs.h (100%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/ShaderHeader/sprite_distortion_vs.h (100%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/ShaderHeader/sprite_lit_vs.h (100%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/ShaderHeader/sprite_unlit_vs.h (100%) rename Dev/Cpp/EffekseerRendererDX11/{EffekseerRenderer => EffekseerRendererDX11}/compile_effect.bat (100%) rename Dev/Cpp/EffekseerRendererDX12/{EffekseerRenderer => EffekseerRendererDX12}/EffekseerRendererDX12.Base.Pre.h (100%) rename Dev/Cpp/EffekseerRendererDX12/{EffekseerRenderer => EffekseerRendererDX12}/EffekseerRendererDX12.Base.h (70%) rename Dev/Cpp/EffekseerRendererDX12/{EffekseerRenderer => EffekseerRendererDX12}/EffekseerRendererDX12.Renderer.cpp (95%) rename Dev/Cpp/EffekseerRendererDX12/{EffekseerRenderer => EffekseerRendererDX12}/EffekseerRendererDX12.Renderer.h (97%) rename Dev/Cpp/EffekseerRendererDX12/{EffekseerRenderer => EffekseerRendererDX12}/Shader/ad_model_distortion_ps.fx (100%) rename Dev/Cpp/EffekseerRendererDX12/{EffekseerRenderer => EffekseerRendererDX12}/Shader/ad_model_distortion_vs.fx (100%) rename Dev/Cpp/EffekseerRendererDX12/{EffekseerRenderer => EffekseerRendererDX12}/Shader/ad_model_lit_ps.fx (100%) rename Dev/Cpp/EffekseerRendererDX12/{EffekseerRenderer => EffekseerRendererDX12}/Shader/ad_model_lit_vs.fx (100%) rename Dev/Cpp/EffekseerRendererDX12/{EffekseerRenderer => EffekseerRendererDX12}/Shader/ad_model_unlit_ps.fx (100%) rename Dev/Cpp/EffekseerRendererDX12/{EffekseerRenderer => EffekseerRendererDX12}/Shader/ad_model_unlit_vs.fx (100%) rename Dev/Cpp/EffekseerRendererDX12/{EffekseerRenderer => EffekseerRendererDX12}/Shader/ad_sprite_distortion_vs.fx (100%) rename Dev/Cpp/EffekseerRendererDX12/{EffekseerRenderer => EffekseerRendererDX12}/Shader/ad_sprite_lit_vs.fx (100%) rename Dev/Cpp/EffekseerRendererDX12/{EffekseerRenderer => EffekseerRendererDX12}/Shader/ad_sprite_unlit_vs.fx (100%) rename Dev/Cpp/EffekseerRendererDX12/{EffekseerRenderer => EffekseerRendererDX12}/Shader/model_distortion_ps.fx (100%) rename Dev/Cpp/EffekseerRendererDX12/{EffekseerRenderer => EffekseerRendererDX12}/Shader/model_distortion_vs.fx (100%) rename Dev/Cpp/EffekseerRendererDX12/{EffekseerRenderer => EffekseerRendererDX12}/Shader/model_lit_ps.fx (100%) rename Dev/Cpp/EffekseerRendererDX12/{EffekseerRenderer => EffekseerRendererDX12}/Shader/model_lit_vs.fx (100%) rename Dev/Cpp/EffekseerRendererDX12/{EffekseerRenderer => EffekseerRendererDX12}/Shader/model_unlit_ps.fx (100%) rename Dev/Cpp/EffekseerRendererDX12/{EffekseerRenderer => EffekseerRendererDX12}/Shader/model_unlit_vs.fx (100%) rename Dev/Cpp/EffekseerRendererDX12/{EffekseerRenderer => EffekseerRendererDX12}/Shader/sprite_distortion_vs.fx (100%) rename Dev/Cpp/EffekseerRendererDX12/{EffekseerRenderer => EffekseerRendererDX12}/Shader/sprite_lit_vs.fx (100%) rename Dev/Cpp/EffekseerRendererDX12/{EffekseerRenderer => EffekseerRendererDX12}/Shader/sprite_unlit_vs.fx (100%) rename Dev/Cpp/EffekseerRendererDX12/{EffekseerRenderer => EffekseerRendererDX12}/ShaderHeader/ad_model_distortion_ps.h (100%) rename Dev/Cpp/EffekseerRendererDX12/{EffekseerRenderer => EffekseerRendererDX12}/ShaderHeader/ad_model_distortion_vs.h (100%) rename Dev/Cpp/EffekseerRendererDX12/{EffekseerRenderer => EffekseerRendererDX12}/ShaderHeader/ad_model_lit_ps.h (100%) rename Dev/Cpp/EffekseerRendererDX12/{EffekseerRenderer => EffekseerRendererDX12}/ShaderHeader/ad_model_lit_vs.h (100%) rename Dev/Cpp/EffekseerRendererDX12/{EffekseerRenderer => EffekseerRendererDX12}/ShaderHeader/ad_model_unlit_ps.h (100%) rename Dev/Cpp/EffekseerRendererDX12/{EffekseerRenderer => EffekseerRendererDX12}/ShaderHeader/ad_model_unlit_vs.h (100%) rename Dev/Cpp/EffekseerRendererDX12/{EffekseerRenderer => EffekseerRendererDX12}/ShaderHeader/ad_sprite_distortion_vs.h (100%) rename Dev/Cpp/EffekseerRendererDX12/{EffekseerRenderer => EffekseerRendererDX12}/ShaderHeader/ad_sprite_lit_vs.h (100%) rename Dev/Cpp/EffekseerRendererDX12/{EffekseerRenderer => EffekseerRendererDX12}/ShaderHeader/ad_sprite_unlit_vs.h (100%) rename Dev/Cpp/EffekseerRendererDX12/{EffekseerRenderer => EffekseerRendererDX12}/ShaderHeader/model_distortion_ps.h (100%) rename Dev/Cpp/EffekseerRendererDX12/{EffekseerRenderer => EffekseerRendererDX12}/ShaderHeader/model_distortion_vs.h (100%) rename Dev/Cpp/EffekseerRendererDX12/{EffekseerRenderer => EffekseerRendererDX12}/ShaderHeader/model_lit_ps.h (100%) rename Dev/Cpp/EffekseerRendererDX12/{EffekseerRenderer => EffekseerRendererDX12}/ShaderHeader/model_lit_vs.h (100%) rename Dev/Cpp/EffekseerRendererDX12/{EffekseerRenderer => EffekseerRendererDX12}/ShaderHeader/model_unlit_ps.h (100%) rename Dev/Cpp/EffekseerRendererDX12/{EffekseerRenderer => EffekseerRendererDX12}/ShaderHeader/model_unlit_vs.h (100%) rename Dev/Cpp/EffekseerRendererDX12/{EffekseerRenderer => EffekseerRendererDX12}/ShaderHeader/sprite_distortion_vs.h (100%) rename Dev/Cpp/EffekseerRendererDX12/{EffekseerRenderer => EffekseerRendererDX12}/ShaderHeader/sprite_lit_vs.h (100%) rename Dev/Cpp/EffekseerRendererDX12/{EffekseerRenderer => EffekseerRendererDX12}/ShaderHeader/sprite_unlit_vs.h (100%) rename Dev/Cpp/EffekseerRendererDX12/{EffekseerRenderer => EffekseerRendererDX12}/compile_effect.bat (100%) rename Dev/Cpp/EffekseerRendererDX9/{EffekseerRenderer => EffekseerRendererDX9}/EffekseerRendererDX9.Base.Pre.h (100%) rename Dev/Cpp/EffekseerRendererDX9/{EffekseerRenderer => EffekseerRendererDX9}/EffekseerRendererDX9.Base.h (100%) rename Dev/Cpp/EffekseerRendererDX9/{EffekseerRenderer => EffekseerRendererDX9}/EffekseerRendererDX9.MaterialLoader.cpp (100%) rename Dev/Cpp/EffekseerRendererDX9/{EffekseerRenderer => EffekseerRendererDX9}/EffekseerRendererDX9.MaterialLoader.h (100%) rename Dev/Cpp/EffekseerRendererDX9/{EffekseerRenderer => EffekseerRendererDX9}/EffekseerRendererDX9.ModelRenderer.cpp (100%) rename Dev/Cpp/EffekseerRendererDX9/{EffekseerRenderer => EffekseerRendererDX9}/EffekseerRendererDX9.ModelRenderer.h (96%) rename Dev/Cpp/EffekseerRendererDX9/{EffekseerRenderer => EffekseerRendererDX9}/EffekseerRendererDX9.RenderState.cpp (100%) rename Dev/Cpp/EffekseerRendererDX9/{EffekseerRenderer => EffekseerRendererDX9}/EffekseerRendererDX9.RenderState.h (94%) rename Dev/Cpp/EffekseerRendererDX9/{EffekseerRenderer => EffekseerRendererDX9}/EffekseerRendererDX9.Renderer.cpp (97%) rename Dev/Cpp/EffekseerRendererDX9/{EffekseerRenderer => EffekseerRendererDX9}/EffekseerRendererDX9.Renderer.h (96%) rename Dev/Cpp/EffekseerRendererDX9/{EffekseerRenderer => EffekseerRendererDX9}/EffekseerRendererDX9.RendererImplemented.h (97%) rename Dev/Cpp/EffekseerRendererDX9/{EffekseerRenderer => EffekseerRendererDX9}/EffekseerRendererDX9.Shader.cpp (100%) rename Dev/Cpp/EffekseerRendererDX9/{EffekseerRenderer => EffekseerRendererDX9}/EffekseerRendererDX9.Shader.h (97%) rename Dev/Cpp/EffekseerRendererDX9/{EffekseerRenderer => EffekseerRendererDX9}/GraphicsDevice.cpp (99%) rename Dev/Cpp/EffekseerRendererDX9/{EffekseerRenderer => EffekseerRendererDX9}/GraphicsDevice.h (99%) rename Dev/Cpp/EffekseerRendererDX9/{EffekseerRenderer => EffekseerRendererDX9}/Shader/ad_model_distortion_ps.fx (100%) rename Dev/Cpp/EffekseerRendererDX9/{EffekseerRenderer => EffekseerRendererDX9}/Shader/ad_model_distortion_vs.fx (100%) rename Dev/Cpp/EffekseerRendererDX9/{EffekseerRenderer => EffekseerRendererDX9}/Shader/ad_model_lit_ps.fx (100%) rename Dev/Cpp/EffekseerRendererDX9/{EffekseerRenderer => EffekseerRendererDX9}/Shader/ad_model_lit_vs.fx (100%) rename Dev/Cpp/EffekseerRendererDX9/{EffekseerRenderer => EffekseerRendererDX9}/Shader/ad_model_unlit_ps.fx (100%) rename Dev/Cpp/EffekseerRendererDX9/{EffekseerRenderer => EffekseerRendererDX9}/Shader/ad_model_unlit_vs.fx (100%) rename Dev/Cpp/EffekseerRendererDX9/{EffekseerRenderer => EffekseerRendererDX9}/Shader/ad_sprite_distortion_vs.fx (100%) rename Dev/Cpp/EffekseerRendererDX9/{EffekseerRenderer => EffekseerRendererDX9}/Shader/ad_sprite_lit_vs.fx (100%) rename Dev/Cpp/EffekseerRendererDX9/{EffekseerRenderer => EffekseerRendererDX9}/Shader/ad_sprite_unlit_vs.fx (100%) rename Dev/Cpp/EffekseerRendererDX9/{EffekseerRenderer => EffekseerRendererDX9}/Shader/model_distortion_ps.fx (100%) rename Dev/Cpp/EffekseerRendererDX9/{EffekseerRenderer => EffekseerRendererDX9}/Shader/model_distortion_vs.fx (100%) rename Dev/Cpp/EffekseerRendererDX9/{EffekseerRenderer => EffekseerRendererDX9}/Shader/model_lit_ps.fx (100%) rename Dev/Cpp/EffekseerRendererDX9/{EffekseerRenderer => EffekseerRendererDX9}/Shader/model_lit_vs.fx (100%) rename Dev/Cpp/EffekseerRendererDX9/{EffekseerRenderer => EffekseerRendererDX9}/Shader/model_unlit_ps.fx (100%) rename Dev/Cpp/EffekseerRendererDX9/{EffekseerRenderer => EffekseerRendererDX9}/Shader/model_unlit_vs.fx (100%) rename Dev/Cpp/EffekseerRendererDX9/{EffekseerRenderer => EffekseerRendererDX9}/Shader/sprite_distortion_vs.fx (100%) rename Dev/Cpp/EffekseerRendererDX9/{EffekseerRenderer => EffekseerRendererDX9}/Shader/sprite_lit_vs.fx (100%) rename Dev/Cpp/EffekseerRendererDX9/{EffekseerRenderer => EffekseerRendererDX9}/Shader/sprite_unlit_vs.fx (100%) rename Dev/Cpp/EffekseerRendererDX9/{EffekseerRenderer => EffekseerRendererDX9}/ShaderHeader/ad_model_distortion_ps.h (100%) rename Dev/Cpp/EffekseerRendererDX9/{EffekseerRenderer => EffekseerRendererDX9}/ShaderHeader/ad_model_distortion_vs.h (100%) rename Dev/Cpp/EffekseerRendererDX9/{EffekseerRenderer => EffekseerRendererDX9}/ShaderHeader/ad_model_lit_ps.h (100%) rename Dev/Cpp/EffekseerRendererDX9/{EffekseerRenderer => EffekseerRendererDX9}/ShaderHeader/ad_model_lit_vs.h (100%) rename Dev/Cpp/EffekseerRendererDX9/{EffekseerRenderer => EffekseerRendererDX9}/ShaderHeader/ad_model_unlit_ps.h (100%) rename Dev/Cpp/EffekseerRendererDX9/{EffekseerRenderer => EffekseerRendererDX9}/ShaderHeader/ad_model_unlit_vs.h (100%) rename Dev/Cpp/EffekseerRendererDX9/{EffekseerRenderer => EffekseerRendererDX9}/ShaderHeader/ad_sprite_distortion_vs.h (100%) rename Dev/Cpp/EffekseerRendererDX9/{EffekseerRenderer => EffekseerRendererDX9}/ShaderHeader/ad_sprite_lit_vs.h (100%) rename Dev/Cpp/EffekseerRendererDX9/{EffekseerRenderer => EffekseerRendererDX9}/ShaderHeader/ad_sprite_unlit_vs.h (100%) rename Dev/Cpp/EffekseerRendererDX9/{EffekseerRenderer => EffekseerRendererDX9}/ShaderHeader/model_distortion_ps.h (100%) rename Dev/Cpp/EffekseerRendererDX9/{EffekseerRenderer => EffekseerRendererDX9}/ShaderHeader/model_distortion_vs.h (100%) rename Dev/Cpp/EffekseerRendererDX9/{EffekseerRenderer => EffekseerRendererDX9}/ShaderHeader/model_lit_ps.h (100%) rename Dev/Cpp/EffekseerRendererDX9/{EffekseerRenderer => EffekseerRendererDX9}/ShaderHeader/model_lit_vs.h (100%) rename Dev/Cpp/EffekseerRendererDX9/{EffekseerRenderer => EffekseerRendererDX9}/ShaderHeader/model_unlit_ps.h (100%) rename Dev/Cpp/EffekseerRendererDX9/{EffekseerRenderer => EffekseerRendererDX9}/ShaderHeader/model_unlit_vs.h (100%) rename Dev/Cpp/EffekseerRendererDX9/{EffekseerRenderer => EffekseerRendererDX9}/ShaderHeader/sprite_distortion_vs.h (100%) rename Dev/Cpp/EffekseerRendererDX9/{EffekseerRenderer => EffekseerRendererDX9}/ShaderHeader/sprite_lit_vs.h (100%) rename Dev/Cpp/EffekseerRendererDX9/{EffekseerRenderer => EffekseerRendererDX9}/ShaderHeader/sprite_unlit_vs.h (100%) rename Dev/Cpp/EffekseerRendererDX9/{EffekseerRenderer => EffekseerRendererDX9}/compile_effect.bat (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/EffekseerRendererGL.Base.Pre.h (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/EffekseerRendererGL.Base.h (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/EffekseerRendererGL.DeviceObject.cpp (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/EffekseerRendererGL.DeviceObject.h (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/EffekseerRendererGL.GLExtension.cpp (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/EffekseerRendererGL.GLExtension.h (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/EffekseerRendererGL.GPUTimer.cpp (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/EffekseerRendererGL.GPUTimer.h (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/EffekseerRendererGL.MaterialLoader.cpp (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/EffekseerRendererGL.MaterialLoader.h (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/EffekseerRendererGL.ModelRenderer.cpp (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/EffekseerRendererGL.ModelRenderer.h (96%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/EffekseerRendererGL.RenderState.cpp (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/EffekseerRendererGL.RenderState.h (95%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/EffekseerRendererGL.Renderer.cpp (98%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/EffekseerRendererGL.Renderer.h (98%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/EffekseerRendererGL.RendererImplemented.h (97%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/EffekseerRendererGL.Shader.cpp (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/EffekseerRendererGL.Shader.h (98%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/GraphicsDevice.cpp (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/GraphicsDevice.h (99%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/ShaderHeader/ad_model_distortion_ps.h (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/ShaderHeader/ad_model_distortion_vs.h (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/ShaderHeader/ad_model_lit_ps.h (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/ShaderHeader/ad_model_lit_vs.h (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/ShaderHeader/ad_model_unlit_ps.h (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/ShaderHeader/ad_model_unlit_vs.h (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/ShaderHeader/ad_sprite_distortion_vs.h (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/ShaderHeader/ad_sprite_lit_vs.h (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/ShaderHeader/ad_sprite_unlit_vs.h (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/ShaderHeader/model_distortion_ps.h (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/ShaderHeader/model_distortion_vs.h (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/ShaderHeader/model_lit_ps.h (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/ShaderHeader/model_lit_vs.h (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/ShaderHeader/model_unlit_ps.h (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/ShaderHeader/model_unlit_vs.h (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/ShaderHeader/sprite_distortion_vs.h (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/ShaderHeader/sprite_lit_vs.h (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/ShaderHeader/sprite_unlit_vs.h (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_2/ad_model_distortion_ps.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_2/ad_model_distortion_vs.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_2/ad_model_lit_ps.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_2/ad_model_lit_vs.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_2/ad_model_unlit_ps.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_2/ad_model_unlit_vs.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_2/ad_sprite_distortion_vs.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_2/ad_sprite_lit_vs.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_2/ad_sprite_unlit_vs.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_2/model_distortion_ps.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_2/model_distortion_vs.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_2/model_lit_ps.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_2/model_lit_vs.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_2/model_unlit_ps.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_2/model_unlit_vs.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_2/sprite_distortion_vs.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_2/sprite_lit_vs.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_2/sprite_unlit_vs.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_3/ad_model_distortion_ps.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_3/ad_model_distortion_vs.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_3/ad_model_lit_ps.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_3/ad_model_lit_vs.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_3/ad_model_unlit_ps.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_3/ad_model_unlit_vs.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_3/ad_sprite_distortion_vs.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_3/ad_sprite_lit_vs.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_3/ad_sprite_unlit_vs.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_3/model_distortion_ps.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_3/model_distortion_vs.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_3/model_lit_ps.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_3/model_lit_vs.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_3/model_unlit_ps.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_3/model_unlit_vs.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_3/sprite_distortion_vs.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_3/sprite_lit_vs.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_3/sprite_unlit_vs.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_ES2/ad_model_distortion_ps.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_ES2/ad_model_distortion_vs.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_ES2/ad_model_lit_ps.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_ES2/ad_model_lit_vs.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_ES2/ad_model_unlit_ps.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_ES2/ad_model_unlit_vs.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_ES2/ad_sprite_distortion_vs.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_ES2/ad_sprite_lit_vs.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_ES2/ad_sprite_unlit_vs.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_ES2/model_distortion_ps.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_ES2/model_distortion_vs.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_ES2/model_lit_ps.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_ES2/model_lit_vs.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_ES2/model_unlit_ps.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_ES2/model_unlit_vs.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_ES2/sprite_distortion_vs.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_ES2/sprite_lit_vs.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_ES2/sprite_unlit_vs.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_ES3/ad_model_distortion_ps.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_ES3/ad_model_distortion_vs.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_ES3/ad_model_lit_ps.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_ES3/ad_model_lit_vs.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_ES3/ad_model_unlit_ps.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_ES3/ad_model_unlit_vs.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_ES3/ad_sprite_distortion_vs.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_ES3/ad_sprite_lit_vs.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_ES3/ad_sprite_unlit_vs.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_ES3/model_distortion_ps.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_ES3/model_distortion_vs.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_ES3/model_lit_ps.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_ES3/model_lit_vs.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_ES3/model_unlit_ps.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_ES3/model_unlit_vs.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_ES3/sprite_distortion_vs.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_ES3/sprite_lit_vs.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/Shader_ES3/sprite_unlit_vs.fx (100%) rename Dev/Cpp/EffekseerRendererGL/{EffekseerRenderer => EffekseerRendererGL}/combine_shader.py (100%) rename Dev/Cpp/EffekseerRendererLLGI/{ => EffekseerRendererLLGI}/Common.cpp (100%) rename Dev/Cpp/EffekseerRendererLLGI/{ => EffekseerRendererLLGI}/Common.h (93%) rename Dev/Cpp/EffekseerRendererLLGI/{ => EffekseerRendererLLGI}/EffekseerRendererLLGI.Base.Pre.h (100%) rename Dev/Cpp/EffekseerRendererLLGI/{ => EffekseerRendererLLGI}/EffekseerRendererLLGI.Base.h (100%) rename Dev/Cpp/EffekseerRendererLLGI/{ => EffekseerRendererLLGI}/EffekseerRendererLLGI.MaterialLoader.cpp (100%) rename Dev/Cpp/EffekseerRendererLLGI/{ => EffekseerRendererLLGI}/EffekseerRendererLLGI.MaterialLoader.h (100%) rename Dev/Cpp/EffekseerRendererLLGI/{ => EffekseerRendererLLGI}/EffekseerRendererLLGI.ModelRenderer.cpp (100%) rename Dev/Cpp/EffekseerRendererLLGI/{ => EffekseerRendererLLGI}/EffekseerRendererLLGI.ModelRenderer.h (95%) rename Dev/Cpp/EffekseerRendererLLGI/{ => EffekseerRendererLLGI}/EffekseerRendererLLGI.RenderState.cpp (100%) rename Dev/Cpp/EffekseerRendererLLGI/{ => EffekseerRendererLLGI}/EffekseerRendererLLGI.RenderState.h (91%) rename Dev/Cpp/EffekseerRendererLLGI/{ => EffekseerRendererLLGI}/EffekseerRendererLLGI.Renderer.cpp (98%) rename Dev/Cpp/EffekseerRendererLLGI/{ => EffekseerRendererLLGI}/EffekseerRendererLLGI.Renderer.h (98%) rename Dev/Cpp/EffekseerRendererLLGI/{ => EffekseerRendererLLGI}/EffekseerRendererLLGI.RendererImplemented.h (93%) rename Dev/Cpp/EffekseerRendererLLGI/{ => EffekseerRendererLLGI}/EffekseerRendererLLGI.Shader.cpp (100%) rename Dev/Cpp/EffekseerRendererLLGI/{ => EffekseerRendererLLGI}/EffekseerRendererLLGI.Shader.h (96%) rename Dev/Cpp/EffekseerRendererLLGI/{ => EffekseerRendererLLGI}/GraphicsDevice.cpp (100%) rename Dev/Cpp/EffekseerRendererLLGI/{ => EffekseerRendererLLGI}/GraphicsDevice.h (100%) rename Dev/Cpp/EffekseerRendererMetal/{EffekseerRenderer => EffekseerRendererMetal}/EffekseerRendererMetal.Base.Pre.h (100%) rename Dev/Cpp/EffekseerRendererMetal/{EffekseerRenderer => EffekseerRendererMetal}/EffekseerRendererMetal.Base.h (100%) rename Dev/Cpp/EffekseerRendererMetal/{EffekseerRenderer => EffekseerRendererMetal}/EffekseerRendererMetal.Renderer.h (100%) rename Dev/Cpp/EffekseerRendererMetal/{EffekseerRenderer => EffekseerRendererMetal}/EffekseerRendererMetal.Renderer.mm (100%) rename Dev/Cpp/EffekseerRendererMetal/{EffekseerRenderer => EffekseerRendererMetal}/Shader/ad_model_distortion_ps.fx (100%) rename Dev/Cpp/EffekseerRendererMetal/{EffekseerRenderer => EffekseerRendererMetal}/Shader/ad_model_distortion_vs.fx (100%) rename Dev/Cpp/EffekseerRendererMetal/{EffekseerRenderer => EffekseerRendererMetal}/Shader/ad_model_lit_ps.fx (100%) rename Dev/Cpp/EffekseerRendererMetal/{EffekseerRenderer => EffekseerRendererMetal}/Shader/ad_model_lit_vs.fx (100%) rename Dev/Cpp/EffekseerRendererMetal/{EffekseerRenderer => EffekseerRendererMetal}/Shader/ad_model_unlit_ps.fx (100%) rename Dev/Cpp/EffekseerRendererMetal/{EffekseerRenderer => EffekseerRendererMetal}/Shader/ad_model_unlit_vs.fx (100%) rename Dev/Cpp/EffekseerRendererMetal/{EffekseerRenderer => EffekseerRendererMetal}/Shader/ad_sprite_distortion_vs.fx (100%) rename Dev/Cpp/EffekseerRendererMetal/{EffekseerRenderer => EffekseerRendererMetal}/Shader/ad_sprite_lit_vs.fx (100%) rename Dev/Cpp/EffekseerRendererMetal/{EffekseerRenderer => EffekseerRendererMetal}/Shader/ad_sprite_unlit_vs.fx (100%) rename Dev/Cpp/EffekseerRendererMetal/{EffekseerRenderer => EffekseerRendererMetal}/Shader/model_distortion_ps.fx (100%) rename Dev/Cpp/EffekseerRendererMetal/{EffekseerRenderer => EffekseerRendererMetal}/Shader/model_distortion_vs.fx (100%) rename Dev/Cpp/EffekseerRendererMetal/{EffekseerRenderer => EffekseerRendererMetal}/Shader/model_lit_ps.fx (100%) rename Dev/Cpp/EffekseerRendererMetal/{EffekseerRenderer => EffekseerRendererMetal}/Shader/model_lit_vs.fx (100%) rename Dev/Cpp/EffekseerRendererMetal/{EffekseerRenderer => EffekseerRendererMetal}/Shader/model_unlit_ps.fx (100%) rename Dev/Cpp/EffekseerRendererMetal/{EffekseerRenderer => EffekseerRendererMetal}/Shader/model_unlit_vs.fx (100%) rename Dev/Cpp/EffekseerRendererMetal/{EffekseerRenderer => EffekseerRendererMetal}/Shader/sprite_distortion_vs.fx (100%) rename Dev/Cpp/EffekseerRendererMetal/{EffekseerRenderer => EffekseerRendererMetal}/Shader/sprite_lit_vs.fx (100%) rename Dev/Cpp/EffekseerRendererMetal/{EffekseerRenderer => EffekseerRendererMetal}/Shader/sprite_unlit_vs.fx (100%) rename Dev/Cpp/EffekseerRendererMetal/{EffekseerRenderer => EffekseerRendererMetal}/ShaderHeader/ad_model_distortion_ps.h (100%) rename Dev/Cpp/EffekseerRendererMetal/{EffekseerRenderer => EffekseerRendererMetal}/ShaderHeader/ad_model_distortion_vs.h (100%) rename Dev/Cpp/EffekseerRendererMetal/{EffekseerRenderer => EffekseerRendererMetal}/ShaderHeader/ad_model_lit_ps.h (100%) rename Dev/Cpp/EffekseerRendererMetal/{EffekseerRenderer => EffekseerRendererMetal}/ShaderHeader/ad_model_lit_vs.h (100%) rename Dev/Cpp/EffekseerRendererMetal/{EffekseerRenderer => EffekseerRendererMetal}/ShaderHeader/ad_model_unlit_ps.h (100%) rename Dev/Cpp/EffekseerRendererMetal/{EffekseerRenderer => EffekseerRendererMetal}/ShaderHeader/ad_model_unlit_vs.h (100%) rename Dev/Cpp/EffekseerRendererMetal/{EffekseerRenderer => EffekseerRendererMetal}/ShaderHeader/ad_sprite_distortion_vs.h (100%) rename Dev/Cpp/EffekseerRendererMetal/{EffekseerRenderer => EffekseerRendererMetal}/ShaderHeader/ad_sprite_lit_vs.h (100%) rename Dev/Cpp/EffekseerRendererMetal/{EffekseerRenderer => EffekseerRendererMetal}/ShaderHeader/ad_sprite_unlit_vs.h (100%) rename Dev/Cpp/EffekseerRendererMetal/{EffekseerRenderer => EffekseerRendererMetal}/ShaderHeader/model_distortion_ps.h (100%) rename Dev/Cpp/EffekseerRendererMetal/{EffekseerRenderer => EffekseerRendererMetal}/ShaderHeader/model_distortion_vs.h (100%) rename Dev/Cpp/EffekseerRendererMetal/{EffekseerRenderer => EffekseerRendererMetal}/ShaderHeader/model_lit_ps.h (100%) rename Dev/Cpp/EffekseerRendererMetal/{EffekseerRenderer => EffekseerRendererMetal}/ShaderHeader/model_lit_vs.h (100%) rename Dev/Cpp/EffekseerRendererMetal/{EffekseerRenderer => EffekseerRendererMetal}/ShaderHeader/model_unlit_ps.h (100%) rename Dev/Cpp/EffekseerRendererMetal/{EffekseerRenderer => EffekseerRendererMetal}/ShaderHeader/model_unlit_vs.h (100%) rename Dev/Cpp/EffekseerRendererMetal/{EffekseerRenderer => EffekseerRendererMetal}/ShaderHeader/sprite_distortion_vs.h (100%) rename Dev/Cpp/EffekseerRendererMetal/{EffekseerRenderer => EffekseerRendererMetal}/ShaderHeader/sprite_lit_vs.h (100%) rename Dev/Cpp/EffekseerRendererMetal/{EffekseerRenderer => EffekseerRendererMetal}/ShaderHeader/sprite_unlit_vs.h (100%) rename Dev/Cpp/EffekseerRendererMetal/{EffekseerRenderer => EffekseerRendererMetal}/combine_shader.py (100%) rename Dev/Cpp/EffekseerRendererVulkan/{EffekseerRenderer => EffekseerRendererVulkan}/EffekseerMaterialCompilerVulkan.cpp (100%) rename Dev/Cpp/EffekseerRendererVulkan/{EffekseerRenderer => EffekseerRendererVulkan}/EffekseerMaterialCompilerVulkan.h (100%) rename Dev/Cpp/EffekseerRendererVulkan/{EffekseerRenderer => EffekseerRendererVulkan}/EffekseerRendererVulkan.Base.Pre.h (100%) rename Dev/Cpp/EffekseerRendererVulkan/{EffekseerRenderer => EffekseerRendererVulkan}/EffekseerRendererVulkan.Base.h (77%) rename Dev/Cpp/EffekseerRendererVulkan/{EffekseerRenderer => EffekseerRendererVulkan}/EffekseerRendererVulkan.Renderer.cpp (96%) rename Dev/Cpp/EffekseerRendererVulkan/{EffekseerRenderer => EffekseerRendererVulkan}/EffekseerRendererVulkan.Renderer.h (83%) rename Dev/Cpp/EffekseerRendererVulkan/{EffekseerRenderer => EffekseerRendererVulkan}/Shader/ad_model_distortion_ps.fx.frag (100%) rename Dev/Cpp/EffekseerRendererVulkan/{EffekseerRenderer => EffekseerRendererVulkan}/Shader/ad_model_distortion_vs.fx.vert (100%) rename Dev/Cpp/EffekseerRendererVulkan/{EffekseerRenderer => EffekseerRendererVulkan}/Shader/ad_model_lit_ps.fx.frag (100%) rename Dev/Cpp/EffekseerRendererVulkan/{EffekseerRenderer => EffekseerRendererVulkan}/Shader/ad_model_lit_vs.fx.vert (100%) rename Dev/Cpp/EffekseerRendererVulkan/{EffekseerRenderer => EffekseerRendererVulkan}/Shader/ad_model_unlit_ps.fx.frag (100%) rename Dev/Cpp/EffekseerRendererVulkan/{EffekseerRenderer => EffekseerRendererVulkan}/Shader/ad_model_unlit_vs.fx.vert (100%) rename Dev/Cpp/EffekseerRendererVulkan/{EffekseerRenderer => EffekseerRendererVulkan}/Shader/ad_sprite_distortion_vs.fx.vert (100%) rename Dev/Cpp/EffekseerRendererVulkan/{EffekseerRenderer => EffekseerRendererVulkan}/Shader/ad_sprite_lit_vs.fx.vert (100%) rename Dev/Cpp/EffekseerRendererVulkan/{EffekseerRenderer => EffekseerRendererVulkan}/Shader/ad_sprite_unlit_vs.fx.vert (100%) rename Dev/Cpp/EffekseerRendererVulkan/{EffekseerRenderer => EffekseerRendererVulkan}/Shader/model_distortion_ps.fx.frag (100%) rename Dev/Cpp/EffekseerRendererVulkan/{EffekseerRenderer => EffekseerRendererVulkan}/Shader/model_distortion_vs.fx.vert (100%) rename Dev/Cpp/EffekseerRendererVulkan/{EffekseerRenderer => EffekseerRendererVulkan}/Shader/model_lit_ps.fx.frag (100%) rename Dev/Cpp/EffekseerRendererVulkan/{EffekseerRenderer => EffekseerRendererVulkan}/Shader/model_lit_vs.fx.vert (100%) rename Dev/Cpp/EffekseerRendererVulkan/{EffekseerRenderer => EffekseerRendererVulkan}/Shader/model_unlit_ps.fx.frag (100%) rename Dev/Cpp/EffekseerRendererVulkan/{EffekseerRenderer => EffekseerRendererVulkan}/Shader/model_unlit_vs.fx.vert (100%) rename Dev/Cpp/EffekseerRendererVulkan/{EffekseerRenderer => EffekseerRendererVulkan}/Shader/sprite_distortion_vs.fx.vert (100%) rename Dev/Cpp/EffekseerRendererVulkan/{EffekseerRenderer => EffekseerRendererVulkan}/Shader/sprite_lit_vs.fx.vert (100%) rename Dev/Cpp/EffekseerRendererVulkan/{EffekseerRenderer => EffekseerRendererVulkan}/Shader/sprite_unlit_vs.fx.vert (100%) rename Dev/Cpp/EffekseerRendererVulkan/{EffekseerRenderer => EffekseerRendererVulkan}/ShaderHeader/ad_model_distortion_ps.h (100%) rename Dev/Cpp/EffekseerRendererVulkan/{EffekseerRenderer => EffekseerRendererVulkan}/ShaderHeader/ad_model_distortion_vs.h (100%) rename Dev/Cpp/EffekseerRendererVulkan/{EffekseerRenderer => EffekseerRendererVulkan}/ShaderHeader/ad_model_lit_ps.h (100%) rename Dev/Cpp/EffekseerRendererVulkan/{EffekseerRenderer => EffekseerRendererVulkan}/ShaderHeader/ad_model_lit_vs.h (100%) rename Dev/Cpp/EffekseerRendererVulkan/{EffekseerRenderer => EffekseerRendererVulkan}/ShaderHeader/ad_model_unlit_ps.h (100%) rename Dev/Cpp/EffekseerRendererVulkan/{EffekseerRenderer => EffekseerRendererVulkan}/ShaderHeader/ad_model_unlit_vs.h (100%) rename Dev/Cpp/EffekseerRendererVulkan/{EffekseerRenderer => EffekseerRendererVulkan}/ShaderHeader/ad_sprite_distortion_vs.h (100%) rename Dev/Cpp/EffekseerRendererVulkan/{EffekseerRenderer => EffekseerRendererVulkan}/ShaderHeader/ad_sprite_lit_vs.h (100%) rename Dev/Cpp/EffekseerRendererVulkan/{EffekseerRenderer => EffekseerRendererVulkan}/ShaderHeader/ad_sprite_unlit_vs.h (100%) rename Dev/Cpp/EffekseerRendererVulkan/{EffekseerRenderer => EffekseerRendererVulkan}/ShaderHeader/model_distortion_ps.h (100%) rename Dev/Cpp/EffekseerRendererVulkan/{EffekseerRenderer => EffekseerRendererVulkan}/ShaderHeader/model_distortion_vs.h (100%) rename Dev/Cpp/EffekseerRendererVulkan/{EffekseerRenderer => EffekseerRendererVulkan}/ShaderHeader/model_lit_ps.h (100%) rename Dev/Cpp/EffekseerRendererVulkan/{EffekseerRenderer => EffekseerRendererVulkan}/ShaderHeader/model_lit_vs.h (100%) rename Dev/Cpp/EffekseerRendererVulkan/{EffekseerRenderer => EffekseerRendererVulkan}/ShaderHeader/model_unlit_ps.h (100%) rename Dev/Cpp/EffekseerRendererVulkan/{EffekseerRenderer => EffekseerRendererVulkan}/ShaderHeader/model_unlit_vs.h (100%) rename Dev/Cpp/EffekseerRendererVulkan/{EffekseerRenderer => EffekseerRendererVulkan}/ShaderHeader/sprite_distortion_vs.h (100%) rename Dev/Cpp/EffekseerRendererVulkan/{EffekseerRenderer => EffekseerRendererVulkan}/ShaderHeader/sprite_lit_vs.h (100%) rename Dev/Cpp/EffekseerRendererVulkan/{EffekseerRenderer => EffekseerRendererVulkan}/ShaderHeader/sprite_unlit_vs.h (100%) rename Dev/Cpp/EffekseerRendererVulkan/{EffekseerRenderer => EffekseerRendererVulkan}/compile.py (100%) rename Dev/Cpp/EffekseerSoundAL/{EffekseerSound => EffekseerSoundAL}/EffekseerSoundAL.Sound.cpp (100%) rename Dev/Cpp/EffekseerSoundAL/{EffekseerSound => EffekseerSoundAL}/EffekseerSoundAL.SoundImplemented.h (100%) rename Dev/Cpp/EffekseerSoundAL/{EffekseerSound => EffekseerSoundAL}/EffekseerSoundAL.SoundLoader.cpp (100%) rename Dev/Cpp/EffekseerSoundAL/{EffekseerSound => EffekseerSoundAL}/EffekseerSoundAL.SoundLoader.h (100%) rename Dev/Cpp/EffekseerSoundAL/{EffekseerSound => EffekseerSoundAL}/EffekseerSoundAL.SoundPlayer.cpp (100%) rename Dev/Cpp/EffekseerSoundAL/{EffekseerSound => EffekseerSoundAL}/EffekseerSoundAL.SoundPlayer.h (100%) rename Dev/Cpp/EffekseerSoundAL/{EffekseerSound => EffekseerSoundAL}/EffekseerSoundAL.SoundVoice.cpp (100%) rename Dev/Cpp/EffekseerSoundAL/{EffekseerSound => EffekseerSoundAL}/EffekseerSoundAL.SoundVoice.h (100%) rename Dev/Cpp/EffekseerSoundDSound/{EffekseerSound => EffekseerSoundDSound}/EffekseerSoundDSound.Sound.cpp (100%) rename Dev/Cpp/EffekseerSoundDSound/{EffekseerSound => EffekseerSoundDSound}/EffekseerSoundDSound.SoundImplemented.h (100%) rename Dev/Cpp/EffekseerSoundDSound/{EffekseerSound => EffekseerSoundDSound}/EffekseerSoundDSound.SoundLoader.cpp (100%) rename Dev/Cpp/EffekseerSoundDSound/{EffekseerSound => EffekseerSoundDSound}/EffekseerSoundDSound.SoundLoader.h (100%) rename Dev/Cpp/EffekseerSoundDSound/{EffekseerSound => EffekseerSoundDSound}/EffekseerSoundDSound.SoundPlayer.cpp (100%) rename Dev/Cpp/EffekseerSoundDSound/{EffekseerSound => EffekseerSoundDSound}/EffekseerSoundDSound.SoundPlayer.h (100%) rename Dev/Cpp/EffekseerSoundDSound/{EffekseerSound => EffekseerSoundDSound}/EffekseerSoundDSound.SoundVoice.cpp (100%) rename Dev/Cpp/EffekseerSoundDSound/{EffekseerSound => EffekseerSoundDSound}/EffekseerSoundDSound.SoundVoice.h (100%) rename Dev/Cpp/EffekseerSoundOSMixer/{EffekseerSound => EffekseerSoundOSMixer}/EffekseerSoundOSMixer.Sound.cpp (100%) rename Dev/Cpp/EffekseerSoundOSMixer/{EffekseerSound => EffekseerSoundOSMixer}/EffekseerSoundOSMixer.SoundImplemented.h (100%) rename Dev/Cpp/EffekseerSoundOSMixer/{EffekseerSound => EffekseerSoundOSMixer}/EffekseerSoundOSMixer.SoundLoader.cpp (100%) rename Dev/Cpp/EffekseerSoundOSMixer/{EffekseerSound => EffekseerSoundOSMixer}/EffekseerSoundOSMixer.SoundLoader.h (100%) rename Dev/Cpp/EffekseerSoundOSMixer/{EffekseerSound => EffekseerSoundOSMixer}/EffekseerSoundOSMixer.SoundPlayer.cpp (100%) rename Dev/Cpp/EffekseerSoundOSMixer/{EffekseerSound => EffekseerSoundOSMixer}/EffekseerSoundOSMixer.SoundPlayer.h (100%) rename Dev/Cpp/EffekseerSoundXAudio2/{EffekseerSound => EffekseerSoundXAudio2}/EffekseerSoundXAudio2.Sound.cpp (100%) rename Dev/Cpp/EffekseerSoundXAudio2/{EffekseerSound => EffekseerSoundXAudio2}/EffekseerSoundXAudio2.SoundImplemented.h (100%) rename Dev/Cpp/EffekseerSoundXAudio2/{EffekseerSound => EffekseerSoundXAudio2}/EffekseerSoundXAudio2.SoundLoader.cpp (100%) rename Dev/Cpp/EffekseerSoundXAudio2/{EffekseerSound => EffekseerSoundXAudio2}/EffekseerSoundXAudio2.SoundLoader.h (100%) rename Dev/Cpp/EffekseerSoundXAudio2/{EffekseerSound => EffekseerSoundXAudio2}/EffekseerSoundXAudio2.SoundPlayer.cpp (100%) rename Dev/Cpp/EffekseerSoundXAudio2/{EffekseerSound => EffekseerSoundXAudio2}/EffekseerSoundXAudio2.SoundPlayer.h (100%) rename Dev/Cpp/EffekseerSoundXAudio2/{EffekseerSound => EffekseerSoundXAudio2}/EffekseerSoundXAudio2.SoundVoice.cpp (100%) rename Dev/Cpp/EffekseerSoundXAudio2/{EffekseerSound => EffekseerSoundXAudio2}/EffekseerSoundXAudio2.SoundVoice.h (100%) diff --git a/Dev/Cpp/Effekseer/CMakeLists.txt b/Dev/Cpp/Effekseer/CMakeLists.txt index dd1011b683..f61f02c402 100644 --- a/Dev/Cpp/Effekseer/CMakeLists.txt +++ b/Dev/Cpp/Effekseer/CMakeLists.txt @@ -197,12 +197,12 @@ WarnError(${PROJECT_NAME}) foreach (file ${effekseer_public_h}) get_filename_component(dir ${file} DIRECTORY) - install(FILES ${file} DESTINATION include/Effekseer/${dir}) + install(FILES ${file} DESTINATION include/${dir}) endforeach() target_include_directories(${PROJECT_NAME} PUBLIC $ - $) + $) install( TARGETS ${PROJECT_NAME} diff --git a/Dev/Cpp/EffekseerMaterialEditor/Graphics/efkMat.Graphics.cpp b/Dev/Cpp/EffekseerMaterialEditor/Graphics/efkMat.Graphics.cpp index 455e32e68c..809c633e22 100644 --- a/Dev/Cpp/EffekseerMaterialEditor/Graphics/efkMat.Graphics.cpp +++ b/Dev/Cpp/EffekseerMaterialEditor/Graphics/efkMat.Graphics.cpp @@ -11,17 +11,17 @@ #include "efkMat.Graphics.h" #include +#include #include -#include #include #include #include #include "../EffekseerMaterialCompiler/OpenGL/EffekseerMaterialCompilerGL.h" -#include "../EffekseerRendererCommon/EffekseerRenderer.CommonUtils.h" -#include "../EffekseerRendererGL/EffekseerRenderer/EffekseerRendererGL.MaterialLoader.h" -#include "../EffekseerRendererGL/EffekseerRenderer/EffekseerRendererGL.Shader.h" -#include "../EffekseerRendererGL/EffekseerRendererGL.h" +#include +#include +#include +#include #define TINYOBJLOADER_IMPLEMENTATION #include "../ThirdParty/tiny_obj_loader.h" diff --git a/Dev/Cpp/EffekseerMaterialEditor/efkMat.Editor.cpp b/Dev/Cpp/EffekseerMaterialEditor/efkMat.Editor.cpp index c1bc44ffe7..baa900900e 100644 --- a/Dev/Cpp/EffekseerMaterialEditor/efkMat.Editor.cpp +++ b/Dev/Cpp/EffekseerMaterialEditor/efkMat.Editor.cpp @@ -20,9 +20,9 @@ #include -#include "../Effekseer/Effekseer/Material/Effekseer.MaterialFile.h" #include "../EffekseerMaterialCompiler/OpenGL/EffekseerMaterialCompilerGL.h" -#include "../EffekseerRendererGL/EffekseerRenderer/EffekseerRendererGL.MaterialLoader.h" +#include +#include #include diff --git a/Dev/Cpp/EffekseerRendererCommon/CMakeLists.txt b/Dev/Cpp/EffekseerRendererCommon/CMakeLists.txt index d610ef288e..2e476aa307 100644 --- a/Dev/Cpp/EffekseerRendererCommon/CMakeLists.txt +++ b/Dev/Cpp/EffekseerRendererCommon/CMakeLists.txt @@ -4,48 +4,48 @@ cmake_minimum_required(VERSION 3.1) # Setup source codes set(PublicHeaders - EffekseerRenderer.Renderer.h - EffekseerRenderer.RenderStateBase.h - EffekseerRenderer.ModelRendererBase.h - EffekseerRenderer.RibbonRendererBase.h - EffekseerRenderer.RingRendererBase.h - EffekseerRenderer.SpriteRendererBase.h - EffekseerRenderer.StandardRenderer.h - EffekseerRenderer.TrackRendererBase.h - EffekseerRenderer.CommonUtils.h - EffekseerRenderer.ShaderBase.h - EffekseerRenderer.Renderer_Impl.h - GraphicsDeviceCPU.h - ModelLoader.h - TextureLoader.h - VertexBuffer.h + EffekseerRendererCommon/EffekseerRenderer.Renderer.h + EffekseerRendererCommon/EffekseerRenderer.RenderStateBase.h + EffekseerRendererCommon/EffekseerRenderer.ModelRendererBase.h + EffekseerRendererCommon/EffekseerRenderer.RibbonRendererBase.h + EffekseerRendererCommon/EffekseerRenderer.RingRendererBase.h + EffekseerRendererCommon/EffekseerRenderer.SpriteRendererBase.h + EffekseerRendererCommon/EffekseerRenderer.StandardRenderer.h + EffekseerRendererCommon/EffekseerRenderer.TrackRendererBase.h + EffekseerRendererCommon/EffekseerRenderer.CommonUtils.h + EffekseerRendererCommon/EffekseerRenderer.ShaderBase.h + EffekseerRendererCommon/EffekseerRenderer.Renderer_Impl.h + EffekseerRendererCommon/GraphicsDeviceCPU.h + EffekseerRendererCommon/ModelLoader.h + EffekseerRendererCommon/TextureLoader.h + EffekseerRendererCommon/VertexBuffer.h ) set(LocalHeaders - EffekseerRendererFlags.h - EffekseerRenderer.CommonUtils.h - EffekseerRenderer.DDSTextureLoader.h - EffekseerRenderer.PngTextureLoader.h - EffekseerRenderer.TGATextureLoader.h + EffekseerRendererCommon/EffekseerRendererFlags.h + EffekseerRendererCommon/EffekseerRenderer.CommonUtils.h + EffekseerRendererCommon/EffekseerRenderer.DDSTextureLoader.h + EffekseerRendererCommon/EffekseerRenderer.PngTextureLoader.h + EffekseerRendererCommon/EffekseerRenderer.TGATextureLoader.h ) set(LocalSources - EffekseerRenderer.CommonUtils.cpp - EffekseerRenderer.DDSTextureLoader.cpp - EffekseerRenderer.ModelRendererBase.cpp - EffekseerRenderer.PngTextureLoader.cpp - EffekseerRenderer.Renderer.cpp - EffekseerRenderer.Renderer_Impl.cpp - EffekseerRenderer.RenderStateBase.cpp - EffekseerRenderer.RibbonRendererBase.cpp - EffekseerRenderer.RingRendererBase.cpp - EffekseerRenderer.SpriteRendererBase.cpp - EffekseerRenderer.TGATextureLoader.cpp - EffekseerRenderer.TrackRendererBase.cpp - GraphicsDeviceCPU.cpp - ModelLoader.cpp - TextureLoader.cpp - VertexBuffer.cpp + EffekseerRendererCommon/EffekseerRenderer.CommonUtils.cpp + EffekseerRendererCommon/EffekseerRenderer.DDSTextureLoader.cpp + EffekseerRendererCommon/EffekseerRenderer.ModelRendererBase.cpp + EffekseerRendererCommon/EffekseerRenderer.PngTextureLoader.cpp + EffekseerRendererCommon/EffekseerRenderer.Renderer.cpp + EffekseerRendererCommon/EffekseerRenderer.Renderer_Impl.cpp + EffekseerRendererCommon/EffekseerRenderer.RenderStateBase.cpp + EffekseerRendererCommon/EffekseerRenderer.RibbonRendererBase.cpp + EffekseerRendererCommon/EffekseerRenderer.RingRendererBase.cpp + EffekseerRendererCommon/EffekseerRenderer.SpriteRendererBase.cpp + EffekseerRendererCommon/EffekseerRenderer.TGATextureLoader.cpp + EffekseerRendererCommon/EffekseerRenderer.TrackRendererBase.cpp + EffekseerRendererCommon/GraphicsDeviceCPU.cpp + EffekseerRendererCommon/ModelLoader.cpp + EffekseerRendererCommon/TextureLoader.cpp + EffekseerRendererCommon/VertexBuffer.cpp ) FilterFolder("${PublicHeaders}") @@ -57,8 +57,8 @@ target_include_directories(${PROJECT_NAME} PRIVATE ${EFK_THIRDPARTY_INCLUDES}) target_link_libraries(${PROJECT_NAME} PUBLIC Effekseer) target_include_directories(${PROJECT_NAME} PUBLIC - $ - $ + $ + $ ) if(USE_LIBPNG_LOADER) @@ -82,7 +82,7 @@ set_target_properties( foreach (file ${PublicHeaders}) get_filename_component(dir ${file} DIRECTORY) - install(FILES ${file} DESTINATION include/EffekseerRendererCommon/${dir}) + install(FILES ${file} DESTINATION include/${dir}) endforeach() install( diff --git a/Dev/Cpp/EffekseerRendererCommon/EffekseerRenderer.CommonUtils.cpp b/Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/EffekseerRenderer.CommonUtils.cpp similarity index 100% rename from Dev/Cpp/EffekseerRendererCommon/EffekseerRenderer.CommonUtils.cpp rename to Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/EffekseerRenderer.CommonUtils.cpp diff --git a/Dev/Cpp/EffekseerRendererCommon/EffekseerRenderer.CommonUtils.h b/Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/EffekseerRenderer.CommonUtils.h similarity index 100% rename from Dev/Cpp/EffekseerRendererCommon/EffekseerRenderer.CommonUtils.h rename to Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/EffekseerRenderer.CommonUtils.h diff --git a/Dev/Cpp/EffekseerRendererCommon/EffekseerRenderer.DDSTextureLoader.cpp b/Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/EffekseerRenderer.DDSTextureLoader.cpp similarity index 100% rename from Dev/Cpp/EffekseerRendererCommon/EffekseerRenderer.DDSTextureLoader.cpp rename to Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/EffekseerRenderer.DDSTextureLoader.cpp diff --git a/Dev/Cpp/EffekseerRendererCommon/EffekseerRenderer.DDSTextureLoader.h b/Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/EffekseerRenderer.DDSTextureLoader.h similarity index 100% rename from Dev/Cpp/EffekseerRendererCommon/EffekseerRenderer.DDSTextureLoader.h rename to Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/EffekseerRenderer.DDSTextureLoader.h diff --git a/Dev/Cpp/EffekseerRendererCommon/EffekseerRenderer.ModelRendererBase.cpp b/Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/EffekseerRenderer.ModelRendererBase.cpp similarity index 100% rename from Dev/Cpp/EffekseerRendererCommon/EffekseerRenderer.ModelRendererBase.cpp rename to Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/EffekseerRenderer.ModelRendererBase.cpp diff --git a/Dev/Cpp/EffekseerRendererCommon/EffekseerRenderer.ModelRendererBase.h b/Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/EffekseerRenderer.ModelRendererBase.h similarity index 100% rename from Dev/Cpp/EffekseerRendererCommon/EffekseerRenderer.ModelRendererBase.h rename to Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/EffekseerRenderer.ModelRendererBase.h diff --git a/Dev/Cpp/EffekseerRendererCommon/EffekseerRenderer.PngTextureLoader.cpp b/Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/EffekseerRenderer.PngTextureLoader.cpp similarity index 100% rename from Dev/Cpp/EffekseerRendererCommon/EffekseerRenderer.PngTextureLoader.cpp rename to Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/EffekseerRenderer.PngTextureLoader.cpp diff --git a/Dev/Cpp/EffekseerRendererCommon/EffekseerRenderer.PngTextureLoader.h b/Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/EffekseerRenderer.PngTextureLoader.h similarity index 100% rename from Dev/Cpp/EffekseerRendererCommon/EffekseerRenderer.PngTextureLoader.h rename to Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/EffekseerRenderer.PngTextureLoader.h diff --git a/Dev/Cpp/EffekseerRendererCommon/EffekseerRenderer.RenderStateBase.cpp b/Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/EffekseerRenderer.RenderStateBase.cpp similarity index 100% rename from Dev/Cpp/EffekseerRendererCommon/EffekseerRenderer.RenderStateBase.cpp rename to Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/EffekseerRenderer.RenderStateBase.cpp diff --git a/Dev/Cpp/EffekseerRendererCommon/EffekseerRenderer.RenderStateBase.h b/Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/EffekseerRenderer.RenderStateBase.h similarity index 100% rename from Dev/Cpp/EffekseerRendererCommon/EffekseerRenderer.RenderStateBase.h rename to Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/EffekseerRenderer.RenderStateBase.h diff --git a/Dev/Cpp/EffekseerRendererCommon/EffekseerRenderer.Renderer.cpp b/Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/EffekseerRenderer.Renderer.cpp similarity index 100% rename from Dev/Cpp/EffekseerRendererCommon/EffekseerRenderer.Renderer.cpp rename to Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/EffekseerRenderer.Renderer.cpp diff --git a/Dev/Cpp/EffekseerRendererCommon/EffekseerRenderer.Renderer.h b/Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/EffekseerRenderer.Renderer.h similarity index 100% rename from Dev/Cpp/EffekseerRendererCommon/EffekseerRenderer.Renderer.h rename to Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/EffekseerRenderer.Renderer.h diff --git a/Dev/Cpp/EffekseerRendererCommon/EffekseerRenderer.Renderer_Impl.cpp b/Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/EffekseerRenderer.Renderer_Impl.cpp similarity index 100% rename from Dev/Cpp/EffekseerRendererCommon/EffekseerRenderer.Renderer_Impl.cpp rename to Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/EffekseerRenderer.Renderer_Impl.cpp diff --git a/Dev/Cpp/EffekseerRendererCommon/EffekseerRenderer.Renderer_Impl.h b/Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/EffekseerRenderer.Renderer_Impl.h similarity index 100% rename from Dev/Cpp/EffekseerRendererCommon/EffekseerRenderer.Renderer_Impl.h rename to Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/EffekseerRenderer.Renderer_Impl.h diff --git a/Dev/Cpp/EffekseerRendererCommon/EffekseerRenderer.RibbonRendererBase.cpp b/Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/EffekseerRenderer.RibbonRendererBase.cpp similarity index 100% rename from Dev/Cpp/EffekseerRendererCommon/EffekseerRenderer.RibbonRendererBase.cpp rename to Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/EffekseerRenderer.RibbonRendererBase.cpp diff --git a/Dev/Cpp/EffekseerRendererCommon/EffekseerRenderer.RibbonRendererBase.h b/Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/EffekseerRenderer.RibbonRendererBase.h similarity index 100% rename from Dev/Cpp/EffekseerRendererCommon/EffekseerRenderer.RibbonRendererBase.h rename to Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/EffekseerRenderer.RibbonRendererBase.h diff --git a/Dev/Cpp/EffekseerRendererCommon/EffekseerRenderer.RingRendererBase.cpp b/Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/EffekseerRenderer.RingRendererBase.cpp similarity index 100% rename from Dev/Cpp/EffekseerRendererCommon/EffekseerRenderer.RingRendererBase.cpp rename to Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/EffekseerRenderer.RingRendererBase.cpp diff --git a/Dev/Cpp/EffekseerRendererCommon/EffekseerRenderer.RingRendererBase.h b/Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/EffekseerRenderer.RingRendererBase.h similarity index 100% rename from Dev/Cpp/EffekseerRendererCommon/EffekseerRenderer.RingRendererBase.h rename to Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/EffekseerRenderer.RingRendererBase.h diff --git a/Dev/Cpp/EffekseerRendererCommon/EffekseerRenderer.ShaderBase.h b/Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/EffekseerRenderer.ShaderBase.h similarity index 100% rename from Dev/Cpp/EffekseerRendererCommon/EffekseerRenderer.ShaderBase.h rename to Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/EffekseerRenderer.ShaderBase.h diff --git a/Dev/Cpp/EffekseerRendererCommon/EffekseerRenderer.SpriteRendererBase.cpp b/Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/EffekseerRenderer.SpriteRendererBase.cpp similarity index 100% rename from Dev/Cpp/EffekseerRendererCommon/EffekseerRenderer.SpriteRendererBase.cpp rename to Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/EffekseerRenderer.SpriteRendererBase.cpp diff --git a/Dev/Cpp/EffekseerRendererCommon/EffekseerRenderer.SpriteRendererBase.h b/Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/EffekseerRenderer.SpriteRendererBase.h similarity index 100% rename from Dev/Cpp/EffekseerRendererCommon/EffekseerRenderer.SpriteRendererBase.h rename to Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/EffekseerRenderer.SpriteRendererBase.h diff --git a/Dev/Cpp/EffekseerRendererCommon/EffekseerRenderer.StandardRenderer.h b/Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/EffekseerRenderer.StandardRenderer.h similarity index 100% rename from Dev/Cpp/EffekseerRendererCommon/EffekseerRenderer.StandardRenderer.h rename to Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/EffekseerRenderer.StandardRenderer.h diff --git a/Dev/Cpp/EffekseerRendererCommon/EffekseerRenderer.TGATextureLoader.cpp b/Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/EffekseerRenderer.TGATextureLoader.cpp similarity index 100% rename from Dev/Cpp/EffekseerRendererCommon/EffekseerRenderer.TGATextureLoader.cpp rename to Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/EffekseerRenderer.TGATextureLoader.cpp diff --git a/Dev/Cpp/EffekseerRendererCommon/EffekseerRenderer.TGATextureLoader.h b/Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/EffekseerRenderer.TGATextureLoader.h similarity index 100% rename from Dev/Cpp/EffekseerRendererCommon/EffekseerRenderer.TGATextureLoader.h rename to Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/EffekseerRenderer.TGATextureLoader.h diff --git a/Dev/Cpp/EffekseerRendererCommon/EffekseerRenderer.TrackRendererBase.cpp b/Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/EffekseerRenderer.TrackRendererBase.cpp similarity index 100% rename from Dev/Cpp/EffekseerRendererCommon/EffekseerRenderer.TrackRendererBase.cpp rename to Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/EffekseerRenderer.TrackRendererBase.cpp diff --git a/Dev/Cpp/EffekseerRendererCommon/EffekseerRenderer.TrackRendererBase.h b/Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/EffekseerRenderer.TrackRendererBase.h similarity index 100% rename from Dev/Cpp/EffekseerRendererCommon/EffekseerRenderer.TrackRendererBase.h rename to Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/EffekseerRenderer.TrackRendererBase.h diff --git a/Dev/Cpp/EffekseerRendererCommon/EffekseerRendererFlags.h b/Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/EffekseerRendererFlags.h similarity index 100% rename from Dev/Cpp/EffekseerRendererCommon/EffekseerRendererFlags.h rename to Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/EffekseerRendererFlags.h diff --git a/Dev/Cpp/EffekseerRendererCommon/GraphicsDeviceCPU.cpp b/Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/GraphicsDeviceCPU.cpp similarity index 100% rename from Dev/Cpp/EffekseerRendererCommon/GraphicsDeviceCPU.cpp rename to Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/GraphicsDeviceCPU.cpp diff --git a/Dev/Cpp/EffekseerRendererCommon/GraphicsDeviceCPU.h b/Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/GraphicsDeviceCPU.h similarity index 100% rename from Dev/Cpp/EffekseerRendererCommon/GraphicsDeviceCPU.h rename to Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/GraphicsDeviceCPU.h diff --git a/Dev/Cpp/EffekseerRendererCommon/ModelLoader.cpp b/Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/ModelLoader.cpp similarity index 100% rename from Dev/Cpp/EffekseerRendererCommon/ModelLoader.cpp rename to Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/ModelLoader.cpp diff --git a/Dev/Cpp/EffekseerRendererCommon/ModelLoader.h b/Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/ModelLoader.h similarity index 100% rename from Dev/Cpp/EffekseerRendererCommon/ModelLoader.h rename to Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/ModelLoader.h diff --git a/Dev/Cpp/EffekseerRendererCommon/TextureLoader.cpp b/Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/TextureLoader.cpp similarity index 100% rename from Dev/Cpp/EffekseerRendererCommon/TextureLoader.cpp rename to Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/TextureLoader.cpp diff --git a/Dev/Cpp/EffekseerRendererCommon/TextureLoader.h b/Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/TextureLoader.h similarity index 100% rename from Dev/Cpp/EffekseerRendererCommon/TextureLoader.h rename to Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/TextureLoader.h diff --git a/Dev/Cpp/EffekseerRendererCommon/VertexBuffer.cpp b/Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/VertexBuffer.cpp similarity index 100% rename from Dev/Cpp/EffekseerRendererCommon/VertexBuffer.cpp rename to Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/VertexBuffer.cpp diff --git a/Dev/Cpp/EffekseerRendererCommon/VertexBuffer.h b/Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/VertexBuffer.h similarity index 100% rename from Dev/Cpp/EffekseerRendererCommon/VertexBuffer.h rename to Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/VertexBuffer.h diff --git a/Dev/Cpp/EffekseerRendererDX11/CMakeLists.txt b/Dev/Cpp/EffekseerRendererDX11/CMakeLists.txt index 6086de8ada..7acb7acdf1 100644 --- a/Dev/Cpp/EffekseerRendererDX11/CMakeLists.txt +++ b/Dev/Cpp/EffekseerRendererDX11/CMakeLists.txt @@ -19,21 +19,21 @@ set(LOCAL_SOURCES set(PublicHeaders EffekseerRendererDX11.h - EffekseerRenderer/EffekseerRendererDX11.Base.h - EffekseerRenderer/EffekseerRendererDX11.Base.Pre.h - EffekseerRenderer/EffekseerRendererDX11.Renderer.h) + EffekseerRendererDX11/EffekseerRendererDX11.Base.h + EffekseerRendererDX11/EffekseerRendererDX11.Base.Pre.h + EffekseerRendererDX11/EffekseerRendererDX11.Renderer.h) #-------------------- # Projects add_library(${PROJECT_NAME} STATIC ${LOCAL_SOURCES}) -target_include_directories(${PROJECT_NAME} PRIVATE ${PROJECT_SOURCE_DIR}/../Effekseer ${EFK_THIRDPARTY_INCLUDES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${EFK_THIRDPARTY_INCLUDES}) set_target_properties(${PROJECT_NAME} PROPERTIES PUBLIC_HEADER "${PublicHeaders}") target_link_libraries(${PROJECT_NAME} PUBLIC Effekseer EffekseerRendererCommon) target_include_directories(${PROJECT_NAME} PUBLIC $ - $) + $) if(CLANG_FORMAT_ENABLED) clang_format(${PROJECT_NAME}) @@ -46,7 +46,7 @@ WarnError(${PROJECT_NAME}) foreach (file ${PublicHeaders}) get_filename_component(dir ${file} DIRECTORY) - install(FILES ${file} DESTINATION include/EffekseerRendererDX11/${dir}) + install(FILES ${file} DESTINATION include/${dir}) endforeach() install( diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11.h b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11.h index 7a1b2d11f6..73b2f5d8a1 100644 --- a/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11.h +++ b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11.h @@ -2,7 +2,7 @@ #ifndef __EFFEKSEERRENDERER_DX11_H__ #define __EFFEKSEERRENDERER_DX11_H__ -#include "EffekseerRenderer/EffekseerRendererDX11.Base.Pre.h" -#include "EffekseerRenderer/EffekseerRendererDX11.Renderer.h" +#include "EffekseerRendererDX11/EffekseerRendererDX11.Base.Pre.h" +#include "EffekseerRendererDX11/EffekseerRendererDX11.Renderer.h" #endif // __EFFEKSEERRENDERER_DX11_H__ diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/EffekseerRendererDX11.Base.Pre.h b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/EffekseerRendererDX11.Base.Pre.h similarity index 100% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/EffekseerRendererDX11.Base.Pre.h rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/EffekseerRendererDX11.Base.Pre.h diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/EffekseerRendererDX11.Base.h b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/EffekseerRendererDX11.Base.h similarity index 100% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/EffekseerRendererDX11.Base.h rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/EffekseerRendererDX11.Base.h diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/EffekseerRendererDX11.DeviceObject.cpp b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/EffekseerRendererDX11.DeviceObject.cpp similarity index 100% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/EffekseerRendererDX11.DeviceObject.cpp rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/EffekseerRendererDX11.DeviceObject.cpp diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/EffekseerRendererDX11.DeviceObject.h b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/EffekseerRendererDX11.DeviceObject.h similarity index 100% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/EffekseerRendererDX11.DeviceObject.h rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/EffekseerRendererDX11.DeviceObject.h diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/EffekseerRendererDX11.GPUTimer.cpp b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/EffekseerRendererDX11.GPUTimer.cpp similarity index 100% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/EffekseerRendererDX11.GPUTimer.cpp rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/EffekseerRendererDX11.GPUTimer.cpp diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/EffekseerRendererDX11.GPUTimer.h b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/EffekseerRendererDX11.GPUTimer.h similarity index 100% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/EffekseerRendererDX11.GPUTimer.h rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/EffekseerRendererDX11.GPUTimer.h diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/EffekseerRendererDX11.MaterialLoader.cpp b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/EffekseerRendererDX11.MaterialLoader.cpp similarity index 100% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/EffekseerRendererDX11.MaterialLoader.cpp rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/EffekseerRendererDX11.MaterialLoader.cpp diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/EffekseerRendererDX11.MaterialLoader.h b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/EffekseerRendererDX11.MaterialLoader.h similarity index 100% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/EffekseerRendererDX11.MaterialLoader.h rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/EffekseerRendererDX11.MaterialLoader.h diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/EffekseerRendererDX11.ModelRenderer.cpp b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/EffekseerRendererDX11.ModelRenderer.cpp similarity index 100% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/EffekseerRendererDX11.ModelRenderer.cpp rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/EffekseerRendererDX11.ModelRenderer.cpp diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/EffekseerRendererDX11.ModelRenderer.h b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/EffekseerRendererDX11.ModelRenderer.h similarity index 96% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/EffekseerRendererDX11.ModelRenderer.h rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/EffekseerRendererDX11.ModelRenderer.h index 15e4a4f0e6..63ec6d7a2e 100644 --- a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/EffekseerRendererDX11.ModelRenderer.h +++ b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/EffekseerRendererDX11.ModelRenderer.h @@ -5,8 +5,8 @@ //---------------------------------------------------------------------------------- // Include //---------------------------------------------------------------------------------- -#include "../../EffekseerRendererCommon/EffekseerRenderer.ModelRendererBase.h" #include "EffekseerRendererDX11.RendererImplemented.h" +#include //----------------------------------------------------------------------------------- // diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/EffekseerRendererDX11.RenderState.cpp b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/EffekseerRendererDX11.RenderState.cpp similarity index 100% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/EffekseerRendererDX11.RenderState.cpp rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/EffekseerRendererDX11.RenderState.cpp diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/EffekseerRendererDX11.RenderState.h b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/EffekseerRendererDX11.RenderState.h similarity index 96% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/EffekseerRendererDX11.RenderState.h rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/EffekseerRendererDX11.RenderState.h index 9d0c0b4122..8f912fd576 100644 --- a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/EffekseerRendererDX11.RenderState.h +++ b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/EffekseerRendererDX11.RenderState.h @@ -5,9 +5,9 @@ //---------------------------------------------------------------------------------- // Include //---------------------------------------------------------------------------------- -#include "../../EffekseerRendererCommon/EffekseerRenderer.RenderStateBase.h" #include "EffekseerRendererDX11.Base.h" #include "EffekseerRendererDX11.RendererImplemented.h" +#include //----------------------------------------------------------------------------------- // diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/EffekseerRendererDX11.Renderer.cpp b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/EffekseerRendererDX11.Renderer.cpp similarity index 98% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/EffekseerRendererDX11.Renderer.cpp rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/EffekseerRendererDX11.Renderer.cpp index 618801ba09..93c6219d7e 100644 --- a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/EffekseerRendererDX11.Renderer.cpp +++ b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/EffekseerRendererDX11.Renderer.cpp @@ -12,13 +12,13 @@ #include "EffekseerRendererDX11.ModelRenderer.h" #include "EffekseerRendererDX11.Shader.h" -#include "../../EffekseerRendererCommon/EffekseerRenderer.Renderer_Impl.h" -#include "../../EffekseerRendererCommon/EffekseerRenderer.RibbonRendererBase.h" -#include "../../EffekseerRendererCommon/EffekseerRenderer.RingRendererBase.h" -#include "../../EffekseerRendererCommon/EffekseerRenderer.SpriteRendererBase.h" -#include "../../EffekseerRendererCommon/EffekseerRenderer.TrackRendererBase.h" -#include "../../EffekseerRendererCommon/ModelLoader.h" -#include "../../EffekseerRendererCommon/TextureLoader.h" +#include +#include +#include +#include +#include +#include +#include //---------------------------------------------------------------------------------- // diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/EffekseerRendererDX11.Renderer.h b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/EffekseerRendererDX11.Renderer.h similarity index 98% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/EffekseerRendererDX11.Renderer.h rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/EffekseerRendererDX11.Renderer.h index 9f3f52cd0d..80bd1456cf 100644 --- a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/EffekseerRendererDX11.Renderer.h +++ b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/EffekseerRendererDX11.Renderer.h @@ -5,8 +5,8 @@ //---------------------------------------------------------------------------------- // Include //---------------------------------------------------------------------------------- -#include "../../EffekseerRendererCommon/EffekseerRenderer.Renderer.h" #include "EffekseerRendererDX11.Base.h" +#include //---------------------------------------------------------------------------------- // diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/EffekseerRendererDX11.RendererImplemented.h b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/EffekseerRendererDX11.RendererImplemented.h similarity index 97% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/EffekseerRendererDX11.RendererImplemented.h rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/EffekseerRendererDX11.RendererImplemented.h index 0d7ec06a0f..2d97dd8343 100644 --- a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/EffekseerRendererDX11.RendererImplemented.h +++ b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/EffekseerRendererDX11.RendererImplemented.h @@ -5,11 +5,11 @@ //---------------------------------------------------------------------------------- // Include //---------------------------------------------------------------------------------- -#include "../../EffekseerRendererCommon/EffekseerRenderer.RenderStateBase.h" -#include "../../EffekseerRendererCommon/EffekseerRenderer.StandardRenderer.h" #include "EffekseerRendererDX11.Base.h" #include "EffekseerRendererDX11.Renderer.h" #include "GraphicsDevice.h" +#include +#include #ifdef _WIN32 #include diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/EffekseerRendererDX11.Shader.cpp b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/EffekseerRendererDX11.Shader.cpp similarity index 100% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/EffekseerRendererDX11.Shader.cpp rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/EffekseerRendererDX11.Shader.cpp diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/EffekseerRendererDX11.Shader.h b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/EffekseerRendererDX11.Shader.h similarity index 96% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/EffekseerRendererDX11.Shader.h rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/EffekseerRendererDX11.Shader.h index faeaf66ffb..0770f6c7b5 100644 --- a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/EffekseerRendererDX11.Shader.h +++ b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/EffekseerRendererDX11.Shader.h @@ -2,9 +2,9 @@ #ifndef __EFFEKSEERRENDERER_DX11_SHADER_H__ #define __EFFEKSEERRENDERER_DX11_SHADER_H__ -#include "../../EffekseerRendererCommon/EffekseerRenderer.ShaderBase.h" #include "EffekseerRendererDX11.DeviceObject.h" #include "EffekseerRendererDX11.RendererImplemented.h" +#include namespace EffekseerRendererDX11 { diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/GraphicsDevice.cpp b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/GraphicsDevice.cpp similarity index 99% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/GraphicsDevice.cpp rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/GraphicsDevice.cpp index 8868a9df4d..85abeb3ff0 100644 --- a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/GraphicsDevice.cpp +++ b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/GraphicsDevice.cpp @@ -1,5 +1,5 @@ #include "GraphicsDevice.h" -#include "../../EffekseerRendererCommon/EffekseerRenderer.CommonUtils.h" +#include #include diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/GraphicsDevice.h b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/GraphicsDevice.h similarity index 99% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/GraphicsDevice.h rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/GraphicsDevice.h index da0c1a5b66..aa46cca606 100644 --- a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/GraphicsDevice.h +++ b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/GraphicsDevice.h @@ -2,8 +2,8 @@ #ifndef __EFFEKSEERRENDERER_DX11_GRAPHICS_DEVICE_H__ #define __EFFEKSEERRENDERER_DX11_GRAPHICS_DEVICE_H__ -#include "../../EffekseerRendererCommon/EffekseerRenderer.CommonUtils.h" #include +#include #include #include #include diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/Shader/Distortion_Common_PS.fx b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/Shader/Distortion_Common_PS.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/Shader/Distortion_Common_PS.fx rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/Shader/Distortion_Common_PS.fx diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/Shader/FlipbookInterpolationUtils.fx b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/Shader/FlipbookInterpolationUtils.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/Shader/FlipbookInterpolationUtils.fx rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/Shader/FlipbookInterpolationUtils.fx diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/Shader/FlipbookInterpolationUtils_PS.fx b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/Shader/FlipbookInterpolationUtils_PS.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/Shader/FlipbookInterpolationUtils_PS.fx rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/Shader/FlipbookInterpolationUtils_PS.fx diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/Shader/Linear_sRGB.fx b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/Shader/Linear_sRGB.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/Shader/Linear_sRGB.fx rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/Shader/Linear_sRGB.fx diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/Shader/SoftParticle_PS.fx b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/Shader/SoftParticle_PS.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/Shader/SoftParticle_PS.fx rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/Shader/SoftParticle_PS.fx diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/Shader/TextureBlendingUtils_PS.fx b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/Shader/TextureBlendingUtils_PS.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/Shader/TextureBlendingUtils_PS.fx rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/Shader/TextureBlendingUtils_PS.fx diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/Shader/UVDistortionUtils_PS.fx b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/Shader/UVDistortionUtils_PS.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/Shader/UVDistortionUtils_PS.fx rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/Shader/UVDistortionUtils_PS.fx diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/Shader/ad_common_ps.fx b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/Shader/ad_common_ps.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/Shader/ad_common_ps.fx rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/Shader/ad_common_ps.fx diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/Shader/ad_model_common_vs.fx b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/Shader/ad_model_common_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/Shader/ad_model_common_vs.fx rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/Shader/ad_model_common_vs.fx diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/Shader/ad_model_distortion_ps.fx b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/Shader/ad_model_distortion_ps.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/Shader/ad_model_distortion_ps.fx rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/Shader/ad_model_distortion_ps.fx diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/Shader/ad_model_distortion_vs.fx b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/Shader/ad_model_distortion_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/Shader/ad_model_distortion_vs.fx rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/Shader/ad_model_distortion_vs.fx diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/Shader/ad_model_lit_ps.fx b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/Shader/ad_model_lit_ps.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/Shader/ad_model_lit_ps.fx rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/Shader/ad_model_lit_ps.fx diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/Shader/ad_model_lit_vs.fx b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/Shader/ad_model_lit_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/Shader/ad_model_lit_vs.fx rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/Shader/ad_model_lit_vs.fx diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/Shader/ad_model_ps.fx b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/Shader/ad_model_ps.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/Shader/ad_model_ps.fx rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/Shader/ad_model_ps.fx diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/Shader/ad_model_unlit_ps.fx b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/Shader/ad_model_unlit_ps.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/Shader/ad_model_unlit_ps.fx rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/Shader/ad_model_unlit_ps.fx diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/Shader/ad_model_unlit_vs.fx b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/Shader/ad_model_unlit_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/Shader/ad_model_unlit_vs.fx rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/Shader/ad_model_unlit_vs.fx diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/Shader/ad_model_vs.fx b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/Shader/ad_model_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/Shader/ad_model_vs.fx rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/Shader/ad_model_vs.fx diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/Shader/ad_sprite_common_vs.fx b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/Shader/ad_sprite_common_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/Shader/ad_sprite_common_vs.fx rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/Shader/ad_sprite_common_vs.fx diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/Shader/ad_sprite_distortion_vs.fx b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/Shader/ad_sprite_distortion_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/Shader/ad_sprite_distortion_vs.fx rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/Shader/ad_sprite_distortion_vs.fx diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/Shader/ad_sprite_lit_vs.fx b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/Shader/ad_sprite_lit_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/Shader/ad_sprite_lit_vs.fx rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/Shader/ad_sprite_lit_vs.fx diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/Shader/ad_sprite_unlit_vs.fx b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/Shader/ad_sprite_unlit_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/Shader/ad_sprite_unlit_vs.fx rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/Shader/ad_sprite_unlit_vs.fx diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/Shader/model_distortion_ps.fx b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/Shader/model_distortion_ps.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/Shader/model_distortion_ps.fx rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/Shader/model_distortion_ps.fx diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/Shader/model_distortion_vs.fx b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/Shader/model_distortion_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/Shader/model_distortion_vs.fx rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/Shader/model_distortion_vs.fx diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/Shader/model_lit_ps.fx b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/Shader/model_lit_ps.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/Shader/model_lit_ps.fx rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/Shader/model_lit_ps.fx diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/Shader/model_lit_vs.fx b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/Shader/model_lit_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/Shader/model_lit_vs.fx rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/Shader/model_lit_vs.fx diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/Shader/model_ps.fx b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/Shader/model_ps.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/Shader/model_ps.fx rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/Shader/model_ps.fx diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/Shader/model_unlit_ps.fx b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/Shader/model_unlit_ps.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/Shader/model_unlit_ps.fx rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/Shader/model_unlit_ps.fx diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/Shader/model_unlit_vs.fx b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/Shader/model_unlit_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/Shader/model_unlit_vs.fx rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/Shader/model_unlit_vs.fx diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/Shader/model_vs.fx b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/Shader/model_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/Shader/model_vs.fx rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/Shader/model_vs.fx diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/Shader/sprite_distortion_vs.fx b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/Shader/sprite_distortion_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/Shader/sprite_distortion_vs.fx rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/Shader/sprite_distortion_vs.fx diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/Shader/sprite_lit_vs.fx b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/Shader/sprite_lit_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/Shader/sprite_lit_vs.fx rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/Shader/sprite_lit_vs.fx diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/Shader/sprite_unlit_vs.fx b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/Shader/sprite_unlit_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/Shader/sprite_unlit_vs.fx rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/Shader/sprite_unlit_vs.fx diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/ShaderHeader/ad_model_distortion_ps.h b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/ShaderHeader/ad_model_distortion_ps.h similarity index 100% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/ShaderHeader/ad_model_distortion_ps.h rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/ShaderHeader/ad_model_distortion_ps.h diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/ShaderHeader/ad_model_distortion_vs.h b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/ShaderHeader/ad_model_distortion_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/ShaderHeader/ad_model_distortion_vs.h rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/ShaderHeader/ad_model_distortion_vs.h diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/ShaderHeader/ad_model_lit_ps.h b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/ShaderHeader/ad_model_lit_ps.h similarity index 100% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/ShaderHeader/ad_model_lit_ps.h rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/ShaderHeader/ad_model_lit_ps.h diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/ShaderHeader/ad_model_lit_vs.h b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/ShaderHeader/ad_model_lit_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/ShaderHeader/ad_model_lit_vs.h rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/ShaderHeader/ad_model_lit_vs.h diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/ShaderHeader/ad_model_unlit_ps.h b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/ShaderHeader/ad_model_unlit_ps.h similarity index 100% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/ShaderHeader/ad_model_unlit_ps.h rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/ShaderHeader/ad_model_unlit_ps.h diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/ShaderHeader/ad_model_unlit_vs.h b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/ShaderHeader/ad_model_unlit_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/ShaderHeader/ad_model_unlit_vs.h rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/ShaderHeader/ad_model_unlit_vs.h diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/ShaderHeader/ad_sprite_distortion_vs.h b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/ShaderHeader/ad_sprite_distortion_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/ShaderHeader/ad_sprite_distortion_vs.h rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/ShaderHeader/ad_sprite_distortion_vs.h diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/ShaderHeader/ad_sprite_lit_vs.h b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/ShaderHeader/ad_sprite_lit_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/ShaderHeader/ad_sprite_lit_vs.h rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/ShaderHeader/ad_sprite_lit_vs.h diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/ShaderHeader/ad_sprite_unlit_vs.h b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/ShaderHeader/ad_sprite_unlit_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/ShaderHeader/ad_sprite_unlit_vs.h rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/ShaderHeader/ad_sprite_unlit_vs.h diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/ShaderHeader/model_distortion_ps.h b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/ShaderHeader/model_distortion_ps.h similarity index 100% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/ShaderHeader/model_distortion_ps.h rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/ShaderHeader/model_distortion_ps.h diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/ShaderHeader/model_distortion_vs.h b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/ShaderHeader/model_distortion_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/ShaderHeader/model_distortion_vs.h rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/ShaderHeader/model_distortion_vs.h diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/ShaderHeader/model_lit_ps.h b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/ShaderHeader/model_lit_ps.h similarity index 100% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/ShaderHeader/model_lit_ps.h rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/ShaderHeader/model_lit_ps.h diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/ShaderHeader/model_lit_vs.h b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/ShaderHeader/model_lit_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/ShaderHeader/model_lit_vs.h rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/ShaderHeader/model_lit_vs.h diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/ShaderHeader/model_unlit_ps.h b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/ShaderHeader/model_unlit_ps.h similarity index 100% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/ShaderHeader/model_unlit_ps.h rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/ShaderHeader/model_unlit_ps.h diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/ShaderHeader/model_unlit_vs.h b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/ShaderHeader/model_unlit_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/ShaderHeader/model_unlit_vs.h rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/ShaderHeader/model_unlit_vs.h diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/ShaderHeader/sprite_distortion_vs.h b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/ShaderHeader/sprite_distortion_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/ShaderHeader/sprite_distortion_vs.h rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/ShaderHeader/sprite_distortion_vs.h diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/ShaderHeader/sprite_lit_vs.h b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/ShaderHeader/sprite_lit_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/ShaderHeader/sprite_lit_vs.h rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/ShaderHeader/sprite_lit_vs.h diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/ShaderHeader/sprite_unlit_vs.h b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/ShaderHeader/sprite_unlit_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/ShaderHeader/sprite_unlit_vs.h rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/ShaderHeader/sprite_unlit_vs.h diff --git a/Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/compile_effect.bat b/Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/compile_effect.bat similarity index 100% rename from Dev/Cpp/EffekseerRendererDX11/EffekseerRenderer/compile_effect.bat rename to Dev/Cpp/EffekseerRendererDX11/EffekseerRendererDX11/compile_effect.bat diff --git a/Dev/Cpp/EffekseerRendererDX12/CMakeLists.txt b/Dev/Cpp/EffekseerRendererDX12/CMakeLists.txt index ef69b01f5d..3ab2e48f16 100644 --- a/Dev/Cpp/EffekseerRendererDX12/CMakeLists.txt +++ b/Dev/Cpp/EffekseerRendererDX12/CMakeLists.txt @@ -19,20 +19,20 @@ set(LOCAL_SOURCES set(PublicHeaders EffekseerRendererDX12.h - EffekseerRenderer/EffekseerRendererDX12.Base.Pre.h - EffekseerRenderer/EffekseerRendererDX12.Renderer.h) + EffekseerRendererDX12/EffekseerRendererDX12.Base.Pre.h + EffekseerRendererDX12/EffekseerRendererDX12.Renderer.h) #-------------------- # Projects add_library(${PROJECT_NAME} STATIC ${LOCAL_SOURCES}) -target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/../Effekseer ${CMAKE_CURRENT_LIST_DIR}/../3rdparty/LLGI/src ${EFK_THIRDPARTY_INCLUDES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/../3rdparty/LLGI/src ${EFK_THIRDPARTY_INCLUDES}) set_target_properties(${PROJECT_NAME} PROPERTIES PUBLIC_HEADER "${PublicHeaders}") target_link_libraries(${PROJECT_NAME} PUBLIC Effekseer EffekseerRendererCommon EffekseerRendererLLGI LLGI) target_include_directories(${PROJECT_NAME} PUBLIC $ - $) + $) if(CLANG_FORMAT_ENABLED) clang_format(${PROJECT_NAME}) @@ -45,7 +45,7 @@ WarnError(${PROJECT_NAME}) foreach (file ${PublicHeaders}) get_filename_component(dir ${file} DIRECTORY) - install(FILES ${file} DESTINATION include/EffekseerRendererDX12/${dir}) + install(FILES ${file} DESTINATION include/${dir}) endforeach() install( diff --git a/Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12.h b/Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12.h index 2a9f6c2025..3188a50f4b 100644 --- a/Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12.h +++ b/Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12.h @@ -2,8 +2,8 @@ #ifndef __EFFEKSEERRENDERER_DX12_H__ #define __EFFEKSEERRENDERER_DX12_H__ -#include "EffekseerRenderer/EffekseerRendererDX12.Base.Pre.h" -#include "EffekseerRenderer/EffekseerRendererDX12.Renderer.h" -#include +#include "EffekseerRendererDX12/EffekseerRendererDX12.Base.Pre.h" +#include "EffekseerRendererDX12/EffekseerRendererDX12.Renderer.h" +#include #endif // __EFFEKSEERRENDERER_DX12_H__ diff --git a/Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/EffekseerRendererDX12.Base.Pre.h b/Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/EffekseerRendererDX12.Base.Pre.h similarity index 100% rename from Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/EffekseerRendererDX12.Base.Pre.h rename to Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/EffekseerRendererDX12.Base.Pre.h diff --git a/Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/EffekseerRendererDX12.Base.h b/Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/EffekseerRendererDX12.Base.h similarity index 70% rename from Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/EffekseerRendererDX12.Base.h rename to Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/EffekseerRendererDX12.Base.h index acee336658..f01a1f920b 100644 --- a/Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/EffekseerRendererDX12.Base.h +++ b/Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/EffekseerRendererDX12.Base.h @@ -6,6 +6,6 @@ #include "EffekseerRendererDX12.Base.Pre.h" -#include "../../EffekseerRendererLLGI/EffekseerRendererLLGI.Base.h" +#include #endif \ No newline at end of file diff --git a/Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/EffekseerRendererDX12.Renderer.cpp b/Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/EffekseerRendererDX12.Renderer.cpp similarity index 95% rename from Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/EffekseerRendererDX12.Renderer.cpp rename to Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/EffekseerRendererDX12.Renderer.cpp index 18abbca87d..d0fa1ff604 100644 --- a/Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/EffekseerRendererDX12.Renderer.cpp +++ b/Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/EffekseerRendererDX12.Renderer.cpp @@ -1,301 +1,303 @@ -#include "EffekseerRendererDX12.Renderer.h" -#include "../../3rdParty/LLGI/src/DX12/LLGI.CommandListDX12.h" -#include "../../3rdParty/LLGI/src/DX12/LLGI.GraphicsDX12.h" -#include "../../3rdParty/LLGI/src/DX12/LLGI.TextureDX12.h" -#include "../EffekseerMaterialCompiler/DirectX12/EffekseerMaterialCompilerDX12.h" -#include "../EffekseerRendererLLGI/EffekseerRendererLLGI.RendererImplemented.h" - -namespace Sprite_Unlit_VS_Ad -{ -static -#include "ShaderHeader/ad_sprite_unlit_vs.h" -} // namespace Sprite_Unlit_VS_Ad - -namespace Sprite_Distortion_VS_Ad -{ -static -#include "ShaderHeader/ad_sprite_distortion_vs.h" -} // namespace Sprite_Distortion_VS_Ad - -namespace Sprite_Lit_VS_Ad -{ -static -#include "ShaderHeader/ad_sprite_lit_vs.h" -} // namespace Sprite_Lit_VS_Ad - -namespace Model_Unlit_VS_Ad -{ -static -#include "ShaderHeader/ad_model_unlit_vs.h" -} // namespace Model_Unlit_VS_Ad - -namespace Model_Unlit_PS_Ad -{ -static -#include "ShaderHeader/ad_model_unlit_ps.h" -} // namespace Model_Unlit_PS_Ad - -namespace Model_Distortion_VS_Ad -{ -static -#include "ShaderHeader/ad_model_distortion_vs.h" -} // namespace Model_Distortion_VS_Ad - -namespace Model_Distortion_PS_Ad -{ -static -#include "ShaderHeader/ad_model_distortion_ps.h" -} // namespace Model_Distortion_PS_Ad - -namespace Model_Lit_VS_Ad -{ -static -#include "ShaderHeader/ad_model_lit_vs.h" -} // namespace Model_Lit_VS_Ad - -namespace Model_Lit_PS_Ad -{ -static -#include "ShaderHeader/ad_model_lit_ps.h" -} // namespace Model_Lit_PS_Ad - -namespace Sprite_Unlit_VS -{ -static -#include "ShaderHeader/sprite_unlit_vs.h" -} // namespace Sprite_Unlit_VS - -namespace Sprite_Distortion_VS -{ -static -#include "ShaderHeader/sprite_distortion_vs.h" -} // namespace Sprite_Distortion_VS - -namespace Sprite_Lit_VS -{ -static -#include "ShaderHeader/sprite_lit_vs.h" -} // namespace Sprite_Lit_VS - -namespace Model_Unlit_VS -{ -static -#include "ShaderHeader/model_unlit_vs.h" -} // namespace Model_Unlit_VS - -namespace Model_Unlit_PS -{ -static -#include "ShaderHeader/model_unlit_ps.h" -} // namespace Model_Unlit_PS - -namespace Model_Distortion_VS -{ -static -#include "ShaderHeader/model_distortion_vs.h" -} // namespace Model_Distortion_VS - -namespace Model_Distortion_PS -{ -static -#include "ShaderHeader/model_distortion_ps.h" -} // namespace Model_Distortion_PS - -namespace Model_Lit_VS -{ -static -#include "ShaderHeader/model_lit_vs.h" -} // namespace Model_Lit_VS - -namespace Model_Lit_PS -{ -static -#include "ShaderHeader/model_lit_ps.h" -} // namespace Model_Lit_PS - -namespace EffekseerRendererDX12 -{ - -::Effekseer::Backend::GraphicsDeviceRef CreateGraphicsDevice(ID3D12Device* device, ID3D12CommandQueue* commandQueue, int32_t swapBufferCount) -{ - std::function()> getScreenFunc = - []() -> std::tuple { - return std::tuple(); - }; - - auto graphics = new LLGI::GraphicsDX12( - device, getScreenFunc, []() -> void {}, commandQueue, swapBufferCount); - - auto ret = Effekseer::MakeRefPtr(graphics); - ES_SAFE_RELEASE(graphics); - return ret; -} - -::EffekseerRenderer::RendererRef Create(::Effekseer::Backend::GraphicsDeviceRef graphicsDevice, - DXGI_FORMAT* renderTargetFormats, - int32_t renderTargetCount, - DXGI_FORMAT depthFormat, - bool isReversedDepth, - int32_t squareMaxCount) -{ - auto renderer = ::Effekseer::MakeRefPtr<::EffekseerRendererLLGI::RendererImplemented>(squareMaxCount); - - auto allocate_ = [](std::vector& ds, const unsigned char* data, int32_t size) -> void { - ds.resize(1); - ds[0].Size = size; - ds[0].Data = data; - return; - }; - - allocate_(renderer->fixedShader_.AdvancedSpriteUnlit_VS, Sprite_Unlit_VS_Ad::g_main, sizeof(Sprite_Unlit_VS_Ad::g_main)); - allocate_(renderer->fixedShader_.AdvancedSpriteDistortion_VS, Sprite_Distortion_VS_Ad::g_main, sizeof(Sprite_Distortion_VS_Ad::g_main)); - allocate_(renderer->fixedShader_.AdvancedSpriteLit_VS, Sprite_Lit_VS_Ad::g_main, sizeof(Sprite_Lit_VS_Ad::g_main)); - - allocate_(renderer->fixedShader_.AdvancedModelUnlit_VS, Model_Unlit_VS_Ad::g_main, sizeof(Model_Unlit_VS_Ad::g_main)); - allocate_(renderer->fixedShader_.AdvancedModelUnlit_PS, Model_Unlit_PS_Ad::g_main, sizeof(Model_Unlit_PS_Ad::g_main)); - allocate_(renderer->fixedShader_.AdvancedModelDistortion_VS, Model_Distortion_VS_Ad::g_main, sizeof(Model_Distortion_VS_Ad::g_main)); - allocate_(renderer->fixedShader_.AdvancedModelDistortion_PS, Model_Distortion_PS_Ad::g_main, sizeof(Model_Distortion_PS_Ad::g_main)); - allocate_(renderer->fixedShader_.AdvancedModelLit_VS, Model_Lit_VS_Ad::g_main, sizeof(Model_Lit_VS_Ad::g_main)); - allocate_(renderer->fixedShader_.AdvancedModelLit_PS, Model_Lit_PS_Ad::g_main, sizeof(Model_Lit_PS_Ad::g_main)); - - allocate_(renderer->fixedShader_.SpriteUnlit_VS, Sprite_Unlit_VS::g_main, sizeof(Sprite_Unlit_VS::g_main)); - allocate_(renderer->fixedShader_.SpriteDistortion_VS, Sprite_Distortion_VS::g_main, sizeof(Sprite_Distortion_VS::g_main)); - allocate_(renderer->fixedShader_.SpriteLit_VS, Sprite_Lit_VS::g_main, sizeof(Sprite_Lit_VS::g_main)); - - allocate_(renderer->fixedShader_.ModelUnlit_VS, Model_Unlit_VS::g_main, sizeof(Model_Unlit_VS::g_main)); - allocate_(renderer->fixedShader_.ModelUnlit_PS, Model_Unlit_PS::g_main, sizeof(Model_Unlit_PS::g_main)); - - allocate_(renderer->fixedShader_.ModelLit_VS, - Model_Lit_VS::g_main, - sizeof(Model_Lit_VS::g_main)); - allocate_(renderer->fixedShader_.ModelLit_PS, - Model_Lit_PS::g_main, - sizeof(Model_Lit_PS::g_main)); - - allocate_( - renderer->fixedShader_.ModelDistortion_VS, Model_Distortion_VS::g_main, sizeof(Model_Distortion_VS::g_main)); - allocate_( - renderer->fixedShader_.ModelDistortion_PS, Model_Distortion_PS::g_main, sizeof(Model_Distortion_PS::g_main)); - - renderer->platformType_ = Effekseer::CompiledMaterialPlatformType::DirectX12; - renderer->materialCompiler_ = new Effekseer::MaterialCompilerDX12(); - - LLGI::RenderPassPipelineStateKey key; - key.RenderTargetFormats.resize(renderTargetCount); - - for (size_t i = 0; i < key.RenderTargetFormats.size(); i++) - { - key.RenderTargetFormats.at(i) = LLGI::ConvertFormat(renderTargetFormats[i]); - } - - key.DepthFormat = LLGI::ConvertFormat(depthFormat); - - auto gd = graphicsDevice.DownCast(); - - if (renderer->Initialize(gd, key, isReversedDepth)) - { - return renderer; - } - - return nullptr; -} - -::EffekseerRenderer::RendererRef Create(ID3D12Device* device, - ID3D12CommandQueue* commandQueue, - int32_t swapBufferCount, - DXGI_FORMAT* renderTargetFormats, - int32_t renderTargetCount, - DXGI_FORMAT depthFormat, - bool isReversedDepth, - int32_t squareMaxCount) -{ - auto graphicDevice = CreateGraphicsDevice(device, commandQueue, swapBufferCount); - - auto ret = Create(graphicDevice, renderTargetFormats, renderTargetCount, depthFormat, isReversedDepth, squareMaxCount); - - if (ret != nullptr) - { - return ret; - } - - return nullptr; -} - -Effekseer::Backend::TextureRef CreateTexture(::Effekseer::Backend::GraphicsDeviceRef graphicsDevice, ID3D12Resource* texture) -{ - auto g = static_cast<::EffekseerRendererLLGI::Backend::GraphicsDevice*>(graphicsDevice.Get()); - return g->CreateTexture((uint64_t)texture, [] {}); -} - -TextureProperty GetTextureProperty(::Effekseer::Backend::TextureRef texture) -{ - if (texture != nullptr) - { - auto t = texture.DownCast<::EffekseerRendererLLGI::Backend::Texture>(); - auto lt = static_cast(t->GetTexture().get()); - return TextureProperty{lt->Get()}; - } - else - { - return TextureProperty{}; - } -} - -CommandListProperty GetCommandListProperty(Effekseer::RefPtr commandList) -{ - if (commandList != nullptr) - { - auto cl = commandList.DownCast<::EffekseerRendererLLGI::CommandList>(); - auto clDx12 = static_cast(cl->GetInternal()); - return CommandListProperty{clDx12->GetCommandList()}; - } - else - { - return CommandListProperty{}; - } -} - -void BeginCommandList(Effekseer::RefPtr commandList, ID3D12GraphicsCommandList* dx12CommandList) -{ - assert(commandList != nullptr); - - if (dx12CommandList) - { - LLGI::PlatformContextDX12 context; - context.commandList = dx12CommandList; - - auto c = static_cast(commandList.Get()); - c->GetInternal()->BeginWithPlatform(&context); - c->SetState(EffekseerRendererLLGI::CommandListState::RunningWithPlatformCommandList); - } - else - { - auto c = static_cast(commandList.Get()); - c->GetInternal()->Begin(); - c->SetState(EffekseerRendererLLGI::CommandListState::Running); - } -} - -void EndCommandList(Effekseer::RefPtr commandList) -{ - assert(commandList != nullptr); - auto c = static_cast(commandList.Get()); - - if (c->GetState() == EffekseerRendererLLGI::CommandListState::RunningWithPlatformCommandList) - { - c->GetInternal()->EndWithPlatform(); - } - else - { - c->GetInternal()->End(); - } -} - -void ExecuteCommandList(Effekseer::RefPtr commandList) -{ - assert(commandList != nullptr); - auto c = static_cast(commandList.Get()); - c->GetGraphics()->Execute(c->GetInternal()); -} - +#include "EffekseerRendererDX12.Renderer.h" +#include "../../3rdParty/LLGI/src/DX12/LLGI.CommandListDX12.h" +#include "../../3rdParty/LLGI/src/DX12/LLGI.GraphicsDX12.h" +#include "../../3rdParty/LLGI/src/DX12/LLGI.TextureDX12.h" +#include "../EffekseerMaterialCompiler/DirectX12/EffekseerMaterialCompilerDX12.h" +#include + +namespace Sprite_Unlit_VS_Ad +{ +static +#include "ShaderHeader/ad_sprite_unlit_vs.h" +} // namespace Sprite_Unlit_VS_Ad + +namespace Sprite_Distortion_VS_Ad +{ +static +#include "ShaderHeader/ad_sprite_distortion_vs.h" +} // namespace Sprite_Distortion_VS_Ad + +namespace Sprite_Lit_VS_Ad +{ +static +#include "ShaderHeader/ad_sprite_lit_vs.h" +} // namespace Sprite_Lit_VS_Ad + +namespace Model_Unlit_VS_Ad +{ +static +#include "ShaderHeader/ad_model_unlit_vs.h" +} // namespace Model_Unlit_VS_Ad + +namespace Model_Unlit_PS_Ad +{ +static +#include "ShaderHeader/ad_model_unlit_ps.h" +} // namespace Model_Unlit_PS_Ad + +namespace Model_Distortion_VS_Ad +{ +static +#include "ShaderHeader/ad_model_distortion_vs.h" +} // namespace Model_Distortion_VS_Ad + +namespace Model_Distortion_PS_Ad +{ +static +#include "ShaderHeader/ad_model_distortion_ps.h" +} // namespace Model_Distortion_PS_Ad + +namespace Model_Lit_VS_Ad +{ +static +#include "ShaderHeader/ad_model_lit_vs.h" +} // namespace Model_Lit_VS_Ad + +namespace Model_Lit_PS_Ad +{ +static +#include "ShaderHeader/ad_model_lit_ps.h" +} // namespace Model_Lit_PS_Ad + +namespace Sprite_Unlit_VS +{ +static +#include "ShaderHeader/sprite_unlit_vs.h" +} // namespace Sprite_Unlit_VS + +namespace Sprite_Distortion_VS +{ +static +#include "ShaderHeader/sprite_distortion_vs.h" +} // namespace Sprite_Distortion_VS + +namespace Sprite_Lit_VS +{ +static +#include "ShaderHeader/sprite_lit_vs.h" +} // namespace Sprite_Lit_VS + +namespace Model_Unlit_VS +{ +static +#include "ShaderHeader/model_unlit_vs.h" +} // namespace Model_Unlit_VS + +namespace Model_Unlit_PS +{ +static +#include "ShaderHeader/model_unlit_ps.h" +} // namespace Model_Unlit_PS + +namespace Model_Distortion_VS +{ +static +#include "ShaderHeader/model_distortion_vs.h" +} // namespace Model_Distortion_VS + +namespace Model_Distortion_PS +{ +static +#include "ShaderHeader/model_distortion_ps.h" +} // namespace Model_Distortion_PS + +namespace Model_Lit_VS +{ +static +#include "ShaderHeader/model_lit_vs.h" +} // namespace Model_Lit_VS + +namespace Model_Lit_PS +{ +static +#include "ShaderHeader/model_lit_ps.h" +} // namespace Model_Lit_PS + +namespace EffekseerRendererDX12 +{ + +::Effekseer::Backend::GraphicsDeviceRef CreateGraphicsDevice(ID3D12Device* device, ID3D12CommandQueue* commandQueue, int32_t swapBufferCount) +{ + std::function()> getScreenFunc = + []() -> std::tuple + { + return std::tuple(); + }; + + auto graphics = new LLGI::GraphicsDX12( + device, getScreenFunc, []() -> void {}, commandQueue, swapBufferCount); + + auto ret = Effekseer::MakeRefPtr(graphics); + ES_SAFE_RELEASE(graphics); + return ret; +} + +::EffekseerRenderer::RendererRef Create(::Effekseer::Backend::GraphicsDeviceRef graphicsDevice, + DXGI_FORMAT* renderTargetFormats, + int32_t renderTargetCount, + DXGI_FORMAT depthFormat, + bool isReversedDepth, + int32_t squareMaxCount) +{ + auto renderer = ::Effekseer::MakeRefPtr<::EffekseerRendererLLGI::RendererImplemented>(squareMaxCount); + + auto allocate_ = [](std::vector& ds, const unsigned char* data, int32_t size) -> void + { + ds.resize(1); + ds[0].Size = size; + ds[0].Data = data; + return; + }; + + allocate_(renderer->fixedShader_.AdvancedSpriteUnlit_VS, Sprite_Unlit_VS_Ad::g_main, sizeof(Sprite_Unlit_VS_Ad::g_main)); + allocate_(renderer->fixedShader_.AdvancedSpriteDistortion_VS, Sprite_Distortion_VS_Ad::g_main, sizeof(Sprite_Distortion_VS_Ad::g_main)); + allocate_(renderer->fixedShader_.AdvancedSpriteLit_VS, Sprite_Lit_VS_Ad::g_main, sizeof(Sprite_Lit_VS_Ad::g_main)); + + allocate_(renderer->fixedShader_.AdvancedModelUnlit_VS, Model_Unlit_VS_Ad::g_main, sizeof(Model_Unlit_VS_Ad::g_main)); + allocate_(renderer->fixedShader_.AdvancedModelUnlit_PS, Model_Unlit_PS_Ad::g_main, sizeof(Model_Unlit_PS_Ad::g_main)); + allocate_(renderer->fixedShader_.AdvancedModelDistortion_VS, Model_Distortion_VS_Ad::g_main, sizeof(Model_Distortion_VS_Ad::g_main)); + allocate_(renderer->fixedShader_.AdvancedModelDistortion_PS, Model_Distortion_PS_Ad::g_main, sizeof(Model_Distortion_PS_Ad::g_main)); + allocate_(renderer->fixedShader_.AdvancedModelLit_VS, Model_Lit_VS_Ad::g_main, sizeof(Model_Lit_VS_Ad::g_main)); + allocate_(renderer->fixedShader_.AdvancedModelLit_PS, Model_Lit_PS_Ad::g_main, sizeof(Model_Lit_PS_Ad::g_main)); + + allocate_(renderer->fixedShader_.SpriteUnlit_VS, Sprite_Unlit_VS::g_main, sizeof(Sprite_Unlit_VS::g_main)); + allocate_(renderer->fixedShader_.SpriteDistortion_VS, Sprite_Distortion_VS::g_main, sizeof(Sprite_Distortion_VS::g_main)); + allocate_(renderer->fixedShader_.SpriteLit_VS, Sprite_Lit_VS::g_main, sizeof(Sprite_Lit_VS::g_main)); + + allocate_(renderer->fixedShader_.ModelUnlit_VS, Model_Unlit_VS::g_main, sizeof(Model_Unlit_VS::g_main)); + allocate_(renderer->fixedShader_.ModelUnlit_PS, Model_Unlit_PS::g_main, sizeof(Model_Unlit_PS::g_main)); + + allocate_(renderer->fixedShader_.ModelLit_VS, + Model_Lit_VS::g_main, + sizeof(Model_Lit_VS::g_main)); + allocate_(renderer->fixedShader_.ModelLit_PS, + Model_Lit_PS::g_main, + sizeof(Model_Lit_PS::g_main)); + + allocate_( + renderer->fixedShader_.ModelDistortion_VS, Model_Distortion_VS::g_main, sizeof(Model_Distortion_VS::g_main)); + allocate_( + renderer->fixedShader_.ModelDistortion_PS, Model_Distortion_PS::g_main, sizeof(Model_Distortion_PS::g_main)); + + renderer->platformType_ = Effekseer::CompiledMaterialPlatformType::DirectX12; + renderer->materialCompiler_ = new Effekseer::MaterialCompilerDX12(); + + LLGI::RenderPassPipelineStateKey key; + key.RenderTargetFormats.resize(renderTargetCount); + + for (size_t i = 0; i < key.RenderTargetFormats.size(); i++) + { + key.RenderTargetFormats.at(i) = LLGI::ConvertFormat(renderTargetFormats[i]); + } + + key.DepthFormat = LLGI::ConvertFormat(depthFormat); + + auto gd = graphicsDevice.DownCast(); + + if (renderer->Initialize(gd, key, isReversedDepth)) + { + return renderer; + } + + return nullptr; +} + +::EffekseerRenderer::RendererRef Create(ID3D12Device* device, + ID3D12CommandQueue* commandQueue, + int32_t swapBufferCount, + DXGI_FORMAT* renderTargetFormats, + int32_t renderTargetCount, + DXGI_FORMAT depthFormat, + bool isReversedDepth, + int32_t squareMaxCount) +{ + auto graphicDevice = CreateGraphicsDevice(device, commandQueue, swapBufferCount); + + auto ret = Create(graphicDevice, renderTargetFormats, renderTargetCount, depthFormat, isReversedDepth, squareMaxCount); + + if (ret != nullptr) + { + return ret; + } + + return nullptr; +} + +Effekseer::Backend::TextureRef CreateTexture(::Effekseer::Backend::GraphicsDeviceRef graphicsDevice, ID3D12Resource* texture) +{ + auto g = static_cast<::EffekseerRendererLLGI::Backend::GraphicsDevice*>(graphicsDevice.Get()); + return g->CreateTexture((uint64_t)texture, [] {}); +} + +TextureProperty GetTextureProperty(::Effekseer::Backend::TextureRef texture) +{ + if (texture != nullptr) + { + auto t = texture.DownCast<::EffekseerRendererLLGI::Backend::Texture>(); + auto lt = static_cast(t->GetTexture().get()); + return TextureProperty{lt->Get()}; + } + else + { + return TextureProperty{}; + } +} + +CommandListProperty GetCommandListProperty(Effekseer::RefPtr commandList) +{ + if (commandList != nullptr) + { + auto cl = commandList.DownCast<::EffekseerRendererLLGI::CommandList>(); + auto clDx12 = static_cast(cl->GetInternal()); + return CommandListProperty{clDx12->GetCommandList()}; + } + else + { + return CommandListProperty{}; + } +} + +void BeginCommandList(Effekseer::RefPtr commandList, ID3D12GraphicsCommandList* dx12CommandList) +{ + assert(commandList != nullptr); + + if (dx12CommandList) + { + LLGI::PlatformContextDX12 context; + context.commandList = dx12CommandList; + + auto c = static_cast(commandList.Get()); + c->GetInternal()->BeginWithPlatform(&context); + c->SetState(EffekseerRendererLLGI::CommandListState::RunningWithPlatformCommandList); + } + else + { + auto c = static_cast(commandList.Get()); + c->GetInternal()->Begin(); + c->SetState(EffekseerRendererLLGI::CommandListState::Running); + } +} + +void EndCommandList(Effekseer::RefPtr commandList) +{ + assert(commandList != nullptr); + auto c = static_cast(commandList.Get()); + + if (c->GetState() == EffekseerRendererLLGI::CommandListState::RunningWithPlatformCommandList) + { + c->GetInternal()->EndWithPlatform(); + } + else + { + c->GetInternal()->End(); + } +} + +void ExecuteCommandList(Effekseer::RefPtr commandList) +{ + assert(commandList != nullptr); + auto c = static_cast(commandList.Get()); + c->GetGraphics()->Execute(c->GetInternal()); +} + } // namespace EffekseerRendererDX12 \ No newline at end of file diff --git a/Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/EffekseerRendererDX12.Renderer.h b/Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/EffekseerRendererDX12.Renderer.h similarity index 97% rename from Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/EffekseerRendererDX12.Renderer.h rename to Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/EffekseerRendererDX12.Renderer.h index 56bde6b2a2..44fd0f3ce0 100644 --- a/Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/EffekseerRendererDX12.Renderer.h +++ b/Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/EffekseerRendererDX12.Renderer.h @@ -2,8 +2,8 @@ #ifndef __EFFEKSEERRENDERER_DX12_RENDERER_H__ #define __EFFEKSEERRENDERER_DX12_RENDERER_H__ -#include "../../EffekseerRendererCommon/EffekseerRenderer.Renderer.h" #include "EffekseerRendererDX12.Base.h" +#include #include namespace EffekseerRendererDX12 diff --git a/Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/Shader/ad_model_distortion_ps.fx b/Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/Shader/ad_model_distortion_ps.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/Shader/ad_model_distortion_ps.fx rename to Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/Shader/ad_model_distortion_ps.fx diff --git a/Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/Shader/ad_model_distortion_vs.fx b/Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/Shader/ad_model_distortion_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/Shader/ad_model_distortion_vs.fx rename to Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/Shader/ad_model_distortion_vs.fx diff --git a/Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/Shader/ad_model_lit_ps.fx b/Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/Shader/ad_model_lit_ps.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/Shader/ad_model_lit_ps.fx rename to Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/Shader/ad_model_lit_ps.fx diff --git a/Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/Shader/ad_model_lit_vs.fx b/Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/Shader/ad_model_lit_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/Shader/ad_model_lit_vs.fx rename to Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/Shader/ad_model_lit_vs.fx diff --git a/Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/Shader/ad_model_unlit_ps.fx b/Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/Shader/ad_model_unlit_ps.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/Shader/ad_model_unlit_ps.fx rename to Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/Shader/ad_model_unlit_ps.fx diff --git a/Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/Shader/ad_model_unlit_vs.fx b/Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/Shader/ad_model_unlit_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/Shader/ad_model_unlit_vs.fx rename to Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/Shader/ad_model_unlit_vs.fx diff --git a/Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/Shader/ad_sprite_distortion_vs.fx b/Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/Shader/ad_sprite_distortion_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/Shader/ad_sprite_distortion_vs.fx rename to Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/Shader/ad_sprite_distortion_vs.fx diff --git a/Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/Shader/ad_sprite_lit_vs.fx b/Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/Shader/ad_sprite_lit_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/Shader/ad_sprite_lit_vs.fx rename to Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/Shader/ad_sprite_lit_vs.fx diff --git a/Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/Shader/ad_sprite_unlit_vs.fx b/Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/Shader/ad_sprite_unlit_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/Shader/ad_sprite_unlit_vs.fx rename to Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/Shader/ad_sprite_unlit_vs.fx diff --git a/Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/Shader/model_distortion_ps.fx b/Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/Shader/model_distortion_ps.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/Shader/model_distortion_ps.fx rename to Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/Shader/model_distortion_ps.fx diff --git a/Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/Shader/model_distortion_vs.fx b/Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/Shader/model_distortion_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/Shader/model_distortion_vs.fx rename to Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/Shader/model_distortion_vs.fx diff --git a/Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/Shader/model_lit_ps.fx b/Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/Shader/model_lit_ps.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/Shader/model_lit_ps.fx rename to Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/Shader/model_lit_ps.fx diff --git a/Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/Shader/model_lit_vs.fx b/Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/Shader/model_lit_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/Shader/model_lit_vs.fx rename to Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/Shader/model_lit_vs.fx diff --git a/Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/Shader/model_unlit_ps.fx b/Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/Shader/model_unlit_ps.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/Shader/model_unlit_ps.fx rename to Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/Shader/model_unlit_ps.fx diff --git a/Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/Shader/model_unlit_vs.fx b/Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/Shader/model_unlit_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/Shader/model_unlit_vs.fx rename to Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/Shader/model_unlit_vs.fx diff --git a/Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/Shader/sprite_distortion_vs.fx b/Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/Shader/sprite_distortion_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/Shader/sprite_distortion_vs.fx rename to Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/Shader/sprite_distortion_vs.fx diff --git a/Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/Shader/sprite_lit_vs.fx b/Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/Shader/sprite_lit_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/Shader/sprite_lit_vs.fx rename to Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/Shader/sprite_lit_vs.fx diff --git a/Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/Shader/sprite_unlit_vs.fx b/Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/Shader/sprite_unlit_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/Shader/sprite_unlit_vs.fx rename to Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/Shader/sprite_unlit_vs.fx diff --git a/Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/ShaderHeader/ad_model_distortion_ps.h b/Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/ShaderHeader/ad_model_distortion_ps.h similarity index 100% rename from Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/ShaderHeader/ad_model_distortion_ps.h rename to Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/ShaderHeader/ad_model_distortion_ps.h diff --git a/Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/ShaderHeader/ad_model_distortion_vs.h b/Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/ShaderHeader/ad_model_distortion_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/ShaderHeader/ad_model_distortion_vs.h rename to Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/ShaderHeader/ad_model_distortion_vs.h diff --git a/Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/ShaderHeader/ad_model_lit_ps.h b/Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/ShaderHeader/ad_model_lit_ps.h similarity index 100% rename from Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/ShaderHeader/ad_model_lit_ps.h rename to Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/ShaderHeader/ad_model_lit_ps.h diff --git a/Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/ShaderHeader/ad_model_lit_vs.h b/Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/ShaderHeader/ad_model_lit_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/ShaderHeader/ad_model_lit_vs.h rename to Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/ShaderHeader/ad_model_lit_vs.h diff --git a/Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/ShaderHeader/ad_model_unlit_ps.h b/Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/ShaderHeader/ad_model_unlit_ps.h similarity index 100% rename from Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/ShaderHeader/ad_model_unlit_ps.h rename to Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/ShaderHeader/ad_model_unlit_ps.h diff --git a/Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/ShaderHeader/ad_model_unlit_vs.h b/Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/ShaderHeader/ad_model_unlit_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/ShaderHeader/ad_model_unlit_vs.h rename to Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/ShaderHeader/ad_model_unlit_vs.h diff --git a/Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/ShaderHeader/ad_sprite_distortion_vs.h b/Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/ShaderHeader/ad_sprite_distortion_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/ShaderHeader/ad_sprite_distortion_vs.h rename to Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/ShaderHeader/ad_sprite_distortion_vs.h diff --git a/Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/ShaderHeader/ad_sprite_lit_vs.h b/Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/ShaderHeader/ad_sprite_lit_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/ShaderHeader/ad_sprite_lit_vs.h rename to Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/ShaderHeader/ad_sprite_lit_vs.h diff --git a/Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/ShaderHeader/ad_sprite_unlit_vs.h b/Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/ShaderHeader/ad_sprite_unlit_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/ShaderHeader/ad_sprite_unlit_vs.h rename to Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/ShaderHeader/ad_sprite_unlit_vs.h diff --git a/Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/ShaderHeader/model_distortion_ps.h b/Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/ShaderHeader/model_distortion_ps.h similarity index 100% rename from Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/ShaderHeader/model_distortion_ps.h rename to Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/ShaderHeader/model_distortion_ps.h diff --git a/Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/ShaderHeader/model_distortion_vs.h b/Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/ShaderHeader/model_distortion_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/ShaderHeader/model_distortion_vs.h rename to Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/ShaderHeader/model_distortion_vs.h diff --git a/Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/ShaderHeader/model_lit_ps.h b/Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/ShaderHeader/model_lit_ps.h similarity index 100% rename from Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/ShaderHeader/model_lit_ps.h rename to Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/ShaderHeader/model_lit_ps.h diff --git a/Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/ShaderHeader/model_lit_vs.h b/Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/ShaderHeader/model_lit_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/ShaderHeader/model_lit_vs.h rename to Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/ShaderHeader/model_lit_vs.h diff --git a/Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/ShaderHeader/model_unlit_ps.h b/Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/ShaderHeader/model_unlit_ps.h similarity index 100% rename from Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/ShaderHeader/model_unlit_ps.h rename to Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/ShaderHeader/model_unlit_ps.h diff --git a/Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/ShaderHeader/model_unlit_vs.h b/Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/ShaderHeader/model_unlit_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/ShaderHeader/model_unlit_vs.h rename to Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/ShaderHeader/model_unlit_vs.h diff --git a/Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/ShaderHeader/sprite_distortion_vs.h b/Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/ShaderHeader/sprite_distortion_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/ShaderHeader/sprite_distortion_vs.h rename to Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/ShaderHeader/sprite_distortion_vs.h diff --git a/Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/ShaderHeader/sprite_lit_vs.h b/Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/ShaderHeader/sprite_lit_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/ShaderHeader/sprite_lit_vs.h rename to Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/ShaderHeader/sprite_lit_vs.h diff --git a/Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/ShaderHeader/sprite_unlit_vs.h b/Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/ShaderHeader/sprite_unlit_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/ShaderHeader/sprite_unlit_vs.h rename to Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/ShaderHeader/sprite_unlit_vs.h diff --git a/Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/compile_effect.bat b/Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/compile_effect.bat similarity index 100% rename from Dev/Cpp/EffekseerRendererDX12/EffekseerRenderer/compile_effect.bat rename to Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/compile_effect.bat diff --git a/Dev/Cpp/EffekseerRendererDX9/CMakeLists.txt b/Dev/Cpp/EffekseerRendererDX9/CMakeLists.txt index 934e2db524..1b2490b1fc 100644 --- a/Dev/Cpp/EffekseerRendererDX9/CMakeLists.txt +++ b/Dev/Cpp/EffekseerRendererDX9/CMakeLists.txt @@ -19,20 +19,20 @@ set(LOCAL_SOURCES set(PublicHeaders EffekseerRendererDX9.h - EffekseerRenderer/EffekseerRendererDX9.Base.Pre.h - EffekseerRenderer/EffekseerRendererDX9.Renderer.h) + EffekseerRendererDX9/EffekseerRendererDX9.Base.Pre.h + EffekseerRendererDX9/EffekseerRendererDX9.Renderer.h) #-------------------- # Projects add_library(${PROJECT_NAME} STATIC ${LOCAL_SOURCES}) -target_include_directories(${PROJECT_NAME} PRIVATE ${PROJECT_SOURCE_DIR}/../Effekseer ${EFK_THIRDPARTY_INCLUDES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${EFK_THIRDPARTY_INCLUDES}) set_target_properties(${PROJECT_NAME} PROPERTIES PUBLIC_HEADER "${PublicHeader}") target_link_libraries(${PROJECT_NAME} PUBLIC Effekseer EffekseerRendererCommon) target_include_directories(${PROJECT_NAME} PUBLIC $ - $) + $) if(CLANG_FORMAT_ENABLED) clang_format(${PROJECT_NAME}) @@ -47,7 +47,7 @@ endif() foreach (file ${PublicHeaders}) get_filename_component(dir ${file} DIRECTORY) - install(FILES ${file} DESTINATION include/EffekseerRendererDX9/${dir}) + install(FILES ${file} DESTINATION include/${dir}) endforeach() install( diff --git a/Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9.h b/Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9.h index 00908ef1db..b7c57c5653 100644 --- a/Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9.h +++ b/Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9.h @@ -2,7 +2,7 @@ #ifndef __EFFEKSEERRENDERER_DX9_H__ #define __EFFEKSEERRENDERER_DX9_H__ -#include "EffekseerRenderer/EffekseerRendererDX9.Base.Pre.h" -#include "EffekseerRenderer/EffekseerRendererDX9.Renderer.h" +#include "EffekseerRendererDX9/EffekseerRendererDX9.Base.Pre.h" +#include "EffekseerRendererDX9/EffekseerRendererDX9.Renderer.h" #endif // __EFFEKSEERRENDERER_DX9_H__ diff --git a/Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/EffekseerRendererDX9.Base.Pre.h b/Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/EffekseerRendererDX9.Base.Pre.h similarity index 100% rename from Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/EffekseerRendererDX9.Base.Pre.h rename to Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/EffekseerRendererDX9.Base.Pre.h diff --git a/Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/EffekseerRendererDX9.Base.h b/Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/EffekseerRendererDX9.Base.h similarity index 100% rename from Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/EffekseerRendererDX9.Base.h rename to Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/EffekseerRendererDX9.Base.h diff --git a/Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/EffekseerRendererDX9.MaterialLoader.cpp b/Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/EffekseerRendererDX9.MaterialLoader.cpp similarity index 100% rename from Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/EffekseerRendererDX9.MaterialLoader.cpp rename to Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/EffekseerRendererDX9.MaterialLoader.cpp diff --git a/Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/EffekseerRendererDX9.MaterialLoader.h b/Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/EffekseerRendererDX9.MaterialLoader.h similarity index 100% rename from Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/EffekseerRendererDX9.MaterialLoader.h rename to Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/EffekseerRendererDX9.MaterialLoader.h diff --git a/Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/EffekseerRendererDX9.ModelRenderer.cpp b/Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/EffekseerRendererDX9.ModelRenderer.cpp similarity index 100% rename from Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/EffekseerRendererDX9.ModelRenderer.cpp rename to Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/EffekseerRendererDX9.ModelRenderer.cpp diff --git a/Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/EffekseerRendererDX9.ModelRenderer.h b/Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/EffekseerRendererDX9.ModelRenderer.h similarity index 96% rename from Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/EffekseerRendererDX9.ModelRenderer.h rename to Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/EffekseerRendererDX9.ModelRenderer.h index 5c057d42ef..9ae92ae183 100644 --- a/Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/EffekseerRendererDX9.ModelRenderer.h +++ b/Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/EffekseerRendererDX9.ModelRenderer.h @@ -5,8 +5,8 @@ //---------------------------------------------------------------------------------- // Include //---------------------------------------------------------------------------------- -#include "../../EffekseerRendererCommon/EffekseerRenderer.ModelRendererBase.h" #include "EffekseerRendererDX9.RendererImplemented.h" +#include //----------------------------------------------------------------------------------- // diff --git a/Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/EffekseerRendererDX9.RenderState.cpp b/Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/EffekseerRendererDX9.RenderState.cpp similarity index 100% rename from Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/EffekseerRendererDX9.RenderState.cpp rename to Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/EffekseerRendererDX9.RenderState.cpp diff --git a/Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/EffekseerRendererDX9.RenderState.h b/Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/EffekseerRendererDX9.RenderState.h similarity index 94% rename from Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/EffekseerRendererDX9.RenderState.h rename to Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/EffekseerRendererDX9.RenderState.h index c51f2e81ab..26e7c68437 100644 --- a/Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/EffekseerRendererDX9.RenderState.h +++ b/Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/EffekseerRendererDX9.RenderState.h @@ -5,8 +5,8 @@ //---------------------------------------------------------------------------------- // Include //---------------------------------------------------------------------------------- -#include "../../EffekseerRendererCommon/EffekseerRenderer.RenderStateBase.h" #include "EffekseerRendererDX9.Base.h" +#include //----------------------------------------------------------------------------------- // diff --git a/Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/EffekseerRendererDX9.Renderer.cpp b/Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/EffekseerRendererDX9.Renderer.cpp similarity index 97% rename from Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/EffekseerRendererDX9.Renderer.cpp rename to Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/EffekseerRendererDX9.Renderer.cpp index 1102b1512c..b774914bd0 100644 --- a/Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/EffekseerRendererDX9.Renderer.cpp +++ b/Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/EffekseerRendererDX9.Renderer.cpp @@ -6,16 +6,16 @@ #include "EffekseerRendererDX9.RenderState.h" #include "EffekseerRendererDX9.RendererImplemented.h" -#include "../../EffekseerRendererCommon/EffekseerRenderer.Renderer_Impl.h" -#include "../../EffekseerRendererCommon/EffekseerRenderer.RibbonRendererBase.h" -#include "../../EffekseerRendererCommon/EffekseerRenderer.RingRendererBase.h" -#include "../../EffekseerRendererCommon/EffekseerRenderer.SpriteRendererBase.h" -#include "../../EffekseerRendererCommon/EffekseerRenderer.TrackRendererBase.h" -#include "../../EffekseerRendererCommon/ModelLoader.h" -#include "../../EffekseerRendererCommon/TextureLoader.h" #include "EffekseerRendererDX9.MaterialLoader.h" #include "EffekseerRendererDX9.ModelRenderer.h" #include "EffekseerRendererDX9.Shader.h" +#include +#include +#include +#include +#include +#include +#include //---------------------------------------------------------------------------------- // @@ -597,12 +597,14 @@ void RendererImplemented::SetBackground(IDirect3DTexture9* background) if (m_backgroundDX9 == nullptr) { - m_backgroundDX9 = graphicsDevice_->CreateTexture(background, [](auto texture) -> auto{}, [](auto texture) -> auto{}); + m_backgroundDX9 = graphicsDevice_->CreateTexture( + background, [](auto texture) -> auto {}, [](auto texture) -> auto {}); } else { auto texture = static_cast(m_backgroundDX9.Get()); - texture->Init(background, [](auto texture) -> auto{}, [](auto texture) -> auto{}); + texture->Init( + background, [](auto texture) -> auto {}, [](auto texture) -> auto {}); } EffekseerRenderer::Renderer::SetBackground(m_backgroundDX9); diff --git a/Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/EffekseerRendererDX9.Renderer.h b/Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/EffekseerRendererDX9.Renderer.h similarity index 96% rename from Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/EffekseerRendererDX9.Renderer.h rename to Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/EffekseerRendererDX9.Renderer.h index a3473d9314..35782d565c 100644 --- a/Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/EffekseerRendererDX9.Renderer.h +++ b/Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/EffekseerRendererDX9.Renderer.h @@ -5,8 +5,8 @@ //---------------------------------------------------------------------------------- // Include //---------------------------------------------------------------------------------- -#include "../../EffekseerRendererCommon/EffekseerRenderer.Renderer.h" #include "EffekseerRendererDX9.Base.h" +#include //---------------------------------------------------------------------------------- // diff --git a/Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/EffekseerRendererDX9.RendererImplemented.h b/Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/EffekseerRendererDX9.RendererImplemented.h similarity index 97% rename from Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/EffekseerRendererDX9.RendererImplemented.h rename to Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/EffekseerRendererDX9.RendererImplemented.h index 7f4b36fc53..fd137b9ab4 100644 --- a/Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/EffekseerRendererDX9.RendererImplemented.h +++ b/Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/EffekseerRendererDX9.RendererImplemented.h @@ -5,8 +5,8 @@ //---------------------------------------------------------------------------------- // Include //---------------------------------------------------------------------------------- -#include "../../EffekseerRendererCommon/EffekseerRenderer.RenderStateBase.h" -#include "../../EffekseerRendererCommon/EffekseerRenderer.StandardRenderer.h" +#include +#include #include "EffekseerRendererDX9.Base.h" #include "EffekseerRendererDX9.Renderer.h" #include "GraphicsDevice.h" diff --git a/Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/EffekseerRendererDX9.Shader.cpp b/Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/EffekseerRendererDX9.Shader.cpp similarity index 100% rename from Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/EffekseerRendererDX9.Shader.cpp rename to Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/EffekseerRendererDX9.Shader.cpp diff --git a/Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/EffekseerRendererDX9.Shader.h b/Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/EffekseerRendererDX9.Shader.h similarity index 97% rename from Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/EffekseerRendererDX9.Shader.h rename to Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/EffekseerRendererDX9.Shader.h index 70b3dca90e..37c84e4415 100644 --- a/Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/EffekseerRendererDX9.Shader.h +++ b/Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/EffekseerRendererDX9.Shader.h @@ -5,8 +5,8 @@ //---------------------------------------------------------------------------------- // Include //---------------------------------------------------------------------------------- -#include "../../EffekseerRendererCommon/EffekseerRenderer.ShaderBase.h" #include "EffekseerRendererDX9.RendererImplemented.h" +#include //----------------------------------------------------------------------------------- // diff --git a/Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/GraphicsDevice.cpp b/Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/GraphicsDevice.cpp similarity index 99% rename from Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/GraphicsDevice.cpp rename to Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/GraphicsDevice.cpp index 553cfe385d..ce4d74189a 100644 --- a/Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/GraphicsDevice.cpp +++ b/Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/GraphicsDevice.cpp @@ -1,5 +1,5 @@ #include "GraphicsDevice.h" -#include "../../EffekseerRendererCommon/EffekseerRenderer.CommonUtils.h" +#include namespace EffekseerRendererDX9 { diff --git a/Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/GraphicsDevice.h b/Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/GraphicsDevice.h similarity index 99% rename from Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/GraphicsDevice.h rename to Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/GraphicsDevice.h index 41c5636324..9b01c40753 100644 --- a/Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/GraphicsDevice.h +++ b/Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/GraphicsDevice.h @@ -2,8 +2,8 @@ #ifndef __EFFEKSEERRENDERER_DX9_GRAPHICS_DEVICE_H__ #define __EFFEKSEERRENDERER_DX9_GRAPHICS_DEVICE_H__ -#include "../../EffekseerRendererCommon/EffekseerRenderer.CommonUtils.h" #include +#include #include #include #include diff --git a/Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/Shader/ad_model_distortion_ps.fx b/Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/Shader/ad_model_distortion_ps.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/Shader/ad_model_distortion_ps.fx rename to Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/Shader/ad_model_distortion_ps.fx diff --git a/Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/Shader/ad_model_distortion_vs.fx b/Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/Shader/ad_model_distortion_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/Shader/ad_model_distortion_vs.fx rename to Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/Shader/ad_model_distortion_vs.fx diff --git a/Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/Shader/ad_model_lit_ps.fx b/Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/Shader/ad_model_lit_ps.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/Shader/ad_model_lit_ps.fx rename to Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/Shader/ad_model_lit_ps.fx diff --git a/Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/Shader/ad_model_lit_vs.fx b/Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/Shader/ad_model_lit_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/Shader/ad_model_lit_vs.fx rename to Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/Shader/ad_model_lit_vs.fx diff --git a/Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/Shader/ad_model_unlit_ps.fx b/Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/Shader/ad_model_unlit_ps.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/Shader/ad_model_unlit_ps.fx rename to Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/Shader/ad_model_unlit_ps.fx diff --git a/Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/Shader/ad_model_unlit_vs.fx b/Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/Shader/ad_model_unlit_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/Shader/ad_model_unlit_vs.fx rename to Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/Shader/ad_model_unlit_vs.fx diff --git a/Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/Shader/ad_sprite_distortion_vs.fx b/Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/Shader/ad_sprite_distortion_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/Shader/ad_sprite_distortion_vs.fx rename to Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/Shader/ad_sprite_distortion_vs.fx diff --git a/Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/Shader/ad_sprite_lit_vs.fx b/Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/Shader/ad_sprite_lit_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/Shader/ad_sprite_lit_vs.fx rename to Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/Shader/ad_sprite_lit_vs.fx diff --git a/Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/Shader/ad_sprite_unlit_vs.fx b/Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/Shader/ad_sprite_unlit_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/Shader/ad_sprite_unlit_vs.fx rename to Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/Shader/ad_sprite_unlit_vs.fx diff --git a/Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/Shader/model_distortion_ps.fx b/Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/Shader/model_distortion_ps.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/Shader/model_distortion_ps.fx rename to Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/Shader/model_distortion_ps.fx diff --git a/Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/Shader/model_distortion_vs.fx b/Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/Shader/model_distortion_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/Shader/model_distortion_vs.fx rename to Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/Shader/model_distortion_vs.fx diff --git a/Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/Shader/model_lit_ps.fx b/Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/Shader/model_lit_ps.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/Shader/model_lit_ps.fx rename to Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/Shader/model_lit_ps.fx diff --git a/Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/Shader/model_lit_vs.fx b/Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/Shader/model_lit_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/Shader/model_lit_vs.fx rename to Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/Shader/model_lit_vs.fx diff --git a/Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/Shader/model_unlit_ps.fx b/Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/Shader/model_unlit_ps.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/Shader/model_unlit_ps.fx rename to Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/Shader/model_unlit_ps.fx diff --git a/Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/Shader/model_unlit_vs.fx b/Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/Shader/model_unlit_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/Shader/model_unlit_vs.fx rename to Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/Shader/model_unlit_vs.fx diff --git a/Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/Shader/sprite_distortion_vs.fx b/Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/Shader/sprite_distortion_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/Shader/sprite_distortion_vs.fx rename to Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/Shader/sprite_distortion_vs.fx diff --git a/Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/Shader/sprite_lit_vs.fx b/Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/Shader/sprite_lit_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/Shader/sprite_lit_vs.fx rename to Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/Shader/sprite_lit_vs.fx diff --git a/Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/Shader/sprite_unlit_vs.fx b/Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/Shader/sprite_unlit_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/Shader/sprite_unlit_vs.fx rename to Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/Shader/sprite_unlit_vs.fx diff --git a/Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/ShaderHeader/ad_model_distortion_ps.h b/Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/ShaderHeader/ad_model_distortion_ps.h similarity index 100% rename from Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/ShaderHeader/ad_model_distortion_ps.h rename to Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/ShaderHeader/ad_model_distortion_ps.h diff --git a/Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/ShaderHeader/ad_model_distortion_vs.h b/Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/ShaderHeader/ad_model_distortion_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/ShaderHeader/ad_model_distortion_vs.h rename to Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/ShaderHeader/ad_model_distortion_vs.h diff --git a/Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/ShaderHeader/ad_model_lit_ps.h b/Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/ShaderHeader/ad_model_lit_ps.h similarity index 100% rename from Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/ShaderHeader/ad_model_lit_ps.h rename to Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/ShaderHeader/ad_model_lit_ps.h diff --git a/Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/ShaderHeader/ad_model_lit_vs.h b/Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/ShaderHeader/ad_model_lit_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/ShaderHeader/ad_model_lit_vs.h rename to Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/ShaderHeader/ad_model_lit_vs.h diff --git a/Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/ShaderHeader/ad_model_unlit_ps.h b/Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/ShaderHeader/ad_model_unlit_ps.h similarity index 100% rename from Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/ShaderHeader/ad_model_unlit_ps.h rename to Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/ShaderHeader/ad_model_unlit_ps.h diff --git a/Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/ShaderHeader/ad_model_unlit_vs.h b/Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/ShaderHeader/ad_model_unlit_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/ShaderHeader/ad_model_unlit_vs.h rename to Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/ShaderHeader/ad_model_unlit_vs.h diff --git a/Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/ShaderHeader/ad_sprite_distortion_vs.h b/Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/ShaderHeader/ad_sprite_distortion_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/ShaderHeader/ad_sprite_distortion_vs.h rename to Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/ShaderHeader/ad_sprite_distortion_vs.h diff --git a/Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/ShaderHeader/ad_sprite_lit_vs.h b/Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/ShaderHeader/ad_sprite_lit_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/ShaderHeader/ad_sprite_lit_vs.h rename to Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/ShaderHeader/ad_sprite_lit_vs.h diff --git a/Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/ShaderHeader/ad_sprite_unlit_vs.h b/Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/ShaderHeader/ad_sprite_unlit_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/ShaderHeader/ad_sprite_unlit_vs.h rename to Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/ShaderHeader/ad_sprite_unlit_vs.h diff --git a/Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/ShaderHeader/model_distortion_ps.h b/Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/ShaderHeader/model_distortion_ps.h similarity index 100% rename from Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/ShaderHeader/model_distortion_ps.h rename to Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/ShaderHeader/model_distortion_ps.h diff --git a/Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/ShaderHeader/model_distortion_vs.h b/Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/ShaderHeader/model_distortion_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/ShaderHeader/model_distortion_vs.h rename to Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/ShaderHeader/model_distortion_vs.h diff --git a/Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/ShaderHeader/model_lit_ps.h b/Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/ShaderHeader/model_lit_ps.h similarity index 100% rename from Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/ShaderHeader/model_lit_ps.h rename to Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/ShaderHeader/model_lit_ps.h diff --git a/Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/ShaderHeader/model_lit_vs.h b/Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/ShaderHeader/model_lit_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/ShaderHeader/model_lit_vs.h rename to Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/ShaderHeader/model_lit_vs.h diff --git a/Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/ShaderHeader/model_unlit_ps.h b/Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/ShaderHeader/model_unlit_ps.h similarity index 100% rename from Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/ShaderHeader/model_unlit_ps.h rename to Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/ShaderHeader/model_unlit_ps.h diff --git a/Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/ShaderHeader/model_unlit_vs.h b/Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/ShaderHeader/model_unlit_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/ShaderHeader/model_unlit_vs.h rename to Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/ShaderHeader/model_unlit_vs.h diff --git a/Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/ShaderHeader/sprite_distortion_vs.h b/Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/ShaderHeader/sprite_distortion_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/ShaderHeader/sprite_distortion_vs.h rename to Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/ShaderHeader/sprite_distortion_vs.h diff --git a/Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/ShaderHeader/sprite_lit_vs.h b/Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/ShaderHeader/sprite_lit_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/ShaderHeader/sprite_lit_vs.h rename to Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/ShaderHeader/sprite_lit_vs.h diff --git a/Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/ShaderHeader/sprite_unlit_vs.h b/Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/ShaderHeader/sprite_unlit_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/ShaderHeader/sprite_unlit_vs.h rename to Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/ShaderHeader/sprite_unlit_vs.h diff --git a/Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/compile_effect.bat b/Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/compile_effect.bat similarity index 100% rename from Dev/Cpp/EffekseerRendererDX9/EffekseerRenderer/compile_effect.bat rename to Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/compile_effect.bat diff --git a/Dev/Cpp/EffekseerRendererGL/CMakeLists.txt b/Dev/Cpp/EffekseerRendererGL/CMakeLists.txt index 6074670a4f..21f35ed259 100644 --- a/Dev/Cpp/EffekseerRendererGL/CMakeLists.txt +++ b/Dev/Cpp/EffekseerRendererGL/CMakeLists.txt @@ -19,20 +19,20 @@ set(LOCAL_SOURCES set(PublicHeaders EffekseerRendererGL.h - EffekseerRenderer/EffekseerRendererGL.Base.Pre.h - EffekseerRenderer/EffekseerRendererGL.Renderer.h) + EffekseerRendererGL/EffekseerRendererGL.Base.Pre.h + EffekseerRendererGL/EffekseerRendererGL.Renderer.h) #-------------------- # Projects add_library(${PROJECT_NAME} STATIC ${LOCAL_SOURCES}) -target_include_directories(${PROJECT_NAME} PRIVATE ${PROJECT_SOURCE_DIR}/../Effekseer ${EFK_THIRDPARTY_INCLUDES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${EFK_THIRDPARTY_INCLUDES}) set_target_properties(${PROJECT_NAME} PROPERTIES PUBLIC_HEADER "${PublicHeader}") target_link_libraries(${PROJECT_NAME} PUBLIC Effekseer EffekseerRendererCommon) target_include_directories(${PROJECT_NAME} PUBLIC $ - $ + $ ) if(CLANG_FORMAT_ENABLED) @@ -45,13 +45,12 @@ endif() foreach (file ${PublicHeaders}) get_filename_component(dir ${file} DIRECTORY) - install(FILES ${file} DESTINATION include/EffekseerRendererGL/${dir}) + install(FILES ${file} DESTINATION include/${dir}) endforeach() install( TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}-export - INCLUDES DESTINATION include/EffekseerRendererGL ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL.h b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL.h index 757290a62d..399e7b917f 100644 --- a/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL.h +++ b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL.h @@ -2,7 +2,7 @@ #ifndef __EFFEKSEERRENDERER_GL_H__ #define __EFFEKSEERRENDERER_GL_H__ -#include "EffekseerRenderer/EffekseerRendererGL.Base.Pre.h" -#include "EffekseerRenderer/EffekseerRendererGL.Renderer.h" +#include "EffekseerRendererGL/EffekseerRendererGL.Base.Pre.h" +#include "EffekseerRendererGL/EffekseerRendererGL.Renderer.h" #endif // __EFFEKSEERRENDERER_GL_H__ diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/EffekseerRendererGL.Base.Pre.h b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/EffekseerRendererGL.Base.Pre.h similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/EffekseerRendererGL.Base.Pre.h rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/EffekseerRendererGL.Base.Pre.h diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/EffekseerRendererGL.Base.h b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/EffekseerRendererGL.Base.h similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/EffekseerRendererGL.Base.h rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/EffekseerRendererGL.Base.h diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/EffekseerRendererGL.DeviceObject.cpp b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/EffekseerRendererGL.DeviceObject.cpp similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/EffekseerRendererGL.DeviceObject.cpp rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/EffekseerRendererGL.DeviceObject.cpp diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/EffekseerRendererGL.DeviceObject.h b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/EffekseerRendererGL.DeviceObject.h similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/EffekseerRendererGL.DeviceObject.h rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/EffekseerRendererGL.DeviceObject.h diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/EffekseerRendererGL.GLExtension.cpp b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/EffekseerRendererGL.GLExtension.cpp similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/EffekseerRendererGL.GLExtension.cpp rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/EffekseerRendererGL.GLExtension.cpp diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/EffekseerRendererGL.GLExtension.h b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/EffekseerRendererGL.GLExtension.h similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/EffekseerRendererGL.GLExtension.h rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/EffekseerRendererGL.GLExtension.h diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/EffekseerRendererGL.GPUTimer.cpp b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/EffekseerRendererGL.GPUTimer.cpp similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/EffekseerRendererGL.GPUTimer.cpp rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/EffekseerRendererGL.GPUTimer.cpp diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/EffekseerRendererGL.GPUTimer.h b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/EffekseerRendererGL.GPUTimer.h similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/EffekseerRendererGL.GPUTimer.h rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/EffekseerRendererGL.GPUTimer.h diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/EffekseerRendererGL.MaterialLoader.cpp b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/EffekseerRendererGL.MaterialLoader.cpp similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/EffekseerRendererGL.MaterialLoader.cpp rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/EffekseerRendererGL.MaterialLoader.cpp diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/EffekseerRendererGL.MaterialLoader.h b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/EffekseerRendererGL.MaterialLoader.h similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/EffekseerRendererGL.MaterialLoader.h rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/EffekseerRendererGL.MaterialLoader.h diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/EffekseerRendererGL.ModelRenderer.cpp b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/EffekseerRendererGL.ModelRenderer.cpp similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/EffekseerRendererGL.ModelRenderer.cpp rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/EffekseerRendererGL.ModelRenderer.cpp diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/EffekseerRendererGL.ModelRenderer.h b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/EffekseerRendererGL.ModelRenderer.h similarity index 96% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/EffekseerRendererGL.ModelRenderer.h rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/EffekseerRendererGL.ModelRenderer.h index 4ac8c4d190..796623cdf4 100644 --- a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/EffekseerRendererGL.ModelRenderer.h +++ b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/EffekseerRendererGL.ModelRenderer.h @@ -5,13 +5,13 @@ //---------------------------------------------------------------------------------- // Include //---------------------------------------------------------------------------------- -#include "../../EffekseerRendererCommon/EffekseerRenderer.ModelRendererBase.h" #include "EffekseerRendererGL.RendererImplemented.h" +#include //----------------------------------------------------------------------------------- // //----------------------------------------------------------------------------------- -//#define MODEL_SOFTWARE_INSTANCING +// #define MODEL_SOFTWARE_INSTANCING //----------------------------------------------------------------------------------- // diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/EffekseerRendererGL.RenderState.cpp b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/EffekseerRendererGL.RenderState.cpp similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/EffekseerRendererGL.RenderState.cpp rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/EffekseerRendererGL.RenderState.cpp diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/EffekseerRendererGL.RenderState.h b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/EffekseerRendererGL.RenderState.h similarity index 95% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/EffekseerRendererGL.RenderState.h rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/EffekseerRendererGL.RenderState.h index 912089dc7d..9b3ed57ad8 100644 --- a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/EffekseerRendererGL.RenderState.h +++ b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/EffekseerRendererGL.RenderState.h @@ -5,9 +5,9 @@ //---------------------------------------------------------------------------------- // Include //---------------------------------------------------------------------------------- -#include "../../EffekseerRendererCommon/EffekseerRenderer.RenderStateBase.h" #include "EffekseerRendererGL.Base.h" #include "EffekseerRendererGL.Renderer.h" +#include //----------------------------------------------------------------------------------- // diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/EffekseerRendererGL.Renderer.cpp b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/EffekseerRendererGL.Renderer.cpp similarity index 98% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/EffekseerRendererGL.Renderer.cpp rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/EffekseerRendererGL.Renderer.cpp index 76618f6603..189343da8d 100644 --- a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/EffekseerRendererGL.Renderer.cpp +++ b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/EffekseerRendererGL.Renderer.cpp @@ -14,13 +14,13 @@ #include "EffekseerRendererGL.GLExtension.h" -#include "../../EffekseerRendererCommon/EffekseerRenderer.Renderer_Impl.h" -#include "../../EffekseerRendererCommon/EffekseerRenderer.RibbonRendererBase.h" -#include "../../EffekseerRendererCommon/EffekseerRenderer.RingRendererBase.h" -#include "../../EffekseerRendererCommon/EffekseerRenderer.SpriteRendererBase.h" -#include "../../EffekseerRendererCommon/EffekseerRenderer.TrackRendererBase.h" -#include "../../EffekseerRendererCommon/ModelLoader.h" -#include "../../EffekseerRendererCommon/TextureLoader.h" +#include +#include +#include +#include +#include +#include +#include #include "ShaderHeader/ad_model_distortion_ps.h" #include "ShaderHeader/ad_model_lit_ps.h" diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/EffekseerRendererGL.Renderer.h b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/EffekseerRendererGL.Renderer.h similarity index 98% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/EffekseerRendererGL.Renderer.h rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/EffekseerRendererGL.Renderer.h index 84bdf9b88e..4fa11d06aa 100644 --- a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/EffekseerRendererGL.Renderer.h +++ b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/EffekseerRendererGL.Renderer.h @@ -5,7 +5,7 @@ //---------------------------------------------------------------------------------- // Include //---------------------------------------------------------------------------------- -#include "../../EffekseerRendererCommon/EffekseerRenderer.Renderer.h" +#include #include "EffekseerRendererGL.Base.h" //---------------------------------------------------------------------------------- diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/EffekseerRendererGL.RendererImplemented.h b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/EffekseerRendererGL.RendererImplemented.h similarity index 97% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/EffekseerRendererGL.RendererImplemented.h rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/EffekseerRendererGL.RendererImplemented.h index 3df487ccca..eb1aba7f23 100644 --- a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/EffekseerRendererGL.RendererImplemented.h +++ b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/EffekseerRendererGL.RendererImplemented.h @@ -5,11 +5,11 @@ //---------------------------------------------------------------------------------- // Include //---------------------------------------------------------------------------------- -#include "../../EffekseerRendererCommon/EffekseerRenderer.RenderStateBase.h" -#include "../../EffekseerRendererCommon/EffekseerRenderer.StandardRenderer.h" #include "EffekseerRendererGL.Base.h" #include "EffekseerRendererGL.Renderer.h" #include "GraphicsDevice.h" +#include +#include namespace EffekseerRendererGL { diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/EffekseerRendererGL.Shader.cpp b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/EffekseerRendererGL.Shader.cpp similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/EffekseerRendererGL.Shader.cpp rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/EffekseerRendererGL.Shader.cpp diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/EffekseerRendererGL.Shader.h b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/EffekseerRendererGL.Shader.h similarity index 98% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/EffekseerRendererGL.Shader.h rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/EffekseerRendererGL.Shader.h index 682df81422..63f0c274c9 100644 --- a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/EffekseerRendererGL.Shader.h +++ b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/EffekseerRendererGL.Shader.h @@ -8,7 +8,7 @@ #include "EffekseerRendererGL.DeviceObject.h" #include "EffekseerRendererGL.RendererImplemented.h" -#include "../../EffekseerRendererCommon/EffekseerRenderer.ShaderBase.h" +#include #include #include diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/GraphicsDevice.cpp b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/GraphicsDevice.cpp similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/GraphicsDevice.cpp rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/GraphicsDevice.cpp diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/GraphicsDevice.h b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/GraphicsDevice.h similarity index 99% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/GraphicsDevice.h rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/GraphicsDevice.h index 31ad0bedc0..eacc961db3 100644 --- a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/GraphicsDevice.h +++ b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/GraphicsDevice.h @@ -2,9 +2,9 @@ #ifndef __EFFEKSEERRENDERER_GL_GRAPHICS_DEVICE_H__ #define __EFFEKSEERRENDERER_GL_GRAPHICS_DEVICE_H__ -#include "../../EffekseerRendererCommon/EffekseerRenderer.CommonUtils.h" #include "EffekseerRendererGL.GLExtension.h" #include +#include #include #include #include diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/ShaderHeader/ad_model_distortion_ps.h b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/ShaderHeader/ad_model_distortion_ps.h similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/ShaderHeader/ad_model_distortion_ps.h rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/ShaderHeader/ad_model_distortion_ps.h diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/ShaderHeader/ad_model_distortion_vs.h b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/ShaderHeader/ad_model_distortion_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/ShaderHeader/ad_model_distortion_vs.h rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/ShaderHeader/ad_model_distortion_vs.h diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/ShaderHeader/ad_model_lit_ps.h b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/ShaderHeader/ad_model_lit_ps.h similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/ShaderHeader/ad_model_lit_ps.h rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/ShaderHeader/ad_model_lit_ps.h diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/ShaderHeader/ad_model_lit_vs.h b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/ShaderHeader/ad_model_lit_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/ShaderHeader/ad_model_lit_vs.h rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/ShaderHeader/ad_model_lit_vs.h diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/ShaderHeader/ad_model_unlit_ps.h b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/ShaderHeader/ad_model_unlit_ps.h similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/ShaderHeader/ad_model_unlit_ps.h rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/ShaderHeader/ad_model_unlit_ps.h diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/ShaderHeader/ad_model_unlit_vs.h b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/ShaderHeader/ad_model_unlit_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/ShaderHeader/ad_model_unlit_vs.h rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/ShaderHeader/ad_model_unlit_vs.h diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/ShaderHeader/ad_sprite_distortion_vs.h b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/ShaderHeader/ad_sprite_distortion_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/ShaderHeader/ad_sprite_distortion_vs.h rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/ShaderHeader/ad_sprite_distortion_vs.h diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/ShaderHeader/ad_sprite_lit_vs.h b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/ShaderHeader/ad_sprite_lit_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/ShaderHeader/ad_sprite_lit_vs.h rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/ShaderHeader/ad_sprite_lit_vs.h diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/ShaderHeader/ad_sprite_unlit_vs.h b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/ShaderHeader/ad_sprite_unlit_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/ShaderHeader/ad_sprite_unlit_vs.h rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/ShaderHeader/ad_sprite_unlit_vs.h diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/ShaderHeader/model_distortion_ps.h b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/ShaderHeader/model_distortion_ps.h similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/ShaderHeader/model_distortion_ps.h rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/ShaderHeader/model_distortion_ps.h diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/ShaderHeader/model_distortion_vs.h b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/ShaderHeader/model_distortion_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/ShaderHeader/model_distortion_vs.h rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/ShaderHeader/model_distortion_vs.h diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/ShaderHeader/model_lit_ps.h b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/ShaderHeader/model_lit_ps.h similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/ShaderHeader/model_lit_ps.h rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/ShaderHeader/model_lit_ps.h diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/ShaderHeader/model_lit_vs.h b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/ShaderHeader/model_lit_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/ShaderHeader/model_lit_vs.h rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/ShaderHeader/model_lit_vs.h diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/ShaderHeader/model_unlit_ps.h b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/ShaderHeader/model_unlit_ps.h similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/ShaderHeader/model_unlit_ps.h rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/ShaderHeader/model_unlit_ps.h diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/ShaderHeader/model_unlit_vs.h b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/ShaderHeader/model_unlit_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/ShaderHeader/model_unlit_vs.h rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/ShaderHeader/model_unlit_vs.h diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/ShaderHeader/sprite_distortion_vs.h b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/ShaderHeader/sprite_distortion_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/ShaderHeader/sprite_distortion_vs.h rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/ShaderHeader/sprite_distortion_vs.h diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/ShaderHeader/sprite_lit_vs.h b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/ShaderHeader/sprite_lit_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/ShaderHeader/sprite_lit_vs.h rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/ShaderHeader/sprite_lit_vs.h diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/ShaderHeader/sprite_unlit_vs.h b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/ShaderHeader/sprite_unlit_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/ShaderHeader/sprite_unlit_vs.h rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/ShaderHeader/sprite_unlit_vs.h diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_2/ad_model_distortion_ps.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_2/ad_model_distortion_ps.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_2/ad_model_distortion_ps.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_2/ad_model_distortion_ps.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_2/ad_model_distortion_vs.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_2/ad_model_distortion_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_2/ad_model_distortion_vs.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_2/ad_model_distortion_vs.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_2/ad_model_lit_ps.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_2/ad_model_lit_ps.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_2/ad_model_lit_ps.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_2/ad_model_lit_ps.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_2/ad_model_lit_vs.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_2/ad_model_lit_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_2/ad_model_lit_vs.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_2/ad_model_lit_vs.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_2/ad_model_unlit_ps.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_2/ad_model_unlit_ps.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_2/ad_model_unlit_ps.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_2/ad_model_unlit_ps.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_2/ad_model_unlit_vs.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_2/ad_model_unlit_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_2/ad_model_unlit_vs.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_2/ad_model_unlit_vs.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_2/ad_sprite_distortion_vs.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_2/ad_sprite_distortion_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_2/ad_sprite_distortion_vs.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_2/ad_sprite_distortion_vs.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_2/ad_sprite_lit_vs.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_2/ad_sprite_lit_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_2/ad_sprite_lit_vs.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_2/ad_sprite_lit_vs.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_2/ad_sprite_unlit_vs.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_2/ad_sprite_unlit_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_2/ad_sprite_unlit_vs.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_2/ad_sprite_unlit_vs.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_2/model_distortion_ps.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_2/model_distortion_ps.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_2/model_distortion_ps.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_2/model_distortion_ps.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_2/model_distortion_vs.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_2/model_distortion_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_2/model_distortion_vs.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_2/model_distortion_vs.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_2/model_lit_ps.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_2/model_lit_ps.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_2/model_lit_ps.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_2/model_lit_ps.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_2/model_lit_vs.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_2/model_lit_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_2/model_lit_vs.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_2/model_lit_vs.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_2/model_unlit_ps.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_2/model_unlit_ps.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_2/model_unlit_ps.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_2/model_unlit_ps.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_2/model_unlit_vs.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_2/model_unlit_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_2/model_unlit_vs.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_2/model_unlit_vs.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_2/sprite_distortion_vs.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_2/sprite_distortion_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_2/sprite_distortion_vs.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_2/sprite_distortion_vs.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_2/sprite_lit_vs.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_2/sprite_lit_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_2/sprite_lit_vs.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_2/sprite_lit_vs.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_2/sprite_unlit_vs.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_2/sprite_unlit_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_2/sprite_unlit_vs.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_2/sprite_unlit_vs.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_3/ad_model_distortion_ps.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_3/ad_model_distortion_ps.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_3/ad_model_distortion_ps.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_3/ad_model_distortion_ps.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_3/ad_model_distortion_vs.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_3/ad_model_distortion_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_3/ad_model_distortion_vs.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_3/ad_model_distortion_vs.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_3/ad_model_lit_ps.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_3/ad_model_lit_ps.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_3/ad_model_lit_ps.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_3/ad_model_lit_ps.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_3/ad_model_lit_vs.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_3/ad_model_lit_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_3/ad_model_lit_vs.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_3/ad_model_lit_vs.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_3/ad_model_unlit_ps.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_3/ad_model_unlit_ps.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_3/ad_model_unlit_ps.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_3/ad_model_unlit_ps.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_3/ad_model_unlit_vs.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_3/ad_model_unlit_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_3/ad_model_unlit_vs.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_3/ad_model_unlit_vs.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_3/ad_sprite_distortion_vs.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_3/ad_sprite_distortion_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_3/ad_sprite_distortion_vs.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_3/ad_sprite_distortion_vs.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_3/ad_sprite_lit_vs.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_3/ad_sprite_lit_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_3/ad_sprite_lit_vs.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_3/ad_sprite_lit_vs.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_3/ad_sprite_unlit_vs.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_3/ad_sprite_unlit_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_3/ad_sprite_unlit_vs.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_3/ad_sprite_unlit_vs.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_3/model_distortion_ps.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_3/model_distortion_ps.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_3/model_distortion_ps.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_3/model_distortion_ps.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_3/model_distortion_vs.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_3/model_distortion_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_3/model_distortion_vs.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_3/model_distortion_vs.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_3/model_lit_ps.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_3/model_lit_ps.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_3/model_lit_ps.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_3/model_lit_ps.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_3/model_lit_vs.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_3/model_lit_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_3/model_lit_vs.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_3/model_lit_vs.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_3/model_unlit_ps.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_3/model_unlit_ps.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_3/model_unlit_ps.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_3/model_unlit_ps.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_3/model_unlit_vs.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_3/model_unlit_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_3/model_unlit_vs.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_3/model_unlit_vs.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_3/sprite_distortion_vs.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_3/sprite_distortion_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_3/sprite_distortion_vs.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_3/sprite_distortion_vs.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_3/sprite_lit_vs.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_3/sprite_lit_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_3/sprite_lit_vs.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_3/sprite_lit_vs.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_3/sprite_unlit_vs.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_3/sprite_unlit_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_3/sprite_unlit_vs.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_3/sprite_unlit_vs.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES2/ad_model_distortion_ps.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES2/ad_model_distortion_ps.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES2/ad_model_distortion_ps.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES2/ad_model_distortion_ps.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES2/ad_model_distortion_vs.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES2/ad_model_distortion_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES2/ad_model_distortion_vs.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES2/ad_model_distortion_vs.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES2/ad_model_lit_ps.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES2/ad_model_lit_ps.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES2/ad_model_lit_ps.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES2/ad_model_lit_ps.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES2/ad_model_lit_vs.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES2/ad_model_lit_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES2/ad_model_lit_vs.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES2/ad_model_lit_vs.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES2/ad_model_unlit_ps.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES2/ad_model_unlit_ps.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES2/ad_model_unlit_ps.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES2/ad_model_unlit_ps.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES2/ad_model_unlit_vs.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES2/ad_model_unlit_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES2/ad_model_unlit_vs.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES2/ad_model_unlit_vs.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES2/ad_sprite_distortion_vs.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES2/ad_sprite_distortion_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES2/ad_sprite_distortion_vs.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES2/ad_sprite_distortion_vs.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES2/ad_sprite_lit_vs.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES2/ad_sprite_lit_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES2/ad_sprite_lit_vs.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES2/ad_sprite_lit_vs.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES2/ad_sprite_unlit_vs.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES2/ad_sprite_unlit_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES2/ad_sprite_unlit_vs.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES2/ad_sprite_unlit_vs.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES2/model_distortion_ps.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES2/model_distortion_ps.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES2/model_distortion_ps.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES2/model_distortion_ps.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES2/model_distortion_vs.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES2/model_distortion_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES2/model_distortion_vs.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES2/model_distortion_vs.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES2/model_lit_ps.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES2/model_lit_ps.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES2/model_lit_ps.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES2/model_lit_ps.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES2/model_lit_vs.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES2/model_lit_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES2/model_lit_vs.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES2/model_lit_vs.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES2/model_unlit_ps.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES2/model_unlit_ps.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES2/model_unlit_ps.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES2/model_unlit_ps.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES2/model_unlit_vs.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES2/model_unlit_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES2/model_unlit_vs.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES2/model_unlit_vs.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES2/sprite_distortion_vs.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES2/sprite_distortion_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES2/sprite_distortion_vs.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES2/sprite_distortion_vs.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES2/sprite_lit_vs.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES2/sprite_lit_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES2/sprite_lit_vs.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES2/sprite_lit_vs.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES2/sprite_unlit_vs.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES2/sprite_unlit_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES2/sprite_unlit_vs.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES2/sprite_unlit_vs.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES3/ad_model_distortion_ps.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES3/ad_model_distortion_ps.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES3/ad_model_distortion_ps.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES3/ad_model_distortion_ps.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES3/ad_model_distortion_vs.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES3/ad_model_distortion_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES3/ad_model_distortion_vs.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES3/ad_model_distortion_vs.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES3/ad_model_lit_ps.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES3/ad_model_lit_ps.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES3/ad_model_lit_ps.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES3/ad_model_lit_ps.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES3/ad_model_lit_vs.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES3/ad_model_lit_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES3/ad_model_lit_vs.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES3/ad_model_lit_vs.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES3/ad_model_unlit_ps.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES3/ad_model_unlit_ps.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES3/ad_model_unlit_ps.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES3/ad_model_unlit_ps.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES3/ad_model_unlit_vs.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES3/ad_model_unlit_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES3/ad_model_unlit_vs.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES3/ad_model_unlit_vs.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES3/ad_sprite_distortion_vs.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES3/ad_sprite_distortion_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES3/ad_sprite_distortion_vs.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES3/ad_sprite_distortion_vs.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES3/ad_sprite_lit_vs.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES3/ad_sprite_lit_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES3/ad_sprite_lit_vs.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES3/ad_sprite_lit_vs.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES3/ad_sprite_unlit_vs.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES3/ad_sprite_unlit_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES3/ad_sprite_unlit_vs.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES3/ad_sprite_unlit_vs.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES3/model_distortion_ps.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES3/model_distortion_ps.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES3/model_distortion_ps.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES3/model_distortion_ps.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES3/model_distortion_vs.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES3/model_distortion_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES3/model_distortion_vs.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES3/model_distortion_vs.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES3/model_lit_ps.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES3/model_lit_ps.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES3/model_lit_ps.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES3/model_lit_ps.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES3/model_lit_vs.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES3/model_lit_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES3/model_lit_vs.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES3/model_lit_vs.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES3/model_unlit_ps.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES3/model_unlit_ps.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES3/model_unlit_ps.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES3/model_unlit_ps.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES3/model_unlit_vs.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES3/model_unlit_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES3/model_unlit_vs.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES3/model_unlit_vs.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES3/sprite_distortion_vs.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES3/sprite_distortion_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES3/sprite_distortion_vs.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES3/sprite_distortion_vs.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES3/sprite_lit_vs.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES3/sprite_lit_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES3/sprite_lit_vs.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES3/sprite_lit_vs.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES3/sprite_unlit_vs.fx b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES3/sprite_unlit_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/Shader_ES3/sprite_unlit_vs.fx rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/Shader_ES3/sprite_unlit_vs.fx diff --git a/Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/combine_shader.py b/Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/combine_shader.py similarity index 100% rename from Dev/Cpp/EffekseerRendererGL/EffekseerRenderer/combine_shader.py rename to Dev/Cpp/EffekseerRendererGL/EffekseerRendererGL/combine_shader.py diff --git a/Dev/Cpp/EffekseerRendererLLGI/CMakeLists.txt b/Dev/Cpp/EffekseerRendererLLGI/CMakeLists.txt index f17958755c..d314719b3b 100644 --- a/Dev/Cpp/EffekseerRendererLLGI/CMakeLists.txt +++ b/Dev/Cpp/EffekseerRendererLLGI/CMakeLists.txt @@ -2,29 +2,29 @@ cmake_minimum_required(VERSION 3.15) project(EffekseerRendererLLGI) set(PublicHeaders - Common.h + EffekseerRendererLLGI/Common.h ) set(LocalHeaders - EffekseerRendererLLGI.Base.h - EffekseerRendererLLGI.Base.Pre.h - EffekseerRendererLLGI.MaterialLoader.h - EffekseerRendererLLGI.ModelRenderer.h - EffekseerRendererLLGI.Renderer.h - EffekseerRendererLLGI.RendererImplemented.h - EffekseerRendererLLGI.RenderState.h - EffekseerRendererLLGI.Shader.h - GraphicsDevice.h + EffekseerRendererLLGI/EffekseerRendererLLGI.Base.h + EffekseerRendererLLGI/EffekseerRendererLLGI.Base.Pre.h + EffekseerRendererLLGI/EffekseerRendererLLGI.MaterialLoader.h + EffekseerRendererLLGI/EffekseerRendererLLGI.ModelRenderer.h + EffekseerRendererLLGI/EffekseerRendererLLGI.Renderer.h + EffekseerRendererLLGI/EffekseerRendererLLGI.RendererImplemented.h + EffekseerRendererLLGI/EffekseerRendererLLGI.RenderState.h + EffekseerRendererLLGI/EffekseerRendererLLGI.Shader.h + EffekseerRendererLLGI/GraphicsDevice.h ) set(LocalSources - Common.cpp - EffekseerRendererLLGI.MaterialLoader.cpp - EffekseerRendererLLGI.ModelRenderer.cpp - EffekseerRendererLLGI.Renderer.cpp - EffekseerRendererLLGI.RenderState.cpp - EffekseerRendererLLGI.Shader.cpp - GraphicsDevice.cpp + EffekseerRendererLLGI/Common.cpp + EffekseerRendererLLGI/EffekseerRendererLLGI.MaterialLoader.cpp + EffekseerRendererLLGI/EffekseerRendererLLGI.ModelRenderer.cpp + EffekseerRendererLLGI/EffekseerRendererLLGI.Renderer.cpp + EffekseerRendererLLGI/EffekseerRendererLLGI.RenderState.cpp + EffekseerRendererLLGI/EffekseerRendererLLGI.Shader.cpp + EffekseerRendererLLGI/GraphicsDevice.cpp ) FilterFolder("${PublicHeaders}") @@ -32,12 +32,12 @@ FilterFolder("${LocalHeaders}") FilterFolder("${LocalSources}") add_library(${PROJECT_NAME} STATIC ${PublicHeaders} ${LocalHeaders} ${LocalSources}) -target_include_directories(${PROJECT_NAME} PRIVATE ${PROJECT_SOURCE_DIR}/../Effekseer ${CMAKE_CURRENT_LIST_DIR}/../3rdparty/LLGI/src ${EFK_THIRDPARTY_INCLUDES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/../3rdparty/LLGI/src ${EFK_THIRDPARTY_INCLUDES}) target_link_libraries(${PROJECT_NAME} PUBLIC Effekseer EffekseerRendererCommon LLGI) target_include_directories(${PROJECT_NAME} PUBLIC $ - $ + $ ) WarnError(${PROJECT_NAME}) @@ -48,13 +48,12 @@ set_target_properties( foreach (file ${PublicHeaders}) get_filename_component(dir ${file} DIRECTORY) - install(FILES ${file} DESTINATION include/EffekseerRendererLLGI/${dir}) + install(FILES ${file} DESTINATION include/${dir}) endforeach() install( TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}-export - INCLUDES DESTINATION include/EffekseerRendererLLGI ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) diff --git a/Dev/Cpp/EffekseerRendererLLGI/Common.cpp b/Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI/Common.cpp similarity index 100% rename from Dev/Cpp/EffekseerRendererLLGI/Common.cpp rename to Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI/Common.cpp diff --git a/Dev/Cpp/EffekseerRendererLLGI/Common.h b/Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI/Common.h similarity index 93% rename from Dev/Cpp/EffekseerRendererLLGI/Common.h rename to Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI/Common.h index 7bfa1dfeec..10a0395a2a 100644 --- a/Dev/Cpp/EffekseerRendererLLGI/Common.h +++ b/Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI/Common.h @@ -3,7 +3,7 @@ #define __EFFEKSEERRENDERER_LLGI_COMMON_H__ #include -#include +#include namespace EffekseerRenderer { diff --git a/Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI.Base.Pre.h b/Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI/EffekseerRendererLLGI.Base.Pre.h similarity index 100% rename from Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI.Base.Pre.h rename to Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI/EffekseerRendererLLGI.Base.Pre.h diff --git a/Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI.Base.h b/Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI/EffekseerRendererLLGI.Base.h similarity index 100% rename from Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI.Base.h rename to Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI/EffekseerRendererLLGI.Base.h diff --git a/Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI.MaterialLoader.cpp b/Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI/EffekseerRendererLLGI.MaterialLoader.cpp similarity index 100% rename from Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI.MaterialLoader.cpp rename to Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI/EffekseerRendererLLGI.MaterialLoader.cpp diff --git a/Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI.MaterialLoader.h b/Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI/EffekseerRendererLLGI.MaterialLoader.h similarity index 100% rename from Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI.MaterialLoader.h rename to Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI/EffekseerRendererLLGI.MaterialLoader.h diff --git a/Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI.ModelRenderer.cpp b/Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI/EffekseerRendererLLGI.ModelRenderer.cpp similarity index 100% rename from Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI.ModelRenderer.cpp rename to Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI/EffekseerRendererLLGI.ModelRenderer.cpp diff --git a/Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI.ModelRenderer.h b/Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI/EffekseerRendererLLGI.ModelRenderer.h similarity index 95% rename from Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI.ModelRenderer.h rename to Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI/EffekseerRendererLLGI.ModelRenderer.h index 3d4d8e8a88..cb522d971b 100644 --- a/Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI.ModelRenderer.h +++ b/Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI/EffekseerRendererLLGI.ModelRenderer.h @@ -2,8 +2,8 @@ #ifndef __EFFEKSEERRENDERER_LLGI_MODEL_RENDERER_H__ #define __EFFEKSEERRENDERER_LLGI_MODEL_RENDERER_H__ -#include "../EffekseerRendererCommon/EffekseerRenderer.ModelRendererBase.h" #include "EffekseerRendererLLGI.RendererImplemented.h" +#include #include #include diff --git a/Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI.RenderState.cpp b/Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI/EffekseerRendererLLGI.RenderState.cpp similarity index 100% rename from Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI.RenderState.cpp rename to Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI/EffekseerRendererLLGI.RenderState.cpp diff --git a/Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI.RenderState.h b/Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI/EffekseerRendererLLGI.RenderState.h similarity index 91% rename from Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI.RenderState.h rename to Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI/EffekseerRendererLLGI.RenderState.h index c9947cb2e5..373ee7def6 100644 --- a/Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI.RenderState.h +++ b/Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI/EffekseerRendererLLGI.RenderState.h @@ -2,9 +2,9 @@ #ifndef __EFFEKSEERRENDERER_LLGI_RENDERSTATE_H__ #define __EFFEKSEERRENDERER_LLGI_RENDERSTATE_H__ -#include "../EffekseerRendererCommon/EffekseerRenderer.RenderStateBase.h" #include "EffekseerRendererLLGI.Base.h" #include "EffekseerRendererLLGI.RendererImplemented.h" +#include namespace EffekseerRendererLLGI { diff --git a/Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI.Renderer.cpp b/Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI/EffekseerRendererLLGI.Renderer.cpp similarity index 98% rename from Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI.Renderer.cpp rename to Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI/EffekseerRendererLLGI.Renderer.cpp index 36217de6ad..b305fcd8f7 100644 --- a/Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI.Renderer.cpp +++ b/Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI/EffekseerRendererLLGI.Renderer.cpp @@ -8,12 +8,12 @@ #include "EffekseerRendererLLGI.ModelRenderer.h" #include "EffekseerRendererLLGI.Shader.h" -#include "../EffekseerRendererCommon/EffekseerRenderer.RibbonRendererBase.h" -#include "../EffekseerRendererCommon/EffekseerRenderer.RingRendererBase.h" -#include "../EffekseerRendererCommon/EffekseerRenderer.SpriteRendererBase.h" -#include "../EffekseerRendererCommon/EffekseerRenderer.TrackRendererBase.h" -#include "../EffekseerRendererCommon/ModelLoader.h" -#include "../EffekseerRendererCommon/TextureLoader.h" +#include +#include +#include +#include +#include +#include #include diff --git a/Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI.Renderer.h b/Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI/EffekseerRendererLLGI.Renderer.h similarity index 98% rename from Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI.Renderer.h rename to Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI/EffekseerRendererLLGI.Renderer.h index 05aab5a0b9..46bb59c963 100644 --- a/Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI.Renderer.h +++ b/Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI/EffekseerRendererLLGI.Renderer.h @@ -2,8 +2,8 @@ #ifndef __EFFEKSEERRENDERER_LLGI_RENDERER_H__ #define __EFFEKSEERRENDERER_LLGI_RENDERER_H__ -#include "../EffekseerRendererCommon/EffekseerRenderer.Renderer.h" #include "EffekseerRendererLLGI.Base.h" +#include #include "GraphicsDevice.h" #include diff --git a/Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI.RendererImplemented.h b/Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI/EffekseerRendererLLGI.RendererImplemented.h similarity index 93% rename from Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI.RendererImplemented.h rename to Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI/EffekseerRendererLLGI.RendererImplemented.h index a8ed023ce2..ec4c6002bd 100644 --- a/Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI.RendererImplemented.h +++ b/Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI/EffekseerRendererLLGI.RendererImplemented.h @@ -1,221 +1,221 @@ - -#ifndef __EFFEKSEERRENDERER_LLGI_RENDERER_IMPLEMENTED_H__ -#define __EFFEKSEERRENDERER_LLGI_RENDERER_IMPLEMENTED_H__ - -#include "../EffekseerRendererCommon/EffekseerRenderer.CommonUtils.h" -#include "../EffekseerRendererCommon/EffekseerRenderer.RenderStateBase.h" -#include "../EffekseerRendererCommon/EffekseerRenderer.StandardRenderer.h" -#include "EffekseerRendererLLGI.Base.h" -#include "EffekseerRendererLLGI.Renderer.h" -#include -#include -#include -#include - -namespace EffekseerRendererLLGI -{ - -using Vertex = EffekseerRenderer::SimpleVertex; -// using VertexDistortion = EffekseerRenderer::VertexDistortion; - -class PiplineStateKey -{ -public: - Shader* shader = nullptr; - EffekseerRenderer::RenderStateBase::State state; - LLGI::TopologyType topologyType; - LLGI::RenderPassPipelineState* renderPassPipelineState = nullptr; - bool operator<(const PiplineStateKey& v) const; -}; - -LLGI::TextureFormatType ConvertTextureFormat(Effekseer::Backend::TextureFormatType format); - -class RendererImplemented : public Renderer, public ::Effekseer::ReferenceObject -{ - friend class DeviceObject; - -protected: - std::map piplineStates_; - LLGI::Buffer* currentVertexBuffer_ = nullptr; - int32_t currentVertexBufferStride_ = 0; - LLGI::TopologyType currentTopologyType_ = LLGI::TopologyType::Triangle; - - std::unordered_map, LLGI::RenderPassPipelineStateKey::Hash> renderpassPipelineStates_; - - // TODO - /** - Create constants and copy - Shader - */ - - Backend::GraphicsDeviceRef graphicsDevice_ = nullptr; - std::shared_ptr currentRenderPassPipelineState_ = nullptr; - - Effekseer::Backend::IndexBufferRef currentndexBuffer_; - Effekseer::Backend::IndexBufferRef indexBuffer_; - Effekseer::Backend::IndexBufferRef indexBufferForWireframe_; - int32_t m_squareMaxCount; - Shader* currentShader = nullptr; - - bool isReversedDepth_ = false; - - EffekseerRenderer::StandardRenderer* m_standardRenderer; - - ::Effekseer::CoordinateSystem m_coordinateSystem; - - ::EffekseerRenderer::RenderStateBase* m_renderState; - - std::set m_deviceObjects; - - EffekseerRenderer::DistortingCallback* m_distortingCallback; - - ::Effekseer::Backend::TextureRef m_backgroundLLGI; - - Effekseer::RenderMode m_renderMode = Effekseer::RenderMode::Normal; - - Effekseer::RefPtr commandList_ = nullptr; - - LLGI::CommandList* GetCurrentCommandList(); - - LLGI::PipelineState* GetOrCreatePiplineState(); - -public: - //! shaders (todo implemented) - FixedShader fixedShader_; - - ::Effekseer::CompiledMaterialPlatformType platformType_; - - ::Effekseer::MaterialCompiler* materialCompiler_ = nullptr; - - RendererImplemented(int32_t squareMaxCount); - - ~RendererImplemented(); - - void OnLostDevice() override; - - void OnResetDevice() override; - - bool Initialize(Backend::GraphicsDeviceRef graphicsDevice, LLGI::RenderPassPipelineStateKey key, bool isReversedDepth); - - bool Initialize(LLGI::Graphics* graphics, LLGI::RenderPassPipelineStateKey key, bool isReversedDepth); - - void SetRestorationOfStatesFlag(bool flag) override; - - void ChangeRenderPassPipelineState(LLGI::RenderPassPipelineStateKey key); - - bool BeginRendering() override; - - bool EndRendering() override; - - void SetCommandList(Effekseer::RefPtr commandList) override; - - Effekseer::Backend::GraphicsDeviceRef GetGraphicsDevice() const override - { - return graphicsDevice_; - } - - Backend::GraphicsDeviceRef& GetGraphicsDeviceInternal() - { - return graphicsDevice_; - } - - LLGI::Graphics* GetGraphics() const override - { - return graphicsDevice_->GetGraphics(); - } - - Effekseer::Backend::IndexBufferRef GetIndexBuffer(); - - /** - @brief 最大描画スプライト数 - */ - int32_t GetSquareMaxCount() const override; - - ::EffekseerRenderer::RenderStateBase* GetRenderState(); - - /** - @brief スプライトレンダラーを生成する。 - */ - ::Effekseer::SpriteRendererRef CreateSpriteRenderer() override; - - /** - @brief リボンレンダラーを生成する。 - */ - ::Effekseer::RibbonRendererRef CreateRibbonRenderer() override; - - /** - @brief リングレンダラーを生成する。 - */ - ::Effekseer::RingRendererRef CreateRingRenderer() override; - - /** - @brief モデルレンダラーを生成する。 - */ - ::Effekseer::ModelRendererRef CreateModelRenderer() override; - - /** - @brief 軌跡レンダラーを生成する。 - */ - ::Effekseer::TrackRendererRef CreateTrackRenderer() override; - - /** - @brief テクスチャ読込クラスを生成する。 - */ - ::Effekseer::TextureLoaderRef CreateTextureLoader(::Effekseer::FileInterfaceRef fileInterface = nullptr) override; - - /** - @brief モデル読込クラスを生成する。 - */ - ::Effekseer::ModelLoaderRef CreateModelLoader(::Effekseer::FileInterfaceRef fileInterface = nullptr) override; - - ::Effekseer::MaterialLoaderRef CreateMaterialLoader(::Effekseer::FileInterfaceRef fileInterface = nullptr) override; - - void SetBackgroundInternal(LLGI::Texture* background); - - EffekseerRenderer::DistortingCallback* GetDistortingCallback() override; - - void SetDistortingCallback(EffekseerRenderer::DistortingCallback* callback) override; - - EffekseerRenderer::StandardRenderer* GetStandardRenderer() - { - return m_standardRenderer; - } - - void SetVertexBuffer(LLGI::Buffer* vertexBuffer, int32_t stride); - - void SetVertexBuffer(const Effekseer::Backend::VertexBufferRef& vertexBuffer, int32_t stride); - void SetIndexBuffer(const Effekseer::Backend::IndexBufferRef& indexBuffer); - - void SetLayout(Shader* shader); - void DrawSprites(int32_t spriteCount, int32_t vertexOffset); - void DrawPolygon(int32_t vertexCount, int32_t indexCount); - void DrawPolygonInstanced(int32_t vertexCount, int32_t indexCount, int32_t instanceCount); - - void BeginShader(Shader* shader); - void EndShader(Shader* shader); - - void SetVertexBufferToShader(const void* data, int32_t size, int32_t dstOffset); - - void SetPixelBufferToShader(const void* data, int32_t size, int32_t dstOffset); - - void SetTextures(Shader* shader, Effekseer::Backend::TextureRef* textures, int32_t count); - - void ResetRenderState() override; - - virtual int GetRef() override - { - return ::Effekseer::ReferenceObject::GetRef(); - } - virtual int AddRef() override - { - return ::Effekseer::ReferenceObject::AddRef(); - } - virtual int Release() override - { - return ::Effekseer::ReferenceObject::Release(); - } -}; - -} // namespace EffekseerRendererLLGI - -#endif // __EFFEKSEERRENDERER_LLGI_RENDERER_IMPLEMENTED_H__ + +#ifndef __EFFEKSEERRENDERER_LLGI_RENDERER_IMPLEMENTED_H__ +#define __EFFEKSEERRENDERER_LLGI_RENDERER_IMPLEMENTED_H__ + +#include "EffekseerRendererLLGI.Base.h" +#include "EffekseerRendererLLGI.Renderer.h" +#include +#include +#include +#include +#include +#include +#include + +namespace EffekseerRendererLLGI +{ + +using Vertex = EffekseerRenderer::SimpleVertex; +// using VertexDistortion = EffekseerRenderer::VertexDistortion; + +class PiplineStateKey +{ +public: + Shader* shader = nullptr; + EffekseerRenderer::RenderStateBase::State state; + LLGI::TopologyType topologyType; + LLGI::RenderPassPipelineState* renderPassPipelineState = nullptr; + bool operator<(const PiplineStateKey& v) const; +}; + +LLGI::TextureFormatType ConvertTextureFormat(Effekseer::Backend::TextureFormatType format); + +class RendererImplemented : public Renderer, public ::Effekseer::ReferenceObject +{ + friend class DeviceObject; + +protected: + std::map piplineStates_; + LLGI::Buffer* currentVertexBuffer_ = nullptr; + int32_t currentVertexBufferStride_ = 0; + LLGI::TopologyType currentTopologyType_ = LLGI::TopologyType::Triangle; + + std::unordered_map, LLGI::RenderPassPipelineStateKey::Hash> renderpassPipelineStates_; + + // TODO + /** + Create constants and copy + Shader + */ + + Backend::GraphicsDeviceRef graphicsDevice_ = nullptr; + std::shared_ptr currentRenderPassPipelineState_ = nullptr; + + Effekseer::Backend::IndexBufferRef currentndexBuffer_; + Effekseer::Backend::IndexBufferRef indexBuffer_; + Effekseer::Backend::IndexBufferRef indexBufferForWireframe_; + int32_t m_squareMaxCount; + Shader* currentShader = nullptr; + + bool isReversedDepth_ = false; + + EffekseerRenderer::StandardRenderer* m_standardRenderer; + + ::Effekseer::CoordinateSystem m_coordinateSystem; + + ::EffekseerRenderer::RenderStateBase* m_renderState; + + std::set m_deviceObjects; + + EffekseerRenderer::DistortingCallback* m_distortingCallback; + + ::Effekseer::Backend::TextureRef m_backgroundLLGI; + + Effekseer::RenderMode m_renderMode = Effekseer::RenderMode::Normal; + + Effekseer::RefPtr commandList_ = nullptr; + + LLGI::CommandList* GetCurrentCommandList(); + + LLGI::PipelineState* GetOrCreatePiplineState(); + +public: + //! shaders (todo implemented) + FixedShader fixedShader_; + + ::Effekseer::CompiledMaterialPlatformType platformType_; + + ::Effekseer::MaterialCompiler* materialCompiler_ = nullptr; + + RendererImplemented(int32_t squareMaxCount); + + ~RendererImplemented(); + + void OnLostDevice() override; + + void OnResetDevice() override; + + bool Initialize(Backend::GraphicsDeviceRef graphicsDevice, LLGI::RenderPassPipelineStateKey key, bool isReversedDepth); + + bool Initialize(LLGI::Graphics* graphics, LLGI::RenderPassPipelineStateKey key, bool isReversedDepth); + + void SetRestorationOfStatesFlag(bool flag) override; + + void ChangeRenderPassPipelineState(LLGI::RenderPassPipelineStateKey key); + + bool BeginRendering() override; + + bool EndRendering() override; + + void SetCommandList(Effekseer::RefPtr commandList) override; + + Effekseer::Backend::GraphicsDeviceRef GetGraphicsDevice() const override + { + return graphicsDevice_; + } + + Backend::GraphicsDeviceRef& GetGraphicsDeviceInternal() + { + return graphicsDevice_; + } + + LLGI::Graphics* GetGraphics() const override + { + return graphicsDevice_->GetGraphics(); + } + + Effekseer::Backend::IndexBufferRef GetIndexBuffer(); + + /** + @brief 最大描画スプライト数 + */ + int32_t GetSquareMaxCount() const override; + + ::EffekseerRenderer::RenderStateBase* GetRenderState(); + + /** + @brief スプライトレンダラーを生成する。 + */ + ::Effekseer::SpriteRendererRef CreateSpriteRenderer() override; + + /** + @brief リボンレンダラーを生成する。 + */ + ::Effekseer::RibbonRendererRef CreateRibbonRenderer() override; + + /** + @brief リングレンダラーを生成する。 + */ + ::Effekseer::RingRendererRef CreateRingRenderer() override; + + /** + @brief モデルレンダラーを生成する。 + */ + ::Effekseer::ModelRendererRef CreateModelRenderer() override; + + /** + @brief 軌跡レンダラーを生成する。 + */ + ::Effekseer::TrackRendererRef CreateTrackRenderer() override; + + /** + @brief テクスチャ読込クラスを生成する。 + */ + ::Effekseer::TextureLoaderRef CreateTextureLoader(::Effekseer::FileInterfaceRef fileInterface = nullptr) override; + + /** + @brief モデル読込クラスを生成する。 + */ + ::Effekseer::ModelLoaderRef CreateModelLoader(::Effekseer::FileInterfaceRef fileInterface = nullptr) override; + + ::Effekseer::MaterialLoaderRef CreateMaterialLoader(::Effekseer::FileInterfaceRef fileInterface = nullptr) override; + + void SetBackgroundInternal(LLGI::Texture* background); + + EffekseerRenderer::DistortingCallback* GetDistortingCallback() override; + + void SetDistortingCallback(EffekseerRenderer::DistortingCallback* callback) override; + + EffekseerRenderer::StandardRenderer* GetStandardRenderer() + { + return m_standardRenderer; + } + + void SetVertexBuffer(LLGI::Buffer* vertexBuffer, int32_t stride); + + void SetVertexBuffer(const Effekseer::Backend::VertexBufferRef& vertexBuffer, int32_t stride); + void SetIndexBuffer(const Effekseer::Backend::IndexBufferRef& indexBuffer); + + void SetLayout(Shader* shader); + void DrawSprites(int32_t spriteCount, int32_t vertexOffset); + void DrawPolygon(int32_t vertexCount, int32_t indexCount); + void DrawPolygonInstanced(int32_t vertexCount, int32_t indexCount, int32_t instanceCount); + + void BeginShader(Shader* shader); + void EndShader(Shader* shader); + + void SetVertexBufferToShader(const void* data, int32_t size, int32_t dstOffset); + + void SetPixelBufferToShader(const void* data, int32_t size, int32_t dstOffset); + + void SetTextures(Shader* shader, Effekseer::Backend::TextureRef* textures, int32_t count); + + void ResetRenderState() override; + + virtual int GetRef() override + { + return ::Effekseer::ReferenceObject::GetRef(); + } + virtual int AddRef() override + { + return ::Effekseer::ReferenceObject::AddRef(); + } + virtual int Release() override + { + return ::Effekseer::ReferenceObject::Release(); + } +}; + +} // namespace EffekseerRendererLLGI + +#endif // __EFFEKSEERRENDERER_LLGI_RENDERER_IMPLEMENTED_H__ diff --git a/Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI.Shader.cpp b/Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI/EffekseerRendererLLGI.Shader.cpp similarity index 100% rename from Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI.Shader.cpp rename to Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI/EffekseerRendererLLGI.Shader.cpp diff --git a/Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI.Shader.h b/Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI/EffekseerRendererLLGI.Shader.h similarity index 96% rename from Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI.Shader.h rename to Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI/EffekseerRendererLLGI.Shader.h index e77ee4d33c..8726a0c802 100644 --- a/Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI.Shader.h +++ b/Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI/EffekseerRendererLLGI.Shader.h @@ -2,8 +2,8 @@ #ifndef __EFFEKSEERRENDERER_LLGI_SHADER_H__ #define __EFFEKSEERRENDERER_LLGI_SHADER_H__ -#include "../EffekseerRendererCommon/EffekseerRenderer.ShaderBase.h" #include "GraphicsDevice.h" +#include namespace EffekseerRendererLLGI { diff --git a/Dev/Cpp/EffekseerRendererLLGI/GraphicsDevice.cpp b/Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI/GraphicsDevice.cpp similarity index 100% rename from Dev/Cpp/EffekseerRendererLLGI/GraphicsDevice.cpp rename to Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI/GraphicsDevice.cpp diff --git a/Dev/Cpp/EffekseerRendererLLGI/GraphicsDevice.h b/Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI/GraphicsDevice.h similarity index 100% rename from Dev/Cpp/EffekseerRendererLLGI/GraphicsDevice.h rename to Dev/Cpp/EffekseerRendererLLGI/EffekseerRendererLLGI/GraphicsDevice.h diff --git a/Dev/Cpp/EffekseerRendererMetal/CMakeLists.txt b/Dev/Cpp/EffekseerRendererMetal/CMakeLists.txt index 107e60af14..8067ddbc9b 100644 --- a/Dev/Cpp/EffekseerRendererMetal/CMakeLists.txt +++ b/Dev/Cpp/EffekseerRendererMetal/CMakeLists.txt @@ -29,20 +29,20 @@ set(LOCAL_SOURCES set(PublicHeaders EffekseerRendererMetal.h - EffekseerRenderer/EffekseerRendererMetal.Base.Pre.h - EffekseerRenderer/EffekseerRendererMetal.Renderer.h) + EffekseerRendererMetal/EffekseerRendererMetal.Base.Pre.h + EffekseerRendererMetal/EffekseerRendererMetal.Renderer.h) #-------------------- # Projects add_library(${PROJECT_NAME} STATIC ${LOCAL_SOURCES}) -target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/../Effekseer ${CMAKE_CURRENT_LIST_DIR}/../3rdparty/LLGI/src ${EFK_THIRDPARTY_INCLUDES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/../3rdparty/LLGI/src ${EFK_THIRDPARTY_INCLUDES}) set_target_properties(${PROJECT_NAME} PROPERTIES PUBLIC_HEADER "${PublicHeaders}") target_link_libraries(${PROJECT_NAME} PUBLIC Effekseer EffekseerRendererCommon EffekseerRendererLLGI LLGI) target_include_directories(${PROJECT_NAME} PUBLIC $ - $) + $) if(CLANG_FORMAT_ENABLED) clang_format(${PROJECT_NAME}) @@ -55,13 +55,12 @@ endif() foreach (file ${PublicHeaders}) get_filename_component(dir ${file} DIRECTORY) - install(FILES ${file} DESTINATION include/EffekseerRendererMetal/${dir}) + install(FILES ${file} DESTINATION include/${dir}) endforeach() install( TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}-export - INCLUDES DESTINATION include/EffekseerRendererMetal ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) diff --git a/Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal.h b/Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal.h index b08d88a96c..a9731f3134 100644 --- a/Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal.h +++ b/Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal.h @@ -2,8 +2,8 @@ #ifndef __EFFEKSEERRENDERER_METAL_H__ #define __EFFEKSEERRENDERER_METAL_H__ -#include "EffekseerRenderer/EffekseerRendererMetal.Base.Pre.h" -#include "EffekseerRenderer/EffekseerRendererMetal.Renderer.h" -#include +#include "EffekseerRendererMetal/EffekseerRendererMetal.Base.Pre.h" +#include "EffekseerRendererMetal/EffekseerRendererMetal.Renderer.h" +#include #endif // __EFFEKSEERRENDERER_METAL_H__ diff --git a/Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/EffekseerRendererMetal.Base.Pre.h b/Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/EffekseerRendererMetal.Base.Pre.h similarity index 100% rename from Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/EffekseerRendererMetal.Base.Pre.h rename to Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/EffekseerRendererMetal.Base.Pre.h diff --git a/Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/EffekseerRendererMetal.Base.h b/Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/EffekseerRendererMetal.Base.h similarity index 100% rename from Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/EffekseerRendererMetal.Base.h rename to Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/EffekseerRendererMetal.Base.h diff --git a/Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/EffekseerRendererMetal.Renderer.h b/Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/EffekseerRendererMetal.Renderer.h similarity index 100% rename from Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/EffekseerRendererMetal.Renderer.h rename to Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/EffekseerRendererMetal.Renderer.h diff --git a/Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/EffekseerRendererMetal.Renderer.mm b/Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/EffekseerRendererMetal.Renderer.mm similarity index 100% rename from Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/EffekseerRendererMetal.Renderer.mm rename to Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/EffekseerRendererMetal.Renderer.mm diff --git a/Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/Shader/ad_model_distortion_ps.fx b/Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/Shader/ad_model_distortion_ps.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/Shader/ad_model_distortion_ps.fx rename to Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/Shader/ad_model_distortion_ps.fx diff --git a/Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/Shader/ad_model_distortion_vs.fx b/Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/Shader/ad_model_distortion_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/Shader/ad_model_distortion_vs.fx rename to Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/Shader/ad_model_distortion_vs.fx diff --git a/Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/Shader/ad_model_lit_ps.fx b/Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/Shader/ad_model_lit_ps.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/Shader/ad_model_lit_ps.fx rename to Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/Shader/ad_model_lit_ps.fx diff --git a/Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/Shader/ad_model_lit_vs.fx b/Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/Shader/ad_model_lit_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/Shader/ad_model_lit_vs.fx rename to Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/Shader/ad_model_lit_vs.fx diff --git a/Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/Shader/ad_model_unlit_ps.fx b/Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/Shader/ad_model_unlit_ps.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/Shader/ad_model_unlit_ps.fx rename to Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/Shader/ad_model_unlit_ps.fx diff --git a/Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/Shader/ad_model_unlit_vs.fx b/Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/Shader/ad_model_unlit_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/Shader/ad_model_unlit_vs.fx rename to Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/Shader/ad_model_unlit_vs.fx diff --git a/Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/Shader/ad_sprite_distortion_vs.fx b/Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/Shader/ad_sprite_distortion_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/Shader/ad_sprite_distortion_vs.fx rename to Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/Shader/ad_sprite_distortion_vs.fx diff --git a/Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/Shader/ad_sprite_lit_vs.fx b/Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/Shader/ad_sprite_lit_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/Shader/ad_sprite_lit_vs.fx rename to Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/Shader/ad_sprite_lit_vs.fx diff --git a/Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/Shader/ad_sprite_unlit_vs.fx b/Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/Shader/ad_sprite_unlit_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/Shader/ad_sprite_unlit_vs.fx rename to Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/Shader/ad_sprite_unlit_vs.fx diff --git a/Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/Shader/model_distortion_ps.fx b/Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/Shader/model_distortion_ps.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/Shader/model_distortion_ps.fx rename to Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/Shader/model_distortion_ps.fx diff --git a/Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/Shader/model_distortion_vs.fx b/Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/Shader/model_distortion_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/Shader/model_distortion_vs.fx rename to Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/Shader/model_distortion_vs.fx diff --git a/Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/Shader/model_lit_ps.fx b/Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/Shader/model_lit_ps.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/Shader/model_lit_ps.fx rename to Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/Shader/model_lit_ps.fx diff --git a/Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/Shader/model_lit_vs.fx b/Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/Shader/model_lit_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/Shader/model_lit_vs.fx rename to Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/Shader/model_lit_vs.fx diff --git a/Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/Shader/model_unlit_ps.fx b/Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/Shader/model_unlit_ps.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/Shader/model_unlit_ps.fx rename to Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/Shader/model_unlit_ps.fx diff --git a/Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/Shader/model_unlit_vs.fx b/Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/Shader/model_unlit_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/Shader/model_unlit_vs.fx rename to Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/Shader/model_unlit_vs.fx diff --git a/Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/Shader/sprite_distortion_vs.fx b/Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/Shader/sprite_distortion_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/Shader/sprite_distortion_vs.fx rename to Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/Shader/sprite_distortion_vs.fx diff --git a/Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/Shader/sprite_lit_vs.fx b/Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/Shader/sprite_lit_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/Shader/sprite_lit_vs.fx rename to Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/Shader/sprite_lit_vs.fx diff --git a/Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/Shader/sprite_unlit_vs.fx b/Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/Shader/sprite_unlit_vs.fx similarity index 100% rename from Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/Shader/sprite_unlit_vs.fx rename to Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/Shader/sprite_unlit_vs.fx diff --git a/Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/ShaderHeader/ad_model_distortion_ps.h b/Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/ShaderHeader/ad_model_distortion_ps.h similarity index 100% rename from Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/ShaderHeader/ad_model_distortion_ps.h rename to Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/ShaderHeader/ad_model_distortion_ps.h diff --git a/Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/ShaderHeader/ad_model_distortion_vs.h b/Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/ShaderHeader/ad_model_distortion_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/ShaderHeader/ad_model_distortion_vs.h rename to Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/ShaderHeader/ad_model_distortion_vs.h diff --git a/Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/ShaderHeader/ad_model_lit_ps.h b/Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/ShaderHeader/ad_model_lit_ps.h similarity index 100% rename from Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/ShaderHeader/ad_model_lit_ps.h rename to Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/ShaderHeader/ad_model_lit_ps.h diff --git a/Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/ShaderHeader/ad_model_lit_vs.h b/Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/ShaderHeader/ad_model_lit_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/ShaderHeader/ad_model_lit_vs.h rename to Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/ShaderHeader/ad_model_lit_vs.h diff --git a/Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/ShaderHeader/ad_model_unlit_ps.h b/Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/ShaderHeader/ad_model_unlit_ps.h similarity index 100% rename from Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/ShaderHeader/ad_model_unlit_ps.h rename to Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/ShaderHeader/ad_model_unlit_ps.h diff --git a/Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/ShaderHeader/ad_model_unlit_vs.h b/Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/ShaderHeader/ad_model_unlit_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/ShaderHeader/ad_model_unlit_vs.h rename to Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/ShaderHeader/ad_model_unlit_vs.h diff --git a/Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/ShaderHeader/ad_sprite_distortion_vs.h b/Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/ShaderHeader/ad_sprite_distortion_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/ShaderHeader/ad_sprite_distortion_vs.h rename to Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/ShaderHeader/ad_sprite_distortion_vs.h diff --git a/Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/ShaderHeader/ad_sprite_lit_vs.h b/Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/ShaderHeader/ad_sprite_lit_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/ShaderHeader/ad_sprite_lit_vs.h rename to Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/ShaderHeader/ad_sprite_lit_vs.h diff --git a/Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/ShaderHeader/ad_sprite_unlit_vs.h b/Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/ShaderHeader/ad_sprite_unlit_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/ShaderHeader/ad_sprite_unlit_vs.h rename to Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/ShaderHeader/ad_sprite_unlit_vs.h diff --git a/Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/ShaderHeader/model_distortion_ps.h b/Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/ShaderHeader/model_distortion_ps.h similarity index 100% rename from Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/ShaderHeader/model_distortion_ps.h rename to Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/ShaderHeader/model_distortion_ps.h diff --git a/Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/ShaderHeader/model_distortion_vs.h b/Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/ShaderHeader/model_distortion_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/ShaderHeader/model_distortion_vs.h rename to Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/ShaderHeader/model_distortion_vs.h diff --git a/Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/ShaderHeader/model_lit_ps.h b/Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/ShaderHeader/model_lit_ps.h similarity index 100% rename from Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/ShaderHeader/model_lit_ps.h rename to Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/ShaderHeader/model_lit_ps.h diff --git a/Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/ShaderHeader/model_lit_vs.h b/Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/ShaderHeader/model_lit_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/ShaderHeader/model_lit_vs.h rename to Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/ShaderHeader/model_lit_vs.h diff --git a/Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/ShaderHeader/model_unlit_ps.h b/Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/ShaderHeader/model_unlit_ps.h similarity index 100% rename from Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/ShaderHeader/model_unlit_ps.h rename to Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/ShaderHeader/model_unlit_ps.h diff --git a/Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/ShaderHeader/model_unlit_vs.h b/Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/ShaderHeader/model_unlit_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/ShaderHeader/model_unlit_vs.h rename to Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/ShaderHeader/model_unlit_vs.h diff --git a/Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/ShaderHeader/sprite_distortion_vs.h b/Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/ShaderHeader/sprite_distortion_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/ShaderHeader/sprite_distortion_vs.h rename to Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/ShaderHeader/sprite_distortion_vs.h diff --git a/Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/ShaderHeader/sprite_lit_vs.h b/Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/ShaderHeader/sprite_lit_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/ShaderHeader/sprite_lit_vs.h rename to Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/ShaderHeader/sprite_lit_vs.h diff --git a/Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/ShaderHeader/sprite_unlit_vs.h b/Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/ShaderHeader/sprite_unlit_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/ShaderHeader/sprite_unlit_vs.h rename to Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/ShaderHeader/sprite_unlit_vs.h diff --git a/Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/combine_shader.py b/Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/combine_shader.py similarity index 100% rename from Dev/Cpp/EffekseerRendererMetal/EffekseerRenderer/combine_shader.py rename to Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/combine_shader.py diff --git a/Dev/Cpp/EffekseerRendererVulkan/CMakeLists.txt b/Dev/Cpp/EffekseerRendererVulkan/CMakeLists.txt index 99b3a9fdad..2390114c35 100644 --- a/Dev/Cpp/EffekseerRendererVulkan/CMakeLists.txt +++ b/Dev/Cpp/EffekseerRendererVulkan/CMakeLists.txt @@ -19,21 +19,21 @@ set(LOCAL_SOURCES set(PublicHeaders EffekseerRendererVulkan.h - EffekseerRenderer/EffekseerRendererVulkan.Base.Pre.h - EffekseerRenderer/EffekseerRendererVulkan.Renderer.h) + EffekseerRendererVulkan/EffekseerRendererVulkan.Base.Pre.h + EffekseerRendererVulkan/EffekseerRendererVulkan.Renderer.h) #-------------------- # Projects add_library(${PROJECT_NAME} STATIC ${LOCAL_SOURCES}) -target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/../Effekseer ${CMAKE_CURRENT_LIST_DIR}/../3rdparty/LLGI/src ${EFK_THIRDPARTY_INCLUDES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/../3rdparty/LLGI/src ${EFK_THIRDPARTY_INCLUDES}) target_include_directories(${PROJECT_NAME} PRIVATE ${Vulkan_INCLUDE_DIRS}) set_target_properties(${PROJECT_NAME} PROPERTIES PUBLIC_HEADER "${PublicHeaders}") target_link_libraries(${PROJECT_NAME} PUBLIC Effekseer EffekseerRendererCommon EffekseerRendererLLGI LLGI) target_include_directories(${PROJECT_NAME} PUBLIC $ - $) + $) if(CLANG_FORMAT_ENABLED) clang_format(${PROJECT_NAME}) @@ -46,13 +46,12 @@ endif() foreach (file ${PublicHeaders}) get_filename_component(dir ${file} DIRECTORY) - install(FILES ${file} DESTINATION include/EffekseerRendererVulkan/${dir}) + install(FILES ${file} DESTINATION include/${dir}) endforeach() install( TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}-export - INCLUDES DESTINATION include/EffekseerRendererVulkan ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) diff --git a/Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan.h b/Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan.h index d5bbe22b40..e71e889b16 100644 --- a/Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan.h +++ b/Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan.h @@ -2,8 +2,8 @@ #ifndef __EFFEKSEERRENDERER_VULKAN_H__ #define __EFFEKSEERRENDERER_VULKAN_H__ -#include "EffekseerRenderer/EffekseerRendererVulkan.Base.Pre.h" -#include "EffekseerRenderer/EffekseerRendererVulkan.Renderer.h" -#include +#include "EffekseerRendererVulkan/EffekseerRendererVulkan.Base.Pre.h" +#include "EffekseerRendererVulkan/EffekseerRendererVulkan.Renderer.h" +#include #endif // __EFFEKSEERRENDERER_VULKAN_H__ diff --git a/Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/EffekseerMaterialCompilerVulkan.cpp b/Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/EffekseerMaterialCompilerVulkan.cpp similarity index 100% rename from Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/EffekseerMaterialCompilerVulkan.cpp rename to Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/EffekseerMaterialCompilerVulkan.cpp diff --git a/Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/EffekseerMaterialCompilerVulkan.h b/Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/EffekseerMaterialCompilerVulkan.h similarity index 100% rename from Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/EffekseerMaterialCompilerVulkan.h rename to Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/EffekseerMaterialCompilerVulkan.h diff --git a/Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/EffekseerRendererVulkan.Base.Pre.h b/Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/EffekseerRendererVulkan.Base.Pre.h similarity index 100% rename from Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/EffekseerRendererVulkan.Base.Pre.h rename to Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/EffekseerRendererVulkan.Base.Pre.h diff --git a/Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/EffekseerRendererVulkan.Base.h b/Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/EffekseerRendererVulkan.Base.h similarity index 77% rename from Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/EffekseerRendererVulkan.Base.h rename to Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/EffekseerRendererVulkan.Base.h index 0b13492d4c..f1da54988d 100644 --- a/Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/EffekseerRendererVulkan.Base.h +++ b/Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/EffekseerRendererVulkan.Base.h @@ -9,6 +9,6 @@ #include "EffekseerRendererVulkan.Base.Pre.h" -#include "../../EffekseerRendererLLGI/EffekseerRendererLLGI.Base.h" +#include #endif \ No newline at end of file diff --git a/Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/EffekseerRendererVulkan.Renderer.cpp b/Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/EffekseerRendererVulkan.Renderer.cpp similarity index 96% rename from Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/EffekseerRendererVulkan.Renderer.cpp rename to Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/EffekseerRendererVulkan.Renderer.cpp index b86540bcdf..4ba63c6a75 100644 --- a/Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/EffekseerRendererVulkan.Renderer.cpp +++ b/Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/EffekseerRendererVulkan.Renderer.cpp @@ -1,164 +1,164 @@ -#include "EffekseerRendererVulkan.Renderer.h" -#include "../../3rdParty/LLGI/src/Vulkan/LLGI.CommandListVulkan.h" -#include "../../3rdParty/LLGI/src/Vulkan/LLGI.GraphicsVulkan.h" -#include "../EffekseerRendererLLGI/EffekseerRendererLLGI.RendererImplemented.h" -#include "EffekseerMaterialCompilerVulkan.h" - -#include "ShaderHeader/ad_model_distortion_ps.h" -#include "ShaderHeader/ad_sprite_distortion_vs.h" -#include "ShaderHeader/ad_sprite_lit_vs.h" -#include "ShaderHeader/ad_sprite_unlit_vs.h" - -#include "ShaderHeader/ad_model_distortion_ps.h" -#include "ShaderHeader/ad_model_distortion_vs.h" -#include "ShaderHeader/ad_model_lit_ps.h" -#include "ShaderHeader/ad_model_lit_vs.h" -#include "ShaderHeader/ad_model_unlit_ps.h" -#include "ShaderHeader/ad_model_unlit_vs.h" - -#include "ShaderHeader/model_distortion_ps.h" -#include "ShaderHeader/sprite_distortion_vs.h" -#include "ShaderHeader/sprite_lit_vs.h" -#include "ShaderHeader/sprite_unlit_vs.h" - -#include "ShaderHeader/model_distortion_ps.h" -#include "ShaderHeader/model_distortion_vs.h" -#include "ShaderHeader/model_lit_ps.h" -#include "ShaderHeader/model_lit_vs.h" -#include "ShaderHeader/model_unlit_ps.h" -#include "ShaderHeader/model_unlit_vs.h" - -#define GENERATE_VIEW(x) {{x, static_cast(sizeof(x))}}; - -namespace EffekseerRendererVulkan -{ - -static void CreateFixedShaderForVulkan(EffekseerRendererLLGI::FixedShader* shader) -{ - assert(shader); - if (!shader) - return; - - shader->AdvancedSpriteUnlit_VS = GENERATE_VIEW(ad_sprite_unlit_vs); - shader->AdvancedSpriteLit_VS = GENERATE_VIEW(ad_sprite_lit_vs); - shader->AdvancedSpriteDistortion_VS = GENERATE_VIEW(ad_sprite_distortion_vs); - - shader->AdvancedModelUnlit_VS = GENERATE_VIEW(ad_model_unlit_vs); - shader->AdvancedModelUnlit_PS = GENERATE_VIEW(ad_model_unlit_ps); - shader->AdvancedModelLit_VS = GENERATE_VIEW(ad_model_lit_vs); - shader->AdvancedModelLit_PS = GENERATE_VIEW(ad_model_lit_ps); - shader->AdvancedModelDistortion_VS = GENERATE_VIEW(ad_model_distortion_vs); - shader->AdvancedModelDistortion_PS = GENERATE_VIEW(ad_model_distortion_ps); - - shader->SpriteUnlit_VS = GENERATE_VIEW(sprite_unlit_vs); - shader->SpriteLit_VS = GENERATE_VIEW(sprite_lit_vs); - shader->SpriteDistortion_VS = GENERATE_VIEW(sprite_distortion_vs); - - shader->ModelUnlit_VS = GENERATE_VIEW(model_unlit_vs); - shader->ModelUnlit_PS = GENERATE_VIEW(model_unlit_ps); - shader->ModelLit_VS = GENERATE_VIEW(model_lit_vs); - shader->ModelLit_PS = GENERATE_VIEW(model_lit_ps); - shader->ModelDistortion_VS = GENERATE_VIEW(model_distortion_vs); - shader->ModelDistortion_PS = GENERATE_VIEW(model_distortion_ps); -} - -::Effekseer::Backend::GraphicsDeviceRef CreateGraphicsDevice( - VkPhysicalDevice physicalDevice, VkDevice device, VkQueue transfarQueue, VkCommandPool transfarCommandPool, int32_t swapBufferCount) -{ - auto graphics = new LLGI::GraphicsVulkan( - vk::Device(device), - vk::Queue(transfarQueue), - vk::CommandPool(transfarCommandPool), - vk::PhysicalDevice(physicalDevice), - swapBufferCount, - [](vk::CommandBuffer, vk::Fence) -> void {}, - nullptr, - nullptr); - - auto ret = Effekseer::MakeRefPtr(graphics); - ES_SAFE_RELEASE(graphics); - return ret; -} - -::EffekseerRenderer::RendererRef -Create(::Effekseer::Backend::GraphicsDeviceRef graphicsDevice, RenderPassInformation renderPassInformation, int32_t squareMaxCount) -{ - auto gd = graphicsDevice.DownCast(); - - auto renderer = Effekseer::MakeRefPtr<::EffekseerRendererLLGI::RendererImplemented>(squareMaxCount); - CreateFixedShaderForVulkan(&renderer->fixedShader_); - - LLGI::RenderPassPipelineStateKey key; - key.RenderTargetFormats.resize(renderPassInformation.RenderTextureCount); - key.IsPresent = renderPassInformation.DoesPresentToScreen; - for (size_t i = 0; i < key.RenderTargetFormats.size(); i++) - { - key.RenderTargetFormats.at(i) = LLGI::VulkanHelper::VkFormatToTextureFormat(renderPassInformation.RenderTextureFormats.at(i)); - } - - key.DepthFormat = LLGI::VulkanHelper::VkFormatToTextureFormat(renderPassInformation.DepthFormat); - - if (!renderer->Initialize(gd, key, false)) - { - return nullptr; - } - - renderer->platformType_ = Effekseer::CompiledMaterialPlatformType::Vulkan; - renderer->materialCompiler_ = new Effekseer::MaterialCompilerVulkan(); - - return renderer; -} - -::EffekseerRenderer::RendererRef Create(VkPhysicalDevice physicalDevice, - VkDevice device, - VkQueue transfarQueue, - VkCommandPool transfarCommandPool, - int32_t swapBufferCount, - RenderPassInformation renderPassInformation, - int32_t squareMaxCount) -{ - auto graphicDevice = CreateGraphicsDevice(physicalDevice, device, transfarQueue, transfarCommandPool, swapBufferCount); - - auto ret = Create(graphicDevice, renderPassInformation, squareMaxCount); - - if (ret != nullptr) - { - return ret; - } - - return nullptr; -} - -Effekseer::Backend::TextureRef CreateTexture(::Effekseer::Backend::GraphicsDeviceRef graphicsDevice, const VulkanImageInfo& info) -{ - LLGI::VulkanImageInfo llgiinfo; - llgiinfo.image = info.image; - llgiinfo.format = info.format; - llgiinfo.aspect = info.aspect; - - auto g = static_cast<::EffekseerRendererLLGI::Backend::GraphicsDevice*>(graphicsDevice.Get()); - return g->CreateTexture((uint64_t)(&llgiinfo), [] {}); -} - -void BeginCommandList(Effekseer::RefPtr commandList, VkCommandBuffer nativeCommandList) -{ - assert(commandList != nullptr); - - auto c = static_cast(commandList.Get()); - - LLGI::PlatformContextVulkan context; - context.commandBuffer = nativeCommandList; - - static_cast(c->GetInternal())->BeginWithPlatform(&context); - c->GetInternal()->BeginRenderPassWithPlatformPtr(nullptr); -} - -void EndCommandList(Effekseer::RefPtr commandList) -{ - assert(commandList != nullptr); - auto c = static_cast(commandList.Get()); - c->GetInternal()->EndRenderPassWithPlatformPtr(); - c->GetInternal()->EndWithPlatform(); -} - +#include "EffekseerRendererVulkan.Renderer.h" +#include "../../3rdParty/LLGI/src/Vulkan/LLGI.CommandListVulkan.h" +#include "../../3rdParty/LLGI/src/Vulkan/LLGI.GraphicsVulkan.h" +#include "EffekseerMaterialCompilerVulkan.h" +#include + +#include "ShaderHeader/ad_model_distortion_ps.h" +#include "ShaderHeader/ad_sprite_distortion_vs.h" +#include "ShaderHeader/ad_sprite_lit_vs.h" +#include "ShaderHeader/ad_sprite_unlit_vs.h" + +#include "ShaderHeader/ad_model_distortion_ps.h" +#include "ShaderHeader/ad_model_distortion_vs.h" +#include "ShaderHeader/ad_model_lit_ps.h" +#include "ShaderHeader/ad_model_lit_vs.h" +#include "ShaderHeader/ad_model_unlit_ps.h" +#include "ShaderHeader/ad_model_unlit_vs.h" + +#include "ShaderHeader/model_distortion_ps.h" +#include "ShaderHeader/sprite_distortion_vs.h" +#include "ShaderHeader/sprite_lit_vs.h" +#include "ShaderHeader/sprite_unlit_vs.h" + +#include "ShaderHeader/model_distortion_ps.h" +#include "ShaderHeader/model_distortion_vs.h" +#include "ShaderHeader/model_lit_ps.h" +#include "ShaderHeader/model_lit_vs.h" +#include "ShaderHeader/model_unlit_ps.h" +#include "ShaderHeader/model_unlit_vs.h" + +#define GENERATE_VIEW(x) {{x, static_cast(sizeof(x))}}; + +namespace EffekseerRendererVulkan +{ + +static void CreateFixedShaderForVulkan(EffekseerRendererLLGI::FixedShader* shader) +{ + assert(shader); + if (!shader) + return; + + shader->AdvancedSpriteUnlit_VS = GENERATE_VIEW(ad_sprite_unlit_vs); + shader->AdvancedSpriteLit_VS = GENERATE_VIEW(ad_sprite_lit_vs); + shader->AdvancedSpriteDistortion_VS = GENERATE_VIEW(ad_sprite_distortion_vs); + + shader->AdvancedModelUnlit_VS = GENERATE_VIEW(ad_model_unlit_vs); + shader->AdvancedModelUnlit_PS = GENERATE_VIEW(ad_model_unlit_ps); + shader->AdvancedModelLit_VS = GENERATE_VIEW(ad_model_lit_vs); + shader->AdvancedModelLit_PS = GENERATE_VIEW(ad_model_lit_ps); + shader->AdvancedModelDistortion_VS = GENERATE_VIEW(ad_model_distortion_vs); + shader->AdvancedModelDistortion_PS = GENERATE_VIEW(ad_model_distortion_ps); + + shader->SpriteUnlit_VS = GENERATE_VIEW(sprite_unlit_vs); + shader->SpriteLit_VS = GENERATE_VIEW(sprite_lit_vs); + shader->SpriteDistortion_VS = GENERATE_VIEW(sprite_distortion_vs); + + shader->ModelUnlit_VS = GENERATE_VIEW(model_unlit_vs); + shader->ModelUnlit_PS = GENERATE_VIEW(model_unlit_ps); + shader->ModelLit_VS = GENERATE_VIEW(model_lit_vs); + shader->ModelLit_PS = GENERATE_VIEW(model_lit_ps); + shader->ModelDistortion_VS = GENERATE_VIEW(model_distortion_vs); + shader->ModelDistortion_PS = GENERATE_VIEW(model_distortion_ps); +} + +::Effekseer::Backend::GraphicsDeviceRef CreateGraphicsDevice( + VkPhysicalDevice physicalDevice, VkDevice device, VkQueue transfarQueue, VkCommandPool transfarCommandPool, int32_t swapBufferCount) +{ + auto graphics = new LLGI::GraphicsVulkan( + vk::Device(device), + vk::Queue(transfarQueue), + vk::CommandPool(transfarCommandPool), + vk::PhysicalDevice(physicalDevice), + swapBufferCount, + [](vk::CommandBuffer, vk::Fence) -> void {}, + nullptr, + nullptr); + + auto ret = Effekseer::MakeRefPtr(graphics); + ES_SAFE_RELEASE(graphics); + return ret; +} + +::EffekseerRenderer::RendererRef +Create(::Effekseer::Backend::GraphicsDeviceRef graphicsDevice, RenderPassInformation renderPassInformation, int32_t squareMaxCount) +{ + auto gd = graphicsDevice.DownCast(); + + auto renderer = Effekseer::MakeRefPtr<::EffekseerRendererLLGI::RendererImplemented>(squareMaxCount); + CreateFixedShaderForVulkan(&renderer->fixedShader_); + + LLGI::RenderPassPipelineStateKey key; + key.RenderTargetFormats.resize(renderPassInformation.RenderTextureCount); + key.IsPresent = renderPassInformation.DoesPresentToScreen; + for (size_t i = 0; i < key.RenderTargetFormats.size(); i++) + { + key.RenderTargetFormats.at(i) = LLGI::VulkanHelper::VkFormatToTextureFormat(renderPassInformation.RenderTextureFormats.at(i)); + } + + key.DepthFormat = LLGI::VulkanHelper::VkFormatToTextureFormat(renderPassInformation.DepthFormat); + + if (!renderer->Initialize(gd, key, false)) + { + return nullptr; + } + + renderer->platformType_ = Effekseer::CompiledMaterialPlatformType::Vulkan; + renderer->materialCompiler_ = new Effekseer::MaterialCompilerVulkan(); + + return renderer; +} + +::EffekseerRenderer::RendererRef Create(VkPhysicalDevice physicalDevice, + VkDevice device, + VkQueue transfarQueue, + VkCommandPool transfarCommandPool, + int32_t swapBufferCount, + RenderPassInformation renderPassInformation, + int32_t squareMaxCount) +{ + auto graphicDevice = CreateGraphicsDevice(physicalDevice, device, transfarQueue, transfarCommandPool, swapBufferCount); + + auto ret = Create(graphicDevice, renderPassInformation, squareMaxCount); + + if (ret != nullptr) + { + return ret; + } + + return nullptr; +} + +Effekseer::Backend::TextureRef CreateTexture(::Effekseer::Backend::GraphicsDeviceRef graphicsDevice, const VulkanImageInfo& info) +{ + LLGI::VulkanImageInfo llgiinfo; + llgiinfo.image = info.image; + llgiinfo.format = info.format; + llgiinfo.aspect = info.aspect; + + auto g = static_cast<::EffekseerRendererLLGI::Backend::GraphicsDevice*>(graphicsDevice.Get()); + return g->CreateTexture((uint64_t)(&llgiinfo), [] {}); +} + +void BeginCommandList(Effekseer::RefPtr commandList, VkCommandBuffer nativeCommandList) +{ + assert(commandList != nullptr); + + auto c = static_cast(commandList.Get()); + + LLGI::PlatformContextVulkan context; + context.commandBuffer = nativeCommandList; + + static_cast(c->GetInternal())->BeginWithPlatform(&context); + c->GetInternal()->BeginRenderPassWithPlatformPtr(nullptr); +} + +void EndCommandList(Effekseer::RefPtr commandList) +{ + assert(commandList != nullptr); + auto c = static_cast(commandList.Get()); + c->GetInternal()->EndRenderPassWithPlatformPtr(); + c->GetInternal()->EndWithPlatform(); +} + } // namespace EffekseerRendererVulkan \ No newline at end of file diff --git a/Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/EffekseerRendererVulkan.Renderer.h b/Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/EffekseerRendererVulkan.Renderer.h similarity index 83% rename from Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/EffekseerRendererVulkan.Renderer.h rename to Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/EffekseerRendererVulkan.Renderer.h index 24e4a03106..dd5b7a5dfd 100644 --- a/Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/EffekseerRendererVulkan.Renderer.h +++ b/Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/EffekseerRendererVulkan.Renderer.h @@ -2,8 +2,8 @@ #ifndef __EFFEKSEERRENDERER_VULKAN_RENDERER_H__ #define __EFFEKSEERRENDERER_VULKAN_RENDERER_H__ -#include "../../EffekseerRendererCommon/EffekseerRenderer.Renderer.h" #include "EffekseerRendererVulkan.Base.h" +#include #include namespace EffekseerRendererVulkan @@ -38,12 +38,12 @@ Create(::Effekseer::Backend::GraphicsDeviceRef graphicsDevice, RenderPassInforma @return instance */ ::EffekseerRenderer::RendererRef Create(VkPhysicalDevice physicalDevice, - VkDevice device, - VkQueue transfarQueue, - VkCommandPool transfarCommandPool, - int32_t swapBufferCount, - RenderPassInformation renderPassInformation, - int32_t squareMaxCount); + VkDevice device, + VkQueue transfarQueue, + VkCommandPool transfarCommandPool, + int32_t swapBufferCount, + RenderPassInformation renderPassInformation, + int32_t squareMaxCount); Effekseer::Backend::TextureRef CreateTexture(::Effekseer::Backend::GraphicsDeviceRef graphicsDevice, const VulkanImageInfo& info); diff --git a/Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/Shader/ad_model_distortion_ps.fx.frag b/Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/Shader/ad_model_distortion_ps.fx.frag similarity index 100% rename from Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/Shader/ad_model_distortion_ps.fx.frag rename to Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/Shader/ad_model_distortion_ps.fx.frag diff --git a/Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/Shader/ad_model_distortion_vs.fx.vert b/Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/Shader/ad_model_distortion_vs.fx.vert similarity index 100% rename from Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/Shader/ad_model_distortion_vs.fx.vert rename to Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/Shader/ad_model_distortion_vs.fx.vert diff --git a/Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/Shader/ad_model_lit_ps.fx.frag b/Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/Shader/ad_model_lit_ps.fx.frag similarity index 100% rename from Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/Shader/ad_model_lit_ps.fx.frag rename to Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/Shader/ad_model_lit_ps.fx.frag diff --git a/Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/Shader/ad_model_lit_vs.fx.vert b/Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/Shader/ad_model_lit_vs.fx.vert similarity index 100% rename from Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/Shader/ad_model_lit_vs.fx.vert rename to Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/Shader/ad_model_lit_vs.fx.vert diff --git a/Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/Shader/ad_model_unlit_ps.fx.frag b/Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/Shader/ad_model_unlit_ps.fx.frag similarity index 100% rename from Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/Shader/ad_model_unlit_ps.fx.frag rename to Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/Shader/ad_model_unlit_ps.fx.frag diff --git a/Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/Shader/ad_model_unlit_vs.fx.vert b/Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/Shader/ad_model_unlit_vs.fx.vert similarity index 100% rename from Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/Shader/ad_model_unlit_vs.fx.vert rename to Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/Shader/ad_model_unlit_vs.fx.vert diff --git a/Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/Shader/ad_sprite_distortion_vs.fx.vert b/Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/Shader/ad_sprite_distortion_vs.fx.vert similarity index 100% rename from Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/Shader/ad_sprite_distortion_vs.fx.vert rename to Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/Shader/ad_sprite_distortion_vs.fx.vert diff --git a/Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/Shader/ad_sprite_lit_vs.fx.vert b/Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/Shader/ad_sprite_lit_vs.fx.vert similarity index 100% rename from Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/Shader/ad_sprite_lit_vs.fx.vert rename to Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/Shader/ad_sprite_lit_vs.fx.vert diff --git a/Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/Shader/ad_sprite_unlit_vs.fx.vert b/Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/Shader/ad_sprite_unlit_vs.fx.vert similarity index 100% rename from Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/Shader/ad_sprite_unlit_vs.fx.vert rename to Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/Shader/ad_sprite_unlit_vs.fx.vert diff --git a/Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/Shader/model_distortion_ps.fx.frag b/Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/Shader/model_distortion_ps.fx.frag similarity index 100% rename from Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/Shader/model_distortion_ps.fx.frag rename to Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/Shader/model_distortion_ps.fx.frag diff --git a/Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/Shader/model_distortion_vs.fx.vert b/Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/Shader/model_distortion_vs.fx.vert similarity index 100% rename from Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/Shader/model_distortion_vs.fx.vert rename to Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/Shader/model_distortion_vs.fx.vert diff --git a/Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/Shader/model_lit_ps.fx.frag b/Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/Shader/model_lit_ps.fx.frag similarity index 100% rename from Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/Shader/model_lit_ps.fx.frag rename to Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/Shader/model_lit_ps.fx.frag diff --git a/Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/Shader/model_lit_vs.fx.vert b/Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/Shader/model_lit_vs.fx.vert similarity index 100% rename from Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/Shader/model_lit_vs.fx.vert rename to Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/Shader/model_lit_vs.fx.vert diff --git a/Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/Shader/model_unlit_ps.fx.frag b/Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/Shader/model_unlit_ps.fx.frag similarity index 100% rename from Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/Shader/model_unlit_ps.fx.frag rename to Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/Shader/model_unlit_ps.fx.frag diff --git a/Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/Shader/model_unlit_vs.fx.vert b/Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/Shader/model_unlit_vs.fx.vert similarity index 100% rename from Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/Shader/model_unlit_vs.fx.vert rename to Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/Shader/model_unlit_vs.fx.vert diff --git a/Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/Shader/sprite_distortion_vs.fx.vert b/Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/Shader/sprite_distortion_vs.fx.vert similarity index 100% rename from Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/Shader/sprite_distortion_vs.fx.vert rename to Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/Shader/sprite_distortion_vs.fx.vert diff --git a/Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/Shader/sprite_lit_vs.fx.vert b/Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/Shader/sprite_lit_vs.fx.vert similarity index 100% rename from Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/Shader/sprite_lit_vs.fx.vert rename to Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/Shader/sprite_lit_vs.fx.vert diff --git a/Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/Shader/sprite_unlit_vs.fx.vert b/Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/Shader/sprite_unlit_vs.fx.vert similarity index 100% rename from Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/Shader/sprite_unlit_vs.fx.vert rename to Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/Shader/sprite_unlit_vs.fx.vert diff --git a/Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/ShaderHeader/ad_model_distortion_ps.h b/Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/ShaderHeader/ad_model_distortion_ps.h similarity index 100% rename from Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/ShaderHeader/ad_model_distortion_ps.h rename to Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/ShaderHeader/ad_model_distortion_ps.h diff --git a/Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/ShaderHeader/ad_model_distortion_vs.h b/Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/ShaderHeader/ad_model_distortion_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/ShaderHeader/ad_model_distortion_vs.h rename to Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/ShaderHeader/ad_model_distortion_vs.h diff --git a/Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/ShaderHeader/ad_model_lit_ps.h b/Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/ShaderHeader/ad_model_lit_ps.h similarity index 100% rename from Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/ShaderHeader/ad_model_lit_ps.h rename to Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/ShaderHeader/ad_model_lit_ps.h diff --git a/Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/ShaderHeader/ad_model_lit_vs.h b/Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/ShaderHeader/ad_model_lit_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/ShaderHeader/ad_model_lit_vs.h rename to Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/ShaderHeader/ad_model_lit_vs.h diff --git a/Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/ShaderHeader/ad_model_unlit_ps.h b/Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/ShaderHeader/ad_model_unlit_ps.h similarity index 100% rename from Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/ShaderHeader/ad_model_unlit_ps.h rename to Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/ShaderHeader/ad_model_unlit_ps.h diff --git a/Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/ShaderHeader/ad_model_unlit_vs.h b/Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/ShaderHeader/ad_model_unlit_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/ShaderHeader/ad_model_unlit_vs.h rename to Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/ShaderHeader/ad_model_unlit_vs.h diff --git a/Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/ShaderHeader/ad_sprite_distortion_vs.h b/Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/ShaderHeader/ad_sprite_distortion_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/ShaderHeader/ad_sprite_distortion_vs.h rename to Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/ShaderHeader/ad_sprite_distortion_vs.h diff --git a/Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/ShaderHeader/ad_sprite_lit_vs.h b/Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/ShaderHeader/ad_sprite_lit_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/ShaderHeader/ad_sprite_lit_vs.h rename to Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/ShaderHeader/ad_sprite_lit_vs.h diff --git a/Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/ShaderHeader/ad_sprite_unlit_vs.h b/Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/ShaderHeader/ad_sprite_unlit_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/ShaderHeader/ad_sprite_unlit_vs.h rename to Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/ShaderHeader/ad_sprite_unlit_vs.h diff --git a/Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/ShaderHeader/model_distortion_ps.h b/Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/ShaderHeader/model_distortion_ps.h similarity index 100% rename from Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/ShaderHeader/model_distortion_ps.h rename to Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/ShaderHeader/model_distortion_ps.h diff --git a/Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/ShaderHeader/model_distortion_vs.h b/Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/ShaderHeader/model_distortion_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/ShaderHeader/model_distortion_vs.h rename to Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/ShaderHeader/model_distortion_vs.h diff --git a/Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/ShaderHeader/model_lit_ps.h b/Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/ShaderHeader/model_lit_ps.h similarity index 100% rename from Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/ShaderHeader/model_lit_ps.h rename to Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/ShaderHeader/model_lit_ps.h diff --git a/Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/ShaderHeader/model_lit_vs.h b/Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/ShaderHeader/model_lit_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/ShaderHeader/model_lit_vs.h rename to Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/ShaderHeader/model_lit_vs.h diff --git a/Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/ShaderHeader/model_unlit_ps.h b/Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/ShaderHeader/model_unlit_ps.h similarity index 100% rename from Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/ShaderHeader/model_unlit_ps.h rename to Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/ShaderHeader/model_unlit_ps.h diff --git a/Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/ShaderHeader/model_unlit_vs.h b/Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/ShaderHeader/model_unlit_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/ShaderHeader/model_unlit_vs.h rename to Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/ShaderHeader/model_unlit_vs.h diff --git a/Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/ShaderHeader/sprite_distortion_vs.h b/Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/ShaderHeader/sprite_distortion_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/ShaderHeader/sprite_distortion_vs.h rename to Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/ShaderHeader/sprite_distortion_vs.h diff --git a/Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/ShaderHeader/sprite_lit_vs.h b/Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/ShaderHeader/sprite_lit_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/ShaderHeader/sprite_lit_vs.h rename to Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/ShaderHeader/sprite_lit_vs.h diff --git a/Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/ShaderHeader/sprite_unlit_vs.h b/Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/ShaderHeader/sprite_unlit_vs.h similarity index 100% rename from Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/ShaderHeader/sprite_unlit_vs.h rename to Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/ShaderHeader/sprite_unlit_vs.h diff --git a/Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/compile.py b/Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/compile.py similarity index 100% rename from Dev/Cpp/EffekseerRendererVulkan/EffekseerRenderer/compile.py rename to Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/compile.py diff --git a/Dev/Cpp/EffekseerSoundAL/CMakeLists.txt b/Dev/Cpp/EffekseerSoundAL/CMakeLists.txt index b4db3e63c2..d4bfb0aa9d 100644 --- a/Dev/Cpp/EffekseerSoundAL/CMakeLists.txt +++ b/Dev/Cpp/EffekseerSoundAL/CMakeLists.txt @@ -8,16 +8,16 @@ if(OpenAL_FOUND) project(EffekseerSoundAL CXX) set(effekseer_sound_h - EffekseerSound/EffekseerSoundAL.SoundImplemented.h - EffekseerSound/EffekseerSoundAL.SoundLoader.h - EffekseerSound/EffekseerSoundAL.SoundPlayer.h - EffekseerSound/EffekseerSoundAL.SoundVoice.h) + EffekseerSoundAL/EffekseerSoundAL.SoundImplemented.h + EffekseerSoundAL/EffekseerSoundAL.SoundLoader.h + EffekseerSoundAL/EffekseerSoundAL.SoundPlayer.h + EffekseerSoundAL/EffekseerSoundAL.SoundVoice.h) set(effekseer_sound_src - EffekseerSound/EffekseerSoundAL.Sound.cpp - EffekseerSound/EffekseerSoundAL.SoundLoader.cpp - EffekseerSound/EffekseerSoundAL.SoundPlayer.cpp - EffekseerSound/EffekseerSoundAL.SoundVoice.cpp) + EffekseerSoundAL/EffekseerSoundAL.Sound.cpp + EffekseerSoundAL/EffekseerSoundAL.SoundLoader.cpp + EffekseerSoundAL/EffekseerSoundAL.SoundPlayer.cpp + EffekseerSoundAL/EffekseerSoundAL.SoundVoice.cpp) set(PublicHeaders EffekseerSoundAL.h) @@ -39,7 +39,7 @@ if(OpenAL_FOUND) target_include_directories(${PROJECT_NAME} PUBLIC $ - $) + $) if(CLANG_FORMAT_ENABLED) clang_format(${PROJECT_NAME}) @@ -49,7 +49,7 @@ if(OpenAL_FOUND) foreach (file ${PublicHeaders}) get_filename_component(dir ${file} DIRECTORY) - install(FILES ${file} DESTINATION include/EffekseerSoundAL/${dir}) + install(FILES ${file} DESTINATION include/${dir}) endforeach() install( diff --git a/Dev/Cpp/EffekseerSoundAL/EffekseerSound/EffekseerSoundAL.Sound.cpp b/Dev/Cpp/EffekseerSoundAL/EffekseerSoundAL/EffekseerSoundAL.Sound.cpp similarity index 100% rename from Dev/Cpp/EffekseerSoundAL/EffekseerSound/EffekseerSoundAL.Sound.cpp rename to Dev/Cpp/EffekseerSoundAL/EffekseerSoundAL/EffekseerSoundAL.Sound.cpp diff --git a/Dev/Cpp/EffekseerSoundAL/EffekseerSound/EffekseerSoundAL.SoundImplemented.h b/Dev/Cpp/EffekseerSoundAL/EffekseerSoundAL/EffekseerSoundAL.SoundImplemented.h similarity index 100% rename from Dev/Cpp/EffekseerSoundAL/EffekseerSound/EffekseerSoundAL.SoundImplemented.h rename to Dev/Cpp/EffekseerSoundAL/EffekseerSoundAL/EffekseerSoundAL.SoundImplemented.h diff --git a/Dev/Cpp/EffekseerSoundAL/EffekseerSound/EffekseerSoundAL.SoundLoader.cpp b/Dev/Cpp/EffekseerSoundAL/EffekseerSoundAL/EffekseerSoundAL.SoundLoader.cpp similarity index 100% rename from Dev/Cpp/EffekseerSoundAL/EffekseerSound/EffekseerSoundAL.SoundLoader.cpp rename to Dev/Cpp/EffekseerSoundAL/EffekseerSoundAL/EffekseerSoundAL.SoundLoader.cpp diff --git a/Dev/Cpp/EffekseerSoundAL/EffekseerSound/EffekseerSoundAL.SoundLoader.h b/Dev/Cpp/EffekseerSoundAL/EffekseerSoundAL/EffekseerSoundAL.SoundLoader.h similarity index 100% rename from Dev/Cpp/EffekseerSoundAL/EffekseerSound/EffekseerSoundAL.SoundLoader.h rename to Dev/Cpp/EffekseerSoundAL/EffekseerSoundAL/EffekseerSoundAL.SoundLoader.h diff --git a/Dev/Cpp/EffekseerSoundAL/EffekseerSound/EffekseerSoundAL.SoundPlayer.cpp b/Dev/Cpp/EffekseerSoundAL/EffekseerSoundAL/EffekseerSoundAL.SoundPlayer.cpp similarity index 100% rename from Dev/Cpp/EffekseerSoundAL/EffekseerSound/EffekseerSoundAL.SoundPlayer.cpp rename to Dev/Cpp/EffekseerSoundAL/EffekseerSoundAL/EffekseerSoundAL.SoundPlayer.cpp diff --git a/Dev/Cpp/EffekseerSoundAL/EffekseerSound/EffekseerSoundAL.SoundPlayer.h b/Dev/Cpp/EffekseerSoundAL/EffekseerSoundAL/EffekseerSoundAL.SoundPlayer.h similarity index 100% rename from Dev/Cpp/EffekseerSoundAL/EffekseerSound/EffekseerSoundAL.SoundPlayer.h rename to Dev/Cpp/EffekseerSoundAL/EffekseerSoundAL/EffekseerSoundAL.SoundPlayer.h diff --git a/Dev/Cpp/EffekseerSoundAL/EffekseerSound/EffekseerSoundAL.SoundVoice.cpp b/Dev/Cpp/EffekseerSoundAL/EffekseerSoundAL/EffekseerSoundAL.SoundVoice.cpp similarity index 100% rename from Dev/Cpp/EffekseerSoundAL/EffekseerSound/EffekseerSoundAL.SoundVoice.cpp rename to Dev/Cpp/EffekseerSoundAL/EffekseerSoundAL/EffekseerSoundAL.SoundVoice.cpp diff --git a/Dev/Cpp/EffekseerSoundAL/EffekseerSound/EffekseerSoundAL.SoundVoice.h b/Dev/Cpp/EffekseerSoundAL/EffekseerSoundAL/EffekseerSoundAL.SoundVoice.h similarity index 100% rename from Dev/Cpp/EffekseerSoundAL/EffekseerSound/EffekseerSoundAL.SoundVoice.h rename to Dev/Cpp/EffekseerSoundAL/EffekseerSoundAL/EffekseerSoundAL.SoundVoice.h diff --git a/Dev/Cpp/EffekseerSoundDSound/CMakeLists.txt b/Dev/Cpp/EffekseerSoundDSound/CMakeLists.txt index 3f8e581f5a..01988caaf2 100644 --- a/Dev/Cpp/EffekseerSoundDSound/CMakeLists.txt +++ b/Dev/Cpp/EffekseerSoundDSound/CMakeLists.txt @@ -2,16 +2,16 @@ cmake_minimum_required(VERSION 3.15) project(EffekseerSoundDSound CXX) set(effekseer_sound_h - EffekseerSound/EffekseerSoundDSound.SoundImplemented.h - EffekseerSound/EffekseerSoundDSound.SoundLoader.h - EffekseerSound/EffekseerSoundDSound.SoundPlayer.h - EffekseerSound/EffekseerSoundDSound.SoundVoice.h) + EffekseerSoundDSound/EffekseerSoundDSound.SoundImplemented.h + EffekseerSoundDSound/EffekseerSoundDSound.SoundLoader.h + EffekseerSoundDSound/EffekseerSoundDSound.SoundPlayer.h + EffekseerSoundDSound/EffekseerSoundDSound.SoundVoice.h) set(effekseer_sound_src - EffekseerSound/EffekseerSoundDSound.Sound.cpp - EffekseerSound/EffekseerSoundDSound.SoundLoader.cpp - EffekseerSound/EffekseerSoundDSound.SoundPlayer.cpp - EffekseerSound/EffekseerSoundDSound.SoundVoice.cpp) + EffekseerSoundDSound/EffekseerSoundDSound.Sound.cpp + EffekseerSoundDSound/EffekseerSoundDSound.SoundLoader.cpp + EffekseerSoundDSound/EffekseerSoundDSound.SoundPlayer.cpp + EffekseerSoundDSound/EffekseerSoundDSound.SoundVoice.cpp) set(PublicHeaders EffekseerSoundDSound.h) @@ -33,7 +33,7 @@ target_link_libraries(${PROJECT_NAME} PUBLIC target_include_directories(${PROJECT_NAME} PUBLIC $ - $) + $) if(CLANG_FORMAT_ENABLED) clang_format(${PROJECT_NAME}) @@ -43,7 +43,7 @@ WarnError(${PROJECT_NAME}) foreach (file ${PublicHeaders}) get_filename_component(dir ${file} DIRECTORY) - install(FILES ${file} DESTINATION include/EffekseerSoundDSound/${dir}) + install(FILES ${file} DESTINATION include/${dir}) endforeach() install( diff --git a/Dev/Cpp/EffekseerSoundDSound/EffekseerSound/EffekseerSoundDSound.Sound.cpp b/Dev/Cpp/EffekseerSoundDSound/EffekseerSoundDSound/EffekseerSoundDSound.Sound.cpp similarity index 100% rename from Dev/Cpp/EffekseerSoundDSound/EffekseerSound/EffekseerSoundDSound.Sound.cpp rename to Dev/Cpp/EffekseerSoundDSound/EffekseerSoundDSound/EffekseerSoundDSound.Sound.cpp diff --git a/Dev/Cpp/EffekseerSoundDSound/EffekseerSound/EffekseerSoundDSound.SoundImplemented.h b/Dev/Cpp/EffekseerSoundDSound/EffekseerSoundDSound/EffekseerSoundDSound.SoundImplemented.h similarity index 100% rename from Dev/Cpp/EffekseerSoundDSound/EffekseerSound/EffekseerSoundDSound.SoundImplemented.h rename to Dev/Cpp/EffekseerSoundDSound/EffekseerSoundDSound/EffekseerSoundDSound.SoundImplemented.h diff --git a/Dev/Cpp/EffekseerSoundDSound/EffekseerSound/EffekseerSoundDSound.SoundLoader.cpp b/Dev/Cpp/EffekseerSoundDSound/EffekseerSoundDSound/EffekseerSoundDSound.SoundLoader.cpp similarity index 100% rename from Dev/Cpp/EffekseerSoundDSound/EffekseerSound/EffekseerSoundDSound.SoundLoader.cpp rename to Dev/Cpp/EffekseerSoundDSound/EffekseerSoundDSound/EffekseerSoundDSound.SoundLoader.cpp diff --git a/Dev/Cpp/EffekseerSoundDSound/EffekseerSound/EffekseerSoundDSound.SoundLoader.h b/Dev/Cpp/EffekseerSoundDSound/EffekseerSoundDSound/EffekseerSoundDSound.SoundLoader.h similarity index 100% rename from Dev/Cpp/EffekseerSoundDSound/EffekseerSound/EffekseerSoundDSound.SoundLoader.h rename to Dev/Cpp/EffekseerSoundDSound/EffekseerSoundDSound/EffekseerSoundDSound.SoundLoader.h diff --git a/Dev/Cpp/EffekseerSoundDSound/EffekseerSound/EffekseerSoundDSound.SoundPlayer.cpp b/Dev/Cpp/EffekseerSoundDSound/EffekseerSoundDSound/EffekseerSoundDSound.SoundPlayer.cpp similarity index 100% rename from Dev/Cpp/EffekseerSoundDSound/EffekseerSound/EffekseerSoundDSound.SoundPlayer.cpp rename to Dev/Cpp/EffekseerSoundDSound/EffekseerSoundDSound/EffekseerSoundDSound.SoundPlayer.cpp diff --git a/Dev/Cpp/EffekseerSoundDSound/EffekseerSound/EffekseerSoundDSound.SoundPlayer.h b/Dev/Cpp/EffekseerSoundDSound/EffekseerSoundDSound/EffekseerSoundDSound.SoundPlayer.h similarity index 100% rename from Dev/Cpp/EffekseerSoundDSound/EffekseerSound/EffekseerSoundDSound.SoundPlayer.h rename to Dev/Cpp/EffekseerSoundDSound/EffekseerSoundDSound/EffekseerSoundDSound.SoundPlayer.h diff --git a/Dev/Cpp/EffekseerSoundDSound/EffekseerSound/EffekseerSoundDSound.SoundVoice.cpp b/Dev/Cpp/EffekseerSoundDSound/EffekseerSoundDSound/EffekseerSoundDSound.SoundVoice.cpp similarity index 100% rename from Dev/Cpp/EffekseerSoundDSound/EffekseerSound/EffekseerSoundDSound.SoundVoice.cpp rename to Dev/Cpp/EffekseerSoundDSound/EffekseerSoundDSound/EffekseerSoundDSound.SoundVoice.cpp diff --git a/Dev/Cpp/EffekseerSoundDSound/EffekseerSound/EffekseerSoundDSound.SoundVoice.h b/Dev/Cpp/EffekseerSoundDSound/EffekseerSoundDSound/EffekseerSoundDSound.SoundVoice.h similarity index 100% rename from Dev/Cpp/EffekseerSoundDSound/EffekseerSound/EffekseerSoundDSound.SoundVoice.h rename to Dev/Cpp/EffekseerSoundDSound/EffekseerSoundDSound/EffekseerSoundDSound.SoundVoice.h diff --git a/Dev/Cpp/EffekseerSoundOSMixer/CMakeLists.txt b/Dev/Cpp/EffekseerSoundOSMixer/CMakeLists.txt index 0242bcb2b5..4d12e19e77 100644 --- a/Dev/Cpp/EffekseerSoundOSMixer/CMakeLists.txt +++ b/Dev/Cpp/EffekseerSoundOSMixer/CMakeLists.txt @@ -2,14 +2,14 @@ cmake_minimum_required(VERSION 3.15) project(EffekseerSoundOSMixer CXX) set(effekseer_sound_h - EffekseerSound/EffekseerSoundOSMixer.SoundImplemented.h - EffekseerSound/EffekseerSoundOSMixer.SoundLoader.h - EffekseerSound/EffekseerSoundOSMixer.SoundPlayer.h) + EffekseerSoundOSMixer/EffekseerSoundOSMixer.SoundImplemented.h + EffekseerSoundOSMixer/EffekseerSoundOSMixer.SoundLoader.h + EffekseerSoundOSMixer/EffekseerSoundOSMixer.SoundPlayer.h) set(effekseer_sound_src - EffekseerSound/EffekseerSoundOSMixer.Sound.cpp - EffekseerSound/EffekseerSoundOSMixer.SoundLoader.cpp - EffekseerSound/EffekseerSoundOSMixer.SoundPlayer.cpp) + EffekseerSoundOSMixer/EffekseerSoundOSMixer.Sound.cpp + EffekseerSoundOSMixer/EffekseerSoundOSMixer.SoundLoader.cpp + EffekseerSoundOSMixer/EffekseerSoundOSMixer.SoundPlayer.cpp) set(PublicHeaders EffekseerSoundOSMixer.h) @@ -45,7 +45,7 @@ target_link_libraries(${PROJECT_NAME} PUBLIC target_include_directories(${PROJECT_NAME} PUBLIC $ - $) + $) if(CLANG_FORMAT_ENABLED) clang_format(${PROJECT_NAME}) @@ -55,7 +55,7 @@ WarnError(${PROJECT_NAME}) foreach (file ${PublicHeaders}) get_filename_component(dir ${file} DIRECTORY) - install(FILES ${file} DESTINATION include/EffekseerSoundOSMixer/${dir}) + install(FILES ${file} DESTINATION include/${dir}) endforeach() install( diff --git a/Dev/Cpp/EffekseerSoundOSMixer/EffekseerSound/EffekseerSoundOSMixer.Sound.cpp b/Dev/Cpp/EffekseerSoundOSMixer/EffekseerSoundOSMixer/EffekseerSoundOSMixer.Sound.cpp similarity index 100% rename from Dev/Cpp/EffekseerSoundOSMixer/EffekseerSound/EffekseerSoundOSMixer.Sound.cpp rename to Dev/Cpp/EffekseerSoundOSMixer/EffekseerSoundOSMixer/EffekseerSoundOSMixer.Sound.cpp diff --git a/Dev/Cpp/EffekseerSoundOSMixer/EffekseerSound/EffekseerSoundOSMixer.SoundImplemented.h b/Dev/Cpp/EffekseerSoundOSMixer/EffekseerSoundOSMixer/EffekseerSoundOSMixer.SoundImplemented.h similarity index 100% rename from Dev/Cpp/EffekseerSoundOSMixer/EffekseerSound/EffekseerSoundOSMixer.SoundImplemented.h rename to Dev/Cpp/EffekseerSoundOSMixer/EffekseerSoundOSMixer/EffekseerSoundOSMixer.SoundImplemented.h diff --git a/Dev/Cpp/EffekseerSoundOSMixer/EffekseerSound/EffekseerSoundOSMixer.SoundLoader.cpp b/Dev/Cpp/EffekseerSoundOSMixer/EffekseerSoundOSMixer/EffekseerSoundOSMixer.SoundLoader.cpp similarity index 100% rename from Dev/Cpp/EffekseerSoundOSMixer/EffekseerSound/EffekseerSoundOSMixer.SoundLoader.cpp rename to Dev/Cpp/EffekseerSoundOSMixer/EffekseerSoundOSMixer/EffekseerSoundOSMixer.SoundLoader.cpp diff --git a/Dev/Cpp/EffekseerSoundOSMixer/EffekseerSound/EffekseerSoundOSMixer.SoundLoader.h b/Dev/Cpp/EffekseerSoundOSMixer/EffekseerSoundOSMixer/EffekseerSoundOSMixer.SoundLoader.h similarity index 100% rename from Dev/Cpp/EffekseerSoundOSMixer/EffekseerSound/EffekseerSoundOSMixer.SoundLoader.h rename to Dev/Cpp/EffekseerSoundOSMixer/EffekseerSoundOSMixer/EffekseerSoundOSMixer.SoundLoader.h diff --git a/Dev/Cpp/EffekseerSoundOSMixer/EffekseerSound/EffekseerSoundOSMixer.SoundPlayer.cpp b/Dev/Cpp/EffekseerSoundOSMixer/EffekseerSoundOSMixer/EffekseerSoundOSMixer.SoundPlayer.cpp similarity index 100% rename from Dev/Cpp/EffekseerSoundOSMixer/EffekseerSound/EffekseerSoundOSMixer.SoundPlayer.cpp rename to Dev/Cpp/EffekseerSoundOSMixer/EffekseerSoundOSMixer/EffekseerSoundOSMixer.SoundPlayer.cpp diff --git a/Dev/Cpp/EffekseerSoundOSMixer/EffekseerSound/EffekseerSoundOSMixer.SoundPlayer.h b/Dev/Cpp/EffekseerSoundOSMixer/EffekseerSoundOSMixer/EffekseerSoundOSMixer.SoundPlayer.h similarity index 100% rename from Dev/Cpp/EffekseerSoundOSMixer/EffekseerSound/EffekseerSoundOSMixer.SoundPlayer.h rename to Dev/Cpp/EffekseerSoundOSMixer/EffekseerSoundOSMixer/EffekseerSoundOSMixer.SoundPlayer.h diff --git a/Dev/Cpp/EffekseerSoundXAudio2/CMakeLists.txt b/Dev/Cpp/EffekseerSoundXAudio2/CMakeLists.txt index f2da14175e..0c39993adc 100644 --- a/Dev/Cpp/EffekseerSoundXAudio2/CMakeLists.txt +++ b/Dev/Cpp/EffekseerSoundXAudio2/CMakeLists.txt @@ -2,16 +2,16 @@ cmake_minimum_required(VERSION 3.15) project(EffekseerSoundXAudio2 CXX) set(effekseer_sound_h - EffekseerSound/EffekseerSoundXAudio2.SoundImplemented.h - EffekseerSound/EffekseerSoundXAudio2.SoundLoader.h - EffekseerSound/EffekseerSoundXAudio2.SoundPlayer.h - EffekseerSound/EffekseerSoundXAudio2.SoundVoice.h) + EffekseerSoundXAudio2/EffekseerSoundXAudio2.SoundImplemented.h + EffekseerSoundXAudio2/EffekseerSoundXAudio2.SoundLoader.h + EffekseerSoundXAudio2/EffekseerSoundXAudio2.SoundPlayer.h + EffekseerSoundXAudio2/EffekseerSoundXAudio2.SoundVoice.h) set(effekseer_sound_src - EffekseerSound/EffekseerSoundXAudio2.Sound.cpp - EffekseerSound/EffekseerSoundXAudio2.SoundLoader.cpp - EffekseerSound/EffekseerSoundXAudio2.SoundPlayer.cpp - EffekseerSound/EffekseerSoundXAudio2.SoundVoice.cpp) + EffekseerSoundXAudio2/EffekseerSoundXAudio2.Sound.cpp + EffekseerSoundXAudio2/EffekseerSoundXAudio2.SoundLoader.cpp + EffekseerSoundXAudio2/EffekseerSoundXAudio2.SoundPlayer.cpp + EffekseerSoundXAudio2/EffekseerSoundXAudio2.SoundVoice.cpp) set(PublicHeaders EffekseerSoundXAudio2.h) @@ -33,7 +33,7 @@ target_link_libraries(${PROJECT_NAME} PUBLIC target_include_directories(${PROJECT_NAME} PUBLIC $ - $) + $) if(CLANG_FORMAT_ENABLED) clang_format(${PROJECT_NAME}) @@ -43,7 +43,7 @@ WarnError(${PROJECT_NAME}) foreach (file ${PublicHeaders}) get_filename_component(dir ${file} DIRECTORY) - install(FILES ${file} DESTINATION include/EffekseerSoundXAudio2/${dir}) + install(FILES ${file} DESTINATION include/${dir}) endforeach() install( diff --git a/Dev/Cpp/EffekseerSoundXAudio2/EffekseerSound/EffekseerSoundXAudio2.Sound.cpp b/Dev/Cpp/EffekseerSoundXAudio2/EffekseerSoundXAudio2/EffekseerSoundXAudio2.Sound.cpp similarity index 100% rename from Dev/Cpp/EffekseerSoundXAudio2/EffekseerSound/EffekseerSoundXAudio2.Sound.cpp rename to Dev/Cpp/EffekseerSoundXAudio2/EffekseerSoundXAudio2/EffekseerSoundXAudio2.Sound.cpp diff --git a/Dev/Cpp/EffekseerSoundXAudio2/EffekseerSound/EffekseerSoundXAudio2.SoundImplemented.h b/Dev/Cpp/EffekseerSoundXAudio2/EffekseerSoundXAudio2/EffekseerSoundXAudio2.SoundImplemented.h similarity index 100% rename from Dev/Cpp/EffekseerSoundXAudio2/EffekseerSound/EffekseerSoundXAudio2.SoundImplemented.h rename to Dev/Cpp/EffekseerSoundXAudio2/EffekseerSoundXAudio2/EffekseerSoundXAudio2.SoundImplemented.h diff --git a/Dev/Cpp/EffekseerSoundXAudio2/EffekseerSound/EffekseerSoundXAudio2.SoundLoader.cpp b/Dev/Cpp/EffekseerSoundXAudio2/EffekseerSoundXAudio2/EffekseerSoundXAudio2.SoundLoader.cpp similarity index 100% rename from Dev/Cpp/EffekseerSoundXAudio2/EffekseerSound/EffekseerSoundXAudio2.SoundLoader.cpp rename to Dev/Cpp/EffekseerSoundXAudio2/EffekseerSoundXAudio2/EffekseerSoundXAudio2.SoundLoader.cpp diff --git a/Dev/Cpp/EffekseerSoundXAudio2/EffekseerSound/EffekseerSoundXAudio2.SoundLoader.h b/Dev/Cpp/EffekseerSoundXAudio2/EffekseerSoundXAudio2/EffekseerSoundXAudio2.SoundLoader.h similarity index 100% rename from Dev/Cpp/EffekseerSoundXAudio2/EffekseerSound/EffekseerSoundXAudio2.SoundLoader.h rename to Dev/Cpp/EffekseerSoundXAudio2/EffekseerSoundXAudio2/EffekseerSoundXAudio2.SoundLoader.h diff --git a/Dev/Cpp/EffekseerSoundXAudio2/EffekseerSound/EffekseerSoundXAudio2.SoundPlayer.cpp b/Dev/Cpp/EffekseerSoundXAudio2/EffekseerSoundXAudio2/EffekseerSoundXAudio2.SoundPlayer.cpp similarity index 100% rename from Dev/Cpp/EffekseerSoundXAudio2/EffekseerSound/EffekseerSoundXAudio2.SoundPlayer.cpp rename to Dev/Cpp/EffekseerSoundXAudio2/EffekseerSoundXAudio2/EffekseerSoundXAudio2.SoundPlayer.cpp diff --git a/Dev/Cpp/EffekseerSoundXAudio2/EffekseerSound/EffekseerSoundXAudio2.SoundPlayer.h b/Dev/Cpp/EffekseerSoundXAudio2/EffekseerSoundXAudio2/EffekseerSoundXAudio2.SoundPlayer.h similarity index 100% rename from Dev/Cpp/EffekseerSoundXAudio2/EffekseerSound/EffekseerSoundXAudio2.SoundPlayer.h rename to Dev/Cpp/EffekseerSoundXAudio2/EffekseerSoundXAudio2/EffekseerSoundXAudio2.SoundPlayer.h diff --git a/Dev/Cpp/EffekseerSoundXAudio2/EffekseerSound/EffekseerSoundXAudio2.SoundVoice.cpp b/Dev/Cpp/EffekseerSoundXAudio2/EffekseerSoundXAudio2/EffekseerSoundXAudio2.SoundVoice.cpp similarity index 100% rename from Dev/Cpp/EffekseerSoundXAudio2/EffekseerSound/EffekseerSoundXAudio2.SoundVoice.cpp rename to Dev/Cpp/EffekseerSoundXAudio2/EffekseerSoundXAudio2/EffekseerSoundXAudio2.SoundVoice.cpp diff --git a/Dev/Cpp/EffekseerSoundXAudio2/EffekseerSound/EffekseerSoundXAudio2.SoundVoice.h b/Dev/Cpp/EffekseerSoundXAudio2/EffekseerSoundXAudio2/EffekseerSoundXAudio2.SoundVoice.h similarity index 100% rename from Dev/Cpp/EffekseerSoundXAudio2/EffekseerSound/EffekseerSoundXAudio2.SoundVoice.h rename to Dev/Cpp/EffekseerSoundXAudio2/EffekseerSoundXAudio2/EffekseerSoundXAudio2.SoundVoice.h diff --git a/Dev/Cpp/Test/Backend/Mesh.cpp b/Dev/Cpp/Test/Backend/Mesh.cpp index 2dabe4a1ac..cc4f1bf5f8 100644 --- a/Dev/Cpp/Test/Backend/Mesh.cpp +++ b/Dev/Cpp/Test/Backend/Mesh.cpp @@ -4,9 +4,9 @@ #include #ifdef _WIN32 -#include "../../EffekseerRendererDX11/EffekseerRenderer/GraphicsDevice.h" -#include #include +#include +#include namespace DX11VS_Mesh { @@ -21,8 +21,8 @@ namespace DX11PS_Mesh #endif #undef None -#include "../../EffekseerRendererGL/EffekseerRenderer/GraphicsDevice.h" #include +#include #include #include "../Shaders/GLSL_GL_Header/mesh_ps.h" @@ -132,10 +132,12 @@ void Backend_Mesh(std::shared_ptr window) } #if !defined(__FROM_CI__) -TestRegister Test_Backend_Mesh_GL("Backend.Mesh_GL", []() -> void { Backend_Mesh(std::make_shared(std::array({1280, 720}), "Backend.Mesh")); }); +TestRegister Test_Backend_Mesh_GL("Backend.Mesh_GL", []() -> void + { Backend_Mesh(std::make_shared(std::array({1280, 720}), "Backend.Mesh")); }); #ifdef _WIN32 -TestRegister Test_Backend_Mesh_DX11("Backend.Mesh_DX11", []() -> void { Backend_Mesh(std::make_shared(std::array({1280, 720}), "Backend.Mesh")); }); +TestRegister Test_Backend_Mesh_DX11("Backend.Mesh_DX11", []() -> void + { Backend_Mesh(std::make_shared(std::array({1280, 720}), "Backend.Mesh")); }); #endif #endif \ No newline at end of file diff --git a/Dev/Cpp/Test/Backend/OpenGL.cpp b/Dev/Cpp/Test/Backend/OpenGL.cpp index 49ac76de84..028993455d 100644 --- a/Dev/Cpp/Test/Backend/OpenGL.cpp +++ b/Dev/Cpp/Test/Backend/OpenGL.cpp @@ -1,7 +1,7 @@ #include "../TestHelper.h" #include "Helper.h" -#include "../../../EffekseerRendererGL/EffekseerRenderer/GraphicsDevice.h" +#include #include #include @@ -21,6 +21,7 @@ void Backend_OpenGL() } #if !defined(__FROM_CI__) -TestRegister Test_Backend_OpenGL("Backend.OpenGL", []() -> void { Backend_OpenGL(); }); +TestRegister Test_Backend_OpenGL("Backend.OpenGL", []() -> void + { Backend_OpenGL(); }); #endif \ No newline at end of file diff --git a/Dev/Cpp/Test/Runtime/Vertex.cpp b/Dev/Cpp/Test/Runtime/Vertex.cpp index 4c3d9ff60e..a78069ea56 100644 --- a/Dev/Cpp/Test/Runtime/Vertex.cpp +++ b/Dev/Cpp/Test/Runtime/Vertex.cpp @@ -1,4 +1,4 @@ -#include "../../EffekseerRendererCommon/EffekseerRenderer.CommonUtils.h" +#include #include "../TestHelper.h" @@ -41,7 +41,8 @@ void VertexTest(bool isValidValue) auto alphaThreshold = EffekseerRenderer::GetVertexAlphaThreshold(v); - auto getExpect = [&](float value) -> float { + auto getExpect = [&](float value) -> float + { if (isValidValue) { return value; @@ -62,10 +63,11 @@ void VertexTest() { VertexTest(true); VertexTest(true); - //VertexTest(true); + // VertexTest(true); VertexTest(false); VertexTest(false); - //VertexTest(false); + // VertexTest(false); VertexTest(false); } -TestRegister Runtime_VertexTest("Runtime.Vertex", []() -> void { VertexTest(); }); +TestRegister Runtime_VertexTest("Runtime.Vertex", []() -> void + { VertexTest(); }); diff --git a/Dev/Cpp/TestRuntimeFramework/RenderingEnvironment/RenderingEnvironmentDX11.cpp b/Dev/Cpp/TestRuntimeFramework/RenderingEnvironment/RenderingEnvironmentDX11.cpp index 7f2ac2a6a3..9aa043a7d3 100644 --- a/Dev/Cpp/TestRuntimeFramework/RenderingEnvironment/RenderingEnvironmentDX11.cpp +++ b/Dev/Cpp/TestRuntimeFramework/RenderingEnvironment/RenderingEnvironmentDX11.cpp @@ -1,8 +1,7 @@ #include "RenderingEnvironmentDX11.h" #include #include - -#include "../../EffekseerRendererDX11/EffekseerRenderer/GraphicsDevice.h" +#include RenderingEnvironmentDX11::RenderingEnvironmentDX11(std::array windowSize, const char* title) : RenderingEnvironment(false, windowSize, title) diff --git a/Dev/Cpp/TestRuntimeFramework/Runtime/EffectPlatform.h b/Dev/Cpp/TestRuntimeFramework/Runtime/EffectPlatform.h index b083e1372c..6d4f709846 100644 --- a/Dev/Cpp/TestRuntimeFramework/Runtime/EffectPlatform.h +++ b/Dev/Cpp/TestRuntimeFramework/Runtime/EffectPlatform.h @@ -5,7 +5,7 @@ #include #include -#include "../../EffekseerRendererCommon/EffekseerRenderer.Renderer.h" +#include struct EffectPlatformInitializingParameter { diff --git a/Dev/Cpp/Viewer/3D/EffectRenderer.cpp b/Dev/Cpp/Viewer/3D/EffectRenderer.cpp index 6633828b6e..0ad0c9e11d 100644 --- a/Dev/Cpp/Viewer/3D/EffectRenderer.cpp +++ b/Dev/Cpp/Viewer/3D/EffectRenderer.cpp @@ -8,12 +8,12 @@ namespace WhiteParticle_Model_VS { -#include +#include } namespace WhiteParticle_Sprite_VS { -#include +#include } namespace WhiteParticle_PS @@ -33,7 +33,7 @@ namespace PostEffect_Overdraw_PS #endif -#include "../EffekseerRendererGL/EffekseerRenderer/EffekseerRendererGL.ModelRenderer.h" +#include #include "../Shaders/GLSL_GL_Header/line_ps.h" #include "../Shaders/GLSL_GL_Header/line_vs.h" @@ -46,8 +46,8 @@ namespace PostEffect_Overdraw_PS #include #include -#include "../EffekseerRendererGL/EffekseerRenderer/ShaderHeader/model_unlit_vs.h" -#include "../EffekseerRendererGL/EffekseerRenderer/ShaderHeader/sprite_unlit_vs.h" +#include +#include #include "../GUI/RenderImage.h" @@ -500,7 +500,8 @@ void EffectRenderer::ResizeScreen(const Vector2I& screenSize) hdrRenderTextureMSAA = nullptr; - const auto createRenderTexture = [&](Effekseer::Tool::Vector2I size, Effekseer::Backend::TextureFormatType format, int samples) { + const auto createRenderTexture = [&](Effekseer::Tool::Vector2I size, Effekseer::Backend::TextureFormatType format, int samples) + { Effekseer::Backend::TextureParameter param; param.Format = format; param.Size[0] = size.X; diff --git a/Dev/Cpp/Viewer/3D/MainScreenEffectRenderer.cpp b/Dev/Cpp/Viewer/3D/MainScreenEffectRenderer.cpp index a57dbadd8f..1bcd006821 100644 --- a/Dev/Cpp/Viewer/3D/MainScreenEffectRenderer.cpp +++ b/Dev/Cpp/Viewer/3D/MainScreenEffectRenderer.cpp @@ -1,9 +1,9 @@  #include "MainScreenEffectRenderer.h" #include "../3D/EffectRenderer.h" -#include "../EffekseerRendererCommon/EffekseerRenderer.PngTextureLoader.h" #include "../EffekseerTool/EffekseerTool.Guide.h" #include "../Graphics/GraphicsDevice.h" +#include #include #include diff --git a/Dev/Cpp/Viewer/GUI/efk.GUIManager.cpp b/Dev/Cpp/Viewer/GUI/efk.GUIManager.cpp index c013700f87..5a6a14bdd6 100644 --- a/Dev/Cpp/Viewer/GUI/efk.GUIManager.cpp +++ b/Dev/Cpp/Viewer/GUI/efk.GUIManager.cpp @@ -5,12 +5,11 @@ #ifdef _WIN32 #include "../Graphics/Platform/DX11/efk.GraphicsDX11.h" -#include +#include #endif -#include - -#include "../EffekseerRendererCommon/EffekseerRenderer.PngTextureLoader.h" +#include +#include #include "Image.h" #include "NodeFrameTimeline.h" @@ -2414,7 +2413,8 @@ bool GUIManager::GradientHDR(int32_t gradientID, Effekseer::Tool::GradientHDRSta bool GUIManager::BeginPlot(const char16_t* label, const Vec2& size, PlotFlags flags) { - return ImPlot::BeginPlot(utf8str<256>(label), ImVec2(size.X, size.Y), (ImPlotFlags)flags);; + return ImPlot::BeginPlot(utf8str<256>(label), ImVec2(size.X, size.Y), (ImPlotFlags)flags); + ; } void GUIManager::EndPlot() diff --git a/Dev/Cpp/Viewer/GUI/efk.Window.cpp b/Dev/Cpp/Viewer/GUI/efk.Window.cpp index 39f5e1b88b..aa98e53031 100644 --- a/Dev/Cpp/Viewer/GUI/efk.Window.cpp +++ b/Dev/Cpp/Viewer/GUI/efk.Window.cpp @@ -1,7 +1,7 @@ #include "efk.Window.h" -#include "../Effekseer/Effekseer/Effekseer.DefaultFile.h" -#include "../EffekseerRendererCommon/EffekseerRenderer.PngTextureLoader.h" #include +#include +#include #include #include #include @@ -126,7 +126,8 @@ bool Window::Initialize(std::shared_ptr mainWindow, Effek maximized = glfwGetWindowAttrib(window, GLFW_MAXIMIZED) > 0; - mainWindow_->DpiChanged = [this](float scale) -> void { GLFW_ContentScaleCallback(window, scale, 1.0f); }; + mainWindow_->DpiChanged = [this](float scale) -> void + { GLFW_ContentScaleCallback(window, scale, 1.0f); }; #ifdef _WIN32 if (mainWindow->IsFrameless()) @@ -227,7 +228,7 @@ void Window::Present() void Window::Close() { - //lfwSetWindowShouldClose(window, 1); + // lfwSetWindowShouldClose(window, 1); GLFW_CloseCallback(window); } diff --git a/Dev/Cpp/Viewer/Graphics/Platform/DX11/efk.GraphicsDX11.h b/Dev/Cpp/Viewer/Graphics/Platform/DX11/efk.GraphicsDX11.h index fa2495eccf..3c12686b01 100644 --- a/Dev/Cpp/Viewer/Graphics/Platform/DX11/efk.GraphicsDX11.h +++ b/Dev/Cpp/Viewer/Graphics/Platform/DX11/efk.GraphicsDX11.h @@ -2,9 +2,9 @@ #pragma once #include -#include -#include -#include +#include +#include +#include #include "../../efk.Graphics.h" diff --git a/Dev/Cpp/Viewer/Graphics/Platform/GL/efk.GraphicsGL.cpp b/Dev/Cpp/Viewer/Graphics/Platform/GL/efk.GraphicsGL.cpp index bc841df201..6623f89f95 100644 --- a/Dev/Cpp/Viewer/Graphics/Platform/GL/efk.GraphicsGL.cpp +++ b/Dev/Cpp/Viewer/Graphics/Platform/GL/efk.GraphicsGL.cpp @@ -5,8 +5,8 @@ #endif #include "efk.GraphicsGL.h" -#include -#include +#include +#include namespace efk { diff --git a/Dev/Cpp/Viewer/Graphics/Platform/GL/efk.GraphicsGL.h b/Dev/Cpp/Viewer/Graphics/Platform/GL/efk.GraphicsGL.h index a3d1d90305..69e0e537a7 100644 --- a/Dev/Cpp/Viewer/Graphics/Platform/GL/efk.GraphicsGL.h +++ b/Dev/Cpp/Viewer/Graphics/Platform/GL/efk.GraphicsGL.h @@ -2,9 +2,9 @@ #pragma once #include -#include -#include -#include +#include +#include +#include #include "../../efk.Graphics.h" diff --git a/Dev/Cpp/Viewer/Graphics/efk.Graphics.h b/Dev/Cpp/Viewer/Graphics/efk.Graphics.h index c6831c8f1b..7f18cd82eb 100644 --- a/Dev/Cpp/Viewer/Graphics/efk.Graphics.h +++ b/Dev/Cpp/Viewer/Graphics/efk.Graphics.h @@ -6,9 +6,9 @@ #include #include -#include "../../EffekseerRendererCommon/EffekseerRenderer.Renderer.h" #include "../Math/Vector2I.h" #include "../Parameters.h" +#include namespace efk { From d5c1c1f72c7962168850eac607460168001024b4 Mon Sep 17 00:00:00 2001 From: durswd Date: Sat, 18 Nov 2023 17:55:12 +0900 Subject: [PATCH 2/4] fix --- .../EffekseerRendererMetal.Renderer.mm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/EffekseerRendererMetal.Renderer.mm b/Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/EffekseerRendererMetal.Renderer.mm index d54434f5c9..5fc47fd43d 100644 --- a/Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/EffekseerRendererMetal.Renderer.mm +++ b/Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/EffekseerRendererMetal.Renderer.mm @@ -1,7 +1,7 @@ #include "EffekseerRendererMetal.Renderer.h" -#include "../../EffekseerRendererCommon/EffekseerRenderer.CommonUtils.h" -#include "../../EffekseerRendererLLGI/EffekseerRendererLLGI.Shader.h" -#include "../../EffekseerRendererLLGI/EffekseerRendererLLGI.MaterialLoader.h" +#include +#include +#include #include "../../3rdParty/LLGI/src/Metal/LLGI.CommandListMetal.h" #include "../../3rdParty/LLGI/src/Metal/LLGI.GraphicsMetal.h" #include "../../3rdParty/LLGI/src/Metal/LLGI.RenderPassMetal.h" From b9483635646c1ff6cabf9d2567a1eaad43c63258 Mon Sep 17 00:00:00 2001 From: durswd Date: Sat, 18 Nov 2023 17:57:24 +0900 Subject: [PATCH 3/4] fix --- .../EffekseerRendererDX9/EffekseerRendererDX9.Renderer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/EffekseerRendererDX9.Renderer.h b/Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/EffekseerRendererDX9.Renderer.h index 35782d565c..d13400f18d 100644 --- a/Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/EffekseerRendererDX9.Renderer.h +++ b/Dev/Cpp/EffekseerRendererDX9/EffekseerRendererDX9/EffekseerRendererDX9.Renderer.h @@ -5,7 +5,7 @@ //---------------------------------------------------------------------------------- // Include //---------------------------------------------------------------------------------- -#include "EffekseerRendererDX9.Base.h" +#include "EffekseerRendererDX9.Base.Pre.h" #include //---------------------------------------------------------------------------------- From 864e76ff3bb7f0bdb722942b566c8059b39e164f Mon Sep 17 00:00:00 2001 From: durswd Date: Sat, 18 Nov 2023 18:49:20 +0900 Subject: [PATCH 4/4] fix --- .../EffekseerRendererDX12/EffekseerRendererDX12.Renderer.h | 2 +- .../EffekseerRendererMetal/EffekseerRendererMetal.Renderer.h | 4 ++-- .../EffekseerRendererVulkan.Renderer.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/EffekseerRendererDX12.Renderer.h b/Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/EffekseerRendererDX12.Renderer.h index 44fd0f3ce0..e4637fdf26 100644 --- a/Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/EffekseerRendererDX12.Renderer.h +++ b/Dev/Cpp/EffekseerRendererDX12/EffekseerRendererDX12/EffekseerRendererDX12.Renderer.h @@ -2,7 +2,7 @@ #ifndef __EFFEKSEERRENDERER_DX12_RENDERER_H__ #define __EFFEKSEERRENDERER_DX12_RENDERER_H__ -#include "EffekseerRendererDX12.Base.h" +#include "EffekseerRendererDX12.Base.Pre.h" #include #include diff --git a/Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/EffekseerRendererMetal.Renderer.h b/Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/EffekseerRendererMetal.Renderer.h index e5f971e48a..dcdfa544e6 100644 --- a/Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/EffekseerRendererMetal.Renderer.h +++ b/Dev/Cpp/EffekseerRendererMetal/EffekseerRendererMetal/EffekseerRendererMetal.Renderer.h @@ -2,8 +2,8 @@ #ifndef __EFFEKSEERRENDERER_METAL_RENDERER_H__ #define __EFFEKSEERRENDERER_METAL_RENDERER_H__ -#include "../../EffekseerRendererCommon/EffekseerRenderer.Renderer.h" -#include "EffekseerRendererMetal.Base.h" +#include +#include "EffekseerRendererMetal.Base.Pre.h" #include #import diff --git a/Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/EffekseerRendererVulkan.Renderer.h b/Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/EffekseerRendererVulkan.Renderer.h index dd5b7a5dfd..4d0b04b88f 100644 --- a/Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/EffekseerRendererVulkan.Renderer.h +++ b/Dev/Cpp/EffekseerRendererVulkan/EffekseerRendererVulkan/EffekseerRendererVulkan.Renderer.h @@ -2,7 +2,7 @@ #ifndef __EFFEKSEERRENDERER_VULKAN_RENDERER_H__ #define __EFFEKSEERRENDERER_VULKAN_RENDERER_H__ -#include "EffekseerRendererVulkan.Base.h" +#include "EffekseerRendererVulkan.Base.Pre.h" #include #include