Skip to content

Commit 9574099

Browse files
robkooperlmarini
andauthored
use model/ for three.js (#320)
* use model/ for three.js * Removed model/ply because it wasn't working with three_js reviewer. Removed obj because it was not working and it was messing with the 3DWebGL previewer. Co-authored-by: Luigi Marini <[email protected]>
1 parent 4eab575 commit 9574099

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
88

99
### Fixed
1010
- conf file and code had incosistent spelling of BagIt. Now all have capital B and I.
11+
- three.js is no longer associated with application/octet-stream, now with models [#305](https://github.com/clowder-framework/clowder/issues/305)
1112

1213
### Changed
1314
- download of dataset/collection now has optional parameter bagit (default false) to download items in bagit format.

conf/mimetypes.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ mimetype.nxz=model/nxz
1212
mimetype.NXZ=model/nxz
1313
mimetype.mtl=model/mtl
1414
mimetype.MTL=model/mtl
15+
mimetype.fbx=model/fbx
1516
mimetype.cnv=application/cnv
1617
mimetype.CNV=application/cnv
1718
mimetype.oni=application/oni

public/javascripts/previewers/three_js/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
"name": "Three-JS",
33
"main": "viewer_three.js",
44
"file": true,
5-
"contentType": [ "application/octet-stream"]
6-
}
5+
"contentType": [ "model/fbx", "model/x3d-xml", "model/x3d-binary" ]
6+
}

0 commit comments

Comments
 (0)