lightling/DX11Starter
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactor for meshes

Browse source
This commit is contained in:
lightling 2022-02-27 12:51:26 -05:00
parent 34ed169216
commit 88629a4cd5
Signed by: lightling
GPG key ID: 016F11E0AA296B67
7 changed files with 408 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

107
DX11Starter.vcxproj
View file

@ -168,6 +168,113 @@
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">5.0</ShaderModel>
</FxCompile>
</ItemGroup>
<ItemGroup>
<CopyFileToFolders Include="Assets\Models\cube.obj">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
<FileType>Document</FileType>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)/Assets/Models</DestinationFolders>
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)/Assets/Models</DestinationFolders>
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)/Assets/Models</DestinationFolders>
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)/Assets/Models</DestinationFolders>
</CopyFileToFolders>
<CopyFileToFolders Include="Assets\Models\cylinder.obj">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
<FileType>Document</FileType>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)/Assets/Models</DestinationFolders>
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)/Assets/Models</DestinationFolders>
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)/Assets/Models</DestinationFolders>
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)/Assets/Models</DestinationFolders>
</CopyFileToFolders>
<CopyFileToFolders Include="Assets\Models\helix.obj">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
<FileType>Document</FileType>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)/Assets/Models</DestinationFolders>
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)/Assets/Models</DestinationFolders>
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)/Assets/Models</DestinationFolders>
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)/Assets/Models</DestinationFolders>
</CopyFileToFolders>
<CopyFileToFolders Include="Assets\Models\quad.obj">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
<FileType>Document</FileType>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)/Assets/Models</DestinationFolders>
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)/Assets/Models</DestinationFolders>
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)/Assets/Models</DestinationFolders>
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)/Assets/Models</DestinationFolders>
</CopyFileToFolders>
<CopyFileToFolders Include="Assets\Models\quad_double_sided.obj">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
<FileType>Document</FileType>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)/Assets/Models</DestinationFolders>
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)/Assets/Models</DestinationFolders>
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)/Assets/Models</DestinationFolders>
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)/Assets/Models</DestinationFolders>
</CopyFileToFolders>
<CopyFileToFolders Include="Assets\Models\sphere.obj">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
<FileType>Document</FileType>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)/Assets/Models</DestinationFolders>
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)/Assets/Models</DestinationFolders>
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)/Assets/Models</DestinationFolders>
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)/Assets/Models</DestinationFolders>
</CopyFileToFolders>
<CopyFileToFolders Include="Assets\Models\torus.obj">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
<FileType>Document</FileType>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)/Assets/Models</DestinationFolders>
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)/Assets/Models</DestinationFolders>
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)/Assets/Models</DestinationFolders>
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)/Assets/Models</DestinationFolders>
</CopyFileToFolders>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>

29
DX11Starter.vcxproj.filters
View file

@ -16,6 +16,12 @@
<Filter Include="Shaders">
<UniqueIdentifier>{e76f01f5-08db-40d4-8720-b5b21f7ec0a3}</UniqueIdentifier>
</Filter>
<Filter Include="Assets">
<UniqueIdentifier>{27304946-4bdd-48b3-86d6-d0de49df247a}</UniqueIdentifier>
</Filter>
<Filter Include="Assets\Models">
<UniqueIdentifier>{70d904c1-abb7-4ffe-a6fd-58c67ea6f72b}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="DXCore.cpp">
@ -89,4 +95,27 @@
<Filter>Shaders</Filter>
</FxCompile>
</ItemGroup>
<ItemGroup>
<CopyFileToFolders Include="Assets\Models\cube.obj">
<Filter>Assets\Models</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="Assets\Models\cylinder.obj">
<Filter>Assets\Models</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="Assets\Models\helix.obj">
<Filter>Assets\Models</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="Assets\Models\quad.obj">
<Filter>Assets\Models</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="Assets\Models\quad_double_sided.obj">
<Filter>Assets\Models</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="Assets\Models\sphere.obj">
<Filter>Assets\Models</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="Assets\Models\torus.obj">
<Filter>Assets\Models</Filter>
</CopyFileToFolders>
</ItemGroup>
</Project>

37
Game.cpp
View file

