Merge pull request #30 from tong/improve-projects

Misc improvements
armory3d · Aug 31, 2021 · e01c797 · e01c797
2 parents cfd15c4 + 5d25a68
commit e01c797
Show file tree

Hide file tree

Showing 33 changed files with 42 additions and 35 deletions.
diff --git a/animation_blend/animation_blend.blend b/animation_blend/animation_blend.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/checker.png b/animation_uv/checker.png
diff --git a/animation_uv/checker_rough.png b/animation_uv/checker_rough.png
diff --git a/debug_draw/README.md b/debug_draw/README.md
@@ -1 +1 @@
-Open DebugConsole to enable/disable debug drawing
+To see debug drawing, `Armory Project - Debug Console` option has to be enabled.  
diff --git a/debug_draw/Sources/arm/MyTrait.hx b/debug_draw/Sources/arm/MyTrait.hx
@@ -5,17 +5,20 @@ import armory.trait.internal.DebugDraw;
 #end
 
 class MyTrait extends iron.Trait {
+
 	public function new() {
 		super();
-
-		// To see debug drawing, `Armory Project - Debug Console` option has to be enabled
-
-		#if arm_debug
-		DebugDraw.notifyOnRender(function(draw:DebugDraw) {
-			var o = iron.Scene.active.getChild("Suzanne");
-			draw.bounds(o.transform);
-			// draw.line();
+		notifyOnInit( () -> {
+			var plane = iron.Scene.active.getChild("Plane");
+			var suzanne = iron.Scene.active.getChild("Suzanne");
+			// To see debug drawing, `Armory Project - Debug Console` option has to be enabled
+			#if arm_debug
+			DebugDraw.notifyOnRender( (draw:DebugDraw) -> {
+				if(plane != null) draw.bounds(plane.transform);
+				if(suzanne != null) draw.bounds(suzanne.transform);
+				// draw.line();
+			});
+			#end
 		});
-		#end
 	}
 }
diff --git a/debug_draw/debug_draw.blend b/debug_draw/debug_draw.blend
diff --git a/ease/README.md b/ease/README.md
@@ -1 +1,2 @@
-https://armory3d.org/api/iron/system/Ease.html
+- https://armory3d.org/api/iron/system/Ease.html
+- https://armory3d.org/api/iron/system/Tween.html
diff --git a/ease/Sources/arm/TweenTest.hx b/ease/Sources/arm/TweenTest.hx
@@ -8,35 +8,26 @@ import armory.trait.internal.DebugDraw;
 class TweenTest extends iron.Trait {
 
     @prop var ease : Int = 0;
-
-    public function new() {
 
+    public function new() {
         super();
-
-        #if arm_debug
-		//DebugDraw.notifyOnRender( draw -> draw.bounds( object.transform) );
-		#end
-
-        notifyOnInit(tweenUp);
+        notifyOnInit(() -> {
+            #if arm_debug
+            //DebugDraw.notifyOnRender( draw -> draw.bounds( object.transform) );
+            #end
+            doTween(10);
+        });
     }
 
-    function tweenUp() {
-        doTween( 15, tweenDown );
-    }
-
-    function tweenDown() {
-        doTween( -15, tweenUp );
-    }
-
-    function doTween( z : Float, onDone : Void->Void ) {
+    function doTween( v : Float ) {
         Tween.to({
             target: object.transform.loc,
-            props: { z: z },
-            duration: 2.0,
+            props: { z: v },
             delay: 0.5,
-            tick: object.transform.buildMatrix,
+            duration: 2.0,
             ease: ease,
-            done: onDone
+            tick: object.transform.buildMatrix,
+            done: () -> doTween(-v)
         });
     }
 }
diff --git a/ease/ease.blend b/ease/ease.blend
diff --git a/empty/empty.blend b/empty/empty.blend
diff --git a/game_bowling/README.md b/game_bowling/README.md
@@ -0,0 +1 @@
+Keyboard `space` to bowl
diff --git a/game_bowling/game_bowling.blend b/game_bowling/game_bowling.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":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"}
+{"name":"untitled","x":0,"y":0,"width":1280,"height":720,"elements":[{"id":2,"type":6,"name":"SSR","event":"","x":20,"y":260,"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":20,"y":300,"width":150,"height":40,"rotation":0,"text":"SSAO","asset":"","color":-1,"anchor":0,"parent":null,"children":[],"visible":true},{"id":4,"type":6,"name":"Fullscreen","event":"","x":20,"y":80,"width":191,"height":14,"rotation":0,"text":"Fullscreen","asset":"","color":-1,"anchor":0,"parent":null,"children":[],"visible":true},{"id":6,"type":6,"name":"Bloom","event":"","x":20,"y":220,"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":20,"y":180,"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":20,"y":130,"width":160,"height":60,"rotation":0,"text":"High;Medium;Low","asset":"","color":-1,"anchor":0,"parent":null,"children":[],"visible":true},{"id":9,"type":10,"name":"ViewDistance","event":"","x":20,"y":360,"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":20,"y":410,"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":10,"y":10,"width":540,"height":60,"rotation":0,"text":"Graphics Settings","asset":"","color":-1,"anchor":0,"parent":null,"children":[],"visible":true},{"id":12,"type":0,"name":"ShadowsTitle","event":"","x":185,"y":130,"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":470,"width":80,"height":50,"rotation":0,"text":"Apply","asset":"","color":-1,"anchor":0,"parent":null,"children":[],"visible":true}],"assets":[],"theme":"Default Light"}
diff --git a/graphics_settings/README.md b/graphics_settings/README.md
@@ -1 +1,4 @@
+- WIP, see attached MyTrait script (scene traits)
+- To generate config.arm file, enable `Armory Project - Write Config`
+
 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/light_area/light_area.blend b/light_area/light_area.blend
diff --git a/linked_proxy/README.md b/linked_proxy/README.md
@@ -1 +1,4 @@
+All three objects use the same Cube-trait, but with different settings.  
+The white cube's material has been overridden with a red material.
+
 https://github.com/armory3d/armory/wiki/multiuser#linked-proxy
diff --git a/linked_proxy/blue_cube.blend b/linked_proxy/blue_cube.blend
diff --git a/linked_proxy/green_cube.blend b/linked_proxy/green_cube.blend
diff --git a/linked_proxy/linked_proxy.blend b/linked_proxy/linked_proxy.blend
diff --git a/linked_proxy/white-cube.blend b/linked_proxy/white-cube.blend
diff --git a/logic_break/logic_break.blend b/logic_break/logic_break.blend
diff --git a/logic_toy_car/README.md b/logic_toy_car/README.md
@@ -0,0 +1 @@
+Car control: `← ↓ ↑ →`
diff --git a/logic_toy_car/logic_toy_car.blend b/logic_toy_car/logic_toy_car.blend
diff --git a/physics_constraints/README.md b/physics_constraints/README.md
@@ -1 +1,2 @@
-https://github.com/armory3d/armory/wiki/physics#rigid-body-constraints
+- https://github.com/armory3d/armory/wiki/physics#rigid-body-constraints
+- https://armory3d.org/api/armory/trait/physics/PhysicsConstraint.html
diff --git a/physics_drag/README.md b/physics_drag/README.md
@@ -0,0 +1 @@
+https://armory3d.org/api/armory/trait/PhysicsDrag.html
diff --git a/physics_drag/physics_drag.blend b/physics_drag/physics_drag.blend
diff --git a/render_bloom/render_bloom.blend b/render_bloom/render_bloom.blend
diff --git a/spawn_from_scene/README.md b/spawn_from_scene/README.md
@@ -1 +1,3 @@
-Spawns an object from another scene.
+Spawns an object from another scene.
+
+https://armory3d.org/api/iron/Scene.html#spawnObject
diff --git a/spawn_from_scene/spawn_from_scene.blend b/spawn_from_scene/spawn_from_scene.blend
diff --git a/tilesheet/tilesheet.blend b/tilesheet/tilesheet.blend