diff options
author | Maxime Curioni <maxime.curioni@gmail.com> | 2008-08-07 19:04:25 +0400 |
---|---|---|
committer | Maxime Curioni <maxime.curioni@gmail.com> | 2008-08-07 19:04:25 +0400 |
commit | 9a1217e55980f9b0a501fbe03ab2ea559638392d (patch) | |
tree | 28b4c5bcf547d2d9f63d7d687ff6f43064cc0dc5 /source/blender/freestyle/intern/stroke | |
parent | 1baf09110b2c3bd4a6eea128b61ca9a0017f81dd (diff) |
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.
Diffstat (limited to 'source/blender/freestyle/intern/stroke')
-rwxr-xr-x | source/blender/freestyle/intern/stroke/Curve.h | 6 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/stroke/StrokeTesselator.cpp | 6 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/stroke/StrokeTesselator.h | 10 |
3 files changed, 11 insertions, 11 deletions
diff --git a/source/blender/freestyle/intern/stroke/Curve.h b/source/blender/freestyle/intern/stroke/Curve.h index 7fbe7e701e9..ee27e92fa37 100755 --- a/source/blender/freestyle/intern/stroke/Curve.h +++ b/source/blender/freestyle/intern/stroke/Curve.h @@ -33,7 +33,7 @@ # include <deque> # include "../system/BaseIterator.h" # include "../geometry/Geom.h" -//# include "../scene_graph/Material.h" +//# include "../scene_graph/FrsMaterial.h" # include "../view_map/Silhouette.h" # include "../view_map/SilhouetteGeomEngine.h" # include "../view_map/Interface0D.h" @@ -234,7 +234,7 @@ public: inline const Vec3r& point2d() const {return _Point2d;} inline const Vec3r& point3d() const {return _Point3d;} Vec3r normal() const ; - //Material material() const ; + //FrsMaterial material() const ; // Id shape_id() const ; const SShape * shape() const ; // float shape_importance() const ; @@ -392,7 +392,7 @@ public: //Vec3r orientation3d(int iCombination = 0) const ; // real curvature2d(point_iterator it) const {return (*it)->curvature2d();} // real curvature2d(int iCombination = 0) const ; - //Material material() const ; + //FrsMaterial material() const ; //int qi() const ; // occluder_container::const_iterator occluders_begin() const ; // occluder_container::const_iterator occluders_end() const ; diff --git a/source/blender/freestyle/intern/stroke/StrokeTesselator.cpp b/source/blender/freestyle/intern/stroke/StrokeTesselator.cpp index 279655c22b7..465e5662774 100755 --- a/source/blender/freestyle/intern/stroke/StrokeTesselator.cpp +++ b/source/blender/freestyle/intern/stroke/StrokeTesselator.cpp @@ -48,8 +48,8 @@ LineRep* StrokeTesselator::Tesselate(Stroke *iStroke) } else { - if(_overloadMaterial) - line->setMaterial(_Material); + if(_overloadFrsMaterial) + line->setFrsMaterial(_FrsMaterial); line->setStyle(LineRep::LINE_STRIP); @@ -75,7 +75,7 @@ NodeGroup* StrokeTesselator::Tesselate(StrokeVertexIterator begin, StrokeVertexI NodeShape *tshape = new NodeShape; group->AddChild(tshape); //tshape->material().setDiffuse(0.f, 0.f, 0.f, 1.f); - tshape->setMaterial(_Material); + tshape->setFrsMaterial(_FrsMaterial); for(StrokeVertexIterator c=begin, cend=end; c!=cend; diff --git a/source/blender/freestyle/intern/stroke/StrokeTesselator.h b/source/blender/freestyle/intern/stroke/StrokeTesselator.h index eaeb73504c9..1de281734cd 100755 --- a/source/blender/freestyle/intern/stroke/StrokeTesselator.h +++ b/source/blender/freestyle/intern/stroke/StrokeTesselator.h @@ -38,7 +38,7 @@ class StrokeTesselator { public: - inline StrokeTesselator() {_Material.setDiffuse(0,0,0,1);_overloadMaterial=false;} + inline StrokeTesselator() {_FrsMaterial.setDiffuse(0,0,0,1);_overloadFrsMaterial=false;} virtual ~StrokeTesselator() {} /*! Builds a line rep contained from a Stroke @@ -54,13 +54,13 @@ public: - inline void setMaterial(const Material& iMaterial) {_Material=iMaterial;_overloadMaterial=true;} - inline const Material& material() const {return _Material;} + inline void setFrsMaterial(const FrsMaterial& iMaterial) {_FrsMaterial=iMaterial;_overloadFrsMaterial=true;} + inline const FrsMaterial& frs_material() const {return _FrsMaterial;} private: - Material _Material; - bool _overloadMaterial; + FrsMaterial _FrsMaterial; + bool _overloadFrsMaterial; }; #endif // STROKETESSELATOR_H |