Skip to content
This repository has been archived by the owner on Nov 26, 2024. It is now read-only.

Commit

Permalink
format
Browse files Browse the repository at this point in the history
  • Loading branch information
@HanetakaChou
HanetakaChou committed Dec 19, 2022
1 parent ccaa887 commit a822936
Show file tree
Hide file tree
Showing 8 changed files with 808 additions and 831 deletions.
105 changes: 53 additions & 52 deletions code/character/AnimatedCharacter.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@

AnimatedCharacter::AnimatedCharacter()
{
animationsTexture = NULL;
numAttachments = 0;
fWalkSpeed = 6.f;
animationsTexture = NULL;
numAttachments = 0;
fWalkSpeed = 6.f;
}
AnimatedCharacter::~AnimatedCharacter()
{
for(int i=0;i<(int)m_animations.size();i++)
for (int i = 0; i < (int)m_animations.size(); i++)
{
CharacterAnimation *anim = m_animations[i];
delete anim;
Expand All @@ -20,121 +20,123 @@ AnimatedCharacter::~AnimatedCharacter()
m_characterMeshes.clear();
}

void AnimatedCharacter::CreateDefaultBuffer(ID3D10Device* pd3dDevice,void *data, UINT size,UINT bindFlags, ID3D10Buffer **ppBuffer)
void AnimatedCharacter::CreateDefaultBuffer(ID3D10Device *pd3dDevice, void *data, UINT size, UINT bindFlags, ID3D10Buffer **ppBuffer)
{
HRESULT hr;

// Vertex Buffer
D3D10_BUFFER_DESC bufferDesc;
ZeroMemory(&bufferDesc,sizeof(D3D10_BUFFER_DESC));
ZeroMemory(&bufferDesc, sizeof(D3D10_BUFFER_DESC));
bufferDesc.ByteWidth = size;
bufferDesc.Usage = D3D10_USAGE_DEFAULT;
bufferDesc.BindFlags = bindFlags;

D3D10_SUBRESOURCE_DATA subresourceData;
subresourceData.pSysMem = (void*)data;
V( pd3dDevice->CreateBuffer( &bufferDesc, &subresourceData, ppBuffer ) );
subresourceData.pSysMem = (void *)data;
V(pd3dDevice->CreateBuffer(&bufferDesc, &subresourceData, ppBuffer));
}

void AnimatedCharacter::CreateEmptyDefaultBuffer(ID3D10Device* pd3dDevice, UINT size,UINT bindFlags, ID3D10Buffer **ppBuffer)
void AnimatedCharacter::CreateEmptyDefaultBuffer(ID3D10Device *pd3dDevice, UINT size, UINT bindFlags, ID3D10Buffer **ppBuffer)
{
HRESULT hr;

// Vertex Buffer
D3D10_BUFFER_DESC bufferDesc;
ZeroMemory(&bufferDesc,sizeof(D3D10_BUFFER_DESC));
ZeroMemory(&bufferDesc, sizeof(D3D10_BUFFER_DESC));
bufferDesc.ByteWidth = size;
bufferDesc.Usage = D3D10_USAGE_DEFAULT;
bufferDesc.BindFlags = bindFlags;

V( pd3dDevice->CreateBuffer( &bufferDesc, NULL, ppBuffer ) );
V(pd3dDevice->CreateBuffer(&bufferDesc, NULL, ppBuffer));
}


HRESULT AnimatedCharacter::Initialize(ID3D10Device* pd3dDevice)
HRESULT AnimatedCharacter::Initialize(ID3D10Device *pd3dDevice)
{
fWalkSpeed = 6.f;
return S_OK;
}

void AnimatedCharacter::addSingleDrawMesh(ID3D10Device* pd3dDevice,Vertex *vertices,UINT vtxCount, DWORD *indices, UINT idxCount,int meshSet,UINT nameHash, std::string texture, std::string normal)
void AnimatedCharacter::addSingleDrawMesh(ID3D10Device *pd3dDevice, Vertex *vertices, UINT vtxCount, DWORD *indices, UINT idxCount, int meshSet, UINT nameHash, std::string texture, std::string normal)
{
// First look to see if there isn a mesh with the same set in there already...
SubmeshList::iterator itExistantMesh = m_characterMeshes.end();

// Expect the mesh to collapse meshes together if it can.
for(itExistantMesh=m_characterMeshes.begin();itExistantMesh != m_characterMeshes.end();itExistantMesh++)
for (itExistantMesh = m_characterMeshes.begin(); itExistantMesh != m_characterMeshes.end(); itExistantMesh++)
{
if((*itExistantMesh).meshSet == meshSet)
if ((*itExistantMesh).meshSet == meshSet)
break;
}

ID3D10Buffer *pIndexBuffer = NULL;
ID3D10Buffer *pVertexBuffer = NULL;

if(itExistantMesh == m_characterMeshes.end())
if (itExistantMesh == m_characterMeshes.end())
{
CreateDefaultBuffer(pd3dDevice,(void*)vertices,vtxCount*sizeof(Vertex),D3D10_BIND_VERTEX_BUFFER,&pVertexBuffer);

if(idxCount > 0)
CreateDefaultBuffer(pd3dDevice,(void*)indices,idxCount*sizeof(DWORD),D3D10_BIND_INDEX_BUFFER,&pIndexBuffer);
CreateDefaultBuffer(pd3dDevice, (void *)vertices, vtxCount * sizeof(Vertex), D3D10_BIND_VERTEX_BUFFER, &pVertexBuffer);

if (idxCount > 0)
CreateDefaultBuffer(pd3dDevice, (void *)indices, idxCount * sizeof(DWORD), D3D10_BIND_INDEX_BUFFER, &pIndexBuffer);
}
else
{
SubMesh subMesh = *itExistantMesh;

// Make aggregate sized buffers
CreateEmptyDefaultBuffer(pd3dDevice,(subMesh.numVertices + vtxCount)*sizeof(Vertex),D3D10_BIND_VERTEX_BUFFER,&pVertexBuffer);
CreateEmptyDefaultBuffer(pd3dDevice, (subMesh.numVertices + vtxCount) * sizeof(Vertex), D3D10_BIND_VERTEX_BUFFER, &pVertexBuffer);

if(idxCount > 0)
CreateEmptyDefaultBuffer(pd3dDevice,(subMesh.numIndices + idxCount)*sizeof(DWORD),D3D10_BIND_INDEX_BUFFER,&pIndexBuffer);
if (idxCount > 0)
CreateEmptyDefaultBuffer(pd3dDevice, (subMesh.numIndices + idxCount) * sizeof(DWORD), D3D10_BIND_INDEX_BUFFER, &pIndexBuffer);

// Copy in vertex data

// first copy in original meshSet
pd3dDevice->CopySubresourceRegion(pVertexBuffer,D3D10CalcSubresource(0,0,1),0,0,0,subMesh.pVB,D3D10CalcSubresource(0,0,1),NULL);
pd3dDevice->CopySubresourceRegion(pVertexBuffer, D3D10CalcSubresource(0, 0, 1), 0, 0, 0, subMesh.pVB, D3D10CalcSubresource(0, 0, 1), NULL);

// Now update with new data.
D3D10_BUFFER_DESC subMeshDesc;
subMesh.pVB->GetDesc(&subMeshDesc);

D3D10_BOX updateBox;
ZeroMemory(&updateBox,sizeof(D3D10_BOX));
ZeroMemory(&updateBox, sizeof(D3D10_BOX));
updateBox.left = subMeshDesc.ByteWidth;
updateBox.right = updateBox.left + vtxCount*sizeof(Vertex);
updateBox.top = 0; updateBox.bottom = 1;
updateBox.front = 0; updateBox.back = 1;
updateBox.right = updateBox.left + vtxCount * sizeof(Vertex);
updateBox.top = 0;
updateBox.bottom = 1;
updateBox.front = 0;
updateBox.back = 1;

pd3dDevice->UpdateSubresource(pVertexBuffer, D3D10CalcSubresource(0, 0, 1), &updateBox, (const void *)vertices, sizeof(Vertex), sizeof(Vertex));

pd3dDevice->UpdateSubresource(pVertexBuffer,D3D10CalcSubresource(0,0,1),&updateBox,(const void *)vertices,sizeof(Vertex),sizeof(Vertex));

// Now create index buffer, offsetting by number of vertices in original vertex buffer.
// Work on a local copy to avoid changing original data

// Now copy like vb
// first copy in original meshSet
pd3dDevice->CopySubresourceRegion(pIndexBuffer,D3D10CalcSubresource(0,0,1),0,0,0,subMesh.pIB,D3D10CalcSubresource(0,0,1),NULL);
pd3dDevice->CopySubresourceRegion(pIndexBuffer, D3D10CalcSubresource(0, 0, 1), 0, 0, 0, subMesh.pIB, D3D10CalcSubresource(0, 0, 1), NULL);

// Then new data
// Now update with new data.
subMesh.pIB->GetDesc(&subMeshDesc);

ZeroMemory(&updateBox,sizeof(D3D10_BOX));
ZeroMemory(&updateBox, sizeof(D3D10_BOX));
updateBox.left = subMeshDesc.ByteWidth;
updateBox.right = updateBox.left + idxCount*sizeof(DWORD);
updateBox.top = 0; updateBox.bottom = 1;
updateBox.front = 0; updateBox.back = 1;
updateBox.right = updateBox.left + idxCount * sizeof(DWORD);
updateBox.top = 0;
updateBox.bottom = 1;
updateBox.front = 0;
updateBox.back = 1;

DWORD *localIndices = new DWORD[idxCount];
memcpy((void*)localIndices,(void*)indices,idxCount*sizeof(DWORD));
for(UINT iIndex=0;iIndex < idxCount;iIndex++)
memcpy((void *)localIndices, (void *)indices, idxCount * sizeof(DWORD));
for (UINT iIndex = 0; iIndex < idxCount; iIndex++)
{
localIndices[iIndex] += subMesh.numVertices;
}

pd3dDevice->UpdateSubresource(pIndexBuffer,D3D10CalcSubresource(0,0,1),&updateBox,(const void *)localIndices,sizeof(DWORD),sizeof(DWORD));
pd3dDevice->UpdateSubresource(pIndexBuffer, D3D10CalcSubresource(0, 0, 1), &updateBox, (const void *)localIndices, sizeof(DWORD), sizeof(DWORD));

delete [] localIndices;
delete[] localIndices;

// update counts
vtxCount += subMesh.numVertices;
Expand All @@ -147,11 +149,10 @@ void AnimatedCharacter::addSingleDrawMesh(ID3D10Device* pd3dDevice,Vertex *verti
}

// Add in the buffers we made
addSingleDrawMesh(pVertexBuffer,vtxCount,pIndexBuffer,idxCount,meshSet,nameHash,texture,normal);

addSingleDrawMesh(pVertexBuffer, vtxCount, pIndexBuffer, idxCount, meshSet, nameHash, texture, normal);
}

void AnimatedCharacter::addSingleDrawMesh(ID3D10Buffer*pVB,int numVerts,ID3D10Buffer*pIB,int numIndices,int meshSet,UINT nameHash, std::string texture, std::string normal)
void AnimatedCharacter::addSingleDrawMesh(ID3D10Buffer *pVB, int numVerts, ID3D10Buffer *pIB, int numIndices, int meshSet, UINT nameHash, std::string texture, std::string normal)
{
SubMesh subMesh;
subMesh.pVB = pVB;
Expand All @@ -163,30 +164,30 @@ void AnimatedCharacter::addSingleDrawMesh(ID3D10Buffer*pVB,int numVerts,ID3D10Bu
subMesh.texture = texture;
subMesh.normal = normal;

SubmeshList::iterator it=m_characterMeshes.begin();
for(;it!= m_characterMeshes.end();it++)
SubmeshList::iterator it = m_characterMeshes.begin();
for (; it != m_characterMeshes.end(); it++)
{
if(subMesh.nameHash < it->nameHash)
if (subMesh.nameHash < it->nameHash)
{
break;
break;
}
}
m_characterMeshes.insert(it,subMesh);
m_characterMeshes.insert(it, subMesh);
}

void AnimatedCharacter::Release()
{

SAFE_RELEASE(animationsTexture);
while(m_characterMeshes.size())
while (m_characterMeshes.size())
{
SubMesh subMesh = m_characterMeshes.back();
SAFE_RELEASE(subMesh.pIB);
SAFE_RELEASE(subMesh.pVB);
m_characterMeshes.pop_back();
}

while(m_animations.size())
while (m_animations.size())
{
delete m_animations.back();
m_animations.pop_back();
Expand Down
32 changes: 14 additions & 18 deletions code/character/AnimatedCharacter.h
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#pragma once
#pragma once

#include <vector>

enum SKINNING_TYPE
{
ST_LINEAR = 0,
ST_DUALQUAT,
ST_FAST_DUALQUAT,
ST_LINEAR = 0,
ST_DUALQUAT,
ST_FAST_DUALQUAT,
};

class CharacterAnimation;
Expand All @@ -19,7 +19,6 @@ class CharacterAnimation;
class AnimatedCharacter
{
public:

struct Vertex
{
D3DXVECTOR3 position;
Expand All @@ -33,9 +32,9 @@ class AnimatedCharacter
// This represents a uniquie sub-section of the character
struct SubMesh
{
ID3D10Buffer*pVB;
ID3D10Buffer*pIB;
int numVertices,numIndices;
ID3D10Buffer *pVB;
ID3D10Buffer *pIB;
int numVertices, numIndices;
int meshSet;
UINT nameHash;
std::string texture;
Expand All @@ -48,20 +47,18 @@ class AnimatedCharacter
AnimatedCharacter();
~AnimatedCharacter();

CharacterAnimation *GetAnimation(int index){return index < (int)m_animations.size()?m_animations[index]:NULL;};
HRESULT Initialize(ID3D10Device* pd3dDevice);
CharacterAnimation *GetAnimation(int index) { return index < (int)m_animations.size() ? m_animations[index] : NULL; };
HRESULT Initialize(ID3D10Device *pd3dDevice);
void Release();

void addSingleDrawMesh(ID3D10Device* pd3dDevice,Vertex *vertices,UINT vtxCount, DWORD *indices, UINT idxCount,int meshSet,UINT nameHash, std::string texture, std::string normal);
void addSingleDrawMesh(ID3D10Device *pd3dDevice, Vertex *vertices, UINT vtxCount, DWORD *indices, UINT idxCount, int meshSet, UINT nameHash, std::string texture, std::string normal);

protected:

void addSingleDrawMesh(ID3D10Buffer*pVB,int numVerts,ID3D10Buffer*pIB,int numIndices,int meshSet,UINT namehash,std::string texture, std::string normal);
void CreateDefaultBuffer(ID3D10Device* pd3dDevice,void *data, UINT size,UINT bindFlags, ID3D10Buffer **ppBuffer);
void CreateEmptyDefaultBuffer(ID3D10Device* pd3dDevice, UINT size,UINT bindFlags, ID3D10Buffer **ppBuffer);
void addSingleDrawMesh(ID3D10Buffer *pVB, int numVerts, ID3D10Buffer *pIB, int numIndices, int meshSet, UINT namehash, std::string texture, std::string normal);
void CreateDefaultBuffer(ID3D10Device *pd3dDevice, void *data, UINT size, UINT bindFlags, ID3D10Buffer **ppBuffer);
void CreateEmptyDefaultBuffer(ID3D10Device *pd3dDevice, UINT size, UINT bindFlags, ID3D10Buffer **ppBuffer);

public:

// DX10 vars
ID3D10Texture2D *animationsTexture;
SubmeshList m_characterMeshes;
Expand All @@ -71,9 +68,8 @@ class AnimatedCharacter

int numAttachments;
int numBones;
float boundingRadius; // rough gauge of size
float boundingRadius; // rough gauge of size

// character logic consts
float fWalkSpeed;

};
Loading

0 comments on commit a822936

Please sign in to comment.