Merge pull request #28 from tong/update-projects

Update projects
armory3d · Aug 5, 2021 · dcc2bc2 · dcc2bc2
2 parents 1718809 + 90fbd93
commit dcc2bc2
Show file tree

Hide file tree

Showing 360 changed files with 514 additions and 232 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,12 @@
 */*.blend?
 */Sources/Main.hx
 */Sources/arm/node/*
-*/khafile.js
 *.pyc
 *.DS_Store
+khafile.js
+node_update_failure.*
+_themes.json
+.vscode/
+config.arm
+_themes.json
+_*/
diff --git a/_/README.md b/_/README.md
diff --git a/_/material_examples/tessellation.blend b/_/material_examples/tessellation.blend
diff --git a/_/vr_dino/dino.blend b/_/vr_dino/dino.blend
diff --git a/_/material_examples/README.md → _material_tesselation/README.md b/_/material_examples/README.md → _material_tesselation/README.md
diff --git a/_material_tesselation/material_tessellation.blend b/_material_tesselation/material_tessellation.blend
diff --git a/_vr_dino/vr_dino.blend b/_vr_dino/vr_dino.blend
diff --git a/animation/animation.blend b/animation/animation.blend
diff --git a/animation_actions/README.md b/animation_actions/README.md
@@ -0,0 +1 @@
+Press keyboard `1`, `2`, `3` to change the animation action
diff --git a/animation_actions/actions.blend b/animation_actions/actions.blend
diff --git a/animation_actions/animation_actions.blend b/animation_actions/animation_actions.blend
diff --git a/animation_blend/README.md b/animation_blend/README.md
@@ -0,0 +1 @@
+Hold keyboard `W`, `S` to blend between animations
diff --git a/animation_blend/animation.blend b/animation_blend/animation.blend
diff --git a/animation_blend/animation_blend.blend b/animation_blend/animation_blend.blend
diff --git a/animation_bonechild/README.md b/animation_bonechild/README.md
@@ -0,0 +1,3 @@
+- Hand object is parented to armature bone
+- Sword is parented to Hand object
+- Press `X` to swap weapons
diff --git a/animation_bonechild/animation.blend b/animation_bonechild/animation.blend
diff --git a/animation_bonechild/animation_bonechild.blend b/animation_bonechild/animation_bonechild.blend
diff --git a/animation_instanced/README.md b/animation_instanced/README.md
@@ -0,0 +1,2 @@
+Use instancing for fast rendering of linked object duplicates.  
+https://github.com/armory3d/armory/wiki/instancing
diff --git a/animation_instanced/animation.blend b/animation_instanced/animation.blend
diff --git a/animation_instanced/animation_instanced.blend b/animation_instanced/animation_instanced.blend
diff --git a/animation_movebone/Sources/arm/MoveBoneFK.hx b/animation_movebone/Sources/arm/MoveBoneFK.hx
@@ -29,7 +29,7 @@ class MoveBoneFK extends iron.Trait {
 				m.setFrom(w);
 				m.translate(10, 0, Math.sin(iron.system.Time.time()) * 50);
 				iw.getInverse(w);
-				m.multmat2(iw);
+				m.multmat(iw);
 			});
 		});
 	}

diff --git a/animation_movebone/animation_movebone.blend b/animation_movebone/animation_movebone.blend
diff --git a/animation_movebone/movebone.blend b/animation_movebone/movebone.blend
diff --git a/animation_timeline/animation_timeline.blend b/animation_timeline/animation_timeline.blend
diff --git a/animation_uv/animation_uv.blend b/animation_uv/animation_uv.blend
diff --git a/animation_uv/uvanim.blend b/animation_uv/uvanim.blend
diff --git a/billboard/billboard.blend b/billboard/billboard.blend
diff --git a/call_hx/README.md b/call_hx/README.md
@@ -0,0 +1,2 @@
+Check console.  
+https://github.com/armory3d/armory/wiki/js
diff --git a/call_hx/Sources/arm/EvalJS.hx b/call_hx/Sources/arm/EvalJS.hx
@@ -5,7 +5,7 @@ class EvalJS {
 	public function new() {
 		// Evaluate bundled JS, usually you would embed JS into .html file instead
 		iron.data.Data.getBlob("my_plugin.js", function(blob:kha.Blob) {
-			untyped __js__("(1, eval)({0})", blob.toString());
+			js.Syntax.code("(1, eval)({0})", blob.toString());
 		});
 	}
 }
