Skip to content

Commit

Permalink
Bi-plane correctly textured
Browse files Browse the repository at this point in the history
  • Loading branch information
Lyraedan committed Apr 11, 2021
1 parent 056fe39 commit 580d9ae
Show file tree
Hide file tree
Showing 18 changed files with 7 additions and 59 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
.vs/
*.log
*.log
1 change: 1 addition & 0 deletions Graphics2/Graphics2.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ void Graphics2::CreateSceneGraph()
{
SceneGraphPointer sceneGraph = GetSceneGraph();

/*
// Apply a seed to the generator
unsigned int stime = static_cast<unsigned int>(time(NULL));
srand(stime);
Expand Down
1 change: 1 addition & 0 deletions Graphics2/ObjLoader.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#include "Graphics2.h"
#include <iostream>
#include <fstream>
#include <iomanip>

class ObjLoader
{
Expand Down
4 changes: 2 additions & 2 deletions Graphics2/SceneNodePlane.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ float y = 0;
void SceneNodePlane::Tick()
{
y++;
SetWorldTransform(XMMatrixScaling(1, 1, 1) * XMMatrixTranslation(0, 30, 0) * XMMatrixRotationAxis(XMVectorSet(0.0f, 1.0f, 0.0f, 0.0f), y * 0.5f * XM_PI / 180.0f));
SetWorldTransform(XMMatrixScaling(2.5f, 2.5f, 2.5f) * XMMatrixTranslation(0, 0, 0) * XMMatrixRotationAxis(XMVectorSet(0.0f, 1.0f, 0.0f, 0.0f), y * 0.5f * XM_PI / 180.0f));

}

Expand Down Expand Up @@ -174,7 +174,7 @@ void SceneNodePlane::BuildTexture()
{
ThrowIfFailed(CreateWICTextureFromFile(_device.Get(),
_deviceContext.Get(),
L"plane/plane.bmp",
L"plane/plane2.bmp",
nullptr,
_texture.GetAddressOf()
));
Expand Down
Binary file added Graphics2/plane/plane2.bmp
Binary file not shown.
58 changes: 1 addition & 57 deletions Graphics2/x64/Debug/Graphics2.log
Original file line number Diff line number Diff line change
@@ -1,64 +1,8 @@
 AABB.cpp
Framework.cpp
DirectXFramework.cpp
Graphics2.cpp
F:\Graphics2\Graphics2\Graphics2.cpp(29,27): warning C4244: 'argument': conversion from 'int' to 'float', possible loss of data
F:\Graphics2\Graphics2\Graphics2.cpp(29,19): warning C4244: 'argument': conversion from 'int' to 'float', possible loss of data
F:\Graphics2\Graphics2\Graphics2.cpp(79,60): warning C4244: 'argument': conversion from 'int' to 'float', possible loss of data
F:\Graphics2\Graphics2\Graphics2.cpp(79,35): warning C4244: 'argument': conversion from 'int' to 'float', possible loss of data
F:\Graphics2\Graphics2\Graphics2.cpp(80,63): warning C4244: 'argument': conversion from 'int' to 'float', possible loss of data
F:\Graphics2\Graphics2\Graphics2.cpp(80,35): warning C4244: 'argument': conversion from 'int' to 'float', possible loss of data
F:\Graphics2\Graphics2\Graphics2.cpp(81,63): warning C4244: 'argument': conversion from 'int' to 'float', possible loss of data
F:\Graphics2\Graphics2\Graphics2.cpp(81,34): warning C4244: 'argument': conversion from 'int' to 'float', possible loss of data
F:\Graphics2\Graphics2\Graphics2.cpp(82,66): warning C4244: 'argument': conversion from 'int' to 'float', possible loss of data
F:\Graphics2\Graphics2\Graphics2.cpp(82,34): warning C4244: 'argument': conversion from 'int' to 'float', possible loss of data
F:\Graphics2\Graphics2\Graphics2.cpp(85,55): warning C4244: 'argument': conversion from 'int' to 'float', possible loss of data
F:\Graphics2\Graphics2\Graphics2.cpp(85,50): warning C4244: 'argument': conversion from 'int' to 'float', possible loss of data
F:\Graphics2\Graphics2\Graphics2.cpp(85,45): warning C4244: 'argument': conversion from 'int' to 'float', possible loss of data
F:\Graphics2\Graphics2\Graphics2.cpp(89,23): warning C4244: 'initializing': conversion from 'int' to 'float', possible loss of data
F:\Graphics2\Graphics2\Graphics2.cpp(91,48): warning C4244: 'argument': conversion from 'int' to 'float', possible loss of data
F:\Graphics2\Graphics2\Graphics2.cpp(91,35): warning C4244: 'argument': conversion from 'int' to 'float', possible loss of data
F:\Graphics2\Graphics2\Graphics2.cpp(92,47): warning C4244: 'argument': conversion from 'int' to 'float', possible loss of data
F:\Graphics2\Graphics2\Graphics2.cpp(92,35): warning C4244: 'argument': conversion from 'int' to 'float', possible loss of data
F:\Graphics2\Graphics2\Graphics2.cpp(93,47): warning C4244: 'argument': conversion from 'int' to 'float', possible loss of data
F:\Graphics2\Graphics2\Graphics2.cpp(93,34): warning C4244: 'argument': conversion from 'int' to 'float', possible loss of data
F:\Graphics2\Graphics2\Graphics2.cpp(94,46): warning C4244: 'argument': conversion from 'int' to 'float', possible loss of data
F:\Graphics2\Graphics2\Graphics2.cpp(94,34): warning C4244: 'argument': conversion from 'int' to 'float', possible loss of data
F:\Graphics2\Graphics2\Graphics2.cpp(97,55): warning C4244: 'argument': conversion from 'int' to 'float', possible loss of data
F:\Graphics2\Graphics2\Graphics2.cpp(97,50): warning C4244: 'argument': conversion from 'int' to 'float', possible loss of data
F:\Graphics2\Graphics2\Graphics2.cpp(97,45): warning C4244: 'argument': conversion from 'int' to 'float', possible loss of data
F:\Graphics2\Graphics2\Graphics2.cpp(112,16): warning C4244: 'initializing': conversion from 'double' to 'float', possible loss of data
F:\Graphics2\Graphics2\Graphics2.cpp(115,30): warning C4305: '+=': truncation from 'double' to 'float'
F:\Graphics2\Graphics2\Graphics2.cpp(117,29): warning C4305: '+=': truncation from 'double' to 'float'
ObjLoader.cpp
F:\Graphics2\Graphics2\ObjLoader.cpp(68,13): warning C4244: 'initializing': conversion from '_Ty' to 'float', possible loss of data
with
[
_Ty=int
]
F:\Graphics2\Graphics2\ObjLoader.cpp(69,13): warning C4244: 'initializing': conversion from '_Ty' to 'float', possible loss of data
with
[
_Ty=int
]
F:\Graphics2\Graphics2\ObjLoader.cpp(70,13): warning C4244: 'initializing': conversion from '_Ty' to 'float', possible loss of data
with
[
_Ty=int
]
PerlinNoise.cpp
SceneGraph.cpp
SceneNodePlane.cpp
 SceneNodePlane.cpp
F:\Graphics2\Graphics2\SceneNodePlane.cpp(58,55): warning C4267: 'argument': conversion from 'size_t' to 'UINT', possible loss of data
F:\Graphics2\Graphics2\SceneNodePlane.cpp(71,34): warning C4244: 'argument': conversion from 'float' to 'UINT', possible loss of data
F:\Graphics2\Graphics2\SceneNodePlane.cpp(71,26): warning C4244: 'argument': conversion from 'float' to 'UINT', possible loss of data
F:\Graphics2\Graphics2\SceneNodePlane.cpp(71,18): warning C4244: 'argument': conversion from 'float' to 'UINT', possible loss of data
F:\Graphics2\Graphics2\SceneNodePlane.cpp(77,50): warning C4267: '=': conversion from 'size_t' to 'UINT', possible loss of data
F:\Graphics2\Graphics2\SceneNodePlane.cpp(91,53): warning C4267: '=': conversion from 'size_t' to 'UINT', possible loss of data
SceneNodeSkybox.cpp
SceneNodeTerrain.cpp
SceneNodePhysicsCube.cpp
SceneNodeWater.cpp
WICTextureLoader.cpp
Generating Code...
Graphics2.vcxproj -> F:\Graphics2\x64\Debug\Graphics2.exe
Binary file modified Graphics2/x64/Debug/Graphics2.obj
Binary file not shown.
Binary file modified Graphics2/x64/Debug/Graphics2.tlog/CL.command.1.tlog
Binary file not shown.
Binary file modified Graphics2/x64/Debug/Graphics2.tlog/CL.read.1.tlog
Binary file not shown.
Binary file modified Graphics2/x64/Debug/Graphics2.tlog/CL.write.1.tlog
Binary file not shown.
Binary file modified Graphics2/x64/Debug/Graphics2.tlog/link.read.1.tlog
Binary file not shown.
Binary file modified Graphics2/x64/Debug/ObjLoader.obj
Binary file not shown.
Binary file modified Graphics2/x64/Debug/SceneNodePlane.obj
Binary file not shown.
Binary file modified Graphics2/x64/Debug/vc142.idb
Binary file not shown.
Binary file modified Graphics2/x64/Debug/vc142.pdb
Binary file not shown.
Binary file modified x64/Debug/Graphics2.exe
Binary file not shown.
Binary file modified x64/Debug/Graphics2.ilk
Binary file not shown.
Binary file modified x64/Debug/Graphics2.pdb
Binary file not shown.

0 comments on commit 580d9ae

Please sign in to comment.