From 6e54fba3bb9dcadf66774fd9b64df191d985aa22 Mon Sep 17 00:00:00 2001 From: qun Date: Tue, 23 Jul 2013 20:50:39 +0200 Subject: Fix GLES3/GLES2 relation / Use bouml 4.21.1 (Note: SVG fonts .. are too tiny, using png) --- doc/uml/html-svg/class128002.html | 25 - doc/uml/html-svg/class128069.html | 25 - doc/uml/html-svg/class128130.html | 25 - doc/uml/html-svg/class128197.html | 25 - doc/uml/html-svg/class128258.html | 25 - doc/uml/html-svg/class128325.html | 25 - doc/uml/html-svg/class128386.html | 24 - doc/uml/html-svg/class128453.html | 25 - doc/uml/html-svg/class128581.html | 25 - doc/uml/html-svg/class128709.html | 25 - doc/uml/html-svg/class128837.html | 25 - doc/uml/html-svg/class128965.html | 25 - doc/uml/html-svg/class130117.html | 25 - doc/uml/html-svg/class130245.html | 25 - doc/uml/html-svg/class130501.html | 24 - doc/uml/html-svg/class130629.html | 24 - doc/uml/html-svg/class130757.html | 24 - doc/uml/html-svg/class130885.html | 26 - doc/uml/html-svg/class131013.html | 26 - doc/uml/html-svg/class131141.html | 25 - doc/uml/html-svg/class131269.html | 26 - doc/uml/html-svg/class131397.html | 25 - doc/uml/html-svg/class132549.html | 26 - doc/uml/html-svg/class134914.html | 25 - doc/uml/html-svg/class135042.html | 25 - doc/uml/html-svg/class135170.html | 25 - doc/uml/html-svg/classdiagrams.html | 6 +- doc/uml/html-svg/classes.html | 56 +- doc/uml/html-svg/classes_list.html | 56 +- doc/uml/html-svg/fig128069.svg | 996 +++++++++++++++++----------------- doc/uml/html-svg/fig134786.svg | 705 ++++++++++++------------ doc/uml/html-svg/index-withframe.html | 31 +- doc/uml/html-svg/index.html | 290 ++++++++-- doc/uml/html-svg/index_65.html | 6 +- doc/uml/html-svg/index_67.html | 8 +- doc/uml/html-svg/index_71.html | 52 +- doc/uml/html-svg/index_74.html | 8 +- doc/uml/html-svg/index_78.html | 6 +- doc/uml/html-svg/index_79.html | 8 +- doc/uml/html-svg/index_82.html | 6 +- doc/uml/html-svg/metaclass135298.html | 25 - doc/uml/html-svg/navig.html | 6 +- doc/uml/html-svg/packages.html | 4 +- doc/uml/html/classdiagrams.html | 6 +- doc/uml/html/classes.html | 56 +- doc/uml/html/classes_list.html | 4 +- doc/uml/html/fig128069.png | Bin 56984 -> 103943 bytes doc/uml/html/fig134786.png | Bin 45683 -> 85886 bytes doc/uml/html/index-withframe.html | 31 +- doc/uml/html/index.html | 110 ++-- doc/uml/html/index_65.html | 6 +- doc/uml/html/index_67.html | 8 +- doc/uml/html/index_71.html | 52 +- doc/uml/html/index_74.html | 8 +- doc/uml/html/index_78.html | 6 +- doc/uml/html/index_79.html | 8 +- doc/uml/html/index_82.html | 6 +- doc/uml/html/navig.html | 6 +- doc/uml/html/packages.html | 4 +- doc/uml/jogl/128069.diagram | 101 ++-- doc/uml/jogl/134786.diagram | 75 +-- doc/uml/jogl/2.session | 15 +- doc/uml/jogl/generation_settings | 2 +- doc/uml/jogl/jogl.prj | 20 +- 64 files changed, 1502 insertions(+), 1941 deletions(-) delete mode 100644 doc/uml/html-svg/class128002.html delete mode 100644 doc/uml/html-svg/class128069.html delete mode 100644 doc/uml/html-svg/class128130.html delete mode 100644 doc/uml/html-svg/class128197.html delete mode 100644 doc/uml/html-svg/class128258.html delete mode 100644 doc/uml/html-svg/class128325.html delete mode 100644 doc/uml/html-svg/class128386.html delete mode 100644 doc/uml/html-svg/class128453.html delete mode 100644 doc/uml/html-svg/class128581.html delete mode 100644 doc/uml/html-svg/class128709.html delete mode 100644 doc/uml/html-svg/class128837.html delete mode 100644 doc/uml/html-svg/class128965.html delete mode 100644 doc/uml/html-svg/class130117.html delete mode 100644 doc/uml/html-svg/class130245.html delete mode 100644 doc/uml/html-svg/class130501.html delete mode 100644 doc/uml/html-svg/class130629.html delete mode 100644 doc/uml/html-svg/class130757.html delete mode 100644 doc/uml/html-svg/class130885.html delete mode 100644 doc/uml/html-svg/class131013.html delete mode 100644 doc/uml/html-svg/class131141.html delete mode 100644 doc/uml/html-svg/class131269.html delete mode 100644 doc/uml/html-svg/class131397.html delete mode 100644 doc/uml/html-svg/class132549.html delete mode 100644 doc/uml/html-svg/class134914.html delete mode 100644 doc/uml/html-svg/class135042.html delete mode 100644 doc/uml/html-svg/class135170.html delete mode 100644 doc/uml/html-svg/metaclass135298.html (limited to 'doc/uml') diff --git a/doc/uml/html-svg/class128002.html b/doc/uml/html-svg/class128002.html deleted file mode 100644 index 7544725e3..000000000 --- a/doc/uml/html-svg/class128002.html +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - -Class GL3bc - - - - - -
Class GL3bc
-

- - - - -

Declaration :

Directly inherited by : GL4bc GL4bcImpl

-

Stereotype: interface

-
-
- - diff --git a/doc/uml/html-svg/class128069.html b/doc/uml/html-svg/class128069.html deleted file mode 100644 index bc9d4a714..000000000 --- a/doc/uml/html-svg/class128069.html +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - -Class GL - - - - - -
Class GL
-

- - - - -

Declaration :

Directly inherited by : GL2ES1 GL2ES2

-

Stereotype: interface

-
-
- - diff --git a/doc/uml/html-svg/class128130.html b/doc/uml/html-svg/class128130.html deleted file mode 100644 index 2d076667b..000000000 --- a/doc/uml/html-svg/class128130.html +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - -Class GL4 - - - - - -
Class GL4
-

- - - - -

Declaration :

Directly inherited by : GL4bc GL4bcImpl

-

Stereotype: interface

-
-
- - diff --git a/doc/uml/html-svg/class128197.html b/doc/uml/html-svg/class128197.html deleted file mode 100644 index 24600b432..000000000 --- a/doc/uml/html-svg/class128197.html +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - -Class GL2ES1 - - - - - -
Class GL2ES1
-

- - - - -

Declaration :

Directly inherited by : GL2 GL2ES12 GLES1

-

Stereotype: interface

-
-
- - diff --git a/doc/uml/html-svg/class128258.html b/doc/uml/html-svg/class128258.html deleted file mode 100644 index b9bedf777..000000000 --- a/doc/uml/html-svg/class128258.html +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - -Class GL4bc - - - - - -
Class GL4bc
-

- - - - -

Declaration :

Directly inherited by : GL4bcImpl

-

Stereotype: interface

-
-
- - diff --git a/doc/uml/html-svg/class128325.html b/doc/uml/html-svg/class128325.html deleted file mode 100644 index 50fef41d3..000000000 --- a/doc/uml/html-svg/class128325.html +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - -Class GLES1 - - - - - -
Class GLES1
-

- - - - -

Declaration :

Directly inherited by : GLES1Impl

-

Stereotype: interface

-
-
- - diff --git a/doc/uml/html-svg/class128386.html b/doc/uml/html-svg/class128386.html deleted file mode 100644 index c2d4c7860..000000000 --- a/doc/uml/html-svg/class128386.html +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - -Class GL2ES12 - - - - - -
Class GL2ES12
-

- - - - -

Declaration :

Stereotype: entity

-
-
- - diff --git a/doc/uml/html-svg/class128453.html b/doc/uml/html-svg/class128453.html deleted file mode 100644 index 9cce94046..000000000 --- a/doc/uml/html-svg/class128453.html +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - -Class GL2 - - - - - -
Class GL2
-

- - - - -

Declaration :

Directly inherited by : GL3bc GL4bcImpl

-

Stereotype: interface

-
-
- - diff --git a/doc/uml/html-svg/class128581.html b/doc/uml/html-svg/class128581.html deleted file mode 100644 index c13640b7c..000000000 --- a/doc/uml/html-svg/class128581.html +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - -Class GL2ES2 - - - - - -
Class GL2ES2
-

- - - - -

Declaration :

