Merge pull request #48 from QuantumCoderQC/master

Fix and Update examples. Added documentation to some examples.
armory3d · Mar 12, 2022 · a1d69da · a1d69da
2 parents 6235550 + 192f22c
commit a1d69da
Show file tree

Hide file tree

Showing 22 changed files with 29 additions and 13 deletions.
diff --git a/animation_blend/animation_blend.blend b/animation_blend/animation_blend.blend
diff --git a/animation_movebone/README.md b/animation_movebone/README.md
@@ -0,0 +1,2 @@
+The left arm is controlled by Inverse Kinematics with a finger following a ball movement. Use `W` `S` `A` and `D` keys to move the ball.
+The right arm is controlled by Forward Kinematics with a Haxe script.
diff --git a/animation_movebone/Sources/arm/MoveBoneFK.hx b/animation_movebone/Sources/arm/MoveBoneFK.hx
@@ -1,5 +1,7 @@
 package arm;
 
+import iron.math.Vec4;
+import iron.math.Quat;
 import iron.object.BoneAnimation;
 import iron.math.Mat4;
 
@@ -13,23 +15,31 @@ class MoveBoneFK extends iron.Trait {
 			// Fetch armature animation
 			var anim = cast(object.children[0].animation, BoneAnimation);
 			// Fetch bone
-			var bone = anim.getBone("mixamorig:LeftArm");
+			var bone = anim.getBone("mixamorig:RightArm");
 
 			// Manipulating bone in local space
-			// var m = anim.getBoneMat(bone);
+			//var m = anim.getBoneMat(bone);
 			// anim.notifyOnUpdate(function() {
-				// m.translate(Math.sin(iron.system.Time.time()) * 50, 0, 0);
-			// });
+			//	var offset = new Quat().fromEuler(0, Math.sin(iron.system.Time.time()), 0);
+			//	m.applyQuat(offset);
+			//});
 
-			// Manipulating bone in world space
-			var m = anim.getBoneMat(bone);
-			var w = anim.getAbsMat(bone);
-			var iw = Mat4.identity();
+			// Manipulating bone in world space	
 			anim.notifyOnUpdate(function() {
-				m.setFrom(w);
-				m.translate(10, 0, Math.sin(iron.system.Time.time()) * 50);
-				iw.getInverse(w);
-				m.multmat(iw);
+				// Get bone mat in world space
+				var m = anim.getAbsWorldMat(bone);
+				// Decompose transform
+				var loc = new Vec4();
+				var scl = new Vec4();
+				var rot = new Quat();
+				m.decompose(loc, rot, scl);
+				// Apply rotation
+				var offset = new Quat().fromEuler(Math.sin(iron.system.Time.time()), 0, 0);
+				rot.multquats(offset, rot);
+				// Compose world matrix
+				m.compose(loc, rot, scl);
+				// Set bone matrix from world matrix
+				anim.setBoneMatFromWorldMat(m, bone);
 			});
 		});
 	}

diff --git a/animation_movebone/animation_movebone.blend b/animation_movebone/animation_movebone.blend
diff --git a/debug_draw/debug_draw.blend b/debug_draw/debug_draw.blend
diff --git a/file_storage/file_storage.blend b/file_storage/file_storage.blend
diff --git a/game_bowling/game_bowling.blend b/game_bowling/game_bowling.blend
diff --git a/logic_callgroup/Bundled/canvas/MyCanvas.files b/logic_callgroup/Bundled/canvas/MyCanvas.files
diff --git a/logic_callgroup/Bundled/canvas/MyCanvas.json b/logic_callgroup/Bundled/canvas/MyCanvas.json
@@ -0,0 +1 @@
+{"name":"untitled","x":0,"y":0,"width":1280,"height":720,"theme":"Default Light","elements":[{"id":0,"type":0,"name":"Text","event":"","x":120,"y":140,"width":260,"height":48,"rotation":0,"text":"My Text","asset":"","progress_at":0,"progress_total":100,"strength":1,"alignment":0,"anchor":0,"parent":null,"children":[],"visible":true}],"assets":[]}
diff --git a/logic_callgroup/README.md b/logic_callgroup/README.md
@@ -1,3 +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
+- Check canvas overlay text
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_gamepad/Bundled/canvas/MyCanvas.files b/logic_gamepad/Bundled/canvas/MyCanvas.files
diff --git a/logic_gamepad/Bundled/canvas/MyCanvas.json b/logic_gamepad/Bundled/canvas/MyCanvas.json
@@ -0,0 +1 @@
+{"name":"untitled","x":0,"y":0,"width":1280,"height":720,"theme":"Default Light","elements":[{"id":2,"type":12,"name":"Filled_Rectangle","event":"","x":0,"y":0,"width":250,"height":50,"rotation":0,"text":"My Filled_Rectangle","asset":"","progress_at":0,"progress_total":100,"strength":1,"alignment":0,"anchor":0,"parent":null,"children":[],"visible":true,"color":null},{"id":1,"type":6,"name":"VGamepad","event":"","x":0,"y":0,"width":250,"height":50,"rotation":0,"text":"Virtual Gamepad","asset":"","progress_at":0,"progress_total":100,"strength":1,"alignment":0,"anchor":0,"parent":null,"children":[],"visible":true,"color_text":-6738141,"color":-3392436,"color_hover":-5726816}],"assets":[]}
diff --git a/logic_gamepad/logic_gamepad.blend b/logic_gamepad/logic_gamepad.blend
diff --git a/logic_object_rotate/logic_object_rotate.blend b/logic_object_rotate/logic_object_rotate.blend
diff --git a/material_params/material_params.blend b/material_params/material_params.blend
diff --git a/material_shaders/material_shaders.blend b/material_shaders/material_shaders.blend
diff --git a/script_camera_lerp/README.md b/script_camera_lerp/README.md
@@ -0,0 +1,2 @@
+Use keys `A` and `D` to rotate the cube
+The camera follows the cube smoothly with interpolation
diff --git a/script_camera_lerp/script_camera_lerp.blend b/script_camera_lerp/script_camera_lerp.blend
diff --git a/tween/tween.blend b/tween/tween.blend