Package list java3d / 27dc1a6
Fixed the build failure with Java 10 (Closes: #898669) Emmanuel Bourg 3 years ago
4 changed file(s) with 1892 addition(s) and 1 deletion(s). Raw diff Collapse all Expand all
00 java3d (1.5.2+dfsg-15) UNRELEASED; urgency=medium
11
22 * Team upload.
3 * Fixed the build failure with Java 10 (Closes: #898669)
34 * Standards-Version updated to 4.1.4
45 * Use salsa.debian.org Vcs-* URLs
56
0 Description: Fixes the build failure with Java 10 caused by the removal of javah
1 Author: Emmanuel Bourg <ebourg@apache.org>
2 Forwarded: no
3 --- a/j3d-core/src/classes/build.xml
4 +++ b/j3d-core/src/classes/build.xml
5 @@ -45,6 +45,7 @@
6 <!-- Compile the java code from ${src} into ${build}/${platform}/debug/classes -->
7 <javac srcdir="${src}/classes/share:${src}/classes/${wstype}:${jogl.pipeline.srcdir}:${core_utils_src}/classes/share:${build-debug-gen}/classes"
8 destdir="${build}/${platform}/debug/classes"
9 + nativeHeaderDir="${build}/${platform}/opt/native/javah/j3dcore"
10 source="1.5"
11 target="1.5"
12 debug="true"
13 @@ -52,6 +53,10 @@
14 excludes="${javac.excludes}">
15 <classpath refid="vecmath.debug.classpath"/>
16 </javac>
17 + <mkdir dir="${build}/${platform}/debug/native/javah/j3dcore"/>
18 + <copy todir="${build}/${platform}/debug/native/javah/j3dcore">
19 + <fileset dir="${build}/${platform}/opt/native/javah/j3dcore"/>
20 + </copy>
21
22 <!-- Copy the I18N property files while retaining package location -->
23 <copy todir="${build}/${platform}/debug/classes">
24 --- a/j3d-core/src/classes/share/javax/media/j3d/Background.java
25 +++ b/j3d-core/src/classes/share/javax/media/j3d/Background.java
26 @@ -31,6 +31,7 @@
27
28 package javax.media.j3d;
29
30 +import java.lang.annotation.Native;
31 import javax.vecmath.*;
32
33 /**
34 @@ -172,6 +173,7 @@
35 *
36 * @since Java 3D 1.3
37 */
38 + @Native
39 public static final int SCALE_NONE = 0;
40
41 /**
42 @@ -189,6 +191,7 @@
43 *
44 * @since Java 3D 1.3
45 */
46 + @Native
47 public static final int SCALE_FIT_MIN = 1;
48
49 /**
50 @@ -205,6 +208,7 @@
51 *
52 * @since Java 3D 1.3
53 */
54 + @Native
55 public static final int SCALE_FIT_MAX = 2;
56
57
58 @@ -219,6 +223,7 @@
59 *
60 * @since Java 3D 1.3
61 */
62 + @Native
63 public static final int SCALE_FIT_ALL = 3;
64
65 /**
66 @@ -231,6 +236,7 @@
67 *
68 * @since Java 3D 1.3
69 */
70 + @Native
71 public static final int SCALE_REPEAT = 4;
72
73 /**
74 @@ -245,6 +251,7 @@
75 *
76 * @since Java 3D 1.3
77 */
78 + @Native
79 public static final int SCALE_NONE_CENTER = 5;
80
81 // Array for setting default read capabilities
82 --- a/j3d-core/src/classes/share/javax/media/j3d/Canvas3D.java
83 +++ b/j3d-core/src/classes/share/javax/media/j3d/Canvas3D.java
84 @@ -34,6 +34,7 @@
85 import javax.vecmath.*;
86 import java.awt.*;
87 import java.awt.image.BufferedImage;
88 +import java.lang.annotation.Native;
89 import java.util.*;
90
91
92 @@ -772,24 +773,41 @@
93 // Read-only flag that indicates whether the following texture features
94 // are supported for this canvas.
95
96 + @Native
97 static final int TEXTURE_3D = 0x0001;
98 + @Native
99 static final int TEXTURE_COLOR_TABLE = 0x0002;
100 + @Native
101 static final int TEXTURE_MULTI_TEXTURE = 0x0004;
102 + @Native
103 static final int TEXTURE_COMBINE = 0x0008;
104 + @Native
105 static final int TEXTURE_COMBINE_DOT3 = 0x0010;
106 + @Native
107 static final int TEXTURE_COMBINE_SUBTRACT = 0x0020;
108 + @Native
109 static final int TEXTURE_REGISTER_COMBINERS = 0x0040;
110 + @Native
111 static final int TEXTURE_CUBE_MAP = 0x0080;
112 + @Native
113 static final int TEXTURE_SHARPEN = 0x0100;
114 + @Native
115 static final int TEXTURE_DETAIL = 0x0200;
116 + @Native
117 static final int TEXTURE_FILTER4 = 0x0400;
118 + @Native
119 static final int TEXTURE_ANISOTROPIC_FILTER = 0x0800;
120 + @Native
121 static final int TEXTURE_LOD_RANGE = 0x1000;
122 + @Native
123 static final int TEXTURE_LOD_OFFSET = 0x2000;
124 // Use by D3D to indicate using one pass Blend mode
125 // if Texture interpolation mode is support.
126 + @Native
127 static final int TEXTURE_LERP = 0x4000;
128 + @Native
129 static final int TEXTURE_NON_POWER_OF_TWO = 0x8000;
130 + @Native
131 static final int TEXTURE_AUTO_MIPMAP_GENERATION = 0x10000;
132
133 int textureExtendedFeatures = 0;
134 @@ -798,9 +816,13 @@
135 //
136 // NOTE: we should remove EXT_BGR and EXT_ABGR when the imaging code is
137 // rewritten
138 + @Native
139 static final int SUN_GLOBAL_ALPHA = 0x1;
140 + @Native
141 static final int EXT_ABGR = 0x2;
142 + @Native
143 static final int EXT_BGR = 0x4;
144 + @Native
145 static final int MULTISAMPLE = 0x8;
146
147 // The following 10 variables are set by the native
148 --- a/j3d-core/src/classes/share/javax/media/j3d/ColoringAttributes.java
149 +++ b/j3d-core/src/classes/share/javax/media/j3d/ColoringAttributes.java
150 @@ -31,6 +31,7 @@
151
152 package javax.media.j3d;
153
154 +import java.lang.annotation.Native;
155 import javax.vecmath.Color3f;
156
157 /**
158 @@ -119,19 +120,23 @@
159 /**
160 * Use the fastest available method for shading.
161 */
162 + @Native
163 public static final int FASTEST = 0;
164 /**
165 * Use the nicest available method for shading.
166 */
167 + @Native
168 public static final int NICEST = 1;
169
170 /**
171 * Do not interpolate color across the primitive.
172 */
173 + @Native
174 public static final int SHADE_FLAT = 2;
175 /**
176 * Smoothly interpolate the color at each vertex across the primitive.
177 */
178 + @Native
179 public static final int SHADE_GOURAUD = 3;
180
181 // Array for setting default read capabilities
182 --- a/j3d-core/src/classes/share/javax/media/j3d/DepthComponentRetained.java
183 +++ b/j3d-core/src/classes/share/javax/media/j3d/DepthComponentRetained.java
184 @@ -31,6 +31,8 @@
185
186 package javax.media.j3d;
187
188 +import java.lang.annotation.Native;
189 +
190 /**
191 * Abstract base class that defines a 2D array of depth (Z) values.
192 */
193 @@ -38,8 +40,11 @@
194
195 abstract class DepthComponentRetained extends NodeComponentRetained {
196 // depth component types
197 + @Native
198 static final int DEPTH_COMPONENT_TYPE_INT = 1;
199 + @Native
200 static final int DEPTH_COMPONENT_TYPE_FLOAT = 2;
201 + @Native
202 static final int DEPTH_COMPONENT_TYPE_NATIVE = DEPTH_COMPONENT_TYPE_INT;
203
204
205 --- a/j3d-core/src/native/ogl/gldefs.h
206 +++ b/j3d-core/src/native/ogl/gldefs.h
207 @@ -128,56 +128,27 @@
208 #include "javax_media_j3d_Background.h"
209 #include "javax_media_j3d_Canvas3D.h"
210 #include "javax_media_j3d_ColoringAttributes.h"
211 -#include "javax_media_j3d_ColoringAttributesRetained.h"
212 #include "javax_media_j3d_DepthComponentRetained.h"
213 -#include "javax_media_j3d_DirectionalLightRetained.h"
214 -#include "javax_media_j3d_DisplayListRenderMethod.h"
215 #include "javax_media_j3d_DrawingSurfaceObjectAWT.h"
216 -#include "javax_media_j3d_ExponentialFogRetained.h"
217 #include "javax_media_j3d_GeometryRetained.h"
218 #include "javax_media_j3d_GeometryArray.h"
219 #include "javax_media_j3d_GeometryArrayRetained.h"
220 -#include "javax_media_j3d_GraphicsContext3D.h"
221 #include "javax_media_j3d_ImageComponent.h"
222 #include "javax_media_j3d_ImageComponentRetained.h"
223 -#include "javax_media_j3d_ImageComponent2DRetained.h"
224 -#include "javax_media_j3d_IndexedGeometryArrayRetained.h"
225 #include "javax_media_j3d_LineAttributes.h"
226 -#include "javax_media_j3d_LineAttributesRetained.h"
227 -#include "javax_media_j3d_LinearFogRetained.h"
228 -#include "javax_media_j3d_MasterControl.h"
229 #include "javax_media_j3d_Material.h"
230 -#include "javax_media_j3d_MaterialRetained.h"
231 -#include "javax_media_j3d_ModelClipRetained.h"
232 #include "javax_media_j3d_NativeConfigTemplate3D.h"
233 #include "javax_media_j3d_NativePipeline.h"
234 -#include "javax_media_j3d_NodeRetained.h"
235 -#include "javax_media_j3d_PointAttributesRetained.h"
236 -#include "javax_media_j3d_PointLightRetained.h"
237 #include "javax_media_j3d_PolygonAttributes.h"
238 -#include "javax_media_j3d_PolygonAttributesRetained.h"
239 #include "javax_media_j3d_Raster.h"
240 -#include "javax_media_j3d_RasterRetained.h"
241 -#include "javax_media_j3d_Renderer.h"
242 #include "javax_media_j3d_RenderingAttributes.h"
243 #include "javax_media_j3d_RenderingAttributesRetained.h"
244 #include "javax_media_j3d_RenderMolecule.h"
245 -#include "javax_media_j3d_SpotLightRetained.h"
246 #include "javax_media_j3d_TexCoordGeneration.h"
247 -#include "javax_media_j3d_TexCoordGenerationRetained.h"
248 #include "javax_media_j3d_Texture.h"
249 #include "javax_media_j3d_Texture2D.h"
250 -#include "javax_media_j3d_Texture2DRetained.h"
251 -#include "javax_media_j3d_Texture3DRetained.h"
252 #include "javax_media_j3d_TextureAttributes.h"
253 -#include "javax_media_j3d_TextureAttributesRetained.h"
254 -#include "javax_media_j3d_TextureCubeMapRetained.h"
255 -#include "javax_media_j3d_TextureRetained.h"
256 -#include "javax_media_j3d_TextureUnitStateRetained.h"
257 #include "javax_media_j3d_TransparencyAttributes.h"
258 -#include "javax_media_j3d_TransparencyAttributesRetained.h"
259 -#include "javax_media_j3d_GLSLShaderProgramRetained.h"
260 -#include "javax_media_j3d_CgShaderProgramRetained.h"
261 #include "javax_media_j3d_Shader.h"
262 #include "javax_media_j3d_ShaderAttributeObjectRetained.h"
263 #include "javax_media_j3d_ShaderError.h"
264 --- a/j3d-core/src/classes/share/javax/media/j3d/GeometryRetained.java
265 +++ b/j3d-core/src/classes/share/javax/media/j3d/GeometryRetained.java
266 @@ -31,34 +31,55 @@
267
268 package javax.media.j3d;
269
270 +import java.lang.annotation.Native;
271 import javax.vecmath.*;
272 import java.util.ArrayList;
273
274 abstract class GeometryRetained extends NodeComponentRetained {
275
276 + @Native
277 static final int GEO_TYPE_NONE = -1;
278
279 + @Native
280 static final int GEO_TYPE_QUAD_SET = 1;
281 + @Native
282 static final int GEO_TYPE_TRI_SET = 2;
283 + @Native
284 static final int GEO_TYPE_POINT_SET = 3;
285 + @Native
286 static final int GEO_TYPE_LINE_SET = 4;
287 + @Native
288 static final int GEO_TYPE_TRI_STRIP_SET = 5;
289 + @Native
290 static final int GEO_TYPE_TRI_FAN_SET = 6;
291 + @Native
292 static final int GEO_TYPE_LINE_STRIP_SET = 7;
293
294 + @Native
295 static final int GEO_TYPE_INDEXED_QUAD_SET = 8;
296 + @Native
297 static final int GEO_TYPE_INDEXED_TRI_SET = 9;
298 + @Native
299 static final int GEO_TYPE_INDEXED_POINT_SET = 10;
300 + @Native
301 static final int GEO_TYPE_INDEXED_LINE_SET = 11;
302 + @Native
303 static final int GEO_TYPE_INDEXED_TRI_STRIP_SET = 12;
304 + @Native
305 static final int GEO_TYPE_INDEXED_TRI_FAN_SET = 13;
306 + @Native
307 static final int GEO_TYPE_INDEXED_LINE_STRIP_SET = 14;
308
309 + @Native
310 static final int GEO_TYPE_RASTER = 15;
311 + @Native
312 static final int GEO_TYPE_TEXT3D = 16;
313 + @Native
314 static final int GEO_TYPE_COMPRESSED = 17;
315
316 + @Native
317 static final int GEO_TYPE_TOTAL = 17;
318 + @Native
319 static final int GEO_TYPE_GEOMETRYARRAY = 14;
320
321 BoundingBox geoBounds = new BoundingBox();
322 --- a/j3d-core/src/classes/share/javax/media/j3d/GeometryArray.java
323 +++ b/j3d-core/src/classes/share/javax/media/j3d/GeometryArray.java
324 @@ -31,6 +31,7 @@
325
326 package javax.media.j3d;
327
328 +import java.lang.annotation.Native;
329 import javax.vecmath.*;
330
331
332 @@ -224,38 +225,45 @@
333 * Specifies that this GeometryArray contains an array of coordinates.
334 * This bit must be set.
335 */
336 + @Native
337 public static final int COORDINATES = 0x01;
338
339 /**
340 * Specifies that this GeometryArray contains an array of normals.
341 */
342 + @Native
343 public static final int NORMALS = 0x02;
344
345 /**
346 * Specifies that this GeometryArray contains an array of colors.
347 */
348 + @Native
349 static final int COLOR = 0x04;
350
351 /**
352 * Specifies that this GeometryArray's colors contain alpha.
353 */
354 + @Native
355 static final int WITH_ALPHA = 0x08;
356
357 /**
358 * Specifies that this GeometryArray contains an array of colors without alpha.
359 */
360 + @Native
361 public static final int COLOR_3 = COLOR;
362
363 /**
364 * Specifies that this GeometryArray contains an array of colors with alpha.
365 * This takes precedence over COLOR_3.
366 */
367 + @Native
368 public static final int COLOR_4 = COLOR | WITH_ALPHA;
369
370 /**
371 * Specifies that this GeometryArray contains one or more arrays of
372 * 2D texture coordinates.
373 */
374 + @Native
375 public static final int TEXTURE_COORDINATE_2 = 0x20;
376
377 /**
378 @@ -263,6 +271,7 @@
379 * 3D texture coordinates.
380 * This takes precedence over TEXTURE_COORDINATE_2.
381 */
382 + @Native
383 public static final int TEXTURE_COORDINATE_3 = 0x40;
384
385
386 @@ -273,6 +282,7 @@
387 *
388 * @since Java 3D 1.3
389 */
390 + @Native
391 public static final int TEXTURE_COORDINATE_4 = 0x400;
392
393
394 @@ -286,6 +296,7 @@
395 *
396 * @since Java 3D 1.2
397 */
398 + @Native
399 public static final int BY_REFERENCE = 0x80;
400
401
402 @@ -299,6 +310,7 @@
403 *
404 * @since Java 3D 1.2
405 */
406 + @Native
407 public static final int INTERLEAVED = 0x100;
408
409 /**
410 @@ -319,6 +331,7 @@
411 *
412 * @since Java 3D 1.3
413 */
414 + @Native
415 public static final int USE_NIO_BUFFER = 0x800;
416
417 /**
418 @@ -335,6 +348,7 @@
419 *
420 * @since Java 3D 1.3
421 */
422 + @Native
423 public static final int USE_COORD_INDEX_ONLY = 0x200;
424
425 /**
426 @@ -344,6 +358,7 @@
427 *
428 * @since Java 3D 1.4
429 */
430 + @Native
431 public static final int VERTEX_ATTRIBUTES = 0x1000;
432
433 //NVaidya
434 @@ -356,9 +371,11 @@
435 *
436 * @since Java 3D 1.5
437 */
438 + @Native
439 public static final int BY_REFERENCE_INDICES = 0x2000;
440
441 // Used to keep track of the last bit (for adding new bits only)
442 + @Native
443 private static final int LAST_FORMAT_BIT = 0x2000;
444
445 // Scratch arrays for converting Point[234]f to TexCoord[234]f
446 --- a/j3d-core/src/classes/share/javax/media/j3d/GeometryArrayRetained.java
447 +++ b/j3d-core/src/classes/share/javax/media/j3d/GeometryArrayRetained.java
448 @@ -34,6 +34,7 @@
449 import com.sun.j3d.internal.Distance;
450 import javax.vecmath.*;
451 import java.lang.Math;
452 +import java.lang.annotation.Native;
453 import java.util.ArrayList;
454 import java.util.Set;
455 import java.util.HashSet;
456 @@ -209,12 +210,19 @@
457 private int vertexAttrType = 0;
458
459 // flag for execute geometry array when by reference
460 + @Native
461 static final int COORD_FLOAT = 0x01;
462 + @Native
463 static final int COORD_DOUBLE = 0x02;
464 + @Native
465 static final int COLOR_FLOAT = 0x04;
466 + @Native
467 static final int COLOR_BYTE = 0x08;
468 + @Native
469 static final int NORMAL_FLOAT = 0x10;
470 + @Native
471 static final int TEXCOORD_FLOAT = 0x20;
472 + @Native
473 static final int VATTR_FLOAT = 0x40;
474
475
476 --- a/j3d-core/src/classes/share/javax/media/j3d/ImageComponent.java
477 +++ b/j3d-core/src/classes/share/javax/media/j3d/ImageComponent.java
478 @@ -31,6 +31,8 @@
479
480 package javax.media.j3d;
481
482 +import java.lang.annotation.Native;
483 +
484 /**
485 * Abstract class that is used to define 2D or 3D ImageComponent
486 * classes used in a Java 3D scene graph. This is used for texture
487 @@ -112,72 +114,84 @@
488 * Specifies that each pixel contains 3 8-bit channels: one each
489 * for red, green, blue. Same as FORMAT_RGB8.
490 */
491 + @Native
492 public static final int FORMAT_RGB = 1;
493
494 /**
495 * Specifies that each pixel contains 4 8-bit channels: one each
496 * for red, green, blue, alpha. Same as FORMAT_RGBA8.
497 */
498 + @Native
499 public static final int FORMAT_RGBA = 2;
500
501 /**
502 * Specifies that each pixel contains 3 8-bit channels: one each
503 * for red, green, blue. Same as FORMAT_RGB.
504 */
505 + @Native
506 public static final int FORMAT_RGB8 = FORMAT_RGB;
507
508 /**
509 * Specifies that each pixel contains 4 8-bit channels: one each
510 * for red, green, blue, alpha. Same as FORMAT_RGBA.
511 */
512 + @Native
513 public static final int FORMAT_RGBA8 = FORMAT_RGBA;
514
515 /**
516 * Specifies that each pixel contains 3 5-bit channels: one each
517 * for red, green, blue.
518 */
519 + @Native
520 public static final int FORMAT_RGB5 = 3;
521
522 /**
523 * Specifies that each pixel contains 3 5-bit channels: one each
524 * for red, green, blue and 1 1-bit channel for alpha.
525 */
526 + @Native
527 public static final int FORMAT_RGB5_A1 = 4;
528
529 /**
530 * Specifies that each pixel contains 3 4-bit channels: one each
531 * for red, green, blue.
532 */
533 + @Native
534 public static final int FORMAT_RGB4 = 5;
535
536 /**
537 * Specifies that each pixel contains 4 4-bit channels: one each
538 * for red, green, blue, alpha.
539 */
540 + @Native
541 public static final int FORMAT_RGBA4 = 6;
542
543 /**
544 * Specifies that each pixel contains 2 4-bit channels: one each
545 * for luminance and alpha.
546 */
547 + @Native
548 public static final int FORMAT_LUM4_ALPHA4 = 7;
549
550 /**
551 * Specifies that each pixel contains 2 8-bit channels: one each
552 * for luminance and alpha.
553 */
554 + @Native
555 public static final int FORMAT_LUM8_ALPHA8 = 8;
556
557 /**
558 * Specifies that each pixel contains 2 3-bit channels: one each
559 * for red, green, and 1 2-bit channel for blue.
560 */
561 + @Native
562 public static final int FORMAT_R3_G3_B2 = 9;
563
564 /**
565 * Specifies that each pixel contains 1 8-bit channel: it can be
566 * used for only luminance or only alpha or only intensity.
567 */
568 + @Native
569 public static final int FORMAT_CHANNEL8 = 10;
570
571 // Internal variable for checking validity of formats
572 --- a/j3d-core/src/classes/share/javax/media/j3d/ImageComponentRetained.java
573 +++ b/j3d-core/src/classes/share/javax/media/j3d/ImageComponentRetained.java
574 @@ -38,6 +38,7 @@
575 import java.awt.geom.AffineTransform;
576 import java.awt.image.AffineTransformOp;
577 import java.awt.image.RenderedImage;
578 +import java.lang.annotation.Native;
579 import java.nio.ByteBuffer;
580 import java.nio.ByteOrder;
581 import java.nio.IntBuffer;
582 @@ -57,15 +58,25 @@
583 static final int IMAGE_CHANGED = 0x01;
584 static final int SUBIMAGE_CHANGED = 0x02;
585
586 + @Native
587 static final int TYPE_BYTE_BGR = 0x1;
588 + @Native
589 static final int TYPE_BYTE_RGB = 0x2;
590 + @Native
591 static final int TYPE_BYTE_ABGR = 0x4;
592 + @Native
593 static final int TYPE_BYTE_RGBA = 0x8;
594 + @Native
595 static final int TYPE_BYTE_LA = 0x10;
596 + @Native
597 static final int TYPE_BYTE_GRAY = 0x20;
598 + @Native
599 static final int TYPE_USHORT_GRAY = 0x40;
600 + @Native
601 static final int TYPE_INT_BGR = 0x80;
602 + @Native
603 static final int TYPE_INT_RGB = 0x100;
604 + @Native
605 static final int TYPE_INT_ARGB = 0x200;
606
607 static final int IMAGE_SIZE_512X512 = 262144;
608 @@ -84,9 +95,13 @@
609 TYPE_INT_ARGB
610 }
611
612 + @Native
613 static final int IMAGE_DATA_TYPE_BYTE_ARRAY = 0x1000;
614 + @Native
615 static final int IMAGE_DATA_TYPE_INT_ARRAY = 0x2000;
616 + @Native
617 static final int IMAGE_DATA_TYPE_BYTE_BUFFER = 0x4000;
618 + @Native
619 static final int IMAGE_DATA_TYPE_INT_BUFFER = 0x8000;
620
621 enum ImageDataType {
622 --- a/j3d-core/src/classes/share/javax/media/j3d/LineAttributes.java
623 +++ b/j3d-core/src/classes/share/javax/media/j3d/LineAttributes.java
624 @@ -31,6 +31,8 @@
625
626 package javax.media.j3d;
627
628 +import java.lang.annotation.Native;
629 +
630 /**
631 * The LineAttributes object defines all rendering state that can be set
632 * as a component object of a Shape3D node.
633 @@ -153,6 +155,7 @@
634 * Draw solid lines with no pattern.
635 * @see #setLinePattern
636 */
637 + @Native
638 public static final int PATTERN_SOLID = 0;
639
640 /**
641 @@ -160,6 +163,7 @@
642 * a repeating pattern of 8 pixels on and 8 pixels off.
643 * @see #setLinePattern
644 */
645 + @Native
646 public static final int PATTERN_DASH = 1;
647
648 /**
649 @@ -167,6 +171,7 @@
650 * a repeating pattern of 1 pixel on and 7 pixels off.
651 * @see #setLinePattern
652 */
653 + @Native
654 public static final int PATTERN_DOT = 2;
655
656 /**
657 @@ -175,6 +180,7 @@
658 * and 4 pixels off.
659 * @see #setLinePattern
660 */
661 + @Native
662 public static final int PATTERN_DASH_DOT = 3;
663
664 /**
665 --- a/j3d-core/src/classes/share/javax/media/j3d/Material.java
666 +++ b/j3d-core/src/classes/share/javax/media/j3d/Material.java
667 @@ -31,6 +31,7 @@
668
669 package javax.media.j3d;
670
671 +import java.lang.annotation.Native;
672 import javax.vecmath.Color3f;
673
674 /**
675 @@ -86,6 +87,7 @@
676 *
677 * @since Java 3D 1.3
678 */
679 + @Native
680 public static final int AMBIENT = 0;
681
682 /**
683 @@ -94,6 +96,7 @@
684 *
685 * @since Java 3D 1.3
686 */
687 + @Native
688 public static final int EMISSIVE = 1;
689
690 /**
691 @@ -103,6 +106,7 @@
692 *
693 * @since Java 3D 1.3
694 */
695 + @Native
696 public static final int DIFFUSE = 2;
697
698 /**
699 @@ -111,6 +115,7 @@
700 *
701 * @since Java 3D 1.3
702 */
703 + @Native
704 public static final int SPECULAR = 3;
705
706 /**
707 @@ -120,6 +125,7 @@
708 *
709 * @since Java 3D 1.3
710 */
711 + @Native
712 public static final int AMBIENT_AND_DIFFUSE = 4;
713
714 // Array for setting default read capabilities
715 --- a/j3d-core/src/classes/share/javax/media/j3d/NativeConfigTemplate3D.java
716 +++ b/j3d-core/src/classes/share/javax/media/j3d/NativeConfigTemplate3D.java
717 @@ -31,6 +31,7 @@
718
719 package javax.media.j3d;
720
721 +import java.lang.annotation.Native;
722 import java.awt.GraphicsConfiguration;
723
724 /**
725 @@ -39,16 +40,27 @@
726 */
727 abstract class NativeConfigTemplate3D {
728 // These definitions are used by both the X11 and Win32 subclasses
729 + @Native
730 final static int RED_SIZE = 0;
731 + @Native
732 final static int GREEN_SIZE = 1;
733 + @Native
734 final static int BLUE_SIZE = 2;
735 + @Native
736 final static int ALPHA_SIZE = 3;
737 + @Native
738 final static int ACCUM_BUFFER = 4;
739 + @Native
740 final static int DEPTH_SIZE = 5;
741 + @Native
742 final static int DOUBLEBUFFER = 6;
743 + @Native
744 final static int STEREO = 7;
745 + @Native
746 final static int ANTIALIASING = 8;
747 + @Native
748 final static int STENCIL_SIZE = 9;
749 + @Native
750 final static int NUM_ITEMS = 10;
751
752 private static final String x11ClassName = "javax.media.j3d.X11NativeConfigTemplate3D";
753 --- a/j3d-core/src/classes/share/javax/media/j3d/PolygonAttributes.java
754 +++ b/j3d-core/src/classes/share/javax/media/j3d/PolygonAttributes.java
755 @@ -31,6 +31,7 @@
756
757 package javax.media.j3d;
758
759 +import java.lang.annotation.Native;
760
761 /**
762 * The PolygonAttributes object defines attributes for rendering polygon
763 @@ -141,28 +142,34 @@
764 * Render polygonal primitives as points drawn at the vertices
765 * of the polygon.
766 */
767 + @Native
768 public static final int POLYGON_POINT = 0;
769 /**
770 * Render polygonal primitives as lines drawn between consecutive
771 * vertices of the polygon.
772 */
773 + @Native
774 public static final int POLYGON_LINE = 1;
775 /**
776 * Render polygonal primitives by filling the interior of the polygon.
777 */
778 + @Native
779 public static final int POLYGON_FILL = 2;
780
781 /**
782 * Don't perform any face culling.
783 */
784 + @Native
785 public static final int CULL_NONE = 0;
786 /**
787 * Cull all back-facing polygons. This is the default mode.
788 */
789 + @Native
790 public static final int CULL_BACK = 1;
791 /**
792 * Cull all front-facing polygons.
793 */
794 + @Native
795 public static final int CULL_FRONT = 2;
796
797 // Array for setting default read capabilities
798 --- a/j3d-core/src/classes/share/javax/media/j3d/Raster.java
799 +++ b/j3d-core/src/classes/share/javax/media/j3d/Raster.java
800 @@ -34,7 +34,7 @@
801 import javax.vecmath.*;
802 import java.awt.Point;
803 import java.awt.Dimension;
804 -
805 +import java.lang.annotation.Native;
806
807 /**
808 * The Raster object extends Geometry to allow drawing a raster image
809 @@ -66,6 +66,7 @@
810 *
811 * @see #setType
812 */
813 + @Native
814 public static final int RASTER_COLOR = 0x1;
815
816 /**
817 @@ -75,6 +76,7 @@
818 *
819 * @see #setType
820 */
821 + @Native
822 public static final int RASTER_DEPTH = 0x2;
823
824 /**
825 --- a/j3d-core/src/classes/share/javax/media/j3d/RenderingAttributes.java
826 +++ b/j3d-core/src/classes/share/javax/media/j3d/RenderingAttributes.java
827 @@ -31,6 +31,8 @@
828
829 package javax.media.j3d;
830
831 +import java.lang.annotation.Native;
832 +
833 /**
834 * The RenderingAttributes object defines common rendering attributes
835 * for all primitive types. The rendering attributes are:<p>
836 @@ -387,6 +389,7 @@
837 * @see #setDepthTestFunction
838 * @see #setStencilFunction(int,int,int)
839 */
840 + @Native
841 public static final int ALWAYS = 0;
842
843 /**
844 @@ -399,6 +402,7 @@
845 * @see #setDepthTestFunction
846 * @see #setStencilFunction(int,int,int)
847 */
848 + @Native
849 public static final int NEVER = 1;
850
851 /**
852 @@ -410,6 +414,7 @@
853 * @see #setDepthTestFunction
854 * @see #setStencilFunction(int,int,int)
855 */
856 + @Native
857 public static final int EQUAL = 2;
858
859 /**
860 @@ -421,6 +426,7 @@
861 * @see #setDepthTestFunction
862 * @see #setStencilFunction(int,int,int)
863 */
864 + @Native
865 public static final int NOT_EQUAL = 3;
866
867 /**
868 @@ -433,6 +439,7 @@
869 * @see #setDepthTestFunction
870 * @see #setStencilFunction(int,int,int)
871 */
872 + @Native
873 public static final int LESS = 4;
874
875 /**
876 @@ -445,6 +452,7 @@
877 * @see #setDepthTestFunction
878 * @see #setStencilFunction(int,int,int)
879 */
880 + @Native
881 public static final int LESS_OR_EQUAL = 5;
882
883 /**
884 @@ -457,6 +465,7 @@
885 * @see #setDepthTestFunction
886 * @see #setStencilFunction(int,int,int)
887 */
888 + @Native
889 public static final int GREATER = 6;
890
891 /**
892 @@ -469,6 +478,7 @@
893 * @see #setDepthTestFunction
894 * @see #setStencilFunction(int,int,int)
895 */
896 + @Native
897 public static final int GREATER_OR_EQUAL = 7;
898
899
900 @@ -482,6 +492,7 @@
901 *
902 * @since Java 3D 1.4
903 */
904 + @Native
905 public static final int ROP_CLEAR = 0x0;
906
907 /**
908 @@ -490,6 +501,7 @@
909 *
910 * @since Java 3D 1.4
911 */
912 + @Native
913 public static final int ROP_AND = 0x1;
914
915 /**
916 @@ -498,6 +510,7 @@
917 *
918 * @since Java 3D 1.4
919 */
920 + @Native
921 public static final int ROP_AND_REVERSE = 0x2;
922
923 /**
924 @@ -506,6 +519,7 @@
925 *
926 * @since Java 3D 1.2
927 */
928 + @Native
929 public static final int ROP_COPY = 0x3;
930
931 /**
932 @@ -514,6 +528,7 @@
933 *
934 * @since Java 3D 1.4
935 */
936 + @Native
937 public static final int ROP_AND_INVERTED = 0x4;
938
939 /**
940 @@ -522,6 +537,7 @@
941 *
942 * @since Java 3D 1.4
943 */
944 + @Native
945 public static final int ROP_NOOP = 0x5;
946
947 /**
948 @@ -530,6 +546,7 @@
949 *
950 * @since Java 3D 1.2
951 */
952 + @Native
953 public static final int ROP_XOR = 0x6;
954
955 /**
956 @@ -538,6 +555,7 @@
957 *
958 * @since Java 3D 1.4
959 */
960 + @Native
961 public static final int ROP_OR = 0x7;
962
963 /**
964 @@ -546,6 +564,7 @@
965 *
966 * @since Java 3D 1.4
967 */
968 + @Native
969 public static final int ROP_NOR = 0x8;
970
971 /**
972 @@ -554,6 +573,7 @@
973 *
974 * @since Java 3D 1.4
975 */
976 + @Native
977 public static final int ROP_EQUIV = 0x9;
978
979 /**
980 @@ -562,6 +582,7 @@
981 *
982 * @since Java 3D 1.4
983 */
984 + @Native
985 public static final int ROP_INVERT = 0xA;
986
987 /**
988 @@ -570,6 +591,7 @@
989 *
990 * @since Java 3D 1.4
991 */
992 + @Native
993 public static final int ROP_OR_REVERSE = 0xB;
994
995 /**
996 @@ -578,6 +600,7 @@
997 *
998 * @since Java 3D 1.4
999 */
1000 + @Native
1001 public static final int ROP_COPY_INVERTED = 0xC;
1002
1003 /**
1004 @@ -586,6 +609,7 @@
1005 *
1006 * @since Java 3D 1.4
1007 */
1008 + @Native
1009 public static final int ROP_OR_INVERTED = 0xD;
1010
1011 /**
1012 @@ -594,6 +618,7 @@
1013 *
1014 * @since Java 3D 1.4
1015 */
1016 + @Native
1017 public static final int ROP_NAND = 0xE;
1018
1019 /**
1020 @@ -602,6 +627,7 @@
1021 *
1022 * @since Java 3D 1.4
1023 */
1024 + @Native
1025 public static final int ROP_SET = 0xF;
1026
1027
1028 @@ -615,6 +641,7 @@
1029 *
1030 * @since Java 3D 1.4
1031 */
1032 + @Native
1033 public static final int STENCIL_KEEP = 1;
1034
1035 /**
1036 @@ -623,6 +650,7 @@
1037 *
1038 * @since Java 3D 1.4
1039 */
1040 + @Native
1041 public static final int STENCIL_ZERO = 2;
1042
1043 /**
1044 @@ -631,6 +659,7 @@
1045 *
1046 * @since Java 3D 1.4
1047 */
1048 + @Native
1049 public static final int STENCIL_REPLACE = 3;
1050
1051 /**
1052 @@ -639,6 +668,7 @@
1053 *
1054 * @since Java 3D 1.4
1055 */
1056 + @Native
1057 public static final int STENCIL_INCR = 4;
1058
1059 /**
1060 @@ -647,6 +677,7 @@
1061 *
1062 * @since Java 3D 1.4
1063 */
1064 + @Native
1065 public static final int STENCIL_DECR = 5;
1066
1067 /**
1068 @@ -655,6 +686,7 @@
1069 *
1070 * @since Java 3D 1.4
1071 */
1072 + @Native
1073 public static final int STENCIL_INVERT = 6;
1074
1075 // Array for setting default read capabilities
1076 --- a/j3d-core/src/classes/share/javax/media/j3d/RenderingAttributesRetained.java
1077 +++ b/j3d-core/src/classes/share/javax/media/j3d/RenderingAttributesRetained.java
1078 @@ -31,6 +31,7 @@
1079
1080 package javax.media.j3d;
1081
1082 +import java.lang.annotation.Native;
1083 import java.util.ArrayList;
1084
1085 /**
1086 @@ -97,7 +98,9 @@
1087
1088 // depth buffer comparison function. Used by multi-texturing only
1089 //[PEPE] NOTE: they are both unused. Candidates for removal.
1090 + @Native
1091 static final int LESS = 0;
1092 + @Native
1093 static final int LEQUAL = 1;
1094
1095 /**
1096 --- a/j3d-core/src/classes/share/javax/media/j3d/RenderMolecule.java
1097 +++ b/j3d-core/src/classes/share/javax/media/j3d/RenderMolecule.java
1098 @@ -32,6 +32,7 @@
1099 package javax.media.j3d;
1100
1101 import javax.vecmath.*;
1102 +import java.lang.annotation.Native;
1103 import java.util.*;
1104
1105 /**
1106 @@ -51,10 +52,15 @@
1107 /**
1108 * Values for the geometryType field
1109 */
1110 + @Native
1111 static final int POINT = 0x01;
1112 + @Native
1113 static final int LINE = 0x02;
1114 + @Native
1115 static final int SURFACE = 0x04;
1116 + @Native
1117 static final int RASTER = 0x08;
1118 + @Native
1119 static final int COMPRESSED = 0x10;
1120
1121 static int RM_COMPONENTS = (AppearanceRetained.POLYGON |
1122 --- a/j3d-core/src/classes/share/javax/media/j3d/TexCoordGeneration.java
1123 +++ b/j3d-core/src/classes/share/javax/media/j3d/TexCoordGeneration.java
1124 @@ -31,6 +31,7 @@
1125
1126 package javax.media.j3d;
1127
1128 +import java.lang.annotation.Native;
1129 import javax.vecmath.Vector4f;
1130
1131 /**
1132 @@ -191,6 +192,7 @@
1133 *
1134 * @see #setGenMode
1135 */
1136 + @Native
1137 public static final int OBJECT_LINEAR = 0;
1138 /**
1139 * Generates texture coordinates as a linear function in
1140 @@ -198,6 +200,7 @@
1141 *
1142 * @see #setGenMode
1143 */
1144 + @Native
1145 public static final int EYE_LINEAR = 1;
1146 /**
1147 * Generates texture coordinates using a spherical reflection
1148 @@ -205,6 +208,7 @@
1149 *
1150 * @see #setGenMode
1151 */
1152 + @Native
1153 public static final int SPHERE_MAP = 2;
1154 /**
1155 * Generates texture coordinates that match vertices' normals in
1156 @@ -215,6 +219,7 @@
1157 *
1158 * @since Java 3D 1.3
1159 */
1160 + @Native
1161 public static final int NORMAL_MAP = 3;
1162 /**
1163 * Generates texture coordinates that match vertices' reflection
1164 @@ -225,6 +230,7 @@
1165 *
1166 * @since Java 3D 1.3
1167 */
1168 + @Native
1169 public static final int REFLECTION_MAP = 4;
1170
1171 // Definitions for format
1172 @@ -233,12 +239,14 @@
1173 *
1174 * @see #setFormat
1175 */
1176 + @Native
1177 public static final int TEXTURE_COORDINATE_2 = 0;
1178 /**
1179 * Generates 3D texture coordinates (S, T, and R).
1180 *
1181 * @see #setFormat
1182 */
1183 + @Native
1184 public static final int TEXTURE_COORDINATE_3 = 1;
1185 /**
1186 * Generates 4D texture coordinates (S, T, R, and Q).
1187 @@ -247,6 +255,7 @@
1188 *
1189 * @since Java 3D 1.3
1190 */
1191 + @Native
1192 public static final int TEXTURE_COORDINATE_4 = 2;
1193
1194 // Array for setting default read capabilities
1195 --- a/j3d-core/src/classes/share/javax/media/j3d/Texture.java
1196 +++ b/j3d-core/src/classes/share/javax/media/j3d/Texture.java
1197 @@ -32,6 +32,7 @@
1198 package javax.media.j3d;
1199
1200 import javax.vecmath.*;
1201 +import java.lang.annotation.Native;
1202 import java.util.Hashtable;
1203
1204 /**
1205 @@ -378,6 +379,7 @@
1206 * @see #setMinFilter
1207 * @see #setMagFilter
1208 */
1209 + @Native
1210 public static final int FASTEST = 0;
1211 /**
1212 * Uses the nicest available method for processing geometry.
1213 @@ -386,6 +388,7 @@
1214 * @see #setMinFilter
1215 * @see #setMagFilter
1216 */
1217 + @Native
1218 public static final int NICEST = 1;
1219
1220 /**
1221 @@ -394,6 +397,7 @@
1222 * @see #setMinFilter
1223 * @see #setMagFilter
1224 */
1225 + @Native
1226 public static final int BASE_LEVEL_POINT = 2;
1227
1228 /**
1229 @@ -403,6 +407,7 @@
1230 * @see #setMinFilter
1231 * @see #setMagFilter
1232 */
1233 + @Native
1234 public static final int BASE_LEVEL_LINEAR = 3;
1235
1236 /**
1237 @@ -410,6 +415,7 @@
1238 * Maps to NEAREST_MIPMAP_NEAREST.
1239 * @see #setMinFilter
1240 */
1241 + @Native
1242 public static final int MULTI_LEVEL_POINT = 4;
1243
1244 /**
1245 @@ -419,6 +425,7 @@
1246 * fall back to LINEAR_MIPMAP_NEAREST or NEAREST_MIPMAP_LINEAR.
1247 * @see #setMinFilter
1248 */
1249 + @Native
1250 public static final int MULTI_LEVEL_LINEAR = 5;
1251
1252 // NOTE: values 6, 7, and 8 are reserved for the LINEAR_DETAIL*
1253 @@ -432,6 +439,7 @@
1254 * @since Java 3D 1.3
1255 * @see #setMagFilter
1256 */
1257 + @Native
1258 public static final int LINEAR_SHARPEN = 9;
1259
1260 /**
1261 @@ -442,6 +450,7 @@
1262 * @since Java 3D 1.3
1263 * @see #setMagFilter
1264 */
1265 + @Native
1266 public static final int LINEAR_SHARPEN_RGB = 10;
1267
1268 /**
1269 @@ -452,6 +461,7 @@
1270 * @since Java 3D 1.3
1271 * @see #setMagFilter
1272 */
1273 + @Native
1274 public static final int LINEAR_SHARPEN_ALPHA = 11;
1275
1276 /**
1277 @@ -462,6 +472,7 @@
1278 * @see #setMinFilter
1279 * @see #setMagFilter
1280 */
1281 + @Native
1282 public static final int FILTER4 = 12;
1283
1284 // Texture boundary mode parameter values
1285 @@ -471,12 +482,14 @@
1286 * width is 0 will be used for U,V values that fall
1287 * outside this range.
1288 */
1289 + @Native
1290 public static final int CLAMP = 2;
1291 /**
1292 * Repeats the texture by wrapping texture coordinates that are outside
1293 * the range [0,1]. Only the fractional portion of the texture
1294 * coordinates is used; the integer portion is discarded.
1295 */
1296 + @Native
1297 public static final int WRAP = 3;
1298 /**
1299 * Clamps texture coordinates such that filtering
1300 @@ -485,6 +498,7 @@
1301 *
1302 * @since Java 3D 1.3
1303 */
1304 + @Native
1305 public static final int CLAMP_TO_EDGE = 4;
1306 /**
1307 * Clamps texture coordinates such that filtering
1308 @@ -494,6 +508,7 @@
1309 *
1310 * @since Java 3D 1.3
1311 */
1312 + @Native
1313 public static final int CLAMP_TO_BOUNDARY = 5;
1314
1315
1316 @@ -501,6 +516,7 @@
1317 * Indicates that Texture object only has one level. If multiple
1318 * levels are needed, they will be implicitly computed.
1319 */
1320 + @Native
1321 public static final int BASE_LEVEL = 1;
1322
1323 /**
1324 @@ -509,6 +525,7 @@
1325 * <code>log<sub><font size=-2>2</font></sub>(max(width,height))+1</code>
1326 * separate images.
1327 */
1328 + @Native
1329 public static final int MULTI_LEVEL_MIPMAP = 2;
1330
1331 // Texture format parameter values
1332 @@ -516,32 +533,38 @@
1333 /**
1334 * Specifies Texture contains only Intensity values.
1335 */
1336 + @Native
1337 public static final int INTENSITY = 1;
1338
1339 /**
1340 * Specifies Texture contains only luminance values.
1341 */
1342 + @Native
1343 public static final int LUMINANCE = 2;
1344
1345 /**
1346 * Specifies Texture contains only Alpha values.
1347 */
1348 + @Native
1349 public static final int ALPHA = 3;
1350
1351 /**
1352 * Specifies Texture contains Luminance and Alpha values.
1353 */
1354 + @Native
1355 public static final int LUMINANCE_ALPHA = 4;
1356
1357 /**
1358 * Specifies Texture contains Red, Green and Blue color values.
1359 */
1360 + @Native
1361 public static final int RGB = 5;
1362
1363 /**
1364 * Specifies Texture contains Red, Green, Blue color values
1365 * and Alpha value.
1366 */
1367 + @Native
1368 public static final int RGBA = 6;
1369
1370 /**
1371 @@ -550,6 +573,7 @@
1372 * @since Java 3D 1.3
1373 * @see #setAnisotropicFilterMode
1374 */
1375 + @Native
1376 public static final int ANISOTROPIC_NONE = 0;
1377
1378 /**
1379 @@ -559,6 +583,7 @@
1380 * @since Java 3D 1.3
1381 * @see #setAnisotropicFilterMode
1382 */
1383 + @Native
1384 public static final int ANISOTROPIC_SINGLE_VALUE = 1;
1385
1386 // Array for setting default read capabilities
1387 --- a/j3d-core/src/classes/share/javax/media/j3d/Texture2D.java
1388 +++ b/j3d-core/src/classes/share/javax/media/j3d/Texture2D.java
1389 @@ -31,6 +31,7 @@
1390
1391 package javax.media.j3d;
1392
1393 +import java.lang.annotation.Native;
1394 import javax.vecmath.*;
1395
1396
1397 @@ -72,6 +73,7 @@
1398 * @since Java 3D 1.3
1399 * @see #setMagFilter
1400 */
1401 + @Native
1402 public static final int LINEAR_DETAIL = 6;
1403
1404 /**
1405 @@ -84,6 +86,7 @@
1406 * @since Java 3D 1.3
1407 * @see #setMagFilter
1408 */
1409 + @Native
1410 public static final int LINEAR_DETAIL_RGB = 7;
1411
1412 /**
1413 @@ -96,6 +99,7 @@
1414 * @since Java 3D 1.3
1415 * @see #setMagFilter
1416 */
1417 + @Native
1418 public static final int LINEAR_DETAIL_ALPHA = 8;
1419
1420 /**
1421 --- a/j3d-core/src/classes/share/javax/media/j3d/TextureAttributes.java
1422 +++ b/j3d-core/src/classes/share/javax/media/j3d/TextureAttributes.java
1423 @@ -31,6 +31,7 @@
1424
1425 package javax.media.j3d;
1426
1427 +import java.lang.annotation.Native;
1428 import javax.vecmath.Color4f;
1429
1430 /**
1431 @@ -253,6 +254,7 @@
1432 * Use the fastest available method for perspective correction.
1433 * @see #setPerspectiveCorrectionMode
1434 */
1435 + @Native
1436 public static final int FASTEST = 0;
1437
1438 /**
1439 @@ -260,30 +262,35 @@
1440 * mapping perspective correction.
1441 * @see #setPerspectiveCorrectionMode
1442 */
1443 + @Native
1444 public static final int NICEST = 1;
1445
1446 /**
1447 * Modulate the object color with the texture color.
1448 * @see #setTextureMode
1449 */
1450 + @Native
1451 public static final int MODULATE = 2;
1452
1453 /**
1454 * Apply the texture color to the object as a decal.
1455 * @see #setTextureMode
1456 */
1457 + @Native
1458 public static final int DECAL = 3;
1459
1460 /**
1461 * Blend the texture blend color with the object color.
1462 * @see #setTextureMode
1463 */
1464 + @Native
1465 public static final int BLEND = 4;
1466
1467 /**
1468 * Replace the object color with the texture color.
1469 * @see #setTextureMode
1470 */
1471 + @Native
1472 public static final int REPLACE = 5;
1473
1474 /**
1475 @@ -293,6 +300,7 @@
1476 * @see #setTextureMode
1477 * @since Java 3D 1.3
1478 */
1479 + @Native
1480 public static final int COMBINE = 6;
1481
1482
1483 @@ -303,6 +311,7 @@
1484 * @see #setCombineRgbMode
1485 * @see #setCombineAlphaMode
1486 */
1487 + @Native
1488 public static final int COMBINE_REPLACE = 0;
1489
1490 /**
1491 @@ -312,6 +321,7 @@
1492 * @see #setCombineRgbMode
1493 * @see #setCombineAlphaMode
1494 */
1495 + @Native
1496 public static final int COMBINE_MODULATE = 1;
1497
1498 /**
1499 @@ -321,6 +331,7 @@
1500 * @see #setCombineRgbMode
1501 * @see #setCombineAlphaMode
1502 */
1503 + @Native
1504 public static final int COMBINE_ADD = 2;
1505
1506 /**
1507 @@ -330,6 +341,7 @@
1508 * @see #setCombineRgbMode
1509 * @see #setCombineAlphaMode
1510 */
1511 + @Native
1512 public static final int COMBINE_ADD_SIGNED = 3;
1513
1514 /**
1515 @@ -339,6 +351,7 @@
1516 * @see #setCombineRgbMode
1517 * @see #setCombineAlphaMode
1518 */
1519 + @Native
1520 public static final int COMBINE_SUBTRACT = 4;
1521
1522 /**
1523 @@ -348,6 +361,7 @@
1524 * @see #setCombineRgbMode
1525 * @see #setCombineAlphaMode
1526 */
1527 + @Native
1528 public static final int COMBINE_INTERPOLATE = 5;
1529
1530 /**
1531 @@ -357,6 +371,7 @@
1532 * @see #setCombineRgbMode
1533 * @see #setCombineAlphaMode
1534 */
1535 + @Native
1536 public static final int COMBINE_DOT3 = 6;
1537
1538
1539 @@ -367,6 +382,7 @@
1540 * @see #setCombineRgbSource
1541 * @see #setCombineAlphaSource
1542 */
1543 + @Native
1544 public static final int COMBINE_OBJECT_COLOR = 0;
1545
1546 /**
1547 @@ -376,6 +392,7 @@
1548 * @see #setCombineRgbSource
1549 * @see #setCombineAlphaSource
1550 */
1551 + @Native
1552 public static final int COMBINE_TEXTURE_COLOR = 1;
1553
1554 /**
1555 @@ -385,6 +402,7 @@
1556 * @see #setCombineRgbSource
1557 * @see #setCombineAlphaSource
1558 */
1559 + @Native
1560 public static final int COMBINE_CONSTANT_COLOR = 2;
1561
1562 /**
1563 @@ -394,6 +412,7 @@
1564 * @see #setCombineRgbSource
1565 * @see #setCombineAlphaSource
1566 */
1567 + @Native
1568 public static final int COMBINE_PREVIOUS_TEXTURE_UNIT_STATE = 3;
1569
1570 /**
1571 @@ -402,6 +421,7 @@
1572 * @since Java 3D 1.3
1573 * @see #setCombineRgbFunction
1574 */
1575 + @Native
1576 public static final int COMBINE_SRC_COLOR = 0;
1577
1578 /**
1579 @@ -410,6 +430,7 @@
1580 * @since Java 3D 1.3
1581 * @see #setCombineRgbFunction
1582 */
1583 + @Native
1584 public static final int COMBINE_ONE_MINUS_SRC_COLOR = 1;
1585
1586 /**
1587 @@ -419,6 +440,7 @@
1588 * @see #setCombineRgbFunction
1589 * @see #setCombineAlphaFunction
1590 */
1591 + @Native
1592 public static final int COMBINE_SRC_ALPHA = 2;
1593
1594 /**
1595 @@ -428,6 +450,7 @@
1596 * @see #setCombineRgbFunction
1597 * @see #setCombineAlphaFunction
1598 */
1599 + @Native
1600 public static final int COMBINE_ONE_MINUS_SRC_ALPHA = 3;
1601
1602 // Array for setting default read capabilities
1603 --- a/j3d-core/src/classes/share/javax/media/j3d/TransparencyAttributes.java
1604 +++ b/j3d-core/src/classes/share/javax/media/j3d/TransparencyAttributes.java
1605 @@ -31,6 +31,8 @@
1606
1607 package javax.media.j3d;
1608
1609 +import java.lang.annotation.Native;
1610 +
1611 /**
1612 * The TransparencyAttributes object defines all attributes affecting
1613 * transparency of the object. The transparency attributes are:<p>
1614 @@ -146,12 +148,14 @@
1615 * Use the fastest available method for transparency.
1616 * @see #setTransparencyMode
1617 */
1618 + @Native
1619 public static final int FASTEST = 0;
1620
1621 /**
1622 * Use the nicest available method for transparency.
1623 * @see #setTransparencyMode
1624 */
1625 + @Native
1626 public static final int NICEST = 1;
1627
1628 /**
1629 @@ -180,6 +184,7 @@
1630 * @see #setSrcBlendFunction
1631 * @see #setDstBlendFunction
1632 */
1633 + @Native
1634 public static final int BLENDED = 2;
1635
1636 /**
1637 @@ -189,12 +194,14 @@
1638 * parameter.
1639 * @see #setTransparencyMode
1640 */
1641 + @Native
1642 public static final int SCREEN_DOOR = 3;
1643
1644 /**
1645 * No transparency, opaque object.
1646 * @see #setTransparencyMode
1647 */
1648 + @Native
1649 public static final int NONE = 4;
1650
1651 /**
1652 @@ -204,6 +211,7 @@
1653 *
1654 * @since Java 3D 1.2
1655 */
1656 + @Native
1657 public static final int BLEND_ZERO = 0;
1658
1659 /**
1660 @@ -213,6 +221,7 @@
1661 *
1662 * @since Java 3D 1.2
1663 */
1664 + @Native
1665 public static final int BLEND_ONE = 1;
1666
1667 /**
1668 @@ -223,6 +232,7 @@
1669 *
1670 * @since Java 3D 1.2
1671 */
1672 + @Native
1673 public static final int BLEND_SRC_ALPHA = 2;
1674
1675 /**
1676 @@ -233,6 +243,7 @@
1677 *
1678 * @since Java 3D 1.2
1679 */
1680 + @Native
1681 public static final int BLEND_ONE_MINUS_SRC_ALPHA = 3;
1682
1683 /**
1684 @@ -244,6 +255,7 @@
1685 *
1686 * @since Java 3D 1.4
1687 */
1688 + @Native
1689 public static final int BLEND_DST_COLOR = 4;
1690
1691 /**
1692 @@ -255,6 +267,7 @@
1693 *
1694 * @since Java 3D 1.4
1695 */
1696 + @Native
1697 public static final int BLEND_ONE_MINUS_DST_COLOR = 5;
1698
1699 /**
1700 @@ -266,6 +279,7 @@
1701 *
1702 * @since Java 3D 1.4
1703 */
1704 + @Native
1705 public static final int BLEND_SRC_COLOR = 6;
1706
1707 /**
1708 @@ -277,10 +291,13 @@
1709 *
1710 * @since Java 3D 1.4
1711 */
1712 + @Native
1713 public static final int BLEND_ONE_MINUS_SRC_COLOR = 7;
1714
1715 + @Native
1716 static final int BLEND_CONSTANT_COLOR = 8;
1717
1718 + @Native
1719 static final int MAX_BLEND_FUNC_TABLE_SIZE = 9;
1720
1721 // Array for setting default read capabilities
1722 --- a/j3d-core/src/classes/share/javax/media/j3d/Shader.java
1723 +++ b/j3d-core/src/classes/share/javax/media/j3d/Shader.java
1724 @@ -31,6 +31,8 @@
1725
1726 package javax.media.j3d;
1727
1728 +import java.lang.annotation.Native;
1729 +
1730 /**
1731 * The Shader object is the abstract base class for programmable
1732 * shader code. Currently, only text-based source code shaders are
1733 @@ -101,6 +103,7 @@
1734 * shader. It is one of the possible values of the shaderType
1735 * parameter.
1736 */
1737 + @Native
1738 public static final int SHADER_TYPE_VERTEX = 1;
1739
1740 /**
1741 @@ -108,6 +111,7 @@
1742 * shader. It is one of the possible values of the shaderType
1743 * parameter.
1744 */
1745 + @Native
1746 public static final int SHADER_TYPE_FRAGMENT = 2;
1747
1748
1749 --- a/j3d-core/src/classes/share/javax/media/j3d/ShaderAttributeObjectRetained.java
1750 +++ b/j3d-core/src/classes/share/javax/media/j3d/ShaderAttributeObjectRetained.java
1751 @@ -31,6 +31,7 @@
1752
1753 package javax.media.j3d;
1754
1755 +import java.lang.annotation.Native;
1756 import java.util.ArrayList;
1757 import javax.vecmath.*;
1758
1759 @@ -184,15 +185,25 @@
1760 // the tables of classes, so the values must start at 0 and
1761 // increment by 1. Also, the order must be the same as the order
1762 // of the entries in each of the two class tables.
1763 + @Native
1764 static final int TYPE_INTEGER = 0;
1765 + @Native
1766 static final int TYPE_FLOAT = 1;
1767 + @Native
1768 static final int TYPE_TUPLE2I = 2;
1769 + @Native
1770 static final int TYPE_TUPLE2F = 3;
1771 + @Native
1772 static final int TYPE_TUPLE3I = 4;
1773 + @Native
1774 static final int TYPE_TUPLE3F = 5;
1775 + @Native
1776 static final int TYPE_TUPLE4I = 6;
1777 + @Native
1778 static final int TYPE_TUPLE4F = 7;
1779 + @Native
1780 static final int TYPE_MATRIX3F = 8;
1781 + @Native
1782 static final int TYPE_MATRIX4F = 9;
1783
1784 // Double-precision is not supported in the current version. Uncomment the
1785 --- a/j3d-core/src/classes/share/javax/media/j3d/ShaderError.java
1786 +++ b/j3d-core/src/classes/share/javax/media/j3d/ShaderError.java
1787 @@ -31,6 +31,7 @@
1788
1789 package javax.media.j3d;
1790
1791 +import java.lang.annotation.Native;
1792 import java.io.PrintStream;
1793
1794 /**
1795 @@ -56,28 +57,33 @@
1796 /**
1797 * Indicates that no error occurred.
1798 */
1799 + @Native
1800 public static final int NO_ERROR = 0;
1801
1802 /**
1803 * Indicates that an error occurred while compiling a shader.
1804 */
1805 + @Native
1806 public static final int COMPILE_ERROR = 1;
1807
1808 /**
1809 * Indicates that an error occurred while linking a shader.
1810 */
1811 + @Native
1812 public static final int LINK_ERROR = 2;
1813
1814 /**
1815 * Indicates a error in looking up a vertex attribute
1816 * name within a given shader program.
1817 */
1818 + @Native
1819 public static final int VERTEX_ATTRIBUTE_LOOKUP_ERROR = 3;
1820
1821 /**
1822 * Indicates a error in looking up the location of a uniform
1823 * shader attribute name within a given shader program.
1824 */
1825 + @Native
1826 public static final int SHADER_ATTRIBUTE_LOOKUP_ERROR = 4;
1827
1828 /**
1829 @@ -85,18 +91,21 @@
1830 * appear in the list of shader attribute names in the corresponding
1831 * ShaderProgram object.
1832 */
1833 + @Native
1834 public static final int SHADER_ATTRIBUTE_NAME_NOT_SET_ERROR = 5;
1835
1836 /**
1837 * Indicates a error in the type of the attribute versus what the shader
1838 * program was expecting.
1839 */
1840 + @Native
1841 public static final int SHADER_ATTRIBUTE_TYPE_ERROR = 6;
1842
1843 /**
1844 * Indicates that the specified shading language is not supported
1845 * on the screen display device.
1846 */
1847 + @Native
1848 public static final int UNSUPPORTED_LANGUAGE_ERROR = 7;
1849
1850
1851 --- a/j3d-core/src/classes/share/javax/media/j3d/ColoringAttributesRetained.java
1852 +++ b/j3d-core/src/classes/share/javax/media/j3d/ColoringAttributesRetained.java
1853 @@ -31,6 +31,7 @@
1854
1855 package javax.media.j3d;
1856
1857 +import java.lang.annotation.Native;
1858 import javax.vecmath.Color3f;
1859 import java.util.ArrayList;
1860
1861 @@ -41,7 +42,9 @@
1862 class ColoringAttributesRetained extends NodeComponentRetained {
1863 // A list of pre-defined bits to indicate which component
1864 // in this ColoringAttributes object changed.
1865 + @Native
1866 static final int COLOR_CHANGED = 0x01;
1867 + @Native
1868 static final int SHADE_MODEL_CHANGED = 0x02;
1869
1870 // Intrinsic color used when lighting is disabled or when
1871 --- a/j3d-core/src/classes/share/javax/media/j3d/DirectionalLightRetained.java
1872 +++ b/j3d-core/src/classes/share/javax/media/j3d/DirectionalLightRetained.java
1873 @@ -31,6 +31,7 @@
1874
1875 package javax.media.j3d;
1876
1877 +import java.lang.annotation.Native;
1878 import javax.vecmath.*;
1879
1880 /**
1881 @@ -39,6 +40,7 @@
1882
1883 class DirectionalLightRetained extends LightRetained
1884 {
1885 + @Native
1886 static final int DIRECTION_CHANGED = LAST_DEFINED_BIT << 1;
1887
1888 // The direction in which this light source is pointing.
66 06_java-compat.patch
77 typedef.patch
88 07_java9_compatibility.patch
9 08_java10_compatibility.patch
99 dh $@ --buildsystem=ant --with javahelper
1010
1111 override_dh_auto_build:
12 dh_auto_build -- -f j3d-core/build.xml -Dbuild.type=fcs echo jar docs
12 dh_auto_build -- -f j3d-core/build.xml -Dbuild.type=fcs -DjavahBuild.notRequired=true echo jar docs
1313
1414 override_dh_auto_clean:
1515 dh_auto_build -- -f j3d-core/build.xml clean