chore: improve ids, and some print tidy up

georgejecook · Aug 5, 2021 · 6283bc3 · 6283bc3
1 parent 9d2fb25
commit 6283bc3
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 11 deletions.
diff --git a/src/source/core/AssetBundle.bs b/src/source/core/AssetBundle.bs
@@ -19,7 +19,7 @@ namespace mc
         '// cspell:disable-next-line
         if not fs.exists("cachefs:/" + filename)
           '// cspell:disable-next-line
-          ? "assetKey " ; assetKey ; " is not in cachefs"
+          ' ? "assetKey " ; assetKey ; " is not in cachefs"
           missingAssets[assetKey] = m.json.files[assetKey]
         end if
       end for
@@ -53,7 +53,7 @@ namespace mc
         end if
         ba = createObject("roByteArray")
         ba.fromBase64String(assetData[assetKey])
-        ? "writing to : " + "cachefs:/" + filename
+        ' ? "writing to : " + "cachefs:/" + filename
         ba.writeFile("cachefs:/" + filename)
       end for
     end function

diff --git a/src/source/core/ComponentPool.bs b/src/source/core/ComponentPool.bs
@@ -60,7 +60,7 @@ namespace mc
       for i = 0 to number
         component = createObject("roSGNode", componentType)
         if component <> invalid
-          component.id = str(pool.numberOfComponentsInPool).trim()
+          component.id = rnd(2147483647).toStr()
           component.isPrebaked = true
           pool.numberOfComponentsInPool++
           pool.freeComponentsById[component.id] = component
@@ -77,6 +77,7 @@ namespace mc
       pool = m.getComponentPool(componentType)
 
       if pool.freeComponentsById.count() = 0
+        ' ? ">>>> RAN OUT OF " ; componentType
         m.log.warn("ran out of components getting type :", componentType)
 
         if m.isCreateMoreEnabled
@@ -121,12 +122,12 @@ namespace mc
 
     function releaseComponent(component as mc.types.node)
       if component <> invalid
-        ' ? "releasing component "; component.id
-        pool = m.getComponentPool(component.subType())
-        pool.usedComponentsById.delete(component.id)
+        ' ? ">>>>releasing component "; mc.dv(component)
         if component.getParent() <> invalid
           component.getParent().removeChild(component)
         end if
+        pool = m.getComponentPool(component.subType())
+        pool.usedComponentsById.delete(component.id)
         pool.freeComponentsById[component.id] = component
         m.numberOfComponentsInUse--
       end if
@@ -146,7 +147,7 @@ namespace mc
       pool = m.getComponentPool(componentType)
       component = createObject("roSGNode", componentType)
       if component <> invalid
-        component.id = str(pool.numberOfComponentsInPool).trim()
+        component.id = rnd(2147483647).toStr()
         pool.allComponents.push(component)
         pool.freeComponentsById[component.id] = component
       else

diff --git a/src/source/core/Map.bs b/src/source/core/Map.bs
@@ -49,7 +49,7 @@ namespace mc.collections
     end function
 
     private function onDebugChange(value as dynamic)
-      ? "dumping contents"
+      ' ? "dumping contents"
       m.top.__contents = m.data
     end function
   end class

diff --git a/src/source/core/Tasks.bs b/src/source/core/Tasks.bs
@@ -142,10 +142,10 @@ namespace mc.tasks
     context.node = node
 
     if node._oid = invalid
-      node.addFields({ "_oid": StrI(rnd(2147483647)).trim() })
+      node.addFields({ "_oid": rnd(2147483647).toStr() })
     end if
     if scope._oid = invalid
-      mc.setOrAddNodeField(scope, "_oid", StrI(rnd(2147483647)).trim())
+      mc.setOrAddNodeField(scope, "_oid", rnd(2147483647).toStr())
     end if
 
     context.key = mc.tasks._getContextKey(node, fieldName, callback, targetField, context.instance)

diff --git a/src/source/core/Utils.bs b/src/source/core/Utils.bs
@@ -346,7 +346,7 @@ namespace mc
 
     if node <> invalid
       if id = invalid
-        id = StrI(rnd(2147483647)).trim()
+        id = rnd(2147483647).toStr()
       end if
 
       node.id = id