Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix review findings.

Browse Source
This commit is contained in:
Kim Kulling
2020-03-15 10:28:37 +01:00
parent 8b6f95ec30 4210318a34
commit 9e91a33d76
47 changed files with 1031 additions and 737 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
code/Obj/ObjFileData.h
View File

@@ -41,12 +41,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#pragma once
#ifndef OBJ_FILEDATA_H_INC
#define OBJ_FILEDATA_H_INC
# define OBJ_FILEDATA_H_INC
#include <assimp/mesh.h>
#include <assimp/types.h>
#include <map>
#include <vector>
# include <assimp/mesh.h>
# include <assimp/types.h>
# include <map>
# include <vector>
namespace Assimp {
namespace ObjFile {
@@ -105,10 +105,7 @@ struct Object {
std::vector<unsigned int> m_Meshes;
//! \brief Default constructor
Object() :
m_strObjName("") {
// empty
}
Object() = default;
//! \brief Destructor
~Object() {
@@ -180,17 +177,17 @@ struct Material {
//! Constructor
Material() :
diffuse(ai_real(0.6), ai_real(0.6), ai_real(0.6)), alpha(ai_real(1.0)), shineness(ai_real(0.0)), illumination_model(1), ior(ai_real(1.0)), transparent(ai_real(1.0), ai_real(1.0), ai_real(1.0)) {
// empty
for (size_t i = 0; i < TextureTypeCount; ++i) {
clamp[i] = false;
}
diffuse(ai_real(0.6), ai_real(0.6), ai_real(0.6)),
alpha(ai_real(1.0)),
shineness(ai_real(0.0)),
illumination_model(1),
ior(ai_real(1.0)),
transparent(ai_real(1.0), ai_real(1.0), ai_real(1.0)) {
std::fill_n(clamp, static_cast<unsigned int>(TextureTypeCount), false);
}
// Destructor
~Material() {
// empty
}
~Material() = default;
};
// ------------------------------------------------------------------------------------------------