diff --git a/uml/renderengine/cin3/128133.diagram b/uml/renderengine/cin3/128133.diagram index e712fd920..fca9a8889 100644 --- a/uml/renderengine/cin3/128133.diagram +++ b/uml/renderengine/cin3/128133.diagram @@ -34,7 +34,7 @@ classcanvas 130949 class_ref 128773 // AbstractMO end classcanvas 131461 class_ref 128901 // Clip draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default 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_infonote default shadow default - xyz 278 368 2000 + xyz 279 361 2000 end classcanvas 131717 class_ref 129029 // Effect draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default 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_infonote default shadow default @@ -50,7 +50,7 @@ classcanvas 132229 class_ref 129285 // DirectPlacement end classcanvas 132869 class_ref 129413 // RelativePlacement draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default 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_infonote default shadow default - xyz 477 350 2000 + xyz 471 346 2000 end classcanvas 134149 class_ref 129541 // Allocation draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default 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_infonote default shadow default @@ -148,7 +148,7 @@ relationcanvas 132997 relation_ref 129925 // from ref 132869 z 1999 to point 486 247 line 133893 z 1999 to ref 129413 role_a_pos 423 192 3000 no_role_b - multiplicity_a_pos 401 205 3000 multiplicity_b_pos 500 325 3000 + multiplicity_a_pos 401 205 3000 multiplicity_b_pos 495 321 3000 relationcanvas 134533 relation_ref 130309 // from ref 134405 z 1999 to ref 131973 no_role_a no_role_b diff --git a/uml/renderengine/cin3/128261 b/uml/renderengine/cin3/128261 index 61f065e93..0ca47fe6e 100644 --- a/uml/renderengine/cin3/128261 +++ b/uml/renderengine/cin3/128261 @@ -1,6 +1,6 @@ format 38 "MObject" // MObject - revision 6 + revision 7 modified_by 5 "hiv" // class settings //class diagram settings @@ -182,7 +182,6 @@ ${inlines} end - end class 128389 "Track" @@ -311,7 +310,6 @@ ${inlines} idl_decl "" comment "startpos in source" end - end class 129029 "Effect" @@ -562,7 +560,6 @@ ${members}}; b multiplicity "" parent class_ref 128389 // Track association_type class_ref 128389 // Track end - end class 129925 "Auto" diff --git a/uml/renderengine/cin3/128389 b/uml/renderengine/cin3/128389 index ab4598401..d46a3e0ee 100644 --- a/uml/renderengine/cin3/128389 +++ b/uml/renderengine/cin3/128389 @@ -1,6 +1,6 @@ format 38 "RenderEngine" // RenderEngine - revision 4 + revision 5 modified_by 5 "hiv" // class settings //class diagram settings @@ -77,6 +77,18 @@ format 38 size A4 end + objectdiagram 129029 "Engine Example1" + write_horizontally default package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default + comment "Example1 (from EDL) continued: here the RenderEngine to be created by the Builder from the Input shown in Example1" + size A4 + end + + objectdiagram 129157 "Engine Example2" + write_horizontally default package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default + comment "Example2 (from EDL) continued: notably in this RenderEngine the Effect has been partitioned into 2 segments with constant configuration." + size A4 + end + class 131333 "RenderEngine" visibility package cpp_decl "${comment}${template}class ${name}${inherit} { @@ -145,6 +157,24 @@ ${inlines} classrelation_ref 136325 // b multiplicity "" parent class_ref 132741 // StateProxy end + + attribute 129413 "start" + protected explicit_type "long" + cpp_decl " ${comment}${static}${mutable}${volatile}${const}${type} ${name}${value}; +" + java_decl "" + idl_decl "" + comment "begin of the timerange covered by this processor" + end + + attribute 129541 "end" + protected explicit_type "long" + cpp_decl " ${comment}${static}${mutable}${volatile}${const}${type} ${name}${value}; +" + java_decl "" + idl_decl "" + comment "end of the timerange (excl)" + end end class 131589 "ExitNode" @@ -164,6 +194,7 @@ ${inlines} classrelation_ref 132869 // b multiplicity "" parent class_ref 131717 // ProcNode end + end class 131717 "ProcNode" @@ -180,6 +211,15 @@ ${members}}; " explicit_switch_type "" + classrelation 136965 // datasrc () + relation 135429 ---> + a role_name "datasrc" multiplicity "" protected + comment "The predecessor in a processing pipeline, i.e. a source to get data to be processed" + cpp default " ${comment}${static}${mutable}${volatile}${const}${type} * ${name}${value}; +" + classrelation_ref 136965 // datasrc () + b multiplicity "1" parent class_ref 131717 // ProcNode + end end class 131845 "Trafo" @@ -256,6 +296,7 @@ ${inlines} classrelation_ref 133509 // b multiplicity "" parent class_ref 131845 // Trafo end + end class 132357 "Mask" @@ -386,14 +427,6 @@ ${members}}; " explicit_switch_type "" - classrelation 135685 // - relation 134405 ---> - a role_name "" multiplicity "" protected - cpp default " ${comment}${static}${mutable}${volatile}${const}${type} * ${name}${value}; -" - classrelation_ref 135685 // - b multiplicity "1" parent class_ref 132741 // StateProxy - end end class 133381 "AFrame" diff --git a/uml/renderengine/cin3/128389.diagram b/uml/renderengine/cin3/128389.diagram index 501e7fe3c..a70ea7935 100644 --- a/uml/renderengine/cin3/128389.diagram +++ b/uml/renderengine/cin3/128389.diagram @@ -6,7 +6,7 @@ classcanvas 128005 class_ref 131333 // RenderEngine end classcanvas 128133 class_ref 131461 // Processor draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default 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_infonote default shadow default - xyz 276 182 2000 + xyz 276 165 2000 end classcanvas 128389 class_ref 131589 // ExitNode draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default 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_infonote default shadow default @@ -14,7 +14,7 @@ classcanvas 128389 class_ref 131589 // ExitNode end classcanvas 128517 class_ref 131717 // ProcNode draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default 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_infonote default shadow default - xyz 472 264 2000 + xyz 462 265 2000 end classcanvas 129029 class_ref 131845 // Trafo draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default 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_infonote default shadow default @@ -86,34 +86,34 @@ relationcanvas 128261 relation_ref 131845 // role_a_pos 184 178 3000 no_role_b multiplicity_a_pos 249 211 3000 multiplicity_b_pos 202 300 3000 relationcanvas 128901 relation_ref 131973 // - from ref 128133 z 1999 stereotype "<>" xyz 350 334 3000 to ref 128389 - role_a_pos 441 419 3000 no_role_b - multiplicity_a_pos 415 419 3000 no_multiplicity_b + from ref 128133 z 1999 stereotype "<>" xyz 354 342 3000 to ref 128389 + role_a_pos 440 419 3000 no_role_b + multiplicity_a_pos 414 419 3000 no_multiplicity_b relationcanvas 129925 relation_ref 132101 // geometry VHV from ref 128389 z 1999 to point 445 384 - line 130693 z 1999 to point 509 384 + line 130693 z 1999 to point 499 384 line 130821 z 1999 to ref 128517 no_role_a no_role_b no_multiplicity_a no_multiplicity_b relationcanvas 130053 relation_ref 132229 // geometry VHV from ref 129029 z 1999 to point 516 384 - line 130949 z 1999 to point 509 384 + line 130949 z 1999 to point 499 384 line 131077 z 1999 to ref 128517 no_role_a no_role_b no_multiplicity_a no_multiplicity_b relationcanvas 130181 relation_ref 132357 // geometry VHV from ref 129285 z 1999 to point 613 384 - line 131205 z 1999 to point 509 384 + line 131205 z 1999 to point 499 384 line 131333 z 1999 to ref 128517 no_role_a no_role_b no_multiplicity_a no_multiplicity_b relationcanvas 130309 relation_ref 132485 // geometry VHV from ref 129157 z 1999 to point 668 384 - line 131461 z 1999 to point 509 384 + line 131461 z 1999 to point 499 384 line 131589 z 1999 to ref 128517 no_role_a no_role_b no_multiplicity_a no_multiplicity_b @@ -180,7 +180,7 @@ relationcanvas 136965 relation_ref 134533 // relationcanvas 137349 relation_ref 134661 // geometry VHV from ref 137221 z 1999 to point 763 384 - line 137477 z 1999 to point 509 384 + line 137477 z 1999 to point 499 384 line 137605 z 1999 to ref 128517 no_role_a no_role_b no_multiplicity_a no_multiplicity_b @@ -189,8 +189,14 @@ relationcanvas 137861 relation_ref 134789 // no_role_a no_role_b no_multiplicity_a no_multiplicity_b relationcanvas 137989 relation_ref 134917 // - from ref 128133 z 1999 stereotype "<>" xyz 285 315 3000 to point 306 403 + from ref 128133 z 1999 stereotype "<>" xyz 285 323 3000 to point 306 403 line 138117 z 1999 to ref 132229 no_role_a no_role_b no_multiplicity_a no_multiplicity_b +relationcanvas 139397 relation_ref 135429 // + from ref 128517 z 1999 to point 432 265 + line 139525 z 1999 to point 432 295 + line 139653 z 1999 to ref 128517 + role_a_pos 414 273 3000 no_role_b + no_multiplicity_a multiplicity_b_pos 445 292 3000 end diff --git a/uml/renderengine/cin3/128517.diagram b/uml/renderengine/cin3/128517.diagram index 59ef4f315..a43b9596e 100644 --- a/uml/renderengine/cin3/128517.diagram +++ b/uml/renderengine/cin3/128517.diagram @@ -18,7 +18,7 @@ note 130565 "Note: Builder subsys is stateless" xyzwh 25 374 2000 128 58 classinstance 130693 class_ref 131077 // Assembler xyz 225 390 2000 name "" xyz 225 390 2000 -classinstance 131333 class_ref 131205 // StreamProvider +classinstance 131333 class_ref 131205 // FrameProvider xyz 172 613 2000 name "" xyz 172 613 2000 classinstance 131717 class_ref 131333 // RenderEngine xyz 721 542 2000 name "" xyz 721 542 2000 @@ -80,7 +80,7 @@ linkcanvas 131973 from ref 131717 z 1999 to ref 131333 dirscanvas 133253 z 1000 linkcanvas_ref 131973 show_full_operations_definition default show_hierarchical_rank default write_horizontally default drawing_language default package_name_in_tab default show_context default draw_all_relations default shadow default - forward_label "11 getReady()" xyz 427 603 3000 + forward_label "11 getReady()" xyz 456 611 3000 msgs msg operation_ref 128261 // "buildProcessor()" forward ranks 1 "1" dirscanvas_ref 132101 diff --git a/uml/renderengine/cin3/128645 b/uml/renderengine/cin3/128645 index 8a7a234a3..34c90b8c6 100644 --- a/uml/renderengine/cin3/128645 +++ b/uml/renderengine/cin3/128645 @@ -1,6 +1,6 @@ format 38 "Vault" // Vault - revision 2 + revision 3 modified_by 5 "hiv" // class settings //class diagram settings @@ -44,7 +44,7 @@ format 38 package_name_in_tab default show_context default show_opaque_action_definition default auto_label_position default write_flow_label_horizontally default draw_all_relations default shadow default show_infonote default drawing_language default - class 131205 "StreamProvider" + class 131205 "FrameProvider" visibility public stereotype "boundary" cpp_decl "${comment}${template}class ${name}${inherit} { ${members}}; diff --git a/uml/renderengine/cin3/128773.diagram b/uml/renderengine/cin3/128773.diagram index f2e5da169..6bf42028f 100644 --- a/uml/renderengine/cin3/128773.diagram +++ b/uml/renderengine/cin3/128773.diagram @@ -47,7 +47,7 @@ classinstance 131077 class_ref 128901 // Clip attribute_ref 128645 // start "176400" end -textcanvas 131333 "Video and Audio Clip of length = 5 frames positioned at frame 2, staring at t=4s in soucre. +textcanvas 131333 "Video and Audio Clip of length = 5 frames positioned at frame 2, starting at t=4s in soucre. (Values for PAL and 44.1)" xyzwh 457 335 2000 175 87 objectlinkcanvas 128261 norel diff --git a/uml/renderengine/cin3/128901 b/uml/renderengine/cin3/128901 index 948673e53..a31f075ba 100644 --- a/uml/renderengine/cin3/128901 +++ b/uml/renderengine/cin3/128901 @@ -1,6 +1,6 @@ format 38 "Builder" // MObject::Builder - revision 4 + revision 5 modified_by 5 "hiv" // class settings //class diagram settings diff --git a/uml/renderengine/cin3/128901.diagram b/uml/renderengine/cin3/128901.diagram index 11442e9f3..9d8326da8 100644 --- a/uml/renderengine/cin3/128901.diagram +++ b/uml/renderengine/cin3/128901.diagram @@ -61,7 +61,7 @@ classinstance 131845 class_ref 129413 // RelativePlacement "SAMETIME" end classinstance 132229 class_ref 129029 // Effect - xyz 561 71 2000 name "" + xyz 562 71 2000 name "" values attribute_ref 128517 // length "3" @@ -131,7 +131,7 @@ objectlinkcanvas 132101 rel relation_ref 129925 // role_a_pos 304 104 3000 no_role_b objectlinkcanvas 132485 rel relation_ref 128645 // from ref 132229 z 1999 to ref 132357 - role_a_pos 612 172 3000 role_b_pos 612 150 3000 + role_a_pos 613 172 3000 role_b_pos 613 150 3000 objectlinkcanvas 132613 rel relation_ref 129925 // from ref 132357 z 1999 to ref 131717 role_a_pos 460 109 3000 no_role_b diff --git a/uml/renderengine/cin3/129029.diagram b/uml/renderengine/cin3/129029.diagram new file mode 100644 index 000000000..3ec7b8843 --- /dev/null +++ b/uml/renderengine/cin3/129029.diagram @@ -0,0 +1,104 @@ +format 38 + +classinstance 128005 class_ref 131333 // RenderEngine + xyz 80 75 2000 name "" +end +classinstance 128133 class_ref 131461 // Processor + xyz 435 172 2000 name "audio1" + values + attribute_ref 129541 // end + "7/25" + attribute_ref 129413 // start + "2/25" +end +classinstance 128261 class_ref 131461 // Processor + xyz 280 172 2000 name "video1" + values + attribute_ref 129541 // end + "7/25" + attribute_ref 129413 // start + "2/25" +end +fragment 128517 "seq" + xyzwh 232 140 1994 367 113 +end +classinstance 128645 class_ref 131589 // ExitNode + xyz 287 329 2000 name "video" +end +classinstance 128773 class_ref 131589 // ExitNode + xyz 443 330 2000 name "audio" +end +classinstance 129157 class_ref 132229 // Projector + xyz 287 386 2000 name "ouput" +end +classinstance 129285 class_ref 132229 // Projector + xyz 290 497 2000 name "input" +end +classinstance 129669 class_ref 132357 // Mask + xyz 306 442 2000 name "" +end +classinstance 129797 class_ref 133765 // Source + xyz 292 556 2000 name "vid_a" +end +classinstance 129925 class_ref 133765 // Source + xyz 444 398 2000 name "aud_a" +end +classinstance 131717 class_ref 132997 // VRender + xyz 188 427 2000 name "vid1" +end +classinstance 131845 class_ref 132869 // ARender + xyz 554 289 2000 name "au1" +end +classinstance 131973 class_ref 133509 // VFrame + xyz 112 492 2000 name "" +end +classinstance 132101 class_ref 133381 // AFrame + xyz 663 353 2000 name "" +end +note 133125 "render state proxy passed on" + xyzwh 123 355 2000 104 53 +textcanvas 133253 "Video and Audio Clip of length = 5 frames positioned at frame 2, producing two output streams (frame sequence)." + xyzwh 445 507 2000 175 83 +objectlinkcanvas 128389 rel relation_ref 131845 // + geometry VH + from ref 128005 z 1999 to point 120 205 + line 81 z 1999 to ref 128261 + role_a_pos 188 183 3000 no_role_b +objectlinkcanvas 128901 rel relation_ref 131973 // + from ref 128261 z 1999 stereotype "<>" xyz 301 284 3000 to ref 128645 + role_a_pos 339 304 3000 no_role_b +objectlinkcanvas 129029 rel relation_ref 131973 // + from ref 128133 z 1999 stereotype "<>" xyz 457 285 3000 to ref 128773 + role_a_pos 494 305 3000 no_role_b +objectlinkcanvas 130437 rel relation_ref 135429 // + from ref 128645 z 1999 to ref 129157 + role_a_pos 339 361 3000 no_role_b +objectlinkcanvas 131205 rel relation_ref 135429 // + from ref 129157 z 1999 to ref 129669 + role_a_pos 340 417 3000 no_role_b +objectlinkcanvas 131333 rel relation_ref 135429 // + from ref 129669 z 1999 to ref 129285 + role_a_pos 341 472 3000 no_role_b +objectlinkcanvas 131461 rel relation_ref 135429 // + from ref 129285 z 1999 to ref 129797 + role_a_pos 340 531 3000 no_role_b +objectlinkcanvas 131589 rel relation_ref 135429 // + from ref 128773 z 1999 to ref 129925 + role_a_pos 494 373 3000 no_role_b +objectlinkcanvas 132229 rel relation_ref 134533 // + geometry VHr + from ref 131717 z 1999 to point 137 438 + line 1 z 1999 to ref 131973 + role_a_pos 149 467 3000 no_role_b +objectlinkcanvas 132485 rel relation_ref 134533 // + geometry HV + from ref 131845 z 1999 to point 688 300 + line 1 z 1999 to ref 132101 + role_a_pos 700 328 3000 no_role_b +line 132613 -_-_ + from ref 128261 z 1999 to point 244 320 + line 132741 z 1999 to ref 131717 +line 132869 -_-_ + from ref 128133 z 1999 to point 583 259 + line 132997 z 1999 to ref 131845 +end diff --git a/uml/renderengine/cin3/129157.diagram b/uml/renderengine/cin3/129157.diagram new file mode 100644 index 000000000..3cd13c11b --- /dev/null +++ b/uml/renderengine/cin3/129157.diagram @@ -0,0 +1,127 @@ +format 38 + +classinstance 128005 class_ref 131333 // RenderEngine + xyz 102 80 2000 name "" +end +note 128261 "render state proxy passed on" + xyzwh 139 319 2000 104 53 +classinstance 128389 class_ref 133765 // Source + xyz 610 558 2000 name "devnull" +end +classinstance 128517 class_ref 131589 // ExitNode + xyz 610 329 2000 name "video" +end +classinstance 128645 class_ref 132229 // Projector + xyz 488 497 2000 name "input" +end +classinstance 128773 class_ref 131461 // Processor + xyz 602 172 2000 name "video1" + values + attribute_ref 129541 // end + "8/25" + attribute_ref 129413 // start + "7/25" +end +classinstance 128901 class_ref 132229 // Projector + xyz 485 386 2000 name "ouput" +end +fragment 129029 "seq" + xyzwh 254 147 1994 477 111 +end +classinstance 129157 class_ref 132485 // PluginAdapter + xyz 477 444 2000 name "HUE" +end +classinstance 129541 class_ref 132997 // VRender + xyz 409 293 2000 name "vid1" +end +classinstance 129669 class_ref 133509 // VFrame + xyz 134 497 2000 name "" +end +classinstance 129797 class_ref 131461 // Processor + xyz 478 172 2000 name "video1" + values + attribute_ref 129541 // end + "7/25" + attribute_ref 129413 // start + "5/25" +end +classinstance 129925 class_ref 131589 // ExitNode + xyz 485 329 2000 name "video" +end +classinstance 132229 class_ref 132485 // PluginAdapter + xyz 600 444 2000 name "HUE" +end +classinstance 132997 class_ref 133765 // Source + xyz 387 602 2000 name "vid_a" +end +classinstance 133125 class_ref 132229 // Projector + xyz 299 498 2000 name "input" +end +classinstance 133253 class_ref 131461 // Processor + xyz 289 172 2000 name "video1" + values + attribute_ref 129541 // end + "5/25" + attribute_ref 129413 // start + "2/25" +end +classinstance 133381 class_ref 132229 // Projector + xyz 296 386 2000 name "ouput" +end +classinstance 133509 class_ref 131589 // ExitNode + xyz 296 329 2000 name "video" +end +note 134661 "Note: because the Engine Components are stateless, various calculation patterns are possible, including all sorts of parallelism " + xyzwh 569 45 2000 240 75 +textcanvas 134789 "Video Clip from 2 to 7, with an attached HUE effect starting 3 frames after begin and overlapping by 1 frame beyond the end" + xyzwh 145 553 2000 175 87 +objectlinkcanvas 130053 rel relation_ref 135429 // + from ref 129925 z 1999 to ref 128901 + role_a_pos 537 361 3000 no_role_b +objectlinkcanvas 130437 rel relation_ref 135429 // + from ref 129157 z 1999 to ref 128645 + role_a_pos 539 472 3000 no_role_b +objectlinkcanvas 130565 rel relation_ref 131973 // + from ref 128773 z 1999 stereotype "<>" xyz 624 285 3000 to ref 128517 + role_a_pos 661 304 3000 no_role_b +objectlinkcanvas 130693 rel relation_ref 134533 // + geometry VHr + from ref 129541 z 1999 to point 159 304 + line 130821 z 1999 to ref 129669 + role_a_pos 171 472 3000 no_role_b +objectlinkcanvas 130949 rel relation_ref 135429 // + from ref 128901 z 1999 to ref 129157 + role_a_pos 538 419 3000 no_role_b +objectlinkcanvas 131589 rel relation_ref 131973 // + from ref 129797 z 1999 stereotype "<>" xyz 499 284 3000 to ref 129925 + role_a_pos 537 304 3000 no_role_b +objectlinkcanvas 132613 rel relation_ref 135429 // + from ref 128517 z 1999 to ref 132229 + role_a_pos 662 419 3000 no_role_b +objectlinkcanvas 132869 rel relation_ref 135429 // + from ref 132229 z 1999 to ref 128389 + role_a_pos 662 533 3000 no_role_b +objectlinkcanvas 133637 rel relation_ref 135429 // + from ref 133509 z 1999 to ref 133381 + role_a_pos 348 361 3000 no_role_b +objectlinkcanvas 133765 rel relation_ref 135429 // + from ref 133125 z 1999 to ref 132997 + role_a_pos 398 565 3000 no_role_b +objectlinkcanvas 133893 rel relation_ref 131973 // + from ref 133253 z 1999 stereotype "<>" xyz 291 273 3000 to ref 133509 + role_a_pos 348 304 3000 no_role_b +objectlinkcanvas 134277 rel relation_ref 135429 // + from ref 133381 z 1999 to ref 133125 + role_a_pos 349 473 3000 no_role_b +objectlinkcanvas 134405 rel relation_ref 135429 // + from ref 128645 z 1999 to ref 132997 + role_a_pos 445 565 3000 no_role_b +objectlinkcanvas 134533 rel relation_ref 131845 // + geometry VH + from ref 128005 z 1999 to point 142 205 + line 6 z 1999 to ref 133253 + role_a_pos 160 185 3000 no_role_b +line 131973 -_-_ + from ref 129797 z 1999 to point 445 243 + line 132101 z 1999 to ref 129541 +end diff --git a/uml/renderengine/cin3/5.session b/uml/renderengine/cin3/5.session index 4fea246cb..b5a9699dd 100644 --- a/uml/renderengine/cin3/5.session +++ b/uml/renderengine/cin3/5.session @@ -1,38 +1,38 @@ -window_sizes 1140 830 287 843 689 62 +window_sizes 1140 830 287 843 693 58 diagrams - componentdiagram_ref 128005 // Overview - 860 687 100 4 525 0 - deploymentdiagram_ref 128261 // Overview Render Engine - 674 551 100 4 0 12 - classdiagram_ref 128133 // Session structure - 674 551 100 4 0 0 classdiagram_ref 128389 // Render Entities 843 689 100 4 147 0 - active collaborationdiagram_ref 128517 // build process - 674 551 100 4 0 181 - classdiagram_ref 128645 // Controller Entities - 674 551 100 4 538 0 + objectdiagram_ref 129029 // Engine Example1 + 674 554 100 4 0 0 + objectdiagram_ref 129157 // Engine Example2 + 674 554 100 4 0 0 + active objectdiagram_ref 128901 // EDL Example2 + 843 693 100 4 0 0 + objectdiagram_ref 128773 // EDL Example1 + 674 554 100 4 0 0 end show_stereotypes -selected - package_ref 129 // cin3 +selected objectdiagram_ref 128901 // EDL Example2 open class_ref 128005 // Session classrelation_ref 128645 // tracks () class_ref 128261 // Fixture class_ref 128645 // Placement - class_ref 129413 // RelativePlacement + class_ref 128773 // AbstractMO + class_ref 128901 // Clip + class_ref 129029 // Effect + class_ref 133893 // RelType + class_ref 129541 // Allocation class_ref 129797 // ExplicitePlacement - class_ref 130181 // Constraint + classrelation_ref 132357 // class_ref 130565 // BuilderFacade class_ref 130693 // ToolFactory class_ref 130821 // ConManager class_ref 131077 // Assembler class_ref 132741 // StateProxy - class_ref 130309 // ControllerFacade - class_ref 130437 // PathManager - class_ref 130949 // RenderState - classview_ref 128133 // Engine Workings - class_ref 131205 // StreamProvider + class_ref 131589 // ExitNode + class_ref 131717 // ProcNode + class_ref 133253 // Frame + classview_ref 128517 // Backend Components end end diff --git a/wiki/index.html b/wiki/index.html index 21dbf9a5d..d5d2d27b8 100644 --- a/wiki/index.html +++ b/wiki/index.html @@ -784,7 +784,7 @@ This distributed wiki might be used instead the pipapo.org wiki, investigate tha Wiki works it is simple to use and just flexible enough to handle the task. I don't go to install any other software for such tasks on my server. While the design progresses I'd propose to move our work into git repositories and eventually phase this wiki pages out anyways. I'd rather like to start out distributed/git right away .. but git gives us only a fine storage layer, for a design process we need some good presentation layer (later when using git and starting the implementation everyones favorite editor serves for that) I have no better ideas yet to solve the presentation problem other than using this wiki (or maybe bouml). -
+
This 'index.html' becomes the entry point of some tiddlywikis managed under git. There is a 'empty.html' in the same folder serving as template for generating new wikis. Please refrain from editing it.
 
 * I started a GitNotes where we will collect some information about git, howto and special setups
@@ -795,7 +795,7 @@ Please end your tiddlers in a newline, this makes merging in git easier since th
 !Design Draft
 to get started, we create design drafts emphasizing different aspects and regions of Cinelerra-3
 
-* Ichthyo focuses mainly on the Render Engine and its interconnection to the EDL. <html><a href="ichthyo-draft.html">see this separate wiki page</a></html>
+* Ichthyo focuses mainly on the Render Engine and its interconnection to the EDL, [[see this separate page|ichthyo-draft.html]]
 * cehteh works on the data backend draft, see [[this page|backend.html]]