Directly inherited by : GL2ES12 GL2ES3 GL2GL3 GLES2

-

Stereotype: interface

-
-
- - diff --git a/doc/uml/html-svg/class128709.html b/doc/uml/html-svg/class128709.html deleted file mode 100644 index 6d44a4e56..000000000 --- a/doc/uml/html-svg/class128709.html +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - -Class GL2GL3 - - - - - -
Class GL2GL3
-

- - - - -

Declaration :

Directly inherited by : GL2 GL3

-

Stereotype: interface

-
-
- - diff --git a/doc/uml/html-svg/class128837.html b/doc/uml/html-svg/class128837.html deleted file mode 100644 index ff077eebf..000000000 --- a/doc/uml/html-svg/class128837.html +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - -Class GL3 - - - - - -
Class GL3
-

- - - - -

Declaration :

Directly inherited by : GL3bc GL4 GL4bcImpl

-

Stereotype: interface

-
-
- - diff --git a/doc/uml/html-svg/class128965.html b/doc/uml/html-svg/class128965.html deleted file mode 100644 index ffdf65f66..000000000 --- a/doc/uml/html-svg/class128965.html +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - -Class GLES2 - - - - - -
Class GLES2
-

- - - - -

Declaration :

Directly inherited by : GLES3Impl

-

Stereotype: interface

-
-
- - diff --git a/doc/uml/html-svg/class130117.html b/doc/uml/html-svg/class130117.html deleted file mode 100644 index eb593d2a5..000000000 --- a/doc/uml/html-svg/class130117.html +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - -Class GLContext - - - - - -
Class GLContext
-

- - - - -

Declaration :

- -
Relation <association>

Declaration :

-
Relation <association>

Declaration :

- - diff --git a/doc/uml/html-svg/class130245.html b/doc/uml/html-svg/class130245.html deleted file mode 100644 index 0662e8da4..000000000 --- a/doc/uml/html-svg/class130245.html +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - -Class GLDrawable - - - - - -
Class GLDrawable
-

- - - - -

Declaration :

- -
Relation <association>

Declaration :

-
Relation <association>

Declaration :

- - diff --git a/doc/uml/html-svg/class130501.html b/doc/uml/html-svg/class130501.html deleted file mode 100644 index 656f8d667..000000000 --- a/doc/uml/html-svg/class130501.html +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - -Class GL4bcImpl - - - - - -
Class GL4bcImpl
-

- - - - -

Declaration :

Stereotype: entity

-
-
- - diff --git a/doc/uml/html-svg/class130629.html b/doc/uml/html-svg/class130629.html deleted file mode 100644 index 05dffedc9..000000000 --- a/doc/uml/html-svg/class130629.html +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - -Class GLES3Impl - - - - - -
Class GLES3Impl
-

- - - - -

Declaration :

Stereotype: entity

-
-
- - diff --git a/doc/uml/html-svg/class130757.html b/doc/uml/html-svg/class130757.html deleted file mode 100644 index f415b8124..000000000 --- a/doc/uml/html-svg/class130757.html +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - -Class GLES1Impl - - - - - -
Class GLES1Impl
-

- - - - -

Declaration :

Stereotype: entity

-
-
- - diff --git a/doc/uml/html-svg/class130885.html b/doc/uml/html-svg/class130885.html deleted file mode 100644 index f0d7b7b8d..000000000 --- a/doc/uml/html-svg/class130885.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - -Class NativeWindow - - - - - -
Class NativeWindow
-

- - - - -

Declaration :

Stereotype: interface

-
- -
Relation <association>

Declaration :

-
Relation <association>

Declaration :

- - diff --git a/doc/uml/html-svg/class131013.html b/doc/uml/html-svg/class131013.html deleted file mode 100644 index cb9cbcbac..000000000 --- a/doc/uml/html-svg/class131013.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - -Class AbstractGraphicsConfiguration - - - - - -
Class AbstractGraphicsConfiguration
-

- - - - -

Declaration :

- -
Relation chosen (<association>)

Declaration :

-
Relation <association>

Declaration :

-
Relation <association>

Declaration :

- - diff --git a/doc/uml/html-svg/class131141.html b/doc/uml/html-svg/class131141.html deleted file mode 100644 index 8b3a8f295..000000000 --- a/doc/uml/html-svg/class131141.html +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - -Class GLCapabilities - - - - - -
Class GLCapabilities
-

- - - - -

Declaration :

- -
Relation <association>

Declaration :

-
Relation <association>

Declaration :

- - diff --git a/doc/uml/html-svg/class131269.html b/doc/uml/html-svg/class131269.html deleted file mode 100644 index 9faf0f545..000000000 --- a/doc/uml/html-svg/class131269.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - -Class Capabilities - - - - - -
Class Capabilities
-

- - - - -

Declaration :

Directly inherited by : GLCapabilities

-
- -
Relation <association>

Declaration :

-
Relation <association>

Declaration :

- - diff --git a/doc/uml/html-svg/class131397.html b/doc/uml/html-svg/class131397.html deleted file mode 100644 index b8568c254..000000000 --- a/doc/uml/html-svg/class131397.html +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - -Class GLProfile - - - - - -
Class GLProfile
-

- - - - -

Declaration :

- -
Relation <association>

Declaration :

-
Relation <association>

Declaration :

- - diff --git a/doc/uml/html-svg/class132549.html b/doc/uml/html-svg/class132549.html deleted file mode 100644 index 7662d1fe3..000000000 --- a/doc/uml/html-svg/class132549.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - -Class GLBase - - - - - -
Class GLBase
-

- - - - -

Declaration :

Directly inherited by : GL

-

Stereotype: interface

-
- -
Relation <association>

Declaration :

- - diff --git a/doc/uml/html-svg/class134914.html b/doc/uml/html-svg/class134914.html deleted file mode 100644 index f27f4e599..000000000 --- a/doc/uml/html-svg/class134914.html +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - -Class GLES3 - - - - - -
Class GLES3
-

- - - - -

Declaration :

Directly inherited by : GLES3Impl

-

Stereotype: @interface

-
-
- - diff --git a/doc/uml/html-svg/class135042.html b/doc/uml/html-svg/class135042.html deleted file mode 100644 index 9849be03a..000000000 --- a/doc/uml/html-svg/class135042.html +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - -Class GL4ES3 - - - - - -
Class GL4ES3
-

- - - - -

Declaration :

Directly inherited by : GL4 GLES3

-

Stereotype: @interface

-
-
- - diff --git a/doc/uml/html-svg/class135170.html b/doc/uml/html-svg/class135170.html deleted file mode 100644 index e5a3ae28d..000000000 --- a/doc/uml/html-svg/class135170.html +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - -Class GL3ES3 - - - - - -
Class GL3ES3
-

- - - - -

Declaration :

Directly inherited by : GL3 GL4ES3

-

Stereotype: @interface

