update latest asset pipeline (#438)

meta4d-me · Dec 15, 2023 · 0c4504d · 0c4504d
1 parent 247fcac
commit 0c4504d
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 9 deletions.
diff --git a/Engine/Source/Editor/ECWorld/ECWorldConsumer.cpp b/Engine/Source/Editor/ECWorld/ECWorldConsumer.cpp
@@ -250,7 +250,7 @@ void ECWorldConsumer::AddAnimation(engine::Entity entity, const cd::Animation& a
 	animationComponent.SetAnimationData(&animation);
 	animationComponent.SetTrackData(pSceneDatabase->GetTracks().data());
 	animationComponent.SetDuration(animation.GetDuration());
-	animationComponent.SetTicksPerSecond(animation.GetTicksPerSecnod());
+	animationComponent.SetTicksPerSecond(animation.GetTicksPerSecond());
 
 	bgfx::UniformHandle boneMatricesUniform = bgfx::createUniform("u_boneMatrices", bgfx::UniformType::Mat4, 128);
 	animationComponent.SetBoneMatricesUniform(boneMatricesUniform.idx);

diff --git a/Engine/Source/Runtime/Core/Types.h b/Engine/Source/Runtime/Core/Types.h
@@ -0,0 +1,5 @@
+#pragma once
+
+#include "Base/Template.h"
+#include "Core/StringCrc.h"
+#include "Scene/Types.h"
diff --git a/Engine/Source/Runtime/Display/CameraController.h b/Engine/Source/Runtime/Display/CameraController.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "Core/Types.h"
 #include "ECWorld/TransformComponent.h"
 #include "Math/Box.hpp"
 #include "Math/Transform.hpp"

diff --git a/Engine/Source/Runtime/ECWorld/CameraComponent.h b/Engine/Source/Runtime/ECWorld/CameraComponent.h
@@ -1,9 +1,8 @@
 #pragma once
 
-#include "Core/StringCrc.h"
+#include "Core/Types.h"
 #include "Math/Box.hpp"
 #include "Math/Ray.hpp"
-#include "Math/Transform.hpp"
 
 namespace cd
 {

diff --git a/Engine/Source/Runtime/ECWorld/LightComponent.h b/Engine/Source/Runtime/ECWorld/LightComponent.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Core/StringCrc.h"
+#include "Core/Types.h"
 #include "Rendering/LightUniforms.h"
 #include "Scene/LightType.h"
 

diff --git a/Engine/Source/Runtime/ECWorld/SkyComponent.h b/Engine/Source/Runtime/ECWorld/SkyComponent.h
@@ -1,8 +1,6 @@
 #pragma once
 
-#include "Base/Template.h"
-#include "Core/StringCrc.h"
-#include "Math/Vector.hpp"
+#include "Core/Types.h"
 #include "Rendering/SkyType.h"
 
 #include <string>

diff --git a/Engine/Source/Runtime/Rendering/AnimationRenderer.cpp b/Engine/Source/Runtime/Rendering/AnimationRenderer.cpp
@@ -199,7 +199,7 @@ void AnimationRenderer::Render(float deltaTime)
 		AnimationComponent* pAnimationComponent = m_pCurrentSceneWorld->GetAnimationComponent(entity);
 
 		const cd::Animation* pAnimation = pAnimationComponent->GetAnimationData();
-		float ticksPerSecond = pAnimation->GetTicksPerSecnod();
+		float ticksPerSecond = pAnimation->GetTicksPerSecond();
 		assert(ticksPerSecond > 1.0f);
 		float animationTime = details::CustomFModf(animationRunningTime * ticksPerSecond, pAnimation->GetDuration());
 

diff --git a/Engine/Source/ThirdParty/AssetPipeline b/Engine/Source/ThirdParty/AssetPipeline
+0 −1		private/Consumers/CDConsumer/CDConsumerImpl.cpp
+3 −3		private/Framework/ProcessorImpl.cpp
+0 −1		private/Producers/FbxProducer/FbxProducerImpl.cpp
+18 −5		private/Producers/GenericProducer/GenericProducerImpl.cpp
+1 −1		private/ProgressiveMesh/Face.h
+0 −1		private/ProgressiveMesh/ProgressiveMeshImpl.h
+1 −1		private/ProgressiveMesh/Vertex.h
+5 −42		private/Scene/Animation.cpp
+2 −2		private/Scene/AnimationImpl.cpp
+9 −25		private/Scene/AnimationImpl.h
+6 −62		private/Scene/Bone.cpp
+2 −2		private/Scene/BoneImpl.cpp
+9 −29		private/Scene/BoneImpl.h
+9 −107		private/Scene/Camera.cpp
+2 −2		private/Scene/CameraImpl.cpp
+10 −43		private/Scene/CameraImpl.h
+14 −172		private/Scene/Light.cpp
+2 −2		private/Scene/LightImpl.cpp
+16 −68		private/Scene/LightImpl.h
+3 −12		private/Scene/Material.cpp
+3 −3		private/Scene/MaterialImpl.cpp
+5 −11		private/Scene/MaterialImpl.h
+12 −57		private/Scene/Mesh.cpp
+36 −32		private/Scene/MeshImpl.cpp
+13 −41		private/Scene/MeshImpl.h
+10 −33		private/Scene/Morph.cpp
+11 −11		private/Scene/MorphImpl.cpp
+11 −33		private/Scene/MorphImpl.h
+6 −67		private/Scene/Node.cpp
+2 −2		private/Scene/NodeImpl.cpp
+10 −32		private/Scene/NodeImpl.h
+1 −1		private/Scene/ObjectIDGenerator.h
+9 −102		private/Scene/ParticleEmitter.cpp
+3 −3		private/Scene/ParticleEmitterImpl.cpp
+10 −43		private/Scene/ParticleEmitterImpl.h
+2 −2		private/Scene/SceneDatabaseImpl.cpp
+14 −112		private/Scene/Texture.cpp
+9 −21		private/Scene/TextureImpl.cpp
+20 −80		private/Scene/TextureImpl.h
+5 −5		private/Scene/Track.cpp
+3 −3		private/Scene/TrackImpl.cpp
+6 −14		private/Scene/TrackImpl.h
+1 −63		public/Base/Export.h
+1 −1		public/HalfEdgeMesh/ForwardDecls.h
+1 −1		public/HalfEdgeMesh/HalfEdgeMesh.h
+0 −5		public/Math/Vector.hpp
+2 −2		public/Producers/TerrainProducer/AlphaMapTypes.h
+1 −1		public/ProgressiveMesh/ProgressiveMesh.h
+1 −1		public/PropertyMap/PropertyMap.hpp
+108 −0		public/Scene/APIMacros.h
+207 −0		public/Scene/APITypeTraits.inl
+6 −14		public/Scene/Animation.h
+7 −19		public/Scene/Bone.h
+10 −31		public/Scene/Camera.h
+15 −49		public/Scene/Light.h
+4 −6		public/Scene/Material.h
+13 −22		public/Scene/Mesh.h
+11 −17		public/Scene/Morph.h
+7 −20		public/Scene/Node.h
+0 −34		public/Scene/ObjectID.h
+10 −41		public/Scene/ParticleEmitter.h
+17 −0		public/Scene/ParticleEmitterType.h
+15 −39		public/Scene/Texture.h
+6 −7		public/Scene/Track.h
+56 −0		public/Scene/Types.h
+0 −1		public/Scene/VertexAttribute.h