Mesh loader refactor
This commit is contained in:
@@ -1,153 +1,7 @@
|
||||
MeshBuilder = class("MeshBuilder")
|
||||
|
||||
function MeshBuilder:initialize(modelPlaceholder, bundleSize, sendDelay)
|
||||
self.modelPlaceholder = modelPlaceholder or "models/holograms/cube.mdl"
|
||||
self.bundleSize = bundleSize or 10
|
||||
self.sendDelay = sendDelay or 0.5
|
||||
|
||||
self._objects = {}
|
||||
self._setups = {}
|
||||
|
||||
if CLIENT then
|
||||
self._setups = {}
|
||||
self._meshData = {}
|
||||
|
||||
net.receive("holograms", function(len)
|
||||
local hasNext = net.readBit()
|
||||
|
||||
while hasNext == 1 do
|
||||
local key = net.readString()
|
||||
|
||||
net.readEntity(function(ent)
|
||||
if not self._objects[key] then
|
||||
local holo = ent:toHologram()
|
||||
|
||||
if self._meshData[key] then
|
||||
holo:setMesh(self._meshData[key])
|
||||
holo:setRenderBounds(Vector(-200), Vector(200))
|
||||
end
|
||||
|
||||
self._objects[key] = holo
|
||||
end
|
||||
end)
|
||||
|
||||
hasNext = net.readBit()
|
||||
end
|
||||
end)
|
||||
else
|
||||
net.receive("setups", function(len, ply)
|
||||
local hasNext = net.readBit()
|
||||
|
||||
while hasNext == 1 do
|
||||
local key = net.readString()
|
||||
local pos = net.readVector()
|
||||
local ang = net.readAngle()
|
||||
local scale = net.readVector()
|
||||
local color = net.readColor()
|
||||
local mat = net.readString()
|
||||
local parent = net.readEntity()
|
||||
local relativeTo = net.readEntity()
|
||||
|
||||
if not self._objects[key] then
|
||||
if isValid(relativeTo) then
|
||||
pos = relativeTo:localToWorld(pos)
|
||||
ang = relativeTo:localToWorldAngles(ang)
|
||||
end
|
||||
|
||||
local holo = holograms.create(pos, ang, self.modelPlaceholder, scale)
|
||||
holo:setColor(color)
|
||||
holo:setMaterial(mat)
|
||||
holo:setParent(parent)
|
||||
|
||||
self._objects[key] = holo
|
||||
end
|
||||
|
||||
if not self._setups[key] then
|
||||
self._setups[key] = self._objects[key]
|
||||
end
|
||||
|
||||
hasNext = net.readBit()
|
||||
end
|
||||
|
||||
net.start("holograms")
|
||||
for k, v in pairs(self._setups) do
|
||||
net.writeBit(1)
|
||||
net.writeString(k)
|
||||
net.writeEntity(v)
|
||||
end
|
||||
net.writeBit(0)
|
||||
net.send(ply)
|
||||
|
||||
table.empty(self._setups)
|
||||
end)
|
||||
end
|
||||
-- @include sv_builder.txt
|
||||
-- @include cl_builder.txt
|
||||
if SERVER then
|
||||
require("sv_builder.txt")
|
||||
else
|
||||
require("cl_builder.txt")
|
||||
end
|
||||
|
||||
if CLIENT then
|
||||
function MeshBuilder:setMeshData(meshData)
|
||||
self._meshData = meshData
|
||||
end
|
||||
|
||||
function MeshBuilder:setup(key, pos, ang, scale, color, mat, parent, relativeTo)
|
||||
if not self._objects[key] and not self._setups[key] and self._meshData[key] then
|
||||
self._setups[key] = {
|
||||
pos = pos,
|
||||
ang = ang,
|
||||
scale = scale,
|
||||
color = color,
|
||||
mat = mat,
|
||||
parent = isValid(parent) and parent or chip(),
|
||||
relativeTo = isValid(relativeTo) and relativeTo or chip()
|
||||
}
|
||||
end
|
||||
end
|
||||
|
||||
function MeshBuilder:setupAll(pos, ang, scale, color, mat, parent, relativeTo)
|
||||
for _, v in pairs(table.getKeys(self._meshData)) do
|
||||
self:setup(v, pos, ang, scale, color, mat, parent)
|
||||
end
|
||||
end
|
||||
|
||||
function MeshBuilder:build()
|
||||
local function sendSetups(setups)
|
||||
net.start("setups")
|
||||
for k, v in pairs(setups) do
|
||||
net.writeBit(1)
|
||||
net.writeString(k)
|
||||
net.writeVector(v.pos)
|
||||
net.writeAngle(v.ang)
|
||||
net.writeVector(v.scale)
|
||||
net.writeColor(v.color)
|
||||
net.writeString(v.mat)
|
||||
net.writeEntity(v.parent)
|
||||
net.writeEntity(v.relativeTo)
|
||||
end
|
||||
net.writeBit(0)
|
||||
net.send()
|
||||
end
|
||||
|
||||
local bundleKeys = table.getKeys(self._setups)
|
||||
if #bundleKeys > self.bundleSize then
|
||||
local i = 1
|
||||
|
||||
timer.create("sendSetups", self.sendDelay, math.ceil(#bundleKeys / self.bundleSize), function()
|
||||
local from = (i - 1) * self.bundleSize + 1
|
||||
local setups = {}
|
||||
|
||||
for _, v in pairs({ unpack(bundleKeys, from, from + self.bundleSize - 1) }) do
|
||||
setups[v] = self._setups[v]
|
||||
end
|
||||
|
||||
sendSetups(setups)
|
||||
|
||||
if i < math.ceil(#bundleKeys / self.bundleSize) then
|
||||
i = i + 1
|
||||
else
|
||||
table.empty(self._setups)
|
||||
end
|
||||
end)
|
||||
else
|
||||
sendSetups(self._setups)
|
||||
end
|
||||
end
|
||||
end
|
||||
51
koptilnya/mesh_loader/cl_builder.txt
Normal file
51
koptilnya/mesh_loader/cl_builder.txt
Normal file
@@ -0,0 +1,51 @@
|
||||
-- @client
|
||||
-- @include /koptilnya/libs/table.txt
|
||||
-- @include obj_parser.txt
|
||||
require("/koptilnya/libs/table.txt")
|
||||
require("obj_parser.txt")
|
||||
|
||||
MeshBuilder = class("MeshBuilder")
|
||||
|
||||
function MeshBuilder:initialize(link)
|
||||
self.link = link
|
||||
self.meshData = {}
|
||||
|
||||
self._objects = {}
|
||||
self._parser = ObjParser:new(link)
|
||||
self._parser.onLoaded = function(parser, objData, meshData, usedTriangles)
|
||||
self.meshData = meshData
|
||||
|
||||
self:_applyMeshes()
|
||||
end
|
||||
|
||||
net.receive("holograms", function()
|
||||
local hasNext = net.readBit()
|
||||
|
||||
while hasNext == 1 do
|
||||
local name = net.readString()
|
||||
|
||||
net.readEntity(function(ent)
|
||||
local holo = ent:toHologram()
|
||||
|
||||
table.insert(self._objects, {name = name, holo = holo})
|
||||
end)
|
||||
|
||||
hasNext = net.readBit()
|
||||
end
|
||||
|
||||
self:onHologramsReceived(self._objects)
|
||||
self:_applyMeshes()
|
||||
end)
|
||||
end
|
||||
|
||||
function MeshBuilder:_applyMeshes()
|
||||
for _, v in pairs(self._objects) do
|
||||
if self.meshData[v.name] ~= nil then
|
||||
v.holo:setMesh(self.meshData[v.name])
|
||||
v.holo:setRenderBounds(Vector(-200), Vector(200))
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
function MeshBuilder:onHologramsReceived(objects)
|
||||
end
|
||||
38
koptilnya/mesh_loader/obj_parser.txt
Normal file
38
koptilnya/mesh_loader/obj_parser.txt
Normal file
@@ -0,0 +1,38 @@
|
||||
-- @client
|
||||
ObjParser = class("ObjParser")
|
||||
|
||||
local initialChipName = chip():getChipName()
|
||||
local function setStatus(status)
|
||||
setName(string.format("%s (%s)", initialChipName, status))
|
||||
end
|
||||
|
||||
function ObjParser:initialize(link, maxQuota)
|
||||
self.maxQuota = maxQuota or 0.75
|
||||
|
||||
local triangles = mesh.trianglesLeft()
|
||||
|
||||
setStatus("Getting file...")
|
||||
http.get(link, function(objData)
|
||||
local loadMesh = coroutine.wrap(function()
|
||||
self.meshData = mesh.createFromObj(objData, true, true)
|
||||
|
||||
return true
|
||||
end)
|
||||
|
||||
setStatus("File received, start parsing...")
|
||||
hook.add("think", "loadingMesh", function()
|
||||
while quotaAverage() < quotaMax() * self.maxQuota do
|
||||
if loadMesh() then
|
||||
setName(initialChipName)
|
||||
self:onLoaded(objData, self.meshData, triangles - mesh.trianglesLeft())
|
||||
hook.remove("think", "loadingMesh")
|
||||
|
||||
return
|
||||
end
|
||||
end
|
||||
end)
|
||||
end)
|
||||
end
|
||||
|
||||
function ObjParser:onLoaded(objData, meshData, usedTriangles)
|
||||
end
|
||||
@@ -1,40 +0,0 @@
|
||||
Parser = class("Parser")
|
||||
|
||||
local initialChipName = chip():getChipName()
|
||||
local function setStatus(status)
|
||||
setName(string.format("%s (%s)", initialChipName, status))
|
||||
end
|
||||
|
||||
function Parser:initialize(link, maxQuota)
|
||||
if CLIENT then
|
||||
local triangles = mesh.trianglesLeft()
|
||||
local createFromObjCoroutine = coroutine.create(function(objData)
|
||||
self:OnLoaded(objData, mesh.createFromObj(objData, true))
|
||||
end)
|
||||
|
||||
setStatus("Getting file...")
|
||||
http.get(link, function(objData)
|
||||
local loadMesh = coroutine.wrap(function()
|
||||
self.meshData = mesh.createFromObj(objData, true)
|
||||
|
||||
return true
|
||||
end)
|
||||
|
||||
setStatus("File received, start parsing...")
|
||||
hook.add("think", "loadingMesh", function()
|
||||
while quotaAverage() < quotaMax() * (maxQuota or 0.75) do
|
||||
if loadMesh() then
|
||||
setName(initialChipName)
|
||||
self:onLoaded(objData, self.meshData, triangles - mesh.trianglesLeft())
|
||||
hook.remove("think", "loadingMesh")
|
||||
|
||||
return
|
||||
end
|
||||
end
|
||||
end)
|
||||
end)
|
||||
end
|
||||
end
|
||||
|
||||
function Parser:onLoaded(objData, meshData, usedTriangles)
|
||||
end
|
||||
76
koptilnya/mesh_loader/sv_builder.txt
Normal file
76
koptilnya/mesh_loader/sv_builder.txt
Normal file
@@ -0,0 +1,76 @@
|
||||
-- @server
|
||||
MeshBuilder = class("MeshBuilder")
|
||||
|
||||
function MeshBuilder:initialize(link, modelPlaceholder)
|
||||
self.link = link
|
||||
self.modelPlaceholder = modelPlaceholder or "models/holograms/cube.mdl"
|
||||
self.isReady = false
|
||||
|
||||
self._objectsNames = {}
|
||||
self._objects = {}
|
||||
|
||||
http.get(link, function(response)
|
||||
for object in string.gmatch(response, "^?\n?o%s([%w_%.%-]+)") do
|
||||
table.insert(self._objectsNames, object)
|
||||
end
|
||||
|
||||
self.isReady = true
|
||||
self:onReady(self._objectsNames)
|
||||
self:_sendHolograms()
|
||||
end)
|
||||
|
||||
hook.add("ClientInitialized", "MeshBuilder_ClientInitialized", function(ply)
|
||||
if self.isReady then
|
||||
self:_sendHolograms(ply)
|
||||
end
|
||||
end)
|
||||
end
|
||||
|
||||
function MeshBuilder:_sendHolograms(ply)
|
||||
if #self._objects == 0 then
|
||||
return
|
||||
end
|
||||
|
||||
net.start("holograms")
|
||||
for _, v in pairs(self._objects) do
|
||||
net.writeBit(1)
|
||||
net.writeString(v.name)
|
||||
net.writeEntity(v.holo)
|
||||
end
|
||||
net.writeBit(0)
|
||||
net.send(ply)
|
||||
end
|
||||
|
||||
function MeshBuilder:onReady(objectsNames)
|
||||
end
|
||||
|
||||
function MeshBuilder:build(name, pos, ang, scale, color, mat, parent, relativeTo)
|
||||
if not self.isReady then
|
||||
throw("Call build methods when builder is ready!")
|
||||
end
|
||||
|
||||
if isValid(relativeTo) then
|
||||
pos = relativeTo:localToWorld(pos)
|
||||
ang = relativeTo:localToWorldAngles(ang)
|
||||
end
|
||||
|
||||
local holo = holograms.create(pos, ang, self.modelPlaceholder, scale)
|
||||
holo:setColor(color)
|
||||
holo:setMaterial(mat)
|
||||
|
||||
if isValid(parent) then
|
||||
holo:setParent(parent)
|
||||
end
|
||||
|
||||
table.insert(self._objects, {name = name, holo = holo})
|
||||
end
|
||||
|
||||
function MeshBuilder:buildAll(pos, ang, scale, color, mat, parent, relativeTo)
|
||||
if not self.isReady then
|
||||
throw("Call build methods when builder is ready!")
|
||||
end
|
||||
|
||||
for _, v in pairs(self._objectsNames) do
|
||||
self:build(v, pos, ang, scale, color, mat, parent, relativeTo)
|
||||
end
|
||||
end
|
||||
Reference in New Issue
Block a user