-
-
- - diff --git a/doc/uml/html-svg/classdiagrams.html b/doc/uml/html-svg/classdiagrams.html index 5e0f421b4..3ba85a150 100644 --- a/doc/uml/html-svg/classdiagrams.html +++ b/doc/uml/html-svg/classdiagrams.html @@ -1,5 +1,5 @@ - + @@ -16,8 +16,8 @@ - - + +
OpenGL Interfaces - All
OpenGL Interfaces - Core Only
OpenGL Interfaces - All
OpenGL Interfaces - Core Only
diff --git a/doc/uml/html-svg/classes.html b/doc/uml/html-svg/classes.html index 53e25aeb2..0e0ae36f9 100644 --- a/doc/uml/html-svg/classes.html +++ b/doc/uml/html-svg/classes.html @@ -1,5 +1,5 @@ - + @@ -16,33 +16,33 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + +
AbstractGraphicsConfiguration
Capabilities
GLinterface
GL2interface
GL2ES1interface
GL2ES12entity
GL2ES2interface
GL2ES3metaclass
GL2GL3interface
GL3interface
GL3bcinterface
GL3ES3@interface
GL4interface
GL4bcinterface
GL4bcImplentity
GL4ES3@interface
GLBaseinterface
GLCapabilities
GLContext
GLDrawable
GLES1interface
GLES1Implentity
GLES2interface
GLES3@interface
GLES3Implentity
GLProfile
NativeWindowinterface
AbstractGraphicsConfiguration
Capabilities
GLinterface
GL2interface
GL2ES1interface
GL2ES12entity
GL2ES2interface
GL2ES3metaclass
GL2GL3interface
GL3interface
GL3bcinterface
GL3ES3@interface
GL4interface
GL4bcinterface
GL4bcImplentity
GL4ES3@interface
GLBaseinterface
GLCapabilities
GLContext
GLDrawable
GLES1interface
GLES1Implentity
GLES2interface
GLES3@interface
GLES3Implentity
GLProfile
NativeWindowinterface
diff --git a/doc/uml/html-svg/classes_list.html b/doc/uml/html-svg/classes_list.html index 7201623c3..4882e6a65 100644 --- a/doc/uml/html-svg/classes_list.html +++ b/doc/uml/html-svg/classes_list.html @@ -1,5 +1,5 @@ - + @@ -17,33 +17,33 @@ -
AbstractGraphicsConfiguration
-Capabilities
-GL
-GL2
-GL2ES1
-GL2ES12
-GL2ES2
-GL2ES3
-GL2GL3
-GL3
-GL3bc
-GL3ES3
-GL4
-GL4bc
-GL4bcImpl
-GL4ES3
-GLBase
-GLCapabilities
-GLContext
-GLDrawable
-GLES1
-GLES1Impl
-GLES2
-GLES3
-GLES3Impl
-GLProfile
-NativeWindow
+		AbstractGraphicsConfiguration
+Capabilities
+GL
+GL2
+GL2ES1
+GL2ES12
+GL2ES2
+GL2ES3
+GL2GL3
+GL3
+GL3bc
+GL3ES3
+GL4
+GL4bc
+GL4bcImpl
+GL4ES3
+GLBase
+GLCapabilities
+GLContext
+GLDrawable
+GLES1
+GLES1Impl
+GLES2
+GLES3
+GLES3Impl
+GLProfile
+NativeWindow
diff --git a/doc/uml/html-svg/fig128069.svg b/doc/uml/html-svg/fig128069.svg index a3e12c5aa..3c3372bff 100644 --- a/doc/uml/html-svg/fig128069.svg +++ b/doc/uml/html-svg/fig128069.svg @@ -1,494 +1,502 @@ - - - - - - - Fixed Function - - - - - - - - - - - - - - - - Programmable Shader - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <<interface>> - GL3bc - - - - - - - - <<interface>> - GL - - - - - - - - <<interface>> - GL4 - - - - - - - - <<interface>> - GL2ES1 - - - - - - - - <<interface>> - GL4bc - - - - - - - - <<interface>> - GLES1 - - - - - - - - <<interface>> - GL2 - - - - - - - - <<interface>> - GL2ES2 - - - - - - - - <<interface>> - GL3 - - - - - - - - <<interface>> - GLES2 - - - - - - - - <<@interface>> - GL4ES3 - - - - - - - - GLContext - - - - - - - - GLDrawable - - - - - - <<metaclass>> - GL2ES3 - - - - - - - GL4bcImpl - - - - - - - GLES3Impl - - - - - - - - <<interface>> - NativeWindow - - - - - - - - AbstractGraphicsConfiguration - - - - - - - - GLCapabilities - - - - - - - - GLProfile - - - - - - - - <<interface>> - GLBase - - - - Desktop final public - OpenGL Interfaces - Mobile final public - OpenGL Interfaces - Private implementation (detail) - Desktop/Mobile - Common Interfaces - Lifecycle: From the lower right to - the top, left step where the - GLContext is created with a - suitable GL implementation - matching the GLProfile. - Common GL Stuff - Common Desktop - Profile - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <<@interface>> - GLES3 - - - - - - - - <<interface>> - GL2GL3 - - - - - - - GLES1Impl - - - - - - - - Capabilities - - - - - - - - - - - - - - - - - - - - - - - - - - <<@interface>> - GL3ES3 - - - - - - - - - - - - - - - - - - - - - - - 1 - - - chosen - - - 0..1 - - - 1 - - - requested - - - 1 - - - 1 - - - 1 - - + + + + + + + Fixed Function + + + + + + + + + + + + + + + + Programmable Shader + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <<interface>> + GL3bc + + + + + + + + <<interface>> + GL2ES1 + + + + + + + + <<interface>> + GL + + + + + + + + <<interface>> + GL4 + + + + + + + + GLContext + + + + + + + + GLDrawable + + + + + + <<metaclass>> + GL2ES3 + + + + Mobile final public + OpenGL Interfaces + + + + GL4bcImpl + + + + + + + GLES3Impl + + + + Private implementation + (detail) + Desktop/Mobile + Common Interfaces + + + + + <<interface>> + NativeWindow + + + + + + + + AbstractGraphicsConfiguration + + + + + + + + GLCapabilities + + + + Lifecycle: From the lower right to + the top, left step where the + GLContext is created with a + suitable GL implementation + matching the GLProfile. + + + + + GLProfile + + + + + + + + <<interface>> + GLBase + + + + Common GL + Stuff + Common Desktop + Profile + + + + + <<@interface>> + GL4ES3 + + + + + + + + <<interface>> + GL4bc + + + + + + + + <<interface>> + GLES1 + + + + + + + + <<interface>> + GL2 + + + + + + + + <<interface>> + GL2ES2 + + + + Desktop final public + OpenGL Interfaces + + + + + <<interface>> + GL3 + + + + + + + + <<interface>> + GLES2 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <<@interface>> + GLES3 + + + + + + + GLES1Impl + + + + + + + + Capabilities + + + + + + + + <<interface>> + GL2GL3 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <<@interface>> + GL3ES3 + + + + + + + + + + + + + + + + + + + + + + + 0..1 + + + 1 + + + chosen + + + 1 + + + requested + + + 1 + + + 1 + + + 1 + + diff --git a/doc/uml/html-svg/fig134786.svg b/doc/uml/html-svg/fig134786.svg index 9b52bd150..ef7e7e5ba 100644 --- a/doc/uml/html-svg/fig134786.svg +++ b/doc/uml/html-svg/fig134786.svg @@ -1,349 +1,356 @@ - - - - - - - Programmable Shader - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Mobile final public - OpenGL Interfaces - Desktop/Mobile - Common Interfaces - Desktop final public - OpenGL Interfaces - Lifecycle: From the lower right to - the top, left step where the - GLContext is created with a - suitable GL implementation - matching the GLProfile. - Common GL Stuff - - - - - <<interface>> - GL - - - - - - - - <<interface>> - GL4 - - - - - - - - <<interface>> - GL2ES2 - - - - - - - - <<interface>> - GL3 - - - - - - - - <<interface>> - GLES2 - - - - - - - - <<@interface>> - GL4ES3 - - - - - - - - GLContext - - - - - - - - GLDrawable - - - - - - <<metaclass>> - GL2ES3 - - - - - - - GL4bcImpl - - - - - - - GLES3Impl - - - - - - - - <<interface>> - NativeWindow - - - - - - - - AbstractGraphicsConfiguration - - - - - - - - GLCapabilities - - - - - - - - GLProfile - - - - - - - - <<interface>> - GLBase - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <<@interface>> - GLES3 - - - - - - <<interface>> - GL2GL3 - - - - - - - - - - - - - - Capabilities - - - - - - - - - - - - - - - - - - - - <<@interface>> - GL3ES3 - - - - - - - - - - - - - - - - - - - - - - - 0..1 - - - 1 - - - chosen - - - 1 - - - requested - - - 1 - - - 1 - - - 1 - - + + + + + + + Programmable Shader + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <<interface>> + GL + + + + + + + + <<interface>> + GL4 + + + + + + + + <<interface>> + GL2ES2 + + + + + + + + <<interface>> + GL3 + + + + + + + + <<interface>> + GLES2 + + + + + + + + <<@interface>> + GL4ES3 + + + + + + + + GLContext + + + + + + + + GLDrawable + + + + + + <<metaclass>> + GL2ES3 + + + + + + + GL4bcImpl + + + + + + + GLES3Impl + + + + Mobile final public + OpenGL Interfaces + Desktop/Mobile + Common Interfaces + + + + + <<interface>> + NativeWindow + + + + + + + + AbstractGraphicsConfiguration + + + + Desktop final public + OpenGL Interfaces + + + + + GLCapabilities + + + + + + + + GLProfile + + + + Lifecycle: From the lower right to + the top, left step where the + GLContext is created with a + suitable GL implementation + matching the GLProfile. + + + + + <<interface>> + GLBase + + + + Common GL + Stuff + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <<@interface>> + GLES3 + + + + + + <<interface>> + GL2GL3 + + + + + + + + Capabilities + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <<@interface>> + GL3ES3 + + + + + + + + + + + + + + + + + + + + + + + 0..1 + + + 1 + + + chosen + + + 1 + + + requested + + + 1 + + + 1 + + + 1 + + diff --git a/doc/uml/html-svg/index-withframe.html b/doc/uml/html-svg/index-withframe.html index 5d39089b0..a1a0a52cb 100644 --- a/doc/uml/html-svg/index-withframe.html +++ b/doc/uml/html-svg/index-withframe.html @@ -1,24 +1,19 @@ - - + + -C:/projects/JOGAMP/jogl/doc/uml/html-svg/index-withframe +/usr/local/projects/JOGL/jogl/doc/uml/html-svg/index-withframe - - - <body> - <h2>Frame Alert</h2> - <p>This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client.</p> - <p>Link to <a href="index.html">Non-frame version.</a></p> - </body> - - - - - - - - \ No newline at end of file + + + + + + + + +<H2>Frame Alert</H2><P>This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client.<BR>Link to <A HREF="index.html">Non-frame version.</A> + diff --git a/doc/uml/html-svg/index.html b/doc/uml/html-svg/index.html index 9338bd2ef..2cb031be5 100644 --- a/doc/uml/html-svg/index.html +++ b/doc/uml/html-svg/index.html @@ -1,5 +1,5 @@ - + @@ -16,46 +16,262 @@ Documentation - -

