Update1030

Author: KodFreedom

AABBColliderComponent.h

@@ -32,15 +32,15 @@ class CAABBColliderComponent : public CBoxColliderComponent
 		CBoxColliderComponent::Update();
 
 		//回転を初期化する
-		m_mtxWorld.m_af[0][0] = 1.0f;
-		m_mtxWorld.m_af[0][1] = 0.0f;
-		m_mtxWorld.m_af[0][2] = 0.0f;
-		m_mtxWorld.m_af[1][0] = 0.0f;
-		m_mtxWorld.m_af[1][1] = 1.0f;
-		m_mtxWorld.m_af[1][2] = 0.0f;
-		m_mtxWorld.m_af[2][0] = 0.0f;
-		m_mtxWorld.m_af[2][1] = 0.0f;
-		m_mtxWorld.m_af[2][2] = 1.0f;
+		m_mtxWorldNext.m_af[0][0] = 1.0f;
+		m_mtxWorldNext.m_af[0][1] = 0.0f;
+		m_mtxWorldNext.m_af[0][2] = 0.0f;
+		m_mtxWorldNext.m_af[1][0] = 0.0f;
+		m_mtxWorldNext.m_af[1][1] = 1.0f;
+		m_mtxWorldNext.m_af[1][2] = 0.0f;
+		m_mtxWorldNext.m_af[2][0] = 0.0f;
+		m_mtxWorldNext.m_af[2][1] = 0.0f;
+		m_mtxWorldNext.m_af[2][2] = 1.0f;
 	}
 
 private:

KF_CollisionSystem.cpp

@@ -301,7 +301,7 @@ void CKFCollisionSystem::DrawCollider(void)
 	for (auto pCol : m_alistCollider[DYNAMIC][COL_SPHERE])
 	{
 		if (!pCol->GetGameObject()->IsActive()) { continue; }
-		D3DXVECTOR3 vPos = pCol->GetWorldPos();
+		D3DXVECTOR3 vPos = pCol->GetWorldPosNext();
 		float fRadius = ((CSphereColliderComponent*)pCol)->GetRadius();
 		D3DXMATRIX mtx,mtxPos,mtxScale;
 		D3DXMatrixIdentity(&mtx);
@@ -316,7 +316,7 @@ void CKFCollisionSystem::DrawCollider(void)
 	for (auto pCol : m_alistCollider[STATIC][COL_SPHERE])
 	{
 		if (!pCol->GetGameObject()->IsActive()) { continue; }
-		auto vPos = pCol->GetWorldPos();
+		auto vPos = pCol->GetWorldPosNext();
 		float fRadius = ((CSphereColliderComponent*)pCol)->GetRadius();
 		D3DXMATRIX mtx, mtxPos, mtxScale;
 		D3DXMatrixIdentity(&mtx);
@@ -332,7 +332,7 @@ void CKFCollisionSystem::DrawCollider(void)
 	for (auto pCol : m_alistCollider[DYNAMIC][COL_AABB])
 	{
 		if (!pCol->GetGameObject()->IsActive()) { continue; }
-		auto vPos = pCol->GetWorldPos();
+		auto vPos = pCol->GetWorldPosNext();
 		auto vHalfSize = ((CAABBColliderComponent*)pCol)->GetHalfSize();
 		D3DXMATRIX mtx, mtxPos, mtxScale;
 		D3DXMatrixIdentity(&mtx);
@@ -347,7 +347,7 @@ void CKFCollisionSystem::DrawCollider(void)
 	for (auto pCol : m_alistCollider[STATIC][COL_AABB])
 	{
 		if (!pCol->GetGameObject()->IsActive()) { continue; }
-		auto vPos = pCol->GetWorldPos();
+		auto vPos = pCol->GetWorldPosNext();
 		auto vHalfSize = ((CAABBColliderComponent*)pCol)->GetHalfSize();
 		D3DXMATRIX mtx, mtxPos, mtxScale;
 		D3DXMatrixIdentity(&mtx);

KF_Framework_Debug.exe

@@ -18,7 +18,7 @@
 list<CKFVec3> CBoxColliderComponent::GetWorldVertexes(void)
 {
 	auto& listVtx = GetLocalVertexes();
-	const auto& mtxWorld = GetMatrixWorld();
+	const auto& mtxWorld = GetMatrixWorldNext();
 	for (auto itr = listVtx.begin(); itr != listVtx.end(); ++itr)
 	{
 		*itr = CKFMath::Vec3TransformCoord(*itr, mtxWorld);

boxColliderComponent.cpp

@@ -141,7 +141,7 @@ bool CManager::Init(HINSTANCE hInstance, HWND hWnd, BOOL bWindow)
 	m_pFade = CFade::Create();
 
 	//初期モード設定
-	SetMode(new CModeDemo);
+	SetMode(new CModeEditor);
 
 	return true;
 }