Commit 3851f14e authored by suhuiguang's avatar suhuiguang

1.修改部分模型加载不对

parent 1ad7fa11
# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware # 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
# ļ:19.06.2020 19:38:56 # ļ:19.06.2020 19:38:56
newmtl fireFoam newmtl fireFoamRoom
Ns 10.0000 Ns 10.0000
Ni 1.5000 Ni 1.5000
d 1.0000 d 1.0000
...@@ -12,5 +12,5 @@ newmtl fireFoam ...@@ -12,5 +12,5 @@ newmtl fireFoam
Kd 0.5882 0.5882 0.5882 Kd 0.5882 0.5882 0.5882
Ks 0.0000 0.0000 0.0000 Ks 0.0000 0.0000 0.0000
Ke 0.0000 0.0000 0.0000 Ke 0.0000 0.0000 0.0000
map_Ka fireFoam.jpg map_Ka fireFoamRoom.jpg
map_Kd fireFoam.jpg map_Kd fireFoamRoom.jpg
...@@ -17,15 +17,6 @@ const getIcon = (markerType, level) => { ...@@ -17,15 +17,6 @@ const getIcon = (markerType, level) => {
return marker3DIoncMapper[`${markerType}`]; return marker3DIoncMapper[`${markerType}`];
}; };
const urlMapper = {
fireCar: { file: 'fire-car', label: '消防车' },
fireEquipment: { file: 'fireEquip', label: '消防设备' },
fireFoamRoom: { file: 'fireFoam', label: '泡沫间' },
fireChamber: { file: 'fireChamber', label: '消防室' },
hydrant: { file: 'hydrant', label: '消防栓' },
pool: { file: 'pool', label: '灭火水池' }
};
export default function marker3DFactory(WrappedComponent = 'div', options) { export default function marker3DFactory(WrappedComponent = 'div', options) {
const { markerType, markerParams } = options; const { markerType, markerParams } = options;
class MarkerPoints extends Component { class MarkerPoints extends Component {
...@@ -228,8 +219,8 @@ export default function marker3DFactory(WrappedComponent = 'div', options) { ...@@ -228,8 +219,8 @@ export default function marker3DFactory(WrappedComponent = 'div', options) {
} else { } else {
m[k] = formatUrl(defaultParams[k], { url: `${markerType}-1` }); m[k] = formatUrl(defaultParams[k], { url: `${markerType}-1` });
} }
} else if (markerType === 'fireResource' && k !== 'useModel' && urlMapper[m.type]) { } else if (markerType === 'fireResource' && k !== 'useModel') {
m[k] = formatUrl(defaultParams[k], { url: `${urlMapper[m.type].file}` }); m[k] = formatUrl(defaultParams[k], { url: `${m.type}` });
} else { } else {
m[k] = defaultParams[k]; m[k] = defaultParams[k];
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment