aboutsummaryrefslogtreecommitdiff
path: root/js/panels
diff options
context:
space:
mode:
Diffstat (limited to 'js/panels')
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.js21
-rw-r--r--js/panels/presets/default-animation-presets.js21
2 files changed, 19 insertions, 23 deletions
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.js b/js/panels/Materials/materials-popup.reel/materials-popup.js
index bbccf45d..bd10f7a5 100755
--- a/js/panels/Materials/materials-popup.reel/materials-popup.js
+++ b/js/panels/Materials/materials-popup.reel/materials-popup.js
@@ -214,10 +214,9 @@ exports.MaterialsPopup = Montage.create(Component, {
214 enumerable: true, 214 enumerable: true,
215 value: function(materialID) 215 value: function(materialID)
216 { 216 {
217 // Note that setting Array.length = 0 will empty arrays, 217 //TODO - Hack to force repetition to draw. Setting .length = 0 did not work.
218 // which is fine if you use getMaterialData to get a new array, but not for the 218 this.materialsData = [];
219 // dummyData arrays. 219
220 this._materialsData.length = 0;
221 this._materialName = materialID; 220 this._materialName = materialID;
222 if( 221 if(
223 (materialID === "UberMaterial") || 222 (materialID === "UberMaterial") ||
@@ -231,16 +230,14 @@ exports.MaterialsPopup = Montage.create(Component, {
231 if (material) 230 if (material)
232 { 231 {
233 this._material = material; 232 this._material = material;
234 var matData = this.getMaterialData( material ); 233 this.materialsData = this.getMaterialData( material );
235 this.materialsData = matData;
236 } 234 }
237 } 235 }
238 else 236 else
239 { 237 {
240 this.materialsData = this._dummyData1.slice(0); 238 this.materialsData = this[materialID];
241 } 239 }
242 240 this.needsDraw = true;
243 this.needsDraw = true;
244 } 241 }
245 }, 242 },
246 243
@@ -445,7 +442,8 @@ exports.MaterialsPopup = Montage.create(Component, {
445 } 442 }
446 }, 443 },
447 444
448 _dummyData1: { 445 // _dummyData1
446 CheckerBoard: {
449 value: [ 447 value: [
450 { 448 {
451 "label": "Texture1", 449 "label": "Texture1",
@@ -588,7 +586,8 @@ exports.MaterialsPopup = Montage.create(Component, {
588 ] 586 ]
589 }, 587 },
590 588
591 _dummyData2: { 589 // _dummyData2
590 ShinyMetal: {
592 value: [ 591 value: [
593 { 592 {
594 "label": "Diffuse", 593 "label": "Diffuse",
diff --git a/js/panels/presets/default-animation-presets.js b/js/panels/presets/default-animation-presets.js
index 578c1622..753b3365 100644
--- a/js/panels/presets/default-animation-presets.js
+++ b/js/panels/presets/default-animation-presets.js
@@ -52,7 +52,6 @@ exports.animationPresets = {
52 "-webkit-animation-direction": "normal", 52 "-webkit-animation-direction": "normal",
53 "-webkit-animation-timing-function": "ease", 53 "-webkit-animation-timing-function": "ease",
54 "-webkit-transform-style": "preserve-3d", 54 "-webkit-transform-style": "preserve-3d",
55 "-webkit-transform": "perspective(1000)",
56 "-webkit-animation-delay": "0s" 55 "-webkit-animation-delay": "0s"
57 } 56 }
58 },{ 57 },{
@@ -100,7 +99,6 @@ exports.animationPresets = {
100 "-webkit-animation-timing-function": "ease-out", 99 "-webkit-animation-timing-function": "ease-out",
101 "-webkit-transform-origin": "100% 50%", 100 "-webkit-transform-origin": "100% 50%",
102 "-webkit-transform-style": "preserve-3d", 101 "-webkit-transform-style": "preserve-3d",
103 "-webkit-transform": "perspective(1000)",
104 "-webkit-animation-delay": "0s" 102 "-webkit-animation-delay": "0s"
105 } 103 }
106 },{ 104 },{
@@ -109,31 +107,31 @@ exports.animationPresets = {
109 "keyText": "0%", 107 "keyText": "0%",
110 "styles": { 108 "styles": {
111 "opacity": "1", 109 "opacity": "1",
112 "-webkit-transform": "perspective(1000) rotateY(0deg)" 110 "-webkit-transform": "rotateY(0deg)"
113 } 111 }
114 }, { 112 }, {
115 "keyText": "70%", 113 "keyText": "70%",
116 "styles": { 114 "styles": {
117 "opacity": "1", 115 "opacity": "1",
118 "-webkit-transform": "perspective(1000) rotateY(0deg)" 116 "-webkit-transform": "rotateY(0deg)"
119 } 117 }
120 }, { 118 }, {
121 "keyText": "85%", 119 "keyText": "85%",
122 "styles": { 120 "styles": {
123 "opacity": "0", 121 "opacity": "0",
124 "-webkit-transform": "perspective(1000) rotateY(95deg)" 122 "-webkit-transform": "rotateY(95deg)"
125 } 123 }
126 }, { 124 }, {
127 "keyText": "86%", 125 "keyText": "86%",
128 "styles": { 126 "styles": {
129 "opacity": "0", 127 "opacity": "0",
130 "-webkit-transform": "perspective(1000) rotateY(-90deg)" 128 "-webkit-transform": "rotateY(-90deg)"
131 } 129 }
132 }, { 130 }, {
133 "keyText": "100%", 131 "keyText": "100%",
134 "styles": { 132 "styles": {
135 "opacity": "1", 133 "opacity": "1",
136 "-webkit-transform": "perspective(1000) rotateY(0deg)" 134 "-webkit-transform": "rotateY(0deg)"
137 } 135 }
138 }] 136 }]
139 }] 137 }]
@@ -151,7 +149,6 @@ exports.animationPresets = {
151 "-webkit-animation-timing-function": "ease-out", 149 "-webkit-animation-timing-function": "ease-out",
152 "-webkit-transform-origin": "100% 50%", 150 "-webkit-transform-origin": "100% 50%",
153 "-webkit-transform-style": "preserve-3d", 151 "-webkit-transform-style": "preserve-3d",
154 "-webkit-transform": "perspective(1000)",
155 "-webkit-animation-delay": "0s" 152 "-webkit-animation-delay": "0s"
156 } 153 }
157 },{ 154 },{
@@ -160,25 +157,25 @@ exports.animationPresets = {
160 "keyText": "0%", 157 "keyText": "0%",
161 "styles": { 158 "styles": {
162 "opacity": "0", 159 "opacity": "0",
163 "-webkit-transform": "perspective(1000) rotateY(-90deg)" 160 "-webkit-transform": "rotateY(-90deg)"
164 } 161 }
165 }, { 162 }, {
166 "keyText": "15%", 163 "keyText": "15%",
167 "styles": { 164 "styles": {
168 "opacity": "1", 165 "opacity": "1",
169 "-webkit-transform": "perspective(1000) rotateY(0deg)" 166 "-webkit-transform": "rotateY(0deg)"
170 } 167 }
171 }, { 168 }, {
172 "keyText": "85%", 169 "keyText": "85%",
173 "styles": { 170 "styles": {
174 "opacity": "1", 171 "opacity": "1",
175 "-webkit-transform": "perspective(1000) rotateY(0deg)" 172 "-webkit-transform": "rotateY(0deg)"
176 } 173 }
177 }, { 174 }, {
178 "keyText": "100%", 175 "keyText": "100%",
179 "styles": { 176 "styles": {
180 "opacity": "0", 177 "opacity": "0",
181 "-webkit-transform": "perspective(1000) rotateY(95deg)" 178 "-webkit-transform": "rotateY(95deg)"
182 } 179 }
183 }] 180 }]
184 }] 181 }]