Properties:

- + +

Properties:

+

1 Class View javax.media.opengl

- -

+ +

OpenGL Interfaces - All



- -

+ +

OpenGL Interfaces - Core Only



-
Class GL
-
Class GL2ES1
-
Class GLES1
-
Class GL2
-
Class GL2ES2
-
Class GL2GL3
-
Class GL3
-
Class GLES2
-
Class GLContext
-
Class GLDrawable
-
Class GL4bcImpl
-
Class GLES3Impl
-
Class GLES1Impl
-
Class NativeWindow
-
Class AbstractGraphicsConfiguration
-
Class GLCapabilities
-
Class Capabilities
-
Class GLProfile
-
Class GLBase
-
Class GL3bc
-
Class GL4
-
Class GL4bc
-
Class GL2ES12
-
Class GLES3
-
Class GL4ES3
-
Class GL3ES3
-
Metaclass GL2ES3
+ +

1.1 Class GL

+

Declaration :

Directly inherited by : GL2ES1 GL2ES2

+

Stereotype: interface

+
+
+
+
+ +

1.2 Class GL2ES1

+

Declaration :

Directly inherited by : GL2 GL2ES12 GLES1

+

Stereotype: interface

+
+
+
+
+ +

1.3 Class GLES1

+

Declaration :

Directly inherited by : GLES1Impl

+

Stereotype: interface

+
+
+
+
+ +

1.4 Class GL2

+

Declaration :

Directly inherited by : GL3bc GL4bcImpl

+

Stereotype: interface

+
+
+
+
+ +

1.5 Class GL2ES2

+

Declaration :

Directly inherited by : GL2ES12 GL2ES3 GL2GL3 GLES2

+

Stereotype: interface

+
+
+
+
+ +

1.6 Class GL2GL3

+

Declaration :

Directly inherited by : GL2 GL3

+

Stereotype: interface

+
+
+
+
+ +

1.7 Class GL3

+

Declaration :

Directly inherited by : GL3bc GL4 GL4bcImpl

+

Stereotype: interface

+
+
+
+
+ +

1.8 Class GLES2

+

Declaration :

Directly inherited by : GLES3 GLES3Impl

+

Stereotype: interface

+
+
+
+
+ +

1.9 Class GLContext

+

Declaration :

+
+ +
Relation <association>

Declaration :

+
Relation <association>

Declaration :

+
+ +

1.10 Class GLDrawable

+

Declaration :

+
+ +
Relation <association>

Declaration :

+
Relation <association>

Declaration :

+
+ +

1.11 Class GL4bcImpl

+

Declaration :

Stereotype: entity

+
+
+
+
+ +

1.12 Class GLES3Impl

+

Declaration :

Stereotype: entity

+
+
+
+
+ +

1.13 Class GLES1Impl

+

Declaration :

Stereotype: entity

+
+
+
+
+ +

1.14 Class NativeWindow

+

Declaration :

Stereotype: interface

+
+
+ +
Relation <association>

Declaration :

+
Relation <association>

Declaration :

+
+ +

1.15 Class AbstractGraphicsConfiguration

+

Declaration :

+
+ +
Relation chosen (<association>)

Declaration :

+
Relation <association>

Declaration :

+
Relation <association>

Declaration :

+
+ +

1.16 Class GLCapabilities

+

Declaration :

+
+ +
Relation <association>

Declaration :

+
Relation <association>

Declaration :

+
+ +

1.17 Class Capabilities

+

Declaration :

Directly inherited by : GLCapabilities

+
+
+ +
Relation <association>

Declaration :

+
Relation <association>

Declaration :

+
+ +

1.18 Class GLProfile

+

Declaration :

+
+ +
Relation <association>

Declaration :

+
Relation <association>

Declaration :

+
+ +

1.19 Class GLBase

+

Declaration :

Directly inherited by : GL

+

Stereotype: interface

+
+
+ +
Relation <association>

Declaration :

+
+ +

1.20 Class GL3bc

+

Declaration :

Directly inherited by : GL4bc GL4bcImpl

+

Stereotype: interface

+
+
+
+
+ +

1.21 Class GL4

+

Declaration :

Directly inherited by : GL4bc GL4bcImpl

+

Stereotype: interface

+
+
+
+
+ +

1.22 Class GL4bc

+

Declaration :

Directly inherited by : GL4bcImpl

+

Stereotype: interface

+
+
+
+
+ +

1.23 Class GL2ES12

+

Declaration :

Stereotype: entity

+
+
+
+
+ +

1.24 Class GLES3

+

Declaration :

Directly inherited by : GLES3Impl

+

Stereotype: @interface

+
+
+
+
+ +

1.25 Class GL4ES3

+

Declaration :

Directly inherited by : GL4 GLES3

+

Stereotype: @interface

+
+
+
+
+ +

1.26 Class GL3ES3

+

Declaration :

Directly inherited by : GL3 GL4ES3

+

Stereotype: @interface

+
+
+
+
+ +

1.27 Metaclass GL2ES3

+

Declaration :

Directly inherited by : GL2GL3 GL3ES3

+

Stereotype: metaclass

+
+
+
+
diff --git a/doc/uml/html-svg/index_65.html b/doc/uml/html-svg/index_65.html index 3ab96c5b1..9a6dedcaa 100644 --- a/doc/uml/html-svg/index_65.html +++ b/doc/uml/html-svg/index_65.html @@ -1,5 +1,5 @@ - + @@ -16,8 +16,8 @@ - - + +
NameKindDescription
AbstractGraphicsConfigurationclass
NameKindDescription
AbstractGraphicsConfigurationclass
diff --git a/doc/uml/html-svg/index_67.html b/doc/uml/html-svg/index_67.html index 28b39e215..630cc4999 100644 --- a/doc/uml/html-svg/index_67.html +++ b/doc/uml/html-svg/index_67.html @@ -1,5 +1,5 @@ - + @@ -16,9 +16,9 @@ - - - + + +
NameKindDescription
Capabilitiesclass
chosenrelation
NameKindDescription
Capabilitiesclass
chosenrelation
diff --git a/doc/uml/html-svg/index_71.html b/doc/uml/html-svg/index_71.html index 79ae310c8..2f84ff7b7 100644 --- a/doc/uml/html-svg/index_71.html +++ b/doc/uml/html-svg/index_71.html @@ -1,5 +1,5 @@ - + @@ -16,31 +16,31 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + +
NameKindDescription
GLclass
GL2class
GL2ES1class
GL2ES12class
GL2ES2class
GL2ES3class
GL2GL3class
GL3class
GL3bcclass
GL3ES3class
GL4class
GL4bcclass
GL4bcImplclass
GL4ES3class
GLBaseclass
GLCapabilitiesclass
GLContextclass
GLDrawableclass
GLES1class
GLES1Implclass
GLES2class
GLES3class
GLES3Implclass
GLProfileclass
NameKindDescription
GLclass
GL2class
GL2ES1class
GL2ES12class
GL2ES2class
GL2ES3class
GL2GL3class
GL3class
GL3bcclass
GL3ES3class
GL4class
GL4bcclass
GL4bcImplclass
GL4ES3class
GLBaseclass
GLCapabilitiesclass
GLContextclass
GLDrawableclass
GLES1class
GLES1Implclass
GLES2class
GLES3class
GLES3Implclass
GLProfileclass
diff --git a/doc/uml/html-svg/index_74.html b/doc/uml/html-svg/index_74.html index fb85d4b8d..14ff3bec2 100644 --- a/doc/uml/html-svg/index_74.html +++ b/doc/uml/html-svg/index_74.html @@ -1,5 +1,5 @@ - + @@ -16,9 +16,9 @@ - - - + + +
NameKindDescription
javax.media.openglclass view
joglpackage
NameKindDescription
javax.media.openglclass view
joglpackage
diff --git a/doc/uml/html-svg/index_78.html b/doc/uml/html-svg/index_78.html index 3596885f2..3273a2e71 100644 --- a/doc/uml/html-svg/index_78.html +++ b/doc/uml/html-svg/index_78.html @@ -1,5 +1,5 @@ - + @@ -16,8 +16,8 @@ - - + +
NameKindDescription
NativeWindowclass
NameKindDescription
NativeWindowclass
diff --git a/doc/uml/html-svg/index_79.html b/doc/uml/html-svg/index_79.html index 2ebee78c7..dc8c42a44 100644 --- a/doc/uml/html-svg/index_79.html +++ b/doc/uml/html-svg/index_79.html @@ -1,5 +1,5 @@ - + @@ -16,9 +16,9 @@ - - - + + +
NameKindDescription
OpenGL Interfaces - Allclass diagram
OpenGL Interfaces - Core Onlyclass diagram
NameKindDescription
OpenGL Interfaces - Allclass diagram
OpenGL Interfaces - Core Onlyclass diagram
diff --git a/doc/uml/html-svg/index_82.html b/doc/uml/html-svg/index_82.html index a9a799489..c5dcd1dcd 100644 --- a/doc/uml/html-svg/index_82.html +++ b/doc/uml/html-svg/index_82.html @@ -1,5 +1,5 @@ - + @@ -16,8 +16,8 @@ - - + +
NameKindDescription
requestedrelation
NameKindDescription
requestedrelation
diff --git a/doc/uml/html-svg/metaclass135298.html b/doc/uml/html-svg/metaclass135298.html deleted file mode 100644 index f66974887..000000000 --- a/doc/uml/html-svg/metaclass135298.html +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - -Metaclass GL2ES3 - - - - - -
Metaclass GL2ES3
-

