From 48997d2e40a74a83fb9edfb9de0999139392f634 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 24 Oct 2016 12:26:12 +0200 Subject: Cycles: Cleanup, style --- intern/cycles/render/camera.cpp | 3 ++- intern/cycles/render/graph.cpp | 7 ++++--- intern/cycles/render/image.cpp | 2 +- intern/cycles/render/mesh.cpp | 2 +- intern/cycles/render/nodes.cpp | 15 +++++++++------ intern/cycles/render/object.cpp | 5 +++-- intern/cycles/render/osl.cpp | 5 ++--- 7 files changed, 22 insertions(+), 17 deletions(-) (limited to 'intern/cycles/render') diff --git a/intern/cycles/render/camera.cpp b/intern/cycles/render/camera.cpp index a6df656d220..c8c51ec96d2 100644 --- a/intern/cycles/render/camera.cpp +++ b/intern/cycles/render/camera.cpp @@ -32,8 +32,9 @@ CCL_NAMESPACE_BEGIN static float shutter_curve_eval(float x, array& shutter_curve) { - if (shutter_curve.size() == 0) + if(shutter_curve.size() == 0) { return 1.0f; + } x *= shutter_curve.size(); int index = (int)x; diff --git a/intern/cycles/render/graph.cpp b/intern/cycles/render/graph.cpp index 131ec824be3..f6c83fb5c7e 100644 --- a/intern/cycles/render/graph.cpp +++ b/intern/cycles/render/graph.cpp @@ -148,8 +148,9 @@ void ShaderNode::attributes(Shader *shader, AttributeRequestSet *attributes) bool ShaderNode::equals(const ShaderNode& other) { - if (type != other.type || bump != other.bump) + if(type != other.type || bump != other.bump) { return false; + } assert(inputs.size() == other.inputs.size()); @@ -597,13 +598,13 @@ void ShaderGraph::deduplicate_nodes() /* Try to merge this node with another one. */ ShaderNode *merge_with = NULL; foreach(ShaderNode *other_node, candidates[node->type->name]) { - if (node != other_node && node->equals(*other_node)) { + if(node != other_node && node->equals(*other_node)) { merge_with = other_node; break; } } /* If found an equivalent, merge; otherwise keep node for later merges */ - if (merge_with != NULL) { + if(merge_with != NULL) { for(int i = 0; i < node->outputs.size(); ++i) { relink(node, node->outputs[i], merge_with->outputs[i]); } diff --git a/intern/cycles/render/image.cpp b/intern/cycles/render/image.cpp index 3cb0aa961ec..073a0aa2ac9 100644 --- a/intern/cycles/render/image.cpp +++ b/intern/cycles/render/image.cpp @@ -43,7 +43,7 @@ ImageManager::ImageManager(const DeviceInfo& info) * be screwed on so many levels.. */ DeviceType device_type = info.type; - if (device_type == DEVICE_MULTI) { + if(device_type == DEVICE_MULTI) { device_type = info.multi_devices[0].type; } diff --git a/intern/cycles/render/mesh.cpp b/intern/cycles/render/mesh.cpp index 039bb49d82f..ac369a0d5f8 100644 --- a/intern/cycles/render/mesh.cpp +++ b/intern/cycles/render/mesh.cpp @@ -1462,7 +1462,7 @@ void MeshManager::device_update_mesh(Device *device, else { PackedBVH& pack = bvh->pack; for(size_t i = 0; i < pack.prim_index.size(); ++i) { - if ((pack.prim_type[i] & PRIMITIVE_ALL_TRIANGLE) != 0) { + if((pack.prim_type[i] & PRIMITIVE_ALL_TRIANGLE) != 0) { tri_prim_index[pack.prim_index[i]] = pack.prim_tri_index[i]; } } diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp index 7ea52b28b9c..3b4aa389c13 100644 --- a/intern/cycles/render/nodes.cpp +++ b/intern/cycles/render/nodes.cpp @@ -2378,8 +2378,9 @@ void EmissionNode::constant_fold(const ConstantFolder& folder) ShaderInput *color_in = input("Color"); ShaderInput *strength_in = input("Strength"); - if ((!color_in->link && color == make_float3(0.0f, 0.0f, 0.0f)) || - (!strength_in->link && strength == 0.0f)) { + if((!color_in->link && color == make_float3(0.0f, 0.0f, 0.0f)) || + (!strength_in->link && strength == 0.0f)) + { folder.discard(); } } @@ -2430,8 +2431,9 @@ void BackgroundNode::constant_fold(const ConstantFolder& folder) ShaderInput *color_in = input("Color"); ShaderInput *strength_in = input("Strength"); - if ((!color_in->link && color == make_float3(0.0f, 0.0f, 0.0f)) || - (!strength_in->link && strength == 0.0f)) { + if((!color_in->link && color == make_float3(0.0f, 0.0f, 0.0f)) || + (!strength_in->link && strength == 0.0f)) + { folder.discard(); } } @@ -4864,8 +4866,9 @@ void CurvesNode::constant_fold(const ConstantFolder& folder, ShaderInput *value_ /* evaluate fully constant node */ if(folder.all_inputs_constant()) { - if (curves.size() == 0) + if(curves.size() == 0) { return; + } float3 pos = (value - make_float3(min_x, min_x, min_x)) / (max_x - min_x); float3 result; @@ -5140,7 +5143,7 @@ OSLNode* OSLNode::create(size_t num_inputs, const OSLNode *from) char *node_memory = (char*) operator new(node_size + inputs_size); memset(node_memory, 0, node_size + inputs_size); - if (!from) { + if(!from) { return new(node_memory) OSLNode(); } else { diff --git a/intern/cycles/render/object.cpp b/intern/cycles/render/object.cpp index d8f3ce58505..8b8b988b969 100644 --- a/intern/cycles/render/object.cpp +++ b/intern/cycles/render/object.cpp @@ -253,7 +253,7 @@ vector Object::motion_times() bool Object::is_traceable() { /* Mesh itself can be empty,can skip all such objects. */ - if (!bounds.valid() || bounds.size() == make_float3(0.0f, 0.0f, 0.0f)) { + if(!bounds.valid() || bounds.size() == make_float3(0.0f, 0.0f, 0.0f)) { return false; } /* TODO(sergey): Check for mesh vertices/curves. visibility flags. */ @@ -624,8 +624,9 @@ void ObjectManager::device_update_flags(Device *device, void ObjectManager::device_update_patch_map_offsets(Device *device, DeviceScene *dscene, Scene *scene) { - if (scene->objects.size() == 0) + if(scene->objects.size() == 0) { return; + } uint4* objects = (uint4*)dscene->objects.get_data(); diff --git a/intern/cycles/render/osl.cpp b/intern/cycles/render/osl.cpp index 18a32f7f328..67b68e63cb2 100644 --- a/intern/cycles/render/osl.cpp +++ b/intern/cycles/render/osl.cpp @@ -825,7 +825,7 @@ void OSLCompiler::parameter(ShaderNode* node, const char *name) // OSL does not support booleans, so convert to int const array& value = node->get_bool_array(socket); array intvalue(value.size()); - for (size_t i = 0; i < value.size(); i++) + for(size_t i = 0; i < value.size(); i++) intvalue[i] = value[i]; ss->Parameter(uname, array_typedesc(TypeDesc::TypeInt, value.size()), intvalue.data()); break; @@ -861,8 +861,7 @@ void OSLCompiler::parameter(ShaderNode* node, const char *name) // convert to tightly packed array since float3 has padding const array& value = node->get_float3_array(socket); array fvalue(value.size() * 3); - for (size_t i = 0, j = 0; i < value.size(); i++) - { + for(size_t i = 0, j = 0; i < value.size(); i++) { fvalue[j++] = value[i].x; fvalue[j++] = value[i].y; fvalue[j++] = value[i].z; -- cgit v1.2.3