Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Clark Lin
hw3d
Commits
eebc975a
Commit
eebc975a
authored
Aug 29, 2019
by
chili
Browse files
Revert "add test cube to app scene"
This reverts commit
0bb1a961
.
parent
0bb1a961
Changes
2
Show whitespace changes
Inline
Side-by-side
hw3d/App.cpp
View file @
eebc975a
...
@@ -15,11 +15,9 @@ App::App()
...
@@ -15,11 +15,9 @@ App::App()
:
:
wnd
(
1280
,
720
,
"The Donkey Fart Box"
),
wnd
(
1280
,
720
,
"The Donkey Fart Box"
),
light
(
wnd
.
Gfx
()
),
light
(
wnd
.
Gfx
()
),
plane
(
wnd
.
Gfx
(),
3.0
f
),
plane
(
wnd
.
Gfx
(),
3.0
f
)
cube
(
wnd
.
Gfx
(),
4.0
f
)
{
{
plane
.
SetPos
(
{
-
5.0
f
,
17.0
f
,
-
1.0
f
}
);
plane
.
SetPos
(
{
1.0
f
,
17.0
f
,
-
1.0
f
}
);
cube
.
SetPos
(
{
3.0
f
,
14.0
f
,
-
2.0
f
}
);
wnd
.
Gfx
().
SetProjection
(
dx
::
XMMatrixPerspectiveLH
(
1.0
f
,
9.0
f
/
16.0
f
,
0.5
f
,
40.0
f
)
);
wnd
.
Gfx
().
SetProjection
(
dx
::
XMMatrixPerspectiveLH
(
1.0
f
,
9.0
f
/
16.0
f
,
0.5
f
,
40.0
f
)
);
}
}
...
@@ -34,7 +32,6 @@ void App::DoFrame()
...
@@ -34,7 +32,6 @@ void App::DoFrame()
nano2
.
Draw
(
wnd
.
Gfx
()
);
nano2
.
Draw
(
wnd
.
Gfx
()
);
light
.
Draw
(
wnd
.
Gfx
()
);
light
.
Draw
(
wnd
.
Gfx
()
);
plane
.
Draw
(
wnd
.
Gfx
()
);
plane
.
Draw
(
wnd
.
Gfx
()
);
cube
.
Draw
(
wnd
.
Gfx
()
);
while
(
const
auto
e
=
wnd
.
kbd
.
ReadKey
()
)
while
(
const
auto
e
=
wnd
.
kbd
.
ReadKey
()
)
{
{
...
@@ -106,7 +103,6 @@ void App::DoFrame()
...
@@ -106,7 +103,6 @@ void App::DoFrame()
nano
.
ShowWindow
(
"Model 1"
);
nano
.
ShowWindow
(
"Model 1"
);
nano2
.
ShowWindow
(
"Model 2"
);
nano2
.
ShowWindow
(
"Model 2"
);
plane
.
SpawnControlWindow
(
wnd
.
Gfx
()
);
plane
.
SpawnControlWindow
(
wnd
.
Gfx
()
);
cube
.
SpawnControlWindow
(
wnd
.
Gfx
()
);
// present
// present
wnd
.
Gfx
().
EndFrame
();
wnd
.
Gfx
().
EndFrame
();
...
...
hw3d/App.h
View file @
eebc975a
...
@@ -5,7 +5,6 @@
...
@@ -5,7 +5,6 @@
#include "Camera.h"
#include "Camera.h"
#include "PointLight.h"
#include "PointLight.h"
#include "TestPlane.h"
#include "TestPlane.h"
#include "TestCube.h"
#include "Mesh.h"
#include "Mesh.h"
#include <set>
#include <set>
...
@@ -30,5 +29,4 @@ private:
...
@@ -30,5 +29,4 @@ private:
Model
nano
{
wnd
.
Gfx
(),
"Models
\\
nano_textured
\\
nanosuit.obj"
};
Model
nano
{
wnd
.
Gfx
(),
"Models
\\
nano_textured
\\
nanosuit.obj"
};
Model
nano2
{
wnd
.
Gfx
(),
"Models
\\
nano_textured
\\
nanosuit.obj"
};
Model
nano2
{
wnd
.
Gfx
(),
"Models
\\
nano_textured
\\
nanosuit.obj"
};
TestPlane
plane
;
TestPlane
plane
;
TestCube
cube
;
};
};
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment