cleanup

ChaoticLeah · Dec 27, 2023 · 3fe7978 · 3fe7978
1 parent 07d98fb
commit 3fe7978
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/scripts/Objects/Components/rigidbodyComponent.js b/scripts/Objects/Components/rigidbodyComponent.js
@@ -8,9 +8,8 @@ export class RigidbodyComponent extends Component {
   onGround = false
   touchingLeftWall = false
   touchingRightWall = false
-  constructor(parentObject, color) {
-    if (typeof color != "object") color = { color: color };
-    super(parentObject, color);
+  constructor(parentObject, data) {
+    super(parentObject, data);
     this.objectPropertyTypes = {
         velocityX: propertyTypes.NUMBER_INPUT,
         velocityY: propertyTypes.NUMBER_INPUT,
@@ -22,7 +21,7 @@ export class RigidbodyComponent extends Component {
     };
   }
 
-  init(parentObject, color = "#ff0000") {
+  init(parentObject) {
     this.parentObject = parentObject;
     this.properties = { velocityX: 0, velocityY: 0, applyGravity: true, shouldCollide:false, mass: 1, damping: 0.98, terminalVelocity: 10 };
   }
@@ -72,9 +71,6 @@ export class RigidbodyComponent extends Component {
     if(this.onGround){
         if(this.properties.velocityY > 0)
             this.properties.velocityY = 0
-            // this.parentObject.incrementY(-0.1);
-            //this.parentObject.setY(collidingObject.object.getYWithoutEditorOffsetScreenCoords() - (this.parentObject.getHWithoutEditorOffsetScreenCoords()))
-            //console.log(collidingObject.object)
     }
 
     if(this.touchingLeftWall && this.properties.velocityX < 0)

diff --git a/scripts/Objects/ObjectManager.js b/scripts/Objects/ObjectManager.js
@@ -58,6 +58,7 @@ export function addObject(object, parentObjectId) {
     }
     object.getProperties().parentObjectId = parentObjectId.toString();
     const parentIsDefined = getObject(parentObjectId) != undefined
+    //This happens when loading in a project since the loading will already come with children data
     const alreadyHasChild = parentIsDefined && getObject(parentObjectId).hasChild(object.getProperties().id)
     if (parentObjectId != "none" && parentIsDefined && !alreadyHasChild)
       getObject(parentObjectId).addChild(object.getProperties().id);