several fixes

decentraland-scenes · Dec 28, 2023 · 60f1041 · 60f1041
1 parent aaa1c54
commit 60f1041
Show file tree

Hide file tree

Showing 7 changed files with 120 additions and 32 deletions.
diff --git a/assets/scene/main.composite b/assets/scene/main.composite
@@ -1130,6 +1130,21 @@
         "protocolBuffer": "PBPointerEvents"
       },
       "data": {
+        "513": {
+          "json": {
+            "pointerEvents": [
+              {
+                "eventType": 1,
+                "eventInfo": {
+                  "button": 3,
+                  "hoverText": "Interact",
+                  "maxDistance": 10,
+                  "showFeedback": false
+                }
+              }
+            ]
+          }
+        },
         "522": {
           "json": {
             "pointerEvents": [
@@ -1280,7 +1295,7 @@
         "serializationType": "map"
       },
       "data": {
-        "530": {
+        "513": {
           "json": {
             "gizmo": 0
           }

diff --git a/bin/game.js b/bin/game.js
diff --git a/main.crdt b/main.crdt
diff --git a/src/index.ts b/src/index.ts
@@ -2,7 +2,7 @@ import {
   ColliderLayer, engine, Animator,
   AudioSource, VisibilityComponent, Material,
   VideoPlayer, pointerEventsSystem,
-  AvatarAttach, GltfContainer, PointerEvents, PointerEventType, TextShape, Transform
+  AvatarAttach, GltfContainer, PointerEvents, Tween, PointerEventType, TextShape, Transform
 } from '@dcl/sdk/ecs'
 import { Vector3, Quaternion } from '@dcl/sdk/math'
 import { BeerType, IngredientType, SyncEntityIDs } from './definitions'
@@ -58,13 +58,39 @@ export function main() {
     fontSize: 3,
   })
 
+
   //Ingredient expenders
   const noodles_expender = engine.getEntityOrNullByName("ExpenderNoodles")
   const roll_expender = engine.getEntityOrNullByName("ExpenderRolls")
-
   const noodles_button = engine.getEntityOrNullByName("Noodle Button")
   const roll_button = engine.getEntityOrNullByName("Roll Button")
 
+  // TODO: HANDLE IDS FOR MULTIPLAYER MODE
+
+  if (noodles_expender && roll_expender && noodles_button && roll_button) {
+    const noodles_button_events = getTriggerEvents(noodles_button)
+    noodles_button_events.on(TriggerType.ON_CLICK, () => {
+      console.log("BUTTON WAS PRESSED!!")
+      const startPosition = Vector3.add(Transform.get(noodles_expender).position, Vector3.create(0, 0.7, 0))
+      createIngredient(IngredientType.Noodles, startPosition, true)
+
+    })
+
+    const roll_button_events = getTriggerEvents(roll_button)
+    roll_button_events.on(TriggerType.ON_CLICK, () => {
+      console.log("BUTTON WAS PRESSED!!")
+      const startPosition = Vector3.add(Transform.get(roll_expender).position, Vector3.create(0, 0.7, 0))
+      createIngredient(IngredientType.SushiRoll, startPosition, true)
+
+    })
+
+  }
+
+
+
+
+
+
   // Pots
   const pot1 = engine.getEntityOrNullByName("Pot1")
   const pot2 = engine.getEntityOrNullByName("Pot2")
@@ -143,7 +169,7 @@ export function main() {
   }
 
 
-
+  // FOR TESTING
   createIngredient(IngredientType.Noodles, Vector3.create(4.4, 0.8, 1.5))
   createIngredient(IngredientType.SushiRoll, Vector3.create(6.4, 0.8, 1.5))
   createIngredient(IngredientType.SlicedSushi, Vector3.create(8.4, 0.8, 1.5))

diff --git a/src/modules/factory.ts b/src/modules/factory.ts
@@ -11,7 +11,9 @@ import {
   MeshRenderer,
   AudioSource,
   ColliderLayer,
-  pointerEventsSystem
+  pointerEventsSystem,
+  Tween,
+  EasingFunction
 } from '@dcl/sdk/ecs'
 import { Vector3, Quaternion } from '@dcl/sdk/math'
 import { BeerGlass, BeerType, CuttingBoard, getTapData, GrabableObjectComponent, IngredientType, SyncEntityIDs, TapBase, TapComponent } from '../definitions'
@@ -55,7 +57,7 @@ export function instanceBeer(entity: Entity, id: SyncEntityIDs) {
 // INGREDIENT
 
 
-export function createIngredient(ingredient: IngredientType, position: Vector3) {
+export function createIngredient(ingredient: IngredientType, position: Vector3, fall?: boolean) {
   const entity = engine.addEntity()
 
   let model = ""
@@ -101,11 +103,25 @@ export function createIngredient(ingredient: IngredientType, position: Vector3)
     ]
   })
 
-  // syncEntity(
-  //   entity,
-  //   [AudioSource.componentId, Transform.componentId, GrabableObjectComponent.componentId],
-  //   id
-  // )
+  if (fall) {
+    Tween.create(entity, {
+      mode: Tween.Mode.Move({
+        start: position,
+        end: Vector3.add(position, Vector3.create(0, -0.7, 0)),
+      }),
+      duration: 1000,
+      easingFunction: EasingFunction.EF_LINEAR
+    })
+  }
+
+  syncEntity(
+    entity,
+    [AudioSource.componentId, Transform.componentId, GrabableObjectComponent.componentId, Tween.componentId],
+    //  id
+  )
+  // TODO: HANDLE IDS FOR MULTIPLAYER
+
+  return ingredient
 
 }
 
@@ -204,7 +220,8 @@ export function createCuttingBoard(position: Vector3, id: SyncEntityIDs) {
 
   const CutterParent = engine.addEntity()
   Transform.create(CutterParent, {
-    position: position
+    position: position,
+    rotation: Quaternion.fromEulerDegrees(0, 0, 0)
   })
 
   syncEntity(CutterParent, [], id + 100)

diff --git a/src/modules/pickAndDrop.ts b/src/modules/pickAndDrop.ts
@@ -38,15 +38,15 @@ export function pickingGlassSystem() {
         //   parent: hitParentEntity
         // })
         console.log("DROPPED ON TAP")
-        removeParent(pickedUpChild)
+        //removeParent(pickedUpChild)
         parentEntity(pickedUpChild, hitParentEntity)
         drop = true
       } else if (hitParentEntity && CuttingBoard.has(hitParentEntity)) {
         //If cutting board
         console.log("DROPPED ON CUTTING BOARD")
         const board = CuttingBoard.getMutable(hitParentEntity)
         if (!board || !board.hasRoll || !board.modelEntity) {
-          removeParent(pickedUpChild)
+          //removeParent(pickedUpChild)
           parentEntity(pickedUpChild, hitParentEntity)
           drop = true
 
@@ -63,7 +63,7 @@ export function pickingGlassSystem() {
         console.log("DROPPED ON POT")
         const pot = PotData.getMutable(hitEntity)
         if (pot && !pot.hasIngredient) {
-          removeParent(pickedUpChild)
+          //removeParent(pickedUpChild)
           parentEntity(pickedUpChild, hitEntity)
           pot.hasIngredient = true
           pot.attachedEntity = pickedUpChild

diff --git a/src/modules/pot.ts b/src/modules/pot.ts
@@ -44,6 +44,7 @@ export function pickFood(pot: Entity) {
   const potData = PotData.getMutable(pot)
   if (potData && potData.hasIngredient && potData.attachedEntity !== undefined) {
 
+    console.log("PICKING UP FROM POT")
     pickUpItem(potData.attachedEntity)
     potData.hasIngredient = false
     //potData.attachedEntity = undefined