From 9a1217e55980f9b0a501fbe03ab2ea559638392d Mon Sep 17 00:00:00 2001 From: Maxime Curioni Date: Thu, 7 Aug 2008 15:04:25 +0000 Subject: soc-2008-mxcurioni: first version of lib3ds code. It does NOT work yet and has to be debugged. It can be activate in app_blender/api.cpp by replacing the FRS_scene_3ds_export call in FRS_prepare, by FRS_load_mesh. All of the reference to the original Material class were renamed to FrsMaterial to resolve a name collision with Blender. To keep the window context necessary to draw the strokes after RE_Database_FromScene has been called, the display_clear function is used. --- .../blender/freestyle/intern/winged_edge/WEdge.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'source/blender/freestyle/intern/winged_edge/WEdge.h') diff --git a/source/blender/freestyle/intern/winged_edge/WEdge.h b/source/blender/freestyle/intern/winged_edge/WEdge.h index ea6c793bdfe..9b05b4577a9 100755 --- a/source/blender/freestyle/intern/winged_edge/WEdge.h +++ b/source/blender/freestyle/intern/winged_edge/WEdge.h @@ -34,7 +34,7 @@ # include # include "../system/FreestyleConfig.h" # include "../geometry/Geom.h" -# include "../scene_graph/Material.h" +# include "../scene_graph/FrsMaterial.h" using namespace std; using namespace Geometry; @@ -495,11 +495,11 @@ protected: vector _VerticesTexCoords; int _Id; - unsigned _MaterialIndex; + unsigned _FrsMaterialIndex; public: void *userdata; - inline WFace() {userdata = NULL;_MaterialIndex = 0;} + inline WFace() {userdata = NULL;_FrsMaterialIndex = 0;} /*! copy constructor */ WFace(WFace& iBrother); virtual WFace * duplicate(); @@ -510,8 +510,8 @@ public: inline WOEdge * GetOEdge(int i) {return _OEdgeList[i];} inline Vec3r& GetNormal() {return _Normal;} inline int GetId() {return _Id;} - inline unsigned materialIndex() const {return _MaterialIndex;} - const Material& material() ; + inline unsigned frs_materialIndex() const {return _FrsMaterialIndex;} + const FrsMaterial& frs_material() ; /*! The vertex of index i corresponds to the a vertex * of the edge of index i @@ -653,7 +653,7 @@ public: inline void setNormalList(const vector& iNormalsList) {_VerticesNormals = iNormalsList;} inline void setTexCoordsList(const vector& iTexCoordsList) {_VerticesTexCoords = iTexCoordsList;} inline void setId(int id) {_Id = id;} - inline void setMaterialIndex(unsigned iMaterialIndex) {_MaterialIndex = iMaterialIndex;} + inline void setFrsMaterialIndex(unsigned iMaterialIndex) {_FrsMaterialIndex = iMaterialIndex;} /*! designed to build a specialized WEdge * for use in MakeEdge @@ -702,7 +702,7 @@ protected: static unsigned _SceneCurrentId; Vec3r _min; Vec3r _max; - vector _Materials; + vector _FrsMaterials; real _meanEdgeSize; public: @@ -749,8 +749,8 @@ public: inline vector& GetFaceList() {return _FaceList;} inline unsigned GetId() {return _Id;} inline void bbox(Vec3r& min, Vec3r& max) {min=_min; max=_max;} - inline const Material& material(unsigned i) const {return _Materials[i];} - inline const vector& materials() const {return _Materials;} + inline const FrsMaterial& frs_material(unsigned i) const {return _FrsMaterials[i];} + inline const vector& frs_materials() const {return _FrsMaterials;} inline const real getMeanEdgeSize() const {return _meanEdgeSize;} /*! modifiers */ static inline void setCurrentId(const unsigned id) { _SceneCurrentId = id; } @@ -759,8 +759,8 @@ public: inline void setFaceList(const vector& iFaceList) {_FaceList = iFaceList;} inline void setId(int id) {_Id = id;} inline void setBBox(const Vec3r& min, const Vec3r& max) {_min = min; _max=max;} - inline void setMaterial(const Material& material, unsigned i) {_Materials[i]=material;} - inline void setMaterials(const vector& iMaterials) {_Materials = iMaterials;} + inline void setFrsMaterial(const FrsMaterial& frs_material, unsigned i) {_FrsMaterials[i]=frs_material;} + inline void setFrsMaterials(const vector& iMaterials) {_FrsMaterials = iMaterials;} /*! designed to build a specialized WFace * for use in MakeFace -- cgit v1.2.3