diff options
Diffstat (limited to 'source/blender/freestyle')
13 files changed, 65 insertions, 65 deletions
diff --git a/source/blender/freestyle/CMakeLists.txt b/source/blender/freestyle/CMakeLists.txt index 6106dfa58b2..183eaf595ed 100644 --- a/source/blender/freestyle/CMakeLists.txt +++ b/source/blender/freestyle/CMakeLists.txt @@ -392,8 +392,8 @@ set(SRC intern/scene_graph/NodeGroup.h intern/scene_graph/NodeLight.cpp intern/scene_graph/NodeLight.h - intern/scene_graph/NodeSceneLayer.cpp - intern/scene_graph/NodeSceneLayer.h + intern/scene_graph/NodeViewLayer.cpp + intern/scene_graph/NodeViewLayer.h intern/scene_graph/NodeShape.cpp intern/scene_graph/NodeShape.h intern/scene_graph/NodeTransform.cpp diff --git a/source/blender/freestyle/FRS_freestyle.h b/source/blender/freestyle/FRS_freestyle.h index 4b9e09a9fb7..58f1c343235 100644 --- a/source/blender/freestyle/FRS_freestyle.h +++ b/source/blender/freestyle/FRS_freestyle.h @@ -51,13 +51,13 @@ extern struct FreestyleGlobals g_freestyle; void FRS_initialize(void); void FRS_set_context(struct bContext *C); void FRS_read_file(struct bContext *C); -int FRS_is_freestyle_enabled(struct SceneLayer *scene_layer); +int FRS_is_freestyle_enabled(struct ViewLayer *view_layer); void FRS_init_stroke_renderer(struct Render *re); void FRS_begin_stroke_rendering(struct Render *re); -struct Render *FRS_do_stroke_rendering(struct Render *re, struct SceneLayer *scene_layer, int render); +struct Render *FRS_do_stroke_rendering(struct Render *re, struct ViewLayer *view_layer, int render); void FRS_end_stroke_rendering(struct Render *re); void FRS_free_view_map_cache(void); -void FRS_composite_result(struct Render *re, struct SceneLayer *scene_layer, struct Render *freestyle_render); +void FRS_composite_result(struct Render *re, struct ViewLayer *view_layer, struct Render *freestyle_render); void FRS_exit(void); /* FreestyleConfig.linesets */ diff --git a/source/blender/freestyle/intern/application/Controller.cpp b/source/blender/freestyle/intern/application/Controller.cpp index 9754cf1de9f..759f6456759 100644 --- a/source/blender/freestyle/intern/application/Controller.cpp +++ b/source/blender/freestyle/intern/application/Controller.cpp @@ -40,7 +40,7 @@ extern "C" { #include "../scene_graph/NodeDrawingStyle.h" #include "../scene_graph/NodeShape.h" #include "../scene_graph/NodeTransform.h" -#include "../scene_graph/NodeSceneLayer.h" +#include "../scene_graph/NodeViewLayer.h" #include "../scene_graph/ScenePrettyPrinter.h" #include "../scene_graph/VertexRep.h" @@ -232,9 +232,9 @@ bool Controller::hitViewMapCache() return false; } -int Controller::LoadMesh(Render *re, SceneLayer *scene_layer) +int Controller::LoadMesh(Render *re, ViewLayer *view_layer) { - BlenderFileLoader loader(re, scene_layer); + BlenderFileLoader loader(re, view_layer); loader.setRenderMonitor(_pRenderMonitor); @@ -301,7 +301,7 @@ int Controller::LoadMesh(Render *re, SceneLayer *scene_layer) } cam->setProjectionMatrix(proj); _RootNode->AddChild(cam); - _RootNode->AddChild(new NodeSceneLayer(*re->scene, *scene_layer)); + _RootNode->AddChild(new NodeViewLayer(*re->scene, *view_layer)); sceneHashFunc.reset(); //blenderScene->accept(sceneHashFunc); diff --git a/source/blender/freestyle/intern/application/Controller.h b/source/blender/freestyle/intern/application/Controller.h index 606c80ada3f..0304c18b8a6 100644 --- a/source/blender/freestyle/intern/application/Controller.h +++ b/source/blender/freestyle/intern/application/Controller.h @@ -68,7 +68,7 @@ public: //soc void init_options(); - int LoadMesh(Render *re, SceneLayer *scene_layer); + int LoadMesh(Render *re, ViewLayer *view_layer); int Load3DSFile(const char *iFileName); void CloseFile(); void ComputeViewMap(); diff --git a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp index b20349acfd1..a0da68849f7 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp +++ b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp @@ -32,16 +32,16 @@ namespace Freestyle { -BlenderFileLoader::BlenderFileLoader(Render *re, SceneLayer *scene_layer) +BlenderFileLoader::BlenderFileLoader(Render *re, ViewLayer *view_layer) { _re = re; - _scene_layer = scene_layer; + _view_layer = view_layer; _Scene = NULL; _numFacesRead = 0; #if 0 _minEdgeSize = DBL_MAX; #endif - _smooth = (scene_layer->freestyle_config.flags & FREESTYLE_FACE_SMOOTHNESS_FLAG) != 0; + _smooth = (view_layer->freestyle_config.flags & FREESTYLE_FACE_SMOOTHNESS_FLAG) != 0; _pRenderMonitor = NULL; } diff --git a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h index b5530e3af09..ad92416801d 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h +++ b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h @@ -78,7 +78,7 @@ class BlenderFileLoader { public: /*! Builds a MaxFileLoader */ - BlenderFileLoader(Render *re, SceneLayer *scene_layer); + BlenderFileLoader(Render *re, ViewLayer *view_layer); virtual ~BlenderFileLoader(); /*! Loads the 3D scene and returns a pointer to the scene root node */ @@ -114,7 +114,7 @@ protected: unsigned n; }; Render *_re; - SceneLayer *_scene_layer; + ViewLayer *_view_layer; NodeGroup *_Scene; unsigned _numFacesRead; #if 0 diff --git a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp index 847da8067d5..6122ef99964 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp +++ b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp @@ -128,11 +128,11 @@ BlenderStrokeRenderer::BlenderStrokeRenderer(Render *re, int render_count) : Str DEG_graph_id_tag_update(freestyle_bmain, freestyle_depsgraph, &freestyle_scene->id, 0); // Scene layer. - SceneLayer *scene_layer = (SceneLayer *)freestyle_scene->render_layers.first; - scene_layer->layflag = SCE_LAY_SOLID | SCE_LAY_ZTRA; + ViewLayer *view_layer = (ViewLayer *)freestyle_scene->view_layers.first; + view_layer->layflag = SCE_LAY_SOLID | SCE_LAY_ZTRA; // Camera - Object *object_camera = BKE_object_add(freestyle_bmain, freestyle_scene, scene_layer, OB_CAMERA, NULL); + Object *object_camera = BKE_object_add(freestyle_bmain, freestyle_scene, view_layer, OB_CAMERA, NULL); DEG_graph_id_tag_update(freestyle_bmain, freestyle_depsgraph, &object_camera->id, 0); Camera *camera = (Camera *)object_camera->data; @@ -174,8 +174,8 @@ BlenderStrokeRenderer::~BlenderStrokeRenderer() // compositor has finished. // release objects and data blocks - SceneLayer *scene_layer = (SceneLayer *)freestyle_scene->render_layers.first; - for (Base *b = (Base *)scene_layer->object_bases.first; b; b = b->next) { + ViewLayer *view_layer = (ViewLayer *)freestyle_scene->view_layers.first; + for (Base *b = (Base *)view_layer->object_bases.first; b; b = b->next) { Object *ob = b->object; void *data = ob->data; char *name = ob->id.name; @@ -205,7 +205,7 @@ BlenderStrokeRenderer::~BlenderStrokeRenderer() BLI_freelistN(&sc->objects); } FOREACH_SCENE_COLLECTION_END - BLI_freelistN(&scene_layer->object_bases); + BLI_freelistN(&view_layer->object_bases); // release materials Link *lnk = (Link *)freestyle_bmain->mat.first; @@ -692,7 +692,7 @@ int BlenderStrokeRenderer::get_stroke_count() const void BlenderStrokeRenderer::GenerateStrokeMesh(StrokeGroup *group, bool hasTex) { #if 0 - Object *object_mesh = BKE_object_add(freestyle_bmain, freestyle_scene, (SceneLayer *)freestyle_scene->render_layers.first, OB_MESH); + Object *object_mesh = BKE_object_add(freestyle_bmain, freestyle_scene, (ViewLayer *)freestyle_scene->view_layers.first, OB_MESH); DEG_relations_tag_update(freestyle_bmain); #else Object *object_mesh = NewMesh(); @@ -969,8 +969,8 @@ Render *BlenderStrokeRenderer::RenderScene(Render * /*re*/, bool render) #endif Render *freestyle_render = RE_NewSceneRender(freestyle_scene); - SceneLayer *scene_layer = (SceneLayer *)freestyle_scene->render_layers.first; - DEG_graph_relations_update(freestyle_depsgraph, freestyle_bmain, freestyle_scene, scene_layer); + ViewLayer *view_layer = (ViewLayer *)freestyle_scene->view_layers.first; + DEG_graph_relations_update(freestyle_depsgraph, freestyle_bmain, freestyle_scene, view_layer); freestyle_render->depsgraph = freestyle_depsgraph; RE_RenderFreestyleStrokes(freestyle_render, freestyle_bmain, freestyle_scene, diff --git a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp index 0baad3f5165..e2560a33443 100644 --- a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp +++ b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp @@ -283,19 +283,19 @@ static bool test_edge_type_conditions(struct edge_type_condition *conditions, return true; } -static void prepare(Render *re, SceneLayer *scene_layer) +static void prepare(Render *re, ViewLayer *view_layer) { // load mesh re->i.infostr = IFACE_("Freestyle: Mesh loading"); re->stats_draw(re->sdh, &re->i); re->i.infostr = NULL; - if (controller->LoadMesh(re, scene_layer)) // returns if scene cannot be loaded or if empty + if (controller->LoadMesh(re, view_layer)) // returns if scene cannot be loaded or if empty return; if (re->test_break(re->tbh)) return; // add style modules - FreestyleConfig *config = &scene_layer->freestyle_config; + FreestyleConfig *config = &view_layer->freestyle_config; if (G.debug & G_DEBUG_FREESTYLE) { cout << "\n=== Rendering options ===" << endl; @@ -359,7 +359,7 @@ static void prepare(Render *re, SceneLayer *scene_layer) cout << " " << layer_count+1 << ": " << lineset->name << " - " << (lineset->linestyle ? (lineset->linestyle->id.name + 2) : "<NULL>") << endl; } - char *buffer = create_lineset_handler(scene_layer->name, lineset->name); + char *buffer = create_lineset_handler(view_layer->name, lineset->name); controller->InsertStyleModule(layer_count, lineset->name, buffer); controller->toggleLayer(layer_count, true); MEM_freeN(buffer); @@ -445,7 +445,7 @@ static void prepare(Render *re, SceneLayer *scene_layer) } // set diffuse and z depth passes - RenderLayer *rl = RE_GetRenderLayer(re->result, scene_layer->name); + RenderLayer *rl = RE_GetRenderLayer(re->result, view_layer->name); bool diffuse = false, z = false; for (RenderPass *rpass = (RenderPass *)rl->passes.first; rpass; rpass = rpass->next) { if (STREQ(rpass->name, RE_PASSNAME_DIFFUSE)) { @@ -473,7 +473,7 @@ static void prepare(Render *re, SceneLayer *scene_layer) controller->ComputeViewMap(); } -void FRS_composite_result(Render *re, SceneLayer *scene_layer, Render *freestyle_render) +void FRS_composite_result(Render *re, ViewLayer *view_layer, Render *freestyle_render) { RenderLayer *rl; float *src, *dest, *pixSrc, *pixDest; @@ -503,7 +503,7 @@ void FRS_composite_result(Render *re, SceneLayer *scene_layer, Render *freestyle } #endif - rl = RE_GetRenderLayer(re->result, scene_layer->name); + rl = RE_GetRenderLayer(re->result, view_layer->name); if (!rl) { if (G.debug & G_DEBUG_FREESTYLE) { cout << "No destination render layer to composite to" << endl; @@ -536,13 +536,13 @@ void FRS_composite_result(Render *re, SceneLayer *scene_layer, Render *freestyle } } -static int displayed_layer_count(SceneLayer *scene_layer) +static int displayed_layer_count(ViewLayer *view_layer) { int count = 0; - switch (scene_layer->freestyle_config.mode) { + switch (view_layer->freestyle_config.mode) { case FREESTYLE_CONTROL_SCRIPT_MODE: - for (FreestyleModuleConfig *module = (FreestyleModuleConfig *)scene_layer->freestyle_config.modules.first; + for (FreestyleModuleConfig *module = (FreestyleModuleConfig *)view_layer->freestyle_config.modules.first; module; module = module->next) { @@ -551,7 +551,7 @@ static int displayed_layer_count(SceneLayer *scene_layer) } break; case FREESTYLE_CONTROL_EDITOR_MODE: - for (FreestyleLineSet *lineset = (FreestyleLineSet *)scene_layer->freestyle_config.linesets.first; + for (FreestyleLineSet *lineset = (FreestyleLineSet *)view_layer->freestyle_config.linesets.first; lineset; lineset = lineset->next) { @@ -563,11 +563,11 @@ static int displayed_layer_count(SceneLayer *scene_layer) return count; } -int FRS_is_freestyle_enabled(SceneLayer *scene_layer) +int FRS_is_freestyle_enabled(ViewLayer *view_layer) { - return ((scene_layer->flag & SCENE_LAYER_RENDER) && - (scene_layer->flag & SCENE_LAYER_FREESTYLE) && - displayed_layer_count(scene_layer) > 0); + return ((view_layer->flag & VIEW_LAYER_RENDER) && + (view_layer->flag & VIEW_LAYER_FREESTYLE) && + displayed_layer_count(view_layer) > 0); } void FRS_init_stroke_renderer(Render *re) @@ -589,7 +589,7 @@ void FRS_begin_stroke_rendering(Render *re) init_camera(re); } -Render *FRS_do_stroke_rendering(Render *re, SceneLayer *scene_layer, int render) +Render *FRS_do_stroke_rendering(Render *re, ViewLayer *view_layer, int render) { Render *freestyle_render = NULL; @@ -598,12 +598,12 @@ Render *FRS_do_stroke_rendering(Render *re, SceneLayer *scene_layer, int render) RenderMonitor monitor(re); controller->setRenderMonitor(&monitor); - controller->setViewMapCache((scene_layer->freestyle_config.flags & FREESTYLE_VIEW_MAP_CACHE) ? true : false); + controller->setViewMapCache((view_layer->freestyle_config.flags & FREESTYLE_VIEW_MAP_CACHE) ? true : false); if (G.debug & G_DEBUG_FREESTYLE) { cout << endl; cout << "----------------------------------------------------------" << endl; - cout << "| " << (re->scene->id.name + 2) << "|" << scene_layer->name << endl; + cout << "| " << (re->scene->id.name + 2) << "|" << view_layer->name << endl; cout << "----------------------------------------------------------" << endl; } @@ -612,7 +612,7 @@ Render *FRS_do_stroke_rendering(Render *re, SceneLayer *scene_layer, int render) // - add style modules // - set parameters // - compute view map - prepare(re, scene_layer); + prepare(re, view_layer); if (re->test_break(re->tbh)) { controller->CloseFile(); @@ -637,7 +637,7 @@ Render *FRS_do_stroke_rendering(Render *re, SceneLayer *scene_layer, int render) // composite result if (freestyle_render) { - FRS_composite_result(re, scene_layer, freestyle_render); + FRS_composite_result(re, view_layer, freestyle_render); RE_FreeRenderResult(freestyle_render->result); freestyle_render->result = NULL; } diff --git a/source/blender/freestyle/intern/scene_graph/NodeSceneLayer.cpp b/source/blender/freestyle/intern/scene_graph/NodeViewLayer.cpp index c4beed1dbef..701c5caa91d 100644 --- a/source/blender/freestyle/intern/scene_graph/NodeSceneLayer.cpp +++ b/source/blender/freestyle/intern/scene_graph/NodeViewLayer.cpp @@ -18,18 +18,18 @@ * ***** END GPL LICENSE BLOCK ***** */ -/** \file blender/freestyle/intern/scene_graph/NodeSceneLayer.cpp +/** \file blender/freestyle/intern/scene_graph/NodeViewLayer.cpp * \ingroup freestyle * \brief Class to represent a scene render layer in Blender. */ -#include "NodeSceneLayer.h" +#include "NodeViewLayer.h" namespace Freestyle { -void NodeSceneLayer::accept(SceneVisitor& v) +void NodeViewLayer::accept(SceneVisitor& v) { - v.visitNodeSceneLayer(*this); + v.visitNodeViewLayer(*this); } } /* namespace Freestyle */ diff --git a/source/blender/freestyle/intern/scene_graph/NodeSceneLayer.h b/source/blender/freestyle/intern/scene_graph/NodeViewLayer.h index 5b781dff528..cc64fda60b6 100644 --- a/source/blender/freestyle/intern/scene_graph/NodeSceneLayer.h +++ b/source/blender/freestyle/intern/scene_graph/NodeViewLayer.h @@ -18,38 +18,38 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef __FREESTYLE_NODE_SCENE_LAYER_H__ -#define __FREESTYLE_NODE_SCENE_LAYER_H__ +#ifndef __FREESTYLE_NODE_VIEW_LAYER_H__ +#define __FREESTYLE_NODE_VIEW_LAYER_H__ -/** \file blender/freestyle/intern/scene_graph/NodeSceneLayer.h +/** \file blender/freestyle/intern/scene_graph/NodeViewLayer.h * \ingroup freestyle - * \brief Class to represent a scene render layer in Blender. + * \brief Class to represent a view layer in Blender. */ #include "Node.h" extern "C" { -#include "DNA_scene_types.h" /* for Scene and SceneRenderLayer */ +#include "DNA_scene_types.h" /* for Scene and ViewLayer */ } using namespace std; namespace Freestyle { -class NodeSceneLayer : public Node +class NodeViewLayer : public Node { public: - inline NodeSceneLayer(Scene& scene, SceneLayer& scene_layer) : Node(), _Scene(scene), _SceneLayer(scene_layer) {} - virtual ~NodeSceneLayer() {} + inline NodeViewLayer(Scene& scene, ViewLayer& view_layer) : Node(), _Scene(scene), _ViewLayer(view_layer) {} + virtual ~NodeViewLayer() {} inline struct Scene& scene() const { return _Scene; } - inline struct SceneLayer& sceneLayer() const + inline struct ViewLayer& sceneLayer() const { - return _SceneLayer; + return _ViewLayer; } /*! Accept the corresponding visitor */ @@ -58,9 +58,9 @@ public: protected: Scene& _Scene; - SceneLayer& _SceneLayer; + ViewLayer& _ViewLayer; }; } /* namespace Freestyle */ -#endif // __FREESTYLE_NODE_SCENE_LAYER_H__ +#endif // __FREESTYLE_NODE_VIEW_LAYER_H__ diff --git a/source/blender/freestyle/intern/scene_graph/SceneHash.cpp b/source/blender/freestyle/intern/scene_graph/SceneHash.cpp index 5fdf06a5059..16c353678c1 100644 --- a/source/blender/freestyle/intern/scene_graph/SceneHash.cpp +++ b/source/blender/freestyle/intern/scene_graph/SceneHash.cpp @@ -35,7 +35,7 @@ string SceneHash::toString() return ss.str(); } -void SceneHash::visitNodeSceneLayer(NodeSceneLayer& node) +void SceneHash::visitNodeViewLayer(NodeViewLayer& node) { struct RenderData *r = &node.scene().r; adler32((unsigned char *)&r->xsch, sizeof(r->xsch)); // resolution_x diff --git a/source/blender/freestyle/intern/scene_graph/SceneHash.h b/source/blender/freestyle/intern/scene_graph/SceneHash.h index b21fcf32fe3..662b4bba8f1 100644 --- a/source/blender/freestyle/intern/scene_graph/SceneHash.h +++ b/source/blender/freestyle/intern/scene_graph/SceneHash.h @@ -26,7 +26,7 @@ */ #include "IndexedFaceSet.h" -#include "NodeSceneLayer.h" +#include "NodeViewLayer.h" #include "NodeCamera.h" #include "SceneVisitor.h" @@ -49,7 +49,7 @@ public: virtual ~SceneHash() {} VISIT_DECL(NodeCamera) - VISIT_DECL(NodeSceneLayer) + VISIT_DECL(NodeViewLayer) VISIT_DECL(IndexedFaceSet) string toString(); diff --git a/source/blender/freestyle/intern/scene_graph/SceneVisitor.h b/source/blender/freestyle/intern/scene_graph/SceneVisitor.h index b27abb3625c..d76e48980bf 100644 --- a/source/blender/freestyle/intern/scene_graph/SceneVisitor.h +++ b/source/blender/freestyle/intern/scene_graph/SceneVisitor.h @@ -56,7 +56,7 @@ class NodeLight; class NodeCamera; class NodeDrawingStyle; class NodeTransform; -class NodeSceneLayer; +class NodeViewLayer; class Rep; class LineRep; @@ -88,7 +88,7 @@ public: VISIT_COMPLETE_DEF(NodeCamera) VISIT_COMPLETE_DEF(NodeDrawingStyle) VISIT_COMPLETE_DEF(NodeTransform) - VISIT_COMPLETE_DEF(NodeSceneLayer) + VISIT_COMPLETE_DEF(NodeViewLayer) VISIT_COMPLETE_DEF(Rep) VISIT_COMPLETE_DEF(LineRep) |