@ -98,37 +98,32 @@ void Game::LoadShaders()
// --------------------------------------------------------
void Game::CreateBasicGeometry()
{
// Create some temporary variables to represent colors
// - Not necessary, just makes things more readable
XMFLOAT4 red = XMFLOAT4(1.0f, 0.0f, 0.0f, 1.0f);
XMFLOAT4 green = XMFLOAT4(0.0f, 1.0f, 0.0f, 1.0f);
XMFLOAT4 blue = XMFLOAT4(0.0f, 0.0f, 1.0f, 1.0f);
XMFLOAT4 black = XMFLOAT4(0.0f, 0.0f, 0.0f, 1.0f);
XMFLOAT4 white = XMFLOAT4(1.0f, 1.0f, 1.0f, 1.0f);
XMFLOAT3 normals = XMFLOAT3(0, 0, -1);
XMFLOAT2 uvs = XMFLOAT2(0, 0);
Vertex verts1[] = {
{ XMFLOAT3(+0.00f, +0.00f, +0.25f), white },
{ XMFLOAT3(-0.25f, -0.25f, -0.25f), red },
{ XMFLOAT3(+0.00f, +0.25f, -0.25f), green },
{ XMFLOAT3(+0.25f, -0.25f, -0.25f), blue },
{ XMFLOAT3(+0.00f, +0.00f, +0.25f), normals, uvs },
{ XMFLOAT3(-0.25f, -0.25f, -0.25f), normals, uvs },
{ XMFLOAT3(+0.00f, +0.25f, -0.25f), normals, uvs },
{ XMFLOAT3(+0.25f, -0.25f, -0.25f), normals, uvs },
};
unsigned int ind1[] = { 0,1,2 , 0,2,3 , 0,3,1 , 3,2,1 };
Vertex verts2[] = {
{ XMFLOAT3(-0.75f, +0.50f, +0.00f), red },
{ XMFLOAT3(-0.50f, +0.50f, +0.00f), blue },
{ XMFLOAT3(-0.50f, +0.20f, +0.00f), red },
{ XMFLOAT3(-0.75f, +0.20f, +0.00f), blue },
{ XMFLOAT3(-0.75f, +0.50f, +0.00f), normals, uvs },
{ XMFLOAT3(-0.50f, +0.50f, +0.00f), normals, uvs },
{ XMFLOAT3(-0.50f, +0.20f, +0.00f), normals, uvs },
{ XMFLOAT3(-0.75f, +0.20f, +0.00f), normals, uvs },
};
unsigned int ind2[] = { 0,1,2, 0,2,3 , 3,2,0 , 2,1,0 };
Vertex verts3[] = {
{ XMFLOAT3(+0.00f, +0.30f, +0.15f), white },
{ XMFLOAT3(+0.30f, +0.15f, +0.00f), black },
{ XMFLOAT3(+0.30f, -0.15f, +0.00f), white },
{ XMFLOAT3(+0.00f, -0.30f, +0.15f), black },
{ XMFLOAT3(-0.30f, -0.15f, +0.00f), white },
{ XMFLOAT3(-0.30f, +0.15f, +0.00f), black },
{ XMFLOAT3(+0.00f, +0.30f, +0.15f), normals, uvs },
{ XMFLOAT3(+0.30f, +0.15f, +0.00f), normals, uvs },
{ XMFLOAT3(+0.30f, -0.15f, +0.00f), normals, uvs },
{ XMFLOAT3(+0.00f, -0.30f, +0.15f), normals, uvs },
{ XMFLOAT3(-0.30f, -0.15f, +0.00f), normals, uvs },
{ XMFLOAT3(-0.30f, +0.15f, +0.00f), normals, uvs },
};
unsigned int ind3[] = { 0,1,5 , 1,2,5 , 2,3,4 , 2,4,5 , 5,4,2 , 4,3,2 , 5,2,1 , 5,1,0 };

231
Mesh.cpp
View file

@ -1,8 +1,239 @@
#include "Mesh.h"
#include <fstream>
#include <vector>
using namespace DirectX;
Mesh::Mesh(Vertex* _vertices, int _vertexCount, unsigned int* _indices, int _indexCount, Microsoft::WRL::ComPtr<ID3D11Device> _device, Microsoft::WRL::ComPtr<ID3D11DeviceContext> _context)
{
CreateMesh(_vertices, _vertexCount, _indices, _indexCount, _device, _context);
}
Mesh::Mesh(const char* _file, Microsoft::WRL::ComPtr<ID3D11Device> _device, Microsoft::WRL::ComPtr<ID3D11DeviceContext> _context)
{
/// BEGIN OBJLOADER ///
// Author: Chris Cascioli
// Purpose: Basic .OBJ 3D model loading, supporting positions, uvs and normals
//
// - You are allowed to directly copy/paste this into your code base
// for assignments, given that you clearly cite that this is not
// code of your own design.
//
// - NOTE: You'll need to #include <fstream>
// File input object
std::ifstream obj(_file);
// Check for successful open
if (!obj.is_open())
return;
// Variables used while reading the file
std::vector<XMFLOAT3> positions; // Positions from the file
std::vector<XMFLOAT3> normals; // Normals from the file
std::vector<XMFLOAT2> uvs; // UVs from the file
std::vector<Vertex> verts; // Verts we're assembling
std::vector<UINT> indices; // Indices of these verts
int vertCounter = 0; // Count of vertices
int indexCounter = 0; // Count of indices
char chars[100]; // String for line reading
// Still have data left?
while (obj.good())
{
// Get the line (100 characters should be more than enough)
obj.getline(chars, 100);
// Check the type of line
if (chars[0] == 'v' && chars[1] == 'n')
{
// Read the 3 numbers directly into an XMFLOAT3
XMFLOAT3 norm;
sscanf_s(
chars,
"vn %f %f %f",
&norm.x, &norm.y, &norm.z);
// Add to the list of normals
normals.push_back(norm);
}
else if (chars[0] == 'v' && chars[1] == 't')
{
// Read the 2 numbers directly into an XMFLOAT2
XMFLOAT2 uv;
sscanf_s(
chars,
"vt %f %f",
&uv.x, &uv.y);
// Add to the list of uv's
uvs.push_back(uv);
}
else if (chars[0] == 'v')
{
// Read the 3 numbers directly into an XMFLOAT3
XMFLOAT3 pos;
sscanf_s(
chars,
"v %f %f %f",
&pos.x, &pos.y, &pos.z);
// Add to the positions
positions.push_back(pos);
}
else if (chars[0] == 'f')
{
// Read the face indices into an array
// NOTE: This assumes the given obj file contains
// vertex positions, uv coordinates AND normals.
unsigned int i[12];
int numbersRead = sscanf_s(
chars,
"f %d/%d/%d %d/%d/%d %d/%d/%d %d/%d/%d",
&i[0], &i[1], &i[2],
&i[3], &i[4], &i[5],
&i[6], &i[7], &i[8],
&i[9], &i[10], &i[11]);
// If we only got the first number, chances are the OBJ
// file has no UV coordinates. This isn't great, but we
// still want to load the model without crashing, so we
// need to re-read a different pattern (in which we assume
// there are no UVs denoted for any of the vertices)
if (numbersRead == 1)
{
// Re-read with a different pattern
numbersRead = sscanf_s(
chars,
"f %d//%d %d//%d %d//%d %d//%d",
&i[0], &i[2],
&i[3], &i[5],
&i[6], &i[8],
&i[9], &i[11]);
// The following indices are where the UVs should
// have been, so give them a valid value
i[1] = 1;
i[4] = 1;
i[7] = 1;
i[10] = 1;
// If we have no UVs, create a single UV coordinate
// that will be used for all vertices
if (uvs.size() == 0)
uvs.push_back(XMFLOAT2(0, 0));
}
// - Create the verts by looking up
// corresponding data from vectors
// - OBJ File indices are 1-based, so
// they need to be adusted
Vertex v1;
v1.Position = positions[i[0] - 1];
v1.UV = uvs[i[1] - 1];
v1.Normal = normals[i[2] - 1];
Vertex v2;
v2.Position = positions[i[3] - 1];
v2.UV = uvs[i[4] - 1];
v2.Normal = normals[i[5] - 1];
Vertex v3;
v3.Position = positions[i[6] - 1];
v3.UV = uvs[i[7] - 1];
v3.Normal = normals[i[8] - 1];
// The model is most likely in a right-handed space,
// especially if it came from Maya. We want to convert
// to a left-handed space for DirectX. This means we
// need to:
// - Invert the Z position
// - Invert the normal's Z
// - Flip the winding order
// We also need to flip the UV coordinate since DirectX
// defines (0,0) as the top left of the texture, and many
// 3D modeling packages use the bottom left as (0,0)
// Flip the UV's since they're probably "upside down"
v1.UV.y = 1.0f - v1.UV.y;
v2.UV.y = 1.0f - v2.UV.y;
v3.UV.y = 1.0f - v3.UV.y;
// Flip Z (LH vs. RH)
v1.Position.z *= -1.0f;
v2.Position.z *= -1.0f;
v3.Position.z *= -1.0f;
// Flip normal's Z
v1.Normal.z *= -1.0f;
v2.Normal.z *= -1.0f;
v3.Normal.z *= -1.0f;
// Add the verts to the vector (flipping the winding order)
verts.push_back(v1);
verts.push_back(v3);
verts.push_back(v2);
vertCounter += 3;
// Add three more indices
indices.push_back(indexCounter); indexCounter += 1;
indices.push_back(indexCounter); indexCounter += 1;
indices.push_back(indexCounter); indexCounter += 1;
// Was there a 4th face?
// - 12 numbers read means 4 faces WITH uv's
// - 8 numbers read means 4 faces WITHOUT uv's
if (numbersRead == 12 || numbersRead == 8)
{
// Make the last vertex
Vertex v4;
v4.Position = positions[i[9] - 1];
v4.UV = uvs[i[10] - 1];
v4.Normal = normals[i[11] - 1];
// Flip the UV, Z pos and normal's Z
v4.UV.y = 1.0f - v4.UV.y;
v4.Position.z *= -1.0f;
v4.Normal.z *= -1.0f;
// Add a whole triangle (flipping the winding order)
verts.push_back(v1);
verts.push_back(v4);
verts.push_back(v3);
vertCounter += 3;
// Add three more indices
indices.push_back(indexCounter); indexCounter += 1;
indices.push_back(indexCounter); indexCounter += 1;
indices.push_back(indexCounter); indexCounter += 1;
}
}
}
// Close the file and create the actual buffers
obj.close();
// - At this point, "verts" is a vector of Vertex structs, and can be used
// directly to create a vertex buffer: &verts[0] is the address of the first vert
//
// - The vector "indices" is similar. It's a vector of unsigned ints and
// can be used directly for the index buffer: &indices[0] is the address of the first int
//
// - "vertCounter" is the number of vertices
// - "indexCounter" is the number of indices
// - Yes, these are effectively the same since OBJs do not index entire vertices! This means
// an index buffer isn't doing much for us. We could try to optimize the mesh ourselves
// and detect duplicate vertices, but at that point it would be better to use a more
// sophisticated model loading library like TinyOBJLoader or AssImp (yes, that's its name)
/// END OBJLOADER ///
CreateMesh(&verts[0], verts.size(), &indices[0], indices.size(), _device, _context);
}
void Mesh::CreateMesh(Vertex* _vertices, int _vertexCount, unsigned int* _indices, int _indexCount, Microsoft::WRL::ComPtr<ID3D11Device> _device, Microsoft::WRL::ComPtr<ID3D11DeviceContext> _context)
{
// Create the VERTEX BUFFER description
D3D11_BUFFER_DESC vbd = {};

23
Mesh.h
View file

@ -6,11 +6,6 @@
class Mesh
{
private:
Microsoft::WRL::ComPtr<ID3D11Buffer> bufferVertex;
Microsoft::WRL::ComPtr<ID3D11Buffer> bufferIndex;
Microsoft::WRL::ComPtr<ID3D11DeviceContext> deviceContext;
int countIndex;
public:
Mesh(
Vertex* _vertices,
@ -19,10 +14,28 @@ public:
int _indexCount,
Microsoft::WRL::ComPtr<ID3D11Device> _device,
Microsoft::WRL::ComPtr<ID3D11DeviceContext> _context);
Mesh(
const char* _file,
Microsoft::WRL::ComPtr<ID3D11Device> _device,
Microsoft::WRL::ComPtr<ID3D11DeviceContext> _context);
~Mesh();
void Draw();
Microsoft::WRL::ComPtr<ID3D11Buffer>* GetVertexBuffer();
Microsoft::WRL::ComPtr<ID3D11Buffer>* GetIndexBuffer();
int GetIndexCount();
private:
Microsoft::WRL::ComPtr<ID3D11Buffer> bufferVertex;
Microsoft::WRL::ComPtr<ID3D11Buffer> bufferIndex;
Microsoft::WRL::ComPtr<ID3D11DeviceContext> deviceContext;
int countIndex;
void CreateMesh(
Vertex* _vertices,
int _vertexCount,
unsigned int* _indices,
int _indexCount,
Microsoft::WRL::ComPtr<ID3D11Device> _device,
Microsoft::WRL::ComPtr<ID3D11DeviceContext> _context);
};

5
Vertex.h
View file

@ -9,6 +9,7 @@
// --------------------------------------------------------
struct Vertex
{
DirectX::XMFLOAT3 Position; // The local position of the vertex
DirectX::XMFLOAT4 Color; // The color of the vertex
DirectX::XMFLOAT3 Position;
DirectX::XMFLOAT3 Normal;
DirectX::XMFLOAT2 UV;
};

7
VertexShader.hlsl
View file

@ -18,8 +18,9 @@ struct VertexShaderInput
// | Name Semantic
// | | |
// v v v
float3 localPosition : POSITION; // XYZ position
float4 color : COLOR; // RGBA color
float3 localPosition : POSITION;
float3 color : NORMAL;
float2 uv : UV;
};
// Struct representing the data we're sending down the pipeline
@ -66,7 +67,7 @@ VertexToPixel main( VertexShaderInput input )
// Pass the color through
// - The values will be interpolated per-pixel by the rasterizer
// - We don't need to alter it here, but we do need to send it to the pixel shader
output.color = input.color * colorTint;
output.color = colorTint;
// Whatever we return will make its way through the pipeline to the
// next programmable stage we're using (the pixel shader for now)