[共通] ConstantBuffer 改善 #1155

Siv3D · Nov 27, 2023 · cf55601 · cf55601
1 parent ad36bcd
commit cf55601
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/Siv3D/include/Siv3D/ConstantBuffer.hpp b/Siv3D/include/Siv3D/ConstantBuffer.hpp
@@ -27,9 +27,6 @@ namespace s3d
 		SIV3D_NODISCARD_CXX20
 		ConstantBufferBase() = default;
 
-		SIV3D_NODISCARD_CXX20
-		ConstantBufferBase(const ConstantBufferBase&) = default;
-
 		SIV3D_NODISCARD_CXX20
 		explicit ConstantBufferBase(size_t size);
 
@@ -77,6 +74,10 @@ namespace s3d
 		SIV3D_NODISCARD_CXX20
 		ConstantBuffer(const Type& data);
 
+		template <class ...Args, std::enable_if_t<std::is_constructible_v<Type, Args...>>* = nullptr>
+		SIV3D_NODISCARD_CXX20
+		explicit ConstantBuffer(Args&&... args);
+
 		ConstantBuffer& operator =(const Type& data);
 
 		[[nodiscard]]

diff --git a/Siv3D/include/Siv3D/detail/ConstantBuffer.ipp b/Siv3D/include/Siv3D/detail/ConstantBuffer.ipp
@@ -24,6 +24,14 @@ namespace s3d
 		m_wrapper->data	= data;
 	}
 
+	template <class Type>
+	template <class ...Args, std::enable_if_t<std::is_constructible_v<Type, Args...>>*>
+	inline ConstantBuffer<Type>::ConstantBuffer(Args&&... args)
+		: ConstantBuffer{}
+	{
+		m_wrapper->data = Type{ std::forward<Args>(args)... };
+	}
+
 	template <class Type>
 	inline ConstantBuffer<Type>& ConstantBuffer<Type>::operator =(const Type& data)
 	{