v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/assimp/assimp

pull/1263/head
Kim Kulling 2017-05-10 18:30:36 +02:00
parent 0300574b8b b8747fffca
commit d36fbfbb8b
2 changed files with 39 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/CMakeLists.txt
View File

@ -59,7 +59,7 @@ SET( PUBLIC_HEADERS
${HEADER_PATH}/camera.h ${HEADER_PATH}/camera.h
${HEADER_PATH}/color4.h ${HEADER_PATH}/color4.h
${HEADER_PATH}/color4.inl ${HEADER_PATH}/color4.inl
${HEADER_PATH}/config.h ${CMAKE_BINARY_DIR}/include/assimp/config.h
${HEADER_PATH}/defs.h ${HEADER_PATH}/defs.h
${HEADER_PATH}/cfileio.h ${HEADER_PATH}/cfileio.h
${HEADER_PATH}/light.h ${HEADER_PATH}/light.h

99
code/X3DImporter_Node.hpp
View File

@ -467,42 +467,29 @@ public:
/// \class CX3DImporter_NodeElement_Geometry3D /// \class CX3DImporter_NodeElement_Geometry3D
/// Three-dimensional body. /// Three-dimensional body.
class CX3DImporter_NodeElement_Geometry3D : public CX3DImporter_NodeElement class CX3DImporter_NodeElement_Geometry3D : public CX3DImporter_NodeElement {
{
/***********************************************/
/****************** Variables ******************/
/***********************************************/
public: public:
std::list<aiVector3D> Vertices; ///< Vertices list.
size_t NumIndices;///< Number of indices in one face.
bool Solid; ///< Flag: if true then render must use back-face culling, else render must draw both sides of object.
std::list<aiVector3D> Vertices;///< Vertices list.
size_t NumIndices;///< Number of indices in one face.
bool Solid;///< Flag: if true then render must use back-face culling, else render must draw both sides of object.
/***********************************************/
/****************** Functions ******************/
/***********************************************/
private:
/// \fn CX3DImporter_NodeElement_Geometry3D(const CX3DImporter_NodeElement_Geometry3D& pNode)
/// Disabled copy constructor.
CX3DImporter_NodeElement_Geometry3D(const CX3DImporter_NodeElement_Geometry3D& pNode);
/// \fn CX3DImporter_NodeElement_Geometry3D& operator=(const CX3DImporter_NodeElement_Geometry3D& pNode)
/// Disabled assign operator.
CX3DImporter_NodeElement_Geometry3D& operator=(const CX3DImporter_NodeElement_Geometry3D& pNode);
public:
/// \fn CX3DImporter_NodeElement_Geometry3D(const EType pType, CX3DImporter_NodeElement* pParent)
/// Constructor. /// Constructor.
/// \param [in] pParent - pointer to parent node. /// \param [in] pParent - pointer to parent node.
/// \param [in] pType - type of geometry object. /// \param [in] pType - type of geometry object.
CX3DImporter_NodeElement_Geometry3D(const EType pType, CX3DImporter_NodeElement* pParent) CX3DImporter_NodeElement_Geometry3D(const EType pType, CX3DImporter_NodeElement* pParent)
: CX3DImporter_NodeElement(pType, pParent), Solid(true) : CX3DImporter_NodeElement(pType, pParent)
{} , Vertices()
, NumIndices( 0 )
, Solid(true) {
// empty
}
private:
/// Disabled copy constructor.
CX3DImporter_NodeElement_Geometry3D(const CX3DImporter_NodeElement_Geometry3D& pNode);
/// Disabled assign operator.
CX3DImporter_NodeElement_Geometry3D& operator=(const CX3DImporter_NodeElement_Geometry3D& pNode);
};// class CX3DImporter_NodeElement_Geometry3D };// class CX3DImporter_NodeElement_Geometry3D
/// \class CX3DImporter_NodeElement_ElevationGrid /// \class CX3DImporter_NodeElement_ElevationGrid
@ -688,45 +675,35 @@ struct CX3DImporter_NodeElement_Appearance : public CX3DImporter_NodeElement
/// \class CX3DImporter_NodeElement_Material /// \class CX3DImporter_NodeElement_Material
/// Material. /// Material.
class CX3DImporter_NodeElement_Material : public CX3DImporter_NodeElement class CX3DImporter_NodeElement_Material : public CX3DImporter_NodeElement {
{
/***********************************************/
/****************** Variables ******************/
/***********************************************/
public: public:
float AmbientIntensity;///< Specifies how much ambient light from light sources this surface shall reflect.
aiColor3D DiffuseColor; ///< Reflects all X3D light sources depending on the angle of the surface with respect to the light source.
aiColor3D EmissiveColor; ///< Models "glowing" objects. This can be useful for displaying pre-lit models.
float Shininess; ///< Lower shininess values produce soft glows, while higher values result in sharper, smaller highlights.
aiColor3D SpecularColor; ///< The specularColor and shininess fields determine the specular highlights.
float Transparency; ///< Specifies how "clear" an object is, with 1.0 being completely transparent, and 0.0 completely opaque.
float AmbientIntensity;///< Specifies how much ambient light from light sources this surface shall reflect.
aiColor3D DiffuseColor;///< Reflects all X3D light sources depending on the angle of the surface with respect to the light source.
aiColor3D EmissiveColor;///< Models "glowing" objects. This can be useful for displaying pre-lit models.
float Shininess;///< Lower shininess values produce soft glows, while higher values result in sharper, smaller highlights.
aiColor3D SpecularColor;///< The specularColor and shininess fields determine the specular highlights.
float Transparency;///< Specifies how "clear" an object is, with 1.0 being completely transparent, and 0.0 completely opaque.
/***********************************************/
/****************** Functions ******************/
/***********************************************/
private:
/// \fn CX3DImporter_NodeElement_Material(const CX3DImporter_NodeElement_Material& pNode)
/// Disabled copy constructor.
CX3DImporter_NodeElement_Material(const CX3DImporter_NodeElement_Material& pNode);
/// \fn CX3DImporter_NodeElement_Material& operator=(const CX3DImporter_NodeElement_Material& pNode)
/// Disabled assign operator.
CX3DImporter_NodeElement_Material& operator=(const CX3DImporter_NodeElement_Material& pNode);
public:
/// \fn CX3DImporter_NodeElement_Material(const EType pType, CX3DImporter_NodeElement* pParent)
/// Constructor. /// Constructor.
/// \param [in] pParent - pointer to parent node. /// \param [in] pParent - pointer to parent node.
/// \param [in] pType - type of geometry object. /// \param [in] pType - type of geometry object.
CX3DImporter_NodeElement_Material(CX3DImporter_NodeElement* pParent) CX3DImporter_NodeElement_Material(CX3DImporter_NodeElement* pParent)
: CX3DImporter_NodeElement(ENET_Material, pParent) : CX3DImporter_NodeElement(ENET_Material, pParent)
{} , AmbientIntensity( 0.0f )
, DiffuseColor()
, EmissiveColor()
, Shininess( 0.0f )
, SpecularColor()
, Transparency( 1.0f ) {
// empty
}
private:
/// Disabled copy constructor.
CX3DImporter_NodeElement_Material(const CX3DImporter_NodeElement_Material& pNode);
/// Disabled assign operator.
CX3DImporter_NodeElement_Material& operator=(const CX3DImporter_NodeElement_Material& pNode);
};// class CX3DImporter_NodeElement_Material };// class CX3DImporter_NodeElement_Material
/// \struct CX3DImporter_NodeElement_ImageTexture /// \struct CX3DImporter_NodeElement_ImageTexture