- - - - -

Declaration :

Directly inherited by : GL2GL3 GL3ES3

-

Stereotype: metaclass

-
-
- - diff --git a/doc/uml/html-svg/navig.html b/doc/uml/html-svg/navig.html index b49965a99..e4f122334 100644 --- a/doc/uml/html-svg/navig.html +++ b/doc/uml/html-svg/navig.html @@ -1,14 +1,14 @@ - + -C:/projects/JOGAMP/jogl/doc/uml/html-svg/navig +/usr/local/projects/JOGL/jogl/doc/uml/html-svg/navig -
+

-Top- -Classes- -Packages- -Class Diagrams-

diff --git a/doc/uml/html-svg/packages.html b/doc/uml/html-svg/packages.html index e2321047e..61017a207 100644 --- a/doc/uml/html-svg/packages.html +++ b/doc/uml/html-svg/packages.html @@ -1,5 +1,5 @@ - + @@ -16,7 +16,7 @@ - +
jogl
jogl
diff --git a/doc/uml/html/classdiagrams.html b/doc/uml/html/classdiagrams.html index 23fc3fb1b..df3dd93ee 100644 --- a/doc/uml/html/classdiagrams.html +++ b/doc/uml/html/classdiagrams.html @@ -1,5 +1,5 @@ - + @@ -16,8 +16,8 @@ - - + +
OpenGL Interfaces - All
OpenGL Interfaces - Core Only
OpenGL Interfaces - All
OpenGL Interfaces - Core Only
diff --git a/doc/uml/html/classes.html b/doc/uml/html/classes.html index b48298a60..7b4525b84 100644 --- a/doc/uml/html/classes.html +++ b/doc/uml/html/classes.html @@ -1,5 +1,5 @@ - + @@ -16,33 +16,33 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + +
AbstractGraphicsConfiguration
Capabilities
GLinterface
GL2interface
GL2ES1interface
GL2ES12entity
GL2ES2interface
GL2ES3metaclass
GL2GL3interface
GL3interface
GL3bcinterface
GL3ES3@interface
GL4interface
GL4bcinterface
GL4bcImplentity
GL4ES3@interface
GLBaseinterface
GLCapabilities
GLContext
GLDrawable
GLES1interface
GLES1Implentity
GLES2interface
GLES3@interface
GLES3Implentity
GLProfile
NativeWindowinterface
AbstractGraphicsConfiguration
Capabilities
GLinterface
GL2interface
GL2ES1interface
GL2ES12entity
GL2ES2interface
GL2ES3metaclass
GL2GL3interface
GL3interface
GL3bcinterface
GL3ES3@interface
GL4interface
GL4bcinterface
GL4bcImplentity
GL4ES3@interface
GLBaseinterface
GLCapabilities
GLContext
GLDrawable
GLES1interface
GLES1Implentity
GLES2interface
GLES3@interface
GLES3Implentity
GLProfile
NativeWindowinterface
diff --git a/doc/uml/html/classes_list.html b/doc/uml/html/classes_list.html index b01081a03..8d1e417b8 100644 --- a/doc/uml/html/classes_list.html +++ b/doc/uml/html/classes_list.html @@ -1,5 +1,5 @@ - + @@ -17,7 +17,7 @@ -
AbstractGraphicsConfiguration
+		AbstractGraphicsConfiguration
Capabilities
GL
GL2
diff --git a/doc/uml/html/fig128069.png b/doc/uml/html/fig128069.png index b653c71a3..08e08f458 100644 Binary files a/doc/uml/html/fig128069.png and b/doc/uml/html/fig128069.png differ diff --git a/doc/uml/html/fig134786.png b/doc/uml/html/fig134786.png index 78d00c200..70b0f50b9 100644 Binary files a/doc/uml/html/fig134786.png and b/doc/uml/html/fig134786.png differ diff --git a/doc/uml/html/index-withframe.html b/doc/uml/html/index-withframe.html index 7ea3a2866..f3a66480c 100644 --- a/doc/uml/html/index-withframe.html +++ b/doc/uml/html/index-withframe.html @@ -1,24 +1,19 @@ - - + + -C:/projects/JOGAMP/jogl/doc/uml/html/index-withframe +/usr/local/projects/JOGL/jogl/doc/uml/html/index-withframe - - - <body> - <h2>Frame Alert</h2> - <p>This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client.</p> - <p>Link to <a href="index.html">Non-frame version.</a></p> - </body> - - - - - - - - \ No newline at end of file + + + + + + + + +<H2>Frame Alert</H2><P>This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client.<BR>Link to <A HREF="index.html">Non-frame version.</A> + diff --git a/doc/uml/html/index.html b/doc/uml/html/index.html index f5988be1e..2b67bd325 100644 --- a/doc/uml/html/index.html +++ b/doc/uml/html/index.html @@ -1,5 +1,5 @@ - + @@ -16,20 +16,20 @@ Documentation - -

Properties:

    -
  • html dir:
    C:/projects/JOGAMP/jogl/doc/uml/html/
    • -
- + +

Properties:

    +
  • html dir:
    /usr/local/projects/JOGL/jogl/doc/uml/html/

    • +

+

1 Class View javax.media.opengl

- +

OpenGL Interfaces - All



- +

OpenGL Interfaces - Core Only



- +

1.1 Class GL

Declaration :

  • Java : public interface GL extends GLBase
  • Php : public interface GL

Directly inherited by : GL2ES1 GL2ES2

@@ -38,7 +38,7 @@ Documentation
- +

1.2 Class GL2ES1

Declaration :

  • Java : public interface GL2ES1 extends GL
  • Php : public interface GL2ES1

Directly inherited by : GL2 GL2ES12 GLES1

@@ -47,7 +47,7 @@ Documentation
- +

1.3 Class GLES1

Declaration :

  • Java : public interface GLES1 extends GL2ES1
  • Php : public interface GLES1

Directly inherited by : GLES1Impl

@@ -56,7 +56,7 @@ Documentation
- +

1.4 Class GL2

Declaration :

  • Java : public interface GL2 extends GL2GL3
  • Php : public interface GL2

Directly inherited by : GL3bc GL4bcImpl

@@ -65,7 +65,7 @@ Documentation
- +

1.5 Class GL2ES2

Declaration :

  • Java : public interface GL2ES2 extends GL
  • Php : public interface GL2ES2

Directly inherited by : GL2ES12 GL2ES3 GL2GL3 GLES2

@@ -74,7 +74,7 @@ Documentation
- +

1.6 Class GL2GL3

Declaration :

  • Java : public interface GL2GL3 extends GL2ES2
  • Php : public interface GL2GL3

Directly inherited by : GL2 GL3

@@ -83,7 +83,7 @@ Documentation
- +

1.7 Class GL3

Declaration :

  • Java : public interface GL3 extends GL2GL3
  • Php : public interface GL3

Directly inherited by : GL3bc GL4 GL4bcImpl

@@ -92,34 +92,34 @@ Documentation
- +

1.8 Class GLES2

Declaration :

    -
  • Java : public interface GLES2 extends GL2ES2
  • Php : public interface GLES2

Directly inherited by : GLES3Impl

