summaryrefslogtreecommitdiffstats
path: root/doc/bouml/jogl
diff options
context:
space:
mode:
Diffstat (limited to 'doc/bouml/jogl')
-rw-r--r--doc/bouml/jogl/128069.diagram71
-rw-r--r--doc/bouml/jogl/69.session2
-rw-r--r--doc/bouml/jogl/jogl.prj54
3 files changed, 88 insertions, 39 deletions
diff --git a/doc/bouml/jogl/128069.diagram b/doc/bouml/jogl/128069.diagram
index fc6271d19..d467ebad4 100644
--- a/doc/bouml/jogl/128069.diagram
+++ b/doc/bouml/jogl/128069.diagram
@@ -2,39 +2,39 @@ format 62
classcanvas 128069 class_ref 128069 // GL
draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype 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_infonote default shadow default show_stereotype_properties default
- xyz 126 11 2000
+ xyz 142 112 2000
end
classcanvas 128197 class_ref 128197 // GL2ES1
draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype 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_infonote default shadow default show_stereotype_properties default
- xyz 26 125 2000
+ xyz 42 226 2000
end
classcanvas 128325 class_ref 128325 // GLES1
draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype 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_infonote default shadow default show_stereotype_properties default
- xyz 25 300 2000
+ xyz 41 401 2000
end
classcanvas 128453 class_ref 128453 // GL2
draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype 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_infonote default shadow default show_stereotype_properties default
- xyz 255 523 2000
+ xyz 202 625 2000
end
classcanvas 128581 class_ref 128581 // GL2ES2
draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype 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_infonote default shadow default show_stereotype_properties default
- xyz 260 125 2000
+ xyz 276 226 2000
end
classcanvas 128709 class_ref 128709 // GL2GL3
draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype 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_infonote default shadow default show_stereotype_properties default
- xyz 414 213 2005
+ xyz 430 314 2005
end
classcanvas 128837 class_ref 128837 // GL3
draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype 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_infonote default shadow default show_stereotype_properties default
- xyz 413 523 2000
+ xyz 429 625 2000
end
classcanvas 128965 class_ref 128965 // GLES2
draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype 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_infonote default shadow default show_stereotype_properties default
- xyz 261 300 2000
+ xyz 277 401 2000
end
classcanvas 130245 class_ref 130117 // GLContext
draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype 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_infonote default shadow default show_stereotype_properties default
- xyz 535 22 2000
+ xyz 534 22 2000
end
classcanvas 130501 class_ref 130245 // GLDrawable
draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype 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_infonote default shadow default show_stereotype_properties default
@@ -42,29 +42,29 @@ classcanvas 130501 class_ref 130245 // GLDrawable
end
classcanvas 130757 class_ref 130373 // GL2Impl
draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype 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_infonote default shadow default show_stereotype_properties default
- xyz 271 628 2000
+ xyz 219 717 2000
end
classcanvas 130885 class_ref 130501 // GL3Impl
draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype 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_infonote default shadow default show_stereotype_properties default
- xyz 431 628 2000
+ xyz 447 717 2000
end
classcanvas 131013 class_ref 130629 // GLES2Impl
draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype 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_infonote default shadow default show_stereotype_properties default
- xyz 268 399 2000
+ xyz 284 500 2000
end
classcanvas 131141 class_ref 130757 // GLES1Impl
draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype 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_infonote default shadow default show_stereotype_properties default
- xyz 33 399 2005
+ xyz 49 500 2005
end
textcanvas 131781 "Desktop final public OpenGL Interfaces
"
- xyzwh 526 545 2000 135 37
+ xyzwh 544 638 2000 135 37
textcanvas 131909 "Mobile final public OpenGL Interfaces"
- xyzwh 525 322 2000 125 38
+ xyzwh 544 423 2000 125 38
textcanvas 132037 "Private implementation (detail)"
- xyzwh 54 648 2000 179 17
+ xyzwh 26 737 2000 179 17
textcanvas 132165 "Desktop/Mobile Common Interfaces"
- xyzwh 372 148 2000 221 17
+ xyzwh 544 247 2000 129 42
classcanvas 132293 class_ref 130885 // NativeWindow
draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype 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_infonote default shadow default show_stereotype_properties default
xyz 769 188 2000
@@ -87,6 +87,26 @@ classcanvas 132805 class_ref 131397 // GLProfile
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 784 16 2000 208 93
+classcanvas 135877 class_ref 132549 // GLBase
+ draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype 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_infonote default shadow default show_stereotype_properties default
+ xyz 143 12 2000
+end
+textcanvas 136261 "Common GL Stuff"
+ xyzwh 273 135 2000 108 17
+fragment 136517 "Programmable Shader"
+ color blue xyzwh 238 193 1994 448 610
+ separator 3275
+ separator 6177
+ separator 1832
+end
+fragment 136645 "Fixed Function"
+ color lightgray xyzwh 5 193 1989 235 610
+ separator 3278
+ separator 6177
+ separator 1821
+end
+textcanvas 136773 "Common Desktop Profile"
+ xyzwh 544 324 2000 115 39
relationcanvas 129093 relation_ref 129221 // <generalisation>
from ref 128197 z 1999 to ref 128069
no_role_a no_role_b
@@ -127,15 +147,10 @@ relationcanvas 130117 relation_ref 130245 // <generalisation>
no_role_a no_role_b
no_multiplicity_a no_multiplicity_b
end
-relationcanvas 130373 relation_ref 130373 // <association>
- from ref 128069 z 1999 to ref 130245
- no_role_a no_role_b
- multiplicity_a_pos 517 50 3000 multiplicity_b_pos 230 50 3000
-end
relationcanvas 130629 relation_ref 130501 // <association>
from ref 130501 z 1999 to ref 130245
no_role_a no_role_b
- multiplicity_a_pos 612 76 3000 multiplicity_b_pos 663 129 3000
+ multiplicity_a_pos 585 66 3000 multiplicity_b_pos 652 106 3000
end
relationcanvas 131269 relation_ref 130629 // <realization>
from ref 131141 z 1999 to ref 128325
@@ -196,4 +211,14 @@ relationcanvas 134725 relation_ref 131781 // <association>
no_role_a no_role_b
no_multiplicity_a no_multiplicity_b
end
+relationcanvas 136005 relation_ref 133061 // <generalisation>
+ from ref 128069 z 1999 to ref 135877
+ no_role_a no_role_b
+ no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 136133 relation_ref 133189 // <association>
+ from ref 135877 z 1999 to ref 130245
+ no_role_a no_role_b
+ multiplicity_a_pos 516 50 3000 multiplicity_b_pos 247 50 3000
+end
end
diff --git a/doc/bouml/jogl/69.session b/doc/bouml/jogl/69.session
index 676e7f380..ae6631e25 100644
--- a/doc/bouml/jogl/69.session
+++ b/doc/bouml/jogl/69.session
@@ -1,7 +1,7 @@
window_sizes 1800 1050 450 1344 851 120
diagrams
active classdiagram_ref 128069 // OpenGL Interfaces
- 1075 797 100 15 0 0
+ 1135 830 100 15 57 0
end
show_stereotypes
selected classdiagram_ref 128069 // OpenGL Interfaces
diff --git a/doc/bouml/jogl/jogl.prj b/doc/bouml/jogl/jogl.prj
index 9bc8dd3de..a7daf2922 100644
--- a/doc/bouml/jogl/jogl.prj
+++ b/doc/bouml/jogl/jogl.prj
@@ -1,6 +1,6 @@
format 62
"jogl"
- revision 3
+ revision 4
modified_by 69 "sg215889"
@@ -74,16 +74,12 @@ ${members}};
"
explicit_switch_type ""
- classrelation 130373 // <association>
- relation 130373 ----
- a role_name "" multiplicity "1" private
- java " ${comment}${@}${visibility}${static}${final}${transient}${volatile}${type} ${name}${value};
-"
- classrelation_ref 130373 // <association>
- b role_name "" multiplicity "1" private
- java " ${comment}${@}${visibility}${static}${final}${transient}${volatile}${type} ${name}${value};
-"
- classrelation_ref 130501 // <association>
+ classrelation 134085 // <generalisation>
+ relation 133061 ---|>
+ a public
+ java "${type}"
+ classrelation_ref 134085 // <generalisation>
+ b parent class_ref 132549 // GLBase
end
end
@@ -274,13 +270,13 @@ ${members}}
idl_decl ""
explicit_switch_type ""
- classrelation 130501 // <association>
- relation_ref 130373 // <association>
- end
-
classrelation 130757 // <association>
relation_ref 130501 // <association>
end
+
+ classrelation 134341 // <association>
+ relation_ref 133189 // <association>
+ end
end
class 130245 "GLDrawable"
@@ -554,5 +550,33 @@ ${members}}
classrelation_ref 132933 // <association>
end
end
+
+ class 132549 "GLBase"
+ visibility public stereotype "interface"
+ cpp_decl ""
+ java_decl "${comment}${@}${visibility}interface ${name}${extends} {
+${members}}
+"
+ php_decl "${comment}${visibility}interface ${name} {
+${members}}
+"
+ python_2_2 python_decl ""
+ idl_decl "${comment}${abstract}${local}interface ${name}${inherit} {
+${members}};
+"
+ explicit_switch_type ""
+
+ classrelation 134213 // <association>
+ relation 133189 ----
+ a role_name "" multiplicity "1" private
+ java " ${comment}${@}${visibility}${static}${final}${transient}${volatile}${type} ${name}${value};
+"
+ classrelation_ref 134213 // <association>
+ b role_name "" multiplicity "1" private
+ java " ${comment}${@}${visibility}${static}${final}${transient}${volatile}${type} ${name}${value};
+"
+ classrelation_ref 134341 // <association>
+ end
+ end
end
end