From d13c2d71b2fca5b4d86a2e437b415afc04a35bdb Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Thu, 18 Jul 2013 13:45:43 +0200 Subject: UML Doc: Fix separator .. --- doc/uml/html-svg/fig128069.svg | 322 ++++++++++++++++++++--------------------- doc/uml/html-svg/fig134786.svg | 194 ++++++++++++------------- doc/uml/html-svg/index.html | 2 +- doc/uml/html/fig128069.png | Bin 51517 -> 51205 bytes doc/uml/jogl/128069.diagram | 72 ++++----- doc/uml/jogl/jogl.prj | 2 +- 6 files changed, 296 insertions(+), 296 deletions(-) (limited to 'doc') diff --git a/doc/uml/html-svg/fig128069.svg b/doc/uml/html-svg/fig128069.svg index 8eeb12069..942a34f81 100755 --- a/doc/uml/html-svg/fig128069.svg +++ b/doc/uml/html-svg/fig128069.svg @@ -1,7 +1,7 @@ - + Fixed Function @@ -10,10 +10,10 @@ - + - + @@ -35,7 +35,7 @@ - + @@ -47,10 +47,10 @@ - - - - + + + + @@ -58,18 +58,6 @@ - - - - - - - - - - - - @@ -83,37 +71,49 @@ - - - - + + + + - + - - - - + + + + - + + + + + + + + + + + + + - + - + - + @@ -152,31 +152,31 @@ - - - - <<interface>> - GL2ES1 - - + + + + <<interface>> + GL2ES1 + + - - - - <<interface>> - GL4bc - - + + + + <<interface>> + GL4bc + + - - - - <<interface>> - GLES1 - - + + + + <<interface>> + GLES1 + + @@ -214,46 +214,44 @@ - Desktop final public - OpenGL Interfaces - - - - <<@interface>> - GL4ES3 - - + + + + <<@interface>> + GL4ES3 + + - - - - GLContext - - + + + + GLContext + + - - - - GLDrawable - - + + + + GLDrawable + + - - <<metaclass>> - GL2ES3 - - + + <<metaclass>> + GL2ES3 + + - - - GL4bcImpl - - + + + GL4bcImpl + + @@ -272,28 +270,28 @@ - - - - AbstractGraphicsConfiguration - - + + + + AbstractGraphicsConfiguration + + - - - - GLCapabilities - - + + + + GLCapabilities + + - - - - GLProfile - - + + + + GLProfile + + @@ -304,41 +302,43 @@ - Mobile final public - OpenGL Interfaces + 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 + 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 - + - - - - + + + + - - - - + + + + - + @@ -362,7 +362,7 @@ - + @@ -374,10 +374,16 @@ - - - - + + + + + + + + + + @@ -385,12 +391,6 @@ - - - - - - @@ -410,19 +410,25 @@ - - - GLES1Impl - - + + + GLES1Impl + + + + + + + + Capabilities + + - - - - Capabilities - - + + + + @@ -431,16 +437,10 @@ - - - - - - - - - - + + + + @@ -470,25 +470,25 @@ - 0..1 + 1 - 1 + 1 - requested + 1 - 1 + 0..1 - 1 + requested - 1 + 1 - 1 + 1 chosen diff --git a/doc/uml/html-svg/fig134786.svg b/doc/uml/html-svg/fig134786.svg index eda938327..e193a4ed4 100755 --- a/doc/uml/html-svg/fig134786.svg +++ b/doc/uml/html-svg/fig134786.svg @@ -9,9 +9,6 @@ - - - @@ -21,6 +18,9 @@ + + + @@ -42,6 +42,15 @@ + + + + + + + + + @@ -76,13 +85,75 @@ - + + + + GLDrawable + + - - - - + + <<metaclass>> + GL2ES3 + + + + + + + GL4bcImpl + + + + + + + GLES3Impl + + + + + + + + <<interface>> + NativeWindow + + + + + + + + AbstractGraphicsConfiguration + + + + + + + + GLCapabilities + + + + + + + + GLProfile + + + + + + + + <<interface>> + GLBase + + @@ -145,23 +216,6 @@ GLContext - - - - - - GLProfile - - - - - - - - <<interface>> - GLBase - - Mobile final public OpenGL Interfaces @@ -175,60 +229,6 @@ suitable GL implementation matching the GLProfile. Common GL Stuff - - - - - GLDrawable - - - - - - <<metaclass>> - GL2ES3 - - - - - - - GL4bcImpl - - - - - - - GLES3Impl - - - - - - - - <<interface>> - NativeWindow - - - - - - - - AbstractGraphicsConfiguration - - - - - - - - GLCapabilities - - - @@ -241,6 +241,12 @@ + + + + + + @@ -253,12 +259,6 @@ - - - - - - @@ -268,6 +268,14 @@ + + + + + Capabilities + + + <<interface>> @@ -281,14 +289,6 @@ - - - - - Capabilities - - - @@ -329,16 +329,16 @@ - 0..1 + chosen - 1 + 1 - chosen + 0..1 - 1 + 1 requested diff --git a/doc/uml/html-svg/index.html b/doc/uml/html-svg/index.html index 9e85e8d21..5505c4d94 100755 --- a/doc/uml/html-svg/index.html +++ b/doc/uml/html-svg/index.html @@ -24,7 +24,7 @@ Documentation

