diff --git a/src/app/babylon/controller/config-manager.ts b/src/app/babylon/controller/config-manager.ts index 1814886..1db46f5 100644 --- a/src/app/babylon/controller/config-manager.ts +++ b/src/app/babylon/controller/config-manager.ts @@ -135,8 +135,8 @@ export class ConfigManager { [MarkType.SNH, "火(小)"], [MarkType.YWA, "烟雾(大)"], [MarkType.YWB, "烟雾(小)"], - [MarkType.MHF, "消防员"], - [MarkType.PMC, "泡沫车"], + [MarkType.XFY, "消防员"], + [MarkType.XFC, "消防车"], [MarkType.GA, "公安"], [MarkType.JJ, "交警"], [MarkType.YS, "医生"], diff --git a/src/app/babylon/controller/inputController.ts b/src/app/babylon/controller/inputController.ts index 2811549..a922e1f 100644 --- a/src/app/babylon/controller/inputController.ts +++ b/src/app/babylon/controller/inputController.ts @@ -309,7 +309,7 @@ export class InputController { } // 是消防员 public IsFiremen(): boolean { - return this.markType == MarkType.MHF + return this.markType == MarkType.XFY // || this.markType == MarkType.JYF // || this.markType == MarkType.GRF // || this.markType == MarkType.FHF @@ -319,7 +319,7 @@ export class InputController { } // 是消防车 public IsFireTruck(): boolean { - return this.markType == MarkType.PMC + return this.markType == MarkType.XFC // || this.markType == MarkType.SGC // || this.markType == MarkType.GCGSC ; diff --git a/src/app/babylon/model/data/mark/all-mark-data.ts b/src/app/babylon/model/data/mark/all-mark-data.ts index a7999d2..2c14be3 100644 --- a/src/app/babylon/model/data/mark/all-mark-data.ts +++ b/src/app/babylon/model/data/mark/all-mark-data.ts @@ -55,8 +55,8 @@ export class AllMarkData { //外部力量 tagPos = MarkTagPos.Outside; - AllMarkData.newMarkData(MarkType.PMC, MarkKindType.Car, tagPos, result); - AllMarkData.newMarkData(MarkType.MHF, MarkKindType.Persion, tagPos, result); + AllMarkData.newMarkData(MarkType.XFC, MarkKindType.Car, tagPos, result); + AllMarkData.newMarkData(MarkType.XFY, MarkKindType.Persion, tagPos, result); AllMarkData.newMarkData(MarkType.JC, MarkKindType.Car, tagPos, result); AllMarkData.newMarkData(MarkType.JJ, MarkKindType.Persion, tagPos, result); AllMarkData.newMarkData(MarkType.GA, MarkKindType.Persion, tagPos, result); diff --git a/src/app/babylon/model/data/mark/mark-data.ts b/src/app/babylon/model/data/mark/mark-data.ts index bd45425..e263145 100644 --- a/src/app/babylon/model/data/mark/mark-data.ts +++ b/src/app/babylon/model/data/mark/mark-data.ts @@ -200,14 +200,14 @@ export enum MarkType { //==================外部力量================ /** - * 灭火服 + * 消防员 */ - MHF = "MHF", + XFY = "XFY", /** - * 泡沫车 + * 消防车 */ - PMC = "PMC", + XFC = "XFC", /** diff --git a/src/app/babylon/model/info/mark/model-info-mark.ts b/src/app/babylon/model/info/mark/model-info-mark.ts index 8af606f..16d1592 100644 --- a/src/app/babylon/model/info/mark/model-info-mark.ts +++ b/src/app/babylon/model/info/mark/model-info-mark.ts @@ -211,8 +211,9 @@ export class ModelInfo_mark extends ModelInfo { //this.pointerDragBehavior.enabled = true; } - //特效类,要出现坐标轴 - if (this.markData.markKindType == MarkKindType.Effect) { + //特效类、灭火器类,要出现坐标轴 + if (this.markData.markKindType == MarkKindType.Effect + || TsTool.stringContain(this.markData.type, "MHQ")) { GizmoTool.onPickMeshInfoObservable.notifyObservers(this); } else { @@ -386,7 +387,7 @@ export class ModelInfo_mark extends ModelInfo { canSprinkling() { let result = false; switch (this.markData.type) { - case MarkType.MHF: + case MarkType.XFY: result = true; //五种消防员 if (this.node_pt == null && this.models != null) { @@ -400,7 +401,7 @@ export class ModelInfo_mark extends ModelInfo { } break; - case MarkType.PMC: + case MarkType.XFC: //五种消防车 result = true; @@ -459,7 +460,7 @@ export class ModelInfo_mark extends ModelInfo { return; } switch (this.markData.type) { - case MarkType.MHF: + case MarkType.XFY: //消防员,显隐喷枪 if (this.node_pt != null) { diff --git a/src/assets/images/mark/inside/gfmhq.png b/src/assets/images/mark/inside/gfmhq.png index e564828..7b64a73 100644 Binary files a/src/assets/images/mark/inside/gfmhq.png and b/src/assets/images/mark/inside/gfmhq.png differ diff --git a/src/assets/images/mark/inside/ptmhq.png b/src/assets/images/mark/inside/ptmhq.png index e564828..eb9dd05 100644 Binary files a/src/assets/images/mark/inside/ptmhq.png and b/src/assets/images/mark/inside/ptmhq.png differ diff --git a/src/assets/images/mark/inside/stcmhq.png b/src/assets/images/mark/inside/stcmhq.png new file mode 100644 index 0000000..fbd2b78 Binary files /dev/null and b/src/assets/images/mark/inside/stcmhq.png differ diff --git a/src/assets/images/mark/inside/tcmhq.png b/src/assets/images/mark/inside/tcmhq.png deleted file mode 100644 index e564828..0000000 Binary files a/src/assets/images/mark/inside/tcmhq.png and /dev/null differ diff --git a/src/assets/images/mark/outside/pmc.png b/src/assets/images/mark/outside/xfc.png similarity index 100% rename from src/assets/images/mark/outside/pmc.png rename to src/assets/images/mark/outside/xfc.png diff --git a/src/assets/images/mark/outside/mhf.png b/src/assets/images/mark/outside/xfy.png similarity index 100% rename from src/assets/images/mark/outside/mhf.png rename to src/assets/images/mark/outside/xfy.png diff --git a/src/assets/mesh/mark/outside/mhf/Boots_AlbedoTransparency.jpg b/src/assets/mesh/mark/outside/mhf/Boots_AlbedoTransparency.jpg deleted file mode 100644 index a615c54..0000000 Binary files a/src/assets/mesh/mark/outside/mhf/Boots_AlbedoTransparency.jpg and /dev/null differ diff --git a/src/assets/mesh/mark/outside/mhf/BunkerClothing_AlbedoTransparency.png b/src/assets/mesh/mark/outside/mhf/BunkerClothing_AlbedoTransparency.png deleted file mode 100644 index 6638094..0000000 Binary files a/src/assets/mesh/mark/outside/mhf/BunkerClothing_AlbedoTransparency.png and /dev/null differ diff --git a/src/assets/mesh/mark/outside/mhf/Head_AlbedoTransparency.jpg b/src/assets/mesh/mark/outside/mhf/Head_AlbedoTransparency.jpg deleted file mode 100644 index 9766899..0000000 Binary files a/src/assets/mesh/mark/outside/mhf/Head_AlbedoTransparency.jpg and /dev/null differ diff --git a/src/assets/mesh/mark/outside/mhf/Helmet_AlbedoTransparency.jpg b/src/assets/mesh/mark/outside/mhf/Helmet_AlbedoTransparency.jpg deleted file mode 100644 index 1c9ae7a..0000000 Binary files a/src/assets/mesh/mark/outside/mhf/Helmet_AlbedoTransparency.jpg and /dev/null differ diff --git a/src/assets/mesh/mark/outside/mhf/MHF.bin b/src/assets/mesh/mark/outside/mhf/MHF.bin deleted file mode 100644 index 802e978..0000000 Binary files a/src/assets/mesh/mark/outside/mhf/MHF.bin and /dev/null differ diff --git a/src/assets/mesh/mark/outside/mhf/MHF.gltf b/src/assets/mesh/mark/outside/mhf/MHF.gltf deleted file mode 100644 index f0c9e90..0000000 --- a/src/assets/mesh/mark/outside/mhf/MHF.gltf +++ /dev/null @@ -1,668 +0,0 @@ -{ - "asset" : { - "generator" : "Khronos glTF Blender I/O v1.6.16", - "version" : "2.0" - }, - "extensionsUsed" : [ - "KHR_draco_mesh_compression" - ], - "extensionsRequired" : [ - "KHR_draco_mesh_compression" - ], - "scene" : 0, - "scenes" : [ - { - "name" : "Scene", - "nodes" : [ - 2 - ] - } - ], - "nodes" : [ - { - "mesh" : 0, - "name" : "PZ", - "scale" : [ - 0.009999999776482582, - 0.009999999776482582, - 0.009999999776482582 - ], - "translation" : [ - 0, - 0, - 0.37858137488365173 - ] - }, - { - "children" : [ - 0 - ], - "mesh" : 1, - "name" : "PT", - "translation" : [ - -0.17859923839569092, - 1.069671392440796, - -0.09293144941329956 - ] - }, - { - "children" : [ - 1 - ], - "mesh" : 2, - "name" : "MHF" - } - ], - "materials" : [ - { - "doubleSided" : true, - "name" : "ShuiQiang.004", - "pbrMetallicRoughness" : { - "baseColorTexture" : { - "index" : 0 - }, - "metallicFactor" : 0, - "roughnessFactor" : 0.5 - } - }, - { - "doubleSided" : true, - "name" : "BunkerClothing_AlbedoTransparency.003", - "pbrMetallicRoughness" : { - "baseColorTexture" : { - "index" : 1 - }, - "metallicFactor" : 0, - "roughnessFactor" : 0.5 - } - }, - { - "doubleSided" : true, - "name" : "Helmet_AlbedoTransparency.003", - "pbrMetallicRoughness" : { - "baseColorTexture" : { - "index" : 2 - }, - "metallicFactor" : 0, - "roughnessFactor" : 0.5 - } - }, - { - "alphaMode" : "BLEND", - "name" : "Glasses.003", - "pbrMetallicRoughness" : { - "baseColorFactor" : [ - 0.5882350206375122, - 0.5882350206375122, - 0.5882350206375122, - 0.3897058963775635 - ], - "metallicFactor" : 0, - "roughnessFactor" : 0.5 - } - }, - { - "doubleSided" : true, - "name" : "Straps_AlbedoTransparency.003", - "pbrMetallicRoughness" : { - "baseColorTexture" : { - "index" : 3 - }, - "metallicFactor" : 0, - "roughnessFactor" : 0.5 - } - }, - { - "doubleSided" : true, - "name" : "Head_AlbedoTransparency.003", - "pbrMetallicRoughness" : { - "baseColorTexture" : { - "index" : 4 - }, - "metallicFactor" : 0, - "roughnessFactor" : 0.5 - } - }, - { - "doubleSided" : true, - "name" : "Boots_AlbedoTransparency.003", - "pbrMetallicRoughness" : { - "baseColorTexture" : { - "index" : 5 - }, - "metallicFactor" : 0, - "roughnessFactor" : 0.5 - } - } - ], - "meshes" : [ - { - "name" : "\u7acb\u65b9\u4f53.003", - "primitives" : [ - { - "attributes" : { - "POSITION" : 0, - "NORMAL" : 1, - "TEXCOORD_0" : 2 - }, - "extensions" : { - "KHR_draco_mesh_compression" : { - "bufferView" : 0, - "attributes" : { - "POSITION" : 0, - "NORMAL" : 1, - "TEXCOORD_0" : 2 - } - } - }, - "indices" : 3, - "mode" : 4 - } - ] - }, - { - "name" : "WaterGun.003", - "primitives" : [ - { - "attributes" : { - "POSITION" : 4, - "NORMAL" : 5, - "TEXCOORD_0" : 6 - }, - "extensions" : { - "KHR_draco_mesh_compression" : { - "bufferView" : 1, - "attributes" : { - "POSITION" : 0, - "NORMAL" : 1, - "TEXCOORD_0" : 2 - } - } - }, - "indices" : 7, - "material" : 0, - "mode" : 4 - } - ] - }, - { - "name" : "MieHuoFu.003", - "primitives" : [ - { - "attributes" : { - "POSITION" : 8, - "NORMAL" : 9, - "TEXCOORD_0" : 10 - }, - "extensions" : { - "KHR_draco_mesh_compression" : { - "bufferView" : 2, - "attributes" : { - "POSITION" : 0, - "NORMAL" : 1, - "TEXCOORD_0" : 2 - } - } - }, - "indices" : 11, - "material" : 1, - "mode" : 4 - }, - { - "attributes" : { - "POSITION" : 12, - "NORMAL" : 13, - "TEXCOORD_0" : 14 - }, - "extensions" : { - "KHR_draco_mesh_compression" : { - "bufferView" : 3, - "attributes" : { - "POSITION" : 0, - "NORMAL" : 1, - "TEXCOORD_0" : 2 - } - } - }, - "indices" : 15, - "material" : 2, - "mode" : 4 - }, - { - "attributes" : { - "POSITION" : 16, - "NORMAL" : 17, - "TEXCOORD_0" : 18 - }, - "extensions" : { - "KHR_draco_mesh_compression" : { - "bufferView" : 4, - "attributes" : { - "POSITION" : 0, - "NORMAL" : 1, - "TEXCOORD_0" : 2 - } - } - }, - "indices" : 19, - "material" : 3, - "mode" : 4 - }, - { - "attributes" : { - "POSITION" : 20, - "NORMAL" : 21, - "TEXCOORD_0" : 22 - }, - "extensions" : { - "KHR_draco_mesh_compression" : { - "bufferView" : 5, - "attributes" : { - "POSITION" : 0, - "NORMAL" : 1, - "TEXCOORD_0" : 2 - } - } - }, - "indices" : 23, - "material" : 4, - "mode" : 4 - }, - { - "attributes" : { - "POSITION" : 24, - "NORMAL" : 25, - "TEXCOORD_0" : 26 - }, - "extensions" : { - "KHR_draco_mesh_compression" : { - "bufferView" : 6, - "attributes" : { - "POSITION" : 0, - "NORMAL" : 1, - "TEXCOORD_0" : 2 - } - } - }, - "indices" : 27, - "material" : 5, - "mode" : 4 - }, - { - "attributes" : { - "POSITION" : 28, - "NORMAL" : 29, - "TEXCOORD_0" : 30 - }, - "extensions" : { - "KHR_draco_mesh_compression" : { - "bufferView" : 7, - "attributes" : { - "POSITION" : 0, - "NORMAL" : 1, - "TEXCOORD_0" : 2 - } - } - }, - "indices" : 31, - "material" : 6, - "mode" : 4 - } - ] - } - ], - "textures" : [ - { - "sampler" : 0, - "source" : 0 - }, - { - "sampler" : 0, - "source" : 1 - }, - { - "sampler" : 0, - "source" : 2 - }, - { - "sampler" : 0, - "source" : 3 - }, - { - "sampler" : 0, - "source" : 4 - }, - { - "sampler" : 0, - "source" : 5 - } - ], - "images" : [ - { - "mimeType" : "image/jpeg", - "name" : "ShuiQiang", - "uri" : "ShuiQiang.jpg" - }, - { - "mimeType" : "image/png", - "name" : "BunkerClothing_AlbedoTransparency", - "uri" : "BunkerClothing_AlbedoTransparency.png" - }, - { - "mimeType" : "image/jpeg", - "name" : "Helmet_AlbedoTransparency", - "uri" : "Helmet_AlbedoTransparency.jpg" - }, - { - "mimeType" : "image/jpeg", - "name" : "Straps_AlbedoTransparency", - "uri" : "Straps_AlbedoTransparency.jpg" - }, - { - "mimeType" : "image/jpeg", - "name" : "Head_AlbedoTransparency", - "uri" : "Head_AlbedoTransparency.jpg" - }, - { - "mimeType" : "image/jpeg", - "name" : "Boots_AlbedoTransparency", - "uri" : "Boots_AlbedoTransparency.jpg" - } - ], - "accessors" : [ - { - "componentType" : 5126, - "count" : 24, - "max" : [ - 1, - 1, - 1 - ], - "min" : [ - -1, - -1, - -1 - ], - "type" : "VEC3" - }, - { - "componentType" : 5126, - "count" : 24, - "type" : "VEC3" - }, - { - "componentType" : 5126, - "count" : 24, - "type" : "VEC2" - }, - { - "componentType" : 5123, - "count" : 36, - "type" : "SCALAR" - }, - { - "componentType" : 5126, - "count" : 1430, - "max" : [ - 0.07184479385614395, - 0.07184479385614395, - 0.39843103289604187 - ], - "min" : [ - -0.07183649390935898, - -0.07183649390935898, - -1.3987065727860681e-08 - ], - "type" : "VEC3" - }, - { - "componentType" : 5126, - "count" : 1430, - "type" : "VEC3" - }, - { - "componentType" : 5126, - "count" : 1430, - "type" : "VEC2" - }, - { - "componentType" : 5123, - "count" : 2964, - "type" : "SCALAR" - }, - { - "componentType" : 5126, - "count" : 3652, - "max" : [ - 0.31568726897239685, - 1.579005241394043, - 0.21250030398368835 - ], - "min" : [ - -0.3100007474422455, - 0.029164545238018036, - -0.16183406114578247 - ], - "type" : "VEC3" - }, - { - "componentType" : 5126, - "count" : 3652, - "type" : "VEC3" - }, - { - "componentType" : 5126, - "count" : 3652, - "type" : "VEC2" - }, - { - "componentType" : 5123, - "count" : 15516, - "type" : "SCALAR" - }, - { - "componentType" : 5126, - "count" : 4746, - "max" : [ - 0.13183458149433136, - 1.8140419721603394, - 0.16708354651927948 - ], - "min" : [ - -0.13521797955036163, - 1.4775199890136719, - -0.1361415833234787 - ], - "type" : "VEC3" - }, - { - "componentType" : 5126, - "count" : 4746, - "type" : "VEC3" - }, - { - "componentType" : 5126, - "count" : 4746, - "type" : "VEC2" - }, - { - "componentType" : 5123, - "count" : 22830, - "type" : "SCALAR" - }, - { - "componentType" : 5126, - "count" : 1514, - "max" : [ - 0.11418724805116653, - 1.6796936988830566, - 0.1821955293416977 - ], - "min" : [ - -0.1096891537308693, - 1.5852127075195312, - 0.0685286819934845 - ], - "type" : "VEC3" - }, - { - "componentType" : 5126, - "count" : 1514, - "type" : "VEC3" - }, - { - "componentType" : 5126, - "count" : 1514, - "type" : "VEC2" - }, - { - "componentType" : 5123, - "count" : 7860, - "type" : "SCALAR" - }, - { - "componentType" : 5126, - "count" : 5342, - "max" : [ - 0.09371404349803925, - 1.7351529598236084, - 0.14662612974643707 - ], - "min" : [ - -0.08921344578266144, - 1.498990535736084, - -0.036142800003290176 - ], - "type" : "VEC3" - }, - { - "componentType" : 5126, - "count" : 5342, - "type" : "VEC3" - }, - { - "componentType" : 5126, - "count" : 5342, - "type" : "VEC2" - }, - { - "componentType" : 5123, - "count" : 15522, - "type" : "SCALAR" - }, - { - "componentType" : 5126, - "count" : 3829, - "max" : [ - 0.09659265726804733, - 1.7590115070343018, - 0.1568334698677063 - ], - "min" : [ - -0.0969589576125145, - 1.455280065536499, - -0.08099030703306198 - ], - "type" : "VEC3" - }, - { - "componentType" : 5126, - "count" : 3829, - "type" : "VEC3" - }, - { - "componentType" : 5126, - "count" : 3829, - "type" : "VEC2" - }, - { - "componentType" : 5123, - "count" : 21555, - "type" : "SCALAR" - }, - { - "componentType" : 5126, - "count" : 1388, - "max" : [ - 0.2262089103460312, - 0.2532302439212799, - 0.18883022665977478 - ], - "min" : [ - -0.2262089103460312, - -2.776151220018619e-08, - -0.10604356974363327 - ], - "type" : "VEC3" - }, - { - "componentType" : 5126, - "count" : 1388, - "type" : "VEC3" - }, - { - "componentType" : 5126, - "count" : 1388, - "type" : "VEC2" - }, - { - "componentType" : 5123, - "count" : 5148, - "type" : "SCALAR" - } - ], - "bufferViews" : [ - { - "buffer" : 0, - "byteLength" : 264, - "byteOffset" : 0 - }, - { - "buffer" : 0, - "byteLength" : 8908, - "byteOffset" : 264 - }, - { - "buffer" : 0, - "byteLength" : 28138, - "byteOffset" : 9172 - }, - { - "buffer" : 0, - "byteLength" : 34016, - "byteOffset" : 37312 - }, - { - "buffer" : 0, - "byteLength" : 9580, - "byteOffset" : 71328 - }, - { - "buffer" : 0, - "byteLength" : 37426, - "byteOffset" : 80908 - }, - { - "buffer" : 0, - "byteLength" : 27725, - "byteOffset" : 118336 - }, - { - "buffer" : 0, - "byteLength" : 11416, - "byteOffset" : 146064 - } - ], - "samplers" : [ - { - "magFilter" : 9729, - "minFilter" : 9987 - } - ], - "buffers" : [ - { - "byteLength" : 157480, - "uri" : "MHF.bin" - } - ] -} diff --git a/src/assets/mesh/mark/outside/mhf/MHF.gltf.manifest b/src/assets/mesh/mark/outside/mhf/MHF.gltf.manifest deleted file mode 100644 index 1781cb5..0000000 --- a/src/assets/mesh/mark/outside/mhf/MHF.gltf.manifest +++ /dev/null @@ -1,5 +0,0 @@ -{ - "version" : 1, - "enableSceneOffline" : true, - "enableTexturesOffline" : true -} \ No newline at end of file diff --git a/src/assets/mesh/mark/outside/mhf/ShuiQiang.jpg b/src/assets/mesh/mark/outside/mhf/ShuiQiang.jpg deleted file mode 100644 index 964bacd..0000000 Binary files a/src/assets/mesh/mark/outside/mhf/ShuiQiang.jpg and /dev/null differ diff --git a/src/assets/mesh/mark/outside/mhf/Straps_AlbedoTransparency.jpg b/src/assets/mesh/mark/outside/mhf/Straps_AlbedoTransparency.jpg deleted file mode 100644 index 7e119d2..0000000 Binary files a/src/assets/mesh/mark/outside/mhf/Straps_AlbedoTransparency.jpg and /dev/null differ diff --git a/src/assets/mesh/mark/outside/pmc/CarColor.png b/src/assets/mesh/mark/outside/pmc/CarColor.png deleted file mode 100644 index 89d2afa..0000000 Binary files a/src/assets/mesh/mark/outside/pmc/CarColor.png and /dev/null differ diff --git a/src/assets/mesh/mark/outside/pmc/FireCar.jpg b/src/assets/mesh/mark/outside/pmc/FireCar.jpg deleted file mode 100644 index 0edb25e..0000000 Binary files a/src/assets/mesh/mark/outside/pmc/FireCar.jpg and /dev/null differ diff --git a/src/assets/mesh/mark/outside/pmc/PMC.bin b/src/assets/mesh/mark/outside/pmc/PMC.bin deleted file mode 100644 index d0e62b2..0000000 Binary files a/src/assets/mesh/mark/outside/pmc/PMC.bin and /dev/null differ diff --git a/src/assets/mesh/mark/outside/pmc/PMC.gltf b/src/assets/mesh/mark/outside/pmc/PMC.gltf deleted file mode 100644 index bf703d1..0000000 --- a/src/assets/mesh/mark/outside/pmc/PMC.gltf +++ /dev/null @@ -1,796 +0,0 @@ -{ - "asset" : { - "generator" : "Khronos glTF Blender I/O v1.6.16", - "version" : "2.0" - }, - "extensionsUsed" : [ - "KHR_draco_mesh_compression" - ], - "extensionsRequired" : [ - "KHR_draco_mesh_compression" - ], - "scene" : 0, - "scenes" : [ - { - "name" : "Scene", - "nodes" : [ - 4, - 5, - 6, - 8 - ] - } - ], - "nodes" : [ - { - "mesh" : 0, - "name" : "BL", - "translation" : [ - 0.930389404296875, - 0.5263820886611938, - -1.2779022455215454 - ] - }, - { - "mesh" : 1, - "name" : "BR", - "translation" : [ - -0.8709052801132202, - 0.5263820886611938, - -1.2779022455215454 - ] - }, - { - "mesh" : 2, - "name" : "FL", - "translation" : [ - 0.9883639812469482, - 0.526381254196167, - 2.525930166244507 - ] - }, - { - "mesh" : 3, - "name" : "FR", - "translation" : [ - -0.9485308527946472, - 0.526381254196167, - 2.525930166244507 - ] - }, - { - "children" : [ - 0, - 1, - 2, - 3 - ], - "name" : "wheelModels" - }, - { - "mesh" : 4, - "name" : "Glass" - }, - { - "mesh" : 5, - "name" : "Body" - }, - { - "mesh" : 6, - "name" : "PZ", - "scale" : [ - 0.009999999776482582, - 0.009999999776482582, - 0.009999999776482582 - ], - "translation" : [ - 0.0015363730490207672, - 0.014608621597290039, - 0.6146829128265381 - ] - }, - { - "children" : [ - 7 - ], - "mesh" : 7, - "name" : "PT", - "translation" : [ - 0.032101746648550034, - 3.3492186069488525, - -1.230138897895813 - ] - } - ], - "materials" : [ - { - "doubleSided" : true, - "name" : "FireCar.002", - "pbrMetallicRoughness" : { - "baseColorTexture" : { - "index" : 0 - }, - "metallicFactor" : 0, - "roughnessFactor" : 0.5 - } - }, - { - "doubleSided" : true, - "name" : "CarGlass", - "pbrMetallicRoughness" : { - "baseColorFactor" : [ - 0.07656104862689972, - 0.06475582718849182, - 0.04368578642606735, - 1 - ], - "metallicFactor" : 0, - "roughnessFactor" : 0.15441176295280457 - } - }, - { - "doubleSided" : true, - "name" : "CarColor", - "pbrMetallicRoughness" : { - "baseColorTexture" : { - "index" : 1 - }, - "metallicFactor" : 0, - "roughnessFactor" : 0.5 - } - } - ], - "meshes" : [ - { - "name" : "BL", - "primitives" : [ - { - "attributes" : { - "POSITION" : 0, - "NORMAL" : 1, - "TEXCOORD_0" : 2, - "TEXCOORD_1" : 3 - }, - "extensions" : { - "KHR_draco_mesh_compression" : { - "bufferView" : 0, - "attributes" : { - "POSITION" : 0, - "NORMAL" : 1, - "TEXCOORD_0" : 2, - "TEXCOORD_1" : 3 - } - } - }, - "indices" : 4, - "material" : 0, - "mode" : 4 - } - ] - }, - { - "name" : "BR", - "primitives" : [ - { - "attributes" : { - "POSITION" : 5, - "NORMAL" : 6, - "TEXCOORD_0" : 7, - "TEXCOORD_1" : 8 - }, - "extensions" : { - "KHR_draco_mesh_compression" : { - "bufferView" : 1, - "attributes" : { - "POSITION" : 0, - "NORMAL" : 1, - "TEXCOORD_0" : 2, - "TEXCOORD_1" : 3 - } - } - }, - "indices" : 9, - "material" : 0, - "mode" : 4 - } - ] - }, - { - "name" : "FL", - "primitives" : [ - { - "attributes" : { - "POSITION" : 10, - "NORMAL" : 11, - "TEXCOORD_0" : 12, - "TEXCOORD_1" : 13 - }, - "extensions" : { - "KHR_draco_mesh_compression" : { - "bufferView" : 2, - "attributes" : { - "POSITION" : 0, - "NORMAL" : 1, - "TEXCOORD_0" : 2, - "TEXCOORD_1" : 3 - } - } - }, - "indices" : 14, - "material" : 0, - "mode" : 4 - } - ] - }, - { - "name" : "FR", - "primitives" : [ - { - "attributes" : { - "POSITION" : 15, - "NORMAL" : 16, - "TEXCOORD_0" : 17, - "TEXCOORD_1" : 18 - }, - "extensions" : { - "KHR_draco_mesh_compression" : { - "bufferView" : 3, - "attributes" : { - "POSITION" : 0, - "NORMAL" : 1, - "TEXCOORD_0" : 2, - "TEXCOORD_1" : 3 - } - } - }, - "indices" : 14, - "material" : 0, - "mode" : 4 - } - ] - }, - { - "name" : "Glass", - "primitives" : [ - { - "attributes" : { - "POSITION" : 19, - "NORMAL" : 20, - "TEXCOORD_0" : 21, - "TEXCOORD_1" : 22 - }, - "extensions" : { - "KHR_draco_mesh_compression" : { - "bufferView" : 4, - "attributes" : { - "POSITION" : 0, - "NORMAL" : 1, - "TEXCOORD_0" : 2, - "TEXCOORD_1" : 3 - } - } - }, - "indices" : 23, - "material" : 1, - "mode" : 4 - } - ] - }, - { - "name" : "Body", - "primitives" : [ - { - "attributes" : { - "POSITION" : 24, - "NORMAL" : 25, - "TEXCOORD_0" : 26, - "TEXCOORD_1" : 27, - "TEXCOORD_2" : 28, - "TEXCOORD_3" : 29 - }, - "extensions" : { - "KHR_draco_mesh_compression" : { - "bufferView" : 5, - "attributes" : { - "POSITION" : 0, - "NORMAL" : 1, - "TEXCOORD_0" : 2, - "TEXCOORD_1" : 3, - "TEXCOORD_2" : 4, - "TEXCOORD_3" : 5 - } - } - }, - "indices" : 30, - "material" : 2, - "mode" : 4 - }, - { - "attributes" : { - "POSITION" : 31, - "NORMAL" : 32, - "TEXCOORD_0" : 33, - "TEXCOORD_1" : 34, - "TEXCOORD_2" : 35, - "TEXCOORD_3" : 36 - }, - "extensions" : { - "KHR_draco_mesh_compression" : { - "bufferView" : 6, - "attributes" : { - "POSITION" : 0, - "NORMAL" : 1, - "TEXCOORD_0" : 2, - "TEXCOORD_1" : 3, - "TEXCOORD_2" : 4, - "TEXCOORD_3" : 5 - } - } - }, - "indices" : 37, - "material" : 0, - "mode" : 4 - } - ] - }, - { - "name" : "\u7acb\u65b9\u4f53.008", - "primitives" : [ - { - "attributes" : { - "POSITION" : 38, - "NORMAL" : 39, - "TEXCOORD_0" : 40 - }, - "extensions" : { - "KHR_draco_mesh_compression" : { - "bufferView" : 7, - "attributes" : { - "POSITION" : 0, - "NORMAL" : 1, - "TEXCOORD_0" : 2 - } - } - }, - "indices" : 41, - "mode" : 4 - } - ] - }, - { - "name" : "WaterGun", - "primitives" : [ - { - "attributes" : { - "POSITION" : 42, - "NORMAL" : 43, - "TEXCOORD_0" : 44, - "TEXCOORD_1" : 45 - }, - "extensions" : { - "KHR_draco_mesh_compression" : { - "bufferView" : 8, - "attributes" : { - "POSITION" : 0, - "NORMAL" : 1, - "TEXCOORD_0" : 2, - "TEXCOORD_1" : 3 - } - } - }, - "indices" : 46, - "material" : 2, - "mode" : 4 - } - ] - } - ], - "textures" : [ - { - "sampler" : 0, - "source" : 0 - }, - { - "sampler" : 0, - "source" : 1 - } - ], - "images" : [ - { - "mimeType" : "image/jpeg", - "name" : "FireCar", - "uri" : "FireCar.jpg" - }, - { - "mimeType" : "image/png", - "name" : "CarColor", - "uri" : "CarColor.png" - } - ], - "accessors" : [ - { - "componentType" : 5126, - "count" : 289, - "max" : [ - 0.2735353708267212, - 0.5016516447067261, - 0.5016562938690186 - ], - "min" : [ - -0.3255194425582886, - -0.5016518831253052, - -0.5016472339630127 - ], - "type" : "VEC3" - }, - { - "componentType" : 5126, - "count" : 289, - "type" : "VEC3" - }, - { - "componentType" : 5126, - "count" : 289, - "type" : "VEC2" - }, - { - "componentType" : 5126, - "count" : 289, - "type" : "VEC2" - }, - { - "componentType" : 5123, - "count" : 1068, - "type" : "SCALAR" - }, - { - "componentType" : 5126, - "count" : 284, - "max" : [ - 0.27353453636169434, - 0.5016516447067261, - 0.5016562938690186 - ], - "min" : [ - -0.32552027702331543, - -0.5016518831253052, - -0.5016472339630127 - ], - "type" : "VEC3" - }, - { - "componentType" : 5126, - "count" : 284, - "type" : "VEC3" - }, - { - "componentType" : 5126, - "count" : 284, - "type" : "VEC2" - }, - { - "componentType" : 5126, - "count" : 284, - "type" : "VEC2" - }, - { - "componentType" : 5123, - "count" : 1068, - "type" : "SCALAR" - }, - { - "componentType" : 5126, - "count" : 148, - "max" : [ - 0.12047308683395386, - 0.5016517639160156, - 0.5016556978225708 - ], - "min" : [ - -0.1725015640258789, - -0.5016516447067261, - -0.5016477108001709 - ], - "type" : "VEC3" - }, - { - "componentType" : 5126, - "count" : 148, - "type" : "VEC3" - }, - { - "componentType" : 5126, - "count" : 148, - "type" : "VEC2" - }, - { - "componentType" : 5126, - "count" : 148, - "type" : "VEC2" - }, - { - "componentType" : 5123, - "count" : 588, - "type" : "SCALAR" - }, - { - "componentType" : 5126, - "count" : 148, - "max" : [ - 0.12047266960144043, - 0.5016517639160156, - 0.5016556978225708 - ], - "min" : [ - -0.17250198125839233, - -0.5016516447067261, - -0.5016477108001709 - ], - "type" : "VEC3" - }, - { - "componentType" : 5126, - "count" : 148, - "type" : "VEC3" - }, - { - "componentType" : 5126, - "count" : 148, - "type" : "VEC2" - }, - { - "componentType" : 5126, - "count" : 148, - "type" : "VEC2" - }, - { - "componentType" : 5126, - "count" : 146, - "max" : [ - 1.2894694805145264, - 2.566256523132324, - 3.534332752227783 - ], - "min" : [ - -1.2894694805145264, - 1.629791498184204, - 1.1941930055618286 - ], - "type" : "VEC3" - }, - { - "componentType" : 5126, - "count" : 146, - "type" : "VEC3" - }, - { - "componentType" : 5126, - "count" : 146, - "type" : "VEC2" - }, - { - "componentType" : 5126, - "count" : 146, - "type" : "VEC2" - }, - { - "componentType" : 5123, - "count" : 474, - "type" : "SCALAR" - }, - { - "componentType" : 5126, - "count" : 10285, - "max" : [ - 1.3214938640594482, - 3.396054267883301, - 3.7334296703338623 - ], - "min" : [ - -1.3215093612670898, - 0.06301689147949219, - -3.7334306240081787 - ], - "type" : "VEC3" - }, - { - "componentType" : 5126, - "count" : 10285, - "type" : "VEC3" - }, - { - "componentType" : 5126, - "count" : 10285, - "type" : "VEC2" - }, - { - "componentType" : 5126, - "count" : 10285, - "type" : "VEC2" - }, - { - "componentType" : 5126, - "count" : 10285, - "type" : "VEC2" - }, - { - "componentType" : 5126, - "count" : 10285, - "type" : "VEC2" - }, - { - "componentType" : 5123, - "count" : 19134, - "type" : "SCALAR" - }, - { - "componentType" : 5126, - "count" : 116, - "max" : [ - 1.1970285177230835, - 2.388274908065796, - 3.7181694507598877 - ], - "min" : [ - -1.1981037855148315, - 0.2322521060705185, - -3.6314189434051514 - ], - "type" : "VEC3" - }, - { - "componentType" : 5126, - "count" : 116, - "type" : "VEC3" - }, - { - "componentType" : 5126, - "count" : 116, - "type" : "VEC2" - }, - { - "componentType" : 5126, - "count" : 116, - "type" : "VEC2" - }, - { - "componentType" : 5126, - "count" : 116, - "type" : "VEC2" - }, - { - "componentType" : 5126, - "count" : 116, - "type" : "VEC2" - }, - { - "componentType" : 5123, - "count" : 156, - "type" : "SCALAR" - }, - { - "componentType" : 5126, - "count" : 24, - "max" : [ - 1, - 1, - 1 - ], - "min" : [ - -1, - -1, - -1 - ], - "type" : "VEC3" - }, - { - "componentType" : 5126, - "count" : 24, - "type" : "VEC3" - }, - { - "componentType" : 5126, - "count" : 24, - "type" : "VEC2" - }, - { - "componentType" : 5123, - "count" : 36, - "type" : "SCALAR" - }, - { - "componentType" : 5126, - "count" : 296, - "max" : [ - 0.12257297337055206, - 0.08071567118167877, - 0.6802297830581665 - ], - "min" : [ - -0.11950023472309113, - -0.0514986515045166, - -0.5285130739212036 - ], - "type" : "VEC3" - }, - { - "componentType" : 5126, - "count" : 296, - "type" : "VEC3" - }, - { - "componentType" : 5126, - "count" : 296, - "type" : "VEC2" - }, - { - "componentType" : 5126, - "count" : 296, - "type" : "VEC2" - }, - { - "componentType" : 5123, - "count" : 516, - "type" : "SCALAR" - } - ], - "bufferViews" : [ - { - "buffer" : 0, - "byteLength" : 3246, - "byteOffset" : 0 - }, - { - "buffer" : 0, - "byteLength" : 3168, - "byteOffset" : 3248 - }, - { - "buffer" : 0, - "byteLength" : 1761, - "byteOffset" : 6416 - }, - { - "buffer" : 0, - "byteLength" : 1773, - "byteOffset" : 8180 - }, - { - "buffer" : 0, - "byteLength" : 1721, - "byteOffset" : 9956 - }, - { - "buffer" : 0, - "byteLength" : 77456, - "byteOffset" : 11680 - }, - { - "buffer" : 0, - "byteLength" : 1695, - "byteOffset" : 89136 - }, - { - "buffer" : 0, - "byteLength" : 264, - "byteOffset" : 90832 - }, - { - "buffer" : 0, - "byteLength" : 3101, - "byteOffset" : 91096 - } - ], - "samplers" : [ - { - "magFilter" : 9729, - "minFilter" : 9987 - } - ], - "buffers" : [ - { - "byteLength" : 94200, - "uri" : "PMC.bin" - } - ] -} diff --git a/src/assets/mesh/mark/outside/pmc/PMC.gltf.manifest b/src/assets/mesh/mark/outside/pmc/PMC.gltf.manifest deleted file mode 100644 index 1781cb5..0000000 --- a/src/assets/mesh/mark/outside/pmc/PMC.gltf.manifest +++ /dev/null @@ -1,5 +0,0 @@ -{ - "version" : 1, - "enableSceneOffline" : true, - "enableTexturesOffline" : true -} \ No newline at end of file