Aiming related improvements.

Shooting logic was removed and replaced with tool handling logic - It was needed to be more generic. Check the demo project for more details https://github.com/NewKrok/three-tps-demo
NewKrok · Mar 22, 2022 · a9b83c8 · a9b83c8
1 parent 81c96d5
commit a9b83c8
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 27 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@newkrok/three-tps",
-  "version": "0.0.5",
+  "version": "0.1.0",
   "description": "TPS extension for THREE Game",
   "exports": {
     "./src/*": "./src/*"
@@ -23,7 +23,7 @@
   },
   "homepage": "https://github.com/NewKrok/three-tps#readme",
   "dependencies": {
-    "@newkrok/three-game": "0.0.4"
+    "@newkrok/three-game": "0.1.0"
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

diff --git a/src/js/newkrok/three-tps/control/unit-controller.js b/src/js/newkrok/three-tps/control/unit-controller.js
@@ -335,14 +335,18 @@ export const updateUnitController = ({ now, delta }) => {
       _target.isShootTriggered = false;
     }
 
-    _target.aimingPosition = _world
+    const cameraPosition = _world.camera.instance.getWorldPosition(
+      new THREE.Vector3()
+    );
+    const cameraDirection = _world.camera.instance.getWorldDirection(
+      new THREE.Vector3()
+    );
+    const aimingRayResult = _world
       .getModule(MODULE_ID.OCTREE)
-      .worldOctree.rayIntersect(
-        new THREE.Ray(
-          _world.camera.instance.getWorldPosition(new THREE.Vector3()),
-          _world.camera.instance.getWorldDirection(new THREE.Vector3())
-        )
-      ).position;
+      .worldOctree.rayIntersect(new THREE.Ray(cameraPosition, cameraDirection));
+    _target.aimingPosition =
+      aimingRayResult?.position ||
+      cameraPosition.add(cameraDirection.setLength(15));
 
     const selectedTool = _target.getSelectedTool();
     if (
@@ -353,20 +357,13 @@ export const updateUnitController = ({ now, delta }) => {
       selectedWeaponType === WeaponType.RIFLE
     ) {
       _target.isShootTriggered = true;
-
-      /* const shootingEffect = createParticleSystem(
-        effectsConfig[EffectId.SHOOTING]
-      ); 
-      projectileStartSocket.add(shootingEffect);
-      setTimeout(() => destroyParticleSystem(shootingEffect), 1000);*/
-
-      _world.getModule(MODULE_ID.PROJECTILES).shoot({
-        startPosition: _target
-          .getSocket(ModelSocketId.PROJECTILE_START)
-          .getWorldPosition(new THREE.Vector3()),
-        direction: selectedTool.getWorldDirection(new THREE.Vector3()),
-        scene: _world.scene,
-      });
+      const position = _target
+        .getRegisteredObject("projectileStart")
+        .object.getWorldPosition(new THREE.Vector3());
+      const direction = selectedTool.object.getWorldDirection(
+        new THREE.Vector3()
+      );
+      selectedTool?.on?.activate({ world: _world, position, direction });
     }
   }
 };
diff --git a/src/js/newkrok/three-tps/tps-world.js b/src/js/newkrok/three-tps/tps-world.js
@@ -30,10 +30,9 @@ export const createTPSWorld = ({
         characterConfig,
         camera: camera.instance,
         characterTickRoutine: (character) => {
-          character.updateLookAtPosition({
-            position: character.useAim ? character.aimingPosition : null,
-            rotation: camera.getRotation(),
-          });
+          character.updateAimPosition(
+            character.useAim ? character.aimingPosition : null
+          );
         },
       })
         .then((world) => {