From 8639cecf4cedd56452b47503be19c44b304cd02f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Wed, 9 Dec 2015 08:38:23 +0100 Subject: Improve code formatting and update to 2.0 The scripts were streamlined using more or less the following conventions: - space after a comma in lists of arguments - space around weak operators (+, -), no space around strong operators (*, /) - space after a comment start (#) - removed trailing spaces or tabs, apart from those that delimit the function indentation level (those could be removed too but since they are added automatically by the editor when typing code, keeping them for now) - function blocks separate by two newlines The scene files were resaved with the (current) 2.0 format, and some scenes that were in XML format were converted to SCN, to be consistent across all demos. --- demos/3d/sat_test/box.scn | Bin 23739 -> 27363 bytes demos/3d/sat_test/capsule.scn | Bin 21133 -> 22718 bytes demos/3d/sat_test/convex.scn | Bin 22828 -> 25617 bytes demos/3d/sat_test/engine.cfg | 2 +- demos/3d/sat_test/sat_test.scn | Bin 0 -> 3430 bytes demos/3d/sat_test/sat_test.xml | 179 ----------------------------------------- demos/3d/sat_test/shapes.scn | Bin 23064 -> 25887 bytes demos/3d/sat_test/sphere.scn | Bin 38627 -> 41375 bytes 8 files changed, 1 insertion(+), 180 deletions(-) create mode 100644 demos/3d/sat_test/sat_test.scn delete mode 100644 demos/3d/sat_test/sat_test.xml (limited to 'demos/3d/sat_test') diff --git a/demos/3d/sat_test/box.scn b/demos/3d/sat_test/box.scn index 8b02826ea7..f9c15839a2 100644 Binary files a/demos/3d/sat_test/box.scn and b/demos/3d/sat_test/box.scn differ diff --git a/demos/3d/sat_test/capsule.scn b/demos/3d/sat_test/capsule.scn index a4fe2b2b3f..db8ff43116 100644 Binary files a/demos/3d/sat_test/capsule.scn and b/demos/3d/sat_test/capsule.scn differ diff --git a/demos/3d/sat_test/convex.scn b/demos/3d/sat_test/convex.scn index 5f62beccaf..93e05338eb 100644 Binary files a/demos/3d/sat_test/convex.scn and b/demos/3d/sat_test/convex.scn differ diff --git a/demos/3d/sat_test/engine.cfg b/demos/3d/sat_test/engine.cfg index 82c688635d..e21c9b1eff 100644 --- a/demos/3d/sat_test/engine.cfg +++ b/demos/3d/sat_test/engine.cfg @@ -1,5 +1,5 @@ [application] name="SAT Collision Test" -main_scene="res://sat_test.xml" +main_scene="res://sat_test.scn" icon="res://icon.png" diff --git a/demos/3d/sat_test/sat_test.scn b/demos/3d/sat_test/sat_test.scn new file mode 100644 index 0000000000..0b25431202 Binary files /dev/null and b/demos/3d/sat_test/sat_test.scn differ diff --git a/demos/3d/sat_test/sat_test.xml b/demos/3d/sat_test/sat_test.xml deleted file mode 100644 index f11dec3292..0000000000 --- a/demos/3d/sat_test/sat_test.xml +++ /dev/null @@ -1,179 +0,0 @@ - - - - - - - - - "names" - - "Node" - "__meta__" - "sphere" - "Spatial" - "transform/local" - "box" - "convex" - "Camera" - "projection" - "fov" - "near" - "far" - "vaspect" - "current" - "visible_layers" - "environment" - "OmniLight" - "layers" - "params/energy" - "colors/ambient" - "colors/diffuse" - "colors/specular" - "shadow/shadow" - "shadow/darkening" - "shadow/z_offset" - "shadow/z_slope_scale" - "projector" - "operator" - "params/radius" - "params/attenuation" - - "version" - 1 - "conn_count" - 0 - "node_count" - 7 - "variants" - - - "__editor_plugin_states__" - - "2D" - - "zoom" - 1 - "ofs" - 1, 1 - - "3D" - - "zfar" - 500 - "fov" - 400 - "viewports" - - - "distance" - 34.508423 - "x_rot" - 0.7 - "y_rot" - 1.262503 - "use_orthogonal" - False - "use_environment" - False - "pos" - 13.3659, 3.22136, 2.27417 - - - "distance" - 4 - "x_rot" - 0 - "y_rot" - 0 - "use_orthogonal" - False - "use_environment" - False - "pos" - 0, 0, 0 - - - "distance" - 4 - "x_rot" - 0 - "y_rot" - 0 - "use_orthogonal" - False - "use_environment" - False - "pos" - 0, 0, 0 - - - "distance" - 4 - "x_rot" - 0 - "y_rot" - 0 - "use_orthogonal" - False - "use_environment" - False - "pos" - 0, 0, 0 - - - "viewport_mode" - 1 - "default_light" - False - "show_grid" - True - "show_origin" - True - "znear" - 0.1 - - - "__editor_run_settings__" - - "custom_args" - "-l $scene" - "run_mode" - 0 - - "__editor_plugin_screen__" - "3D" - - - 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -2.93877 - - 1, 0, 0, 0, 1, 0, 0, 0, 1, 13.5356, 0, -3.40082 - - 1, 0, 0, 0, 1, 0, 0, 0, 1, 22.8626, 0, -2.50073 - - 1, 0, 0, 0, 1, 0, 0, 0, 1, 28.4061, 0, -2.76809 - 1, 0, 0, 0, 0.819152, 0.573576, 0, -0.573576, 0.819152, 14.482, 11.1225, 20.5858 - 0 - 60 - 0.1 - 100 - False - -1 - 1, 0, 0, 0, 1, 0, 0, 0, 1, 66.4797, 0, 10.4696 - 1 - 1.5 - 0.355828, 0.346354, 0.329995, 1 - 1, 1, 1, 1 - 0 - 0.05 - 500 - 0.535887 - - "nodes" - -1, -1, 0, 0, -1, 1, 1, 0, 0, 0, 0, 3, 2, 1, 1, 4, 2, 0, 0, 0, 3, 5, 3, 1, 4, 4, 0, 0, 0, 3, 6, 5, 1, 4, 6, 0, 0, 0, 3, 3, 7, 1, 4, 8, 0, 0, 0, 7, 7, -1, 9, 4, 9, 8, 10, 9, 11, 10, 12, 11, 13, 12, 14, 13, 14, 14, 15, 15, 16, 0, 0, 0, 16, 16, -1, 14, 4, 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, 21, 22, 14, 23, 22, 24, 23, 25, 22, 26, 16, 27, 10, 28, 24, 29, 25, 0 - "conns" - - - - - \ No newline at end of file diff --git a/demos/3d/sat_test/shapes.scn b/demos/3d/sat_test/shapes.scn index 584237b89d..bf10be0a59 100644 Binary files a/demos/3d/sat_test/shapes.scn and b/demos/3d/sat_test/shapes.scn differ diff --git a/demos/3d/sat_test/sphere.scn b/demos/3d/sat_test/sphere.scn index dd49c914b3..e40c3bd42d 100644 Binary files a/demos/3d/sat_test/sphere.scn and b/demos/3d/sat_test/sphere.scn differ -- cgit v1.2.3