diff --git a/call_hx/call_hx.blend b/call_hx/call_hx.blend
diff --git a/call_js/README.md b/call_js/README.md
@@ -0,0 +1,2 @@
+Check console.  
+https://github.com/armory3d/armory/wiki/js
diff --git a/call_js/Sources/arm/CallJS.hx b/call_js/Sources/arm/CallJS.hx
@@ -10,21 +10,20 @@ class CallJS extends iron.Trait {
 
 	public function new() {
 		super();
-
+        var mouse = Input.getMouse();
         notifyOnUpdate(function() {
+
             // Check mouse button
-            var mouse = Input.getMouse();
             if (!mouse.started()) return;
 
             // Pick object at mouse coords
             var rb = PhysicsWorld.active.pickClosest(mouse.x, mouse.y);
 
             // Check if picked object is our Cube
             if (rb != null && rb.object.name == 'Cube') {
-
                 // Raw JS calls
-                untyped __js__('document.title = "Cube clicked!"');
-                untyped __js__('console.log("Testing..");');
+                js.Syntax.code('document.title = "Cube clicked!"');
+                js.Syntax.code('console.log("Testing..");');
             }
         });
 	}

diff --git a/call_js/call_js.blend b/call_js/call_js.blend
diff --git a/debug_draw/README.md b/debug_draw/README.md
@@ -0,0 +1 @@
+Open DebugConsole to enable/disable debug drawing
diff --git a/debug_draw/debug_draw.blend b/debug_draw/debug_draw.blend
diff --git a/debug_draw/draw.blend b/debug_draw/draw.blend
diff --git a/dev_logicnode/dev_logicnode.blend b/dev_logicnode/dev_logicnode.blend
diff --git a/dev_logicnode/logicnode.blend b/dev_logicnode/logicnode.blend
diff --git a/ease/README.md b/ease/README.md
@@ -0,0 +1 @@
+https://armory3d.org/api/iron/system/Ease.html
diff --git a/ease/Sources/arm/TweenTest.hx b/ease/Sources/arm/TweenTest.hx
@@ -0,0 +1,42 @@
+package arm;
+
+import iron.system.Tween;
+#if arm_debug
+import armory.trait.internal.DebugDraw;
+#end
+
+class TweenTest extends iron.Trait {
+
+    @prop var ease : Int = 0;
+
+    public function new() {
+
+        super();
+
+        #if arm_debug
+		//DebugDraw.notifyOnRender( draw -> draw.bounds( object.transform) );
+		#end
+
+        notifyOnInit(tweenUp);
+    }
+
+    function tweenUp() {
+        doTween( 15, tweenDown );
+    }
+
+    function tweenDown() {
+        doTween( -15, tweenUp );
+    }
+
+    function doTween( z : Float, onDone : Void->Void ) {
+        Tween.to({
+            target: object.transform.loc,
+            props: { z: z },
+            duration: 2.0,
+            delay: 0.5,
+            tick: object.transform.buildMatrix,
+            ease: ease,
+            done: onDone
+        });
+    }
+}
diff --git a/ease/ease.blend b/ease/ease.blend
diff --git a/file_read/README.md b/file_read/README.md
@@ -0,0 +1 @@
+Loads a json file from the `Bundled/` directory.
diff --git a/file_read/Sources/arm/ReadFile.hx b/file_read/Sources/arm/ReadFile.hx
@@ -1,8 +1,8 @@
 package arm;
 
-import iron.Scene;
-import iron.data.Data;
 import armory.trait.internal.CanvasScript;
+import iron.data.Data;
+import iron.Scene;
 
 class ReadFile extends iron.Trait {
 	public function new() {
@@ -11,7 +11,7 @@ class ReadFile extends iron.Trait {
 		notifyOnInit(function() {
 
 			// Relative or absolute path to file
-			// In this case we load the file placed in the "Bundled/" folder
+			// In this case we load the file placed in the "Bundled/" directory
 			var file = "my_file.json";
 
 			// Load the file asynchronously

diff --git a/file_read/file.blend b/file_read/file.blend
diff --git a/file_read/file_read.blend b/file_read/file_read.blend
diff --git a/file_storage/README.md b/file_storage/README.md
@@ -0,0 +1 @@
+https://armory3d.org/api/kha/Storage.html
diff --git a/file_storage/storage.blend → file_storage/file_storage.blend b/file_storage/storage.blend → file_storage/file_storage.blend
diff --git a/file_write/README.md b/file_write/README.md
@@ -0,0 +1 @@
+https://github.com/armory3d/armory/wiki/reference#write-json
diff --git a/file_write/file.blend b/file_write/file.blend
diff --git a/file_write/file_write.blend b/file_write/file_write.blend
diff --git a/game_bowling/bowling.blend b/game_bowling/bowling.blend
diff --git a/game_bowling/game_bowling.blend b/game_bowling/game_bowling.blend
diff --git a/game_endlessrun/endless.blend b/game_endlessrun/endless.blend
diff --git a/game_endlessrun/game_endless.blend b/game_endlessrun/game_endless.blend
diff --git a/graphics_settings/Bundled/canvas/MyCanvas.json b/graphics_settings/Bundled/canvas/MyCanvas.json
@@ -1 +1 @@
-{"name":"untitled","x":0,"y":0,"width":1280,"height":720,"elements":[{"id":2,"type":6,"name":"SSR","event":"","x":40,"y":290,"width":150,"height":44,"rotation":0,"text":"SSR","asset":"","color":-1,"anchor":0,"parent":null,"children":[],"visible":true},{"id":3,"type":6,"name":"SSAO","event":"","x":40,"y":340,"width":150,"height":44,"rotation":0,"text":"SSAO","asset":"","color":-1,"anchor":0,"parent":null,"children":[],"visible":true},{"id":4,"type":6,"name":"Fullscreen","event":"","x":40,"y":90,"width":191,"height":44,"rotation":0,"text":"Fullscreen","asset":"","color":-1,"anchor":0,"parent":null,"children":[],"visible":true},{"id":6,"type":6,"name":"Bloom","event":"","x":40,"y":240,"width":150,"height":44,"rotation":0,"text":"Bloom","asset":"","color":-1,"anchor":0,"parent":null,"children":[],"visible":true},{"id":7,"type":6,"name":"MotionBlur","event":"","x":40,"y":190,"width":177,"height":44,"rotation":0,"text":"Motion Blur","asset":"","color":-1,"anchor":0,"parent":null,"children":[],"visible":true},{"id":8,"type":8,"name":"Shadows","event":"","x":40,"y":140,"width":150,"height":44,"rotation":0,"text":"High;Medium;Low","asset":"","color":-1,"anchor":0,"parent":null,"children":[],"visible":true},{"id":9,"type":10,"name":"ViewDistance","event":"","x":40,"y":390,"width":250,"height":44,"rotation":0,"text":"View Distance","asset":"","color":-1,"anchor":0,"parent":null,"children":[],"visible":true},{"id":10,"type":10,"name":"FoV","event":"","x":40,"y":440,"width":250,"height":44,"rotation":0,"text":"FoV","asset":"","color":-1,"anchor":0,"parent":null,"children":[],"visible":true},{"id":11,"type":0,"name":"Title","event":"","x":20,"y":20,"width":377,"height":44,"rotation":0,"text":"Graphics Settings","asset":"","color":-1,"anchor":0,"parent":null,"children":[],"visible":true},{"id":12,"type":0,"name":"ShadowsTitle","event":"","x":180,"y":140,"width":184,"height":28,"rotation":0,"text":"Shadows","asset":"","color":-6381922,"anchor":0,"parent":null,"children":[],"visible":true},{"id":13,"type":2,"name":"Apply","event":"apply_settings","x":40,"y":490,"width":150,"height":44,"rotation":0,"text":"Apply","asset":"","color":-1,"anchor":0,"parent":null,"children":[],"visible":true}],"assets":[]}
+{"name":"untitled","x":0,"y":0,"width":1280,"height":720,"elements":[{"id":2,"type":6,"name":"SSR","event":"","x":40,"y":300,"width":150,"height":34,"rotation":0,"text":"SSR","asset":"","color":-1,"anchor":0,"parent":null,"children":[],"visible":true},{"id":3,"type":6,"name":"SSAO","event":"","x":40,"y":340,"width":150,"height":44,"rotation":0,"text":"SSAO","asset":"","color":-1,"anchor":0,"parent":null,"children":[],"visible":true},{"id":4,"type":6,"name":"Fullscreen","event":"","x":40,"y":90,"width":191,"height":24,"rotation":0,"text":"Fullscreen","asset":"","color":-1,"anchor":0,"parent":null,"children":[],"visible":true},{"id":6,"type":6,"name":"Bloom","event":"","x":40,"y":240,"width":150,"height":44,"rotation":0,"text":"Bloom","asset":"","color":-1,"anchor":0,"parent":null,"children":[],"visible":true},{"id":7,"type":6,"name":"MotionBlur","event":"","x":40,"y":190,"width":177,"height":44,"rotation":0,"text":"Motion Blur","asset":"","color":-1,"anchor":0,"parent":null,"children":[],"visible":true},{"id":8,"type":8,"name":"Shadows","event":"","x":40,"y":160,"width":80,"height":20,"rotation":0,"text":"High;Medium;Low","asset":"","color":-1,"anchor":0,"parent":null,"children":[],"visible":true},{"id":9,"type":10,"name":"ViewDistance","event":"","x":40,"y":390,"width":250,"height":44,"rotation":0,"text":"View Distance","asset":"","color":-1,"anchor":0,"parent":null,"children":[],"visible":true},{"id":10,"type":10,"name":"FoV","event":"","x":40,"y":440,"width":250,"height":40,"rotation":0,"text":"FoV","asset":"","color":-1,"anchor":0,"parent":null,"children":[],"visible":true},{"id":11,"type":0,"name":"Title","event":"","x":20,"y":20,"width":260,"height":32,"rotation":0,"text":"Graphics Settings","asset":"","color":-1,"anchor":0,"parent":null,"children":[],"visible":true},{"id":12,"type":0,"name":"ShadowsTitle","event":"","x":180,"y":140,"width":184,"height":20,"rotation":0,"text":"Shadows","asset":"","color":-6381922,"anchor":0,"parent":null,"children":[],"visible":true},{"id":13,"type":2,"name":"Apply","event":"apply_settings","x":40,"y":480,"width":80,"height":30,"rotation":0,"text":"Apply","asset":"","color":-1,"anchor":0,"parent":null,"children":[],"visible":true}],"assets":[],"theme":"Default Light"}
diff --git a/graphics_settings/Bundled/config.arm b/graphics_settings/Bundled/config.arm
@@ -8,13 +8,13 @@
     "rp_ssgi": true,
     "rp_ssr": true,
     "rp_supersample": 1.0,
-    "window_h": 720,
+    "window_h": 540,
     "window_maximizable": false,
     "window_minimizable": true,
     "window_mode": 0,
     "window_msaa": 1,
     "window_resizable": false,
     "window_scale": 1.0,
     "window_vsync": true,
-    "window_w": 1280
+    "window_w": 960
 }
diff --git a/graphics_settings/README.md b/graphics_settings/README.md
@@ -0,0 +1 @@
+https://armory3d.org/api/armory/data/Config.html
diff --git a/graphics_settings/graphics_settings.blend b/graphics_settings/graphics_settings.blend
diff --git a/graphics_settings/settings.blend b/graphics_settings/settings.blend
diff --git a/input_mouselock/README.md b/input_mouselock/README.md
@@ -0,0 +1,2 @@
+Click to lock mouse, press ESC to unlock mouse.  
+https://armory3d.org/api/iron/system/Mouse.html
diff --git a/mouse_lock/Sources/arm/LockTrait.hx → input_mouselock/Sources/arm/LockTrait.hx b/mouse_lock/Sources/arm/LockTrait.hx → input_mouselock/Sources/arm/LockTrait.hx
@@ -1,22 +1,23 @@
 package arm;
 
 import iron.math.Vec4;
+import iron.system.Input;
 
 class LockTrait extends iron.Trait {
+
 	public function new() {
+
 		super();
 
-		notifyOnUpdate(function() {
-			var mouse = iron.system.Input.getMouse();
-			var kb = iron.system.Input.getKeyboard();
+		var mouse = Input.getMouse();
+		var kb = Input.getKeyboard();
 
+		notifyOnUpdate(() -> {
 			if (mouse.started("left")) {
 				mouse.lock();
-			}
-			else if (kb.started("escape")) {
+			} else if (kb.started("escape")) {
 				mouse.unlock();
 			}
-
 			var cube = iron.Scene.active.getChild("Cube");
 			if (cube != null) {
 				cube.transform.rotate(Vec4.zAxis(), mouse.movementX * 0.002);

diff --git a/input_mouselock/input_mouselock.blend b/input_mouselock/input_mouselock.blend
diff --git a/multitouch/Sources/arm/TouchTrait.hx → input_multitouch/Sources/arm/TouchTrait.hx b/multitouch/Sources/arm/TouchTrait.hx → input_multitouch/Sources/arm/TouchTrait.hx
diff --git a/input_multitouch/input_multitouch.blend b/input_multitouch/input_multitouch.blend
diff --git a/sensor/Sources/arm/SensorTrait.hx → input_sensor/Sources/arm/SensorTrait.hx b/sensor/Sources/arm/SensorTrait.hx → input_sensor/Sources/arm/SensorTrait.hx
diff --git a/input_sensor/input_sensor.blend b/input_sensor/input_sensor.blend
diff --git a/instancing/README.md b/instancing/README.md
@@ -0,0 +1,6 @@
+#### Enable instancing  
+
+- Select object and set `Properties - Object - Armory Props - Instanced Children` property  
+- Create linked duplicates and parent them to object being instanced  
+
+https://github.com/armory3d/armory/wiki/instancing
diff --git a/instancing/inst.blend b/instancing/inst.blend
diff --git a/instancing/instancing.blend b/instancing/instancing.blend
diff --git a/light_area/area.blend b/light_area/area.blend
diff --git a/light_area/light_area.blend b/light_area/light_area.blend
diff --git a/light_ies/ies.blend b/light_ies/ies.blend
diff --git a/light_ies/light_ies.blend b/light_ies/light_ies.blend
diff --git a/light_probes/reflection_cubemap.blend b/light_probes/reflection_cubemap.blend
diff --git a/light_probes/reflection_plane.blend b/light_probes/reflection_plane.blend
diff --git a/light_probes_cubemap/light_probes_cubemap.blend b/light_probes_cubemap/light_probes_cubemap.blend
diff --git a/light_probes_plane/light_probes_plane.blend b/light_probes_plane/light_probes_plane.blend
diff --git a/light_volumetric/README.md b/light_volumetric/README.md
@@ -0,0 +1 @@
+https://github.com/armory3d/armory/wiki/screen-effects#volumetric-fog
diff --git a/light_volumetric/light_volumetric.blend b/light_volumetric/light_volumetric.blend
diff --git a/light_volumetric/volumetric.blend b/light_volumetric/volumetric.blend
diff --git a/linked_proxy/README.md b/linked_proxy/README.md
@@ -0,0 +1 @@
+https://github.com/armory3d/armory/wiki/multiuser#linked-proxy
diff --git a/linked_proxy/linked_proxy.blend b/linked_proxy/linked_proxy.blend
diff --git a/load_screen/load_screen.blend b/load_screen/load_screen.blend
diff --git a/lod/README.md b/lod/README.md
@@ -0,0 +1 @@
+LOD (level of detail) can be decreased as the model moves away from the viewer.
diff --git a/lod/lod.blend b/lod/lod.blend
diff --git a/logic_break/logic_break.blend b/logic_break/logic_break.blend
diff --git a/logic_callgroup/README.md b/logic_callgroup/README.md
@@ -0,0 +1,3 @@
+- Keyboard `C` NodeTreeA calls NodeTreeB, NodeTreeB sets current time to global object property  
+- Keyboard `V` NodeTreeA prints value of global object property  
+- Check console output
diff --git a/logic_callgroup/logic_callgroup.blend b/logic_callgroup/logic_callgroup.blend
diff --git a/logic_camera_pan/logic_camera_pan.blend b/logic_camera_pan/logic_camera_pan.blend
diff --git a/logic_camera_zoom/logic_camera_zoom.blend b/logic_camera_zoom/logic_camera_zoom.blend
diff --git a/logic_canvas/logic_canvas.blend b/logic_canvas/logic_canvas.blend
diff --git a/...hics_settings/Bundled/canvas/_themes.json → logic_event_fromhaxe/README.md b/...hics_settings/Bundled/canvas/_themes.json → logic_event_fromhaxe/README.md
diff --git a/logic_event_fromhaxe/Sources/arm/SendEvent.hx b/logic_event_fromhaxe/Sources/arm/SendEvent.hx
@@ -0,0 +1,19 @@
+package arm;
+
+import armory.system.Event;
+
+class SendEvent extends iron.Trait {
+
+	public function new() {
+
+		super();
+
+		var mouse = iron.system.Input.getMouse();
+
+		notifyOnUpdate(function() {
+			if (mouse.started("left")) {
+				Event.send("my_event");
+			}
+		});
+	}
+}
diff --git a/logic_event_fromhaxe/logic_event_fromhaxe.blend b/logic_event_fromhaxe/logic_event_fromhaxe.blend
diff --git a/logic_event_global/logic_event_global.blend b/logic_event_global/logic_event_global.blend
diff --git a/logic_events/Sources/arm/SendEvent.hx → logic_event_object/Sources/arm/SendEvent.hx b/logic_events/Sources/arm/SendEvent.hx → logic_event_object/Sources/arm/SendEvent.hx
diff --git a/logic_event_object/logic_event_object.blend b/logic_event_object/logic_event_object.blend
diff --git a/logic_events/from_haxe.blend b/logic_events/from_haxe.blend
diff --git a/logic_events/global_event.blend b/logic_events/global_event.blend
diff --git a/logic_events/object_event.blend b/logic_events/object_event.blend
diff --git a/logic_examples/LoadUrl.blend b/logic_examples/LoadUrl.blend
diff --git a/logic_examples/break.blend b/logic_examples/break.blend
diff --git a/logic_examples/callgroup.blend b/logic_examples/callgroup.blend
diff --git a/logic_examples/camera_pan.blend b/logic_examples/camera_pan.blend
diff --git a/logic_examples/camera_zoom.blend b/logic_examples/camera_zoom.blend
diff --git a/logic_examples/get_contacts.blend b/logic_examples/get_contacts.blend
diff --git a/logic_examples/hello_world.blend b/logic_examples/hello_world.blend
diff --git a/logic_examples/keyboard.blend b/logic_examples/keyboard.blend
diff --git a/logic_examples/linked_variable.blend b/logic_examples/linked_variable.blend
diff --git a/logic_examples/logic_scenetree.blend b/logic_examples/logic_scenetree.blend
diff --git a/logic_examples/object_rotate.blend b/logic_examples/object_rotate.blend
diff --git a/logic_examples/object_scale.blend b/logic_examples/object_scale.blend
diff --git a/logic_examples/object_translate.blend b/logic_examples/object_translate.blend
diff --git a/logic_examples/pause_trait.blend b/logic_examples/pause_trait.blend
diff --git a/logic_examples/scenes.blend b/logic_examples/scenes.blend
diff --git a/logic_examples/script.blend b/logic_examples/script.blend
diff --git a/logic_examples/set_property.blend b/logic_examples/set_property.blend
diff --git a/logic_examples/toy_car.blend b/logic_examples/toy_car.blend
diff --git a/logic_examples/transform.blend b/logic_examples/transform.blend
diff --git a/logic_examples/triggers.blend b/logic_examples/triggers.blend
diff --git a/logic_examples/watch_variable.blend b/logic_examples/watch_variable.blend
diff --git a/logic_gamepad/Sources/arm/VirtualGamepad.hx b/logic_gamepad/Sources/arm/VirtualGamepad.hx
@@ -0,0 +1,112 @@
+package arm;
+
+import iron.Trait;
+import iron.math.Vec2;
+import iron.system.Input;
+
+using kha.graphics2.GraphicsExtension;
+
+@:access(iron.system.Gamepad)
+class VirtualGamepad extends Trait {
+
+	@prop public var gamepad : Int = 0;
+	@prop public var radius : Int = 100;
+	@prop public var offset : Int = 45;
+	@prop public var sizeRatio : Float = 2.2;
+
+	public var colorA : kha.Color = 0xff888888;
+	public var colorB : kha.Color = 0xffcf2b43;
+
+	var leftPadX = 0;
+	var leftPadY = 0;
+	var rightPadX = 0;
+	var rightPadY = 0;
+	var leftStickX = 0;
+	var leftStickY = 0;
+	var rightStickX = 0;
+	var rightStickY = 0;
+	// var leftStickXLast = 0;
+	// var leftStickYLast = 0;
+	// var rightStickXLast = 0;
+	// var rightStickYLast = 0;
+	var leftLocked = false;
+	var rightLocked = false;
+	var gamepad_ : Gamepad;
+
+	public function new() {
+		super();
+		notifyOnInit(function() {
+			gamepad_ = Input.getGamepad( gamepad );
+			notifyOnUpdate(update);
+			notifyOnRender2D(render2D);
+		});
+	}
+
+	function update() {
+
+		var r = radius;
+		var o = offset;
+
+		leftPadX = r + o;
+		rightPadX = iron.App.w() - r - o;
+		leftPadY = rightPadY = iron.App.h() - r - o;
+
+		final mouse = Input.getMouse();
+		if (mouse.started() ) {
+			leftLocked = Vec2.distancef(mouse.x, mouse.y, leftPadX, leftPadY) <= r;
+		} else if (mouse.released()) {
+			leftLocked = false;
+		}
+		if (leftLocked) {
+			leftStickX = Std.int(mouse.x - leftPadX);
+			leftStickY = Std.int(mouse.y - leftPadY);
+			if (Math.sqrt(leftStickX * leftStickX + leftStickY * leftStickY) > r) {
+				leftStickX = Std.int(r * (leftStickX / Math.sqrt(leftStickX * leftStickX + leftStickY * leftStickY)));
+				leftStickY = Std.int(r * (leftStickY / Math.sqrt(leftStickX * leftStickX + leftStickY * leftStickY)));
+			}
+		} else {
+			leftStickX = leftStickY = 0;
+		}
+
+		if (mouse.started() ) {
+			rightLocked = Vec2.distancef(mouse.x, mouse.y, rightPadX, rightPadY) <= r;
+		} else if (mouse.released()) {
+			rightLocked = false;
+		}
+		if (rightLocked) {
+			rightStickX = Std.int(mouse.x - rightPadX);
+			rightStickY = Std.int(mouse.y - rightPadY);
+			if (Math.sqrt(rightStickX * rightStickX + rightStickY * rightStickY) > r) {
+				rightStickX = Std.int(r * (rightStickX / Math.sqrt(rightStickX * rightStickX + rightStickY * rightStickY)));
+				rightStickY = Std.int(r * (rightStickY / Math.sqrt(rightStickX * rightStickX + rightStickY * rightStickY)));
+			}
+		}
+		else {
+			rightStickX = rightStickY = 0;
+		}
+
+		gamepad_.axisListener(0, leftStickX / r);
+		gamepad_.axisListener(1, leftStickY / r);
+		gamepad_.axisListener(2, rightStickY / r);
+		gamepad_.axisListener(3, rightStickX / r);
+
+		// leftStickXLast = leftStickX;
+		// leftStickYLast = leftStickY;
+		// rightStickXLast = rightStickX;
+		// rightStickYLast = rightStickY;
+	}
+
+	function render2D(g: kha.graphics2.Graphics) {
+
+		var r = radius;
+		var r2 = Std.int(r / sizeRatio);
+
+		g.color = colorA;
+		g.fillCircle(leftPadX, leftPadY, r);
+		g.fillCircle(rightPadX, rightPadY, r);
+
+		g.color = colorB;
+		g.fillCircle(leftPadX + leftStickX, leftPadY + leftStickY, r2);
+		g.fillCircle(rightPadX + rightStickX, rightPadY + rightStickY, r2);
+	}
+}
diff --git a/logic_gamepad/logic_gamepad.blend b/logic_gamepad/logic_gamepad.blend
diff --git a/logic_gate/gate.blend b/logic_gate/gate.blend
diff --git a/logic_gate/logic_gate.blend b/logic_gate/logic_gate.blend
diff --git a/logic_get_contacts/logic_get_contacts.blend b/logic_get_contacts/logic_get_contacts.blend
diff --git a/logic_hello_world/logic_hello_world.blend b/logic_hello_world/logic_hello_world.blend
diff --git a/logic_keyboard/logic_keyboard.blend b/logic_keyboard/logic_keyboard.blend
diff --git a/logic_linked_variable/logic_linked_variable.blend b/logic_linked_variable/logic_linked_variable.blend
diff --git a/logic_loadurl/logic_loadurl.blend b/logic_loadurl/logic_loadurl.blend
diff --git a/logic_mouselock/logic_mouselock.blend b/logic_mouselock/logic_mouselock.blend
diff --git a/logic_object_rotate/README.md b/logic_object_rotate/README.md
@@ -0,0 +1 @@
+Press keyboard A, D to rotate object
diff --git a/logic_object_rotate/logic_object_rotate.blend b/logic_object_rotate/logic_object_rotate.blend
diff --git a/logic_object_scale/README.md b/logic_object_scale/README.md
@@ -0,0 +1 @@
+Press keyboard `↓` `↑` to scale object
diff --git a/logic_object_scale/logic_object_scale.blend b/logic_object_scale/logic_object_scale.blend
diff --git a/logic_object_translate/README.md b/logic_object_translate/README.md
@@ -0,0 +1 @@
+Keyboard `WASD` to translate object
diff --git a/logic_object_translate/logic_object_translate.blend b/logic_object_translate/logic_object_translate.blend
diff --git a/logic_pause_trait/README.md b/logic_pause_trait/README.md
@@ -0,0 +1,3 @@
+#### Keyboard
+- `1` to pause trait
+- `2` to resume trait
diff --git a/logic_pause_trait/logic_pause_trait.blend b/logic_pause_trait/logic_pause_trait.blend
diff --git a/logic_pong/logic_pong.blend b/logic_pong/logic_pong.blend
diff --git a/logic_pong/pong.blend b/logic_pong/pong.blend
diff --git a/logic_scenes/README.md b/logic_scenes/README.md
@@ -0,0 +1,3 @@
+#### Keyboard
+- `1` to drop all objects from other scene into current
+- `2` to remove current scene and switch to Scene3
diff --git a/logic_scenes/logic_scenes.blend b/logic_scenes/logic_scenes.blend
diff --git a/logic_scenetree/README.md b/logic_scenetree/README.md
@@ -0,0 +1 @@
+Check console
diff --git a/logic_scenetree/logic_scenetree.blend b/logic_scenetree/logic_scenetree.blend
diff --git a/logic_script/logic_script.blend b/logic_script/logic_script.blend
diff --git a/logic_set_property/README.md b/logic_set_property/README.md
@@ -0,0 +1 @@
+- Press 1, 2 or 3
diff --git a/logic_set_property/logic_set_property.blend b/logic_set_property/logic_set_property.blend
diff --git a/logic_transform/logic_transform.blend b/logic_transform/logic_transform.blend
diff --git a/material_examples/baked.blend → material_bake/material_bake.blend b/material_examples/baked.blend → material_bake/material_bake.blend
diff --git a/material_batch/material_batch.blend b/material_batch/material_batch.blend
diff --git a/billboard/bunny.png → material_billboard/bunny.png b/billboard/bunny.png → material_billboard/bunny.png
diff --git a/material_billboard/material_billboard.blend b/material_billboard/material_billboard.blend
diff --git a/material_bump/brick_bump.jpg b/material_bump/brick_bump.jpg
diff --git a/material_examples/bump.blend → material_bump/material_bump.blend b/material_examples/bump.blend → material_bump/material_bump.blend
diff --git a/material_examples/decal.png → material_decal/decal.png b/material_examples/decal.png → material_decal/decal.png
diff --git a/material_decal/material_decal.blend b/material_decal/material_decal.blend
diff --git a/material_displace/README.md b/material_displace/README.md
@@ -0,0 +1 @@
+https://github.com/armory3d/armory/wiki/materials#displacement
diff --git a/material_examples/checker.png → material_displace/checker.png b/material_examples/checker.png → material_displace/checker.png
diff --git a/material_examples/checker_rough.png → material_displace/checker_rough.png b/material_examples/checker_rough.png → material_displace/checker_rough.png
diff --git a/material_displace/material_displace.blend b/material_displace/material_displace.blend
diff --git a/material_examples/batch.blend b/material_examples/batch.blend
diff --git a/material_examples/decal.blend b/material_examples/decal.blend
diff --git a/material_examples/displace.blend b/material_examples/displace.blend
diff --git a/material_examples/normalmap.blend b/material_examples/normalmap.blend
diff --git a/material_examples/shadeless.blend b/material_examples/shadeless.blend
diff --git a/material_examples/sss.blend b/material_examples/sss.blend
diff --git a/material_movie/movie.blend b/material_movie/movie.blend
diff --git a/material_examples/multiuvs.blend → material_multiuvs/multiuvs.blend b/material_examples/multiuvs.blend → material_multiuvs/multiuvs.blend
diff --git a/material_normalmap/material_normalmap.blend b/material_normalmap/material_normalmap.blend
diff --git a/material_params/README.md b/material_params/README.md
@@ -0,0 +1 @@
+https://github.com/armory3d/armory/wiki/materials#material-parameters
diff --git a/material_params/material_params.blend b/material_params/material_params.blend
diff --git a/material_params/params.blend b/material_params/params.blend
diff --git a/material_shadeless/material_shadeless.blend b/material_shadeless/material_shadeless.blend