Commit 62837c09 authored by chili's avatar chili
Browse files

minor access control change

parent 99e230c6
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
namespace dx = DirectX; namespace dx = DirectX;
ModelException::ModelException( int line,const char* file,std::string note ) noexcept ModelException::ModelException( int line,const char* file,std::string note ) noexcept
: :
ChiliException( line,file ), ChiliException( line,file ),
...@@ -239,7 +238,6 @@ Model::~Model() noexcept ...@@ -239,7 +238,6 @@ Model::~Model() noexcept
std::unique_ptr<Mesh> Model::ParseMesh( Graphics& gfx,const aiMesh& mesh ) std::unique_ptr<Mesh> Model::ParseMesh( Graphics& gfx,const aiMesh& mesh )
{ {
namespace dx = DirectX;
using Dvtx::VertexLayout; using Dvtx::VertexLayout;
Dvtx::VertexBuffer vbuf( std::move( Dvtx::VertexBuffer vbuf( std::move(
...@@ -292,6 +290,7 @@ std::unique_ptr<Mesh> Model::ParseMesh( Graphics& gfx,const aiMesh& mesh ) ...@@ -292,6 +290,7 @@ std::unique_ptr<Mesh> Model::ParseMesh( Graphics& gfx,const aiMesh& mesh )
return std::make_unique<Mesh>( gfx,std::move( bindablePtrs ) ); return std::make_unique<Mesh>( gfx,std::move( bindablePtrs ) );
} }
std::unique_ptr<Node> Model::ParseNode( int& nextId,const aiNode& node ) noexcept std::unique_ptr<Node> Model::ParseNode( int& nextId,const aiNode& node ) noexcept
{ {
namespace dx = DirectX; namespace dx = DirectX;
......
...@@ -33,15 +33,14 @@ private: ...@@ -33,15 +33,14 @@ private:
class Node class Node
{ {
friend class Model; friend class Model;
friend class ModelWindow;
public: public:
Node( int id,const std::string& name,std::vector<Mesh*> meshPtrs,const DirectX::XMMATRIX& transform ) noxnd; 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 Draw( Graphics& gfx,DirectX::FXMMATRIX accumulatedTransform ) const noxnd;
void SetAppliedTransform( DirectX::FXMMATRIX transform ) noexcept; void SetAppliedTransform( DirectX::FXMMATRIX transform ) noexcept;
int GetId() const noexcept; int GetId() const noexcept;
void ShowTree( Node*& pSelectedNode ) const noexcept;
private: private:
void AddChild( std::unique_ptr<Node> pChild ) noxnd; void AddChild( std::unique_ptr<Node> pChild ) noxnd;
void ShowTree( Node*& pSelectedNode ) const noexcept;
private: private:
std::string name; std::string name;
int id; int id;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment