Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-station-module-view
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
station
amos-station-module-view
Commits
3851f14e
Commit
3851f14e
authored
Jun 22, 2020
by
suhuiguang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.修改部分模型加载不对
parent
1ad7fa11
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
14 deletions
+5
-14
fireFoamRoom.mtl
...rtor/threeres/marker-models/fireResource/fireFoamRoom.mtl
+3
-3
marker3DFactory.js
...components/3dviewConvertor/view/points/marker3DFactory.js
+2
-11
No files found.
mods/components/3dviewConvertor/threeres/marker-models/fireResource/fireFoamRoom.mtl
View file @
3851f14e
# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
# ļ:19.06.2020 19:38:56
newmtl fireFoam
newmtl fireFoam
Room
Ns 10.0000
Ni 1.5000
d 1.0000
...
...
@@ -12,5 +12,5 @@ newmtl fireFoam
Kd 0.5882 0.5882 0.5882
Ks 0.0000 0.0000 0.0000
Ke 0.0000 0.0000 0.0000
map_Ka fireFoam.jpg
map_Kd fireFoam.jpg
map_Ka fireFoam
Room
.jpg
map_Kd fireFoam
Room
.jpg
mods/components/3dviewConvertor/view/points/marker3DFactory.js
View file @
3851f14e
...
...
@@ -17,15 +17,6 @@ const getIcon = (markerType, level) => {
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
)
{
const
{
markerType
,
markerParams
}
=
options
;
class
MarkerPoints
extends
Component
{
...
...
@@ -228,8 +219,8 @@ export default function marker3DFactory(WrappedComponent = 'div', options) {
}
else
{
m
[
k
]
=
formatUrl
(
defaultParams
[
k
],
{
url
:
`
${
markerType
}
-1`
});
}
}
else
if
(
markerType
===
'fireResource'
&&
k
!==
'useModel'
&&
urlMapper
[
m
.
type
]
)
{
m
[
k
]
=
formatUrl
(
defaultParams
[
k
],
{
url
:
`
${
urlMapper
[
m
.
type
].
fil
e
}
`
});
}
else
if
(
markerType
===
'fireResource'
&&
k
!==
'useModel'
)
{
m
[
k
]
=
formatUrl
(
defaultParams
[
k
],
{
url
:
`
${
m
.
typ
e
}
`
});
}
else
{
m
[
k
]
=
defaultParams
[
k
];
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment