source: issm/oecreview/Archive/19101-20495/ISSM-20472-20473.diff@ 20498

Last change on this file since 20498 was 20498, checked in by Mathieu Morlighem, 9 years ago

CHG: done with Archive/19101-20495
File size: 9.4 KB
RevLine 
[20498]1Index: ../trunk-jpl/src/m/plot/plot_quiver.js
2===================================================================
3--- ../trunk-jpl/src/m/plot/plot_quiver.js (revision 20472)
4+++ ../trunk-jpl/src/m/plot/plot_quiver.js (revision 20473)
5@@ -98,17 +98,27 @@
6 magnitude = vec3.length(xyz1) + md.geometry.surface[i] * surfacescale;
7 vec3.normalize(direction, xyz1);
8 vec3.scale(vertex, direction, magnitude);
9- vertices.push.apply(vertices, vertex);
10+ vertices[vertices.length] = vertex[0];
11+ vertices[vertices.length] = vertex[1];
12+ vertices[vertices.length] = vertex[2];
13
14 xyz2 = vec3.fromValues(vx[i], vy[i], 0.0);
15 magnitude = 100.0; //mesh resolution
16 vec3.normalize(direction, xyz2);
17 vec3.scale(direction, direction, magnitude);
18 vec3.add(vertex, direction, vertex);
19- vertices.push.apply(vertices, vertex);
20+ vertices[vertices.length] = vertex[0];
21+ vertices[vertices.length] = vertex[1];
22+ vertices[vertices.length] = vertex[2];
23
24- colors.push.apply(colors, color);
25- colors.push.apply(colors, color);
26+ colors[colors.length] = color[0];
27+ colors[colors.length] = color[1];
28+ colors[colors.length] = color[2];
29+ colors[colors.length] = color[3];
30+ colors[colors.length] = color[0];
31+ colors[colors.length] = color[1];
32+ colors[colors.length] = color[2];
33+ colors[colors.length] = color[3];
34 }
35 }
36 //}}}
37Index: ../trunk-jpl/src/m/plot/plot_unit.js
38===================================================================
39--- ../trunk-jpl/src/m/plot/plot_unit.js (revision 20472)
40+++ ../trunk-jpl/src/m/plot/plot_unit.js (revision 20473)
41@@ -111,7 +111,9 @@
42 //Check for NaN values and remove from indices array as necessary, but preserve vertex array spacing
43 if (isNaN(x[i]) || isNaN(y[i]) || isNaN(z[i])) {
44 nanindices[i] = i;
45- vertices.push.apply(vertices, vertex);
46+ vertices[vertices.length] = vertex[0];
47+ vertices[vertices.length] = vertex[1];
48+ vertices[vertices.length] = vertex[2];
49 continue;
50 }
51 //Scale vertices
52@@ -119,9 +121,12 @@
53 magnitude = vec3.length(xyz) + md.geometry.surface[i] * surfacescale;
54 vec3.normalize(direction, xyz);
55 vec3.scale(vertex, direction, magnitude);
56- vertices.push.apply(vertices, vertex);
57+ vertices[vertices.length] = vertex[0];
58+ vertices[vertices.length] = vertex[1];
59+ vertices[vertices.length] = vertex[2];
60
61- texcoords.push.apply(texcoords, [0.5, (data[i] - datamin) / datadelta]);
62+ texcoords[texcoords.length] = 0.5;
63+ texcoords[texcoords.length] = (data[i] - datamin) / datadelta;
64 }
65
66 //linearize the elements array:
67@@ -129,7 +134,9 @@
68 for(var i = 0; i < elements.length; i++){
69 element = [elements[i][0] - 1, elements[i][1] - 1, elements[i][2] - 1];
70 if (element[0] in nanindices || element[1] in nanindices || element[2] in nanindices) continue;
71- indices = indices.concat(element);
72+ indices[indices.length] = element[0];
73+ indices[indices.length] = element[1];
74+ indices[indices.length] = element[2];
75 }
76 indices.itemSize = 1;
77
78@@ -163,12 +170,13 @@
79 var vertex = vec3.create();
80 var magnitude;
81 var timestamps = data[data.length-1];
82-
83 for(var i = 0; i < x.length; i++){
84 //Check for NaN values and remove from indices array as necessary, but preserve vertex array spacing
85 if (isNaN(x[i]) || isNaN(y[i]) || isNaN(z[i])) {
86 nanindices[i] = i;
87- vertices.push.apply(vertices, vertex);
88+ vertices[vertices.length] = vertex[0];
89+ vertices[vertices.length] = vertex[1];
90+ vertices[vertices.length] = vertex[2];
91 continue;
92 }
93 //Scale vertices
94@@ -176,7 +184,9 @@
95 magnitude = vec3.length(xyz) + md.geometry.surface[i] * surfacescale;
96 vec3.normalize(direction, xyz);
97 vec3.scale(vertex, direction, magnitude);
98- vertices.push.apply(vertices, vertex);
99+ vertices[vertices.length] = vertex[0];
100+ vertices[vertices.length] = vertex[1];
101+ vertices[vertices.length] = vertex[2];
102 }
103
104 //Transpose data to obtain column addressable data matrix
105@@ -212,7 +222,9 @@
106 for(var i = 0; i < elements.length; i++){
107 element = [elements[i][0] - 1, elements[i][1] - 1, elements[i][2] - 1];
108 if (element[0] in nanindices || element[1] in nanindices || element[2] in nanindices) continue;
109- indices = indices.concat(element);
110+ indices[indices.length] = element[0];
111+ indices[indices.length] = element[1];
112+ indices[indices.length] = element[2];
113 }
114 indices.itemSize = 1;
115
116Index: ../trunk-jpl/src/m/plot/plot_overlay.js
117===================================================================
118--- ../trunk-jpl/src/m/plot/plot_overlay.js (revision 20472)
119+++ ../trunk-jpl/src/m/plot/plot_overlay.js (revision 20473)
120@@ -78,7 +78,7 @@
121 if (md.radaroverlay.outerx) {
122 var newelements = [];
123 for (var i = 0; i < md.radaroverlay.outerindex.length; i++) {
124- newelements.push([md.radaroverlay.outerindex[i][0] + x.length, md.radaroverlay.outerindex[i][1] + y.length, md.radaroverlay.outerindex[i][2] + z.length]);
125+ newelements[newelements.length] = [md.radaroverlay.outerindex[i][0] + x.length, md.radaroverlay.outerindex[i][1] + y.length, md.radaroverlay.outerindex[i][2] + z.length];
126 }
127 x = [].concat(x, md.radaroverlay.outerx);
128 y = [].concat(y, md.radaroverlay.outery);
129@@ -112,18 +112,22 @@
130 //Check for NaN values and remove from indices array as necessary, but preserve vertex array spacing
131 if (isNaN(x[i]) || isNaN(y[i]) || isNaN(z[i])) {
132 nanindices[i] = i;
133- vertices.push.apply(vertices, vertex);
134+ vertices[vertices.length] = vertex[0];
135+ vertices[vertices.length] = vertex[1];
136+ vertices[vertices.length] = vertex[2];
137 continue;
138 }
139 //Scale vertices
140- //Scale vertices
141 xyz = vec3.fromValues(x[i], y[i], z[i]);
142 magnitude = vec3.length(xyz);
143 vec3.normalize(direction, xyz);
144 vec3.scale(vertex, direction, magnitude);
145- vertices.push.apply(vertices, vertex);
146-
147- texcoords.push.apply(texcoords, [(x[i] - modelxlim[0]) / xrange, (y[i] - modelylim[0]) / yrange]);
148+ vertices[vertices.length] = vertex[0];
149+ vertices[vertices.length] = vertex[1];
150+ vertices[vertices.length] = vertex[2];
151+
152+ texcoords[texcoords.length] = (x[i] - modelxlim[0]) / xrange;
153+ texcoords[texcoords.length] = (y[i] - modelylim[0]) / yrange;
154 }
155
156 //linearize the elements array:
157@@ -134,7 +138,6 @@
158 indices[indices.length] = element[0];
159 indices[indices.length] = element[1];
160 indices[indices.length] = element[2];
161-
162 }
163 indices.itemSize = 1;
164
165Index: ../trunk-jpl/src/m/plot/plot_mesh.js
166===================================================================
167--- ../trunk-jpl/src/m/plot/plot_mesh.js (revision 20472)
168+++ ../trunk-jpl/src/m/plot/plot_mesh.js (revision 20473)
169@@ -85,82 +85,28 @@
170 var vertex = vec3.create();
171 var magnitude;
172 var color = [0.0, 0.0, 0.0, 1.0];
173- x[0] = NaN;
174- x[1] = NaN;
175- x[2] = NaN;
176- x[3] = NaN;
177- x[4] = NaN;
178- x[5] = NaN;
179- x[6] = NaN;
180- x[7] = NaN;
181- x[8] = NaN;
182- x[9] = NaN;
183- x[10] = NaN;
184- x[11] = NaN;
185- x[12] = NaN;
186- x[13] = NaN;
187- x[14] = NaN;
188- x[15] = NaN;
189- x[16] = NaN;
190- x[17] = NaN;
191- x[18] = NaN;
192- x[19] = NaN;
193- x[20] = NaN;
194- x[21] = NaN;
195- x[22] = NaN;
196- x[23] = NaN;
197- x[24] = NaN;
198- x[25] = NaN;
199- x[26] = NaN;
200- x[27] = NaN;
201- x[28] = NaN;
202- x[29] = NaN;
203- x[30] = NaN;
204- x[31] = NaN;
205- x[32] = NaN;
206- x[33] = NaN;
207- x[34] = NaN;
208- x[35] = NaN;
209- x[36] = NaN;
210- x[37] = NaN;
211- x[38] = NaN;
212- x[39] = NaN;
213- x[310] = NaN;
214- x[311] = NaN;
215- x[312] = NaN;
216- x[313] = NaN;
217- x[314] = NaN;
218- x[315] = NaN;
219- x[316] = NaN;
220- x[317] = NaN;
221- x[318] = NaN;
222- x[319] = NaN;
223- x[320] = NaN;
224- x[321] = NaN;
225- x[322] = NaN;
226- x[323] = NaN;
227- x[324] = NaN;
228- x[325] = NaN;
229- x[326] = NaN;
230- x[327] = NaN;
231- x[328] = NaN;
232- x[329] = NaN;
233 for(var i = 0; i < x.length; i++){
234 //Check for NaN values and remove from indices array as necessary, but preserve vertex array spacing
235 if (isNaN(x[i]) || isNaN(y[i]) || isNaN(z[i])) {
236 nanindices[i] = i;
237- vertices.push.apply(vertices, vertex);
238+ vertices[vertices.length] = vertex[0];
239+ vertices[vertices.length] = vertex[1];
240+ vertices[vertices.length] = vertex[2];
241 continue;
242 }
243 //Scale vertices
244- //Scale vertices
245 xyz = vec3.fromValues(x[i], y[i], z[i]);
246 magnitude = vec3.length(xyz) + md.geometry.surface[i] * surfacescale;
247 vec3.normalize(direction, xyz);
248 vec3.scale(vertex, direction, magnitude);
249- vertices.push.apply(vertices, vertex);
250+ vertices[vertices.length] = vertex[0];
251+ vertices[vertices.length] = vertex[1];
252+ vertices[vertices.length] = vertex[2];
253
254- colors.push.apply(colors, color);
255+ colors[colors.length] = color[0];
256+ colors[colors.length] = color[1];
257+ colors[colors.length] = color[2];
258+ colors[colors.length] = color[3];
259 }
260
261 //linearize the elements array:
262@@ -168,7 +114,12 @@
263 for(var i = 0; i < elements.length; i++){
264 element = [elements[i][0] - 1, elements[i][1] - 1, elements[i][2] - 1];
265 if (element[0] in nanindices || element[1] in nanindices || element[2] in nanindices) continue;
266- indices = indices.concat([element[0], element[1], element[1], element[2], element[2], element[0]]);
267+ indices[indices.length] = element[0];
268+ indices[indices.length] = element[1];
269+ indices[indices.length] = element[1];
270+ indices[indices.length] = element[2];
271+ indices[indices.length] = element[2];
272+ indices[indices.length] = element[0];
273 }
274 indices.itemSize = 1;
275 }
Note: See TracBrowser for help on using the repository browser.