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/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 +- 16 files changed, 153 insertions(+), 158 deletions(-) (limited to 'doc/uml/html') 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
GL	interface
GL2	interface
GL2ES1	interface
GL2ES12	entity
GL2ES2	interface
GL2ES3	metaclass
GL2GL3	interface
GL3	interface
GL3bc	interface
GL3ES3	@interface
GL4	interface
GL4bc	interface
GL4bcImpl	entity
GL4ES3	@interface
GLBase	interface
GLCapabilities
GLContext
GLDrawable
GLES1	interface
GLES1Impl	entity
GLES2	interface
GLES3	@interface
GLES3Impl	entity
GLProfile
NativeWindow	interface
AbstractGraphicsConfiguration
Capabilities
GL	interface
GL2	interface
GL2ES1	interface
GL2ES12	entity
GL2ES2	interface
GL2ES3	metaclass
GL2GL3	interface
GL3	interface
GL3bc	interface
GL3ES3	@interface
GL4	interface
GL4bc	interface
GL4bcImpl	entity
GL4ES3	@interface
GLBase	interface
GLCapabilities
GLContext
GLDrawable
GLES1	interface
GLES1Impl	entity
GLES2	interface
GLES3	@interface
GLES3Impl	entity
GLProfile
NativeWindow	interface

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 :

Uml : - : GLDrawable, multiplicity : 1
Java : private GLDrawable

+ +

Relation <association>

Declaration :

Uml : - : GLDrawable, multiplicity : 1
Java : private GLDrawable

Relation <association>

Declaration :

Uml : - : GLBase, multiplicity : 1
Java : private GLBase

- +

1.10 Class GLDrawable

Declaration :

Java : package abstract class GLDrawable

- -

Relation <association>

Declaration :

Uml : - : GLContext, multiplicity : 0..1
Java : private GLContext

+ +

Relation <association>

Declaration :

Uml : - : GLContext, multiplicity : 0..1
Java : private GLContext

Relation <association>

Declaration :

Uml : - : NativeWindow
Java : private NativeWindow

- +

1.11 Class GL4bcImpl

Declaration :

Java : private class GL4bcImpl implements GL3, GL3bc, GL4bc, GL2, GL4

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 :

Uml : - : AbstractGraphicsConfiguration
Java : private AbstractGraphicsConfiguration

+ +

Relation <association>

Declaration :

Uml : - : AbstractGraphicsConfiguration
Java : private AbstractGraphicsConfiguration

Relation <association>

Declaration :

Uml : - : GLDrawable
Java : private GLDrawable

- +

1.15 Class AbstractGraphicsConfiguration

Declaration :

Java : package abstract class AbstractGraphicsConfiguration

- -

Relation chosen (<association>)

Declaration :

Uml : - chosen : Capabilities, multiplicity : 1
Java : private Capabilities chosen

-

Relation <association>

Declaration :

Uml : - requested : Capabilities, multiplicity : 1
Java : private Capabilities requested

+ +

Relation chosen (<association>)

Declaration :

Uml : - chosen : Capabilities, multiplicity : 1
Java : private Capabilities chosen

+

Relation <association>

Declaration :

Uml : - requested : Capabilities, multiplicity : 1
Java : private Capabilities requested

Relation <association>

Declaration :

Uml : - : NativeWindow
Java : private NativeWindow

- +

1.16 Class GLCapabilities

Declaration :

Java : package class GLCapabilities extends Capabilities

- -

Relation <association>

Declaration :

Uml : - : GLProfile
Java : private GLProfile

+ +

Relation <association>

Declaration :

Uml : - : GLProfile
Java : private GLProfile

Relation <association>

Declaration :

Uml : - : GLProfile
Java : private GLProfile

- +

1.17 Class Capabilities

Declaration :

Java : package class Capabilities

Directly inherited by : GLCapabilities

- -

Relation <association>

Declaration :

Uml : - : AbstractGraphicsConfiguration
Java : private AbstractGraphicsConfiguration

+ +

Relation <association>

Declaration :

Uml : - : AbstractGraphicsConfiguration
Java : private AbstractGraphicsConfiguration

Relation <association>

Declaration :

Uml : - : AbstractGraphicsConfiguration
Java : private AbstractGraphicsConfiguration

- +

1.18 Class GLProfile

Declaration :

Java : package class GLProfile

- -

Relation <association>

Declaration :

Uml : - : GLCapabilities
Java : private GLCapabilities

+ +

Relation <association>

Declaration :

Uml : - : GLCapabilities
Java : private GLCapabilities

Relation <association>

Declaration :

Uml : - : GLCapabilities
Java : private GLCapabilities

- +

1.19 Class GLBase

Declaration :

Java : public interface GLBase
Php : public interface GLBase

Directly inherited by : GL

Stereotype: interface

- +

Relation <association>

Declaration :

Uml : - : GLContext, multiplicity : 1
Java : private GLContext

- +

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 :

Java : package class GL2ES12 implements GL2ES1, GL2ES2

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 @@ - - + +

Name	Kind	Description
AbstractGraphicsConfiguration	class
Name	Kind	Description
AbstractGraphicsConfiguration	class

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 @@ - - - + + +

Name	Kind	Description
Capabilities	class
chosen	relation
Name	Kind	Description
Capabilities	class
chosen	relation

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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + +

Name	Kind	Description
GL	class
GL2	class
GL2ES1	class
GL2ES12	class
GL2ES2	class
GL2ES3	class
GL2GL3	class
GL3	class
GL3bc	class
GL3ES3	class
GL4	class
GL4bc	class
GL4bcImpl	class
GL4ES3	class
GLBase	class
GLCapabilities	class
GLContext	class
GLDrawable	class
GLES1	class
GLES1Impl	class
GLES2	class
GLES3	class
GLES3Impl	class
GLProfile	class
Name	Kind	Description
GL	class
GL2	class
GL2ES1	class
GL2ES12	class
GL2ES2	class
GL2ES3	class
GL2GL3	class
GL3	class
GL3bc	class
GL3ES3	class
GL4	class
GL4bc	class
GL4bcImpl	class
GL4ES3	class
GLBase	class
GLCapabilities	class
GLContext	class
GLDrawable	class
GLES1	class
GLES1Impl	class
GLES2	class
GLES3	class
GLES3Impl	class
GLProfile	class

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 @@ - - - + + +

Name	Kind	Description
javax.media.opengl	class view
jogl	package
Name	Kind	Description
javax.media.opengl	class view
jogl	package

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 @@ - - + +

Name	Kind	Description
NativeWindow	class
Name	Kind	Description
NativeWindow	class

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 @@ - - - + + +

Name	Kind	Description
OpenGL Interfaces - All	class diagram
OpenGL Interfaces - Core Only	class diagram
Name	Kind	Description
OpenGL Interfaces - All	class diagram
OpenGL Interfaces - Core Only	class 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 @@ - - + +

Name	Kind	Description
requested	relation
Name	Kind	Description
requested	relation

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

-- cgit v1.2.3