Browse Source

Merge branch 'pete'

master
Pete Shadbolt 8 years ago
parent
commit
68bc22a0aa
2 changed files with 7 additions and 2 deletions
  1. +1
    -0
      abp/static/scripts/editor.js
  2. +6
    -2
      abp/static/scripts/materials.js

+ 1
- 0
abp/static/scripts/editor.js View File

@@ -124,6 +124,7 @@ editor.setOrientation = function(orientation) {
editor.makeGrid = function() {
editor.grid = new THREE.GridHelper(10, 1);
editor.grid.setColors(0xbbbbbb, 0xeeeeee);
editor.grid.renderOrder = 1000;
editor.setOrientation(0);
gui.scene.add(editor.grid);
};


+ 6
- 2
abp/static/scripts/materials.js View File

@@ -1,7 +1,7 @@
var materials = {};

var curveProperties = {
splineDensity: 10,
splineDensity: 1,
curvature: 20
};

@@ -12,8 +12,9 @@ materials.prepare = function() {
materials.edge = new THREE.LineBasicMaterial({
color: "gray",
transparent: false,
linewidth: 2
linewidth: 3
});
materials.edge.depthTest = false;
materials.qubit = new THREE.PointsMaterial({
size: 0.3,
map: ballSprite,
@@ -21,8 +22,11 @@ materials.prepare = function() {
transparent: true,
vertexColors: THREE.VertexColors
});
materials.edge.depthTest = false;
};

console.log("what");

materials.makeCurve = function(a, b) {
var length = new THREE.Vector3().subVectors(a, b).length();
var bend = new THREE.Vector3(length / curveProperties.curvature, length / curveProperties.curvature, 0);


Loading…
Cancel
Save