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

mess with shapes and have a better non-flickery camera rotation limit

Browse source
This commit is contained in:
lightling 2022-02-13 15:10:38 -05:00
parent bdad836e03
commit fb89377eab
Signed by: lightling
GPG key ID: 016F11E0AA296B67
2 changed files with 20 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Camera.cpp
View file

@ -124,7 +124,8 @@ void Camera::ReadInput(float _dt)
void Camera::ClampRotation()
{
static const float rotationLimit = XM_PIDIV2 - XM_1DIV2PI;
XMFLOAT3 eulerAngles = transform.GetEulerAngles();
if (eulerAngles.x > XM_PIDIV4) transform.SetRotation(XM_PIDIV4, eulerAngles.y, eulerAngles.z);
if (eulerAngles.x < -XM_PIDIV4) transform.SetRotation(-XM_PIDIV4, eulerAngles.y, eulerAngles.z);
if (eulerAngles.x > rotationLimit) transform.SetRotation(rotationLimit, eulerAngles.y, eulerAngles.z);
if (eulerAngles.x < -rotationLimit) transform.SetRotation(-rotationLimit, eulerAngles.y, eulerAngles.z);
}

33
Game.cpp
View file

@ -170,11 +170,12 @@ void Game::CreateBasicGeometry()
XMFLOAT4 white = XMFLOAT4(1.0f, 1.0f, 1.0f, 1.0f);
Vertex verts1[] = {
{ XMFLOAT3(+0.50f, +0.75f, +0.00f), red },
{ XMFLOAT3(+0.75f, +0.25f, +0.00f), blue },
{ XMFLOAT3(+0.25f, +0.25f, +0.00f), green },
{ 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 },
};
unsigned int ind1[] = { 0, 1, 2 };
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 },
@ -182,22 +183,22 @@ void Game::CreateBasicGeometry()
{ XMFLOAT3(-0.50f, +0.20f, +0.00f), red },
{ XMFLOAT3(-0.75f, +0.20f, +0.00f), blue },
};
unsigned int ind2[] = { 0, 1, 2, 0, 2, 3 };
unsigned int ind2[] = { 0,1,2, 0,2,3 , 3,2,0 , 2,1,0 };
Vertex verts3[] = {
{ XMFLOAT3(+0.00f, +0.30f, +0.00f), white },
{ XMFLOAT3(+0.15f, +0.15f, +0.00f), black },
{ XMFLOAT3(+0.15f, -0.15f, +0.00f), white },
{ XMFLOAT3(+0.00f, -0.30f, +0.00f), black },
{ XMFLOAT3(-0.15f, -0.15f, +0.00f), white },
{ XMFLOAT3(-0.15f, +0.15f, +0.00f), black },
{ 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 },
};
unsigned int ind3[] = { 0,1,5 , 1,2,5 , 2,3,4 , 2,4,5 };
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 };
shapes = {
std::make_shared<Mesh>(verts1, 03, ind1, 03, device, context),
std::make_shared<Mesh>(verts2, 04, ind2, 06, device, context),
std::make_shared<Mesh>(verts3, 06, ind3, 12, device, context),
std::make_shared<Mesh>(verts1, 4, ind1, 12, device, context),
std::make_shared<Mesh>(verts2, 4, ind2, 12, device, context),
std::make_shared<Mesh>(verts3, 6, ind3, 24, device, context),
};
entities = {
@ -240,7 +241,7 @@ void Game::Update(float deltaTime, float totalTime)
for (int i = 0; i < entities.size(); ++i)
{
entities[i]->GetTransform()->SetScale(0.1f * (i + 1), 0.1f * (i + 1), 0.1f * (i + 1));
entities[i]->GetTransform()->SetScale(0.2f * (i + 1), 0.2f * (i + 1), 0.2f * (i + 1));
entities[i]->GetTransform()->SetRotation(0.1f * (i + 1) * sin(totalTime), 0.1f * (i + 1) * sin(totalTime), 0.1f * (i + 1) * sin(totalTime));
// this range uses shapes[0] for testing
if (i < 3)