diff --git a/src/app/babylon/controller/config-manager.ts b/src/app/babylon/controller/config-manager.ts index 29c31c3..16cd13d 100644 --- a/src/app/babylon/controller/config-manager.ts +++ b/src/app/babylon/controller/config-manager.ts @@ -128,22 +128,30 @@ export class ConfigManager { static s_markName = new Map([ [MarkType.SYD, "伤员"], - [MarkType.H, "火"], - [MarkType.TPH, "突破火"], - [MarkType.SNH, "室内火"], - [MarkType.YWA, "烟雾"], - [MarkType.YWB, "烟雾"], - [MarkType.YWC, "烟雾"], - [MarkType.MHF, "灭火服"], + [MarkType.DT, "歹徒"], + [MarkType.LYX, "漏油(小)"], + [MarkType.LYD, "漏油(大)"], + [MarkType.H, "火(大)"], + [MarkType.SNH, "火(小)"], + [MarkType.YWA, "烟雾(大)"], + [MarkType.YWB, "烟雾(小)"], + [MarkType.MHF, "消防员"], [MarkType.PMC, "泡沫车"], [MarkType.GA, "公安"], [MarkType.JJ, "交警"], [MarkType.YS, "医生"], [MarkType.JHC, "救护车"], [MarkType.JC, "警车"], + [MarkType.GK, "顾客"], [MarkType.JCA, "轿车"], [MarkType.JL, "经理"], [MarkType.ZG, "主管"], + [MarkType.SYY, "收银员"], + [MarkType.JYY, "加油员"], + [MarkType.XYY, "卸油员"], + [MarkType.XFSD, "消防沙(堆)"], + [MarkType.XFSQ, "消防沙(圈)"], + [MarkType.XFT, "消防桶"], [MarkType.JJX, "警戒线"], [MarkType.JGLX, "进攻路线"], [MarkType.CT, "撤退"], @@ -172,7 +180,7 @@ export class ConfigManager { */ static getMarkModelPath(pos: MarkTagPos, type: MarkType): string { - let result = ConfigManager.c_resPath_assetsRoot + "mesh/mark/" + pos.toLocaleLowerCase() + "/" + type.toLocaleLowerCase() + "/"; + let result = "mesh/mark/" + pos.toLocaleLowerCase() + "/" + type.toLocaleLowerCase() + "/"; return result; } diff --git a/src/app/babylon/controller/inputController.ts b/src/app/babylon/controller/inputController.ts index 3fea861..2811549 100644 --- a/src/app/babylon/controller/inputController.ts +++ b/src/app/babylon/controller/inputController.ts @@ -289,11 +289,9 @@ export class InputController { // 可以旋转 public CanRotateSelf(): boolean { return this.markType != MarkType.H - && this.markType != MarkType.TPH && this.markType != MarkType.SNH && this.markType != MarkType.YWA && this.markType != MarkType.YWB - && this.markType != MarkType.YWC && this.markType != MarkType.JJX // && this.markType != MarkType.SD && this.markType != MarkType.JGLX diff --git a/src/app/babylon/controller/mode-manager.ts b/src/app/babylon/controller/mode-manager.ts index 27cb259..92eb799 100644 --- a/src/app/babylon/controller/mode-manager.ts +++ b/src/app/babylon/controller/mode-manager.ts @@ -23,12 +23,12 @@ export class ModeManager { /** * 制作模式代表内部编辑人员，可新增单位、上传模型，查看模式代表交付的模式 */ - public static s_isMakeMode = false; + public static s_isMakeMode = true; /** * 调试模式 */ - public static isDebug = false; + public static isDebug = true; diff --git a/src/app/babylon/controller/scene-manager.ts b/src/app/babylon/controller/scene-manager.ts index 9a3fc03..6194e96 100644 --- a/src/app/babylon/controller/scene-manager.ts +++ b/src/app/babylon/controller/scene-manager.ts @@ -516,11 +516,9 @@ export class SceneManager { modelInfo = new ModelInfo_mark_multiArrow(modelData as MarkData, null, defaultMesh, null, isNew); break; case MarkType.H: - case MarkType.TPH: case MarkType.SNH: case MarkType.YWA: case MarkType.YWB: - case MarkType.YWC: modelInfo = new ModelInfo_mark_particle(modelData as MarkData, null, defaultMesh, null, isNew); break; diff --git a/src/app/babylon/model/data/institution/facility/property-data/in/property-data-jyj.ts b/src/app/babylon/model/data/institution/facility/property-data/in/property-data-jyj.ts index e06fede..ea673a0 100644 --- a/src/app/babylon/model/data/institution/facility/property-data/in/property-data-jyj.ts +++ b/src/app/babylon/model/data/institution/facility/property-data/in/property-data-jyj.ts @@ -12,6 +12,8 @@ export class PropertyData_JYJ extends PropertyData_Base { oilGunNum: string = ""; //油枪数量 oilProductNo: string = ""; //油品品号 oilPumpType: string = ""; //油泵类型 + flow: string = ""; //流量 + power: string = ""; //功率 constructor(key: string, brand: string, superBrand: string, oilGunNum: string, oilProductNo: string, oilPumpType: string) { super(key, FacilityType.JY_JYJ); @@ -21,11 +23,15 @@ export class PropertyData_JYJ extends PropertyData_Base { this.oilGunNum = oilGunNum this.oilProductNo = oilProductNo this.oilPumpType = oilPumpType + this.flow = "0.5kg/s" + this.power = "1kw" } clone(key: string) { let result = new PropertyData_JYJ(key, this.brand, this.superBrand, this.oilGunNum, this.oilProductNo, this.oilPumpType); result.name = this.name; + result.flow = this.flow; + result.power = this.power; return result; } 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 9481cca..eb551fa 100644 --- a/src/app/babylon/model/data/mark/all-mark-data.ts +++ b/src/app/babylon/model/data/mark/all-mark-data.ts @@ -45,15 +45,13 @@ export class AllMarkData { //灾情 let tagPos: MarkTagPos = MarkTagPos.Disaster; AllMarkData.newMarkData(MarkType.SYD, MarkKindType.Persion, tagPos, result); - AllMarkData.newMarkData(MarkType.DY, MarkKindType.Persion, tagPos, result); + AllMarkData.newMarkData(MarkType.DT, MarkKindType.Persion, tagPos, result); AllMarkData.newMarkData(MarkType.LYX, MarkKindType.Goods, tagPos, result); AllMarkData.newMarkData(MarkType.LYD, MarkKindType.Goods, tagPos, result); - AllMarkData.newMarkData(MarkType.H, MarkKindType.Effect, tagPos, result, undefined, false); - AllMarkData.newMarkData(MarkType.TPH, MarkKindType.Effect, tagPos, result, undefined, false); AllMarkData.newMarkData(MarkType.SNH, MarkKindType.Effect, tagPos, result, undefined, false); - AllMarkData.newMarkData(MarkType.YWA, MarkKindType.Effect, tagPos, result, undefined, false); + AllMarkData.newMarkData(MarkType.H, MarkKindType.Effect, tagPos, result, undefined, false); AllMarkData.newMarkData(MarkType.YWB, MarkKindType.Effect, tagPos, result, undefined, false); - AllMarkData.newMarkData(MarkType.YWC, MarkKindType.Effect, tagPos, result, undefined, false); + AllMarkData.newMarkData(MarkType.YWA, MarkKindType.Effect, tagPos, result, undefined, false); //外部力量 tagPos = MarkTagPos.Outside; diff --git a/src/app/babylon/model/data/mark/mark-data.ts b/src/app/babylon/model/data/mark/mark-data.ts index be79766..6c256d3 100644 --- a/src/app/babylon/model/data/mark/mark-data.ts +++ b/src/app/babylon/model/data/mark/mark-data.ts @@ -165,7 +165,7 @@ export enum MarkType { /** * 歹徒 */ - DY = "DT", + DT = "DT", /** * 漏油（大） @@ -178,35 +178,25 @@ export enum MarkType { LYX = "LYX", /** - * 火 + * 火（大） */ H = "H", /** - * 突破火 - */ - TPH = "TPH", - - /** - * 室内火 + * 火（小） */ SNH = "SNH", /** - * 烟雾A + * 烟雾A（大） */ YWA = "YWA", /** - * 烟雾B + * 烟雾（小） */ YWB = "YWB", - /** - * 烟雾C - */ - YWC = "YWC", - //==================外部力量================ /** diff --git a/src/app/babylon/model/data/mark/mark-plan-data.ts b/src/app/babylon/model/data/mark/mark-plan-data.ts index 2613eaa..bc0687c 100644 --- a/src/app/babylon/model/data/mark/mark-plan-data.ts +++ b/src/app/babylon/model/data/mark/mark-plan-data.ts @@ -236,10 +236,14 @@ export class MarkNodeData { describe: string; /** - * 图片（或视频？） + * 图片地址 */ texture: string; + /** + * 视频地址 + */ + video: string; constructor(id: number, name: string) { this.id = id; 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 f503690..f7e62c0 100644 --- a/src/app/babylon/model/info/mark/model-info-mark.ts +++ b/src/app/babylon/model/info/mark/model-info-mark.ts @@ -194,6 +194,7 @@ export class ModelInfo_mark extends ModelInfo { * @param select */ onSelect(select: boolean) { + console.log("onSelect", select); this.isSelect = select; // this.lookAt(); if (select) { diff --git a/src/app/babylon/model/info/mark/other/mark-plan-particle-info.ts b/src/app/babylon/model/info/mark/other/mark-plan-particle-info.ts index 0a1a9ce..473a8e4 100644 --- a/src/app/babylon/model/info/mark/other/mark-plan-particle-info.ts +++ b/src/app/babylon/model/info/mark/other/mark-plan-particle-info.ts @@ -34,39 +34,25 @@ export class ModelInfo_mark_particle extends ModelInfo_mark { switch (this.markData.type) { case MarkType.H: particleJsonPath.push("assets/particlesystem/fire/fire_h_1.json"); - particleJsonPath.push("assets/particlesystem/fire/fire_h_2.json"); - particleJsonPath.push("assets/particlesystem/fire/fire_h_3.json"); particleJsonPath.push("assets/particlesystem/smoke/smoke_a.json"); - instance.modelBox.scaling = new Vector3(300, 300, 300); - posOffset.y = 2.9 / instance.modelBox.scaling.y; - break; - case MarkType.TPH: - particleJsonPath.push("assets/particlesystem/fire/fire_tph_1.json"); - particleJsonPath.push("assets/particlesystem/fire/fire_tph_2.json"); - particleJsonPath.push("assets/particlesystem/fire/fire_tph_3.json"); - particleJsonPath.push("assets/particlesystem/smoke/smoke_b.json"); - instance.modelBox.scaling = new Vector3(300, 300, 300); - posOffset.y = 2.9 / instance.modelBox.scaling.y; + instance.modelBox.scaling = new Vector3(5, 1, 5); + posOffset.y = 0.7 / instance.modelBox.scaling.y; break; case MarkType.SNH: particleJsonPath.push("assets/particlesystem/fire/fire_snh_1.json"); - particleJsonPath.push("assets/particlesystem/fire/fire_snh_2.json"); - particleJsonPath.push("assets/particlesystem/fire/fire_snh_3.json"); particleJsonPath.push("assets/particlesystem/smoke/smoke_snh.json"); - instance.modelBox.scaling = new Vector3(300, 100, 300); - posOffset.y = 1 / instance.modelBox.scaling.y; + instance.modelBox.scaling = new Vector3(3, 1, 3); + posOffset.y = 0.2 / instance.modelBox.scaling.y; break; case MarkType.YWA: particleJsonPath.push("assets/particlesystem/smoke/smoke_a.json"); - instance.modelBox.scaling = new Vector3(500, 100, 500); + instance.modelBox.scaling = new Vector3(5, 1, 5); + posOffset.y = 0.1 / instance.modelBox.scaling.y; break; case MarkType.YWB: - particleJsonPath.push("assets/particlesystem/smoke/smoke_b.json"); - instance.modelBox.scaling = new Vector3(300, 600, 300); - break; - case MarkType.YWC: - particleJsonPath.push("assets/particlesystem/smoke/smoke_c.json"); - instance.modelBox.scaling = new Vector3(100, 100, 100); + particleJsonPath.push("assets/particlesystem/smoke/smoke_snh.json"); + instance.modelBox.scaling = new Vector3(3, 1, 3); + posOffset.y = 0.2 / instance.modelBox.scaling.y; break; } diff --git a/src/app/babylon/model/info/model/facilityinfo-tool/facility-area.ts b/src/app/babylon/model/info/model/facilityinfo-tool/facility-area.ts index 6c96074..b7d30c1 100644 --- a/src/app/babylon/model/info/model/facilityinfo-tool/facility-area.ts +++ b/src/app/babylon/model/info/model/facilityinfo-tool/facility-area.ts @@ -166,6 +166,7 @@ export class AreaInfo { showPoint(show: boolean) { for (let i = 0; i < this.pointMesh.length; i++) { this.pointMesh[i].showUI(show); + this.pointMesh[i].showPoint(show); } } @@ -365,6 +366,19 @@ export class PolygonMeshPoint { if (this.uiRoot != null) { this.uiRoot.isVisible = show; } + } + + /** + * 展示编辑节点 + * @param show + */ + showPoint(show: boolean) { + if (this.area == null) { + return; + } + for (let i = 0; i < this.area.pointMesh.length; i++) { + this.area.pointMesh[i].mesh.setEnabled(show); + } } diff --git a/src/app/babylon/model/info/model/model-info-building.ts b/src/app/babylon/model/info/model/model-info-building.ts index 68345d8..a9d9005 100644 --- a/src/app/babylon/model/info/model/model-info-building.ts +++ b/src/app/babylon/model/info/model/model-info-building.ts @@ -16,7 +16,7 @@ import { FacilityWindow } from "src/app/babylon/view/facility-window/facility-wi import { BuildingType } from "../../data/institution/building/building-data"; -import { FacilityPosType, ModelData_facility } from "../../data/model-data/model-data-facility"; +import { FacilityPosType, FacilityType, ModelData_facility } from "../../data/model-data/model-data-facility"; import { ModelInfo_mark } from "../mark/model-info-mark"; import { ModelInfo } from "./model-info"; import { FacilityInfoByType, ModelInfo_facility } from "./model-info-facility"; @@ -113,7 +113,7 @@ export class ModelInfo_building extends ModelInfo { border.addControl(this.uiIconBtn); this.uiIconBtn.width = '100px'; this.uiIconBtn.height = '22px'; - this.uiIconBtn.background = "#415094"; + this.uiIconBtn.background = BabylonUIStyleTool.c_color_blueBtnBg; this.uiIconBtn.color = "white"; this.uiIconBtn.thickness = 0; this.uiIconBtn.textBlock.fontSize = 12; @@ -270,5 +270,19 @@ export class ModelInfo_building extends ModelInfo { } } + /** + * 查询某类设备 + * @param type + */ + getFacilityInfoByType(type: FacilityType) { + let result: ModelInfo_facility[] = []; + for (let i = 0; i < this.facilityInfos.length; i++) { + if (this.facilityInfos[i].type == type) { + result = this.facilityInfos[i].facilityInfo; + } + + } + return result; + } } diff --git a/src/app/babylon/model/info/model/model-info-facility.ts b/src/app/babylon/model/info/model/model-info-facility.ts index 29e5b8d..a89bbd2 100644 --- a/src/app/babylon/model/info/model/model-info-facility.ts +++ b/src/app/babylon/model/info/model/model-info-facility.ts @@ -1,7 +1,8 @@ import { AbstractMesh, Color3, EventState, Mesh } from "@babylonjs/core"; -import { Button, Control, Ellipse, Rectangle, Vector2WithInfo } from "@babylonjs/gui"; +import { Button, Control, Ellipse, Rectangle, TextBlock, Vector2WithInfo } from "@babylonjs/gui"; import { ConfigManager } from "src/app/babylon/controller/config-manager"; import { SceneManager } from "src/app/babylon/controller/scene-manager"; +import { UIManager } from "src/app/babylon/controller/ui-manager"; import { BabylonUIStyleTool } from "src/app/babylon/tool/babylon-ui-style-tool"; import { SpeakingTool } from "src/app/babylon/tool/speaking-tool"; import { TsTool } from "src/app/babylon/tool/ts-tool"; @@ -27,6 +28,9 @@ export class ModelInfo_facility extends ModelInfo { areaInfo: AreaInfo;//区域信息 isNew: boolean;//是否是新建 + nameUIRoot: Rectangle; + nameText: TextBlock; + constructor( key: string, @@ -62,8 +66,8 @@ export class ModelInfo_facility extends ModelInfo { this.uiFollowRoot.addControl(this.ui_select); this.ui_select.background = BabylonUIStyleTool.c_color_3d_blue; this.ui_select.thickness = 0; - this.ui_select.width = 0.95; - this.ui_select.height = 0.95; + this.ui_select.width = 0.8; + this.ui_select.height = 0.8; this.ui_select.shadowColor = BabylonUIStyleTool.c_color_3d_blue; this.ui_select.shadowBlur = 3; this.ui_select.isVisible = false; @@ -104,6 +108,43 @@ export class ModelInfo_facility extends ModelInfo { + } + + /** + * 显示名称UI + * @param show + */ + showNameUI(show: boolean) { + let data = this.modelData as ModelData_facility; + if (this.nameUIRoot == null) { + this.nameUIRoot = new Rectangle("nameRoot"); + this.nameUIRoot.thickness = 0; + this.nameUIRoot.background = BabylonUIStyleTool.c_color_blueBtnBg; + this.nameUIRoot.color = BabylonUIStyleTool.c_color_blue;//"#0CB7F7"; + this.nameUIRoot.alpha = 0.9; + UIManager.Instance.uiRoot.addControl(this.nameUIRoot); + this.nameUIRoot.width = '50px'; + this.nameUIRoot.height = '26px'; + this.nameUIRoot.thickness = 2; + this.nameUIRoot.linkWithMesh(this.head); + + this.nameText = new TextBlock("name", ""); + this.nameUIRoot.addControl(this.nameText); + this.nameText.color = "white"; + this.nameText.resizeToFit = true; + this.nameText.top = "2px"; + this.nameText.fontSize = 16; + this.nameText.textVerticalAlignment = Control.VERTICAL_ALIGNMENT_CENTER; + } + this.nameText.text = data.propertyData.name; + this.nameUIRoot.isVisible = show; + + let instance = this; + setTimeout(() => { + instance.nameUIRoot.widthInPixels = instance.nameText.widthInPixels + 10; + instance.nameUIRoot.heightInPixels = instance.nameText.heightInPixels + 5; + }, 100); + } @@ -165,7 +206,6 @@ export class ModelInfo_facility extends ModelInfo { setIconEnable(enable: boolean) { this.showFollowUI(enable); - if (!enable)//还原选中状态 { this.setSelectEnable(false); @@ -207,6 +247,13 @@ export class ModelInfo_facility extends ModelInfo { this.areaInfo.dispose(); } + + if (this.nameUIRoot != null) { + this.nameUIRoot.dispose(); + this.nameUIRoot = null; + this.nameText = null; + } + super.dispose(disposeMesh); } } diff --git a/src/app/babylon/tool/babylon-ui-style-tool.ts b/src/app/babylon/tool/babylon-ui-style-tool.ts index 2fd9e82..16e4f41 100644 --- a/src/app/babylon/tool/babylon-ui-style-tool.ts +++ b/src/app/babylon/tool/babylon-ui-style-tool.ts @@ -11,6 +11,7 @@ import { MyInputText } from "./babylon-tool"; export class BabylonUIStyleTool { static c_color_blue: string = "#0080FF";//普通蓝色，用于选中、确定等正面风格 + static c_color_blueBtnBg: string = "#415094";//深蓝色，用于文本按钮背景色 static c_color_gray: string = "#E8ECF1";//普通灰色，用于取消、后退、输入背景等 static c_color_black: string = "black";//黑色 static c_color_blueBg: string = "#001121";//深蓝，用于长存界面的背景 diff --git a/src/app/babylon/view/building-window/building-window.ts b/src/app/babylon/view/building-window/building-window.ts index 1b852b2..9285571 100644 --- a/src/app/babylon/view/building-window/building-window.ts +++ b/src/app/babylon/view/building-window/building-window.ts @@ -20,7 +20,7 @@ import { BuildingInfo_ChemicalPlant } from "../../model/info/building/building-i import { BuildingInfo_Environment } from "../../model/info/building/building-info-environment"; import { BuildingInfo_Normal } from "../../model/info/building/building-info-normal"; import { ModelInfo_building } from "../../model/info/model/model-info-building"; -import { FacilityInfoByType } from "../../model/info/model/model-info-facility"; +import { FacilityInfoByType, ModelInfo_facility } from "../../model/info/model/model-info-facility"; import { BabylonTool } from "../../tool/babylon-tool"; import { TsTool } from "../../tool/ts-tool"; import { FacilityInfoInSceneWindow } from "../facilityinfoinscene-window/facilityinfoinscene-window"; @@ -374,6 +374,7 @@ export class BuildingWindow extends UIBase { } // console.log("选中建筑", modelInfo); + this.showJYZModules(JYZInfoMoudleType.JBXX, false); this.showJYZModules(JYZInfoMoudleType.AQSS, false); this.showJYZModules(JYZInfoMoudleType.YQHSGX, false); this.showJYZModules(JYZInfoMoudleType.SYG, false); @@ -792,6 +793,18 @@ export class BuildingWindow extends UIBase { } } + /** + * 在输油管和油气回收模块， 要展示油罐和加油机的名字UI + */ + let isShowNameUI_JYJ_YG = show && (type == JYZInfoMoudleType.SYG || type == JYZInfoMoudleType.YQHSGX); + let showNameFacilitys: ModelInfo_facility[] = []; + showNameFacilitys = showNameFacilitys.concat(this.currentBuidngItem.buildingInfo.ModelInfo.getFacilityInfoByType(FacilityType.JY_JYJ)); + showNameFacilitys = showNameFacilitys.concat(this.currentBuidngItem.buildingInfo.ModelInfo.getFacilityInfoByType(FacilityType.JY_YG)); + for (let i = 0; i < showNameFacilitys.length; i++) { + showNameFacilitys[i].showNameUI(isShowNameUI_JYJ_YG); + } + + if (show) { this.currentJYZInfoMoudleType = type; } diff --git a/src/app/babylon/view/facility-window/facility-window.ts b/src/app/babylon/view/facility-window/facility-window.ts index a430a89..8d68f96 100644 --- a/src/app/babylon/view/facility-window/facility-window.ts +++ b/src/app/babylon/view/facility-window/facility-window.ts @@ -259,7 +259,11 @@ export class FacilityWindow extends UIBase { } } else { //右键取消 - instance.three.unSelectBottomIcon(); + if (!SceneManager.s_isPointerDrag)//不是拖拽 + { + instance.three.unSelectBottomIcon(); + } + } break; diff --git a/src/app/babylon/view/mark-window/mark-window.ts b/src/app/babylon/view/mark-window/mark-window.ts index e82d75e..45cada3 100644 --- a/src/app/babylon/view/mark-window/mark-window.ts +++ b/src/app/babylon/view/mark-window/mark-window.ts @@ -3,6 +3,7 @@ import { AbstractMesh, Vector3 } from "@babylonjs/core"; import { PointerEventTypes, PointerInfo } from "@babylonjs/core/Events/pointerEvents"; import { EventState, Observer } from "@babylonjs/core/Misc/observable"; import { classToClass } from "class-transformer"; +import { PlanComponent } from "src/app/pages/plan/plan.component"; import { DataManager } from "../../controller/data-manager"; import { EventManager } from "../../controller/event-manager/event-manager"; import { Event_GetAllMarkPlanData } from "../../controller/event-manager/events/event-get-markplandata-success"; @@ -501,11 +502,11 @@ export class MarkWindow extends UIBase { // markInfo.markData //通知前端 最后需要其调用 selectMarkData selectMarkDataFrom3d(markInfo: ModelInfo_mark, select: boolean) { if (select) { - //ThreeDimensionalHomeComponent.instance.selectSandTableMark(markInfo.markData, select) + //PlanComponent.instance.selectSandTableMark(markInfo.markData, select) } else { if (markInfo != null) { - //ThreeDimensionalHomeComponent.instance.selectSandTableMark(markInfo.markData, select) + //PlanComponent.instance.selectSandTableMark(markInfo.markData, select) } } @@ -748,6 +749,7 @@ export class MarkWindow extends UIBase { */ onPointerObservable(eventData: PointerInfo, eventState: EventState) { let instance = MarkWindow.instance; + if (!instance.isShow) { return; } @@ -830,23 +832,24 @@ export class MarkWindow extends UIBase { break; } - if (pickMesh != null) { + //创建标绘物 + if (readyCreateMark) { + instance.createNewMark(pickPos, instance.currentMarkDataPrefab, true); + } + else if (pickMesh != null) { //是标绘物 let l_markInfo = instance.getMarkInfoFromMesh(eventData.pickInfo.pickedMesh); if (l_markInfo != null) { - if (readyCreateMark == true) //水带的起点是可以在分水器上的 - { - readyCreateMark = false; - } - if (eventData.type == PointerEventTypes.POINTERDOUBLETAP) { //双击标绘物，打开任务界面 + console.log("打开属性面板"); instance.openProperty(l_markInfo); } else if (eventData.type == PointerEventTypes.POINTERDOWN) { if (eventData.event.button == 0)//左键 { if (!instance.isCreateMultiPointMark()) { + console.log("选中标绘物", l_markInfo); instance.selectMarkDataFrom3d(l_markInfo, true); } } @@ -874,9 +877,6 @@ export class MarkWindow extends UIBase { } } - if (readyCreateMark) { - instance.createNewMark(pickPos, instance.currentMarkDataPrefab, true); - } } @@ -969,6 +969,7 @@ export class MarkWindow extends UIBase { } }) + console.log(mesh, "是标绘物", result); return result; } diff --git a/src/app/pages/plan/plan.component.html b/src/app/pages/plan/plan.component.html index 3d3c285..9978d24 100644 --- a/src/app/pages/plan/plan.component.html +++ b/src/app/pages/plan/plan.component.html @@ -2,7 +2,17 @@
- + + +
    +
    • +
    • +
    • +
    • +
+
@@ -47,6 +57,45 @@
+ +
+
+
+
详情
+
+
+
+
图片
+
+
+
+
+
+
+
{{beforeOnePropertyData.getPropertyData().name}}
+
+
+ + +
+
+ + +
+
+
品牌 :
+
油枪数量 :
+
油品品号 :
+
+
+
{{beforeOnePropertyData.getPropertyData().name}}
+
油品品号 :
+
油罐容积 :
+
安全容积 :
+
+
+ +
diff --git a/src/app/pages/plan/plan.component.scss b/src/app/pages/plan/plan.component.scss index 896fb73..4dcc908 100644 --- a/src/app/pages/plan/plan.component.scss +++ b/src/app/pages/plan/plan.component.scss @@ -48,6 +48,7 @@ cursor: pointer; margin: 7px 10px 0px; padding: 0; + label{ display: block; width: 100%; height: 100%; cursor: pointer; .anticon{ font-size: 14px; margin-left: 1px; } } } .selectFence { background: linear-gradient(180deg, #000D21 0%, #00404D 49%, #23D9FF 100%); } //选种样式 .rightFence{ @@ -178,6 +179,51 @@ transition: margin-left 0.5s; } +//右侧属性栏 +.nature{ + width: 230px; + position: absolute; + top: 1%; + right: 1%; + color: #C4E2FC; + font-size: 14px; + background: linear-gradient(360deg, #000D21 0%, rgba(0, 59, 110, 0.8) 100%); + .natureHeader{ text-align: right; height: 10px; .anticon{ font-size: 18px; margin: 5px 5px 0 0; } } + .natureContent{ + box-sizing: border-box; + padding: 0 20px; + margin-bottom: 5px; + .natureTitle{ margin-bottom: 5px; height: 20px; line-height: 20px; } + textarea{ width: 100%; height: 75px; background: rgba(145, 204, 255, 0.41); border: 1px solid #91CCFF; padding: 0; resize: none; outline: none; } + .natureImg{ margin-bottom: 5px; img{ width: auto; height: auto; max-width: 100%; } } + .natureUpload{ margin: 0; text-align: center; width: 50px; height: 50px; line-height: 50px; } + } +} +.natureLook{ + width: auto; + min-width: 170px; + box-sizing: border-box; + padding: 20px; + color: #fff; + .flowPower{ + width: 200px; + height: 50px; + display: flex; + font-size: 12px; + margin-bottom: 8px; + div{ flex: 1; line-height: 50px; margin-left: -10px; } + img { width: 40%; height: auto; vertical-align: top; } + label { display: inline-block; width: 60%; height: 100%; overflow: hidden; } + p{ width: 100%; height: 25px; line-height: 25px; margin: 0; } + input{ border: none; outline: none; background-color: transparent; width: 100%; height: 100%; } + } + .everyNature{ + margin-bottom: 8px; + font-size: 12px; + span{ margin-right: 10px; } + } +} + //右侧图标栏 .rightIcons{ width: 100px; @@ -286,7 +332,7 @@ flex: 1; font-size: 14px; p{ margin: 0; height: 20px; line-height: 18px; } - textarea{ width: 100%; height: 50px; background: rgba(145, 204, 255, 0.41); border: 1px solid #91CCFF; padding: 0; resize:none; outline: none; } + textarea{ width: 100%; height: 50px; background: rgba(145, 204, 255, 0.41); border: 1px solid #91CCFF; padding: 0; resize: none; outline: none; } } .planHeaderImg{ width: 100px; height: 100%; text-align: center; } .planHeaderVideo{ width: 120px; height: 100%; text-align: center; } diff --git a/src/app/pages/plan/plan.component.ts b/src/app/pages/plan/plan.component.ts index 45827e1..3d1ace7 100644 --- a/src/app/pages/plan/plan.component.ts +++ b/src/app/pages/plan/plan.component.ts @@ -116,6 +116,7 @@ export class PlanComponent implements OnInit { this.beforeOneSatus = StatusManager.getStatus(BuildingStatus); let buildingWindow: BuildingWindow = this.beforeOneSatus.buildingWindow; let fenceType: JYZInfoMoudleType = this.getFenceType(type) + this.isShowNature = false //隐藏属性栏 if (this.selectFence != type) { this.isShowChildComponent && this.leftDomain && type != 4 ? this.leftDomain.initComponent(type) : null; //手动初始化子组件 this.selectFence = type @@ -300,11 +301,15 @@ export class PlanComponent implements OnInit { e == 0 ? bootomDiv.scrollLeft = bootomDiv.scrollLeft + 50 : bootomDiv.scrollLeft = bootomDiv.scrollLeft - 50 } + isShowNature: boolean = false; //显隐设备 属性栏 beforeOnePropertyData: FacilityInfoUIItem = null; //当前选择 设备 + naturePosition: naturePosition = new naturePosition(); //设备栏 定位位置 //选中 设备 selectProperty(e: FacilityInfoUIItem) { + this.isShowNature = true this.beforeOnePropertyData = e + console.log(e.getPropertyData(),'选中设备') if (this.isShowChildComponent && this.leftDomain) { this.leftDomain.selectFacilityId = e.getID() } @@ -383,9 +388,14 @@ export class PlanComponent implements OnInit { this.isShowLoading = show; } - } +//属性栏 定位 +export class naturePosition { + top: string = "1%" + left: string = "50%" + right: string = "5%" +} // 处置预案 所有图标 export class planIcons { iconsName: string[] = ["灾情", "内部力量", "外部力量", "其他"] diff --git a/src/assets/images/flow.png b/src/assets/images/flow.png new file mode 100644 index 0000000..d7291b9 Binary files /dev/null and b/src/assets/images/flow.png differ diff --git a/src/assets/images/mark/disaster/dt.png b/src/assets/images/mark/disaster/dt.png new file mode 100644 index 0000000..e564828 Binary files /dev/null and b/src/assets/images/mark/disaster/dt.png differ diff --git a/src/assets/images/mark/disaster/h.png b/src/assets/images/mark/disaster/h.png new file mode 100644 index 0000000..e133579 Binary files /dev/null and b/src/assets/images/mark/disaster/h.png differ diff --git a/src/assets/images/mark/disaster/lyd.png b/src/assets/images/mark/disaster/lyd.png new file mode 100644 index 0000000..e564828 Binary files /dev/null and b/src/assets/images/mark/disaster/lyd.png differ diff --git a/src/assets/images/mark/disaster/lyx.png b/src/assets/images/mark/disaster/lyx.png new file mode 100644 index 0000000..e564828 Binary files /dev/null and b/src/assets/images/mark/disaster/lyx.png differ diff --git a/src/assets/images/mark/disaster/snh.png b/src/assets/images/mark/disaster/snh.png new file mode 100644 index 0000000..e133579 Binary files /dev/null and b/src/assets/images/mark/disaster/snh.png differ diff --git a/src/assets/images/mark/disaster/syd.png b/src/assets/images/mark/disaster/syd.png new file mode 100644 index 0000000..240c445 Binary files /dev/null and b/src/assets/images/mark/disaster/syd.png differ diff --git a/src/assets/images/mark/disaster/tph.png b/src/assets/images/mark/disaster/tph.png new file mode 100644 index 0000000..e133579 Binary files /dev/null and b/src/assets/images/mark/disaster/tph.png differ diff --git a/src/assets/images/mark/disaster/ywa.png b/src/assets/images/mark/disaster/ywa.png new file mode 100644 index 0000000..5246917 Binary files /dev/null and b/src/assets/images/mark/disaster/ywa.png differ diff --git a/src/assets/images/mark/disaster/ywb.png b/src/assets/images/mark/disaster/ywb.png new file mode 100644 index 0000000..5246917 Binary files /dev/null and b/src/assets/images/mark/disaster/ywb.png differ diff --git a/src/assets/images/mark/disaster/ywc.png b/src/assets/images/mark/disaster/ywc.png new file mode 100644 index 0000000..5246917 Binary files /dev/null and b/src/assets/images/mark/disaster/ywc.png differ diff --git a/src/assets/images/mark/inside/jl.png b/src/assets/images/mark/inside/jl.png new file mode 100644 index 0000000..58cf65e Binary files /dev/null and b/src/assets/images/mark/inside/jl.png differ diff --git a/src/assets/images/mark/inside/jyy.png b/src/assets/images/mark/inside/jyy.png new file mode 100644 index 0000000..e564828 Binary files /dev/null and b/src/assets/images/mark/inside/jyy.png differ diff --git a/src/assets/images/mark/inside/syy.png b/src/assets/images/mark/inside/syy.png new file mode 100644 index 0000000..e564828 Binary files /dev/null and b/src/assets/images/mark/inside/syy.png differ diff --git a/src/assets/images/mark/inside/xfsd.png b/src/assets/images/mark/inside/xfsd.png new file mode 100644 index 0000000..e564828 Binary files /dev/null and b/src/assets/images/mark/inside/xfsd.png differ diff --git a/src/assets/images/mark/inside/xfsq.png b/src/assets/images/mark/inside/xfsq.png new file mode 100644 index 0000000..e564828 Binary files /dev/null and b/src/assets/images/mark/inside/xfsq.png differ diff --git a/src/assets/images/mark/inside/xft.png b/src/assets/images/mark/inside/xft.png new file mode 100644 index 0000000..e564828 Binary files /dev/null and b/src/assets/images/mark/inside/xft.png differ diff --git a/src/assets/images/mark/inside/xyy.png b/src/assets/images/mark/inside/xyy.png new file mode 100644 index 0000000..e564828 Binary files /dev/null and b/src/assets/images/mark/inside/xyy.png differ diff --git a/src/assets/images/mark/inside/zg.png b/src/assets/images/mark/inside/zg.png new file mode 100644 index 0000000..0cd1b19 Binary files /dev/null and b/src/assets/images/mark/inside/zg.png differ diff --git a/src/assets/images/mark/other/ct.png b/src/assets/images/mark/other/ct.png new file mode 100644 index 0000000..3860648 Binary files /dev/null and b/src/assets/images/mark/other/ct.png differ diff --git a/src/assets/images/mark/other/gk.png b/src/assets/images/mark/other/gk.png new file mode 100644 index 0000000..0cd1b19 Binary files /dev/null and b/src/assets/images/mark/other/gk.png differ diff --git a/src/assets/images/mark/other/jca.png b/src/assets/images/mark/other/jca.png new file mode 100644 index 0000000..c2823e2 Binary files /dev/null and b/src/assets/images/mark/other/jca.png differ diff --git a/src/assets/images/mark/other/jglx.png b/src/assets/images/mark/other/jglx.png new file mode 100644 index 0000000..8b36605 Binary files /dev/null and b/src/assets/images/mark/other/jglx.png differ diff --git a/src/assets/images/mark/other/jjx.png b/src/assets/images/mark/other/jjx.png new file mode 100644 index 0000000..dff5a09 Binary files /dev/null and b/src/assets/images/mark/other/jjx.png differ diff --git a/src/assets/images/mark/other/qysda.png b/src/assets/images/mark/other/qysda.png new file mode 100644 index 0000000..309d3df Binary files /dev/null and b/src/assets/images/mark/other/qysda.png differ diff --git a/src/assets/images/mark/other/qysdb.png b/src/assets/images/mark/other/qysdb.png new file mode 100644 index 0000000..065d83f Binary files /dev/null and b/src/assets/images/mark/other/qysdb.png differ diff --git a/src/assets/images/mark/other/wz.png b/src/assets/images/mark/other/wz.png new file mode 100644 index 0000000..5afa00a Binary files /dev/null and b/src/assets/images/mark/other/wz.png differ diff --git a/src/assets/images/mark/outside/ga.png b/src/assets/images/mark/outside/ga.png new file mode 100644 index 0000000..56faf56 Binary files /dev/null and b/src/assets/images/mark/outside/ga.png differ diff --git a/src/assets/images/mark/outside/jc.png b/src/assets/images/mark/outside/jc.png new file mode 100644 index 0000000..e6475ce Binary files /dev/null and b/src/assets/images/mark/outside/jc.png differ diff --git a/src/assets/images/mark/outside/jhc.png b/src/assets/images/mark/outside/jhc.png new file mode 100644 index 0000000..698fafb Binary files /dev/null and b/src/assets/images/mark/outside/jhc.png differ diff --git a/src/assets/images/mark/outside/jj.png b/src/assets/images/mark/outside/jj.png new file mode 100644 index 0000000..1a33145 Binary files /dev/null and b/src/assets/images/mark/outside/jj.png differ diff --git a/src/assets/images/mark/outside/mhf.png b/src/assets/images/mark/outside/mhf.png new file mode 100644 index 0000000..661bdc8 Binary files /dev/null and b/src/assets/images/mark/outside/mhf.png differ diff --git a/src/assets/images/mark/outside/pmc.png b/src/assets/images/mark/outside/pmc.png new file mode 100644 index 0000000..9b62c0b Binary files /dev/null and b/src/assets/images/mark/outside/pmc.png differ diff --git a/src/assets/images/mark/outside/ys.png b/src/assets/images/mark/outside/ys.png new file mode 100644 index 0000000..b0179be Binary files /dev/null and b/src/assets/images/mark/outside/ys.png differ diff --git a/src/assets/images/power.png b/src/assets/images/power.png new file mode 100644 index 0000000..2eacd10 Binary files /dev/null and b/src/assets/images/power.png differ diff --git a/src/assets/mesh/mark/inside/jl/JL.bin b/src/assets/mesh/mark/inside/jl/JL.bin new file mode 100644 index 0000000..ab27f23 Binary files /dev/null and b/src/assets/mesh/mark/inside/jl/JL.bin differ diff --git a/src/assets/mesh/mark/inside/jl/JL.gltf b/src/assets/mesh/mark/inside/jl/JL.gltf new file mode 100644 index 0000000..8af202d --- /dev/null +++ b/src/assets/mesh/mark/inside/jl/JL.gltf @@ -0,0 +1,130 @@ +{ + "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" : [ + 0 + ] + } + ], + "nodes" : [ + { + "mesh" : 0, + "name" : "JingLi" + } + ], + "materials" : [ + { + "doubleSided" : true, + "name" : "JingLi", + "pbrMetallicRoughness" : { + "baseColorTexture" : { + "index" : 0 + }, + "metallicFactor" : 0 + } + } + ], + "meshes" : [ + { + "name" : "JingLi", + "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, + "material" : 0, + "mode" : 4 + } + ] + } + ], + "textures" : [ + { + "sampler" : 0, + "source" : 0 + } + ], + "images" : [ + { + "mimeType" : "image/png", + "name" : "JingLi", + "uri" : "JingLi.png" + } + ], + "accessors" : [ + { + "componentType" : 5126, + "count" : 2265, + "max" : [ + 0.294888436794281, + 1.8255571126937866, + 0.1540677845478058 + ], + "min" : [ + -0.2899564504623413, + -0.002153639914467931, + -0.1543898731470108 + ], + "type" : "VEC3" + }, + { + "componentType" : 5126, + "count" : 2265, + "type" : "VEC3" + }, + { + "componentType" : 5126, + "count" : 2265, + "type" : "VEC2" + }, + { + "componentType" : 5123, + "count" : 6720, + "type" : "SCALAR" + } + ], + "bufferViews" : [ + { + "buffer" : 0, + "byteLength" : 18953, + "byteOffset" : 0 + } + ], + "samplers" : [ + { + "magFilter" : 9729, + "minFilter" : 9987 + } + ], + "buffers" : [ + { + "byteLength" : 18956, + "uri" : "JL.bin" + } + ] +} diff --git a/src/assets/mesh/mark/inside/jl/JL.gltf.manifest b/src/assets/mesh/mark/inside/jl/JL.gltf.manifest new file mode 100644 index 0000000..1781cb5 --- /dev/null +++ b/src/assets/mesh/mark/inside/jl/JL.gltf.manifest @@ -0,0 +1,5 @@ +{ + "version" : 1, + "enableSceneOffline" : true, + "enableTexturesOffline" : true +} \ No newline at end of file diff --git a/src/assets/mesh/mark/inside/jl/JingLi.png b/src/assets/mesh/mark/inside/jl/JingLi.png new file mode 100644 index 0000000..c2018c5 Binary files /dev/null and b/src/assets/mesh/mark/inside/jl/JingLi.png differ diff --git a/src/assets/mesh/mark/inside/zg/ZG.bin b/src/assets/mesh/mark/inside/zg/ZG.bin new file mode 100644 index 0000000..81cbfcf Binary files /dev/null and b/src/assets/mesh/mark/inside/zg/ZG.bin differ diff --git a/src/assets/mesh/mark/inside/zg/ZG.gltf b/src/assets/mesh/mark/inside/zg/ZG.gltf new file mode 100644 index 0000000..d0d1dc2 --- /dev/null +++ b/src/assets/mesh/mark/inside/zg/ZG.gltf @@ -0,0 +1,278 @@ +{ + "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" : [ + 0 + ] + } + ], + "nodes" : [ + { + "mesh" : 0, + "name" : "ZhuGuan" + } + ], + "materials" : [ + { + "doubleSided" : true, + "name" : "ZhuGuanHead", + "pbrMetallicRoughness" : { + "baseColorTexture" : { + "index" : 0 + }, + "metallicFactor" : 0 + } + }, + { + "doubleSided" : true, + "name" : "ZhuGuanBody", + "pbrMetallicRoughness" : { + "baseColorTexture" : { + "index" : 1 + }, + "metallicFactor" : 0 + } + }, + { + "doubleSided" : true, + "name" : "ZhuGuanHair", + "pbrMetallicRoughness" : { + "baseColorTexture" : { + "index" : 2 + }, + "metallicFactor" : 0 + } + } + ], + "meshes" : [ + { + "name" : "ZhuGuan", + "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, + "material" : 0, + "mode" : 4 + }, + { + "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" : 1, + "mode" : 4 + }, + { + "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" : 2, + "mode" : 4 + } + ] + } + ], + "textures" : [ + { + "sampler" : 0, + "source" : 0 + }, + { + "sampler" : 0, + "source" : 1 + }, + { + "sampler" : 0, + "source" : 2 + } + ], + "images" : [ + { + "mimeType" : "image/jpeg", + "name" : "ZhuGuanHead", + "uri" : "ZhuGuanHead.jpg" + }, + { + "mimeType" : "image/jpeg", + "name" : "ZhuGuanBody", + "uri" : "ZhuGuanBody.jpg" + }, + { + "mimeType" : "image/png", + "name" : "ZhuGuanHair", + "uri" : "ZhuGuanHair.png" + } + ], + "accessors" : [ + { + "componentType" : 5126, + "count" : 1197, + "max" : [ + 0.09228011965751648, + 1.8159304857254028, + 0.14006438851356506 + ], + "min" : [ + -0.09851814061403275, + 1.4478205442428589, + -0.08274100720882416 + ], + "type" : "VEC3" + }, + { + "componentType" : 5126, + "count" : 1197, + "type" : "VEC3" + }, + { + "componentType" : 5126, + "count" : 1197, + "type" : "VEC2" + }, + { + "componentType" : 5123, + "count" : 5505, + "type" : "SCALAR" + }, + { + "componentType" : 5126, + "count" : 2476, + "max" : [ + 0.29248711466789246, + 1.6499481201171875, + 0.1415385901927948 + ], + "min" : [ + -0.2962494194507599, + -0.0008729100227355957, + -0.18568363785743713 + ], + "type" : "VEC3" + }, + { + "componentType" : 5126, + "count" : 2476, + "type" : "VEC3" + }, + { + "componentType" : 5126, + "count" : 2476, + "type" : "VEC2" + }, + { + "componentType" : 5123, + "count" : 10347, + "type" : "SCALAR" + }, + { + "componentType" : 5126, + "count" : 934, + "max" : [ + 0.08727983385324478, + 1.8330750465393066, + 0.12628629803657532 + ], + "min" : [ + -0.09116833657026291, + 1.6331498622894287, + -0.09298797696828842 + ], + "type" : "VEC3" + }, + { + "componentType" : 5126, + "count" : 934, + "type" : "VEC3" + }, + { + "componentType" : 5126, + "count" : 934, + "type" : "VEC2" + }, + { + "componentType" : 5123, + "count" : 2481, + "type" : "SCALAR" + } + ], + "bufferViews" : [ + { + "buffer" : 0, + "byteLength" : 10664, + "byteOffset" : 0 + }, + { + "buffer" : 0, + "byteLength" : 20262, + "byteOffset" : 10664 + }, + { + "buffer" : 0, + "byteLength" : 9127, + "byteOffset" : 30928 + } + ], + "samplers" : [ + { + "magFilter" : 9729, + "minFilter" : 9987 + } + ], + "buffers" : [ + { + "byteLength" : 40056, + "uri" : "ZG.bin" + } + ] +} diff --git a/src/assets/mesh/mark/inside/zg/ZG.gltf.manifest b/src/assets/mesh/mark/inside/zg/ZG.gltf.manifest new file mode 100644 index 0000000..1781cb5 --- /dev/null +++ b/src/assets/mesh/mark/inside/zg/ZG.gltf.manifest @@ -0,0 +1,5 @@ +{ + "version" : 1, + "enableSceneOffline" : true, + "enableTexturesOffline" : true +} \ No newline at end of file diff --git a/src/assets/mesh/mark/inside/zg/ZhuGuanBody.jpg b/src/assets/mesh/mark/inside/zg/ZhuGuanBody.jpg new file mode 100644 index 0000000..827296b Binary files /dev/null and b/src/assets/mesh/mark/inside/zg/ZhuGuanBody.jpg differ diff --git a/src/assets/mesh/mark/inside/zg/ZhuGuanHair.png b/src/assets/mesh/mark/inside/zg/ZhuGuanHair.png new file mode 100644 index 0000000..722ea94 Binary files /dev/null and b/src/assets/mesh/mark/inside/zg/ZhuGuanHair.png differ diff --git a/src/assets/mesh/mark/inside/zg/ZhuGuanHead.jpg b/src/assets/mesh/mark/inside/zg/ZhuGuanHead.jpg new file mode 100644 index 0000000..9cbcb9e Binary files /dev/null and b/src/assets/mesh/mark/inside/zg/ZhuGuanHead.jpg differ diff --git a/src/assets/mesh/mark/other/gk/FuZong.jpg b/src/assets/mesh/mark/other/gk/FuZong.jpg new file mode 100644 index 0000000..0117ebb Binary files /dev/null and b/src/assets/mesh/mark/other/gk/FuZong.jpg differ diff --git a/src/assets/mesh/mark/other/gk/GK.bin b/src/assets/mesh/mark/other/gk/GK.bin new file mode 100644 index 0000000..66d2ed4 Binary files /dev/null and b/src/assets/mesh/mark/other/gk/GK.bin differ diff --git a/src/assets/mesh/mark/other/gk/GK.gltf b/src/assets/mesh/mark/other/gk/GK.gltf new file mode 100644 index 0000000..0f797d2 --- /dev/null +++ b/src/assets/mesh/mark/other/gk/GK.gltf @@ -0,0 +1,130 @@ +{ + "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" : [ + 0 + ] + } + ], + "nodes" : [ + { + "mesh" : 0, + "name" : "FZ" + } + ], + "materials" : [ + { + "doubleSided" : true, + "name" : "FuZong", + "pbrMetallicRoughness" : { + "baseColorTexture" : { + "index" : 0 + }, + "metallicFactor" : 0 + } + } + ], + "meshes" : [ + { + "name" : "FuZong", + "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, + "material" : 0, + "mode" : 4 + } + ] + } + ], + "textures" : [ + { + "sampler" : 0, + "source" : 0 + } + ], + "images" : [ + { + "mimeType" : "image/jpeg", + "name" : "FuZong", + "uri" : "FuZong.jpg" + } + ], + "accessors" : [ + { + "componentType" : 5126, + "count" : 3206, + "max" : [ + 0.2624218761920929, + 1.6847517490386963, + 0.1686718910932541 + ], + "min" : [ + -0.26234373450279236, + 2.593356475699693e-05, + -0.16867190599441528 + ], + "type" : "VEC3" + }, + { + "componentType" : 5126, + "count" : 3206, + "type" : "VEC3" + }, + { + "componentType" : 5126, + "count" : 3206, + "type" : "VEC2" + }, + { + "componentType" : 5123, + "count" : 11262, + "type" : "SCALAR" + } + ], + "bufferViews" : [ + { + "buffer" : 0, + "byteLength" : 25392, + "byteOffset" : 0 + } + ], + "samplers" : [ + { + "magFilter" : 9729, + "minFilter" : 9987 + } + ], + "buffers" : [ + { + "byteLength" : 25392, + "uri" : "GKbin" + } + ] +} diff --git a/src/assets/mesh/mark/other/gk/GK.gltf.manifest b/src/assets/mesh/mark/other/gk/GK.gltf.manifest new file mode 100644 index 0000000..1781cb5 --- /dev/null +++ b/src/assets/mesh/mark/other/gk/GK.gltf.manifest @@ -0,0 +1,5 @@ +{ + "version" : 1, + "enableSceneOffline" : true, + "enableTexturesOffline" : true +} \ No newline at end of file diff --git a/src/assets/mesh/mark/other/jca/JCA.bin b/src/assets/mesh/mark/other/jca/JCA.bin new file mode 100644 index 0000000..9c5a46f Binary files /dev/null and b/src/assets/mesh/mark/other/jca/JCA.bin differ diff --git a/src/assets/mesh/mark/other/jca/JCA.gltf b/src/assets/mesh/mark/other/jca/JCA.gltf new file mode 100644 index 0000000..4d85a90 --- /dev/null +++ b/src/assets/mesh/mark/other/jca/JCA.gltf @@ -0,0 +1,461 @@ +{ + "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" : [ + 0, + 1, + 2, + 3, + 4 + ] + } + ], + "nodes" : [ + { + "mesh" : 0, + "name" : "FL", + "rotation" : [ + 0.7071068286895752, + 0, + 0, + 0.7071068286895752 + ], + "scale" : [ + 0.009999999776482582, + 0.009999999776482582, + 0.009999999776482582 + ], + "translation" : [ + -1.0985089540481567, + 0.4814870059490204, + -2.133125066757202 + ] + }, + { + "mesh" : 1, + "name" : "BL", + "rotation" : [ + 0.7071068286895752, + 0, + 0, + 0.7071068286895752 + ], + "scale" : [ + 0.009999999776482582, + 0.009999999776482582, + 0.009999999776482582 + ], + "translation" : [ + -1.0985089540481567, + 0.4814870059490204, + 1.7678910493850708 + ] + }, + { + "mesh" : 2, + "name" : "BR", + "rotation" : [ + 0.7071068286895752, + 0, + 0, + 0.7071068286895752 + ], + "scale" : [ + 0.009999999776482582, + 0.009999999776482582, + 0.009999999776482582 + ], + "translation" : [ + 1.1095609664916992, + 0.4814870059490204, + 1.7678910493850708 + ] + }, + { + "mesh" : 3, + "name" : "FR", + "rotation" : [ + 0.7071068286895752, + 0, + 0, + 0.7071068286895752 + ], + "scale" : [ + 0.009999999776482582, + 0.009999999776482582, + 0.009999999776482582 + ], + "translation" : [ + 1.1095609664916992, + 0.4814870059490204, + -2.133125066757202 + ] + }, + { + "mesh" : 4, + "name" : "Body", + "rotation" : [ + 0.7071068286895752, + 0, + 0, + 0.7071068286895752 + ], + "scale" : [ + 0.009999999776482582, + 0.009999999776482582, + 0.009999999776482582 + ], + "translation" : [ + 0, + 1.0828319787979126, + 0 + ] + } + ], + "materials" : [ + { + "doubleSided" : true, + "name" : "JiaoCheA", + "pbrMetallicRoughness" : { + "baseColorTexture" : { + "index" : 0 + }, + "metallicFactor" : 0, + "roughnessFactor" : 0.5 + } + } + ], + "meshes" : [ + { + "name" : "yk-CLS Wheel", + "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, + "material" : 0, + "mode" : 4 + } + ] + }, + { + "name" : "yk-CLS Wheel.001", + "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" : 3, + "material" : 0, + "mode" : 4 + } + ] + }, + { + "name" : "yk-CLS Wheel.002", + "primitives" : [ + { + "attributes" : { + "POSITION" : 7, + "NORMAL" : 8, + "TEXCOORD_0" : 9 + }, + "extensions" : { + "KHR_draco_mesh_compression" : { + "bufferView" : 2, + "attributes" : { + "POSITION" : 0, + "NORMAL" : 1, + "TEXCOORD_0" : 2 + } + } + }, + "indices" : 10, + "material" : 0, + "mode" : 4 + } + ] + }, + { + "name" : "yk-CLS Wheel.003", + "primitives" : [ + { + "attributes" : { + "POSITION" : 11, + "NORMAL" : 12, + "TEXCOORD_0" : 13 + }, + "extensions" : { + "KHR_draco_mesh_compression" : { + "bufferView" : 3, + "attributes" : { + "POSITION" : 0, + "NORMAL" : 1, + "TEXCOORD_0" : 2 + } + } + }, + "indices" : 10, + "material" : 0, + "mode" : 4 + } + ] + }, + { + "name" : "yk-CLS Body", + "primitives" : [ + { + "attributes" : { + "POSITION" : 14, + "NORMAL" : 15, + "TEXCOORD_0" : 16 + }, + "extensions" : { + "KHR_draco_mesh_compression" : { + "bufferView" : 4, + "attributes" : { + "POSITION" : 0, + "NORMAL" : 1, + "TEXCOORD_0" : 2 + } + } + }, + "indices" : 17, + "material" : 0, + "mode" : 4 + } + ] + } + ], + "textures" : [ + { + "sampler" : 0, + "source" : 0 + } + ], + "images" : [ + { + "mimeType" : "image/jpeg", + "name" : "JiaoCheA", + "uri" : "JiaoCheA.jpg" + } + ], + "accessors" : [ + { + "componentType" : 5126, + "count" : 234, + "max" : [ + 17.92121124267578, + 47.514617919921875, + 46.79276657104492 + ], + "min" : [ + -17.92116928100586, + -47.514625549316406, + -46.79276657104492 + ], + "type" : "VEC3" + }, + { + "componentType" : 5126, + "count" : 234, + "type" : "VEC3" + }, + { + "componentType" : 5126, + "count" : 234, + "type" : "VEC2" + }, + { + "componentType" : 5123, + "count" : 1392, + "type" : "SCALAR" + }, + { + "componentType" : 5126, + "count" : 234, + "max" : [ + 17.92121124267578, + 47.514739990234375, + 46.79276657104492 + ], + "min" : [ + -17.92116928100586, + -47.514503479003906, + -46.79276657104492 + ], + "type" : "VEC3" + }, + { + "componentType" : 5126, + "count" : 234, + "type" : "VEC3" + }, + { + "componentType" : 5126, + "count" : 234, + "type" : "VEC2" + }, + { + "componentType" : 5126, + "count" : 234, + "max" : [ + 17.92116928100586, + 47.51475524902344, + 46.792781829833984 + ], + "min" : [ + -17.92121696472168, + -47.514522552490234, + -46.79277801513672 + ], + "type" : "VEC3" + }, + { + "componentType" : 5126, + "count" : 234, + "type" : "VEC3" + }, + { + "componentType" : 5126, + "count" : 234, + "type" : "VEC2" + }, + { + "componentType" : 5123, + "count" : 1392, + "type" : "SCALAR" + }, + { + "componentType" : 5126, + "count" : 234, + "max" : [ + 17.92116928100586, + 47.51463317871094, + 46.792781829833984 + ], + "min" : [ + -17.92121696472168, + -47.514644622802734, + -46.79277801513672 + ], + "type" : "VEC3" + }, + { + "componentType" : 5126, + "count" : 234, + "type" : "VEC3" + }, + { + "componentType" : 5126, + "count" : 234, + "type" : "VEC2" + }, + { + "componentType" : 5126, + "count" : 5408, + "max" : [ + 138.19265747070312, + 336.4250183105469, + 84.43877410888672 + ], + "min" : [ + -138.19268798828125, + -336.4249267578125, + -84.43873596191406 + ], + "type" : "VEC3" + }, + { + "componentType" : 5126, + "count" : 5408, + "type" : "VEC3" + }, + { + "componentType" : 5126, + "count" : 5408, + "type" : "VEC2" + }, + { + "componentType" : 5123, + "count" : 16962, + "type" : "SCALAR" + } + ], + "bufferViews" : [ + { + "buffer" : 0, + "byteLength" : 2386, + "byteOffset" : 0 + }, + { + "buffer" : 0, + "byteLength" : 2386, + "byteOffset" : 2388 + }, + { + "buffer" : 0, + "byteLength" : 2416, + "byteOffset" : 4776 + }, + { + "buffer" : 0, + "byteLength" : 2416, + "byteOffset" : 7192 + }, + { + "buffer" : 0, + "byteLength" : 41863, + "byteOffset" : 9608 + } + ], + "samplers" : [ + { + "magFilter" : 9729, + "minFilter" : 9987 + } + ], + "buffers" : [ + { + "byteLength" : 51472, + "uri" : "JCA.bin" + } + ] +} diff --git a/src/assets/mesh/mark/other/jca/JCA.gltf.manifest b/src/assets/mesh/mark/other/jca/JCA.gltf.manifest new file mode 100644 index 0000000..1781cb5 --- /dev/null +++ b/src/assets/mesh/mark/other/jca/JCA.gltf.manifest @@ -0,0 +1,5 @@ +{ + "version" : 1, + "enableSceneOffline" : true, + "enableTexturesOffline" : true +} \ No newline at end of file diff --git a/src/assets/mesh/mark/other/jca/JiaoCheA.jpg b/src/assets/mesh/mark/other/jca/JiaoCheA.jpg new file mode 100644 index 0000000..d6c2f2d Binary files /dev/null and b/src/assets/mesh/mark/other/jca/JiaoCheA.jpg differ diff --git a/src/assets/mesh/mark/other/wz/WZ.bin b/src/assets/mesh/mark/other/wz/WZ.bin new file mode 100644 index 0000000..f9d78ec Binary files /dev/null and b/src/assets/mesh/mark/other/wz/WZ.bin differ diff --git a/src/assets/mesh/mark/other/wz/WZ.gltf b/src/assets/mesh/mark/other/wz/WZ.gltf new file mode 100644 index 0000000..4deda10 --- /dev/null +++ b/src/assets/mesh/mark/other/wz/WZ.gltf @@ -0,0 +1,114 @@ +{ + "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" : [ + 0 + ] + } + ], + "nodes" : [ + { + "mesh" : 0, + "name" : "WenZi" + } + ], + "materials" : [ + { + "doubleSided" : true, + "name" : "Red", + "pbrMetallicRoughness" : { + "baseColorFactor" : [ + 0.9550902247428894, + 0.014668499119579792, + 0.008405414409935474, + 1 + ], + "metallicFactor" : 0 + } + } + ], + "meshes" : [ + { + "name" : "WenZi", + "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, + "material" : 0, + "mode" : 4 + } + ] + } + ], + "accessors" : [ + { + "componentType" : 5126, + "count" : 1770, + "max" : [ + 0.08586336672306061, + 0.5111521482467651, + 0.03383050486445427 + ], + "min" : [ + -0.08586336672306061, + 7.233956544894227e-09, + -0.03383046016097069 + ], + "type" : "VEC3" + }, + { + "componentType" : 5126, + "count" : 1770, + "type" : "VEC3" + }, + { + "componentType" : 5126, + "count" : 1770, + "type" : "VEC2" + }, + { + "componentType" : 5123, + "count" : 2184, + "type" : "SCALAR" + } + ], + "bufferViews" : [ + { + "buffer" : 0, + "byteLength" : 10260, + "byteOffset" : 0 + } + ], + "buffers" : [ + { + "byteLength" : 10260, + "uri" : "WZ.bin" + } + ] +} diff --git a/src/assets/mesh/mark/other/wz/WZ.gltf.manifest b/src/assets/mesh/mark/other/wz/WZ.gltf.manifest new file mode 100644 index 0000000..1781cb5 --- /dev/null +++ b/src/assets/mesh/mark/other/wz/WZ.gltf.manifest @@ -0,0 +1,5 @@ +{ + "version" : 1, + "enableSceneOffline" : true, + "enableTexturesOffline" : true +} \ No newline at end of file diff --git a/src/assets/mesh/mark/outside/ga/GA.bin b/src/assets/mesh/mark/outside/ga/GA.bin new file mode 100644 index 0000000..7a11dfc Binary files /dev/null and b/src/assets/mesh/mark/outside/ga/GA.bin differ diff --git a/src/assets/mesh/mark/outside/ga/GA.gltf b/src/assets/mesh/mark/outside/ga/GA.gltf new file mode 100644 index 0000000..3daeb3a --- /dev/null +++ b/src/assets/mesh/mark/outside/ga/GA.gltf @@ -0,0 +1,130 @@ +{ + "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" : [ + 0 + ] + } + ], + "nodes" : [ + { + "mesh" : 0, + "name" : "Body" + } + ], + "materials" : [ + { + "doubleSided" : true, + "name" : "MinJing_Color", + "pbrMetallicRoughness" : { + "baseColorTexture" : { + "index" : 0 + }, + "metallicFactor" : 0 + } + } + ], + "meshes" : [ + { + "name" : "Body", + "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, + "material" : 0, + "mode" : 4 + } + ] + } + ], + "textures" : [ + { + "sampler" : 0, + "source" : 0 + } + ], + "images" : [ + { + "mimeType" : "image/png", + "name" : "MinJing_Color", + "uri" : "MinJing_Color.png" + } + ], + "accessors" : [ + { + "componentType" : 5126, + "count" : 4255, + "max" : [ + 0.2961918115615845, + 1.8704509735107422, + 0.16374512016773224 + ], + "min" : [ + -0.2781335115432739, + -0.0019856898579746485, + -0.1792096644639969 + ], + "type" : "VEC3" + }, + { + "componentType" : 5126, + "count" : 4255, + "type" : "VEC3" + }, + { + "componentType" : 5126, + "count" : 4255, + "type" : "VEC2" + }, + { + "componentType" : 5123, + "count" : 15249, + "type" : "SCALAR" + } + ], + "bufferViews" : [ + { + "buffer" : 0, + "byteLength" : 34259, + "byteOffset" : 0 + } + ], + "samplers" : [ + { + "magFilter" : 9729, + "minFilter" : 9987 + } + ], + "buffers" : [ + { + "byteLength" : 34260, + "uri" : "GA.bin" + } + ] +} diff --git a/src/assets/mesh/mark/outside/ga/GA.gltf.manifest b/src/assets/mesh/mark/outside/ga/GA.gltf.manifest new file mode 100644 index 0000000..1781cb5 --- /dev/null +++ b/src/assets/mesh/mark/outside/ga/GA.gltf.manifest @@ -0,0 +1,5 @@ +{ + "version" : 1, + "enableSceneOffline" : true, + "enableTexturesOffline" : true +} \ No newline at end of file diff --git a/src/assets/mesh/mark/outside/ga/MinJing_Color.png b/src/assets/mesh/mark/outside/ga/MinJing_Color.png new file mode 100644 index 0000000..78a107f Binary files /dev/null and b/src/assets/mesh/mark/outside/ga/MinJing_Color.png differ diff --git a/src/assets/mesh/mark/outside/jc/JC.bin b/src/assets/mesh/mark/outside/jc/JC.bin new file mode 100644 index 0000000..e8ff128 Binary files /dev/null and b/src/assets/mesh/mark/outside/jc/JC.bin differ diff --git a/src/assets/mesh/mark/outside/jc/JC.gltf b/src/assets/mesh/mark/outside/jc/JC.gltf new file mode 100644 index 0000000..ff9b620 --- /dev/null +++ b/src/assets/mesh/mark/outside/jc/JC.gltf @@ -0,0 +1,642 @@ +{ + "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 + ] + } + ], + "nodes" : [ + { + "mesh" : 0, + "name" : "BL", + "translation" : [ + 0.8741393685340881, + 0.3686968684196472, + -2.096468687057495 + ] + }, + { + "mesh" : 1, + "name" : "BR", + "translation" : [ + -0.8716365694999695, + 0.3686968684196472, + -2.096468925476074 + ] + }, + { + "mesh" : 2, + "name" : "FL", + "translation" : [ + 0.8741394877433777, + 0.3686963617801666, + 2.2105014324188232 + ] + }, + { + "mesh" : 3, + "name" : "FR", + "translation" : [ + -0.8716368079185486, + 0.3686964213848114, + 2.2105019092559814 + ] + }, + { + "children" : [ + 0, + 1, + 2, + 3 + ], + "name" : "Wheels" + }, + { + "mesh" : 4, + "name" : "Body" + } + ], + "materials" : [ + { + "doubleSided" : true, + "name" : "Jiaojingzhihuiche", + "pbrMetallicRoughness" : { + "baseColorTexture" : { + "index" : 0 + }, + "metallicFactor" : 0, + "roughnessFactor" : 0.5 + } + }, + { + "doubleSided" : true, + "name" : "Glass", + "pbrMetallicRoughness" : { + "baseColorFactor" : [ + 0.054958075284957886, + 0.044052742421627045, + 0.044052742421627045, + 1 + ], + "metallicFactor" : 0, + "roughnessFactor" : 0.15000000596046448 + } + }, + { + "doubleSided" : true, + "name" : "Red", + "pbrMetallicRoughness" : { + "baseColorFactor" : [ + 0.800000011920929, + 0, + 0, + 1 + ], + "metallicFactor" : 0, + "roughnessFactor" : 0.5 + } + }, + { + "doubleSided" : true, + "name" : "Blue", + "pbrMetallicRoughness" : { + "baseColorFactor" : [ + 0, + 0, + 0.800000011920929, + 1 + ], + "metallicFactor" : 0, + "roughnessFactor" : 0.5 + } + } + ], + "meshes" : [ + { + "name" : "BL.001", + "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, + "material" : 0, + "mode" : 4 + } + ] + }, + { + "name" : "BR.001", + "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" : 3, + "material" : 0, + "mode" : 4 + } + ] + }, + { + "name" : "FL.001", + "primitives" : [ + { + "attributes" : { + "POSITION" : 7, + "NORMAL" : 8, + "TEXCOORD_0" : 9 + }, + "extensions" : { + "KHR_draco_mesh_compression" : { + "bufferView" : 2, + "attributes" : { + "POSITION" : 0, + "NORMAL" : 1, + "TEXCOORD_0" : 2 + } + } + }, + "indices" : 10, + "material" : 0, + "mode" : 4 + } + ] + }, + { + "name" : "FR.001", + "primitives" : [ + { + "attributes" : { + "POSITION" : 11, + "NORMAL" : 12, + "TEXCOORD_0" : 13 + }, + "extensions" : { + "KHR_draco_mesh_compression" : { + "bufferView" : 3, + "attributes" : { + "POSITION" : 0, + "NORMAL" : 1, + "TEXCOORD_0" : 2 + } + } + }, + "indices" : 10, + "material" : 0, + "mode" : 4 + } + ] + }, + { + "name" : "Body", + "primitives" : [ + { + "attributes" : { + "POSITION" : 14, + "NORMAL" : 15, + "TEXCOORD_0" : 16, + "TEXCOORD_1" : 17 + }, + "extensions" : { + "KHR_draco_mesh_compression" : { + "bufferView" : 4, + "attributes" : { + "POSITION" : 0, + "NORMAL" : 1, + "TEXCOORD_0" : 2, + "TEXCOORD_1" : 3 + } + } + }, + "indices" : 18, + "material" : 1, + "mode" : 4 + }, + { + "attributes" : { + "POSITION" : 19, + "NORMAL" : 20, + "TEXCOORD_0" : 21, + "TEXCOORD_1" : 22 + }, + "extensions" : { + "KHR_draco_mesh_compression" : { + "bufferView" : 5, + "attributes" : { + "POSITION" : 0, + "NORMAL" : 1, + "TEXCOORD_0" : 2, + "TEXCOORD_1" : 3 + } + } + }, + "indices" : 23, + "material" : 2, + "mode" : 4 + }, + { + "attributes" : { + "POSITION" : 24, + "NORMAL" : 25, + "TEXCOORD_0" : 26, + "TEXCOORD_1" : 27 + }, + "extensions" : { + "KHR_draco_mesh_compression" : { + "bufferView" : 6, + "attributes" : { + "POSITION" : 0, + "NORMAL" : 1, + "TEXCOORD_0" : 2, + "TEXCOORD_1" : 3 + } + } + }, + "indices" : 28, + "material" : 3, + "mode" : 4 + }, + { + "attributes" : { + "POSITION" : 29, + "NORMAL" : 30, + "TEXCOORD_0" : 31, + "TEXCOORD_1" : 32 + }, + "extensions" : { + "KHR_draco_mesh_compression" : { + "bufferView" : 7, + "attributes" : { + "POSITION" : 0, + "NORMAL" : 1, + "TEXCOORD_0" : 2, + "TEXCOORD_1" : 3 + } + } + }, + "indices" : 33, + "material" : 0, + "mode" : 4 + } + ] + } + ], + "textures" : [ + { + "sampler" : 0, + "source" : 0 + } + ], + "images" : [ + { + "mimeType" : "image/jpeg", + "name" : "Jiaojingzhihuiche", + "uri" : "Jiaojingzhihuiche.jpg" + } + ], + "accessors" : [ + { + "componentType" : 5126, + "count" : 274, + "max" : [ + 0.11223506927490234, + 0.36417192220687866, + 0.3703547716140747 + ], + "min" : [ + -0.11223471164703369, + -0.3651561141014099, + -0.37004566192626953 + ], + "type" : "VEC3" + }, + { + "componentType" : 5126, + "count" : 274, + "type" : "VEC3" + }, + { + "componentType" : 5126, + "count" : 274, + "type" : "VEC2" + }, + { + "componentType" : 5123, + "count" : 1188, + "type" : "SCALAR" + }, + { + "componentType" : 5126, + "count" : 274, + "max" : [ + 0.11223495006561279, + 0.36417192220687866, + 0.3703550100326538 + ], + "min" : [ + -0.11223489046096802, + -0.3651561141014099, + -0.37004542350769043 + ], + "type" : "VEC3" + }, + { + "componentType" : 5126, + "count" : 274, + "type" : "VEC3" + }, + { + "componentType" : 5126, + "count" : 274, + "type" : "VEC2" + }, + { + "componentType" : 5126, + "count" : 274, + "max" : [ + 0.11223495006561279, + 0.3641718327999115, + 0.37035560607910156 + ], + "min" : [ + -0.11223483085632324, + -0.3651562035083771, + -0.370044469833374 + ], + "type" : "VEC3" + }, + { + "componentType" : 5126, + "count" : 274, + "type" : "VEC3" + }, + { + "componentType" : 5126, + "count" : 274, + "type" : "VEC2" + }, + { + "componentType" : 5123, + "count" : 1188, + "type" : "SCALAR" + }, + { + "componentType" : 5126, + "count" : 274, + "max" : [ + 0.1122351884841919, + 0.3641717731952667, + 0.37035512924194336 + ], + "min" : [ + -0.11223465204238892, + -0.36515626311302185, + -0.3700449466705322 + ], + "type" : "VEC3" + }, + { + "componentType" : 5126, + "count" : 274, + "type" : "VEC3" + }, + { + "componentType" : 5126, + "count" : 274, + "type" : "VEC2" + }, + { + "componentType" : 5126, + "count" : 86, + "max" : [ + 0.9621924161911011, + 2.353841781616211, + 2.2372875213623047 + ], + "min" : [ + -0.9623246788978577, + 1.4734232425689697, + -2.966947317123413 + ], + "type" : "VEC3" + }, + { + "componentType" : 5126, + "count" : 86, + "type" : "VEC3" + }, + { + "componentType" : 5126, + "count" : 86, + "type" : "VEC2" + }, + { + "componentType" : 5126, + "count" : 86, + "type" : "VEC2" + }, + { + "componentType" : 5123, + "count" : 192, + "type" : "SCALAR" + }, + { + "componentType" : 5126, + "count" : 32, + "max" : [ + 0.7121754288673401, + 2.872901678085327, + 0.819999635219574 + ], + "min" : [ + 0.17550039291381836, + 2.72139573097229, + 0.5596964359283447 + ], + "type" : "VEC3" + }, + { + "componentType" : 5126, + "count" : 32, + "type" : "VEC3" + }, + { + "componentType" : 5126, + "count" : 32, + "type" : "VEC2" + }, + { + "componentType" : 5126, + "count" : 32, + "type" : "VEC2" + }, + { + "componentType" : 5123, + "count" : 66, + "type" : "SCALAR" + }, + { + "componentType" : 5126, + "count" : 32, + "max" : [ + -0.16407783329486847, + 2.872901678085327, + 0.819999635219574 + ], + "min" : [ + -0.6491308212280273, + 2.72139573097229, + 0.5596964359283447 + ], + "type" : "VEC3" + }, + { + "componentType" : 5126, + "count" : 32, + "type" : "VEC3" + }, + { + "componentType" : 5126, + "count" : 32, + "type" : "VEC2" + }, + { + "componentType" : 5126, + "count" : 32, + "type" : "VEC2" + }, + { + "componentType" : 5123, + "count" : 66, + "type" : "SCALAR" + }, + { + "componentType" : 5126, + "count" : 5279, + "max" : [ + 1.2398207187652588, + 2.872901678085327, + 3.000600576400757 + ], + "min" : [ + -1.2397969961166382, + 0.31551486253738403, + -3.079669713973999 + ], + "type" : "VEC3" + }, + { + "componentType" : 5126, + "count" : 5279, + "type" : "VEC3" + }, + { + "componentType" : 5126, + "count" : 5279, + "type" : "VEC2" + }, + { + "componentType" : 5126, + "count" : 5279, + "type" : "VEC2" + }, + { + "componentType" : 5123, + "count" : 12702, + "type" : "SCALAR" + } + ], + "bufferViews" : [ + { + "buffer" : 0, + "byteLength" : 2746, + "byteOffset" : 0 + }, + { + "buffer" : 0, + "byteLength" : 2746, + "byteOffset" : 2748 + }, + { + "buffer" : 0, + "byteLength" : 2747, + "byteOffset" : 5496 + }, + { + "buffer" : 0, + "byteLength" : 2747, + "byteOffset" : 8244 + }, + { + "buffer" : 0, + "byteLength" : 896, + "byteOffset" : 10992 + }, + { + "buffer" : 0, + "byteLength" : 489, + "byteOffset" : 11888 + }, + { + "buffer" : 0, + "byteLength" : 469, + "byteOffset" : 12380 + }, + { + "buffer" : 0, + "byteLength" : 52281, + "byteOffset" : 12852 + } + ], + "samplers" : [ + { + "magFilter" : 9729, + "minFilter" : 9987 + } + ], + "buffers" : [ + { + "byteLength" : 65136, + "uri" : "JC.bin" + } + ] +} diff --git a/src/assets/mesh/mark/outside/jc/JC.gltf.manifest b/src/assets/mesh/mark/outside/jc/JC.gltf.manifest new file mode 100644 index 0000000..1781cb5 --- /dev/null +++ b/src/assets/mesh/mark/outside/jc/JC.gltf.manifest @@ -0,0 +1,5 @@ +{ + "version" : 1, + "enableSceneOffline" : true, + "enableTexturesOffline" : true +} \ No newline at end of file diff --git a/src/assets/mesh/mark/outside/jc/Jiaojingzhihuiche.jpg b/src/assets/mesh/mark/outside/jc/Jiaojingzhihuiche.jpg new file mode 100644 index 0000000..5b93bce Binary files /dev/null and b/src/assets/mesh/mark/outside/jc/Jiaojingzhihuiche.jpg differ diff --git a/src/assets/mesh/mark/outside/jhc/JHC.bin b/src/assets/mesh/mark/outside/jhc/JHC.bin new file mode 100644 index 0000000..59527f7 Binary files /dev/null and b/src/assets/mesh/mark/outside/jhc/JHC.bin differ diff --git a/src/assets/mesh/mark/outside/jhc/JHC.gltf b/src/assets/mesh/mark/outside/jhc/JHC.gltf new file mode 100644 index 0000000..468b88a --- /dev/null +++ b/src/assets/mesh/mark/outside/jhc/JHC.gltf @@ -0,0 +1,663 @@ +{ + "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 + ] + } + ], + "nodes" : [ + { + "mesh" : 0, + "name" : "BL", + "translation" : [ + 89.86991119384766, + -243.82618713378906, + -39.0037841796875 + ] + }, + { + "mesh" : 1, + "name" : "BR", + "translation" : [ + -89.59562683105469, + -243.82618713378906, + -39.00377655029297 + ] + }, + { + "mesh" : 2, + "name" : "FL", + "translation" : [ + 89.86988830566406, + 198.93002319335938, + -39.00377655029297 + ] + }, + { + "mesh" : 3, + "name" : "FR", + "translation" : [ + -89.59563446044922, + 198.93002319335938, + -39.00377655029297 + ] + }, + { + "children" : [ + 0, + 1, + 2, + 3 + ], + "name" : "Wheels", + "rotation" : [ + 0.7071068286895752, + 0, + 0, + 0.7071068286895752 + ], + "scale" : [ + 0.009999999776482582, + 0.009999999776482582, + 0.009999999776482582 + ] + }, + { + "mesh" : 4, + "name" : "Body" + } + ], + "materials" : [ + { + "doubleSided" : true, + "name" : "jiuhuchecc", + "pbrMetallicRoughness" : { + "baseColorTexture" : { + "index" : 0 + }, + "metallicFactor" : 0, + "roughnessFactor" : 0.5 + } + }, + { + "doubleSided" : true, + "name" : "Glass", + "pbrMetallicRoughness" : { + "baseColorFactor" : [ + 0.054958075284957886, + 0.044052742421627045, + 0.044052742421627045, + 1 + ], + "metallicFactor" : 0, + "roughnessFactor" : 0.15000000596046448 + } + }, + { + "doubleSided" : true, + "name" : "Blue", + "pbrMetallicRoughness" : { + "baseColorFactor" : [ + 0, + 0, + 0.6743999719619751, + 1 + ], + "metallicFactor" : 0, + "roughnessFactor" : 0.5 + } + }, + { + "doubleSided" : true, + "name" : "Red", + "pbrMetallicRoughness" : { + "baseColorFactor" : [ + 0.800000011920929, + 0, + 0, + 1 + ], + "metallicFactor" : 0, + "roughnessFactor" : 0.5 + } + } + ], + "meshes" : [ + { + "name" : "BL", + "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, + "material" : 0, + "mode" : 4 + } + ] + }, + { + "name" : "BR", + "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" : "FL", + "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" : 0, + "mode" : 4 + } + ] + }, + { + "name" : "FR", + "primitives" : [ + { + "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" : 0, + "mode" : 4 + } + ] + }, + { + "name" : "Body", + "primitives" : [ + { + "attributes" : { + "POSITION" : 16, + "NORMAL" : 17, + "TEXCOORD_0" : 18, + "TEXCOORD_1" : 19 + }, + "extensions" : { + "KHR_draco_mesh_compression" : { + "bufferView" : 4, + "attributes" : { + "POSITION" : 0, + "NORMAL" : 1, + "TEXCOORD_0" : 2, + "TEXCOORD_1" : 3 + } + } + }, + "indices" : 20, + "material" : 0, + "mode" : 4 + }, + { + "attributes" : { + "POSITION" : 21, + "NORMAL" : 22, + "TEXCOORD_0" : 23, + "TEXCOORD_1" : 24 + }, + "extensions" : { + "KHR_draco_mesh_compression" : { + "bufferView" : 5, + "attributes" : { + "POSITION" : 0, + "NORMAL" : 1, + "TEXCOORD_0" : 2, + "TEXCOORD_1" : 3 + } + } + }, + "indices" : 25, + "material" : 1, + "mode" : 4 + }, + { + "attributes" : { + "POSITION" : 26, + "NORMAL" : 27, + "TEXCOORD_0" : 28, + "TEXCOORD_1" : 29 + }, + "extensions" : { + "KHR_draco_mesh_compression" : { + "bufferView" : 6, + "attributes" : { + "POSITION" : 0, + "NORMAL" : 1, + "TEXCOORD_0" : 2, + "TEXCOORD_1" : 3 + } + } + }, + "indices" : 30, + "material" : 2, + "mode" : 4 + }, + { + "attributes" : { + "POSITION" : 31, + "NORMAL" : 32, + "TEXCOORD_0" : 33, + "TEXCOORD_1" : 34 + }, + "extensions" : { + "KHR_draco_mesh_compression" : { + "bufferView" : 7, + "attributes" : { + "POSITION" : 0, + "NORMAL" : 1, + "TEXCOORD_0" : 2, + "TEXCOORD_1" : 3 + } + } + }, + "indices" : 35, + "material" : 3, + "mode" : 4 + } + ] + } + ], + "textures" : [ + { + "sampler" : 0, + "source" : 0 + } + ], + "images" : [ + { + "mimeType" : "image/jpeg", + "name" : "jiuhuchecolor", + "uri" : "jiuhuchecolor.jpg" + } + ], + "accessors" : [ + { + "componentType" : 5126, + "count" : 274, + "max" : [ + 11.537712097167969, + 38.07270812988281, + 37.538028717041016 + ], + "min" : [ + -11.537750244140625, + -38.04032897949219, + -37.43679428100586 + ], + "type" : "VEC3" + }, + { + "componentType" : 5126, + "count" : 274, + "type" : "VEC3" + }, + { + "componentType" : 5126, + "count" : 274, + "type" : "VEC2" + }, + { + "componentType" : 5123, + "count" : 1188, + "type" : "SCALAR" + }, + { + "componentType" : 5126, + "count" : 274, + "max" : [ + 11.537673950195312, + 38.07269287109375, + 37.53801727294922 + ], + "min" : [ + -11.537788391113281, + -38.04034423828125, + -37.436805725097656 + ], + "type" : "VEC3" + }, + { + "componentType" : 5126, + "count" : 274, + "type" : "VEC3" + }, + { + "componentType" : 5126, + "count" : 274, + "type" : "VEC2" + }, + { + "componentType" : 5123, + "count" : 1188, + "type" : "SCALAR" + }, + { + "componentType" : 5126, + "count" : 274, + "max" : [ + 11.537734985351562, + 38.0726318359375, + 37.53801727294922 + ], + "min" : [ + -11.537727355957031, + -38.0404052734375, + -37.436805725097656 + ], + "type" : "VEC3" + }, + { + "componentType" : 5126, + "count" : 274, + "type" : "VEC3" + }, + { + "componentType" : 5126, + "count" : 274, + "type" : "VEC2" + }, + { + "componentType" : 5123, + "count" : 1188, + "type" : "SCALAR" + }, + { + "componentType" : 5126, + "count" : 274, + "max" : [ + 11.537681579589844, + 38.0726318359375, + 37.53801727294922 + ], + "min" : [ + -11.53778076171875, + -38.0404052734375, + -37.436805725097656 + ], + "type" : "VEC3" + }, + { + "componentType" : 5126, + "count" : 274, + "type" : "VEC3" + }, + { + "componentType" : 5126, + "count" : 274, + "type" : "VEC2" + }, + { + "componentType" : 5123, + "count" : 1188, + "type" : "SCALAR" + }, + { + "componentType" : 5126, + "count" : 5257, + "max" : [ + 1.2746187448501587, + 2.96435809135437, + 2.8015220165252686 + ], + "min" : [ + -1.2744255065917969, + 0.3353670537471771, + -3.448988199234009 + ], + "type" : "VEC3" + }, + { + "componentType" : 5126, + "count" : 5257, + "type" : "VEC3" + }, + { + "componentType" : 5126, + "count" : 5257, + "type" : "VEC2" + }, + { + "componentType" : 5126, + "count" : 5257, + "type" : "VEC2" + }, + { + "componentType" : 5123, + "count" : 12720, + "type" : "SCALAR" + }, + { + "componentType" : 5126, + "count" : 68, + "max" : [ + 0.9840683341026306, + 2.4307644367218018, + 2.0168375968933105 + ], + "min" : [ + -0.9705947041511536, + 1.525695562362671, + -3.3331093788146973 + ], + "type" : "VEC3" + }, + { + "componentType" : 5126, + "count" : 68, + "type" : "VEC3" + }, + { + "componentType" : 5126, + "count" : 68, + "type" : "VEC2" + }, + { + "componentType" : 5126, + "count" : 68, + "type" : "VEC2" + }, + { + "componentType" : 5123, + "count" : 168, + "type" : "SCALAR" + }, + { + "componentType" : 5126, + "count" : 32, + "max" : [ + 0.7321998476982117, + 2.96435809135437, + 0.5598673224449158 + ], + "min" : [ + 0.1756378710269928, + 2.8086097240448, + 0.2922760248184204 + ], + "type" : "VEC3" + }, + { + "componentType" : 5126, + "count" : 32, + "type" : "VEC3" + }, + { + "componentType" : 5126, + "count" : 32, + "type" : "VEC2" + }, + { + "componentType" : 5126, + "count" : 32, + "type" : "VEC2" + }, + { + "componentType" : 5123, + "count" : 66, + "type" : "SCALAR" + }, + { + "componentType" : 5126, + "count" : 32, + "max" : [ + -0.1641930192708969, + 2.96435809135437, + 0.5598673224449158 + ], + "min" : [ + -0.6672216057777405, + 2.8086097240448, + 0.2922760248184204 + ], + "type" : "VEC3" + }, + { + "componentType" : 5126, + "count" : 32, + "type" : "VEC3" + }, + { + "componentType" : 5126, + "count" : 32, + "type" : "VEC2" + }, + { + "componentType" : 5126, + "count" : 32, + "type" : "VEC2" + }, + { + "componentType" : 5123, + "count" : 66, + "type" : "SCALAR" + } + ], + "bufferViews" : [ + { + "buffer" : 0, + "byteLength" : 2746, + "byteOffset" : 0 + }, + { + "buffer" : 0, + "byteLength" : 2746, + "byteOffset" : 2748 + }, + { + "buffer" : 0, + "byteLength" : 2740, + "byteOffset" : 5496 + }, + { + "buffer" : 0, + "byteLength" : 2740, + "byteOffset" : 8236 + }, + { + "buffer" : 0, + "byteLength" : 43616, + "byteOffset" : 10976 + }, + { + "buffer" : 0, + "byteLength" : 1125, + "byteOffset" : 54592 + }, + { + "buffer" : 0, + "byteLength" : 592, + "byteOffset" : 55720 + }, + { + "buffer" : 0, + "byteLength" : 546, + "byteOffset" : 56312 + } + ], + "samplers" : [ + { + "magFilter" : 9729, + "minFilter" : 9987 + } + ], + "buffers" : [ + { + "byteLength" : 56860, + "uri" : "JHC.bin" + } + ] +} diff --git a/src/assets/mesh/mark/outside/jhc/JHC.gltf.manifest b/src/assets/mesh/mark/outside/jhc/JHC.gltf.manifest new file mode 100644 index 0000000..1781cb5 --- /dev/null +++ b/src/assets/mesh/mark/outside/jhc/JHC.gltf.manifest @@ -0,0 +1,5 @@ +{ + "version" : 1, + "enableSceneOffline" : true, + "enableTexturesOffline" : true +} \ No newline at end of file diff --git a/src/assets/mesh/mark/outside/jhc/jiuhuchecolor.jpg b/src/assets/mesh/mark/outside/jhc/jiuhuchecolor.jpg new file mode 100644 index 0000000..38fea17 Binary files /dev/null and b/src/assets/mesh/mark/outside/jhc/jiuhuchecolor.jpg differ diff --git a/src/assets/mesh/mark/outside/jj/JJ.bin b/src/assets/mesh/mark/outside/jj/JJ.bin new file mode 100644 index 0000000..1b210fd Binary files /dev/null and b/src/assets/mesh/mark/outside/jj/JJ.bin differ diff --git a/src/assets/mesh/mark/outside/jj/JJ.gltf b/src/assets/mesh/mark/outside/jj/JJ.gltf new file mode 100644 index 0000000..2b620f4 --- /dev/null +++ b/src/assets/mesh/mark/outside/jj/JJ.gltf @@ -0,0 +1,205 @@ +{ + "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" : [ + 0 + ] + } + ], + "nodes" : [ + { + "mesh" : 0, + "name" : "JiaoJing" + } + ], + "materials" : [ + { + "doubleSided" : true, + "name" : "JiaoJing", + "pbrMetallicRoughness" : { + "baseColorTexture" : { + "index" : 0 + }, + "metallicFactor" : 0 + } + }, + { + "doubleSided" : true, + "name" : "JiaoJingMaoZi", + "pbrMetallicRoughness" : { + "baseColorTexture" : { + "index" : 1 + }, + "metallicFactor" : 0, + "roughnessFactor" : 0.5 + } + } + ], + "meshes" : [ + { + "name" : "JiaoJing", + "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, + "material" : 0, + "mode" : 4 + }, + { + "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" : 1, + "mode" : 4 + } + ] + } + ], + "textures" : [ + { + "sampler" : 0, + "source" : 0 + }, + { + "sampler" : 0, + "source" : 1 + } + ], + "images" : [ + { + "mimeType" : "image/jpeg", + "name" : "JiaoJing", + "uri" : "JiaoJing.jpg" + }, + { + "mimeType" : "image/jpeg", + "name" : "JiaoJingMaoZi", + "uri" : "JiaoJingMaoZi.jpg" + } + ], + "accessors" : [ + { + "componentType" : 5126, + "count" : 3137, + "max" : [ + 0.2940014600753784, + 1.825747013092041, + 0.15076936781406403 + ], + "min" : [ + -0.2879331111907959, + -0.0029216797556728125, + -0.15514452755451202 + ], + "type" : "VEC3" + }, + { + "componentType" : 5126, + "count" : 3137, + "type" : "VEC3" + }, + { + "componentType" : 5126, + "count" : 3137, + "type" : "VEC2" + }, + { + "componentType" : 5123, + "count" : 14886, + "type" : "SCALAR" + }, + { + "componentType" : 5126, + "count" : 268, + "max" : [ + 0.14447662234306335, + 1.8681155443191528, + 0.17496293783187866 + ], + "min" : [ + -0.1444767415523529, + 1.7160290479660034, + -0.17496289312839508 + ], + "type" : "VEC3" + }, + { + "componentType" : 5126, + "count" : 268, + "type" : "VEC3" + }, + { + "componentType" : 5126, + "count" : 268, + "type" : "VEC2" + }, + { + "componentType" : 5123, + "count" : 756, + "type" : "SCALAR" + } + ], + "bufferViews" : [ + { + "buffer" : 0, + "byteLength" : 25904, + "byteOffset" : 0 + }, + { + "buffer" : 0, + "byteLength" : 2825, + "byteOffset" : 25904 + } + ], + "samplers" : [ + { + "magFilter" : 9729, + "minFilter" : 9987 + } + ], + "buffers" : [ + { + "byteLength" : 28732, + "uri" : "JJ.bin" + } + ] +} diff --git a/src/assets/mesh/mark/outside/jj/JJ.gltf.manifest b/src/assets/mesh/mark/outside/jj/JJ.gltf.manifest new file mode 100644 index 0000000..1781cb5 --- /dev/null +++ b/src/assets/mesh/mark/outside/jj/JJ.gltf.manifest @@ -0,0 +1,5 @@ +{ + "version" : 1, + "enableSceneOffline" : true, + "enableTexturesOffline" : true +} \ No newline at end of file diff --git a/src/assets/mesh/mark/outside/jj/JiaoJing.jpg b/src/assets/mesh/mark/outside/jj/JiaoJing.jpg new file mode 100644 index 0000000..b4c733b Binary files /dev/null and b/src/assets/mesh/mark/outside/jj/JiaoJing.jpg differ diff --git a/src/assets/mesh/mark/outside/jj/JiaoJingMaoZi.jpg b/src/assets/mesh/mark/outside/jj/JiaoJingMaoZi.jpg new file mode 100644 index 0000000..652bd80 Binary files /dev/null and b/src/assets/mesh/mark/outside/jj/JiaoJingMaoZi.jpg differ diff --git a/src/assets/mesh/mark/outside/mhf/Boots_AlbedoTransparency.jpg b/src/assets/mesh/mark/outside/mhf/Boots_AlbedoTransparency.jpg new file mode 100644 index 0000000..a615c54 Binary files /dev/null and b/src/assets/mesh/mark/outside/mhf/Boots_AlbedoTransparency.jpg differ diff --git a/src/assets/mesh/mark/outside/mhf/BunkerClothing_AlbedoTransparency.png b/src/assets/mesh/mark/outside/mhf/BunkerClothing_AlbedoTransparency.png new file mode 100644 index 0000000..6638094 Binary files /dev/null and b/src/assets/mesh/mark/outside/mhf/BunkerClothing_AlbedoTransparency.png differ diff --git a/src/assets/mesh/mark/outside/mhf/Head_AlbedoTransparency.jpg b/src/assets/mesh/mark/outside/mhf/Head_AlbedoTransparency.jpg new file mode 100644 index 0000000..9766899 Binary files /dev/null and b/src/assets/mesh/mark/outside/mhf/Head_AlbedoTransparency.jpg differ diff --git a/src/assets/mesh/mark/outside/mhf/Helmet_AlbedoTransparency.jpg b/src/assets/mesh/mark/outside/mhf/Helmet_AlbedoTransparency.jpg new file mode 100644 index 0000000..1c9ae7a Binary files /dev/null and b/src/assets/mesh/mark/outside/mhf/Helmet_AlbedoTransparency.jpg differ diff --git a/src/assets/mesh/mark/outside/mhf/MHF.bin b/src/assets/mesh/mark/outside/mhf/MHF.bin new file mode 100644 index 0000000..802e978 Binary files /dev/null and b/src/assets/mesh/mark/outside/mhf/MHF.bin differ diff --git a/src/assets/mesh/mark/outside/mhf/MHF.gltf b/src/assets/mesh/mark/outside/mhf/MHF.gltf new file mode 100644 index 0000000..f0c9e90 --- /dev/null +++ b/src/assets/mesh/mark/outside/mhf/MHF.gltf @@ -0,0 +1,668 @@ +{ + "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 new file mode 100644 index 0000000..1781cb5 --- /dev/null +++ b/src/assets/mesh/mark/outside/mhf/MHF.gltf.manifest @@ -0,0 +1,5 @@ +{ + "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 new file mode 100644 index 0000000..964bacd Binary files /dev/null and b/src/assets/mesh/mark/outside/mhf/ShuiQiang.jpg differ diff --git a/src/assets/mesh/mark/outside/mhf/Straps_AlbedoTransparency.jpg b/src/assets/mesh/mark/outside/mhf/Straps_AlbedoTransparency.jpg new file mode 100644 index 0000000..7e119d2 Binary files /dev/null and b/src/assets/mesh/mark/outside/mhf/Straps_AlbedoTransparency.jpg differ diff --git a/src/assets/mesh/mark/outside/pmc/CarColor.png b/src/assets/mesh/mark/outside/pmc/CarColor.png new file mode 100644 index 0000000..89d2afa Binary files /dev/null and b/src/assets/mesh/mark/outside/pmc/CarColor.png differ diff --git a/src/assets/mesh/mark/outside/pmc/FireCar.jpg b/src/assets/mesh/mark/outside/pmc/FireCar.jpg new file mode 100644 index 0000000..0edb25e Binary files /dev/null and b/src/assets/mesh/mark/outside/pmc/FireCar.jpg differ diff --git a/src/assets/mesh/mark/outside/pmc/PMC.bin b/src/assets/mesh/mark/outside/pmc/PMC.bin new file mode 100644 index 0000000..d0e62b2 Binary files /dev/null and b/src/assets/mesh/mark/outside/pmc/PMC.bin differ diff --git a/src/assets/mesh/mark/outside/pmc/PMC.gltf b/src/assets/mesh/mark/outside/pmc/PMC.gltf new file mode 100644 index 0000000..bf703d1 --- /dev/null +++ b/src/assets/mesh/mark/outside/pmc/PMC.gltf @@ -0,0 +1,796 @@ +{ + "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 new file mode 100644 index 0000000..1781cb5 --- /dev/null +++ b/src/assets/mesh/mark/outside/pmc/PMC.gltf.manifest @@ -0,0 +1,5 @@ +{ + "version" : 1, + "enableSceneOffline" : true, + "enableTexturesOffline" : true +} \ No newline at end of file diff --git a/src/assets/mesh/mark/outside/ys/YS.bin b/src/assets/mesh/mark/outside/ys/YS.bin new file mode 100644 index 0000000..1186957 Binary files /dev/null and b/src/assets/mesh/mark/outside/ys/YS.bin differ diff --git a/src/assets/mesh/mark/outside/ys/YS.gltf b/src/assets/mesh/mark/outside/ys/YS.gltf new file mode 100644 index 0000000..66a6f89 --- /dev/null +++ b/src/assets/mesh/mark/outside/ys/YS.gltf @@ -0,0 +1,137 @@ +{ + "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" : [ + 0 + ] + } + ], + "nodes" : [ + { + "mesh" : 0, + "name" : "Doctor" + } + ], + "materials" : [ + { + "doubleSided" : true, + "name" : "YiShengColor", + "pbrMetallicRoughness" : { + "baseColorTexture" : { + "index" : 0 + }, + "metallicFactor" : 0 + } + } + ], + "meshes" : [ + { + "name" : "Doctor", + "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 + } + ] + } + ], + "textures" : [ + { + "sampler" : 0, + "source" : 0 + } + ], + "images" : [ + { + "mimeType" : "image/jpeg", + "name" : "YiShengColor", + "uri" : "YiShengColor.jpg" + } + ], + "accessors" : [ + { + "componentType" : 5126, + "count" : 4628, + "max" : [ + 0.3044985830783844, + 1.82574462890625, + 0.15377852320671082 + ], + "min" : [ + -0.3002696931362152, + -0.013995950110256672, + -0.16470162570476532 + ], + "type" : "VEC3" + }, + { + "componentType" : 5126, + "count" : 4628, + "type" : "VEC3" + }, + { + "componentType" : 5126, + "count" : 4628, + "type" : "VEC2" + }, + { + "componentType" : 5126, + "count" : 4628, + "type" : "VEC2" + }, + { + "componentType" : 5123, + "count" : 20031, + "type" : "SCALAR" + } + ], + "bufferViews" : [ + { + "buffer" : 0, + "byteLength" : 43670, + "byteOffset" : 0 + } + ], + "samplers" : [ + { + "magFilter" : 9729, + "minFilter" : 9987 + } + ], + "buffers" : [ + { + "byteLength" : 43672, + "uri" : "YS.bin" + } + ] +} diff --git a/src/assets/mesh/mark/outside/ys/YS.gltf.manifest b/src/assets/mesh/mark/outside/ys/YS.gltf.manifest new file mode 100644 index 0000000..1781cb5 --- /dev/null +++ b/src/assets/mesh/mark/outside/ys/YS.gltf.manifest @@ -0,0 +1,5 @@ +{ + "version" : 1, + "enableSceneOffline" : true, + "enableTexturesOffline" : true +} \ No newline at end of file diff --git a/src/assets/mesh/mark/outside/ys/YiShengColor.jpg b/src/assets/mesh/mark/outside/ys/YiShengColor.jpg new file mode 100644 index 0000000..82a22ab Binary files /dev/null and b/src/assets/mesh/mark/outside/ys/YiShengColor.jpg differ diff --git a/src/assets/particlesystem/fire/fire_h_1.json b/src/assets/particlesystem/fire/fire_h_1.json index 2e6ad17..8978722 100644 --- a/src/assets/particlesystem/fire/fire_h_1.json +++ b/src/assets/particlesystem/fire/fire_h_1.json @@ -1,221 +1 @@ -{ - "name": "fireSystem", - "id": "fireSystem", - "capacity": 5, - "disposeOnStop": false, - "manualEmitCount": -1, - "emitter": [ - 0, - 0, - 0 - ], - "particleEmitterType": { - "type": "CylinderParticleEmitter", - "radius": 1.01, - "height": 1, - "radiusRange": 1, - "directionRandomizer": 0 - }, - "texture": { - "tags": null, - "url": "assets/particlesystem/fire/fire_8x8_1.png", - "uOffset": 0, - "vOffset": 0, - "uScale": 1, - "vScale": 1, - "uAng": 0, - "vAng": 0, - "wAng": 0, - "uRotationCenter": 0.5, - "vRotationCenter": 0.5, - "wRotationCenter": 0.5, - "homogeneousRotationInUVTransform": false, - "isBlocking": true, - "name": "assets/particlesystem/fire/fire_8x8_1.png", - "hasAlpha": false, - "getAlphaFromRGB": false, - "level": 1, - "coordinatesIndex": 0, - "coordinatesMode": 0, - "wrapU": 1, - "wrapV": 1, - "wrapR": 1, - "anisotropicFilteringLevel": 4, - "isCube": false, - "is3D": false, - "is2DArray": false, - "gammaSpace": true, - "invertZ": false, - "lodLevelInAlpha": false, - "lodGenerationOffset": 0, - "lodGenerationScale": 0, - "linearSpecularLOD": false, - "isRenderTarget": false, - "animations": [], - "invertY": false, - "samplingMode": 3, - "_useSRGBBuffer": false - }, - "isLocal": true, - "animations": [], - "startDelay": 0, - "renderingGroupId": 0, - "isBillboardBased": true, - "billboardMode": 2, - "minAngularSpeed": 0, - "maxAngularSpeed": 0, - "minSize": 6, - "maxSize": 8, - "minScaleX": 1, - "maxScaleX": 1, - "minScaleY": 1, - "maxScaleY": 1, - "minEmitPower": 0, - "maxEmitPower": 0, - "minLifeTime": 2, - "maxLifeTime": 5, - "emitRate": 10, - "gravity": [ - 0, - 0, - 0 - ], - "noiseStrength": [ - 10, - 10, - 10 - ], - "color1": [ - 1, - 1, - 1, - 1 - ], - "color2": [ - 1, - 1, - 1, - 1 - ], - "colorDead": [ - 1, - 1, - 1, - 0 - ], - "updateSpeed": 0.016666666666666666, - "targetStopDuration": 0, - "blendMode": 4, - "preWarmCycles": 100, - "preWarmStepOffset": 10, - "minInitialRotation": -0.1, - "maxInitialRotation": 0.1, - "startSpriteCellID": 0, - "endSpriteCellID": 63, - "spriteCellChangeSpeed": 1, - "spriteCellWidth": 128, - "spriteCellHeight": 128, - "spriteRandomStartCell": true, - "isAnimationSheetEnabled": true, - "colorGradients": [ - { - "gradient": 0, - "color1": [ - 1, - 1, - 1, - 0 - ], - "color2": [ - 1, - 1, - 1, - 0 - ] - }, - { - "gradient": 0.1, - "color1": [ - 1, - 1, - 1, - 0.6 - ], - "color2": [ - 1, - 1, - 1, - 0.6 - ] - }, - { - "gradient": 0.9, - "color1": [ - 1, - 1, - 1, - 0.6 - ], - "color2": [ - 1, - 1, - 1, - 0.6 - ] - }, - { - "gradient": 1, - "color1": [ - 1, - 1, - 1, - 0 - ], - "color2": [ - 1, - 1, - 1, - 0 - ] - } - ], - "rampGradients": [ - { - "gradient": 0, - "color": [ - 1, - 1, - 1 - ] - }, - { - "gradient": 1, - "color": [ - 0.7968, - 0.3685, - 0.1105 - ] - } - ], - "useRampGradients": true, - "colorRemapGradients": [ - { - "gradient": 0, - "factor1": 0.2, - "factor2": 1 - }, - { - "gradient": 1, - "factor1": 0.2, - "factor2": 1 - } - ], - "textureMask": [ - 1, - 1, - 1, - 1 - ], - "customShader": null, - "preventAutoStart": true -} \ No newline at end of file +{"name":"fireSystem","id":"fireSystem","capacity":5,"emitterId":"psRoot","particleEmitterType":{"type":"PointParticleEmitter","direction1":[0,0,0],"direction2":[0,0,0]},"texture":{"tags":null,"url":"assets/particlesystem/fire/fire_8x8_1.png","uOffset":0,"vOffset":0,"uScale":1,"vScale":1,"uAng":0,"vAng":0,"wAng":0,"uRotationCenter":0.5,"vRotationCenter":0.5,"wRotationCenter":0.5,"homogeneousRotationInUVTransform":false,"isBlocking":true,"name":"assets/particlesystem/fire/fire_8x8_1.png","hasAlpha":false,"getAlphaFromRGB":false,"level":1,"coordinatesIndex":0,"coordinatesMode":0,"wrapU":1,"wrapV":1,"wrapR":1,"anisotropicFilteringLevel":4,"isCube":false,"is3D":false,"is2DArray":false,"gammaSpace":true,"invertZ":false,"lodLevelInAlpha":false,"lodGenerationOffset":0,"lodGenerationScale":0,"linearSpecularLOD":false,"isRenderTarget":false,"animations":[],"invertY":false,"samplingMode":3},"isLocal":true,"animations":[],"startDelay":0,"renderingGroupId":0,"isBillboardBased":true,"billboardMode":2,"minAngularSpeed":0,"maxAngularSpeed":0,"minSize":1,"maxSize":1,"minScaleX":2,"maxScaleX":2,"minScaleY":2,"maxScaleY":2,"minEmitPower":0,"maxEmitPower":0,"minLifeTime":2,"maxLifeTime":3,"emitRate":5,"gravity":[0,0,0],"noiseStrength":[10,10,10],"color1":[1,1,1,1],"color2":[1,1,1,1],"colorDead":[1,1,1,0],"updateSpeed":0.012,"targetStopDuration":0,"blendMode":4,"preWarmCycles":100,"preWarmStepOffset":10,"minInitialRotation":-0.1,"maxInitialRotation":0.1,"startSpriteCellID":0,"endSpriteCellID":63,"spriteCellChangeSpeed":1,"spriteCellWidth":128,"spriteCellHeight":128,"spriteRandomStartCell":true,"isAnimationSheetEnabled":true,"colorGradients":[{"gradient":0,"color1":[1,1,1,0],"color2":[1,1,1,0]},{"gradient":0.1,"color1":[1,1,1,0.6],"color2":[1,1,1,0.6]},{"gradient":0.9,"color1":[1,1,1,0.6],"color2":[1,1,1,0.6]},{"gradient":1,"color1":[1,1,1,0],"color2":[1,1,1,0]}],"rampGradients":[{"gradient":0,"color":[1,1,1]},{"gradient":1,"color":[0.7968,0.3685,0.1105]}],"useRampGradients":true,"colorRemapGradients":[{"gradient":0,"factor1":0.2,"factor2":1},{"gradient":1,"factor1":0.2,"factor2":1}],"textureMask":[1,1,1,1],"customShader":null,"preventAutoStart":true} \ No newline at end of file diff --git a/src/assets/particlesystem/fire/fire_h_2.json b/src/assets/particlesystem/fire/fire_h_2.json deleted file mode 100644 index d9a08a6..0000000 --- a/src/assets/particlesystem/fire/fire_h_2.json +++ /dev/null @@ -1,237 +0,0 @@ -{ - "name": "fireSystem2", - "id": "fireSystem2", - "capacity": 3, - "disposeOnStop": false, - "manualEmitCount": -1, - "emitter": [ - 0, - 0, - 0 - ], - "particleEmitterType": { - "type": "BoxParticleEmitter", - "direction1": [ - 0, - 1, - 0 - ], - "direction2": [ - 0, - 1, - 0 - ], - "minEmitBox": [ - -0.5, - 0, - -0.5 - ], - "maxEmitBox": [ - 0.5, - 0, - 0.5 - ] - }, - "texture": { - "tags": null, - "url": "assets/particlesystem/fire/fire_8x8_2.png", - "uOffset": 0, - "vOffset": 0, - "uScale": 1, - "vScale": 1, - "uAng": 0, - "vAng": 0, - "wAng": 0, - "uRotationCenter": 0.5, - "vRotationCenter": 0.5, - "wRotationCenter": 0.5, - "homogeneousRotationInUVTransform": false, - "isBlocking": true, - "name": "assets/particlesystem/fire/fire_8x8_2.png", - "hasAlpha": false, - "getAlphaFromRGB": false, - "level": 1, - "coordinatesIndex": 0, - "coordinatesMode": 0, - "wrapU": 1, - "wrapV": 1, - "wrapR": 1, - "anisotropicFilteringLevel": 4, - "isCube": false, - "is3D": false, - "is2DArray": false, - "gammaSpace": true, - "invertZ": false, - "lodLevelInAlpha": false, - "lodGenerationOffset": 0, - "lodGenerationScale": 0, - "linearSpecularLOD": false, - "isRenderTarget": false, - "animations": [], - "invertY": false, - "samplingMode": 3, - "_useSRGBBuffer": false - }, - "isLocal": true, - "animations": [], - "startDelay": 0, - "renderingGroupId": 0, - "isBillboardBased": true, - "billboardMode": 2, - "minAngularSpeed": 0, - "maxAngularSpeed": 0, - "minSize": 5, - "maxSize": 6, - "minScaleX": 1, - "maxScaleX": 1, - "minScaleY": 1, - "maxScaleY": 1, - "minEmitPower": 0, - "maxEmitPower": 0, - "minLifeTime": 2, - "maxLifeTime": 5, - "emitRate": 2, - "gravity": [ - 0, - 0, - 0 - ], - "noiseStrength": [ - 10, - 10, - 10 - ], - "color1": [ - 1, - 1, - 1, - 1 - ], - "color2": [ - 1, - 1, - 1, - 1 - ], - "colorDead": [ - 1, - 1, - 1, - 0 - ], - "updateSpeed": 0.016666666666666666, - "targetStopDuration": 0, - "blendMode": 4, - "preWarmCycles": 100, - "preWarmStepOffset": 10, - "minInitialRotation": -0.1, - "maxInitialRotation": 0.1, - "startSpriteCellID": 0, - "endSpriteCellID": 63, - "spriteCellChangeSpeed": 0.9, - "spriteCellWidth": 128, - "spriteCellHeight": 128, - "spriteRandomStartCell": true, - "isAnimationSheetEnabled": true, - "colorGradients": [ - { - "gradient": 0, - "color1": [ - 1, - 1, - 1, - 0 - ], - "color2": [ - 1, - 1, - 1, - 0 - ] - }, - { - "gradient": 0.1, - "color1": [ - 1, - 1, - 1, - 0.6 - ], - "color2": [ - 1, - 1, - 1, - 0.6 - ] - }, - { - "gradient": 0.9, - "color1": [ - 1, - 1, - 1, - 0.6 - ], - "color2": [ - 1, - 1, - 1, - 0.6 - ] - }, - { - "gradient": 1, - "color1": [ - 1, - 1, - 1, - 0 - ], - "color2": [ - 1, - 1, - 1, - 0 - ] - } - ], - "rampGradients": [ - { - "gradient": 0, - "color": [ - 1, - 1, - 1 - ] - }, - { - "gradient": 1, - "color": [ - 0.7968, - 0.3685, - 0.1105 - ] - } - ], - "useRampGradients": true, - "colorRemapGradients": [ - { - "gradient": 0, - "factor1": 0.2, - "factor2": 1 - }, - { - "gradient": 1, - "factor1": 0.2, - "factor2": 1 - } - ], - "textureMask": [ - 1, - 1, - 1, - 1 - ], - "customShader": null, - "preventAutoStart": true -} \ No newline at end of file diff --git a/src/assets/particlesystem/fire/fire_h_3.json b/src/assets/particlesystem/fire/fire_h_3.json deleted file mode 100644 index 52ea02a..0000000 --- a/src/assets/particlesystem/fire/fire_h_3.json +++ /dev/null @@ -1,237 +0,0 @@ -{ - "name": "fireSystem3", - "id": "fireSystem3", - "capacity": 3, - "disposeOnStop": false, - "manualEmitCount": -1, - "emitter": [ - 0, - 0, - 0 - ], - "particleEmitterType": { - "type": "BoxParticleEmitter", - "direction1": [ - 0, - 1, - 0 - ], - "direction2": [ - 0, - 1, - 0 - ], - "minEmitBox": [ - -0.5, - 0, - -0.5 - ], - "maxEmitBox": [ - 0.5, - 0, - 0.5 - ] - }, - "texture": { - "tags": null, - "url": "assets/particlesystem/fire/fire_8x8_3.png", - "uOffset": 0, - "vOffset": 0, - "uScale": 1, - "vScale": 1, - "uAng": 0, - "vAng": 0, - "wAng": 0, - "uRotationCenter": 0.5, - "vRotationCenter": 0.5, - "wRotationCenter": 0.5, - "homogeneousRotationInUVTransform": false, - "isBlocking": true, - "name": "assets/particlesystem/fire/fire_8x8_3.png", - "hasAlpha": false, - "getAlphaFromRGB": false, - "level": 1, - "coordinatesIndex": 0, - "coordinatesMode": 0, - "wrapU": 1, - "wrapV": 1, - "wrapR": 1, - "anisotropicFilteringLevel": 4, - "isCube": false, - "is3D": false, - "is2DArray": false, - "gammaSpace": true, - "invertZ": false, - "lodLevelInAlpha": false, - "lodGenerationOffset": 0, - "lodGenerationScale": 0, - "linearSpecularLOD": false, - "isRenderTarget": false, - "animations": [], - "invertY": false, - "samplingMode": 3, - "_useSRGBBuffer": false - }, - "isLocal": true, - "animations": [], - "startDelay": 0, - "renderingGroupId": 0, - "isBillboardBased": true, - "billboardMode": 2, - "minAngularSpeed": 0, - "maxAngularSpeed": 0, - "minSize": 5, - "maxSize": 6, - "minScaleX": 1, - "maxScaleX": 1, - "minScaleY": 1, - "maxScaleY": 1, - "minEmitPower": 0, - "maxEmitPower": 0, - "minLifeTime": 2, - "maxLifeTime": 5, - "emitRate": 2, - "gravity": [ - 0, - 0, - 0 - ], - "noiseStrength": [ - 10, - 10, - 10 - ], - "color1": [ - 1, - 1, - 1, - 1 - ], - "color2": [ - 1, - 1, - 1, - 1 - ], - "colorDead": [ - 1, - 1, - 1, - 0 - ], - "updateSpeed": 0.016666666666666666, - "targetStopDuration": 0, - "blendMode": 4, - "preWarmCycles": 100, - "preWarmStepOffset": 10, - "minInitialRotation": -0.1, - "maxInitialRotation": 0.1, - "startSpriteCellID": 0, - "endSpriteCellID": 63, - "spriteCellChangeSpeed": 0.9, - "spriteCellWidth": 128, - "spriteCellHeight": 128, - "spriteRandomStartCell": true, - "isAnimationSheetEnabled": true, - "colorGradients": [ - { - "gradient": 0, - "color1": [ - 1, - 1, - 1, - 0 - ], - "color2": [ - 1, - 1, - 1, - 0 - ] - }, - { - "gradient": 0.1, - "color1": [ - 1, - 1, - 1, - 0.6 - ], - "color2": [ - 1, - 1, - 1, - 0.6 - ] - }, - { - "gradient": 0.9, - "color1": [ - 1, - 1, - 1, - 0.6 - ], - "color2": [ - 1, - 1, - 1, - 0.6 - ] - }, - { - "gradient": 1, - "color1": [ - 1, - 1, - 1, - 0 - ], - "color2": [ - 1, - 1, - 1, - 0 - ] - } - ], - "rampGradients": [ - { - "gradient": 0, - "color": [ - 1, - 1, - 1 - ] - }, - { - "gradient": 1, - "color": [ - 0.7968, - 0.3685, - 0.1105 - ] - } - ], - "useRampGradients": true, - "colorRemapGradients": [ - { - "gradient": 0, - "factor1": 0.2, - "factor2": 1 - }, - { - "gradient": 1, - "factor1": 0.2, - "factor2": 1 - } - ], - "textureMask": [ - 1, - 1, - 1, - 1 - ], - "customShader": null, - "preventAutoStart": true -} \ No newline at end of file diff --git a/src/assets/particlesystem/fire/fire_snh_1.json b/src/assets/particlesystem/fire/fire_snh_1.json index f4bd785..7ee9a4e 100644 --- a/src/assets/particlesystem/fire/fire_snh_1.json +++ b/src/assets/particlesystem/fire/fire_snh_1.json @@ -1,220 +1 @@ -{ - "name": "fireSystem", - "id": "fireSystem", - "capacity": 5, - "disposeOnStop": false, - "manualEmitCount": -1, - "emitter": [ - 0, - 3.25, - 0 - ], - "particleEmitterType": { - "type": "HemisphericParticleEmitter", - "radius": 0.5, - "radiusRange": 1, - "directionRandomizer": 0 - }, - "texture": { - "tags": null, - "url": "assets/particlesystem/fire/fire_8x8_1.png", - "uOffset": 0, - "vOffset": 0, - "uScale": 1, - "vScale": 1, - "uAng": 0, - "vAng": 0, - "wAng": 0, - "uRotationCenter": 0.5, - "vRotationCenter": 0.5, - "wRotationCenter": 0.5, - "homogeneousRotationInUVTransform": false, - "isBlocking": true, - "name": "assets/particlesystem/fire/fire_8x8_1.png", - "hasAlpha": false, - "getAlphaFromRGB": false, - "level": 1, - "coordinatesIndex": 0, - "coordinatesMode": 0, - "wrapU": 1, - "wrapV": 1, - "wrapR": 1, - "anisotropicFilteringLevel": 4, - "isCube": false, - "is3D": false, - "is2DArray": false, - "gammaSpace": true, - "invertZ": false, - "lodLevelInAlpha": false, - "lodGenerationOffset": 0, - "lodGenerationScale": 0, - "linearSpecularLOD": false, - "isRenderTarget": false, - "animations": [], - "invertY": false, - "samplingMode": 3, - "_useSRGBBuffer": false - }, - "isLocal": true, - "animations": [], - "startDelay": 0, - "renderingGroupId": 0, - "isBillboardBased": true, - "billboardMode": 2, - "minAngularSpeed": 0, - "maxAngularSpeed": 0, - "minSize": 6, - "maxSize": 8, - "minScaleX": 1, - "maxScaleX": 1, - "minScaleY": 0.2, - "maxScaleY": 0.5, - "minEmitPower": 0, - "maxEmitPower": 0, - "minLifeTime": 2, - "maxLifeTime": 3, - "emitRate": 10, - "gravity": [ - 0, - 0, - 0 - ], - "noiseStrength": [ - 10, - 10, - 10 - ], - "color1": [ - 1, - 1, - 1, - 1 - ], - "color2": [ - 1, - 1, - 1, - 1 - ], - "colorDead": [ - 1, - 1, - 1, - 0 - ], - "updateSpeed": 0.016666666666666666, - "targetStopDuration": 0, - "blendMode": 4, - "preWarmCycles": 100, - "preWarmStepOffset": 10, - "minInitialRotation": -0.1, - "maxInitialRotation": 0.1, - "startSpriteCellID": 0, - "endSpriteCellID": 63, - "spriteCellChangeSpeed": 1, - "spriteCellWidth": 128, - "spriteCellHeight": 128, - "spriteRandomStartCell": true, - "isAnimationSheetEnabled": true, - "colorGradients": [ - { - "gradient": 0, - "color1": [ - 1, - 1, - 1, - 0 - ], - "color2": [ - 1, - 1, - 1, - 0 - ] - }, - { - "gradient": 0.1, - "color1": [ - 1, - 1, - 1, - 0.6 - ], - "color2": [ - 1, - 1, - 1, - 0.6 - ] - }, - { - "gradient": 0.9, - "color1": [ - 1, - 1, - 1, - 0.6 - ], - "color2": [ - 1, - 1, - 1, - 0.6 - ] - }, - { - "gradient": 1, - "color1": [ - 1, - 1, - 1, - 0 - ], - "color2": [ - 1, - 1, - 1, - 0 - ] - } - ], - "rampGradients": [ - { - "gradient": 0, - "color": [ - 1, - 1, - 1 - ] - }, - { - "gradient": 1, - "color": [ - 0.7968, - 0.3685, - 0.1105 - ] - } - ], - "useRampGradients": true, - "colorRemapGradients": [ - { - "gradient": 0, - "factor1": 0.2, - "factor2": 1 - }, - { - "gradient": 1, - "factor1": 0.2, - "factor2": 1 - } - ], - "textureMask": [ - 1, - 1, - 1, - 1 - ], - "customShader": null, - "preventAutoStart": true -} \ No newline at end of file +{"name":"fireSystem","id":"fireSystem","capacity":5,"emitterId":"psRoot","particleEmitterType":{"type":"HemisphericParticleEmitter","radius":0.1,"radiusRange":0,"directionRandomizer":0},"texture":{"tags":null,"url":"assets/particlesystem/fire/fire_8x8_1.png","uOffset":0,"vOffset":0,"uScale":1,"vScale":1,"uAng":0,"vAng":0,"wAng":0,"uRotationCenter":0.5,"vRotationCenter":0.5,"wRotationCenter":0.5,"homogeneousRotationInUVTransform":false,"isBlocking":true,"name":"assets/particlesystem/fire/fire_8x8_1.png","hasAlpha":false,"getAlphaFromRGB":false,"level":1,"coordinatesIndex":0,"coordinatesMode":0,"wrapU":1,"wrapV":1,"wrapR":1,"anisotropicFilteringLevel":4,"isCube":false,"is3D":false,"is2DArray":false,"gammaSpace":true,"invertZ":false,"lodLevelInAlpha":false,"lodGenerationOffset":0,"lodGenerationScale":0,"linearSpecularLOD":false,"isRenderTarget":false,"animations":[],"invertY":false,"samplingMode":3},"isLocal":true,"animations":[],"startDelay":0,"renderingGroupId":0,"isBillboardBased":true,"billboardMode":2,"minAngularSpeed":0,"maxAngularSpeed":0,"minSize":1,"maxSize":1,"minScaleX":0.5,"maxScaleX":0.5,"minScaleY":0.5,"maxScaleY":0.5,"minEmitPower":0,"maxEmitPower":0,"minLifeTime":2,"maxLifeTime":3,"emitRate":10,"gravity":[0,0,0],"noiseStrength":[10,10,10],"color1":[1,1,1,1],"color2":[1,1,1,1],"colorDead":[1,1,1,0],"updateSpeed":0.012,"targetStopDuration":0,"blendMode":4,"preWarmCycles":100,"preWarmStepOffset":10,"minInitialRotation":-0.1,"maxInitialRotation":0.1,"startSpriteCellID":0,"endSpriteCellID":63,"spriteCellChangeSpeed":1,"spriteCellWidth":128,"spriteCellHeight":128,"spriteRandomStartCell":true,"isAnimationSheetEnabled":true,"colorGradients":[{"gradient":0,"color1":[1,1,1,0],"color2":[1,1,1,0]},{"gradient":0.1,"color1":[1,1,1,0.6],"color2":[1,1,1,0.6]},{"gradient":0.9,"color1":[1,1,1,0.6],"color2":[1,1,1,0.6]},{"gradient":1,"color1":[1,1,1,0],"color2":[1,1,1,0]}],"rampGradients":[{"gradient":0,"color":[1,1,1]},{"gradient":1,"color":[0.7968,0.3685,0.1105]}],"useRampGradients":true,"colorRemapGradients":[{"gradient":0,"factor1":0.2,"factor2":1},{"gradient":1,"factor1":0.2,"factor2":1}],"textureMask":[1,1,1,1],"customShader":null,"preventAutoStart":true} \ No newline at end of file diff --git a/src/assets/particlesystem/fire/fire_snh_2.json b/src/assets/particlesystem/fire/fire_snh_2.json deleted file mode 100644 index 48e7e9f..0000000 --- a/src/assets/particlesystem/fire/fire_snh_2.json +++ /dev/null @@ -1,220 +0,0 @@ -{ - "name": "fireSystem2", - "id": "fireSystem2", - "capacity": 3, - "disposeOnStop": false, - "manualEmitCount": -1, - "emitter": [ - 0, - 2.25, - 0 - ], - "particleEmitterType": { - "type": "HemisphericParticleEmitter", - "radius": 0.5, - "radiusRange": 1, - "directionRandomizer": 0 - }, - "texture": { - "tags": null, - "url": "assets/particlesystem/fire/fire_8x8_2.png", - "uOffset": 0, - "vOffset": 0, - "uScale": 1, - "vScale": 1, - "uAng": 0, - "vAng": 0, - "wAng": 0, - "uRotationCenter": 0.5, - "vRotationCenter": 0.5, - "wRotationCenter": 0.5, - "homogeneousRotationInUVTransform": false, - "isBlocking": true, - "name": "assets/particlesystem/fire/fire_8x8_2.png", - "hasAlpha": false, - "getAlphaFromRGB": false, - "level": 1, - "coordinatesIndex": 0, - "coordinatesMode": 0, - "wrapU": 1, - "wrapV": 1, - "wrapR": 1, - "anisotropicFilteringLevel": 4, - "isCube": false, - "is3D": false, - "is2DArray": false, - "gammaSpace": true, - "invertZ": false, - "lodLevelInAlpha": false, - "lodGenerationOffset": 0, - "lodGenerationScale": 0, - "linearSpecularLOD": false, - "isRenderTarget": false, - "animations": [], - "invertY": false, - "samplingMode": 3, - "_useSRGBBuffer": false - }, - "isLocal": true, - "animations": [], - "startDelay": 0, - "renderingGroupId": 0, - "isBillboardBased": true, - "billboardMode": 2, - "minAngularSpeed": 0, - "maxAngularSpeed": 0, - "minSize": 5, - "maxSize": 6, - "minScaleX": 1, - "maxScaleX": 1, - "minScaleY": 0.2, - "maxScaleY": 0.5, - "minEmitPower": 0, - "maxEmitPower": 0, - "minLifeTime": 2, - "maxLifeTime": 3, - "emitRate": 10, - "gravity": [ - 0, - 0, - 0 - ], - "noiseStrength": [ - 10, - 10, - 10 - ], - "color1": [ - 1, - 1, - 1, - 1 - ], - "color2": [ - 1, - 1, - 1, - 1 - ], - "colorDead": [ - 1, - 1, - 1, - 0 - ], - "updateSpeed": 0.016666666666666666, - "targetStopDuration": 0, - "blendMode": 4, - "preWarmCycles": 100, - "preWarmStepOffset": 10, - "minInitialRotation": -0.1, - "maxInitialRotation": 0.1, - "startSpriteCellID": 0, - "endSpriteCellID": 63, - "spriteCellChangeSpeed": 0.9, - "spriteCellWidth": 128, - "spriteCellHeight": 128, - "spriteRandomStartCell": true, - "isAnimationSheetEnabled": true, - "colorGradients": [ - { - "gradient": 0, - "color1": [ - 1, - 1, - 1, - 0 - ], - "color2": [ - 1, - 1, - 1, - 0 - ] - }, - { - "gradient": 0.1, - "color1": [ - 1, - 1, - 1, - 0.6 - ], - "color2": [ - 1, - 1, - 1, - 0.6 - ] - }, - { - "gradient": 0.9, - "color1": [ - 1, - 1, - 1, - 0.6 - ], - "color2": [ - 1, - 1, - 1, - 0.6 - ] - }, - { - "gradient": 1, - "color1": [ - 1, - 1, - 1, - 0 - ], - "color2": [ - 1, - 1, - 1, - 0 - ] - } - ], - "rampGradients": [ - { - "gradient": 0, - "color": [ - 1, - 1, - 1 - ] - }, - { - "gradient": 1, - "color": [ - 0.7968, - 0.3685, - 0.1105 - ] - } - ], - "useRampGradients": true, - "colorRemapGradients": [ - { - "gradient": 0, - "factor1": 0.2, - "factor2": 1 - }, - { - "gradient": 1, - "factor1": 0.2, - "factor2": 1 - } - ], - "textureMask": [ - 1, - 1, - 1, - 1 - ], - "customShader": null, - "preventAutoStart": true -} \ No newline at end of file diff --git a/src/assets/particlesystem/fire/fire_snh_3.json b/src/assets/particlesystem/fire/fire_snh_3.json deleted file mode 100644 index 89347e9..0000000 --- a/src/assets/particlesystem/fire/fire_snh_3.json +++ /dev/null @@ -1,220 +0,0 @@ -{ - "name": "fireSystem3", - "id": "fireSystem3", - "capacity": 3, - "disposeOnStop": false, - "manualEmitCount": -1, - "emitter": [ - 0, - 2.25, - 0 - ], - "particleEmitterType": { - "type": "HemisphericParticleEmitter", - "radius": 0.5, - "radiusRange": 1, - "directionRandomizer": 0 - }, - "texture": { - "tags": null, - "url": "assets/particlesystem/fire/fire_8x8_3.png", - "uOffset": 0, - "vOffset": 0, - "uScale": 1, - "vScale": 1, - "uAng": 0, - "vAng": 0, - "wAng": 0, - "uRotationCenter": 0.5, - "vRotationCenter": 0.5, - "wRotationCenter": 0.5, - "homogeneousRotationInUVTransform": false, - "isBlocking": true, - "name": "assets/particlesystem/fire/fire_8x8_3.png", - "hasAlpha": false, - "getAlphaFromRGB": false, - "level": 1, - "coordinatesIndex": 0, - "coordinatesMode": 0, - "wrapU": 1, - "wrapV": 1, - "wrapR": 1, - "anisotropicFilteringLevel": 4, - "isCube": false, - "is3D": false, - "is2DArray": false, - "gammaSpace": true, - "invertZ": false, - "lodLevelInAlpha": false, - "lodGenerationOffset": 0, - "lodGenerationScale": 0, - "linearSpecularLOD": false, - "isRenderTarget": false, - "animations": [], - "invertY": false, - "samplingMode": 3, - "_useSRGBBuffer": false - }, - "isLocal": true, - "animations": [], - "startDelay": 0, - "renderingGroupId": 0, - "isBillboardBased": true, - "billboardMode": 2, - "minAngularSpeed": 0, - "maxAngularSpeed": 0, - "minSize": 5, - "maxSize": 6, - "minScaleX": 1, - "maxScaleX": 1, - "minScaleY": 0.2, - "maxScaleY": 0.5, - "minEmitPower": 0, - "maxEmitPower": 0, - "minLifeTime": 3, - "maxLifeTime": 10, - "emitRate": 10, - "gravity": [ - 0, - 0, - 0 - ], - "noiseStrength": [ - 10, - 10, - 10 - ], - "color1": [ - 1, - 1, - 1, - 1 - ], - "color2": [ - 1, - 1, - 1, - 1 - ], - "colorDead": [ - 1, - 1, - 1, - 0 - ], - "updateSpeed": 0.016666666666666666, - "targetStopDuration": 0, - "blendMode": 4, - "preWarmCycles": 100, - "preWarmStepOffset": 10, - "minInitialRotation": -0.1, - "maxInitialRotation": 0.1, - "startSpriteCellID": 0, - "endSpriteCellID": 63, - "spriteCellChangeSpeed": 0.9, - "spriteCellWidth": 128, - "spriteCellHeight": 128, - "spriteRandomStartCell": true, - "isAnimationSheetEnabled": true, - "colorGradients": [ - { - "gradient": 0, - "color1": [ - 1, - 1, - 1, - 0 - ], - "color2": [ - 1, - 1, - 1, - 0 - ] - }, - { - "gradient": 0.1, - "color1": [ - 1, - 1, - 1, - 0.6 - ], - "color2": [ - 1, - 1, - 1, - 0.6 - ] - }, - { - "gradient": 0.9, - "color1": [ - 1, - 1, - 1, - 0.6 - ], - "color2": [ - 1, - 1, - 1, - 0.6 - ] - }, - { - "gradient": 1, - "color1": [ - 1, - 1, - 1, - 0 - ], - "color2": [ - 1, - 1, - 1, - 0 - ] - } - ], - "rampGradients": [ - { - "gradient": 0, - "color": [ - 1, - 1, - 1 - ] - }, - { - "gradient": 1, - "color": [ - 0.7968, - 0.3685, - 0.1105 - ] - } - ], - "useRampGradients": true, - "colorRemapGradients": [ - { - "gradient": 0.1, - "factor1": 0.2, - "factor2": 1 - }, - { - "gradient": 1, - "factor1": 0.2, - "factor2": 1 - } - ], - "textureMask": [ - 1, - 1, - 1, - 1 - ], - "customShader": null, - "preventAutoStart": true -} \ No newline at end of file diff --git a/src/assets/particlesystem/fire/fire_tph_1.json b/src/assets/particlesystem/fire/fire_tph_1.json deleted file mode 100644 index 02ebfe4..0000000 --- a/src/assets/particlesystem/fire/fire_tph_1.json +++ /dev/null @@ -1,220 +0,0 @@ -{ - "name": "fireSystem", - "id": "fireSystem", - "capacity": 5, - "disposeOnStop": false, - "manualEmitCount": -1, - "emitter": [ - 0, - 3.25, - 0 - ], - "particleEmitterType": { - "type": "HemisphericParticleEmitter", - "radius": 2, - "radiusRange": 1, - "directionRandomizer": 0 - }, - "texture": { - "tags": null, - "url": "assets/particlesystem/fire/fire_8x8_1.png", - "uOffset": 0, - "vOffset": 0, - "uScale": 1, - "vScale": 1, - "uAng": 0, - "vAng": 0, - "wAng": 0, - "uRotationCenter": 0.5, - "vRotationCenter": 0.5, - "wRotationCenter": 0.5, - "homogeneousRotationInUVTransform": false, - "isBlocking": true, - "name": "assets/particlesystem/fire/fire_8x8_1.png", - "hasAlpha": false, - "getAlphaFromRGB": false, - "level": 1, - "coordinatesIndex": 0, - "coordinatesMode": 0, - "wrapU": 1, - "wrapV": 1, - "wrapR": 1, - "anisotropicFilteringLevel": 4, - "isCube": false, - "is3D": false, - "is2DArray": false, - "gammaSpace": true, - "invertZ": false, - "lodLevelInAlpha": false, - "lodGenerationOffset": 0, - "lodGenerationScale": 0, - "linearSpecularLOD": false, - "isRenderTarget": false, - "animations": [], - "invertY": false, - "samplingMode": 3, - "_useSRGBBuffer": false - }, - "isLocal": true, - "animations": [], - "startDelay": 0, - "renderingGroupId": 0, - "isBillboardBased": true, - "billboardMode": 2, - "minAngularSpeed": 0, - "maxAngularSpeed": 0, - "minSize": 6, - "maxSize": 8, - "minScaleX": 1, - "maxScaleX": 1, - "minScaleY": 1, - "maxScaleY": 5, - "minEmitPower": 0, - "maxEmitPower": 0, - "minLifeTime": 2, - "maxLifeTime": 3, - "emitRate": 10, - "gravity": [ - 0, - 0, - 0 - ], - "noiseStrength": [ - 10, - 10, - 10 - ], - "color1": [ - 1, - 1, - 1, - 1 - ], - "color2": [ - 1, - 1, - 1, - 1 - ], - "colorDead": [ - 1, - 1, - 1, - 0 - ], - "updateSpeed": 0.016666666666666666, - "targetStopDuration": 0, - "blendMode": 4, - "preWarmCycles": 100, - "preWarmStepOffset": 10, - "minInitialRotation": -0.1, - "maxInitialRotation": 0.1, - "startSpriteCellID": 0, - "endSpriteCellID": 63, - "spriteCellChangeSpeed": 1, - "spriteCellWidth": 128, - "spriteCellHeight": 128, - "spriteRandomStartCell": true, - "isAnimationSheetEnabled": true, - "colorGradients": [ - { - "gradient": 0, - "color1": [ - 1, - 1, - 1, - 0 - ], - "color2": [ - 1, - 1, - 1, - 0 - ] - }, - { - "gradient": 0.1, - "color1": [ - 1, - 1, - 1, - 0.6 - ], - "color2": [ - 1, - 1, - 1, - 0.6 - ] - }, - { - "gradient": 0.9, - "color1": [ - 1, - 1, - 1, - 0.6 - ], - "color2": [ - 1, - 1, - 1, - 0.6 - ] - }, - { - "gradient": 1, - "color1": [ - 1, - 1, - 1, - 0 - ], - "color2": [ - 1, - 1, - 1, - 0 - ] - } - ], - "rampGradients": [ - { - "gradient": 0, - "color": [ - 1, - 1, - 1 - ] - }, - { - "gradient": 1, - "color": [ - 0.7968, - 0.3685, - 0.1105 - ] - } - ], - "useRampGradients": true, - "colorRemapGradients": [ - { - "gradient": 0, - "factor1": 0.2, - "factor2": 1 - }, - { - "gradient": 1, - "factor1": 0.2, - "factor2": 1 - } - ], - "textureMask": [ - 1, - 1, - 1, - 1 - ], - "customShader": null, - "preventAutoStart": true -} \ No newline at end of file diff --git a/src/assets/particlesystem/fire/fire_tph_2.json b/src/assets/particlesystem/fire/fire_tph_2.json deleted file mode 100644 index 3d507d7..0000000 --- a/src/assets/particlesystem/fire/fire_tph_2.json +++ /dev/null @@ -1,220 +0,0 @@ -{ - "name": "fireSystem2", - "id": "fireSystem2", - "capacity": 3, - "disposeOnStop": false, - "manualEmitCount": -1, - "emitter": [ - 0, - 2.25, - 0 - ], - "particleEmitterType": { - "type": "HemisphericParticleEmitter", - "radius": 2, - "radiusRange": 1, - "directionRandomizer": 0 - }, - "texture": { - "tags": null, - "url": "assets/particlesystem/fire/fire_8x8_2.png", - "uOffset": 0, - "vOffset": 0, - "uScale": 1, - "vScale": 1, - "uAng": 0, - "vAng": 0, - "wAng": 0, - "uRotationCenter": 0.5, - "vRotationCenter": 0.5, - "wRotationCenter": 0.5, - "homogeneousRotationInUVTransform": false, - "isBlocking": true, - "name": "assets/particlesystem/fire/fire_8x8_2.png", - "hasAlpha": false, - "getAlphaFromRGB": false, - "level": 1, - "coordinatesIndex": 0, - "coordinatesMode": 0, - "wrapU": 1, - "wrapV": 1, - "wrapR": 1, - "anisotropicFilteringLevel": 4, - "isCube": false, - "is3D": false, - "is2DArray": false, - "gammaSpace": true, - "invertZ": false, - "lodLevelInAlpha": false, - "lodGenerationOffset": 0, - "lodGenerationScale": 0, - "linearSpecularLOD": false, - "isRenderTarget": false, - "animations": [], - "invertY": false, - "samplingMode": 3, - "_useSRGBBuffer": false - }, - "isLocal": true, - "animations": [], - "startDelay": 0, - "renderingGroupId": 0, - "isBillboardBased": true, - "billboardMode": 2, - "minAngularSpeed": 0, - "maxAngularSpeed": 0, - "minSize": 5, - "maxSize": 6, - "minScaleX": 1, - "maxScaleX": 1, - "minScaleY": 1, - "maxScaleY": 5, - "minEmitPower": 0, - "maxEmitPower": 0, - "minLifeTime": 2, - "maxLifeTime": 3, - "emitRate": 10, - "gravity": [ - 0, - 0, - 0 - ], - "noiseStrength": [ - 10, - 10, - 10 - ], - "color1": [ - 1, - 1, - 1, - 1 - ], - "color2": [ - 1, - 1, - 1, - 1 - ], - "colorDead": [ - 1, - 1, - 1, - 0 - ], - "updateSpeed": 0.016666666666666666, - "targetStopDuration": 0, - "blendMode": 4, - "preWarmCycles": 100, - "preWarmStepOffset": 10, - "minInitialRotation": -0.1, - "maxInitialRotation": 0.1, - "startSpriteCellID": 0, - "endSpriteCellID": 63, - "spriteCellChangeSpeed": 0.9, - "spriteCellWidth": 128, - "spriteCellHeight": 128, - "spriteRandomStartCell": true, - "isAnimationSheetEnabled": true, - "colorGradients": [ - { - "gradient": 0, - "color1": [ - 1, - 1, - 1, - 0 - ], - "color2": [ - 1, - 1, - 1, - 0 - ] - }, - { - "gradient": 0.1, - "color1": [ - 1, - 1, - 1, - 0.6 - ], - "color2": [ - 1, - 1, - 1, - 0.6 - ] - }, - { - "gradient": 0.9, - "color1": [ - 1, - 1, - 1, - 0.6 - ], - "color2": [ - 1, - 1, - 1, - 0.6 - ] - }, - { - "gradient": 1, - "color1": [ - 1, - 1, - 1, - 0 - ], - "color2": [ - 1, - 1, - 1, - 0 - ] - } - ], - "rampGradients": [ - { - "gradient": 0, - "color": [ - 1, - 1, - 1 - ] - }, - { - "gradient": 1, - "color": [ - 0.7968, - 0.3685, - 0.1105 - ] - } - ], - "useRampGradients": true, - "colorRemapGradients": [ - { - "gradient": 0, - "factor1": 0.2, - "factor2": 1 - }, - { - "gradient": 1, - "factor1": 0.2, - "factor2": 1 - } - ], - "textureMask": [ - 1, - 1, - 1, - 1 - ], - "customShader": null, - "preventAutoStart": true -} \ No newline at end of file diff --git a/src/assets/particlesystem/fire/fire_tph_3.json b/src/assets/particlesystem/fire/fire_tph_3.json deleted file mode 100644 index 44e7f40..0000000 --- a/src/assets/particlesystem/fire/fire_tph_3.json +++ /dev/null @@ -1,220 +0,0 @@ -{ - "name": "fireSystem3", - "id": "fireSystem3", - "capacity": 3, - "disposeOnStop": false, - "manualEmitCount": -1, - "emitter": [ - 0, - 2.25, - 0 - ], - "particleEmitterType": { - "type": "HemisphericParticleEmitter", - "radius": 2, - "radiusRange": 1, - "directionRandomizer": 0 - }, - "texture": { - "tags": null, - "url": "assets/particlesystem/fire/fire_8x8_3.png", - "uOffset": 0, - "vOffset": 0, - "uScale": 1, - "vScale": 1, - "uAng": 0, - "vAng": 0, - "wAng": 0, - "uRotationCenter": 0.5, - "vRotationCenter": 0.5, - "wRotationCenter": 0.5, - "homogeneousRotationInUVTransform": false, - "isBlocking": true, - "name": "assets/particlesystem/fire/fire_8x8_3.png", - "hasAlpha": false, - "getAlphaFromRGB": false, - "level": 1, - "coordinatesIndex": 0, - "coordinatesMode": 0, - "wrapU": 1, - "wrapV": 1, - "wrapR": 1, - "anisotropicFilteringLevel": 4, - "isCube": false, - "is3D": false, - "is2DArray": false, - "gammaSpace": true, - "invertZ": false, - "lodLevelInAlpha": false, - "lodGenerationOffset": 0, - "lodGenerationScale": 0, - "linearSpecularLOD": false, - "isRenderTarget": false, - "animations": [], - "invertY": false, - "samplingMode": 3, - "_useSRGBBuffer": false - }, - "isLocal": true, - "animations": [], - "startDelay": 0, - "renderingGroupId": 0, - "isBillboardBased": true, - "billboardMode": 2, - "minAngularSpeed": 0, - "maxAngularSpeed": 0, - "minSize": 5, - "maxSize": 6, - "minScaleX": 1, - "maxScaleX": 1, - "minScaleY": 1, - "maxScaleY": 5, - "minEmitPower": 0, - "maxEmitPower": 0, - "minLifeTime": 3, - "maxLifeTime": 10, - "emitRate": 10, - "gravity": [ - 0, - 0, - 0 - ], - "noiseStrength": [ - 10, - 10, - 10 - ], - "color1": [ - 1, - 1, - 1, - 1 - ], - "color2": [ - 1, - 1, - 1, - 1 - ], - "colorDead": [ - 1, - 1, - 1, - 0 - ], - "updateSpeed": 0.016666666666666666, - "targetStopDuration": 0, - "blendMode": 4, - "preWarmCycles": 100, - "preWarmStepOffset": 10, - "minInitialRotation": -0.1, - "maxInitialRotation": 0.1, - "startSpriteCellID": 0, - "endSpriteCellID": 63, - "spriteCellChangeSpeed": 0.9, - "spriteCellWidth": 128, - "spriteCellHeight": 128, - "spriteRandomStartCell": true, - "isAnimationSheetEnabled": true, - "colorGradients": [ - { - "gradient": 0, - "color1": [ - 1, - 1, - 1, - 0 - ], - "color2": [ - 1, - 1, - 1, - 0 - ] - }, - { - "gradient": 0.1, - "color1": [ - 1, - 1, - 1, - 0.6 - ], - "color2": [ - 1, - 1, - 1, - 0.6 - ] - }, - { - "gradient": 0.9, - "color1": [ - 1, - 1, - 1, - 0.6 - ], - "color2": [ - 1, - 1, - 1, - 0.6 - ] - }, - { - "gradient": 1, - "color1": [ - 1, - 1, - 1, - 0 - ], - "color2": [ - 1, - 1, - 1, - 0 - ] - } - ], - "rampGradients": [ - { - "gradient": 0, - "color": [ - 1, - 1, - 1 - ] - }, - { - "gradient": 1, - "color": [ - 0.7968, - 0.3685, - 0.1105 - ] - } - ], - "useRampGradients": true, - "colorRemapGradients": [ - { - "gradient": 0.1, - "factor1": 0.2, - "factor2": 1 - }, - { - "gradient": 1, - "factor1": 0.2, - "factor2": 1 - } - ], - "textureMask": [ - 1, - 1, - 1, - 1 - ], - "customShader": null, - "preventAutoStart": true -} \ No newline at end of file diff --git a/src/assets/particlesystem/smoke/smoke_a.json b/src/assets/particlesystem/smoke/smoke_a.json index 275321c..c9e3680 100644 --- a/src/assets/particlesystem/smoke/smoke_a.json +++ b/src/assets/particlesystem/smoke/smoke_a.json @@ -1,211 +1 @@ -{ - "name": "default system", - "id": "default system", - "capacity": 500, - "disposeOnStop": false, - "manualEmitCount": -1, - "emitter": [ - 0, - 0, - 0 - ], - "particleEmitterType": { - "type": "HemisphericParticleEmitter", - "radius": 1, - "radiusRange": 1, - "directionRandomizer": 0 - }, - "texture": { - "tags": null, - "url": "assets/particlesystem/smoke/smoke_8x8.png", - "uOffset": 0, - "vOffset": 0, - "uScale": 1, - "vScale": 1, - "uAng": 0, - "vAng": 0, - "wAng": 0, - "uRotationCenter": 0.5, - "vRotationCenter": 0.5, - "wRotationCenter": 0.5, - "homogeneousRotationInUVTransform": false, - "isBlocking": true, - "name": "assets/particlesystem/smoke/smoke_8x8.png", - "hasAlpha": false, - "getAlphaFromRGB": false, - "level": 1, - "coordinatesIndex": 0, - "coordinatesMode": 0, - "wrapU": 1, - "wrapV": 1, - "wrapR": 1, - "anisotropicFilteringLevel": 4, - "isCube": false, - "is3D": false, - "is2DArray": false, - "gammaSpace": true, - "invertZ": false, - "lodLevelInAlpha": false, - "lodGenerationOffset": 0, - "lodGenerationScale": 0, - "linearSpecularLOD": false, - "isRenderTarget": false, - "animations": [], - "invertY": true, - "samplingMode": 3, - "_useSRGBBuffer": false - }, - "isLocal": true, - "animations": [], - "startDelay": 0, - "renderingGroupId": 0, - "isBillboardBased": true, - "billboardMode": 7, - "minAngularSpeed": 0, - "maxAngularSpeed": 0, - "minSize": 3, - "maxSize": 5, - "minScaleX": 1, - "maxScaleX": 1, - "minScaleY": 1, - "maxScaleY": 1, - "minEmitPower": 1.2, - "maxEmitPower": 1.4, - "minLifeTime": 5, - "maxLifeTime": 3, - "emitRate": 3, - "gravity": [ - 0, - 0, - 0 - ], - "noiseStrength": [ - 0.2, - 0, - 0.15 - ], - "color1": [ - 1, - 1, - 1, - 1 - ], - "color2": [ - 1, - 1, - 1, - 1 - ], - "colorDead": [ - 1, - 1, - 1, - 0 - ], - "updateSpeed": 0.016666666666666666, - "targetStopDuration": 0, - "blendMode": 1, - "preWarmCycles": 0, - "preWarmStepOffset": 1, - "minInitialRotation": -0.7, - "maxInitialRotation": 0.7, - "startSpriteCellID": 0, - "endSpriteCellID": 63, - "spriteCellChangeSpeed": 2.5, - "spriteCellWidth": 128, - "spriteCellHeight": 128, - "spriteRandomStartCell": true, - "isAnimationSheetEnabled": true, - "colorGradients": [ - { - "gradient": 0, - "color1": [ - 0.5, - 0.5, - 0.5, - 0 - ], - "color2": [ - 0.5, - 0.5, - 0.5, - 0 - ] - }, - { - "gradient": 0.3, - "color1": [ - 0.3, - 0.3, - 0.3, - 0.5 - ], - "color2": [ - 0.3, - 0.3, - 0.3, - 0.5 - ] - }, - { - "gradient": 0.7, - "color1": [ - 0.2, - 0.2, - 0.2, - 0.3 - ], - "color2": [ - 0.2, - 0.2, - 0.2, - 0.3 - ] - }, - { - "gradient": 1, - "color1": [ - 0.1, - 0.1, - 0.1, - 0 - ], - "color2": [ - 0.1, - 0.1, - 0.1, - 0 - ] - } - ], - "sizeGradients": [ - { - "gradient": 0, - "factor1": 1, - "factor2": 1 - }, - { - "gradient": 0.09, - "factor1": 6, - "factor2": 6 - } - ], - "noiseTexture": { - "customType": "BABYLON.NoiseProceduralTexture", - "brightness": 0.5, - "octaves": 4, - "persistence": 0.2, - "animationSpeedFactor": 5, - "size": 256, - "generateMipMaps": true, - "time": 2729.4365999997644 - }, - "textureMask": [ - 1, - 1, - 1, - 1 - ], - "customShader": null, - "preventAutoStart": true -} \ No newline at end of file +{"name":"default system","id":"default system","capacity":500,"emitterId":"psRoot","particleEmitterType":{"type":"PointParticleEmitter","direction1":[0,1,0],"direction2":[0,1,0]},"texture":{"tags":null,"url":"assets/particlesystem/smoke/smoke_8x8.png","uOffset":0,"vOffset":0,"uScale":1,"vScale":1,"uAng":0,"vAng":0,"wAng":0,"uRotationCenter":0.5,"vRotationCenter":0.5,"wRotationCenter":0.5,"homogeneousRotationInUVTransform":false,"isBlocking":true,"name":"assets/particlesystem/smoke/smoke_8x8.png","hasAlpha":false,"getAlphaFromRGB":false,"level":1,"coordinatesIndex":0,"coordinatesMode":0,"wrapU":1,"wrapV":1,"wrapR":1,"anisotropicFilteringLevel":4,"isCube":false,"is3D":false,"is2DArray":false,"gammaSpace":true,"invertZ":false,"lodLevelInAlpha":false,"lodGenerationOffset":0,"lodGenerationScale":0,"linearSpecularLOD":false,"isRenderTarget":false,"animations":[],"invertY":true,"samplingMode":3},"isLocal":true,"animations":[],"startDelay":0,"renderingGroupId":0,"isBillboardBased":true,"billboardMode":7,"minAngularSpeed":0,"maxAngularSpeed":0,"minSize":3,"maxSize":5,"minScaleX":0.2,"maxScaleX":0.2,"minScaleY":0.2,"maxScaleY":0.2,"minEmitPower":1,"maxEmitPower":0.5,"minLifeTime":5,"maxLifeTime":3,"emitRate":3,"gravity":[0,0,0],"noiseStrength":[0.2,0,0.15],"color1":[1,1,1,1],"color2":[1,1,1,1],"colorDead":[1,1,1,0],"updateSpeed":0.016666666666666666,"targetStopDuration":0,"blendMode":1,"preWarmCycles":0,"preWarmStepOffset":1,"minInitialRotation":-0.7,"maxInitialRotation":0.7,"startSpriteCellID":0,"endSpriteCellID":63,"spriteCellChangeSpeed":2.5,"spriteCellWidth":128,"spriteCellHeight":128,"spriteRandomStartCell":true,"isAnimationSheetEnabled":true,"colorGradients":[{"gradient":0,"color1":[0.5,0.5,0.5,0],"color2":[0.5,0.5,0.5,0]},{"gradient":0.3,"color1":[0.3,0.3,0.3,0.5],"color2":[0.3,0.3,0.3,0.5]},{"gradient":0.7,"color1":[0.2,0.2,0.2,0.3],"color2":[0.2,0.2,0.2,0.3]},{"gradient":1,"color1":[0.1,0.1,0.1,0],"color2":[0.1,0.1,0.1,0]}],"sizeGradients":[{"gradient":0,"factor1":1,"factor2":1},{"gradient":0.24,"factor1":6,"factor2":6}],"noiseTexture":{"customType":"BABYLON.NoiseProceduralTexture","brightness":0.5,"octaves":4,"persistence":0.2,"animationSpeedFactor":5,"size":256,"generateMipMaps":true,"time":10339.515299999644},"textureMask":[1,1,1,1],"customShader":null,"preventAutoStart":true} \ No newline at end of file diff --git a/src/assets/particlesystem/smoke/smoke_b.json b/src/assets/particlesystem/smoke/smoke_b.json deleted file mode 100644 index 5c5d906..0000000 --- a/src/assets/particlesystem/smoke/smoke_b.json +++ /dev/null @@ -1,214 +0,0 @@ -{ - "name": "default system", - "id": "default system", - "capacity": 500, - "disposeOnStop": false, - "manualEmitCount": -1, - "emitter": [ - 0, - 0, - 0 - ], - "particleEmitterType": { - "type": "ConeParticleEmitter", - "radius": 0.1, - "angle": 0.6, - "directionRandomizer": 0, - "radiusRange": 1, - "heightRange": 1, - "emitFromSpawnPointOnly": false - }, - "texture": { - "tags": null, - "url": "assets/particlesystem/smoke/smoke_8x8.png", - "uOffset": 0, - "vOffset": 0, - "uScale": 1, - "vScale": 1, - "uAng": 0, - "vAng": 0, - "wAng": 0, - "uRotationCenter": 0.5, - "vRotationCenter": 0.5, - "wRotationCenter": 0.5, - "homogeneousRotationInUVTransform": false, - "isBlocking": true, - "name": "assets/particlesystem/smoke/smoke_8x8.png", - "hasAlpha": false, - "getAlphaFromRGB": false, - "level": 1, - "coordinatesIndex": 0, - "coordinatesMode": 0, - "wrapU": 1, - "wrapV": 1, - "wrapR": 1, - "anisotropicFilteringLevel": 4, - "isCube": false, - "is3D": false, - "is2DArray": false, - "gammaSpace": true, - "invertZ": false, - "lodLevelInAlpha": false, - "lodGenerationOffset": 0, - "lodGenerationScale": 0, - "linearSpecularLOD": false, - "isRenderTarget": false, - "animations": [], - "invertY": true, - "samplingMode": 3, - "_useSRGBBuffer": false - }, - "isLocal": true, - "animations": [], - "startDelay": 0, - "renderingGroupId": 0, - "isBillboardBased": true, - "billboardMode": 7, - "minAngularSpeed": 0, - "maxAngularSpeed": 0, - "minSize": 3, - "maxSize": 5, - "minScaleX": 1, - "maxScaleX": 1, - "minScaleY": 1, - "maxScaleY": 1, - "minEmitPower": 1.2, - "maxEmitPower": 1.4, - "minLifeTime": 10, - "maxLifeTime": 11, - "emitRate": 5, - "gravity": [ - 0.1, - 0, - 0.05 - ], - "noiseStrength": [ - 0.2, - 0, - 0.15 - ], - "color1": [ - 1, - 1, - 1, - 1 - ], - "color2": [ - 1, - 1, - 1, - 1 - ], - "colorDead": [ - 1, - 1, - 1, - 0 - ], - "updateSpeed": 0.016666666666666666, - "targetStopDuration": 0, - "blendMode": 1, - "preWarmCycles": 0, - "preWarmStepOffset": 1, - "minInitialRotation": -0.7, - "maxInitialRotation": 0.7, - "startSpriteCellID": 0, - "endSpriteCellID": 63, - "spriteCellChangeSpeed": 2.5, - "spriteCellWidth": 128, - "spriteCellHeight": 128, - "spriteRandomStartCell": true, - "isAnimationSheetEnabled": true, - "colorGradients": [ - { - "gradient": 0, - "color1": [ - 0.5, - 0.5, - 0.5, - 0 - ], - "color2": [ - 0.5, - 0.5, - 0.5, - 0 - ] - }, - { - "gradient": 0.3, - "color1": [ - 0.3, - 0.3, - 0.3, - 0.5 - ], - "color2": [ - 0.3, - 0.3, - 0.3, - 0.5 - ] - }, - { - "gradient": 0.7, - "color1": [ - 0.2, - 0.2, - 0.2, - 0.3 - ], - "color2": [ - 0.2, - 0.2, - 0.2, - 0.3 - ] - }, - { - "gradient": 1, - "color1": [ - 0.1, - 0.1, - 0.1, - 0 - ], - "color2": [ - 0.1, - 0.1, - 0.1, - 0 - ] - } - ], - "sizeGradients": [ - { - "gradient": 0, - "factor1": 1, - "factor2": 1 - }, - { - "gradient": 1, - "factor1": 6, - "factor2": 6 - } - ], - "noiseTexture": { - "customType": "BABYLON.NoiseProceduralTexture", - "brightness": 0.5, - "octaves": 4, - "persistence": 0.2, - "animationSpeedFactor": 5, - "size": 256, - "generateMipMaps": true, - "time": 191.22629999998276 - }, - "textureMask": [ - 1, - 1, - 1, - 1 - ], - "customShader": null, - "preventAutoStart": true -} \ No newline at end of file diff --git a/src/assets/particlesystem/smoke/smoke_c.json b/src/assets/particlesystem/smoke/smoke_c.json deleted file mode 100644 index 513fc2b..0000000 --- a/src/assets/particlesystem/smoke/smoke_c.json +++ /dev/null @@ -1,214 +0,0 @@ -{ - "name": "default system", - "id": "default system", - "capacity": 500, - "disposeOnStop": false, - "manualEmitCount": -1, - "emitter": [ - 0, - 0, - 0 - ], - "particleEmitterType": { - "type": "ConeParticleEmitter", - "radius": 0.1, - "angle": 0.6, - "directionRandomizer": 0, - "radiusRange": 1, - "heightRange": 1, - "emitFromSpawnPointOnly": false - }, - "texture": { - "tags": null, - "url": "assets/particlesystem/smoke/smoke_8x8.png", - "uOffset": 0, - "vOffset": 0, - "uScale": 1, - "vScale": 1, - "uAng": 0, - "vAng": 0, - "wAng": 0, - "uRotationCenter": 0.5, - "vRotationCenter": 0.5, - "wRotationCenter": 0.5, - "homogeneousRotationInUVTransform": false, - "isBlocking": true, - "name": "assets/particlesystem/smoke/smoke_8x8.png", - "hasAlpha": false, - "getAlphaFromRGB": false, - "level": 1, - "coordinatesIndex": 0, - "coordinatesMode": 0, - "wrapU": 1, - "wrapV": 1, - "wrapR": 1, - "anisotropicFilteringLevel": 4, - "isCube": false, - "is3D": false, - "is2DArray": false, - "gammaSpace": true, - "invertZ": false, - "lodLevelInAlpha": false, - "lodGenerationOffset": 0, - "lodGenerationScale": 0, - "linearSpecularLOD": false, - "isRenderTarget": false, - "animations": [], - "invertY": true, - "samplingMode": 3, - "_useSRGBBuffer": false - }, - "isLocal": true, - "animations": [], - "startDelay": 0, - "renderingGroupId": 0, - "isBillboardBased": true, - "billboardMode": 7, - "minAngularSpeed": 0, - "maxAngularSpeed": 0, - "minSize": 3, - "maxSize": 5, - "minScaleX": 1, - "maxScaleX": 1, - "minScaleY": 1, - "maxScaleY": 1, - "minEmitPower": 1.2, - "maxEmitPower": 1.4, - "minLifeTime": 5, - "maxLifeTime": 3, - "emitRate": 3, - "gravity": [ - 0, - -1, - 0 - ], - "noiseStrength": [ - 0.2, - 0, - 0.15 - ], - "color1": [ - 1, - 1, - 1, - 1 - ], - "color2": [ - 1, - 1, - 1, - 1 - ], - "colorDead": [ - 1, - 1, - 1, - 0 - ], - "updateSpeed": 0.016666666666666666, - "targetStopDuration": 0, - "blendMode": 1, - "preWarmCycles": 0, - "preWarmStepOffset": 1, - "minInitialRotation": -0.7, - "maxInitialRotation": 0.7, - "startSpriteCellID": 0, - "endSpriteCellID": 63, - "spriteCellChangeSpeed": 2.5, - "spriteCellWidth": 128, - "spriteCellHeight": 128, - "spriteRandomStartCell": true, - "isAnimationSheetEnabled": true, - "colorGradients": [ - { - "gradient": 0, - "color1": [ - 0.5, - 0.5, - 0.5, - 0 - ], - "color2": [ - 0.5, - 0.5, - 0.5, - 0 - ] - }, - { - "gradient": 0.3, - "color1": [ - 0.3, - 0.3, - 0.3, - 0.5 - ], - "color2": [ - 0.3, - 0.3, - 0.3, - 0.5 - ] - }, - { - "gradient": 0.7, - "color1": [ - 0.2, - 0.2, - 0.2, - 0.3 - ], - "color2": [ - 0.2, - 0.2, - 0.2, - 0.3 - ] - }, - { - "gradient": 1, - "color1": [ - 0.1, - 0.1, - 0.1, - 0 - ], - "color2": [ - 0.1, - 0.1, - 0.1, - 0 - ] - } - ], - "sizeGradients": [ - { - "gradient": 0, - "factor1": 1, - "factor2": 1 - }, - { - "gradient": 0.24, - "factor1": 6, - "factor2": 6 - } - ], - "noiseTexture": { - "customType": "BABYLON.NoiseProceduralTexture", - "brightness": 0.5, - "octaves": 4, - "persistence": 0.2, - "animationSpeedFactor": 5, - "size": 256, - "generateMipMaps": true, - "time": 1530.3456000000376 - }, - "textureMask": [ - 1, - 1, - 1, - 1 - ], - "customShader": null, - "preventAutoStart": true -} \ No newline at end of file diff --git a/src/assets/particlesystem/smoke/smoke_snh.json b/src/assets/particlesystem/smoke/smoke_snh.json index beb805a..a028ccf 100644 --- a/src/assets/particlesystem/smoke/smoke_snh.json +++ b/src/assets/particlesystem/smoke/smoke_snh.json @@ -2,21 +2,17 @@ "name": "default system", "id": "default system", "capacity": 500, - "emitter": [ - 0, - 0, - 0 - ], + "emitterId": "psRoot", "particleEmitterType": { "type": "PointParticleEmitter", "direction1": [ 0, - 2, + 0.1, 0 ], "direction2": [ 0, - 2, + 0.1, 0 ] }, @@ -69,18 +65,18 @@ "maxAngularSpeed": 0, "minSize": 3, "maxSize": 5, - "minScaleX": 1, - "maxScaleX": 1, - "minScaleY": 0.5, - "maxScaleY": 0.5, + "minScaleX": 0.1, + "maxScaleX": 0.1, + "minScaleY": 0.1, + "maxScaleY": 0.1, "minEmitPower": 1, "maxEmitPower": 0.5, "minLifeTime": 5, "maxLifeTime": 3, - "emitRate": 2, + "emitRate": 3, "gravity": [ 0, - -1, + 0, 0 ], "noiseStrength": [ @@ -202,7 +198,7 @@ "animationSpeedFactor": 5, "size": 256, "generateMipMaps": true, - "time": 5209.7477999989915 + "time": 8323.863300001296 }, "textureMask": [ 1, diff --git a/src/styles.scss b/src/styles.scss index 3981db8..508ce71 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -103,6 +103,13 @@ h1 { } //三维场景 +.dropDown{ + border: 1px solid #23D9FF; + background: linear-gradient(180deg, #000D21 0%, #006E85 100%); + li:hover { background-color: transparent; } + li { text-align: center; } + .ant-checkbox-wrapper { color: #fff; } +} #threeDimensional { .ant-tree{ color: #C4E2FC; } //tree .ant-tree,.ant-tree-node-content-wrapper:hover,.ant-tree-node-content-wrapper.ant-tree-node-selected { background-color: transparent; } //tree @@ -114,7 +121,7 @@ h1 { .ant-collapse,.ant-collapse-item,.ant-collapse-header,.ant-collapse-content{ border-radius: 0px; border: none; } //可展开面板 .ant-collapse-content{ background: rgba(0, 59, 110, 0.9); color: #fff; } //可展开面板 .ant-collapse-content-box{ padding: 0; } //可展开面板 - .ant-collapse-header{ + .ant-collapse-header{ //可展开面板 padding: 0 0 0 25px; height: 30px; line-height: 28px; @@ -123,6 +130,7 @@ h1 { color: #23D9FF; .ant-collapse-arrow{ left: 5px; } //可展开面板 } + //滚动条样式 ::-webkit-scrollbar { width: 5px; diff --git a/yarn.lock b/yarn.lock index 2d39931..2dba4a7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7154,6 +7154,11 @@ lineclip@^1.1.5: resolved "https://registry.nlark.com/lineclip/download/lineclip-1.1.5.tgz#2bf26067d94354feabf91e42768236db5616fd13" integrity sha1-K/JgZ9lDVP6r+R5CdoI221YW/RM= +linqjs@^1.0.2: + version "1.0.2" + resolved "https://registry.nlark.com/linqjs/download/linqjs-1.0.2.tgz#bba9fd694bef3fb0e64cb7c0bcd95fcdbc470fec" + integrity sha1-u6n9aUvvP7DmTLfAvNlfzbxHD+w= + loader-runner@^2.4.0: version "2.4.0" resolved "https://registry.npm.taobao.org/loader-runner/download/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357"