diff --git a/Dev/Cpp/Effekseer/Effekseer/Parameter/GpuParticlesParameter.cpp b/Dev/Cpp/Effekseer/Effekseer/Parameter/GpuParticlesParameter.cpp index b6582fa1d2..cbc86ece02 100644 --- a/Dev/Cpp/Effekseer/Effekseer/Parameter/GpuParticlesParameter.cpp +++ b/Dev/Cpp/Effekseer/Effekseer/Parameter/GpuParticlesParameter.cpp @@ -47,10 +47,10 @@ GpuParticles::ParamSet LoadGpuParticlesParameter(uint8_t*& pos, int32_t version) break; } - paramSet.Position.Direction = Read(pos); - paramSet.Position.Spread = Read(pos); - paramSet.Position.InitialSpeed = Read>(pos); - paramSet.Position.Damping = Read>(pos); + paramSet.Velocity.Direction = Read(pos); + paramSet.Velocity.Spread = Read(pos); + paramSet.Velocity.InitialSpeed = Read>(pos); + paramSet.Velocity.Damping = Read>(pos); paramSet.Rotation.Offset = Read>(pos); paramSet.Rotation.Velocity = Read>(pos); diff --git a/Dev/Cpp/Effekseer/Effekseer/Renderer/Effekseer.GpuParticles.h b/Dev/Cpp/Effekseer/Effekseer/Renderer/Effekseer.GpuParticles.h index 09fa2a4616..a952f53fc4 100644 --- a/Dev/Cpp/Effekseer/Effekseer/Renderer/Effekseer.GpuParticles.h +++ b/Dev/Cpp/Effekseer/Effekseer/Renderer/Effekseer.GpuParticles.h @@ -175,14 +175,14 @@ struct ParamSet }; EmitShapeParams EmitShape; - struct PositionParams + struct VelocityParams { float3 Direction; float Spread; std::array InitialSpeed; std::array Damping; }; - PositionParams Position; + VelocityParams Velocity; struct RotationParams { diff --git a/Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/EffekseerRenderer.GpuParticles.cpp b/Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/EffekseerRenderer.GpuParticles.cpp index 7a413e8e75..630d8fe68a 100644 --- a/Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/EffekseerRenderer.GpuParticles.cpp +++ b/Dev/Cpp/EffekseerRendererCommon/EffekseerRendererCommon/EffekseerRenderer.GpuParticles.cpp @@ -248,10 +248,10 @@ GpuParticles::ParameterData GpuParticleFactory::ToParamData(const Effekseer::Gpu data.EmitShapeData[0] = paramSet.EmitShape.Data[0]; data.EmitShapeData[1] = paramSet.EmitShape.Data[1]; - data.Direction = paramSet.Position.Direction; - data.Spread = paramSet.Position.Spread; - data.InitialSpeed = paramSet.Position.InitialSpeed; - data.Damping = paramSet.Position.Damping; + data.Direction = paramSet.Velocity.Direction; + data.Spread = paramSet.Velocity.Spread; + data.InitialSpeed = paramSet.Velocity.InitialSpeed; + data.Damping = paramSet.Velocity.Damping; data.AngularOffset[0] = float4(paramSet.Rotation.Offset[0], 0.0f); data.AngularOffset[1] = float4(paramSet.Rotation.Offset[1], 0.0f); diff --git a/Dev/Editor/EffekseerCore/Binary/GpuParticlesValues.cs b/Dev/Editor/EffekseerCore/Binary/GpuParticlesValues.cs index 301d83829b..74bf75cb73 100644 --- a/Dev/Editor/EffekseerCore/Binary/GpuParticlesValues.cs +++ b/Dev/Editor/EffekseerCore/Binary/GpuParticlesValues.cs @@ -57,10 +57,10 @@ public static byte[] GetBytes(Data.GpuParticlesValues value, break; } - data.Add(value.Position.Direction.GetBytes()); - data.Add(value.Position.Spread.GetBytes()); - data.Add(value.Position.InitialSpeed.GetBytes()); - data.Add(value.Position.Damping.GetBytes()); + data.Add(value.Velocity.Direction.GetBytes()); + data.Add(value.Velocity.Spread.GetBytes()); + data.Add(value.Velocity.InitialSpeed.GetBytes()); + data.Add(value.Velocity.Damping.GetBytes()); data.Add(value.Rotation.InitialAngle.GetBytes()); data.Add(value.Rotation.AngularVelocity.GetBytes()); diff --git a/Dev/Editor/EffekseerCore/Data/GpuParticles.cs b/Dev/Editor/EffekseerCore/Data/GpuParticles.cs index e6c516b68d..fe19892c67 100644 --- a/Dev/Editor/EffekseerCore/Data/GpuParticles.cs +++ b/Dev/Editor/EffekseerCore/Data/GpuParticles.cs @@ -94,18 +94,18 @@ public EmitShapeParams(Value.Path basepath) } } - public class PositionParams + public class VelocityParams { - [Key(key = "GpuParticles_Position_Direction")] + [Key(key = "GpuParticles_Velocity_Direction")] public Value.Vector3D Direction { get; private set; } = new Value.Vector3D(0.0f, 0.0f, 1.0f); - [Key(key = "GpuParticles_Position_Spread")] + [Key(key = "GpuParticles_Velocity_Spread")] public Value.Float Spread { get; private set; } = new Value.Float(value: 15.0f, min: 0.0f, max: 180.0f); - [Key(key = "GpuParticles_Position_InitialSpeed")] + [Key(key = "GpuParticles_Velocity_InitialSpeed")] public Value.FloatWithRandom InitialSpeed { get; private set; } = new Value.FloatWithRandom(value: 1.0f); - [Key(key = "GpuParticles_Position_Damping")] + [Key(key = "GpuParticles_Velocity_Damping")] public Value.FloatWithRandom Damping { get; private set; } = new Value.FloatWithRandom(value: 0.0f, min: 0.0f); } @@ -371,8 +371,8 @@ public RenderMaterialParams(Value.Path basepath) [IO(Export = true)] [Selected(ID = 0, Value = 1)] - [TreeNode(id = "GpuParticles_Position", key = "GpuParticles_Position")] - public PositionParams Position { get; private set; } = new PositionParams(); + [TreeNode(id = "GpuParticles_Velocity", key = "GpuParticles_Velocity")] + public VelocityParams Velocity { get; private set; } = new VelocityParams(); [IO(Export = true)] [Selected(ID = 0, Value = 1)] diff --git a/Dev/release/resources/languages/en/Effekseer_GpuParticles.csv b/Dev/release/resources/languages/en/Effekseer_GpuParticles.csv index 8227984ffa..c20b12ff1b 100644 --- a/Dev/release/resources/languages/en/Effekseer_GpuParticles.csv +++ b/Dev/release/resources/languages/en/Effekseer_GpuParticles.csv @@ -41,15 +41,15 @@ GpuParticles_EmitShape_ModelSize_Desc,Size of mesh shape. GpuParticles_EmitShape_RotationApplied_Name,Set angle on spawn GpuParticles_EmitShape_RotationApplied_Desc,Valid for circles, spheres, and models -GpuParticles_Position_Name,Position -GpuParticles_Position_Direction_Name,Direction -GpuParticles_Position_Direction_Desc,Direction of movement when spawning particles. -GpuParticles_Position_Spread_Name,Spread -GpuParticles_Position_Spread_Desc,Angle of random diffusion in the direction of movement when spawning particles. -GpuParticles_Position_InitialSpeed_Name,Initial Speed -GpuParticles_Position_InitialSpeed_Desc,Initial speed of movement when spawning particles. -GpuParticles_Position_Damping_Name,Damping -GpuParticles_Position_Damping_Desc,Damping force during particle motion. +GpuParticles_Velocity_Name,Velocity +GpuParticles_Velocity_Direction_Name,Direction +GpuParticles_Velocity_Direction_Desc,Direction of movement when spawning particles. +GpuParticles_Velocity_Spread_Name,Spread +GpuParticles_Velocity_Spread_Desc,Angle of random diffusion in the direction of movement when spawning particles. +GpuParticles_Velocity_InitialSpeed_Name,Initial Speed +GpuParticles_Velocity_InitialSpeed_Desc,Initial speed of movement when spawning particles. +GpuParticles_Velocity_Damping_Name,Damping +GpuParticles_Velocity_Damping_Desc,Damping force during particle motion. GpuParticles_Rotation_Name,Rotation GpuParticles_Rotation_InitialAngle_Name,Initial Angle diff --git a/Dev/release/resources/languages/es/Effekseer_GpuParticles.csv b/Dev/release/resources/languages/es/Effekseer_GpuParticles.csv index 69d1cda4ec..8e191a9a47 100644 --- a/Dev/release/resources/languages/es/Effekseer_GpuParticles.csv +++ b/Dev/release/resources/languages/es/Effekseer_GpuParticles.csv @@ -41,15 +41,15 @@ GpuParticles_EmitShape_ModelSize_Desc,Tamaño de la forma de la malla. GpuParticles_EmitShape_RotationApplied_Name,Ajustar ángulo en la Aparición GpuParticles_EmitShape_RotationApplied_Desc,Válido para círculo, esfera y modelo -GpuParticles_Position_Name,Posición -GpuParticles_Position_Direction_Name,Dirección -GpuParticles_Position_Direction_Desc,Dirección de movimiento cuando se generan partículas. -GpuParticles_Position_Spread_Name,Dispersión -GpuParticles_Position_Spread_Desc,Ángulo de difusión aleatoria en la dirección del movimiento cuando se generan partículas. -GpuParticles_Position_InitialSpeed_Name,Velocidad Inicial -GpuParticles_Position_InitialSpeed_Desc,Velocidad inicial del movimiento al desovar partículas. -GpuParticles_Position_Damping_Name,Amortiguación -GpuParticles_Position_Damping_Desc,Fuerza de amortiguación durante el movimiento de las partículas. +GpuParticles_Velocity_Name,Velocidad +GpuParticles_Velocity_Direction_Name,Dirección +GpuParticles_Velocity_Direction_Desc,Dirección de movimiento cuando se generan partículas. +GpuParticles_Velocity_Spread_Name,Dispersión +GpuParticles_Velocity_Spread_Desc,Ángulo de difusión aleatoria en la dirección del movimiento cuando se generan partículas. +GpuParticles_Velocity_InitialSpeed_Name,Velocidad Inicial +GpuParticles_Velocity_InitialSpeed_Desc,Velocidad inicial del movimiento al desovar partículas. +GpuParticles_Velocity_Damping_Name,Amortiguación +GpuParticles_Velocity_Damping_Desc,Fuerza de amortiguación durante el movimiento de las partículas. GpuParticles_Rotation_Name,Rotación GpuParticles_Rotation_InitialAngle_Name,Ángulo inicial diff --git a/Dev/release/resources/languages/ja/Effekseer_GpuParticles.csv b/Dev/release/resources/languages/ja/Effekseer_GpuParticles.csv index 9aef088c0d..cccdc72587 100644 --- a/Dev/release/resources/languages/ja/Effekseer_GpuParticles.csv +++ b/Dev/release/resources/languages/ja/Effekseer_GpuParticles.csv @@ -41,15 +41,15 @@ GpuParticles_EmitShape_ModelSize_Desc,モデル形状のサイズ GpuParticles_EmitShape_RotationApplied_Name,生成角度に影響 GpuParticles_EmitShape_RotationApplied_Desc,円、球、モデルで有効 -GpuParticles_Position_Name,位置 -GpuParticles_Position_Direction_Name,移動方向 -GpuParticles_Position_Direction_Desc,パーティクル生成時の移動方向 -GpuParticles_Position_Spread_Name,拡散角度 -GpuParticles_Position_Spread_Desc,パーティクル生成時の移動方向のランダムに拡散する角度 -GpuParticles_Position_InitialSpeed_Name,初期速度 -GpuParticles_Position_InitialSpeed_Desc,パーティクル生成時の速さ -GpuParticles_Position_Damping_Name,速度減衰 -GpuParticles_Position_Damping_Desc,パーティクル運動時の減衰力 +GpuParticles_Velocity_Name,速度 +GpuParticles_Velocity_Direction_Name,方向 +GpuParticles_Velocity_Direction_Desc,パーティクル生成時の移動方向 +GpuParticles_Velocity_Spread_Name,拡散角度 +GpuParticles_Velocity_Spread_Desc,パーティクル生成時の移動方向のランダムに拡散する角度 +GpuParticles_Velocity_InitialSpeed_Name,初期速度 +GpuParticles_Velocity_InitialSpeed_Desc,パーティクル生成時の速さ +GpuParticles_Velocity_Damping_Name,速度減衰 +GpuParticles_Velocity_Damping_Desc,パーティクル運動時の減衰力 GpuParticles_Rotation_Name,回転 GpuParticles_Rotation_InitialAngle_Name,初期角度 diff --git a/Examples/Resources/GpuParticles_emit_line.efkefc b/Examples/Resources/GpuParticles_emit_line.efkefc index 6ecf0a767e..65a38535ec 100644 Binary files a/Examples/Resources/GpuParticles_emit_line.efkefc and b/Examples/Resources/GpuParticles_emit_line.efkefc differ diff --git a/Examples/Resources/GpuParticles_emit_mesh.efkefc b/Examples/Resources/GpuParticles_emit_mesh.efkefc index b8e32c9079..803210f0bb 100644 Binary files a/Examples/Resources/GpuParticles_emit_mesh.efkefc and b/Examples/Resources/GpuParticles_emit_mesh.efkefc differ diff --git a/Examples/Resources/GpuParticles_emit_sphere.efkefc b/Examples/Resources/GpuParticles_emit_sphere.efkefc index 015282886f..a3f00feb7b 100644 Binary files a/Examples/Resources/GpuParticles_emit_sphere.efkefc and b/Examples/Resources/GpuParticles_emit_sphere.efkefc differ diff --git a/Examples/Resources/GpuParticles_force_turbulence.efkefc b/Examples/Resources/GpuParticles_force_turbulence.efkefc index 01ff3f3c25..b3e0e48d21 100644 Binary files a/Examples/Resources/GpuParticles_force_turbulence.efkefc and b/Examples/Resources/GpuParticles_force_turbulence.efkefc differ diff --git a/Examples/Resources/GpuParticles_force_vortex.efkefc b/Examples/Resources/GpuParticles_force_vortex.efkefc index 1ec815d301..0868abf5e7 100644 Binary files a/Examples/Resources/GpuParticles_force_vortex.efkefc and b/Examples/Resources/GpuParticles_force_vortex.efkefc differ diff --git a/Examples/Resources/GpuParticles_mesh_simple.efkefc b/Examples/Resources/GpuParticles_mesh_simple.efkefc index b151df22bd..d5b794ef1a 100644 Binary files a/Examples/Resources/GpuParticles_mesh_simple.efkefc and b/Examples/Resources/GpuParticles_mesh_simple.efkefc differ diff --git a/Examples/Resources/GpuParticles_sprite_directional.efkefc b/Examples/Resources/GpuParticles_sprite_directional.efkefc index 75a46f7fdc..e04e05d085 100644 Binary files a/Examples/Resources/GpuParticles_sprite_directional.efkefc and b/Examples/Resources/GpuParticles_sprite_directional.efkefc differ diff --git a/Examples/Resources/GpuParticles_sprite_mass.efkefc b/Examples/Resources/GpuParticles_sprite_mass.efkefc index 2bdca1b264..d35cb8fc2d 100644 Binary files a/Examples/Resources/GpuParticles_sprite_mass.efkefc and b/Examples/Resources/GpuParticles_sprite_mass.efkefc differ diff --git a/Examples/Resources/GpuParticles_sprite_simple.efkefc b/Examples/Resources/GpuParticles_sprite_simple.efkefc index 5f242e9bb3..6cf394a2ba 100644 Binary files a/Examples/Resources/GpuParticles_sprite_simple.efkefc and b/Examples/Resources/GpuParticles_sprite_simple.efkefc differ diff --git a/Examples/Resources/GpuParticles_trails_simple.efkefc b/Examples/Resources/GpuParticles_trails_simple.efkefc index 8074ebd1bc..94a552066e 100644 Binary files a/Examples/Resources/GpuParticles_trails_simple.efkefc and b/Examples/Resources/GpuParticles_trails_simple.efkefc differ