[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51377] trunk/blender: style cleanup: make OSL follow our C style convention.
Campbell Barton
ideasman42 at gmail.com
Wed Oct 17 03:47:42 CEST 2012
Revision: 51377
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51377
Author: campbellbarton
Date: 2012-10-17 01:47:37 +0000 (Wed, 17 Oct 2012)
Log Message:
-----------
style cleanup: make OSL follow our C style convention. http://wiki.blender.org/index.php/Dev:Doc/CodeStyle
Modified Paths:
--------------
trunk/blender/GNUmakefile
trunk/blender/build_files/cmake/project_info.py
trunk/blender/build_files/cmake/project_source_info.py
trunk/blender/intern/cycles/kernel/osl/nodes/node_attribute.osl
trunk/blender/intern/cycles/kernel/osl/nodes/node_background.osl
trunk/blender/intern/cycles/kernel/osl/nodes/node_blend_weight.osl
trunk/blender/intern/cycles/kernel/osl/nodes/node_brick_texture.osl
trunk/blender/intern/cycles/kernel/osl/nodes/node_brightness.osl
trunk/blender/intern/cycles/kernel/osl/nodes/node_bump.osl
trunk/blender/intern/cycles/kernel/osl/nodes/node_checker_texture.osl
trunk/blender/intern/cycles/kernel/osl/nodes/node_convert_from_color.osl
trunk/blender/intern/cycles/kernel/osl/nodes/node_convert_from_normal.osl
trunk/blender/intern/cycles/kernel/osl/nodes/node_convert_from_point.osl
trunk/blender/intern/cycles/kernel/osl/nodes/node_convert_from_vector.osl
trunk/blender/intern/cycles/kernel/osl/nodes/node_diffuse_bsdf.osl
trunk/blender/intern/cycles/kernel/osl/nodes/node_emission.osl
trunk/blender/intern/cycles/kernel/osl/nodes/node_environment_texture.osl
trunk/blender/intern/cycles/kernel/osl/nodes/node_fresnel.osl
trunk/blender/intern/cycles/kernel/osl/nodes/node_geometry.osl
trunk/blender/intern/cycles/kernel/osl/nodes/node_glass_bsdf.osl
trunk/blender/intern/cycles/kernel/osl/nodes/node_glossy_bsdf.osl
trunk/blender/intern/cycles/kernel/osl/nodes/node_gradient_texture.osl
trunk/blender/intern/cycles/kernel/osl/nodes/node_image_texture.osl
trunk/blender/intern/cycles/kernel/osl/nodes/node_magic_texture.osl
trunk/blender/intern/cycles/kernel/osl/nodes/node_math.osl
trunk/blender/intern/cycles/kernel/osl/nodes/node_mix.osl
trunk/blender/intern/cycles/kernel/osl/nodes/node_mix_closure.osl
trunk/blender/intern/cycles/kernel/osl/nodes/node_musgrave_texture.osl
trunk/blender/intern/cycles/kernel/osl/nodes/node_noise_texture.osl
trunk/blender/intern/cycles/kernel/osl/nodes/node_output_displacement.osl
trunk/blender/intern/cycles/kernel/osl/nodes/node_rgb_ramp.osl
trunk/blender/intern/cycles/kernel/osl/nodes/node_sky_texture.osl
trunk/blender/intern/cycles/kernel/osl/nodes/node_texture.h
trunk/blender/intern/cycles/kernel/osl/nodes/node_texture_coordinate.osl
trunk/blender/intern/cycles/kernel/osl/nodes/node_translucent_bsdf.osl
trunk/blender/intern/cycles/kernel/osl/nodes/node_transparent_bsdf.osl
trunk/blender/intern/cycles/kernel/osl/nodes/node_vector_math.osl
trunk/blender/intern/cycles/kernel/osl/nodes/node_velvet_bsdf.osl
trunk/blender/intern/cycles/kernel/osl/nodes/node_voronoi_texture.osl
trunk/blender/intern/cycles/kernel/osl/nodes/node_ward_bsdf.osl
trunk/blender/intern/cycles/kernel/osl/nodes/node_wave_texture.osl
trunk/blender/source/tools/check_style_c.py
Modified: trunk/blender/GNUmakefile
===================================================================
--- trunk/blender/GNUmakefile 2012-10-17 00:31:11 UTC (rev 51376)
+++ trunk/blender/GNUmakefile 2012-10-17 01:47:37 UTC (rev 51377)
@@ -163,12 +163,14 @@
@echo " * package_archive - build an archive package"
@echo ""
@echo "Testing Targets (not associated with building blender)"
- @echo " * test - run ctest, currently tests import/export, operator execution and that python modules load"
- @echo " * test_cmake - runs our own cmake file checker which detects errors in the cmake file list definitions"
- @echo " * test_pep8 - checks all python script are pep8 which are tagged to use the stricter formatting"
- @echo " * test_deprecated - checks for deprecation tags in our code which may need to be removed"
- @echo " * test_style - checks C/C++ conforms with blenders style guide: http://wiki.blender.org/index.php/Dev:Doc/CodeStyle"
- @echo " * test_style_qtc - same as test_style but outputs QtCreator tasks format"
+ @echo " * test - run ctest, currently tests import/export, operator execution and that python modules load"
+ @echo " * test_cmake - runs our own cmake file checker which detects errors in the cmake file list definitions"
+ @echo " * test_pep8 - checks all python script are pep8 which are tagged to use the stricter formatting"
+ @echo " * test_deprecated - checks for deprecation tags in our code which may need to be removed"
+ @echo " * test_style_c - checks C/C++ conforms with blenders style guide: http://wiki.blender.org/index.php/Dev:Doc/CodeStyle"
+ @echo " * test_style_c_qtc - same as test_style but outputs QtCreator tasks format"
+ @echo " * test_style_osl - checks OpenShadingLanguage conforms with blenders style guide: http://wiki.blender.org/index.php/Dev:Doc/CodeStyle"
+ @echo " * test_style_osl_qtc - checks OpenShadingLanguage conforms with blenders style guide: http://wiki.blender.org/index.php/Dev:Doc/CodeStyle"
@echo ""
@echo "Static Source Code Checking (not associated with building blender)"
@echo " * check_cppcheck - run blender source through cppcheck (C & C++)"
@@ -211,28 +213,40 @@
# run pep8 check check on scripts we distribute.
test_pep8:
- python3.2 source/tests/pep8.py > test_pep8.log 2>&1
+ python3 source/tests/pep8.py > test_pep8.log 2>&1
@echo "written: test_pep8.log"
# run some checks on our cmakefiles.
test_cmake:
- python3.2 build_files/cmake/cmake_consistency_check.py > test_cmake_consistency.log 2>&1
+ python3 build_files/cmake/cmake_consistency_check.py > test_cmake_consistency.log 2>&1
@echo "written: test_cmake_consistency.log"
# run deprecation tests, see if we have anything to remove.
test_deprecated:
- python3.2 source/tests/check_deprecated.py
+ python3 source/tests/check_deprecated.py
-test_style:
+test_style_c:
# run our own checks on C/C++ style
- PYTHONIOENCODING=utf_8 python3.2 $(BLENDER_DIR)/source/tools/check_style_c.py $(BLENDER_DIR)/source/blender $(BLENDER_DIR)/source/creator --no-length-check
+ PYTHONIOENCODING=utf_8 python3 $(BLENDER_DIR)/source/tools/check_style_c.py $(BLENDER_DIR)/source/blender $(BLENDER_DIR)/source/creator --no-length-check
-test_style_qtc:
+test_style_c_qtc:
# run our own checks on C/C++ style
USE_QTC_TASK=1 \
- PYTHONIOENCODING=utf_8 python3.2 $(BLENDER_DIR)/source/tools/check_style_c.py $(BLENDER_DIR)/source/blender $(BLENDER_DIR)/source/creator --no-length-check > \
+ PYTHONIOENCODING=utf_8 python3 $(BLENDER_DIR)/source/tools/check_style_c.py $(BLENDER_DIR)/source/blender $(BLENDER_DIR)/source/creator --no-length-check > \
test_style.tasks
+ @echo "written: test_style.tasks"
+
+test_style_osl:
+ # run our own checks on C/C++ style
+ PYTHONIOENCODING=utf_8 python3 $(BLENDER_DIR)/source/tools/check_style_c.py $(BLENDER_DIR)/intern/cycles/kernel/osl
+
+
+test_style_osl_qtc:
+ # run our own checks on C/C++ style
+ USE_QTC_TASK=1 \
+ PYTHONIOENCODING=utf_8 python3 $(BLENDER_DIR)/source/tools/check_style_c.py $(BLENDER_DIR)/intern/cycles/kernel/osl > \
+ test_style.tasks
@echo "written: test_style.tasks"
# -----------------------------------------------------------------------------
@@ -240,10 +254,10 @@
#
project_qtcreator:
- python3.2 build_files/cmake/cmake_qtcreator_project.py $(BUILD_DIR)
+ python3 build_files/cmake/cmake_qtcreator_project.py $(BUILD_DIR)
project_netbeans:
- python3.2 build_files/cmake/cmake_netbeans_project.py $(BUILD_DIR)
+ python3 build_files/cmake/cmake_netbeans_project.py $(BUILD_DIR)
project_eclipse:
cmake -G"Eclipse CDT4 - Unix Makefiles" -H$(BLENDER_DIR) -B$(BUILD_DIR)
@@ -255,29 +269,29 @@
check_cppcheck:
$(CMAKE_CONFIG)
- cd $(BUILD_DIR) ; python3.2 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_cppcheck.py
+ cd $(BUILD_DIR) ; python3 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_cppcheck.py
check_clang_array:
$(CMAKE_CONFIG)
- cd $(BUILD_DIR) ; python3.2 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_clang_array.py
+ cd $(BUILD_DIR) ; python3 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_clang_array.py
check_splint:
$(CMAKE_CONFIG)
- cd $(BUILD_DIR) ; python3.2 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_splint.py
+ cd $(BUILD_DIR) ; python3 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_splint.py
check_sparse:
$(CMAKE_CONFIG)
- cd $(BUILD_DIR) ; python3.2 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_sparse.py
+ cd $(BUILD_DIR) ; python3 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_sparse.py
check_smatch:
$(CMAKE_CONFIG)
- cd $(BUILD_DIR) ; python3.2 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_smatch.py
+ cd $(BUILD_DIR) ; python3 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_smatch.py
check_spelling_py:
- cd $(BUILD_DIR) ; PYTHONIOENCODING=utf_8 python3.2 $(BLENDER_DIR)/source/tools/spell_check_source.py $(BLENDER_DIR)/release/scripts
+ cd $(BUILD_DIR) ; PYTHONIOENCODING=utf_8 python3 $(BLENDER_DIR)/source/tools/spell_check_source.py $(BLENDER_DIR)/release/scripts
check_spelling_c:
- cd $(BUILD_DIR) ; PYTHONIOENCODING=utf_8 python3.2 $(BLENDER_DIR)/source/tools/spell_check_source.py $(BLENDER_DIR)/source
+ cd $(BUILD_DIR) ; PYTHONIOENCODING=utf_8 python3 $(BLENDER_DIR)/source/tools/spell_check_source.py $(BLENDER_DIR)/source
# -----------------------------------------------------------------------------
@@ -310,7 +324,7 @@
@echo "docs written into: '$(BLENDER_DIR)/doc/blender_file_format/dna.html'"
doc_man:
- python3.2 doc/manpage/blender.1.py $(BUILD_DIR)/bin/blender
+ python3 doc/manpage/blender.1.py $(BUILD_DIR)/bin/blender
clean:
Modified: trunk/blender/build_files/cmake/project_info.py
===================================================================
--- trunk/blender/build_files/cmake/project_info.py 2012-10-17 00:31:11 UTC (rev 51376)
+++ trunk/blender/build_files/cmake/project_info.py 2012-10-17 01:47:37 UTC (rev 51377)
@@ -112,7 +112,7 @@
def is_c(filename):
ext = splitext(filename)[1]
- return (ext in (".c", ".cpp", ".cxx", ".m", ".mm", ".rc", ".cc", ".inl"))
+ return (ext in {".c", ".cpp", ".cxx", ".m", ".mm", ".rc", ".cc", ".inl", ".osl"})
def is_c_any(filename):
Modified: trunk/blender/build_files/cmake/project_source_info.py
===================================================================
--- trunk/blender/build_files/cmake/project_source_info.py 2012-10-17 00:31:11 UTC (rev 51376)
+++ trunk/blender/build_files/cmake/project_source_info.py 2012-10-17 01:47:37 UTC (rev 51377)
@@ -48,7 +48,7 @@
def is_c(filename):
ext = os.path.splitext(filename)[1]
- return (ext in (".c", ".cpp", ".cxx", ".m", ".mm", ".rc", ".cc", ".inl"))
+ return (ext in {".c", ".cpp", ".cxx", ".m", ".mm", ".rc", ".cc", ".inl", ".osl"})
def is_c_any(filename):
Modified: trunk/blender/intern/cycles/kernel/osl/nodes/node_attribute.osl
===================================================================
--- trunk/blender/intern/cycles/kernel/osl/nodes/node_attribute.osl 2012-10-17 00:31:11 UTC (rev 51376)
+++ trunk/blender/intern/cycles/kernel/osl/nodes/node_attribute.osl 2012-10-17 01:47:37 UTC (rev 51377)
@@ -29,12 +29,12 @@
Vector = point(Color);
getattribute(name, Fac);
- if(bump_offset == "dx") {
+ if (bump_offset == "dx") {
Color += Dx(Color);
Vector += Dx(Vector);
Fac += Dx(Fac);
}
- else if(bump_offset == "dy") {
+ else if (bump_offset == "dy") {
Color += Dy(Color);
Vector += Dy(Vector);
Fac += Dy(Fac);
Modified: trunk/blender/intern/cycles/kernel/osl/nodes/node_background.osl
===================================================================
--- trunk/blender/intern/cycles/kernel/osl/nodes/node_background.osl 2012-10-17 00:31:11 UTC (rev 51376)
+++ trunk/blender/intern/cycles/kernel/osl/nodes/node_background.osl 2012-10-17 01:47:37 UTC (rev 51377)
@@ -23,6 +23,6 @@
float Strength = 1.0,
output closure color Background = background())
{
- Background = Color*Strength*background();
+ Background = Color * Strength * background();
}
Modified: trunk/blender/intern/cycles/kernel/osl/nodes/node_blend_weight.osl
===================================================================
--- trunk/blender/intern/cycles/kernel/osl/nodes/node_blend_weight.osl 2012-10-17 00:31:11 UTC (rev 51376)
+++ trunk/blender/intern/cycles/kernel/osl/nodes/node_blend_weight.osl 2012-10-17 01:47:37 UTC (rev 51377)
@@ -26,13 +26,13 @@
output float Facing = 0.0)
{
float f = max(1.0 - Blend, 1e-5);
- Fresnel = fresnel_dielectric(I, Normal, backfacing()? f: 1.0/f);
+ Fresnel = fresnel_dielectric(I, Normal, backfacing()? f: 1.0 / f);
Facing = abs(dot(I, Normal));
- if(Blend != 0.5) {
+ if (Blend != 0.5) {
Blend = clamp(Blend, 0.0, 1.0);
- Blend = (Blend < 0.5)? 2.0*Blend: 0.5/(1.0 - Blend);
+ Blend = (Blend < 0.5)? 2.0 * Blend: 0.5 / (1.0 - Blend);
Facing = powf(Facing, Blend);
}
Modified: trunk/blender/intern/cycles/kernel/osl/nodes/node_brick_texture.osl
===================================================================
--- trunk/blender/intern/cycles/kernel/osl/nodes/node_brick_texture.osl 2012-10-17 00:31:11 UTC (rev 51376)
+++ trunk/blender/intern/cycles/kernel/osl/nodes/node_brick_texture.osl 2012-10-17 01:47:37 UTC (rev 51377)
@@ -40,21 +40,21 @@
rownum = (int)floor(p[1] / row_height);
- if(offset_frequency && squash_frequency) {
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list