aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhwc4872012-06-13 10:17:07 -0700
committerhwc4872012-06-13 10:17:07 -0700
commiteea0703ca3b7f066a9d685ce09905d4860fa082d (patch)
treef0000ae8469a9e551f629c744251e6a688bbec4c
parent1fe66f1a89ac949dee44ae881556901a8bf98bba (diff)
parent5a7774f6769a7a682e21bafe0e57007668f16153 (diff)
downloadninja-eea0703ca3b7f066a9d685ce09905d4860fa082d.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts: js/io/system/ninjalibrary.json
-rw-r--r--assets/canvas-runtime.js40
-rw-r--r--js/components/prompt.reel/prompt.js73
-rwxr-xr-xjs/document/document-html.js6
-rwxr-xr-xjs/document/models/base.js66
-rw-r--r--js/io/system/ninjalibrary.json2
-rwxr-xr-xjs/lib/geom/brush-stroke.js5
-rwxr-xr-xjs/models/element-model.js4
-rwxr-xr-xjs/ninja.reel/ninja.js4
-rwxr-xr-xjs/panels/properties.reel/sections/three-d-view.reel/three-d-view.js66
-rwxr-xr-xjs/tools/PenTool.js49
10 files changed, 264 insertions, 51 deletions
diff --git a/assets/canvas-runtime.js b/assets/canvas-runtime.js
index 753161aa..2035d2e0 100644
--- a/assets/canvas-runtime.js
+++ b/assets/canvas-runtime.js
@@ -2447,7 +2447,40 @@ NinjaCvsRt.RuntimeBrushStroke = Object.create(NinjaCvsRt.RuntimeGeomObj, {
2447 } 2447 }
2448 this._LocalPoints = newPoints.slice(0); 2448 this._LocalPoints = newPoints.slice(0);
2449 } 2449 }
2450 } 2450
2451 // *** compute the bounding box *********
2452 var BBoxMin = [Infinity, Infinity, Infinity];
2453 var BBoxMax = [-Infinity, -Infinity, -Infinity];
2454 if (numPoints === 0) {
2455 BBoxMin = [0, 0, 0];
2456 BBoxMax = [0, 0, 0];
2457 } else {
2458 for (var i=0;i<numPoints;i++){
2459 var pt = this._LocalPoints[i];
2460 for (var d = 0; d < 3; d++) {
2461 if (BBoxMin[d] > pt[d]) {
2462 BBoxMin[d] = pt[d];
2463 }
2464 if (BBoxMax[d] < pt[d]) {
2465 BBoxMax[d] = pt[d];
2466 }
2467 }//for every dimension d from 0 to 2
2468 }
2469 }
2470
2471 //increase the bbox given the stroke width and the angle (in case of calligraphic brush)
2472 var bboxPadding = this._strokeWidth*0.5;
2473 for (var d = 0; d < 3; d++) {
2474 BBoxMin[d]-= bboxPadding;
2475 BBoxMax[d]+= bboxPadding;
2476 }//for every dimension d from 0 to 2
2477
2478 //******* update the local coords so that the bbox min is at the origin ******
2479 for (var i=0;i<numPoints;i++) {
2480 this._LocalPoints[i][0]-= BBoxMin[0];
2481 this._LocalPoints[i][1]-= BBoxMin[1];
2482 }
2483 }//if we need to do smoothing
2451 } 2484 }
2452 }, 2485 },
2453 2486
@@ -2571,7 +2604,10 @@ NinjaCvsRt.RuntimeBrushStroke = Object.create(NinjaCvsRt.RuntimeGeomObj, {
2571 var disp = [brushStamp[t][0], brushStamp[t][1]]; 2604 var disp = [brushStamp[t][0], brushStamp[t][1]];
2572 var alphaVal = 1.0; 2605 var alphaVal = 1.0;
2573 var distFromOpaqueRegion = Math.abs(t-halfNumTraces) - opaqueRegionHalfWidth; 2606 var distFromOpaqueRegion = Math.abs(t-halfNumTraces) - opaqueRegionHalfWidth;
2574 if (distFromOpaqueRegion>0) { 2607 if (numTraces === 1){
2608 distFromOpaqueRegion = 0;
2609 }
2610 else if (distFromOpaqueRegion>0) {
2575 var transparencyFactor = distFromOpaqueRegion/maxTransparentRegionHalfWidth; 2611 var transparencyFactor = distFromOpaqueRegion/maxTransparentRegionHalfWidth;
2576 alphaVal = 1.0 - transparencyFactor;//(transparencyFactor*transparencyFactor);//the square term produces nonlinearly varying alpha values 2612 alphaVal = 1.0 - transparencyFactor;//(transparencyFactor*transparencyFactor);//the square term produces nonlinearly varying alpha values
2577 alphaVal *= 0.5; //factor that accounts for lineWidth == 2 2613 alphaVal *= 0.5; //factor that accounts for lineWidth == 2
diff --git a/js/components/prompt.reel/prompt.js b/js/components/prompt.reel/prompt.js
new file mode 100644
index 00000000..652d7b7e
--- /dev/null
+++ b/js/components/prompt.reel/prompt.js
@@ -0,0 +1,73 @@
1/* <copyright>
2This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
3No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
4(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
5</copyright> */
6
7////////////////////////////////////////////////////////////////////////
8//
9var Montage = require("montage/core/core").Montage,
10 Component = require("montage/ui/component").Component;
11////////////////////////////////////////////////////////////////////////
12//
13exports.NinjaPrompt = Montage.create(Component, {
14 ////////////////////////////////////////////////////////////////////
15 //TODO: This should have an UI template eventually
16 hasTemplate: {
17 value: false
18 },
19 ////////////////////////////////////////////////////////////////////
20 //Type of prompt window (should be confirm, prompt, alert, or input)
21 _type: {
22 value: null
23 },
24 ////////////////////////////////////////////////////////////////////
25 //
26 _params: {
27 value: null
28 },
29 ////////////////////////////////////////////////////////////////////
30 //
31 _callback: {
32 value: null
33 },
34 ////////////////////////////////////////////////////////////////////
35 //
36 initialize: {
37 value: function (type, params, callback) {
38 //
39 this._type = type.toLowerCase();
40 this._params = params;
41 this._callback = callback;
42 }
43 },
44 ////////////////////////////////////////////////////////////////////
45 //
46 show: {
47 value: function () {
48 //
49 var input;
50 //
51 switch (this._type) {
52 case 'confirm':
53 input = confirm(this._params.message);
54 if (this._callback) this._callback(input);
55 break;
56 default:
57 //TODO: Add support for other standard box types
58 break;
59 }
60 }
61 },
62 ////////////////////////////////////////////////////////////////////
63 //This is for later, need to hide if need (overwrite)
64 hide: {
65 value: function () {
66 //TODO: Add support as real UI component
67 }
68 }
69 ////////////////////////////////////////////////////////////////////
70 ////////////////////////////////////////////////////////////////////
71});
72////////////////////////////////////////////////////////////////////////
73//////////////////////////////////////////////////////////////////////// \ No newline at end of file
diff --git a/js/document/document-html.js b/js/document/document-html.js
index 15f88d09..aded9241 100755
--- a/js/document/document-html.js
+++ b/js/document/document-html.js
@@ -121,10 +121,8 @@ exports.HtmlDocument = Montage.create(Component, {
121 // 121 //
122 closeDocument: { 122 closeDocument: {
123 value: function (context, callback) { 123 value: function (context, callback) {
124 //Closing document and getting outcome 124 //Closing document (sending null to close all views)
125 var closed = this.model.close(null); 125 this.model.close(null, function () {if (callback) callback.call(context, this);}.bind(this));
126 //Making callback if specified
127 if (callback) callback.call(context, this);
128 } 126 }
129 }, 127 },
130 //////////////////////////////////////////////////////////////////// 128 ////////////////////////////////////////////////////////////////////
diff --git a/js/document/models/base.js b/js/document/models/base.js
index 1307e0c0..8ff52132 100755
--- a/js/document/models/base.js
+++ b/js/document/models/base.js
@@ -6,8 +6,9 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
6 6
7//////////////////////////////////////////////////////////////////////// 7////////////////////////////////////////////////////////////////////////
8// 8//
9var Montage = require("montage/core/core").Montage, 9var Montage = require("montage/core/core").Montage,
10 Component = require("montage/ui/component").Component; 10 Component = require("montage/ui/component").Component,
11 NinjaPrompt = require("js/components/prompt.reel").NinjaPrompt;
11//////////////////////////////////////////////////////////////////////// 12////////////////////////////////////////////////////////////////////////
12// 13//
13exports.BaseDocumentModel = Montage.create(Component, { 14exports.BaseDocumentModel = Montage.create(Component, {
@@ -267,30 +268,59 @@ exports.BaseDocumentModel = Montage.create(Component, {
267 if (this.callback) this.callback(result); 268 if (this.callback) this.callback(result);
268 } 269 }
269 }, 270 },
271 ////////////////////////////////////////////////////////////////////
272 //
273 handleSavePrompt: {
274 value: function (continueToClose, callback) {
275 //TODO: Perhaps add logic to save the file is the user wants
276 if (continueToClose) {
277 if (callback) callback();
278 } else {
279 //User canceled
280 //this.saveAll(null, callback);
281 }
282 }
283 },
270 //////////////////////////////////////////////////////////////////// 284 ////////////////////////////////////////////////////////////////////
271 //TODO: Implement better logic to include different views on single document 285 //TODO: Implement better logic to include different views on single document
272 close: { 286 close: {
273 value: function (view, callback) { 287 value: function (view, callback) {
274 //Outcome of close (pending on save logic) 288 //Checking if files needs to be saved to avoid losing data
275 var success;
276 //
277 if (this.needsSave) { 289 if (this.needsSave) {
278 //TODO: Prompt user to save or lose data 290 //Creating prompt to ask user to save the file
291 var prompt = NinjaPrompt.create();
292 prompt.initialize('confirm', {message: 'Do you want to save the changes you made in the document '+this.file.name+'?\n\nYour changes will be lost if you do not save them.'}, function (result){this.handleSavePrompt(result, callback);}.bind(this));
293 //Showing the prompt, it will make callback with user input
294 prompt.show();
279 } else { 295 } else {
280 //Close file 296 //TODO: Add support for other views
281 success = true; 297 if (!view || view === 'design') {
282 } 298 this.closeView('design');
283 //Checking for view mode to close</