yuliang
/
yvan-rcs-web
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	doc/OBB矩形包围盒API.md
master
修宁 6 months ago
parent
f2bdc448db fa8ee191af
commit
57982caf6b
10 changed files with 1374 additions and 10 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      doc/OBB矩形包围盒API.md
  2. BIN
      src/assets/Models/shuttle.glb
  3. BIN
      src/assets/images/conveyor/shapes/triangle-double.png
  4. 2
      src/core/manager/WorldModel.ts
  5. 252
      src/example/example1.js
  6. 5
      src/modules/shuttle_rack/ShuttleRackEntity.ts
  7. 22
      src/modules/shuttle_rack/ShuttleRackInteraction.ts
  8. 65
      src/modules/shuttle_rack/ShuttleRackPropertySetter.ts
  9. 1022
      src/modules/shuttle_rack/ShuttleRackRenderer.ts
  10. 15
      src/modules/shuttle_rack/index.ts

1
doc/OBB矩形包围盒API.md
View File

@ -77,6 +77,7 @@ getItemsByPositionDistance(x:number, z:number, distance:number): {id:string, dis
---
(选择框)
### getItemsByRect(x1,y1,x2,y2): string[]
给出一个选择框(矩形)2个顶点，根据矩形，获取与矩形有碰撞的所有物品集合

BIN
src/assets/Models/shuttle.glb
View File

Binary file not shown.

BIN
src/assets/images/conveyor/shapes/triangle-double.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.3 KiB

2
src/core/manager/WorldModel.ts
View File

@ -5,6 +5,7 @@ import Measure from '@/modules/measure'
import Way from '@/modules/way'
import Gstore from '@/modules/gstore'
import Rack from '@/modules/rack'
import ShuttleRack from '@/modules/shuttle_rack'
import Pallet from "@/modules/pallet"
import Tote from "@/modules/tote"
import Carton from "@/modules/carton"
@ -73,6 +74,7 @@ export default class WorldModel {
Way,
Gstore,
Rack,
ShuttleRack,
Pallet,
Tote,
Carton,

252
src/example/example1.js
View File

@ -471,17 +471,21 @@ export default {
catalogCode: 'shuttle1', t: 'floor',
items: [
{
id: 'shuttle_rack1',
t: 'shuttle_rack', // 多穿库货架
tf: [[0, 0.1, 0], [0, 0, 0], [1, 1, 1]],
dt: {
bayCount: 15, // 列数
aisleCount: 2, // 巷道数
aisleCount: 16, // 巷道数
hideFloor: false, // 隐藏底板
shuttleRackDepth:7.6,
bayRail: [ // 横行巷道
{
afterBay: 2, // 横行巷道所在位置
railWidth: 1.4 // 横行巷道宽度
},
{ afterBay: 11, railWidth: 1.4 }
{ afterBay: 15, railWidth: 1.4 },
{ afterBay: 26, railWidth: 1.4 }
],
bays: [ // 每列的配置
{ bayWidth: 1.6 },
@ -500,6 +504,24 @@ export default {
{ bayWidth: 1.6 },
{ bayWidth: 1.6 },
{ bayWidth: 1.6 },
{ bayWidth: 1.6 },
{ bayWidth: 1.6 },
{ bayWidth: 1.6 },
{ bayWidth: 1.6 },
{ bayWidth: 1.6 },
{ bayWidth: 1.6 },
{ bayWidth: 1.6 },
{ bayWidth: 1.6 },
{ bayWidth: 1.6 },
{ bayWidth: 1.6 },
{ bayWidth: 1.6 },
{ bayWidth: 1.6 },
{ bayWidth: 1.6 },
{ bayWidth: 1.6 },
{ bayWidth: 1.6 },
{ bayWidth: 1.6 }
],
aisles: [ // 巷道的配置
@ -507,14 +529,14 @@ export default {
rail: { railWidth: 0.8 }, // 轨道, 主要是轨道宽度
railLeft: { // 轨道左侧
stores: [ // 轨道左侧货位
{ depth: 1.1 }, // 深位1的存储深度
{ depth: 1.1 } // 深位2的存储深度
{ depth: 0.75 }, // 深位1的存储深度
{ depth: 0.75 } // 深位2的存储深度
]
},
railRight: { // 轨道左侧
stores: [ // 轨道左侧货位
{ depth: 1.1 }, // 深位1的存储深度
{ depth: 1.1 } // 深位2的存储深度
{ depth: 0.75 }, // 深位1的存储深度
{ depth: 0.75 } // 深位2的存储深度
]
}
},
@ -522,14 +544,224 @@ export default {
rail: { railWidth: 0.8 },
railLeft: {
stores: [
{ depth: 1.1 },
{ depth: 1.1 }
{ depth: 0.75 },
{ depth: 0.75 }
]
},
railRight: {
stores: [
{ depth: 1.1 },
{ depth: 1.1 }
{ depth: 0.75 },
{ depth: 0.75 }
]
}
},
{
rail: { railWidth: 0.8 }, // 轨道, 主要是轨道宽度
railLeft: { // 轨道左侧
stores: [ // 轨道左侧货位
{ depth: 0.75 }, // 深位1的存储深度
{ depth: 0.75 } // 深位2的存储深度
]
},
railRight: { // 轨道左侧
stores: [ // 轨道左侧货位
{ depth: 0.75 }, // 深位1的存储深度
{ depth: 0.75 } // 深位2的存储深度
]
}
},
{
rail: { railWidth: 0.8 },
railLeft: {
stores: [
{ depth: 0.75 },
{ depth: 0.75 }
]
},
railRight: {
stores: [
{ depth: 0.75 },
{ depth: 0.75 }
]
}
},
{
rail: { railWidth: 0.8 }, // 轨道, 主要是轨道宽度
railLeft: { // 轨道左侧
stores: [ // 轨道左侧货位
{ depth: 0.75 }, // 深位1的存储深度
{ depth: 0.75 } // 深位2的存储深度
]
},
railRight: { // 轨道左侧
stores: [ // 轨道左侧货位
{ depth: 0.75 }, // 深位1的存储深度
{ depth: 0.75 } // 深位2的存储深度
]
}
},
{
rail: { railWidth: 0.8 },
railLeft: {
stores: [
{ depth: 0.75 },
{ depth: 0.75 }
]
},
railRight: {
stores: [
{ depth: 0.75 },
{ depth: 0.75 }
]
}
},
{
rail: { railWidth: 0.8 }, // 轨道, 主要是轨道宽度
railLeft: { // 轨道左侧
stores: [ // 轨道左侧货位
{ depth: 0.75 }, // 深位1的存储深度
{ depth: 0.75 } // 深位2的存储深度
]
},
railRight: { // 轨道左侧
stores: [ // 轨道左侧货位
{ depth: 0.75 }, // 深位1的存储深度
{ depth: 0.75 } // 深位2的存储深度
]
}
},
{
rail: { railWidth: 0.8 },
railLeft: {
stores: [
{ depth: 0.75 },
{ depth: 0.75 }
]
},
railRight: {
stores: [
{ depth: 0.75 },
{ depth: 0.75 }
]
}
},
{
rail: { railWidth: 0.8 }, // 轨道, 主要是轨道宽度
railLeft: { // 轨道左侧
stores: [ // 轨道左侧货位
{ depth: 0.75 }, // 深位1的存储深度
{ depth: 0.75 } // 深位2的存储深度
]
},
railRight: { // 轨道左侧
stores: [ // 轨道左侧货位
{ depth: 0.75 }, // 深位1的存储深度
{ depth: 0.75 } // 深位2的存储深度
]
}
},
{
rail: { railWidth: 0.8 },
railLeft: {
stores: [
{ depth: 0.75 },
{ depth: 0.75 }
]
},
railRight: {
stores: [
{ depth: 0.75 },
{ depth: 0.75 }
]
}
},
{
rail: { railWidth: 0.8 }, // 轨道, 主要是轨道宽度
railLeft: { // 轨道左侧
stores: [ // 轨道左侧货位
{ depth: 0.75 }, // 深位1的存储深度
{ depth: 0.75 } // 深位2的存储深度
]
},
railRight: { // 轨道左侧
stores: [ // 轨道左侧货位
{ depth: 0.75 }, // 深位1的存储深度
{ depth: 0.75 } // 深位2的存储深度
]
}
},
{
rail: { railWidth: 0.8 },
railLeft: {
stores: [
{ depth: 0.75 },
{ depth: 0.75 }
]
},
railRight: {
stores: [
{ depth: 0.75 },
{ depth: 0.75 }
]
}
},
{
rail: { railWidth: 0.8 }, // 轨道, 主要是轨道宽度
railLeft: { // 轨道左侧
stores: [ // 轨道左侧货位
{ depth: 0.75 }, // 深位1的存储深度
{ depth: 0.75 } // 深位2的存储深度
]
},
railRight: { // 轨道左侧
stores: [ // 轨道左侧货位
{ depth: 0.75 }, // 深位1的存储深度
{ depth: 0.75 } // 深位2的存储深度
]
}
},
{
rail: { railWidth: 0.8 },
railLeft: {
stores: [
{ depth: 0.75 },
{ depth: 0.75 }
]
},
railRight: {
stores: [
{ depth: 0.75 },
{ depth: 0.75 }
]
}
},
{
rail: { railWidth: 0.8 }, // 轨道, 主要是轨道宽度
railLeft: { // 轨道左侧
stores: [ // 轨道左侧货位
{ depth: 0.75 }, // 深位1的存储深度
{ depth: 0.75 } // 深位2的存储深度
]
},
railRight: { // 轨道左侧
stores: [ // 轨道左侧货位
{ depth: 0.75 }, // 深位1的存储深度
{ depth: 0.75 } // 深位2的存储深度
]
}
},
{
rail: { railWidth: 0.8 },
railLeft: {
stores: [
{ depth: 0.75 },
{ depth: 0.75 }
]
},
railRight: {
stores: [
{ depth: 0.75 },
{ depth: 0.75 }
]
}
}

5
src/modules/shuttle_rack/ShuttleRackEntity.ts
View File

@ -0,0 +1,5 @@
import BaseEntity from '@/core/base/BaseItemEntity.ts'
export default class ShuttleRackEntity extends BaseEntity {
}

22
src/modules/shuttle_rack/ShuttleRackInteraction.ts
View File

@ -0,0 +1,22 @@
import BaseInteraction from '@/core/base/BaseInteraction.ts'
import * as THREE from 'three'
export default class ShuttleRackInteraction extends BaseInteraction {
get isSinglePointMode(): boolean {
return true
}
constructor(itemTypeName: string) {
super(itemTypeName)
}
createPointOfItem(item: ItemJson, point: THREE.Vector3): ItemJson {
item = super.createPointOfItem(item, point)
// 创建一个地堆货架
item.dt.rackWidth = 3 // 宽度
item.dt.rackDepth = 1 // 深度
return item
}
}

65
src/modules/shuttle_rack/ShuttleRackPropertySetter.ts
View File

@ -0,0 +1,65 @@
import type { PropertySetter } from "@/core/base/PropertyTypes.ts";
import { basicFieldsSetter } from "@/editor/widgets/property/PropertyPanelConstant.ts";
const propertySetter: PropertySetter = {
flatten: {
fields: [
...basicFieldsSetter,
{
dataPath: 'dt.rackDepth', label: '货架深度', input: 'InputNumber',
inputProps: {},
},
{
dataPath: 'dt.levelCount', label: '总层数', input: 'InputNumber',
inputProps: {},
},
{
dataPath: 'dt.bayCount', label: '总列数', input: 'InputNumber',
inputProps: {},
},
{
dataPath: 'dt.hideFloor', label: '隐藏底板', input: 'InputNumber',
inputProps: {},
},
{
dataPath: 'dt.extendColumns', label: '扩展挡板', input: 'InputNumber',
inputProps: {},
},
{
dataPath: 'dt.columnSpacing', label: '支脚跨越', input: 'InputNumber',
inputProps: {},
},
{
dataPath: 'dt.bays', input: 'BayEditor',
inputProps: {
},
},
/**
* dt.bays 5列3层货架示例
* {
* dt: {
* rackDepth: 1.1, // 货架深度
* levelCount: 3, // 总层数
* bayCount: 5, // 总列数
* hideFloor: false, // 隐藏底板
* extendColumns: true, // 扩展挡板
* columnSpacing: 1, // 支脚跨越
* bays: [ // 每列的配置
* {
* bayWidth: 1.6, // 列的宽度
* offset: // 列偏移
* levelHeight: [ 1.4, 1.4, 1.4 ] // 每层的高度
* },
* {bayWidth: 1.6, levelHeight: [ 1.4, 1.4, 1.4 ]},
* {bayWidth: 1.6, levelHeight: [ 1.4, 1.4, 1.4 ]},
* {bayWidth: 1.6, levelHeight: [ 1.4, 1.4, 1.4 ]},
* {bayWidth: 1.6, levelHeight: [ 1.4, 1.4, 1.4 ]},
* ]
* }
* }
*/
],
},
};
export default propertySetter;

1022
src/modules/shuttle_rack/ShuttleRackRenderer.ts
View File

File diff suppressed because it is too large

15
src/modules/shuttle_rack/index.ts
View File

@ -0,0 +1,15 @@
import { defineModule } from '@/core/manager/ModuleManager.ts'
import ShuttleRackRenderer from './ShuttleRackRenderer.ts'
import ShuttleRackEntity from './ShuttleRackEntity.ts'
import ShuttleRackInteraction from './ShuttleRackInteraction.ts'
import propertySetter from "./ShuttleRackPropertySetter.ts";
export const ITEM_TYPE_NAME = 'shuttle_rack'
export default defineModule({
name: ITEM_TYPE_NAME,
renderer: new ShuttleRackRenderer(ITEM_TYPE_NAME),
interaction: new ShuttleRackInteraction(ITEM_TYPE_NAME),
setter: propertySetter,
entity: ShuttleRackEntity,
})
Write Preview
Loading…
Cancel
Save