Skip to content

Commit 1e94e14

Browse files
cconsta1Chrysovalantis Constantinoulmarini
authored
Added Google's model viewer within viewer_three.js (#372)
* New IFC previewer * Added an IFC previewer and a GLTF previewer * Changelog update * Fix positioning issues of three.js previewer * Added changes to CHANGELOG.md * Improving the 3D model viewer * Remove the console.log --------- Co-authored-by: Chrysovalantis Constantinou <[email protected]> Co-authored-by: Luigi Marini <[email protected]> Co-authored-by: Luigi Marini <[email protected]>
1 parent 4f6a6e3 commit 1e94e14

File tree

5 files changed

+281
-247
lines changed

5 files changed

+281
-247
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,14 @@ registration or heartbeat to Clowder that will restrict use of that extractor to
2525
- Documentation on how to do easy testing of pull requests
2626
- Previewer source URL in the documentation to point to the Clowder GitHub repo. [#395](https://github.com/clowder-framework/clowder/issues/395)
2727
- Added a citation.cff file
28+
- Added Google's model viewer within viewer_three.js previewer
2829

2930
### Fixed
3031
- Updated lastModifiesDate when updating file or metadata to a dataset, added lastModified to UI [386](https://github.com/clowder-framework/clowder/issues/386)
3132
- Disabled button while create dataset ajax call is still going on [#311](https://github.com/clowder-framework/clowder/issues/311)
3233
- Changed default to 'Viewer' while inviting users to new spaces [#375](https://github.com/clowder-framework/clowder/issues/375)
3334
- Fixed bug where complex JSON metadata objects using arrays were not being indexed properly for search.
35+
- Fixed positioning problems related to how the 3D models appear on the screen
3436

3537

3638
## 1.21.0 - 2022-08-23

public/javascripts/previewers/ifc_previewer/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
"name": "IFC-Viewer",
33
"main": "ifc_viewer.js",
44
"file": true,
5-
"contentType": ["model/ifc", "model/IFC", "application/octet-stream"]
5+
"contentType": ["model/ifc", "model/IFC"]
66
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"name": "Three-JS",
2+
"name": "3D Viewer",
33
"main": "viewer_three.js",
44
"file": true,
5-
"contentType": [ "model/fbx", "model/FBX","model/gltf","model/GLTF", "model/glb","model/GLB", "application/octet-stream"]
5+
"contentType": [ "model/fbx", "model/FBX","model/gltf","model/GLTF", "model/glb","model/GLB"]
66
}

public/javascripts/previewers/three_js/loading_screen.css renamed to public/javascripts/previewers/three_js/style.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,4 +84,9 @@ html, body {
8484
-ms-transform: rotate(360deg);
8585
transform: rotate(360deg);
8686
}
87+
}
88+
89+
model-viewer {
90+
width: 640px;
91+
height: 480px;
8792
}

0 commit comments

Comments
 (0)