Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added Google's model viewer within viewer_three.js #372

Merged
merged 10 commits into from
Sep 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,14 @@ registration or heartbeat to Clowder that will restrict use of that extractor to
- Documentation on how to do easy testing of pull requests
- Previewer source URL in the documentation to point to the Clowder GitHub repo. [#395](https://github.com/clowder-framework/clowder/issues/395)
- Added a citation.cff file
- Added Google's model viewer within viewer_three.js previewer

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


## 1.21.0 - 2022-08-23
Expand Down
2 changes: 1 addition & 1 deletion public/javascripts/previewers/ifc_previewer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
"name": "IFC-Viewer",
"main": "ifc_viewer.js",
"file": true,
"contentType": ["model/ifc", "model/IFC", "application/octet-stream"]
"contentType": ["model/ifc", "model/IFC"]
}
4 changes: 2 additions & 2 deletions public/javascripts/previewers/three_js/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Three-JS",
"name": "3D Viewer",
"main": "viewer_three.js",
"file": true,
"contentType": [ "model/fbx", "model/FBX","model/gltf","model/GLTF", "model/glb","model/GLB", "application/octet-stream"]
"contentType": [ "model/fbx", "model/FBX","model/gltf","model/GLTF", "model/glb","model/GLB"]
}
Original file line number Diff line number Diff line change
Expand Up @@ -84,4 +84,9 @@ html, body {
-ms-transform: rotate(360deg);
transform: rotate(360deg);
}
}

model-viewer {
width: 640px;
height: 480px;
}
Loading
Loading