diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2015-12-09 08:38:23 +0100 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2015-12-09 08:38:23 +0100 |
commit | 8639cecf4cedd56452b47503be19c44b304cd02f (patch) | |
tree | e2a795da15e40c7d9d5b82e33378f8dbf0eaf67a /demos/3d/sat_test | |
parent | efbb834936fdc9da9789ad37c9cc61e0b90cda95 (diff) |
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.
Diffstat (limited to 'demos/3d/sat_test')
-rw-r--r-- | demos/3d/sat_test/box.scn | bin | 23739 -> 27363 bytes | |||
-rw-r--r-- | demos/3d/sat_test/capsule.scn | bin | 21133 -> 22718 bytes | |||
-rw-r--r-- | demos/3d/sat_test/convex.scn | bin | 22828 -> 25617 bytes | |||
-rw-r--r-- | demos/3d/sat_test/engine.cfg | 2 | ||||
-rw-r--r-- | demos/3d/sat_test/sat_test.scn | bin | 0 -> 3430 bytes | |||
-rw-r--r-- | demos/3d/sat_test/sat_test.xml | 179 | ||||
-rw-r--r-- | demos/3d/sat_test/shapes.scn | bin | 23064 -> 25887 bytes | |||
-rw-r--r-- | demos/3d/sat_test/sphere.scn | bin | 38627 -> 41375 bytes |
8 files changed, 1 insertions, 180 deletions
diff --git a/demos/3d/sat_test/box.scn b/demos/3d/sat_test/box.scn Binary files differindex 8b02826ea7..f9c15839a2 100644 --- a/demos/3d/sat_test/box.scn +++ b/demos/3d/sat_test/box.scn diff --git a/demos/3d/sat_test/capsule.scn b/demos/3d/sat_test/capsule.scn Binary files differindex a4fe2b2b3f..db8ff43116 100644 --- a/demos/3d/sat_test/capsule.scn +++ b/demos/3d/sat_test/capsule.scn diff --git a/demos/3d/sat_test/convex.scn b/demos/3d/sat_test/convex.scn Binary files differindex 5f62beccaf..93e05338eb 100644 --- a/demos/3d/sat_test/convex.scn +++ b/demos/3d/sat_test/convex.scn 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 Binary files differnew file mode 100644 index 0000000000..0b25431202 --- /dev/null +++ b/demos/3d/sat_test/sat_test.scn 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 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<resource_file type="PackedScene" subresource_count="5" version="0.99" version_name="Godot Engine v0.99.3735-pre-beta"> - <ext_resource path="res://box.*" type="PackedScene"></ext_resource> - <ext_resource path="res://sphere.*" type="PackedScene"></ext_resource> - <ext_resource path="res://capsule.*" type="PackedScene"></ext_resource> - <ext_resource path="res://convex.*" type="PackedScene"></ext_resource> - <main_resource> - <dictionary name="_bundled" shared="false"> - <string> "names" </string> - <string_array len="30"> - <string> "Node" </string> - <string> "__meta__" </string> - <string> "sphere" </string> - <string> "Spatial" </string> - <string> "transform/local" </string> - <string> "box" </string> - <string> "convex" </string> - <string> "Camera" </string> - <string> "projection" </string> - <string> "fov" </string> - <string> "near" </string> - <string> "far" </string> - <string> "vaspect" </string> - <string> "current" </string> - <string> "visible_layers" </string> - <string> "environment" </string> - <string> "OmniLight" </string> - <string> "layers" </string> - <string> "params/energy" </string> - <string> "colors/ambient" </string> - <string> "colors/diffuse" </string> - <string> "colors/specular" </string> - <string> "shadow/shadow" </string> - <string> "shadow/darkening" </string> - <string> "shadow/z_offset" </string> - <string> "shadow/z_slope_scale" </string> - <string> "projector" </string> - <string> "operator" </string> - <string> "params/radius" </string> - <string> "params/attenuation" </string> - </string_array> - <string> "version" </string> - <int> 1 </int> - <string> "conn_count" </string> - <int> 0 </int> - <string> "node_count" </string> - <int> 7 </int> - <string> "variants" </string> - <array len="26" shared="false"> - <dictionary shared="false"> - <string> "__editor_plugin_states__" </string> - <dictionary shared="false"> - <string> "2D" </string> - <dictionary shared="false"> - <string> "zoom" </string> - <real> 1 </real> - <string> "ofs" </string> - <vector2> 1, 1 </vector2> - </dictionary> - <string> "3D" </string> - <dictionary shared="false"> - <string> "zfar" </string> - <real> 500 </real> - <string> "fov" </string> - <real> 400 </real> - <string> "viewports" </string> - <array len="4" shared="false"> - <dictionary shared="false"> - <string> "distance" </string> - <real> 34.508423 </real> - <string> "x_rot" </string> - <real> 0.7 </real> - <string> "y_rot" </string> - <real> 1.262503 </real> - <string> "use_orthogonal" </string> - <bool> False </bool> - <string> "use_environment" </string> - <bool> False </bool> - <string> "pos" </string> - <vector3> 13.3659, 3.22136, 2.27417 </vector3> - </dictionary> - <dictionary shared="false"> - <string> "distance" </string> - <real> 4 </real> - <string> "x_rot" </string> - <real> 0 </real> - <string> "y_rot" </string> - <real> 0 </real> - <string> "use_orthogonal" </string> - <bool> False </bool> - <string> "use_environment" </string> - <bool> False </bool> - <string> "pos" </string> - <vector3> 0, 0, 0 </vector3> - </dictionary> - <dictionary shared="false"> - <string> "distance" </string> - <real> 4 </real> - <string> "x_rot" </string> - <real> 0 </real> - <string> "y_rot" </string> - <real> 0 </real> - <string> "use_orthogonal" </string> - <bool> False </bool> - <string> "use_environment" </string> - <bool> False </bool> - <string> "pos" </string> - <vector3> 0, 0, 0 </vector3> - </dictionary> - <dictionary shared="false"> - <string> "distance" </string> - <real> 4 </real> - <string> "x_rot" </string> - <real> 0 </real> - <string> "y_rot" </string> - <real> 0 </real> - <string> "use_orthogonal" </string> - <bool> False </bool> - <string> "use_environment" </string> - <bool> False </bool> - <string> "pos" </string> - <vector3> 0, 0, 0 </vector3> - </dictionary> - </array> - <string> "viewport_mode" </string> - <int> 1 </int> - <string> "default_light" </string> - <bool> False </bool> - <string> "show_grid" </string> - <bool> True </bool> - <string> "show_origin" </string> - <bool> True </bool> - <string> "znear" </string> - <real> 0.1 </real> - </dictionary> - </dictionary> - <string> "__editor_run_settings__" </string> - <dictionary shared="false"> - <string> "custom_args" </string> - <string> "-l $scene" </string> - <string> "run_mode" </string> - <int> 0 </int> - </dictionary> - <string> "__editor_plugin_screen__" </string> - <string> "3D" </string> - </dictionary> - <resource resource_type="PackedScene" path="res://sphere.*"> </resource> - <transform> 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -2.93877 </transform> - <resource resource_type="PackedScene" path="res://box.*"> </resource> - <transform> 1, 0, 0, 0, 1, 0, 0, 0, 1, 13.5356, 0, -3.40082 </transform> - <resource resource_type="PackedScene" path="res://convex.*"> </resource> - <transform> 1, 0, 0, 0, 1, 0, 0, 0, 1, 22.8626, 0, -2.50073 </transform> - <resource resource_type="PackedScene" path="res://capsule.*"> </resource> - <transform> 1, 0, 0, 0, 1, 0, 0, 0, 1, 28.4061, 0, -2.76809 </transform> - <transform> 1, 0, 0, 0, 0.819152, 0.573576, 0, -0.573576, 0.819152, 14.482, 11.1225, 20.5858 </transform> - <int> 0 </int> - <real> 60 </real> - <real> 0.1 </real> - <real> 100 </real> - <bool> False </bool> - <int> -1 </int> - <resource name=""></resource> <transform> 1, 0, 0, 0, 1, 0, 0, 0, 1, 66.4797, 0, 10.4696 </transform> - <int> 1 </int> - <real> 1.5 </real> - <color> 0.355828, 0.346354, 0.329995, 1 </color> - <color> 1, 1, 1, 1 </color> - <real> 0 </real> - <real> 0.05 </real> - <real> 500 </real> - <real> 0.535887 </real> - </array> - <string> "nodes" </string> - <int_array len="105"> -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 </int_array> - <string> "conns" </string> - <int_array len="0"> </int_array> - </dictionary> - - </main_resource> -</resource_file>
\ No newline at end of file diff --git a/demos/3d/sat_test/shapes.scn b/demos/3d/sat_test/shapes.scn Binary files differindex 584237b89d..bf10be0a59 100644 --- a/demos/3d/sat_test/shapes.scn +++ b/demos/3d/sat_test/shapes.scn diff --git a/demos/3d/sat_test/sphere.scn b/demos/3d/sat_test/sphere.scn Binary files differindex dd49c914b3..e40c3bd42d 100644 --- a/demos/3d/sat_test/sphere.scn +++ b/demos/3d/sat_test/sphere.scn |