1 Class View javax.media.opengl

-

+

OpenGL Interfaces - All



diff --git a/doc/uml/html/fig128069.png b/doc/uml/html/fig128069.png index 9c90b0377..f94051e8a 100755 Binary files a/doc/uml/html/fig128069.png and b/doc/uml/html/fig128069.png differ diff --git a/doc/uml/jogl/128069.diagram b/doc/uml/jogl/128069.diagram index 3461f2d61..3a184cb7d 100755 --- a/doc/uml/jogl/128069.diagram +++ b/doc/uml/jogl/128069.diagram @@ -2,43 +2,43 @@ format 75 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.4 800.5 2000 + xyz 195.3 800.5 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.2 112.8 2000 + xyz 142.4 112.6 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.2 2000 + xyz 764.5 928.4 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.2 226.4 2000 + xyz 40.6 226.8 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.4 928.7 2000 + xyz 195.3 928.9 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.6 480.3 2000 + xyz 40 480.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.9 691.9 2000 + xyz 195.8 691.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 274 227.3 2000 + xyz 274 227.6 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.8 389.1 2005 + xyz 428.4 389.2 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.1 800 2000 + xyz 595 800 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 @@ -46,92 +46,92 @@ classcanvas 128965 class_ref 128965 // GLES2 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.5 480.6 2004 + xyz 669.3 480.6 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 757 305 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.5 2000 + xyz 422.4 23.2 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.1 273.8 2009 + xyz 588 273.5 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.6 105.3 2000 + xyz 686.7 105.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 423.3 250.6 2000 + xyz 423 250.8 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.6 1048.4 2000 + xyz 436.2 1048.8 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.8 2005 + xyz 46.5 574.6 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.3 575.9 2000 + xyz 682.2 575.6 2000 end textcanvas 131781 "Desktop final public OpenGL Interfaces " - xyzwh 820 664.5 2000 135 37 + xyzwh 820.3 664.8 2000 135 37 textcanvas 131909 "Mobile final public OpenGL Interfaces" - xyzwh 820 522 2000 125 38 + xyzwh 820.8 522 2000 125 38 textcanvas 132037 "Private implementation (detail)" - xyzwh 18.6 1072 2000 178 18 + xyzwh 18.4 1072 2000 178 18 textcanvas 132165 "Desktop/Mobile Common Interfaces" - xyzwh 819 243 2000 129 42 + xyzwh 819.7 242.7 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.6 200.8 2000 + xyz 1021.3 200.8 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 295.8 2000 + xyz 972.7 295.3 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.2 478.7 2000 + xyz 1019.1 478.9 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.7 395.5 2005 + xyz 1028.6 395 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 582.8 2000 + xyz 1036.8 582.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 782 16.6 2000 208 93 + xyzwh 781.5 16.8 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.8 2000 + xyz 144 12.6 2000 end textcanvas 136261 "Common GL Stuff" - xyzwh 272 135.4 2000 108 17 + xyzwh 271.5 135.7 2000 108 17 fragment 136517 "Programmable Shader" - color blue xyzwh 236.4 196.4 1994 709 972 + color blue xyzwh 236.4 196.3 1994 709 972 separator 2748 separator 4543 separator 1893 end fragment 136645 "Fixed Function" - color lightgray xyzwh 2 195.4 1989 238 973 - separator 2743 + color lightgray xyzwh 2 195.3 1989 238 973 + separator 2754 separator 4544 - separator 1885 + separator 1896 end textcanvas 136773 "Common Desktop Profile" - xyzwh 820 402.7 2000 115 39 + xyzwh 820.3 402.9 2000 115 39 relationcanvas 128386 relation_ref 128002 // from ref 130885 z 2001 to ref 128002 no_role_a no_role_b diff --git a/doc/uml/jogl/jogl.prj b/doc/uml/jogl/jogl.prj index b91c1cc14..882c2a1e9 100755 --- a/doc/uml/jogl/jogl.prj +++ b/doc/uml/jogl/jogl.prj @@ -1,6 +1,6 @@ format 75 "jogl" - revision 11 + revision 12 modified_by 2 "sven" -- cgit v1.2.3