[Bf-blender-cvs] [f573824] bake-cycles: Cycles-Bake: [review] style cleanups (Cycles)
Dalai Felinto
noreply at git.blender.org
Wed Apr 23 02:47:43 CEST 2014
Commit: f57382418617d902e1f87862319bac5a70445a0b
Author: Dalai Felinto
Date: Tue Mar 25 14:22:46 2014 -0300
https://developer.blender.org/rBf57382418617d902e1f87862319bac5a70445a0b
Cycles-Bake: [review] style cleanups (Cycles)
===================================================================
M intern/cycles/blender/blender_session.cpp
M intern/cycles/kernel/kernel_displace.h
M intern/cycles/kernel/kernel_types.h
M intern/cycles/render/bake.cpp
M intern/cycles/render/session.cpp
===================================================================
diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp
index 759c3e3..d137953 100644
--- a/intern/cycles/blender/blender_session.cpp
+++ b/intern/cycles/blender/blender_session.cpp
@@ -268,47 +268,47 @@ static ShaderEvalType get_shader_type(const string& pass_type)
const char *shader_type = pass_type.c_str();
/* data passes */
- if (strcmp(shader_type, "NORMAL")==0)
+ if(strcmp(shader_type, "NORMAL")==0)
return SHADER_EVAL_NORMAL;
- else if (strcmp(shader_type, "UV")==0)
+ else if(strcmp(shader_type, "UV")==0)
return SHADER_EVAL_UV;
- else if (strcmp(shader_type, "DIFFUSE_COLOR")==0)
+ else if(strcmp(shader_type, "DIFFUSE_COLOR")==0)
return SHADER_EVAL_DIFFUSE_COLOR;
- else if (strcmp(shader_type, "GLOSSY_COLOR")==0)
+ else if(strcmp(shader_type, "GLOSSY_COLOR")==0)
return SHADER_EVAL_GLOSSY_COLOR;
- else if (strcmp(shader_type, "TRANSMISSION_COLOR")==0)
+ else if(strcmp(shader_type, "TRANSMISSION_COLOR")==0)
return SHADER_EVAL_TRANSMISSION_COLOR;
- else if (strcmp(shader_type, "SUBSURFACE_COLOR")==0)
+ else if(strcmp(shader_type, "SUBSURFACE_COLOR")==0)
return SHADER_EVAL_SUBSURFACE_COLOR;
- else if (strcmp(shader_type, "EMIT")==0)
+ else if(strcmp(shader_type, "EMIT")==0)
return SHADER_EVAL_EMISSION;
/* light passes */
- else if (strcmp(shader_type, "AO")==0)
+ else if(strcmp(shader_type, "AO")==0)
return SHADER_EVAL_AO;
- else if (strcmp(shader_type, "COMBINED")==0)
+ else if(strcmp(shader_type, "COMBINED")==0)
return SHADER_EVAL_COMBINED;
- else if (strcmp(shader_type, "SHADOW")==0)
+ else if(strcmp(shader_type, "SHADOW")==0)
return SHADER_EVAL_SHADOW;
- else if (strcmp(shader_type, "DIFFUSE_DIRECT")==0)
+ else if(strcmp(shader_type, "DIFFUSE_DIRECT")==0)
return SHADER_EVAL_DIFFUSE_DIRECT;
- else if (strcmp(shader_type, "GLOSSY_DIRECT")==0)
+ else if(strcmp(shader_type, "GLOSSY_DIRECT")==0)
return SHADER_EVAL_GLOSSY_DIRECT;
- else if (strcmp(shader_type, "TRANSMISSION_DIRECT")==0)
+ else if(strcmp(shader_type, "TRANSMISSION_DIRECT")==0)
return SHADER_EVAL_TRANSMISSION_DIRECT;
- else if (strcmp(shader_type, "SUBSURFACE_DIRECT")==0)
+ else if(strcmp(shader_type, "SUBSURFACE_DIRECT")==0)
return SHADER_EVAL_SUBSURFACE_DIRECT;
- else if (strcmp(shader_type, "DIFFUSE_INDIRECT")==0)
+ else if(strcmp(shader_type, "DIFFUSE_INDIRECT")==0)
return SHADER_EVAL_DIFFUSE_INDIRECT;
- else if (strcmp(shader_type, "GLOSSY_INDIRECT")==0)
+ else if(strcmp(shader_type, "GLOSSY_INDIRECT")==0)
return SHADER_EVAL_GLOSSY_INDIRECT;
- else if (strcmp(shader_type, "TRANSMISSION_INDIRECT")==0)
+ else if(strcmp(shader_type, "TRANSMISSION_INDIRECT")==0)
return SHADER_EVAL_TRANSMISSION_INDIRECT;
- else if (strcmp(shader_type, "SUBSURFACE_INDIRECT")==0)
+ else if(strcmp(shader_type, "SUBSURFACE_INDIRECT")==0)
return SHADER_EVAL_SUBSURFACE_INDIRECT;
/* extra */
- else if (strcmp(shader_type, "ENVIRONMENT")==0)
+ else if(strcmp(shader_type, "ENVIRONMENT")==0)
return SHADER_EVAL_ENVIRONMENT;
else
@@ -486,7 +486,7 @@ static void populate_bake_data(BakeData *data, BL::BakePixel pixel_array, const
BL::BakePixel bp = pixel_array;
int i;
- for (i=0; i < num_pixels; i++) {
+ for(i=0; i < num_pixels; i++) {
data->set(i, bp.primitive_id(), bp.u(), bp.v());
bp = bp.next();
}
@@ -518,12 +518,12 @@ void BlenderSession::bake(BL::Object b_object, const string& pass_type, BL::Bake
size_t object_index = ~0;
int tri_offset = 0;
- if (shader_type == SHADER_EVAL_UV) {
+ if(shader_type == SHADER_EVAL_UV) {
/* force UV to be available */
Pass::add(PASS_UV, scene->film->passes);
}
- if (is_light_pass(shader_type)) {
+ if(is_light_pass(shader_type)) {
/* force use_light_pass to be true */
Pass::add(PASS_LIGHT, scene->film->passes);
}
@@ -546,8 +546,8 @@ void BlenderSession::bake(BL::Object b_object, const string& pass_type, BL::Bake
session->update_scene();
/* find object index. todo: is arbitrary - copied from mesh_displace.cpp */
- for (size_t i = 0; i < scene->objects.size(); i++) {
- if (strcmp(scene->objects[i]->name.c_str(), b_object.name().c_str()) == 0) {
+ for(size_t i = 0; i < scene->objects.size(); i++) {
+ if(strcmp(scene->objects[i]->name.c_str(), b_object.name().c_str()) == 0) {
object_index = i;
tri_offset = scene->objects[i]->mesh->tri_offset;
break;
diff --git a/intern/cycles/kernel/kernel_displace.h b/intern/cycles/kernel/kernel_displace.h
index 5a3be0c..338e17f 100644
--- a/intern/cycles/kernel/kernel_displace.h
+++ b/intern/cycles/kernel/kernel_displace.h
@@ -28,7 +28,7 @@ ccl_device void compute_light_pass(KernelGlobals *kg, ShaderData *sd, PathRadian
path_radiance_init(L, kernel_data.film.use_light_pass);
/* take multiple samples */
- for (int sample = 0; sample < samples; sample++) {
+ for(int sample = 0; sample < samples; sample++) {
PathRadiance L_sample;
PathState state;
Ray ray;
@@ -46,12 +46,12 @@ ccl_device void compute_light_pass(KernelGlobals *kg, ShaderData *sd, PathRadian
shader_eval_surface(kg, sd, rbsdf, state.flag, SHADER_CONTEXT_MAIN);
/* sample ambient occlusion */
- if (is_ao) {
+ if(is_ao) {
kernel_path_ao(kg, sd, &L_sample, &state, &rng, throughput);
}
/* sample light and BSDF */
- else if (kernel_path_integrate_lighting(kg, &rng, sd, &throughput, &state, &L_sample, &ray)) {
+ else if(kernel_path_integrate_lighting(kg, &rng, sd, &throughput, &state, &L_sample, &ray)) {
#ifdef __LAMP_MIS__
state.ray_t = 0.0f;
#endif
@@ -97,15 +97,16 @@ ccl_device void kernel_bake_evaluate(KernelGlobals *kg, ccl_global uint4 *input,
int object = in.x;
int prim = in.y;
- float u = __uint_as_float(in.z);
- float v = __uint_as_float(in.w);
- if (prim == -1) {
+ if(prim == -1) {
/* write output */
output[i] = make_float4(0.0f, 0.0f, 0.0f, 0.0f);
return;
}
+ float u = __uint_as_float(in.z);
+ float v = __uint_as_float(in.w);
+
int shader;
float3 P = triangle_point_MT(kg, prim, u, v);
float3 Ng = triangle_normal_MT(kg, prim, &shader);
@@ -123,7 +124,7 @@ ccl_device void kernel_bake_evaluate(KernelGlobals *kg, ccl_global uint4 *input,
/* TODO, disable the closures we won't need */
shader_setup_from_sample(kg, &sd, P, Ng, I, shader, object, prim, u, v, t, time, bounce, segment);
- if (is_light_pass(type)){
+ if(is_light_pass(type)){
RNG rng = hash_int(i);
compute_light_pass(kg, &sd, &L, rng, (type == SHADER_EVAL_AO));
}
@@ -284,7 +285,7 @@ ccl_device void kernel_bake_evaluate(KernelGlobals *kg, ccl_global uint4 *input,
ccl_device void kernel_shader_evaluate(KernelGlobals *kg, ccl_global uint4 *input, ccl_global float4 *output, ShaderEvalType type, int i)
{
- if (type >= SHADER_EVAL_BAKE) {
+ if(type >= SHADER_EVAL_BAKE) {
kernel_bake_evaluate(kg, input, output, type, i);
return;
}
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h
index 07ac91f..b3656c3 100644
--- a/intern/cycles/kernel/kernel_types.h
+++ b/intern/cycles/kernel/kernel_types.h
@@ -189,37 +189,6 @@ typedef enum ShaderEvalType {
/* extra */
SHADER_EVAL_ENVIRONMENT,
-#if 0
- SHADER_EVAL_COMBINED,
- SHADER_EVAL_DEPTH,
- SHADER_EVAL_MIST,
- SHADER_EVAL_NORMAL,
- SHADER_EVAL_OBJECT_ID,
- SHADER_EVAL_UV,
- SHADER_EVAL_MOTION,
- SHADER_EVAL_MATERIAL_ID,
- SHADER_EVAL_DIFFUSE_DIRECT,
- SHADER_EVAL_GLOSSY_DIRECT,
- SHADER_EVAL_TRANSMISSION_DIRECT,
- SHADER_EVAL_SUBSURFACE_DIRECT,
- SHADER_EVAL_DIFFUSE_INDIRECT,
- SHADER_EVAL_GLOSSY_INDIRECT,
- SHADER_EVAL_TRANSMISSION_INDIRECT,
- SHADER_EVAL_SUBSURFACE_INDIRECT,
- SHADER_EVAL_DIFFUSE_COLOR,
- SHADER_EVAL_GLOSSY_COLOR,
- SHADER_EVAL_TRANSMISSION_COLOR,
- SHADER_EVAL_SUBSURFACE_COLOR,
- SHADER_EVAL_EMISSION,
- SHADER_EVAL_AO,
- SHADER_EVAL_SHADOW,
- SHADER_EVAL_DIFFUSE,
- SHADER_EVAL_COLOR,
- SHADER_EVAL_REFRACTION,
- SHADER_EVAL_SPECULAR,
- SHADER_EVAL_REFLECTION,
- SHADER_EVAL_ENVIRONMENT,
-#endif
} ShaderEvalType;
/* Path Tracing
diff --git a/intern/cycles/render/bake.cpp b/intern/cycles/render/bake.cpp
index 6094d60..a265065 100644
--- a/intern/cycles/render/bake.cpp
+++ b/intern/cycles/render/bake.cpp
@@ -32,7 +32,7 @@ void BakeManager::device_update(Device *device, DeviceScene *dscene, Scene *scen
BakeManager::~BakeManager()
{
- if (bake_data)
+ if(bake_data)
delete bake_data;
}
@@ -97,12 +97,12 @@ bool BakeManager::bake(Device *device, DeviceScene *dscene, Scene *scene, Shader
float4 *offset = (float4*)d_output.data_pointer;
- int depth = 4;
+ size_t depth = 4;
for(size_t i = 0; i < limit; i++) {
- int index = i * depth;
+ size_t index = i * depth;
float4 out = offset[k++];
- for (int j=0; j < 4; j++)
+ for(size_t j=0; j < 4; j++)
result[index + j] = out[j];
}
diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp
index 3e8291b..0d999dd 100644
--- a/intern/cycles/render/session.cpp
+++ b/intern/cycles/render/session.cpp
@@ -734,7 +734,7 @@ void Session::update_scene()
}
/* number of samples is needed by multi jittered
- sampling pattern and by baking */
+ * sampling pattern and by baking */
Integrator *integrator = scene->integrator;
int aa_samples = tile_manager.num_samples;
More information about the Bf-blender-cvs
mailing list