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
62837c09
Commit
62837c09
authored
Jul 06, 2019
by
chili
Browse files
minor access control change
parent
99e230c6
Changes
2
Hide whitespace changes
Inline
Side-by-side
hw3d/Mesh.cpp
View file @
62837c09
...
...
@@ -5,7 +5,6 @@
namespace
dx
=
DirectX
;
ModelException
::
ModelException
(
int
line
,
const
char
*
file
,
std
::
string
note
)
noexcept
:
ChiliException
(
line
,
file
),
...
...
@@ -239,7 +238,6 @@ Model::~Model() noexcept
std
::
unique_ptr
<
Mesh
>
Model
::
ParseMesh
(
Graphics
&
gfx
,
const
aiMesh
&
mesh
)
{
namespace
dx
=
DirectX
;
using
Dvtx
::
VertexLayout
;
Dvtx
::
VertexBuffer
vbuf
(
std
::
move
(
...
...
@@ -292,6 +290,7 @@ std::unique_ptr<Mesh> Model::ParseMesh( Graphics& gfx,const aiMesh& mesh )
return
std
::
make_unique
<
Mesh
>
(
gfx
,
std
::
move
(
bindablePtrs
)
);
}
std
::
unique_ptr
<
Node
>
Model
::
ParseNode
(
int
&
nextId
,
const
aiNode
&
node
)
noexcept
{
namespace
dx
=
DirectX
;
...
...
hw3d/Mesh.h
View file @
62837c09
...
...
@@ -33,15 +33,14 @@ private:
class
Node
{
friend
class
Model
;
friend
class
ModelWindow
;
public:
Node
(
int
id
,
const
std
::
string
&
name
,
std
::
vector
<
Mesh
*>
meshPtrs
,
const
DirectX
::
XMMATRIX
&
transform
)
noxnd
;
void
Draw
(
Graphics
&
gfx
,
DirectX
::
FXMMATRIX
accumulatedTransform
)
const
noxnd
;
void
SetAppliedTransform
(
DirectX
::
FXMMATRIX
transform
)
noexcept
;
int
GetId
()
const
noexcept
;
void
ShowTree
(
Node
*&
pSelectedNode
)
const
noexcept
;
private:
void
AddChild
(
std
::
unique_ptr
<
Node
>
pChild
)
noxnd
;
void
ShowTree
(
Node
*&
pSelectedNode
)
const
noexcept
;
private:
std
::
string
name
;
int
id
;
...
...
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