bump xeokit-viewer and prepare enabling SAO for default models

pull/8040/head
Wieland Lindenthal 5 years ago
parent ee0c22c259
commit 7e09fc0bc7
  1. 6
      frontend/npm-shrinkwrap.json
  2. 2
      frontend/package.json
  3. 3
      frontend/src/app/modules/ifc_models/xeokit-server.js
  4. 4
      modules/ifc_models/app/helpers/ifc_models_helper.rb

@ -3888,9 +3888,9 @@
"integrity": "sha512-z5UKiLb2uJBr5K2nHSNuXtWCV8ZueSe+DQ0DLGRPm4FoIMxNCMxwj3sQCZjo0YdM9NnAHawC8hjn9K2o+Z9HNA=="
},
"@xeokit/xeokit-viewer": {
"version": "1.5.7",
"resolved": "https://registry.npmjs.org/@xeokit/xeokit-viewer/-/xeokit-viewer-1.5.7.tgz",
"integrity": "sha512-YrYO7PjYJ0k8wfxLBAPdSddpJWjOiCr9n7cia3fb+ZB4PBUjgeiKEpLovZzmxlTAI0UsvhepplTbgvl+8M4akA==",
"version": "1.5.9",
"resolved": "https://registry.npmjs.org/@xeokit/xeokit-viewer/-/xeokit-viewer-1.5.9.tgz",
"integrity": "sha512-E7AxIUb52m5pgN6iEQqwuebbZ4IsV1kagP6tHD8F7jhc9adFRmHtMlH7LzJeBun5hU9l4WJYs4TfPMHGssOtrQ==",
"requires": {
"@xeokit/xeokit-sdk": "^0.8.3"
}

@ -69,7 +69,7 @@
"@uirouter/angular": "^4.0.0",
"@uirouter/core": "^5.0.23",
"@xeokit/xeokit-sdk": "^0.8.3",
"@xeokit/xeokit-viewer": "^1.5.7",
"@xeokit/xeokit-viewer": "^1.5.9",
"URIjs": "^1.14.1",
"amdefine": "^1.0.0",
"angular-dragula": "^1.2.8",

@ -35,6 +35,9 @@ class XeokitServer {
models: window.gon.ifc_models.models,
viewerContent: {
modelsLoaded: window.gon.ifc_models.default_models
},
viewerConfigs: {
saoEnabled: false
}
};

@ -22,7 +22,7 @@ module IFCModelsHelper
{
id: ifc_model.id,
name: ifc_model.title,
default: models_to_load.include?(ifc_model)
saoEnabled: models_to_load.include?(ifc_model)
}
end
end
@ -32,7 +32,7 @@ module IFCModelsHelper
default_models = []
all_converted_models.map do |ifc_model|
default_models << ifc_model.id if models_to_load.include?(ifc_model)
default_models << ifc_model.id.to_s if models_to_load.include?(ifc_model)
end
default_models
end

Loading…
Cancel
Save