diff --git a/assets/stls/parts/DNALegoBrick1x1.stl b/assets/stls/parts/DNALegoBrick1x1.stl index 67e036338947227ea456f0570be81121b5280961..3b6eca8ba3a9e9c1455771d7d184b727099b1c44 100644 Binary files a/assets/stls/parts/DNALegoBrick1x1.stl and b/assets/stls/parts/DNALegoBrick1x1.stl differ diff --git a/assets/stls/parts/DNALegoBrick1x2.stl b/assets/stls/parts/DNALegoBrick1x2.stl new file mode 100644 index 0000000000000000000000000000000000000000..67e036338947227ea456f0570be81121b5280961 Binary files /dev/null and b/assets/stls/parts/DNALegoBrick1x2.stl differ diff --git a/js/main.js b/js/main.js index e46558a6c0899544291f368834ff95be5cc07fdc..f17e4d81b30c4a95f59bef53af9f9bdd49f43181 100644 --- a/js/main.js +++ b/js/main.js @@ -218,7 +218,8 @@ require.config({ kennyTeqPartHighResSTL: 'assets/stls/parts/KennyTeqPartHighRes.stl', samTeqPartSTL: 'assets/stls/parts/SamTeqPart.stl', legoBrickSTL: 'assets/stls/parts/legoBrick1x1.stl', - dnaLegoBrickSTL: 'assets/stls/parts/DNALegoBrick1x1.stl' + dnaLegoBrickSTL: 'assets/stls/parts/DNALegoBrick1x2.stl', + dnaLegoBrick1x1STL: 'assets/stls/parts/DNALegoBrick1x1.stl' }, diff --git a/js/parts/DNALegoPart.js b/js/parts/DNALegoPart.js index 8396d6e8cababbbffd215b0bac8f404a0bba1cca..24eb653ca37b90c687dfbff3e728c30afca16278 100644 --- a/js/parts/DNALegoPart.js +++ b/js/parts/DNALegoPart.js @@ -3,10 +3,11 @@ */ -define(['underscore', 'stlLoader', 'gikPart', 'bin!dnaLegoBrickSTL'], function(_, THREE, GIKPart, stl){ +define(['underscore', 'stlLoader', 'gikPart', 'bin!dnaLegoBrickSTL', 'bin!dnaLegoBrick1x1STL'], function(_, THREE, GIKPart, stl, stl1by1){ var loader = new THREE.STLLoader(); var unitGeo = preProcessGeo(loader.parse(stl)); + var unitGeo1by1 = preProcessGeo(loader.parse(stl1by1)); function preProcessGeo(geo){ geo.applyMatrix(new THREE.Matrix4().makeRotationZ(-Math.PI/2)); @@ -20,6 +21,7 @@ define(['underscore', 'stlLoader', 'gikPart', 'bin!dnaLegoBrickSTL'], function(_ DNALegoPart.prototype = Object.create(GIKPart.prototype); DNALegoPart.prototype._getGeometry = function(){ + if (this.parentCell.getLength() == 1) return unitGeo1by1; return unitGeo; };