Cleaning

koptilnya/mesh_loader/cl_builder.txt

@@ -6,20 +6,29 @@ require("obj_parser.txt")
 
 MeshBuilder = class("MeshBuilder")
 
-function MeshBuilder:initialize(link, maxQuota)
+function MeshBuilder:initialize(link)
     self.link = link
     self.meshData = {}
 
     self._objects = {}
-    self._parser = ObjParser:new(link, maxQuota)
-    self._parser.onLoaded = function(parser, objData, meshData, usedTriangles)
+    self._parser = ObjParser:new(link)
+    self._parser.onLoaded = function(parser, objData)
+        self:onObjLoaded(objData)
+    end
+    self._parser.onParsed = function(parser, meshData, usedTriangles)
+        net.start("obj_parsed")
+        net.send()
+
+        self:onObjParsed(meshData, usedTriangles)
+
         self.meshData = meshData
 
-        net.start("ready")
-        net.send()
+        self:_applyMeshes()
     end
 
-    net.receive("holograms", function()
+    net.receive("objects", function()
+        self._objects = {}
+
         local hasNext = net.readBit()
 
         while hasNext == 1 do
@@ -27,17 +36,17 @@ function MeshBuilder:initialize(link, maxQuota)
 
             net.readEntity(function(ent)
                 local holo = ent:toHologram()
+                local object = {name = name, holo = holo}
 
-                table.insert(self._objects, {name = name, holo = holo})
+                table.insert(self._objects, object)
             end)
 
             hasNext = net.readBit()
         end
-        
-        self:_applyMeshes()
-        
-        timer.simple(0, function()
+
+        timer.simple(0.5, function()
             self:onHologramsReceived(self._objects)
+            self:_applyMeshes()
         end)
     end)
 end
@@ -47,9 +56,25 @@ function MeshBuilder:_applyMeshes()
         if self.meshData[v.name] ~= nil then
             v.holo:setMesh(self.meshData[v.name])
             v.holo:setRenderBounds(Vector(-200), Vector(200))
+            v.meshApplied = true
         end
     end
+
+    if #self._objects > 0 then
+        self:onMeshesApplied()
+    end
+end
+
+-- STUB
+
+function MeshBuilder:onObjLoaded(objData)
+end
+
+function MeshBuilder:onObjParsed(meshData, usedTriangles)
 end
 
 function MeshBuilder:onHologramsReceived(objects)
 end
+
+function MeshBuilder:onMeshesApplied()
+end