From 1a95fd905d7db074a8147224863046b26bdd6a25 Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Mon, 15 Jun 2015 14:22:05 -0700
Subject: [PATCH] init composite from current lattice
---
js/lattice/Lattice.js | 9 +++++++++
js/menus/MaterialMenuView.js | 2 ++
2 files changed, 11 insertions(+)
diff --git a/js/lattice/Lattice.js b/js/lattice/Lattice.js
index 25740693..7380a156 100644
--- a/js/lattice/Lattice.js
+++ b/js/lattice/Lattice.js
@@ -253,6 +253,15 @@ define(['underscore', 'backbone', 'appState', 'globals', 'plist', 'three', 'thre
if (currentNav != "navComposite" && this.compositeEditor && this.exitCompositeEditing) this.exitCompositeEditing();
},
+ getCompositeData: function(){
+ return {
+ cellsMin: this.get("cellsMin").clone(),
+ cellsMax: this.get("cellsMax").clone(),
+ sparseCells: JSON.parse(JSON.stringify(this.sparseCells)),
+ numCells: this.get("numCells")
+ };
+ },
+
setToCompositeMode: function(id, data){
var self = this;
require(['compositeEditorLattice'], function(CompositeEditorLattice){
diff --git a/js/menus/MaterialMenuView.js b/js/menus/MaterialMenuView.js
index 05e56ea3..eee16c25 100644
--- a/js/menus/MaterialMenuView.js
+++ b/js/menus/MaterialMenuView.js
@@ -31,6 +31,8 @@ define(['jquery', 'underscore', 'menuParent', 'plist', 'lattice', 'globals'], fu
},
_latticeToComposite: function(e){
+ lattice.setToCompositeMode(null, lattice.getCompositeData());
+ lattice.clearCells();
e.preventDefault();
},
--
GitLab