+
  • Java : public interface GLES2 extends GL2ES2
  • Php : public interface GLES2

    • Directly inherited by : GLES3 GLES3Impl

    Stereotype: interface

    - +

    1.9 Class GLContext

    Declaration :

    • Java : package abstract class GLContext
    - -
    Relation <association>

    Declaration :

    + +
    Relation <association>

    Declaration :

    Relation <association>

    Declaration :

    - +

    1.10 Class GLDrawable

    Declaration :

    • Java : package abstract class GLDrawable
    - -
    Relation <association>

    Declaration :

    + +
    Relation <association>

    Declaration :

    Relation <association>

    Declaration :

    - +

    1.11 Class GL4bcImpl

    Declaration :

    Stereotype: entity

    @@ -127,7 +127,7 @@ Documentation
    - +

    1.12 Class GLES3Impl

    Declaration :

    • Java : private class GLES3Impl extends GLES3 implements GLES2

    Stereotype: entity

    @@ -135,7 +135,7 @@ Documentation
    - +

    1.13 Class GLES1Impl

    Declaration :

    • Java : private class GLES1Impl implements GLES1

    Stereotype: entity

    @@ -143,65 +143,65 @@ Documentation
    - +

    1.14 Class NativeWindow

    Declaration :

    • Java : package interface NativeWindow
    • Php : interface NativeWindow

    Stereotype: interface

    - -
    Relation <association>

    Declaration :

    + +
    Relation <association>

    Declaration :

    Relation <association>

    Declaration :

    - +

    1.15 Class AbstractGraphicsConfiguration

    Declaration :

    • Java : package abstract class AbstractGraphicsConfiguration
    - -
    Relation chosen (<association>)

    Declaration :

    -
    Relation <association>

    Declaration :

    + +
    Relation chosen (<association>)

    Declaration :

    +
    Relation <association>

    Declaration :

    Relation <association>

    Declaration :

    - +

    1.16 Class GLCapabilities

    Declaration :

    - -
    Relation <association>

    Declaration :

    + +
    Relation <association>

    Declaration :

    Relation <association>

    Declaration :

    - +

    1.17 Class Capabilities

    Declaration :

    • Java : package class Capabilities

    Directly inherited by : GLCapabilities

    - -
    Relation <association>

    Declaration :

    + +
    Relation <association>

    Declaration :

    Relation <association>

    Declaration :

    - +

    1.18 Class GLProfile

    Declaration :

    • Java : package class GLProfile
    - -
    Relation <association>

    Declaration :

    + +
    Relation <association>

    Declaration :

    Relation <association>

    Declaration :

    - +

    1.19 Class GLBase

    Declaration :

    • Java : public interface GLBase
    • Php : public interface GLBase

    Directly inherited by : GL

    Stereotype: interface

    - +
    Relation <association>

    Declaration :

    - +

    1.20 Class GL3bc

    Declaration :

    • Java : package interface GL3bc extends GL2
    • Php : interface GL3bc

    Directly inherited by : GL4bc GL4bcImpl

    @@ -210,7 +210,7 @@ Documentation
    - +

    1.21 Class GL4

    Declaration :

    • Java : package interface GL4 extends GL3
    • Php : interface GL4

    Directly inherited by : GL4bc GL4bcImpl

    @@ -219,7 +219,7 @@ Documentation
    - +

    1.22 Class GL4bc

    Declaration :

    • Java : package interface GL4bc extends GL3bc
    • Php : interface GL4bc

    Directly inherited by : GL4bcImpl

    @@ -228,7 +228,7 @@ Documentation
    - +

    1.23 Class GL2ES12

    Declaration :

    Stereotype: entity

    @@ -236,34 +236,34 @@ Documentation
    - +

    1.24 Class GLES3

    Declaration :

    • Java : public @interface GLES3 extends GL4ES3

    Directly inherited by : GLES3Impl

    -

    Stereotype: @interface

    +

    Stereotype: @interface

    - +

    1.25 Class GL4ES3

    Declaration :

    • Java : public @interface GL4ES3 extends GL3ES3

    Directly inherited by : GL4 GLES3

    -

    Stereotype: @interface

    +

    Stereotype: @interface

    - +

    1.26 Class GL3ES3

    Declaration :

    • Java : public @interface GL3ES3 extends GL2ES3

    Directly inherited by : GL3 GL4ES3

    -

    Stereotype: @interface

    +

    Stereotype: @interface

    - +

    1.27 Metaclass GL2ES3

    Declaration :

    • Java : package @interface GL2ES3

    Directly inherited by : GL2GL3 GL3ES3

    diff --git a/doc/uml/html/index_65.html b/doc/uml/html/index_65.html index ea5554d1a..12cff3a70 100644 --- a/doc/uml/html/index_65.html +++ b/doc/uml/html/index_65.html @@ -1,5 +1,5 @@ - + @@ -16,8 +16,8 @@ - - + +
    NameKindDescription
    AbstractGraphicsConfigurationclass
    NameKindDescription
    AbstractGraphicsConfigurationclass
    diff --git a/doc/uml/html/index_67.html b/doc/uml/html/index_67.html index 9e6c1eebb..6c276a1e2 100644 --- a/doc/uml/html/index_67.html +++ b/doc/uml/html/index_67.html @@ -1,5 +1,5 @@ - + @@ -16,9 +16,9 @@ - - - + + +
    NameKindDescription
    Capabilitiesclass
    chosenrelation
    NameKindDescription
    Capabilitiesclass
    chosenrelation
    diff --git a/doc/uml/html/index_71.html b/doc/uml/html/index_71.html index 0e03401db..40ba063ac 100644 --- a/doc/uml/html/index_71.html +++ b/doc/uml/html/index_71.html @@ -1,5 +1,5 @@ - + @@ -16,31 +16,31 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + +
    NameKindDescription
    GLclass
    GL2class
    GL2ES1class
    GL2ES12class
    GL2ES2class
    GL2ES3class
    GL2GL3class
    GL3class
    GL3bcclass
    GL3ES3class
    GL4class
    GL4bcclass
    GL4bcImplclass
    GL4ES3class
    GLBaseclass
    GLCapabilitiesclass
    GLContextclass
    GLDrawableclass
    GLES1class
    GLES1Implclass
    GLES2class
    GLES3class
    GLES3Implclass
    GLProfileclass
    NameKindDescription
    GLclass
    GL2class
    GL2ES1class
    GL2ES12class
    GL2ES2class
    GL2ES3class
    GL2GL3class
    GL3class
    GL3bcclass
    GL3ES3class
    GL4class
    GL4bcclass
    GL4bcImplclass
    GL4ES3class
    GLBaseclass
    GLCapabilitiesclass
    GLContextclass
    GLDrawableclass
    GLES1class
    GLES1Implclass
    GLES2class
    GLES3class
    GLES3Implclass
    GLProfileclass
    diff --git a/doc/uml/html/index_74.html b/doc/uml/html/index_74.html index fc3b5bd36..9a970333e 100644 --- a/doc/uml/html/index_74.html +++ b/doc/uml/html/index_74.html @@ -1,5 +1,5 @@ - + @@ -16,9 +16,9 @@ - - - + + +
    NameKindDescription
    javax.media.openglclass view
    joglpackage
    NameKindDescription
    javax.media.openglclass view
    joglpackage
    diff --git a/doc/uml/html/index_78.html b/doc/uml/html/index_78.html index f9ce21fbe..4165af58c 100644 --- a/doc/uml/html/index_78.html +++ b/doc/uml/html/index_78.html @@ -1,5 +1,5 @@ - + @@ -16,8 +16,8 @@ - - + +
    NameKindDescription
    NativeWindowclass
    NameKindDescription
    NativeWindowclass
    diff --git a/doc/uml/html/index_79.html b/doc/uml/html/index_79.html index 24a23e21f..751a36ac9 100644 --- a/doc/uml/html/index_79.html +++ b/doc/uml/html/index_79.html @@ -1,5 +1,5 @@ - + @@ -16,9 +16,9 @@ - - - + + +
    NameKindDescription
    OpenGL Interfaces - Allclass diagram
    OpenGL Interfaces - Core Onlyclass diagram
    NameKindDescription
    OpenGL Interfaces - Allclass diagram
    OpenGL Interfaces - Core Onlyclass diagram
    diff --git a/doc/uml/html/index_82.html b/doc/uml/html/index_82.html index fbd61acca..984d8bf45 100644 --- a/doc/uml/html/index_82.html +++ b/doc/uml/html/index_82.html @@ -1,5 +1,5 @@ - + @@ -16,8 +16,8 @@ - - + +
    NameKindDescription
    requestedrelation
    NameKindDescription
    requestedrelation
    diff --git a/doc/uml/html/navig.html b/doc/uml/html/navig.html index 66c16e873..7416879d2 100644 --- a/doc/uml/html/navig.html +++ b/doc/uml/html/navig.html @@ -1,14 +1,14 @@ - + -C:/projects/JOGAMP/jogl/doc/uml/html/navig +/usr/local/projects/JOGL/jogl/doc/uml/html/navig -
    +

    -Top- -Classes- -Packages- -Class Diagrams-

    diff --git a/doc/uml/html/packages.html b/doc/uml/html/packages.html index c3f7af43f..50e1a6d9f 100644 --- a/doc/uml/html/packages.html +++ b/doc/uml/html/packages.html @@ -1,5 +1,5 @@ - + @@ -16,7 +16,7 @@ - +
    jogl
    jogl
    diff --git a/doc/uml/jogl/128069.diagram b/doc/uml/jogl/128069.diagram index 757594823..b0ab78b76 100644 --- a/doc/uml/jogl/128069.diagram +++ b/doc/uml/jogl/128069.diagram @@ -1,137 +1,137 @@ -format 75 +format 74 classcanvas 128002 class_ref 128002 // GL3bc draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode class drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 195.8 800.5 2000 + xyz 188.4 856.7 2000 end classcanvas 128069 class_ref 128069 // GL draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode class drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 142.4 112.6 2000 + xyz 163.4 116 2000 end classcanvas 128130 class_ref 128130 // GL4 draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode class drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 764.5 928.4 2000 + xyz 786.7 985.3 2000 end classcanvas 128197 class_ref 128197 // GL2ES1 draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode class drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 40.6 226.8 2000 + xyz 59 234.4 2000 end classcanvas 128258 class_ref 128258 // GL4bc draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode class drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 195.8 928.9 2000 + xyz 188.4 985.6 2000 end classcanvas 128325 class_ref 128325 // GLES1 draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode class drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 40 480.3 2000 + xyz 59.4 492.3 2000 end classcanvas 128453 class_ref 128453 // GL2 draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode class drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 195.3 691.3 2000 + xyz 188.9 746 2000 end classcanvas 128581 class_ref 128581 // GL2ES2 draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode class drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 274 227.1 2000 + xyz 294.9 235.5 2000 end classcanvas 128709 class_ref 128709 // GL2GL3 draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode class drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 428.4 389.7 2005 + xyz 447.2 397.7 2005 end classcanvas 128837 class_ref 128837 // GL3 draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode class drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 595.5 800 2000 + xyz 615.2 856.2 2000 end classcanvas 128965 class_ref 128965 // GLES2 draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode class drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 274 480.5 2000 + xyz 294.9 489.6 2000 end classcanvas 130050 class_ref 134914 // GLES3 draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 669.3 480.6 2004 + xyz 709.2 569.5 2004 end classcanvas 130178 class_ref 135042 // GL4ES3 draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 757 305.5 2000 + xyz 779 313.3 2000 end classcanvas 130245 class_ref 130117 // GLContext draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 422.4 23.7 2000 + xyz 437.1 19.1 2000 end classcanvas 130434 class_ref 135170 // GL3ES3 draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 588.5 273 2009 + xyz 610.8 282.6 2009 end classcanvas 130501 class_ref 130245 // GLDrawable draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 686.2 105.3 2000 + xyz 713.9 91.2 2000 end classcanvas 130690 class_ref 135298 // GL2ES3 draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default color transparent - xyz 423.5 250.8 2000 + xyz 444.3 258 2000 end classcanvas 130885 class_ref 130501 // GL4bcImpl draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 436.2 1048.8 2000 + xyz 452.1 1088.4 2000 end classcanvas 131141 class_ref 130757 // GLES1Impl draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 46 574.6 2005 + xyz 67.4 578.2 2005 end classcanvas 131202 class_ref 130629 // GLES3Impl draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 682.7 575.1 2000 + xyz 724.9 656.8 2000 end textcanvas 131781 "Desktop final public OpenGL Interfaces " - xyzwh 820.5 664 2000 135 37 + xyzwh 851.5 718.6 2000 139 48 textcanvas 131909 "Mobile final public OpenGL Interfaces" - xyzwh 820 522 2000 125 38 + xyzwh 851.1 490.8 2000 125 38 textcanvas 132037 "Private implementation (detail)" - xyzwh 17 1072 2000 178 18 + xyzwh 17.5 1095.8 2000 178 18 textcanvas 132165 "Desktop/Mobile Common Interfaces" - xyzwh 819.5 242 2000 129 42 + xyzwh 851.5 206.6 2000 129 42 classcanvas 132293 class_ref 130885 // NativeWindow draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode class drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 1021.8 200.8 2000 + xyz 1052.2 170 2000 end classcanvas 132421 class_ref 131013 // AbstractGraphicsConfiguration draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 972.2 295.8 2000 + xyz 994.6 261.2 2000 end classcanvas 132549 class_ref 131141 // GLCapabilities draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 1019.6 478.9 2000 + xyz 1051 444.7 2000 end classcanvas 132677 class_ref 131269 // Capabilities draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 1028.1 395.5 2005 + xyz 1061 361.9 2005 end classcanvas 132805 class_ref 131397 // GLProfile draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 1036.8 582.6 2000 + xyz 1069.2 548.6 2000 end textcanvas 135749 "Lifecycle: From the lower right to the top, left step where the GLContext is created with a suitable GL implementation matching the GLProfile." - xyzwh 781 16 2000 208 93 + xyzwh 845.2 10.6 2000 208 93 classcanvas 135877 class_ref 132549 // GLBase draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode class drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 144 12.6 2000 + xyz 164.9 7.5 2000 end textcanvas 136261 "Common GL Stuff" - xyzwh 271 135.5 2000 108 17 + xyzwh 271.2 135.4 2000 108 17 fragment 136517 "Programmable Shader" - color blue xyzwh 236.4 195.8 1994 709 972 - separator 2748 - separator 4543 - separator 1893 + color blue xyzwh 237.5 195.6 1994 744 972 + separator 2892 + separator 5265 + separator 2006 end fragment 136645 "Fixed Function" - color lightgray xyzwh 2 195.8 1989 236 972 - separator 2746 - separator 4546 - separator 1888 + color lightgray xyzwh 2.7 195.6 1989 236 972 + separator 2890 + separator 5270 + separator 2001 end textcanvas 136773 "Common Desktop Profile" - xyzwh 820.5 402.5 2000 115 39 + xyzwh 851.1 401.6 2000 115 39 relationcanvas 128386 relation_ref 128002 // from ref 130885 z 2001 to ref 128002 no_role_a no_role_b @@ -225,7 +225,7 @@ end relationcanvas 130629 relation_ref 130501 // from ref 130501 z 1999 to ref 130245 no_role_a no_role_b - multiplicity_a_pos 514 67 3000 multiplicity_b_pos 660 122 3000 + multiplicity_a_pos 533 61 3000 multiplicity_b_pos 694 110 3000 end relationcanvas 130818 relation_ref 136066 // from ref 130434 z 2010 to ref 130690 @@ -272,6 +272,11 @@ relationcanvas 132226 relation_ref 137218 // no_role_a no_role_b no_multiplicity_a no_multiplicity_b end +relationcanvas 132354 relation_ref 143746 // + from ref 130050 z 2005 to ref 128965 + no_role_a no_role_b + no_multiplicity_a no_multiplicity_b +end relationcanvas 132933 relation_ref 131141 // from ref 132549 z 1999 to ref 132677 no_role_a no_role_b @@ -281,8 +286,8 @@ relationcanvas 133061 relation_ref 131269 // decenter_begin 326 decenter_end 104 from ref 132421 z 1999 to ref 132677 - role_a_pos 1043 373 3000 no_role_b - multiplicity_a_pos 1015 373 3000 no_multiplicity_b + role_a_pos 1080 336 3000 no_role_b + multiplicity_a_pos 1052 336 3000 no_multiplicity_b end relationcanvas 133701 relation_ref 131525 // decenter_begin 493 @@ -304,8 +309,8 @@ relationcanvas 134213 relation_ref 131397 // decenter_begin 814 decenter_end 625 from ref 132677 z 1999 to ref 132421 - no_role_a role_b_pos 1115 373 3000 - no_multiplicity_a multiplicity_b_pos 1080 373 3000 + no_role_a role_b_pos 1146 336 3000 + no_multiplicity_a multiplicity_b_pos 1118 336 3000 end relationcanvas 134725 relation_ref 131781 // from ref 132805 z 1999 to ref 132549 @@ -320,6 +325,6 @@ end relationcanvas 136133 relation_ref 133189 // from ref 135877 z 1999 to ref 130245 no_role_a no_role_b - multiplicity_a_pos 397 51 3000 multiplicity_b_pos 248 51 3000 + multiplicity_a_pos 418 49 3000 multiplicity_b_pos 272 49 3000 end end diff --git a/doc/uml/jogl/134786.diagram b/doc/uml/jogl/134786.diagram index eaac88d82..ea3909cc2 100644 --- a/doc/uml/jogl/134786.diagram +++ b/doc/uml/jogl/134786.diagram @@ -1,104 +1,104 @@ -format 75 +format 74 classcanvas 128069 class_ref 128069 // GL draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode class drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 143.8 112.2 2000 + xyz 162.3 120.7 2000 end classcanvas 128130 class_ref 128130 // GL4 draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode class drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 642.5 851.8 2000 + xyz 664.1 879.8 2000 end classcanvas 128581 class_ref 128581 // GL2ES2 draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode class drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 143 238.2 2000 + xyz 162.5 246.7 2000 end classcanvas 128709 class_ref 128709 // GL2GL3 draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode class drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default color transparent - xyz 298.6 414.4 2005 + xyz 317.6 413.1 2005 end classcanvas 128837 class_ref 128837 // GL3 draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode class drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 462.8 708 2000 + xyz 481.8 774.1 2000 end classcanvas 128965 class_ref 128965 // GLES2 draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode class drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 143 506.5 2000 + xyz 162.5 500.2 2000 end classcanvas 130050 class_ref 134914 // GLES3 draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 537.9 508.6 2004 + xyz 581.8 586.1 2004 end classcanvas 130178 class_ref 135042 // GL4ES3 draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 635 316 2000 + xyz 657.5 324.5 2000 end classcanvas 130245 class_ref 130117 // GLContext draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 422.4 23.6 2000 + xyz 436.9 27.6 2000 end classcanvas 130434 class_ref 135170 // GL3ES3 draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 456.8 284.9 2009 + xyz 474.8 292.4 2009 end classcanvas 130501 class_ref 130245 // GLDrawable draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 686.9 105.8 2000 + xyz 703.9 109.8 2000 end classcanvas 130690 class_ref 135298 // GL2ES3 draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default color transparent - xyz 292 261.2 2000 + xyz 312.3 269.2 2000 end classcanvas 130885 class_ref 130501 // GL4bcImpl draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 652.3 966.6 2000 + xyz 672.3 990.3 2000 end classcanvas 131202 class_ref 130629 // GLES3Impl draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 552 586 2000 + xyz 596.1 689.3 2000 end textcanvas 131909 "Mobile final public OpenGL Interfaces" - xyzwh 817 530 2000 153 42 + xyzwh 817.8 496.2 2000 153 42 textcanvas 132165 "Desktop/Mobile Common Interfaces" - xyzwh 817 257 2000 139 49 + xyzwh 817.4 215.1 2000 139 49 classcanvas 132293 class_ref 130885 // NativeWindow draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode class drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 1021.7 200.8 2000 + xyz 1040.2 208.3 2000 end fragment 132354 "Programmable Shader" - color blue xyzwh 10 206.8 1994 940 836 - separator 5296 + color blue xyzwh 9.5 206.8 1994 940 836 + separator 6384 separator 3351 - separator 2308 + separator 2367 end classcanvas 132421 class_ref 131013 // AbstractGraphicsConfiguration draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 972.1 295.3 2000 + xyz 982.2 299.3 2000 end textcanvas 132482 "Desktop final public OpenGL Interfaces " - xyzwh 817 681 2000 135 37 + xyzwh 817 749.1 2000 135 37 classcanvas 132549 class_ref 131141 // GLCapabilities draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 1019.9 478.3 2000 + xyz 1039.4 482.8 2000 end classcanvas 132677 class_ref 131269 // Capabilities draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 1028.4 395 2005 + xyz 1049.4 399 2005 end classcanvas 132805 class_ref 131397 // GLProfile draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 1036.4 581.1 2000 + xyz 1057.5 585.1 2000 end textcanvas 135749 "Lifecycle: From the lower right to the top, left step where the GLContext is created with a suitable GL implementation matching the GLProfile." - xyzwh 782 16 2000 208 93 + xyzwh 853.9 16 2000 208 93 classcanvas 135877 class_ref 132549 // GLBase draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode class drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 143.9 12.2 2000 + xyz 162.4 15.7 2000 end textcanvas 136261 "Common GL Stuff" - xyzwh 271 135 2000 108 17 + xyzwh 271 135.5 2000 108 17 relationcanvas 128770 relation_ref 128386 // decenter_begin 479 from ref 130885 z 2001 to ref 128130 @@ -138,7 +138,7 @@ end relationcanvas 130629 relation_ref 130501 // from ref 130501 z 1999 to ref 130245 no_role_a no_role_b - multiplicity_a_pos 514 67 3000 multiplicity_b_pos 660 122 3000 + multiplicity_a_pos 532 72 3000 multiplicity_b_pos 684 126 3000 end relationcanvas 130818 relation_ref 136066 // from ref 130434 z 2010 to ref 130690 @@ -180,6 +180,11 @@ relationcanvas 132226 relation_ref 137218 // no_role_a no_role_b no_multiplicity_a no_multiplicity_b end +relationcanvas 132610 relation_ref 143746 // + from ref 130050 z 2005 to ref 128965 + no_role_a no_role_b + no_multiplicity_a no_multiplicity_b +end relationcanvas 132933 relation_ref 131141 // from ref 132549 z 1999 to ref 132677 no_role_a no_role_b @@ -189,8 +194,8 @@ relationcanvas 133061 relation_ref 131269 // decenter_begin 326 decenter_end 104 from ref 132421 z 1999 to ref 132677 - role_a_pos 1043 373 3000 no_role_b - multiplicity_a_pos 1015 373 3000 no_multiplicity_b + role_a_pos 1068 374 3000 no_role_b + multiplicity_a_pos 1040 374 3000 no_multiplicity_b end relationcanvas 133701 relation_ref 131525 // decenter_begin 493 @@ -212,8 +217,8 @@ relationcanvas 134213 relation_ref 131397 // decenter_begin 814 decenter_end 625 from ref 132677 z 1999 to ref 132421 - no_role_a role_b_pos 1115 373 3000 - no_multiplicity_a multiplicity_b_pos 1080 373 3000 + no_role_a role_b_pos 1134 374 3000 + no_multiplicity_a multiplicity_b_pos 1106 374 3000 end relationcanvas 134725 relation_ref 131781 // from ref 132805 z 1999 to ref 132549 @@ -228,6 +233,6 @@ end relationcanvas 136133 relation_ref 133189 // from ref 135877 z 1999 to ref 130245 no_role_a no_role_b - multiplicity_a_pos 397 51 3000 multiplicity_b_pos 248 51 3000 + multiplicity_a_pos 417 57 3000 multiplicity_b_pos 270 57 3000 end end diff --git a/doc/uml/jogl/2.session b/doc/uml/jogl/2.session index d8aaad531..f2e91bf06 100644 --- a/doc/uml/jogl/2.session +++ b/doc/uml/jogl/2.session @@ -1,16 +1,15 @@ -window_sizes 1898 1332 450 1344 884 38 +window_sizes 1920 1060 450 1464 982 0 +windows_style diagrams - active classdiagram_ref 128069 // OpenGL Interfaces - All - 1442 1217 100 17 0 0 - classdiagram_ref 134786 // OpenGL Interfaces - Core Only - 1149 974 100 17 0 0 + classdiagram_ref 128069 // OpenGL Interfaces - All + 1463 849 100 17 253 0 + active classdiagram_ref 134786 // OpenGL Interfaces - Core Only + 1464 982 100 17 0 0 end show_stereotypes selected package_ref 129 // jogl open - class_ref 128837 // GL3 - class_ref 130501 // GL4bcImpl - class_ref 130629 // GLES3Impl + class_ref 134914 // GLES3 end end diff --git a/doc/uml/jogl/generation_settings b/doc/uml/jogl/generation_settings index e66b84528..6e7065d11 100644 --- a/doc/uml/jogl/generation_settings +++ b/doc/uml/jogl/generation_settings @@ -110,7 +110,7 @@ ${items} cpp_default_operation_definition "${comment}${inline}${type} ${class}::${name}${(}${)}${const}${volatile}${throw}${staticnl}{ ${body}} " - cpp_indent_visibility " "java_default_src_content "${comment} + java_default_src_content "${comment} ${package} ${imports} ${definition}" diff --git a/doc/uml/jogl/jogl.prj b/doc/uml/jogl/jogl.prj index 8efc4be70..3e64cb449 100644 --- a/doc/uml/jogl/jogl.prj +++ b/doc/uml/jogl/jogl.prj @@ -1,7 +1,7 @@ -format 75 +format 74 "jogl" - revision 14 - modified_by 2 "sven" + revision 15 + modified_by 2 "qun" @@ -31,15 +31,13 @@ format 75 show_infonote yes drawing_language uml show_stereotype_properties no class_color yellow duration_color transparent continuation_color gray note_color blue fragment_color transparent subject_color transparent usecase_color yellow package_color transparent component_color green artifact_color green deploymentnode_color gray state_color yellow stateaction_color transparent activity_color transparent activityregion_color transparent activitypartition_color transparent activityaction_color transparent parameterpin_color white - font_size 10 + font_size 7 diagram_format A4 - image_root_dir "" - mark_for_import ncouples 1 - key "html dir" value "C:/projects/JOGAMP/jogl/doc/uml/html-svg/" + key "html dir" value "/usr/local/projects/JOGL/jogl/doc/uml/html/" classview 128069 "javax.media.opengl" //class diagram settings draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default @@ -764,6 +762,14 @@ ${members}} classrelation_ref 135810 // b parent class_ref 135042 // GL4ES3 end + + classrelation 143746 // + relation 143746 ---|> + a public + java "${type}" + classrelation_ref 143746 // + b parent class_ref 128965 // GLES2 + end end class 135042 "GL4ES3" -- cgit v1.2.3