From fc3adf4aa2ca015b40dd77094b0cbea9f83f549f Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Wed, 10 Jun 2015 20:53:22 -0700
Subject: [PATCH] data in outs for composite
---
js/lattice/CompositeEditorLattice.js | 23 +++++++++++++++++++++--
1 file changed, 21 insertions(+), 2 deletions(-)
diff --git a/js/lattice/CompositeEditorLattice.js b/js/lattice/CompositeEditorLattice.js
index 71262137..732517ae 100644
--- a/js/lattice/CompositeEditorLattice.js
+++ b/js/lattice/CompositeEditorLattice.js
@@ -7,6 +7,7 @@ define(['underscore', 'backbone', 'appState', 'lattice', 'globals', 'plist', 'th
function(_, Backbone, appState, lattice, globals, plist, THREE, three){
var defaults = {
+ compositeId: null,
compositeColor: makeRandomColor(),
numCompositeCells:0,
compositeCellsMin: null,
@@ -21,21 +22,39 @@ define(['underscore', 'backbone', 'appState', 'lattice', 'globals', 'plist', 'th
- _initCompositeEditor: function(){
+ _initCompositeEditor: function(id, data){
var self = this;
_.each(_.keys(defaults), function(key){
self.set(key, defaults[key], {silent:true});
});
-
this.compositeCells = [[[null]]];
+ if (data){
+ _.each(_.keys(data), function(key){
+ self.set(key, defaults[key], {silent:true});
+ });
+ this.compositeCells = data.cells;//todo
+ this.set("compositeId", id, {silent:true});
+ }
},
_changeRandomColor: function(){
this.set("compositeColor", makeRandomColor());
},
+ _makeNewCompositeMaterial: function(name){
+ var id = this.get("compositeId");
+ var data = {
+ name: name,
+ color: this.get("compositeColor"),
+ altColor: this.get("compositeColor"),
+ numCells: this.get("numCompositeCells"),
+ dimensions: new THREE.Vector3.subVectors(this.get("compositeCellsMax"), this.get("compositeCellsMin"))
+ };
+ globals.materials.id = data;//todo trigger change on all instances
+ },
+
_undoCompositeEditor: function(){
console.log("undo");
var self = this;
--
GitLab