create a nice base for our test objects

hw3d/Box.cpp

@@ -13,16 +13,7 @@ Box::Box( Graphics& gfx,
 	std::uniform_real_distribution<float>& bdist,
 	DirectX::XMFLOAT3 material )
 	:
-	r( rdist( rng ) ),
-	droll( ddist( rng ) ),
-	dpitch( ddist( rng ) ),
-	dyaw( ddist( rng ) ),
-	dphi( odist( rng ) ),
-	dtheta( odist( rng ) ),
-	dchi( odist( rng ) ),
-	chi( adist( rng ) ),
-	theta( adist( rng ) ),
-	phi( adist( rng ) )
+	TestObject( gfx,rng,adist,ddist,odist,rdist )
 {
 	namespace dx = DirectX;
 
@@ -79,21 +70,8 @@ Box::Box( Graphics& gfx,
 	);
 }
 
-void Box::Update( float dt ) noexcept
-{
-	roll += droll * dt;
-	pitch += dpitch * dt;
-	yaw += dyaw * dt;
-	theta += dtheta * dt;
-	phi += dphi * dt;
-	chi += dchi * dt;
-}
-
 DirectX::XMMATRIX Box::GetTransformXM() const noexcept
 {
 	namespace dx = DirectX;
-	return dx::XMLoadFloat3x3( &mt ) *
-		dx::XMMatrixRotationRollPitchYaw( pitch,yaw,roll ) *
-		dx::XMMatrixTranslation( r,0.0f,0.0f ) *
-		dx::XMMatrixRotationRollPitchYaw( theta,phi,chi );
+	return dx::XMLoadFloat3x3( &mt ) * TestObject::GetTransformXM();
 }

hw3d/Box.h

 #pragma once
-#include "DrawableBase.h"
+#include "TestObject.h"
 
-class Box : public DrawableBase<Box>
+class Box : public TestObject<Box>
 {
 public:
 	Box( Graphics& gfx,std::mt19937& rng,
@@ -11,24 +11,8 @@ public:
 		std::uniform_real_distribution<float>& rdist,
 		std::uniform_real_distribution<float>& bdist,
 		DirectX::XMFLOAT3 material );
-	void Update( float dt ) noexcept override;
 	DirectX::XMMATRIX GetTransformXM() const noexcept override;
 private:
-	// positional
-	float r;
-	float roll = 0.0f;
-	float pitch = 0.0f;
-	float yaw = 0.0f;
-	float theta;
-	float phi;
-	float chi;
-	// speed (delta/s)
-	float droll;
-	float dpitch;
-	float dyaw;
-	float dtheta;
-	float dphi;
-	float dchi;
 	// model transform
 	DirectX::XMFLOAT3X3 mt;
 };
\ No newline at end of file

hw3d/TestObject.h

+#pragma once
+#include "DrawableBase.h"
+
+template<class T>
+class TestObject : public DrawableBase<T>
+{
+public:
+	TestObject( Graphics& gfx,std::mt19937& rng,
+	std::uniform_real_distribution<float>& adist,
+	std::uniform_real_distribution<float>& ddist,
+	std::uniform_real_distribution<float>& odist,
+	std::uniform_real_distribution<float>& rdist )
+		:
+		r( rdist( rng ) ),
+		droll( ddist( rng ) ),
+		dpitch( ddist( rng ) ),
+		dyaw( ddist( rng ) ),
+		dphi( odist( rng ) ),
+		dtheta( odist( rng ) ),
+		dchi( odist( rng ) ),
+		chi( adist( rng ) ),
+		theta( adist( rng ) ),
+		phi( adist( rng ) )
+	{}
+	void Update( float dt ) noexcept
+	{
+		roll += droll * dt;
+		pitch += dpitch * dt;
+		yaw += dyaw * dt;
+		theta += dtheta * dt;
+		phi += dphi * dt;
+		chi += dchi * dt;
+	}
+	DirectX::XMMATRIX GetTransformXM() const noexcept
+	{
+		namespace dx = DirectX;
+		return dx::XMMatrixRotationRollPitchYaw( pitch,yaw,roll ) *
+			dx::XMMatrixTranslation( r,0.0f,0.0f ) *
+			dx::XMMatrixRotationRollPitchYaw( theta,phi,chi );
+	}
+private:
+	// positional
+	float r;
+	float roll = 0.0f;
+	float pitch = 0.0f;
+	float yaw = 0.0f;
+	float theta;
+	float phi;
+	float chi;
+	// speed (delta/s)
+	float droll;
+	float dpitch;
+	float dyaw;
+	float dtheta;
+	float dphi;
+	float dchi;
+};

hw3d/hw3d.vcxproj

@@ -176,6 +176,7 @@
     <ClCompile Include="Sampler.cpp" />
     <ClCompile Include="SkinnedBox.cpp" />
     <ClCompile Include="Surface.cpp" />
+    <ClCompile Include="TestObject.h" />
     <ClCompile Include="Texture.cpp" />
     <ClCompile Include="Topology.cpp" />
     <ClCompile Include="TransformCbuf.cpp" />

hw3d/hw3d.vcxproj.filters

@@ -153,6 +153,9 @@
     <ClCompile Include="PointLight.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="TestObject.h">
+      <Filter>Header Files\Drawable</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="WindowsMessageMap.h">