Changeset 0c6b92a for imaps-frontend/src/scripts/util/Factory.js

Timestamp:

12/12/24 17:06:06 (5 weeks ago)

Author:

stefan toskovski <stefantoska84@…>

Branches:

main

Parents:

d565449

Message:

Pred finalna verzija

File:

• imaps-frontend/src/scripts/util/Factory.js (modified) (2 diffs)

imaps-frontend/src/scripts/util/Factory.js

@@ -6 +6 @@
 import RenderedEntrance from "../rendered_shapes/RenderedEntrance";
 import RenderedWall from "../rendered_shapes/RenderedWall.js";
+import Stairs from "../shapes/Stairs.js";
+import RenderedStairs from "../rendered_shapes/RenderedStairs.js";
+import {updateShapeCount, getShapeCount} from "./ShapeCount.js";
 export default class Factory {
+  // BUG KO KE NAPRES REFRESH SA RESETVAT COUNTS!
 
-  static infoPinCount = 0;
-  static wallCount = 0;
-  static entranceCount = 0;
-  static roomCount = 0;
+  static createShape(shapeType,attrs) {
+    console.log(attrs,"attrs in factory")
+    console.log("position in factory: " + attrs.position.x)
 
-  static createShape(shapeType, position, blockSize, layer, rotation,scaleX = 1, scaleY = 1, increment = false) {
+    let scaleX = (attrs.scaleX ? parseFloat(attrs.scaleX) : 1);
+    let scaleY =  (attrs.scaleY ? parseFloat(attrs.scaleY) : 1);
+
+    attrs.scaleX = scaleX;
+    attrs.scaleY = scaleY;
+
     switch (shapeType) {
       case "Entrance":
-        if(increment) this.entranceCount++;
-        return new Entrance(position, blockSize, layer, rotation,true,this.entranceCount,scaleX,scaleY);
+        if(attrs.increment) updateShapeCount("entrance")
+        return new Entrance(attrs,getShapeCount("entrance"));
       case "Room":
-        if(increment) this.roomCount++;
-        return new Room(position, blockSize, layer, rotation,true, this.roomCount,scaleX,scaleY);
-      case "Wall":
-        return new Wall(position, blockSize, layer, rotation,true,scaleX,scaleY);
-      case "InfoPin":
-        if(increment) this.infoPinCount++;
-        return new InfoPin(position, blockSize, layer, false,this.infoPinCount);
+        if(attrs.increment) updateShapeCount("room");
+        return new Room(attrs,getShapeCount("room"));
+       case "Wall":
+         return new Wall(attrs);
+       case "InfoPin":
+        if(attrs.increment) updateShapeCount("infoPin")
+          return new InfoPin(attrs,getShapeCount("infoPin"));
+      case "Stairs":
+        if(attrs.increment) updateShapeCount("stairs")
+        return new Stairs(attrs,getShapeCount("stairs"))
       default:
         throw new Error("Invalid shape type: " + shapeType);
@@ -41 +52 @@
       case "Wall":
         return new RenderedWall(attrs,scaleX,scaleY);
+      case "Stairs":
+        return new RenderedStairs(attrs,scaleX,scaleY)
       default:
         throw new Error("Invalid shape type." + shapeType);