Develop

build_scripts/build.py

@@ -776,7 +776,7 @@ def execbuildscript(filepath):
 		)
 		add_pragma_module(
 			name="pr_dmx",
-			commitSha="f818ed1",
+			commitSha="f818ed1954705d98739ad59ad6e8d928e910aca1",
 			repositoryUrl="https://github.com/Silverlan/pr_dmx.git"
 		)
 	if with_all_pfm_modules:
@@ -790,16 +790,6 @@ def execbuildscript(filepath):
 			commitSha="6e64315dbcb855a098f3bce4746c30da1c89faba",
 			repositoryUrl="https://github.com/Silverlan/pr_cycles.git"
 		)
-		add_pragma_module(
-			name="pr_curl",
-			commitSha="d49b477d77310737fd5f88d49e35b7db58f9718c",
-			repositoryUrl="https://github.com/Silverlan/pr_curl.git"
-		)
-		add_pragma_module(
-			name="pr_dmx",
-			commitSha="f818ed1",
-			repositoryUrl="https://github.com/Silverlan/pr_dmx.git"
-		)
 		add_pragma_module(
 			name="pr_xatlas",
 			commitSha="485eaad",
@@ -1042,7 +1032,7 @@ def download_addon(name,addonName,url,commitId=None):
 curDir = os.getcwd()
 if not skip_repository_updates:
 	if with_pfm:
-		download_addon("PFM","filmmaker","https://github.com/Silverlan/pfm.git","50ef957cf29ceef7e97f0abfb82731b78407ac01")
+		download_addon("PFM","filmmaker","https://github.com/Silverlan/pfm.git","4d2579c26ffbb04b241dd9d18288f02d821a8481")
 		download_addon("model editor","tool_model_editor","https://github.com/Silverlan/pragma_model_editor.git","56d46dacb398fa7540e794359eaf1081c9df1edd")
 
 	if with_vr:

core/client/src/debug/c_debugoverlay.cpp

@@ -331,7 +331,7 @@ std::shared_ptr<DebugRenderer::BaseObject> DebugRenderer::DrawBox(const Vector3
 {
 	auto center = (end + start) * 0.5f;
 	auto *poutlineColor = renderInfo.outlineColor ? &*renderInfo.outlineColor : nullptr;
-	return draw_box(renderInfo.pose.GetOrigin(), start - center, end - center, renderInfo, poutlineColor);
+	return draw_box(renderInfo.pose.GetOrigin() +center, start - center, end - center, renderInfo, poutlineColor);
 }
 static WIText *create_text_element(const std::string &text)
 {

core/shared/include/pragma/entities/components/base_animated_component.hpp

@@ -159,6 +159,7 @@ namespace pragma {
 		bool PlayLayeredActivity(int slot, Activity activity, FPlayAnim flags = FPlayAnim::Default);
 		bool PlayLayeredAnimation(int slot, std::string animation, FPlayAnim flags = FPlayAnim::Default);
 		virtual void StopLayeredAnimation(int slot);
+		void StopLayeredAnimations();
 		bool PlayAnimation(const std::string &animation, FPlayAnim flags = FPlayAnim::Default);
 		void SetPlaybackRate(float rate);
 		float GetPlaybackRate() const;

core/shared/src/entities/components/base_animated_component.cpp

@@ -1154,6 +1154,15 @@ bool BaseAnimatedComponent::PlayLayeredActivity(int slot, Activity activity, FPl
 		animInfo->activity = activity;
 	return (seq == -1) ? false : true;
 }
+void BaseAnimatedComponent::StopLayeredAnimations()
+{
+	std::vector<uint32_t> curSlots;
+	curSlots.reserve(m_animSlots.size());
+	for(auto &[slotId, slotInfo] : m_animSlots)
+		curSlots.push_back(slotId);
+	for(auto slotId : curSlots)
+		StopLayeredAnimation(slotId);
+}
 void BaseAnimatedComponent::StopLayeredAnimation(int slot)
 {
 	auto it = m_animSlots.find(slot);