[Bf-blender-cvs] [9a7c4ea] master: Move BVHType and shadingsystem enums to top-level of Cycles namespace.
Nathan Letwory
noreply at git.blender.org
Mon May 19 14:11:06 CEST 2014
Commit: 9a7c4ead3f57052c911570d1b507e1f5229210c8
Author: Nathan Letwory
Date: Fri May 16 16:43:28 2014 +0300
https://developer.blender.org/rB9a7c4ead3f57052c911570d1b507e1f5229210c8
Move BVHType and shadingsystem enums to top-level of Cycles namespace.
Easier access of BVHType and deduplication for ShadingSystem.
Reviewers: dingto, brecht
Differential Revision: https://developer.blender.org/D534
===================================================================
M intern/cycles/blender/blender_sync.cpp
M intern/cycles/render/object.cpp
M intern/cycles/render/scene.cpp
M intern/cycles/render/scene.h
M intern/cycles/render/session.h
M intern/cycles/render/shader.cpp
M intern/cycles/util/util_types.h
===================================================================
diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp
index 555692d..d0eac16 100644
--- a/intern/cycles/blender/blender_sync.cpp
+++ b/intern/cycles/blender/blender_sync.cpp
@@ -35,6 +35,7 @@
#include "util_debug.h"
#include "util_foreach.h"
#include "util_opengl.h"
+#include "util_types.h"
CCL_NAMESPACE_BEGIN
@@ -362,19 +363,19 @@ SceneParams BlenderSync::get_scene_params(BL::Scene b_scene, bool background)
const bool shadingsystem = RNA_boolean_get(&cscene, "shading_system");
if(shadingsystem == 0)
- params.shadingsystem = SceneParams::SVM;
+ params.shadingsystem = ShadingSystem::SVM;
else if(shadingsystem == 1)
- params.shadingsystem = SceneParams::OSL;
+ params.shadingsystem = ShadingSystem::OSL;
if(background)
- params.bvh_type = SceneParams::BVH_STATIC;
+ params.bvh_type = BVHType::BVH_STATIC;
else
- params.bvh_type = (SceneParams::BVHType)RNA_enum_get(&cscene, "debug_bvh_type");
+ params.bvh_type = (BVHType)RNA_enum_get(&cscene, "debug_bvh_type");
params.use_bvh_spatial_split = RNA_boolean_get(&cscene, "debug_use_spatial_splits");
params.use_bvh_cache = (background)? RNA_boolean_get(&cscene, "use_cache"): false;
- if(background && params.shadingsystem != SceneParams::OSL)
+ if(background && params.shadingsystem != ShadingSystem::OSL)
params.persistent_data = r.use_persistent_data();
else
params.persistent_data = false;
@@ -511,9 +512,9 @@ SessionParams BlenderSync::get_session_params(BL::RenderEngine b_engine, BL::Use
const bool shadingsystem = RNA_boolean_get(&cscene, "shading_system");
if(shadingsystem == 0)
- params.shadingsystem = SessionParams::SVM;
+ params.shadingsystem = ShadingSystem::SVM;
else if(shadingsystem == 1)
- params.shadingsystem = SessionParams::OSL;
+ params.shadingsystem = ShadingSystem::OSL;
/* color managagement */
params.display_buffer_linear = GLEW_ARB_half_float_pixel && b_engine.support_display_space_shader(b_scene);
diff --git a/intern/cycles/render/object.cpp b/intern/cycles/render/object.cpp
index 027bfd7..7b2ffef 100644
--- a/intern/cycles/render/object.cpp
+++ b/intern/cycles/render/object.cpp
@@ -25,6 +25,7 @@
#include "util_foreach.h"
#include "util_map.h"
#include "util_progress.h"
+#include "util_types.h"
#include "util_vector.h"
CCL_NAMESPACE_BEGIN
@@ -388,7 +389,7 @@ void ObjectManager::device_update(Device *device, DeviceScene *dscene, Scene *sc
/* prepare for static BVH building */
/* todo: do before to support getting object level coords? */
- if(scene->params.bvh_type == SceneParams::BVH_STATIC) {
+ if(scene->params.bvh_type == BVHType::BVH_STATIC) {
progress.set_status("Updating Objects", "Applying Static Transformations");
apply_static_transforms(dscene, scene, object_flag, progress);
}
diff --git a/intern/cycles/render/scene.cpp b/intern/cycles/render/scene.cpp
index 4f5ad43..2cb8db5 100644
--- a/intern/cycles/render/scene.cpp
+++ b/intern/cycles/render/scene.cpp
@@ -61,7 +61,7 @@ Scene::Scene(const SceneParams& params_, const DeviceInfo& device_info_)
if(device_info_.type == DEVICE_CPU)
shader_manager = ShaderManager::create(this, params.shadingsystem);
else
- shader_manager = ShaderManager::create(this, SceneParams::SVM);
+ shader_manager = ShaderManager::create(this, ShadingSystem::SVM);
/* Extended image limits for CPU and GPUs */
image_manager->set_extended_image_limits(device_info_);
diff --git a/intern/cycles/render/scene.h b/intern/cycles/render/scene.h
index 0f0bb72..94fbbc4 100644
--- a/intern/cycles/render/scene.h
+++ b/intern/cycles/render/scene.h
@@ -120,8 +120,8 @@ public:
class SceneParams {
public:
- enum { OSL, SVM } shadingsystem;
- enum BVHType { BVH_DYNAMIC, BVH_STATIC } bvh_type;
+ ShadingSystem shadingsystem;
+ BVHType bvh_type;
bool use_bvh_cache;
bool use_bvh_spatial_split;
bool use_qbvh;
diff --git a/intern/cycles/render/session.h b/intern/cycles/render/session.h
index 1e62515..2d29015 100644
--- a/intern/cycles/render/session.h
+++ b/intern/cycles/render/session.h
@@ -24,6 +24,7 @@
#include "util_progress.h"
#include "util_stats.h"
#include "util_thread.h"
+#include "util_types.h"
#include "util_vector.h"
CCL_NAMESPACE_BEGIN
@@ -59,7 +60,7 @@ public:
double reset_timeout;
double text_timeout;
- enum { OSL, SVM } shadingsystem;
+ ShadingSystem shadingsystem;
SessionParams()
{
diff --git a/intern/cycles/render/shader.cpp b/intern/cycles/render/shader.cpp
index b25673b..14bb810 100644
--- a/intern/cycles/render/shader.cpp
+++ b/intern/cycles/render/shader.cpp
@@ -28,6 +28,7 @@
#include "tables.h"
#include "util_foreach.h"
+#include "util_types.h"
CCL_NAMESPACE_BEGIN
@@ -148,7 +149,7 @@ ShaderManager *ShaderManager::create(Scene *scene, int shadingsystem)
ShaderManager *manager;
#ifdef WITH_OSL
- if(shadingsystem == SceneParams::OSL)
+ if(shadingsystem == ShadingSystem::OSL)
manager = new OSLShaderManager();
else
#endif
diff --git a/intern/cycles/util/util_types.h b/intern/cycles/util/util_types.h
index bfaab3d..d1c9dc8 100644
--- a/intern/cycles/util/util_types.h
+++ b/intern/cycles/util/util_types.h
@@ -456,6 +456,15 @@ enum InterpolationType {
INTERPOLATION_SMART = 3,
};
+enum ShadingSystem {
+ OSL,
+ SVM
+};
+
+enum BVHType {
+ BVH_DYNAMIC,
+ BVH_STATIC
+};
/* macros */
More information about the Bf-blender-cvs
mailing list