@abi-software/scaffoldvuer 0.1.51 → 0.1.52-beta.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (10) hide show
  1. package/dist/scaffoldvuer.common.js +161 -35
  2. package/dist/scaffoldvuer.common.js.map +1 -1
  3. package/dist/scaffoldvuer.css +1 -1
  4. package/dist/scaffoldvuer.umd.js +161 -35
  5. package/dist/scaffoldvuer.umd.js.map +1 -1
  6. package/dist/scaffoldvuer.umd.min.js +1 -1
  7. package/dist/scaffoldvuer.umd.min.js.map +1 -1
  8. package/package.json +1 -1
  9. package/src/components/TraditionalControls.vue +0 -1
  10. package/src/scripts/graphicsHighlight.js +7 -7
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@abi-software/scaffoldvuer",
3
- "version": "0.1.51",
3
+ "version": "0.1.52-beta.0",
4
4
  "license": "Apache-2.0",
5
5
  "repository": {
6
6
  "type": "git",
package/src/components/TraditionalControls.vue CHANGED
@@ -130,7 +130,6 @@ export default {
130
130
  tmpArray = uniq(tmpArray.concat(this.module.sceneData.pointset));
131
131
  this.sortedPrimitiveGroups = orderBy(tmpArray);
132
132
  this.module.addOrganPartAddedCallback(this.organsAdded);
133
- this.module.graphicsHighlight.selectColour = 0x444444;
134
133
  },
135
134
  destroyed: function() {
136
135
  this.sortedPrimitiveGroups = undefined;
package/src/scripts/graphicsHighlight.js CHANGED
@@ -9,9 +9,9 @@ var THREE = require('zincjs').THREE;
9
9
  exports.GraphicsHighlight = function() {
10
10
  let currentHighlightedObjects = [];
11
11
  let currentSelectedObjects = [];
12
- this.highlightColour = 0x0000FF;
13
- this.selectColour = 0x00FF00;
14
- this.originalColour = 0x000000;
12
+ this.highlightColour = [1, 0, 0];
13
+ this.selectColour = [0, 1, 0];
14
+ this.originalColour = [0, 0, 0];
15
15
  const _this = this;
16
16
 
17
17
  const isDifferent = function(array1, array2) {
@@ -65,7 +65,7 @@ exports.GraphicsHighlight = function() {
65
65
  const fullList = getFullListOfObjects(array);
66
66
  for (let i = 0; i < fullList.length; i++) {
67
67
  if (fullList[i] && fullList[i].material && fullList[i].material.emissive)
68
- fullList[i].material.emissive.setHex(_this.highlightColour);
68
+ fullList[i].material.emissive.setRGB(..._this.highlightColour);
69
69
  }
70
70
  currentHighlightedObjects = array;
71
71
  return isDifferent(currentHighlightedObjects, previousHighlightedObjects);
@@ -80,7 +80,7 @@ exports.GraphicsHighlight = function() {
80
80
  const fullList = getFullListOfObjects(objects);
81
81
  for (let i = 0; i < fullList.length; i++) {
82
82
  if (fullList[i] && fullList[i].material && fullList[i].material.emissive)
83
- fullList[i].material.emissive.setHex(_this.selectColour);
83
+ fullList[i].material.emissive.setRGB(..._this.selectColour);
84
84
  }
85
85
  currentSelectedObjects = objects;
86
86
  return isDifferent(currentSelectedObjects, previousHSelectedObjects);
@@ -100,7 +100,7 @@ exports.GraphicsHighlight = function() {
100
100
  for (let i = 0; i < fullList.length; i++) {
101
101
  if (fullList[i] && fullList[i].material) {
102
102
  if (fullList[i].material.emissive)
103
- fullList[i].material.emissive.setHex(_this.originalColour);
103
+ fullList[i].material.emissive.setRGB(..._this.originalColour);
104
104
  if (fullList[i].material.depthFunc)
105
105
  fullList[i].material.depthFunc = THREE.LessEqualDepth;
106
106
  }
@@ -113,7 +113,7 @@ exports.GraphicsHighlight = function() {
113
113
  for (let i = 0; i < fullList.length; i++) {
114
114
  if (fullList[i] && fullList[i].material) {
115
115
  if (fullList[i].material.emissive)
116
- fullList[i].material.emissive.setHex(_this.originalColour);
116
+ fullList[i].material.emissive.setRGB(..._this.originalColour);
117
117
  if (fullList[i].material.depthFunc)
118
118
  fullList[i].material.depthFunc = THREE.LessEqualDepth;
119
119
  }