diff --git a/doc/devel/DIR_INFO b/doc/devel/DIR_INFO index a9ea7e85c..27f8206c5 100644 --- a/doc/devel/DIR_INFO +++ b/doc/devel/DIR_INFO @@ -1 +1,3 @@ developer documentation, extra sources, doxygen + +dir uml: html documentation generated by BOUML diff --git a/doc/devel/uml/class101.html b/doc/devel/uml/class101.html new file mode 100644 index 000000000..fa9b15fbf --- /dev/null +++ b/doc/devel/uml/class101.html @@ -0,0 +1,28 @@ + + + + + + +Class Processor + + + + + +
Class Processor
+

+ + + + +

Declaration :

Directly inherited by : RenderEngine

+
+ +
Relation output (<unidirectional association>)

Declaration :

+
Attribut start
+

Declaration :

begin of the timerange covered by this processor

+
Attribut end
+

Declaration :

end of the timerange (excl)

+ + diff --git a/wiki/renderengine/class91.html b/doc/devel/uml/class105.html similarity index 86% rename from wiki/renderengine/class91.html rename to doc/devel/uml/class105.html index d96080d50..ac8690cd8 100644 --- a/wiki/renderengine/class91.html +++ b/doc/devel/uml/class105.html @@ -15,8 +15,8 @@ - -

Declaration :

+ +

Declaration :

diff --git a/doc/devel/uml/class106.html b/doc/devel/uml/class106.html new file mode 100644 index 000000000..e16822541 --- /dev/null +++ b/doc/devel/uml/class106.html @@ -0,0 +1,24 @@ + + + + + + +Class ProcNode + + + + + +
Class ProcNode
+

+ + + + +

Declaration :

Directly inherited by : ExitNode Hub Link Source Trafo

+
+ +
Relation datasrc (<unidirectional association>)

Declaration :

The predecessor in a processing pipeline, i.e. a source to get data to be processed

+ + diff --git a/wiki/renderengine/class93.html b/doc/devel/uml/class108.html similarity index 71% rename from wiki/renderengine/class93.html rename to doc/devel/uml/class108.html index bf0f5ab81..50ca20cd6 100644 --- a/wiki/renderengine/class93.html +++ b/doc/devel/uml/class108.html @@ -15,8 +15,8 @@ - -

Declaration :

Directly inherited by : Mask PluginAdapter Projector

+ +

Declaration :

Directly inherited by : Mask PluginAdapter Projector

diff --git a/wiki/renderengine/class94.html b/doc/devel/uml/class109.html similarity index 80% rename from wiki/renderengine/class94.html rename to doc/devel/uml/class109.html index 9b0589b67..20fd4c803 100644 --- a/wiki/renderengine/class94.html +++ b/doc/devel/uml/class109.html @@ -15,8 +15,8 @@ - -

Declaration :

Directly inherited by : OpenGLPipe

+ +

Declaration :

Directly inherited by : OpenGLPipe

diff --git a/wiki/renderengine/class95.html b/doc/devel/uml/class110.html similarity index 87% rename from wiki/renderengine/class95.html rename to doc/devel/uml/class110.html index af40c3ca7..25431c38f 100644 --- a/wiki/renderengine/class95.html +++ b/doc/devel/uml/class110.html @@ -15,8 +15,8 @@ - -

Declaration :

+ +

Declaration :

diff --git a/wiki/renderengine/class96.html b/doc/devel/uml/class111.html similarity index 87% rename from wiki/renderengine/class96.html rename to doc/devel/uml/class111.html index 528c7e640..b1180f177 100644 --- a/wiki/renderengine/class96.html +++ b/doc/devel/uml/class111.html @@ -15,8 +15,8 @@ - -

Declaration :

+ +

Declaration :

  • C++ : class Projector : public Trafo
diff --git a/wiki/renderengine/class97.html b/doc/devel/uml/class112.html similarity index 87% rename from wiki/renderengine/class97.html rename to doc/devel/uml/class112.html index c72200bf9..52b1f337a 100644 --- a/wiki/renderengine/class97.html +++ b/doc/devel/uml/class112.html @@ -15,8 +15,8 @@ - -

Declaration :

  • C++ : class Mask : public Trafo
+ +

Declaration :

  • C++ : class Mask : public Trafo
diff --git a/wiki/renderengine/class98.html b/doc/devel/uml/class113.html similarity index 86% rename from wiki/renderengine/class98.html rename to doc/devel/uml/class113.html index e63dc5c68..b9ffc50a1 100644 --- a/wiki/renderengine/class98.html +++ b/doc/devel/uml/class113.html @@ -15,8 +15,8 @@ - -

Declaration :

  • C++ : class PluginAdapter : public Trafo
+ +

Declaration :

  • C++ : class PluginAdapter : public Trafo
diff --git a/wiki/renderengine/class99.html b/doc/devel/uml/class114.html similarity index 87% rename from wiki/renderengine/class99.html rename to doc/devel/uml/class114.html index 6b816617d..adac24572 100644 --- a/wiki/renderengine/class99.html +++ b/doc/devel/uml/class114.html @@ -15,8 +15,8 @@ - -

Declaration :

  • C++ : class OpenGLPipe : public Link
+ +

Declaration :

  • C++ : class OpenGLPipe : public Link
diff --git a/wiki/renderengine/class100.html b/doc/devel/uml/class115.html similarity index 88% rename from wiki/renderengine/class100.html rename to doc/devel/uml/class115.html index f4d19be30..ebe105cf5 100644 --- a/wiki/renderengine/class100.html +++ b/doc/devel/uml/class115.html @@ -15,8 +15,8 @@ - -

Declaration :

+ +

Declaration :

diff --git a/wiki/renderengine/class101.html b/doc/devel/uml/class116.html similarity index 88% rename from wiki/renderengine/class101.html rename to doc/devel/uml/class116.html index 037eb4cba..44d2ee9ae 100644 --- a/wiki/renderengine/class101.html +++ b/doc/devel/uml/class116.html @@ -15,8 +15,8 @@ - -

Declaration :

+ +

Declaration :

diff --git a/wiki/renderengine/class102.html b/doc/devel/uml/class117.html similarity index 88% rename from wiki/renderengine/class102.html rename to doc/devel/uml/class117.html index 1fd1eb01b..e8567241a 100644 --- a/wiki/renderengine/class102.html +++ b/doc/devel/uml/class117.html @@ -15,8 +15,8 @@ - -

Declaration :

+ +

Declaration :

diff --git a/wiki/renderengine/class103.html b/doc/devel/uml/class118.html similarity index 59% rename from wiki/renderengine/class103.html rename to doc/devel/uml/class118.html index 75897a78a..a57dda746 100644 --- a/wiki/renderengine/class103.html +++ b/doc/devel/uml/class118.html @@ -15,10 +15,7 @@ - -

Declaration :

  • C++ : class Frame
  • Java : package interface Frame

Directly inherited by : AFrame GLBuf VFrame

-
- -
Relation <unidirectional association>

Declaration :

+ +

Declaration :

  • C++ : class Frame
  • Java : package interface Frame

Directly inherited by : AFrame GLBuf VFrame

diff --git a/wiki/renderengine/class105.html b/doc/devel/uml/class119.html similarity index 88% rename from wiki/renderengine/class105.html rename to doc/devel/uml/class119.html index c06a22987..3d8194786 100644 --- a/wiki/renderengine/class105.html +++ b/doc/devel/uml/class119.html @@ -15,8 +15,8 @@ - -

Declaration :

  • C++ : class AFrame : public Frame
+ +

Declaration :

  • C++ : class AFrame : public Frame
diff --git a/wiki/renderengine/class106.html b/doc/devel/uml/class120.html similarity index 88% rename from wiki/renderengine/class106.html rename to doc/devel/uml/class120.html index f3cb16c67..f4d8cac21 100644 --- a/wiki/renderengine/class106.html +++ b/doc/devel/uml/class120.html @@ -15,8 +15,8 @@ - -

Declaration :

  • C++ : class VFrame : public Frame
+ +

Declaration :

  • C++ : class VFrame : public Frame
diff --git a/wiki/renderengine/class107.html b/doc/devel/uml/class121.html similarity index 87% rename from wiki/renderengine/class107.html rename to doc/devel/uml/class121.html index 9c9f32c24..6347e8146 100644 --- a/wiki/renderengine/class107.html +++ b/doc/devel/uml/class121.html @@ -15,8 +15,8 @@ - -

Declaration :

  • C++ : class GLBuf : public Frame
+ +

Declaration :

  • C++ : class GLBuf : public Frame
diff --git a/wiki/renderengine/class108.html b/doc/devel/uml/class122.html similarity index 87% rename from wiki/renderengine/class108.html rename to doc/devel/uml/class122.html index 898b13da7..56aaecef1 100644 --- a/wiki/renderengine/class108.html +++ b/doc/devel/uml/class122.html @@ -15,8 +15,8 @@ - -

Declaration :

+ +

Declaration :

diff --git a/wiki/renderengine/class112.html b/doc/devel/uml/class126.html similarity index 64% rename from wiki/renderengine/class112.html rename to doc/devel/uml/class126.html index a24ead126..56f21dadd 100644 --- a/wiki/renderengine/class112.html +++ b/doc/devel/uml/class126.html @@ -4,22 +4,22 @@ -Class StreamProvider +Class FrameProvider -
Class StreamProvider
+
Class FrameProvider

- -

Declaration :

  • C++ : class StreamProvider

Note: just a Placeholder for my design. Cehteh will ceratinly know much better how to organize this

- -
Operation prepareStream

Declaration :

  • Uml : + prepareStream() :
  • C++ : public: prepareStream()
+ +

Declaration :

  • C++ : class FrameProvider

Note: just a Placeholder for my design. Cehteh will ceratinly know much better how to organize this

+ +
Operation prepareStream

Declaration :

  • Uml : + prepareStream() :
  • C++ : public: prepareStream()
Operation getReady

Declaration :

  • Uml : + getReady() :
  • C++ : public: getReady()
-

All public operations : getReady , prepareStream

+

All public operations : getReady , prepareStream

diff --git a/wiki/renderengine/class20.html b/doc/devel/uml/class22.html similarity index 61% rename from wiki/renderengine/class20.html rename to doc/devel/uml/class22.html index 3362822c9..bb5f814c6 100644 --- a/wiki/renderengine/class20.html +++ b/doc/devel/uml/class22.html @@ -15,10 +15,10 @@ - +

Declaration :

  • C++ : class Session
- -
Relation edls (<directional aggregation>)

Declaration :

  • Uml : # edls : EDL, multiplicity : 1..*
  • C++ : protected: EDL * edls
-
Relation fixture (<directional aggregation by value>)

Declaration :

  • Uml : # fixture : Fixture, multiplicity : 1
  • C++ : protected: Fixture fixture
+ +
Relation edls (<directional aggregation>)

Declaration :

  • Uml : # edls : EDL, multiplicity : 1..*
  • C++ : protected: EDL * edls
+
Relation fixture (<unidirectional association>)

Declaration :

  • Uml : # fixture : Fixture, multiplicity : 1
  • C++ : protected: Fixture * fixture
diff --git a/wiki/renderengine/class23.html b/doc/devel/uml/class25.html similarity index 68% rename from wiki/renderengine/class23.html rename to doc/devel/uml/class25.html index e8c184b81..641d7db71 100644 --- a/wiki/renderengine/class23.html +++ b/doc/devel/uml/class25.html @@ -15,11 +15,11 @@ - -

Declaration :

  • C++ : class EDL

Directly inherited by : Fixture

+ +

Declaration :

  • C++ : class EDL

Directly inherited by : Fixture

- -
Relation tracks (<directional aggregation by value>)

Declaration :

  • Uml : # tracks : Track, multiplicity : *
  • C++ : protected: Track tracks
-
Relation clips (<directional aggregation>)

Declaration :

  • Uml : # clips : MObject, multiplicity : *
  • C++ : protected: MObject * clips
+ +
Relation tracks (<directional aggregation by value>)

Declaration :

  • Uml : # tracks : Track, multiplicity : *
  • C++ : protected: Track tracks
+
Relation clips (<directional aggregation>)

Declaration :

  • Uml : # clips : MObject, multiplicity : *
  • C++ : protected: MObject * clips
diff --git a/wiki/renderengine/class26.html b/doc/devel/uml/class28.html similarity index 63% rename from wiki/renderengine/class26.html rename to doc/devel/uml/class28.html index 50052fd3c..781cbb3f5 100644 --- a/wiki/renderengine/class26.html +++ b/doc/devel/uml/class28.html @@ -15,13 +15,13 @@ - -

Declaration :

  • C++ : class Fixture : public EDL
- -
Relation tracks (<directional aggregation by value>)

Declaration :

  • Uml : # tracks : Track, multiplicity : 1..*
  • C++ : protected: Track tracks
-
Relation timeline (<directional aggregation by value>)

Declaration :

-
Operation getPlaylistForRender

Declaration :

  • Uml : + getPlaylistForRender() :
  • C++ : public: getPlaylistForRender()
+ +

Declaration :

  • C++ : class Fixture : public EDL
+ +
Relation tracks (<directional aggregation by value>)

Declaration :

  • Uml : # tracks : Track, multiplicity : 1..*
  • C++ : protected: Track tracks
+
Relation timeline (<directional aggregation by value>)

Declaration :

+
Operation getPlaylistForRender

Declaration :

  • Uml : + getPlaylistForRender() :
  • C++ : public: getPlaylistForRender()
Operation getAutomation

Declaration :

  • Uml : + getAutomation() :
  • C++ : public: getAutomation()
-

All public operations : getAutomation , getPlaylistForRender

+

All public operations : getAutomation , getPlaylistForRender

diff --git a/wiki/renderengine/class31.html b/doc/devel/uml/class33.html similarity index 96% rename from wiki/renderengine/class31.html rename to doc/devel/uml/class33.html index bdbca81a5..8d68bceee 100644 --- a/wiki/renderengine/class31.html +++ b/doc/devel/uml/class33.html @@ -15,6 +15,6 @@ - +

Declaration :

  • C++ : class Track
diff --git a/wiki/renderengine/class32.html b/doc/devel/uml/class34.html similarity index 73% rename from wiki/renderengine/class32.html rename to doc/devel/uml/class34.html index 608b29aed..13f13f349 100644 --- a/wiki/renderengine/class32.html +++ b/doc/devel/uml/class34.html @@ -15,10 +15,10 @@ - -

Declaration :

  • C++ : class MObject
  • Java : public interface MObject

Directly inherited by : AbstractMO

+ +

Declaration :

  • C++ : class MObject
  • Java : public interface MObject

Directly inherited by : AbstractMO

- -
Relation placement (<association>)

Declaration :

+ +
Relation placement (<association>)

Declaration :

diff --git a/wiki/renderengine/class34.html b/doc/devel/uml/class36.html similarity index 66% rename from wiki/renderengine/class34.html rename to doc/devel/uml/class36.html index 4dfee44fe..8f1b815c6 100644 --- a/wiki/renderengine/class34.html +++ b/doc/devel/uml/class36.html @@ -15,12 +15,12 @@ - -

Declaration :

  • C++ : class Placement
  • Java : public interface Placement

Directly inherited by : Allocation DirectPlacement ExplicitePlacement RelativePlacement

+ +

Declaration :

  • C++ : class Placement
  • Java : public interface Placement

Directly inherited by : Allocation DirectPlacement ExplicitePlacement RelativePlacement

- -
Relation subject (<association>)

Declaration :

  • Uml : # subject : MObject, multiplicity : 1
  • C++ : protected: MObject * subject
-
Operation resolve

Declaration :

create an actual (explicite) placement while trying to satisfy the network of adjacent objects and placements.

-

All public operations : resolve

+ +
Relation subject (<association>)

Declaration :

  • Uml : # subject : MObject, multiplicity : 1
  • C++ : protected: MObject * subject
+
Operation resolve

Declaration :

create an actual (explicite) placement while trying to satisfy the network of adjacent objects and placements.

+

All public operations : resolve

diff --git a/wiki/renderengine/class37.html b/doc/devel/uml/class39.html similarity index 58% rename from wiki/renderengine/class37.html rename to doc/devel/uml/class39.html index 14ec9db8d..0c10135cc 100644 --- a/wiki/renderengine/class37.html +++ b/doc/devel/uml/class39.html @@ -15,9 +15,11 @@ - -

Declaration :

  • C++ : class AbstractMO : public MObject

Directly inherited by : Clip Effect Meta

+ +

Declaration :

  • C++ : class AbstractMO : public MObject

Directly inherited by : Clip Effect Meta

-
+ +
Attribut length
+

Declaration :

  • Uml : # length : long
  • C++ : protected: long length
diff --git a/wiki/renderengine/class38.html b/doc/devel/uml/class41.html similarity index 66% rename from wiki/renderengine/class38.html rename to doc/devel/uml/class41.html index 8c98d88f0..a20cd4266 100644 --- a/wiki/renderengine/class38.html +++ b/doc/devel/uml/class41.html @@ -15,8 +15,10 @@ - -

Declaration :

-
+ +

Declaration :

+ +
Attribut start
+

Declaration :

  • Uml : # start : long
  • C++ : protected: long start

startpos in source

diff --git a/wiki/renderengine/class39.html b/doc/devel/uml/class43.html similarity index 64% rename from wiki/renderengine/class39.html rename to doc/devel/uml/class43.html index b22b301a3..53b9cd7e7 100644 --- a/wiki/renderengine/class39.html +++ b/doc/devel/uml/class43.html @@ -15,8 +15,10 @@ - -

Declaration :

-
+ +

Declaration :

+ +
Attribut plugID
+

Declaration :

  • Uml : # plugID : string
  • C++ : protected: string plugID

Identifier of the Plugin to be used

diff --git a/wiki/renderengine/class40.html b/doc/devel/uml/class45.html similarity index 76% rename from wiki/renderengine/class40.html rename to doc/devel/uml/class45.html index 85f829935..38ba4549b 100644 --- a/wiki/renderengine/class40.html +++ b/doc/devel/uml/class45.html @@ -15,8 +15,8 @@ - -

Declaration :

Directly inherited by : Auto Label

+ +

Declaration :

Directly inherited by : Auto Label

diff --git a/wiki/renderengine/class41.html b/doc/devel/uml/class46.html similarity index 76% rename from wiki/renderengine/class41.html rename to doc/devel/uml/class46.html index eb6136a91..af2ac828b 100644 --- a/wiki/renderengine/class41.html +++ b/doc/devel/uml/class46.html @@ -15,9 +15,9 @@ - -

Declaration :

+ +

Declaration :

-

All public operations : resolve

+

All public operations : resolve

diff --git a/wiki/renderengine/class42.html b/doc/devel/uml/class47.html similarity index 57% rename from wiki/renderengine/class42.html rename to doc/devel/uml/class47.html index 71248c9e2..71463ffe0 100644 --- a/wiki/renderengine/class42.html +++ b/doc/devel/uml/class47.html @@ -15,12 +15,15 @@ - -

Declaration :

  • C++ : class RelativePlacement : public Placement
- -
Relation anchor (<unidirectional association>)

Declaration :

  • Uml : # anchor : MObject, multiplicity : 1
  • C++ : protected: MObject * anchor
+ +

Declaration :

  • C++ : class RelativePlacement : public Placement
+ +
Relation anchor (<unidirectional association>)

Declaration :

  • Uml : # anchor : MObject, multiplicity : 1
  • C++ : protected: MObject * anchor
Attribut relType
-

Declaration :

  • Uml : # relType :
  • C++ : protected: relType
-

All public operations : resolve

+

Declaration :

  • Uml : # relType :
  • C++ : protected: relType
+
Attribut offset
+

Declaration :

  • Uml : # offset : long
  • C++ : protected: long offset

Offset the actual position by this (time) value relative to the anchor point

Class RelType
+
+

All public operations : resolve

diff --git a/doc/devel/uml/class51.html b/doc/devel/uml/class51.html new file mode 100644 index 000000000..1cad98a9a --- /dev/null +++ b/doc/devel/uml/class51.html @@ -0,0 +1,27 @@ + + + + + + +Class RelType + + + + + +
Class RelType
+

+ + + + +

Declaration :

  • C++ : enum RelType
  • Java : protected enum RelType

nested in RelativePlacement

+
+

Items :

    +
  • SAMETIME
    • +
  • ATTACH
    • +
+
+ + diff --git a/wiki/renderengine/class45.html b/doc/devel/uml/class54.html similarity index 55% rename from wiki/renderengine/class45.html rename to doc/devel/uml/class54.html index 8a90a7f34..86a16fb2c 100644 --- a/wiki/renderengine/class45.html +++ b/doc/devel/uml/class54.html @@ -15,10 +15,12 @@ - -

Declaration :

Directly inherited by : Constraint Wish

+ +

Declaration :

Directly inherited by : Constraint Wish

a directive to place a MObject in a specific way

-
-

All public operations : resolve

+ +
Attribut repr
+

Declaration :

  • Uml : # repr : string
  • C++ : protected: string repr

human readable representation of the condition characterizing this allocaton, e.g. "t >= 10"

+

All public operations : resolve

diff --git a/wiki/renderengine/class46.html b/doc/devel/uml/class56.html similarity index 88% rename from wiki/renderengine/class46.html rename to doc/devel/uml/class56.html index 2c26a9afb..909c5c3d4 100644 --- a/wiki/renderengine/class46.html +++ b/doc/devel/uml/class56.html @@ -15,8 +15,8 @@ - -

Declaration :

  • C++ : class Label : public Meta
+ +

Declaration :

  • C++ : class Label : public Meta
diff --git a/wiki/renderengine/class47.html b/doc/devel/uml/class57.html similarity index 65% rename from wiki/renderengine/class47.html rename to doc/devel/uml/class57.html index eb04ece04..fd145dc3d 100644 --- a/wiki/renderengine/class47.html +++ b/doc/devel/uml/class57.html @@ -15,15 +15,15 @@ - -

Declaration :

  • C++ : class ExplicitePlacement : public Placement
  • Java : public interface ExplicitePlacement

Directly inherited by : DirectPlacement

+ +

Declaration :

  • C++ : class ExplicitePlacement : public Placement
  • Java : public interface ExplicitePlacement

Directly inherited by : DirectPlacement

- +
Attribut time
-

Declaration :

  • Uml : # time : long
  • C++ : protected: long time
+

Declaration :

  • Uml : # time : long
  • C++ : protected: long time
Attribut track
-

Declaration :

-
Relation <unidirectional association>

Declaration :

-

All public operations : resolve

+

Declaration :

+
Relation <unidirectional association>

Declaration :

+

All public operations : resolve

diff --git a/wiki/renderengine/class51.html b/doc/devel/uml/class61.html similarity index 88% rename from wiki/renderengine/class51.html rename to doc/devel/uml/class61.html index c6cd6cd11..3fa6dd237 100644 --- a/wiki/renderengine/class51.html +++ b/doc/devel/uml/class61.html @@ -15,8 +15,8 @@ - -

Declaration :

  • C++ : class Auto : public Meta
+ +

Declaration :

  • C++ : class Auto : public Meta
diff --git a/wiki/renderengine/class52.html b/doc/devel/uml/class62.html similarity index 81% rename from wiki/renderengine/class52.html rename to doc/devel/uml/class62.html index 218d02b81..edc288cd0 100644 --- a/wiki/renderengine/class52.html +++ b/doc/devel/uml/class62.html @@ -15,9 +15,9 @@ - -

Declaration :

+ +

Declaration :

-

All public operations : resolve

+

All public operations : resolve

diff --git a/wiki/renderengine/class53.html b/doc/devel/uml/class63.html similarity index 81% rename from wiki/renderengine/class53.html rename to doc/devel/uml/class63.html index 87e04df53..ec23d7dc0 100644 --- a/wiki/renderengine/class53.html +++ b/doc/devel/uml/class63.html @@ -15,9 +15,9 @@ - -

Declaration :

+ +

Declaration :

-

All public operations : resolve

+

All public operations : resolve

diff --git a/wiki/renderengine/class57.html b/doc/devel/uml/class67.html similarity index 89% rename from wiki/renderengine/class57.html rename to doc/devel/uml/class67.html index 40935c4f4..1240d2914 100644 --- a/wiki/renderengine/class57.html +++ b/doc/devel/uml/class67.html @@ -15,10 +15,10 @@ - +

Declaration :

  • C++ : class BuilderFacade
- +
Operation buildEngine

Declaration :

  • Uml : + buildEngine() :
  • C++ : public: buildEngine()
-

All public operations : buildEngine

+

All public operations : buildEngine

diff --git a/wiki/renderengine/class59.html b/doc/devel/uml/class69.html similarity index 88% rename from wiki/renderengine/class59.html rename to doc/devel/uml/class69.html index 4d741df66..d95190551 100644 --- a/wiki/renderengine/class59.html +++ b/doc/devel/uml/class69.html @@ -15,10 +15,10 @@ - +

Declaration :

  • C++ : class ToolFactory
- +
Operation configure

Declaration :

  • Uml : + configure() :
  • C++ : public: configure()
-

All public operations : configure

+

All public operations : configure

diff --git a/wiki/renderengine/class61.html b/doc/devel/uml/class71.html similarity index 89% rename from wiki/renderengine/class61.html rename to doc/devel/uml/class71.html index 6d18e7952..574d44232 100644 --- a/wiki/renderengine/class61.html +++ b/doc/devel/uml/class71.html @@ -15,10 +15,10 @@ - +

Declaration :

  • C++ : class ConManager
- +
Operation getConnection

Declaration :

  • Uml : + getConnection() :
  • C++ : public: getConnection()
-

All public operations : getConnection

+

All public operations : getConnection

diff --git a/wiki/renderengine/class63.html b/doc/devel/uml/class73.html similarity index 88% rename from wiki/renderengine/class63.html rename to doc/devel/uml/class73.html index 4ea9996fd..0474d1952 100644 --- a/wiki/renderengine/class63.html +++ b/doc/devel/uml/class73.html @@ -15,10 +15,10 @@ - +

Declaration :

  • C++ : class Assembler
- +
Operation build

Declaration :

  • Uml : + build() :
  • C++ : public: build()
-

All public operations : build

+

All public operations : build

diff --git a/wiki/renderengine/class65.html b/doc/devel/uml/class75.html similarity index 68% rename from wiki/renderengine/class65.html rename to doc/devel/uml/class75.html index b887d0295..e110729dd 100644 --- a/wiki/renderengine/class65.html +++ b/doc/devel/uml/class75.html @@ -15,10 +15,10 @@ - -

Declaration :

  • C++ : class StateProxy
  • Java : package interface StateProxy

Directly inherited by : ARender GLRender VRender

+ +

Declaration :

  • C++ : class StateProxy
  • Java : package interface StateProxy

Directly inherited by : ARender GLRender VRender

- -
Relation currFrame (<unidirectional association>)

Declaration :

  • Uml : # currFrame : Frame
  • C++ : protected: Frame * currFrame
+ +
Relation currFrame (<unidirectional association>)

Declaration :

  • Uml : # currFrame : Frame
  • C++ : protected: Frame * currFrame
diff --git a/wiki/renderengine/class70.html b/doc/devel/uml/class80.html similarity index 96% rename from wiki/renderengine/class70.html rename to doc/devel/uml/class80.html index f74fdddd1..0219ca00d 100644 --- a/wiki/renderengine/class70.html +++ b/doc/devel/uml/class80.html @@ -15,6 +15,6 @@ - +

Declaration :

  • C++ : class ControllerFacade
diff --git a/wiki/renderengine/class71.html b/doc/devel/uml/class81.html similarity index 89% rename from wiki/renderengine/class71.html rename to doc/devel/uml/class81.html index b246c37bd..02da5261d 100644 --- a/wiki/renderengine/class71.html +++ b/doc/devel/uml/class81.html @@ -15,10 +15,10 @@ - +

Declaration :

  • C++ : class PathManager
- +
Operation buildProcessor

Declaration :

  • Uml : + buildProcessor() :
  • C++ : public: buildProcessor()
-

All public operations : buildProcessor

+

All public operations : buildProcessor

diff --git a/wiki/renderengine/class73.html b/doc/devel/uml/class83.html similarity index 89% rename from wiki/renderengine/class73.html rename to doc/devel/uml/class83.html index 10c79ab76..f34265c58 100644 --- a/wiki/renderengine/class73.html +++ b/doc/devel/uml/class83.html @@ -15,10 +15,10 @@ - +

Declaration :

  • C++ : class RenderState
- +
Operation getStateProxy

Declaration :

  • Uml : + getStateProxy() :
  • C++ : public: getStateProxy()
-

All public operations : getStateProxy

+

All public operations : getStateProxy

diff --git a/wiki/renderengine/class86.html b/doc/devel/uml/class98.html similarity index 69% rename from wiki/renderengine/class86.html rename to doc/devel/uml/class98.html index 2714afbae..fbc171302 100644 --- a/wiki/renderengine/class86.html +++ b/doc/devel/uml/class98.html @@ -15,11 +15,11 @@ - -

Declaration :

- -
Operation play

Declaration :

  • Uml : + play() :
  • C++ : public: play()
-
Relation renderSegments (<directional aggregation by value>)

Declaration :

  • Uml : - renderSegments : Processor, multiplicity : 0..*
  • C++ : private: Processor renderSegments
-

All public operations : play

+ +

Declaration :

+ +
Operation play

Declaration :

  • Uml : + play() :
  • C++ : public: play()
+
Relation renderSegments (<directional aggregation by value>)

Declaration :

  • Uml : - renderSegments : Processor, multiplicity : 0..*
  • C++ : private: Processor renderSegments
+

All public operations : play

diff --git a/wiki/renderengine/classdiagrams.html b/doc/devel/uml/classdiagrams.html similarity index 87% rename from wiki/renderengine/classdiagrams.html rename to doc/devel/uml/classdiagrams.html index 17dfee4a7..ff642e758 100644 --- a/wiki/renderengine/classdiagrams.html +++ b/doc/devel/uml/classdiagrams.html @@ -16,8 +16,8 @@ - - + +
Controller Entities
Render Entities
Controller Entities
Render Entities
Session structure
diff --git a/wiki/renderengine/classes.html b/doc/devel/uml/classes.html similarity index 59% rename from wiki/renderengine/classes.html rename to doc/devel/uml/classes.html index 6a16597dd..c6ad30387 100644 --- a/wiki/renderengine/classes.html +++ b/doc/devel/uml/classes.html @@ -16,52 +16,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
AbstractMO
AFrame
Allocationa directive to place a MObject in a specific way
ARender
Assembler
Auto
BuilderFacadeboundary
Clip
ConManager
Constraint
ControllerFacadeboundary
DirectPlacement
EDL
Effect
ExitNode
ExplicitePlacementinterface
Fixture
Frameinterface
GLBuf
GLRender
Hub
Label
Link
Mask
Meta
MObjectinterface
OpenGLPipe
PathManager
Placementinterface
PluginAdapter
Processor
ProcNodeinterface
Projector
RelativePlacement
RenderEngine
RenderState
Session
Source
StateProxyinterface
StreamProviderboundaryNote: just a Placeholder for my design. Cehteh will ceratinly know much better how to organize this
ToolFactory
Track
Trafo
VFrame
VRender
Wish
AbstractMO
AFrame
Allocationa directive to place a MObject in a specific way
ARender
Assembler
Auto
BuilderFacadeboundary
Clip
ConManager
Constraint
ControllerFacadeboundary
DirectPlacement
EDL
Effect
ExitNode
ExplicitePlacementinterface
Fixture
Frameinterface
FrameProviderboundaryNote: just a Placeholder for my design. Cehteh will ceratinly know much better how to organize this
GLBuf
GLRender
Hub
Label
Link
Mask
Meta
MObjectinterface
OpenGLPipe
PathManager
Placementinterface
PluginAdapter
Processor
ProcNodeinterface
Projector
RelativePlacement
RelTypeenum
RenderEngine
RenderState
Session
Source
StateProxyinterface
ToolFactory
Track
Trafo
VFrame
VRender
Wish
diff --git a/doc/devel/uml/classes_list.html b/doc/devel/uml/classes_list.html new file mode 100644 index 000000000..03c70033b --- /dev/null +++ b/doc/devel/uml/classes_list.html @@ -0,0 +1,71 @@ + + + + + + +Classes + + + + + +
Classes
+

+ + + + + + + +
AbstractMO
+AFrame
+Allocation
+ARender
+Assembler
+Auto
+BuilderFacade
+Clip
+ConManager
+Constraint
+ControllerFacade
+DirectPlacement
+EDL
+Effect
+ExitNode
+ExplicitePlacement
+Fixture
+Frame
+FrameProvider
+GLBuf
+GLRender
+Hub
+Label
+Link
+Mask
+Meta
+MObject
+OpenGLPipe
+PathManager
+Placement
+PluginAdapter
+Processor
+ProcNode
+Projector
+RelativePlacement
+RelType
+RenderEngine
+RenderState
+Session
+Source
+StateProxy
+ToolFactory
+Track
+Trafo
+VFrame
+VRender
+Wish
+
+ + diff --git a/wiki/renderengine/collaborationdiagrams.html b/doc/devel/uml/collaborationdiagrams.html similarity index 92% rename from wiki/renderengine/collaborationdiagrams.html rename to doc/devel/uml/collaborationdiagrams.html index fa8019a48..e934480ee 100644 --- a/wiki/renderengine/collaborationdiagrams.html +++ b/doc/devel/uml/collaborationdiagrams.html @@ -16,7 +16,7 @@ - +
build processThis figure shows the process of building and starting a RenderEngine
build processThis figure shows the process of building and starting a RenderEngine
diff --git a/wiki/renderengine/componentdiagrams.html b/doc/devel/uml/componentdiagrams.html similarity index 100% rename from wiki/renderengine/componentdiagrams.html rename to doc/devel/uml/componentdiagrams.html diff --git a/wiki/renderengine/deploymentdiagrams.html b/doc/devel/uml/deploymentdiagrams.html similarity index 91% rename from wiki/renderengine/deploymentdiagrams.html rename to doc/devel/uml/deploymentdiagrams.html index 5ded69ac5..ab17c2208 100644 --- a/wiki/renderengine/deploymentdiagrams.html +++ b/doc/devel/uml/deploymentdiagrams.html @@ -16,7 +16,7 @@ - +
Overview Render Engine
Overview Render Engine
diff --git a/doc/devel/uml/fig1.png b/doc/devel/uml/fig1.png new file mode 100644 index 000000000..337145bff Binary files /dev/null and b/doc/devel/uml/fig1.png differ diff --git a/wiki/renderengine/fig1.svg b/doc/devel/uml/fig1.svg similarity index 100% rename from wiki/renderengine/fig1.svg rename to doc/devel/uml/fig1.svg diff --git a/doc/devel/uml/fig10.png b/doc/devel/uml/fig10.png new file mode 100644 index 000000000..2e17eddea Binary files /dev/null and b/doc/devel/uml/fig10.png differ diff --git a/doc/devel/uml/fig2.png b/doc/devel/uml/fig2.png new file mode 100644 index 000000000..4ec6d5a39 Binary files /dev/null and b/doc/devel/uml/fig2.png differ diff --git a/doc/devel/uml/fig3.png b/doc/devel/uml/fig3.png new file mode 100644 index 000000000..5c319eb1f Binary files /dev/null and b/doc/devel/uml/fig3.png differ diff --git a/doc/devel/uml/fig4.png b/doc/devel/uml/fig4.png new file mode 100644 index 000000000..e49a9ce36 Binary files /dev/null and b/doc/devel/uml/fig4.png differ diff --git a/doc/devel/uml/fig5.png b/doc/devel/uml/fig5.png new file mode 100644 index 000000000..6849bd041 Binary files /dev/null and b/doc/devel/uml/fig5.png differ diff --git a/wiki/renderengine/fig4.png b/doc/devel/uml/fig6.png similarity index 100% rename from wiki/renderengine/fig4.png rename to doc/devel/uml/fig6.png diff --git a/wiki/renderengine/fig5.png b/doc/devel/uml/fig7.png similarity index 100% rename from wiki/renderengine/fig5.png rename to doc/devel/uml/fig7.png diff --git a/doc/devel/uml/fig8.png b/doc/devel/uml/fig8.png new file mode 100644 index 000000000..2891b31b9 Binary files /dev/null and b/doc/devel/uml/fig8.png differ diff --git a/doc/devel/uml/fig9.png b/doc/devel/uml/fig9.png new file mode 100644 index 000000000..bdf25a57a Binary files /dev/null and b/doc/devel/uml/fig9.png differ diff --git a/wiki/renderengine/index-withframe.html b/doc/devel/uml/index-withframe.html similarity index 91% rename from wiki/renderengine/index-withframe.html rename to doc/devel/uml/index-withframe.html index 44db32d02..cf6c2c73f 100644 --- a/wiki/renderengine/index-withframe.html +++ b/doc/devel/uml/index-withframe.html @@ -4,7 +4,7 @@ -/mnt/Lager/heim/devel/cin3/wiki/renderengine/index-withframe +/mnt/Lager/heim/devel/cin3/doc/devel/uml/index-withframe diff --git a/wiki/renderengine/index.html b/doc/devel/uml/index.html similarity index 50% rename from wiki/renderengine/index.html rename to doc/devel/uml/index.html index 86c48f6a3..15c783bc5 100644 --- a/wiki/renderengine/index.html +++ b/doc/devel/uml/index.html @@ -4,14 +4,14 @@ -cin3 +<title>cinelerra3 Documentation -
cin3
Documentation
+
cinelerra3
Documentation

@@ -72,117 +72,129 @@ Documentation

Session structure



-
Class Session
-
Class EDL
-
Class Fixture
-
Class Track
-
Class MObject
-
Class Placement
-
Class AbstractMO
-
Class Clip
-
Class Effect
-
Class Meta
-
Class DirectPlacement
-
Class RelativePlacement
-
Class Allocation
-
Class Label
-
Class ExplicitePlacement
-
Class Auto
-
Class Wish
-
Class Constraint
+ +

+

EDL Example1



+

A simple example showing how the actual objects are placed in the Fixture (=definitive playlist). It shows a Video and Audio clip placed on two tracks

+

+

EDL Example2



+

More complex example showing the Object graph in the EDL and how it is linked into the Fixture to yield the actual locations. In this example, an HUE Effect is applied on a part of the Clip

Class Session
+
Class EDL
+
Class Fixture
+
Class Track
+
Class MObject
+
Class Placement
+
Class AbstractMO
+
Class Clip
+
Class Effect
+
Class Meta
+
Class DirectPlacement
+
Class RelativePlacement
+
Class Allocation
+
Class Label
+
Class ExplicitePlacement
+
Class Auto
+
Class Wish
+
Class Constraint
- +

3.2 Package Builder

- +

3.2.1 Class View Builder Workings

- -

+ +

build process



-

This figure shows the process of building and starting a RenderEngine

Class BuilderFacade
-
Class ToolFactory
-
Class ConManager
-
Class Assembler
-
Class StateProxy
+

This figure shows the process of building and starting a RenderEngine

Class BuilderFacade
+
Class ToolFactory
+
Class ConManager
+
Class Assembler
+
Class StateProxy
- +

3.3 Package Controller

- +

3.3.1 Class View Controller Workings

- -

+ +

Controller Entities



-
Class ControllerFacade
-
Class PathManager
-
Class RenderState
+
Class ControllerFacade
+
Class PathManager
+
Class RenderState
- +

4 Package RenderEngine

- +

4.1 Deployment View Engine Parts

- -

+ +

Overview Render Engine



- +
Node timeline
- +
Node playlist
- +
Node proc
- +
Node pnode
- +
Node mStream
- +
Node State
- +

4.2 Class View Engine Workings

- -

+ +

Render Entities



-
Class RenderEngine
-
Class Processor
-
Class ExitNode
-
Class ProcNode
-
Class Trafo
-
Class Link
-
Class Hub
-
Class Projector
-
Class Mask
-
Class PluginAdapter
-
Class OpenGLPipe
-
Class ARender
-
Class VRender
-
Class GLRender
-
Class Frame
-
Class AFrame
-
Class VFrame
-
Class GLBuf
-
Class Source
+ +

+

Engine Example1



+

Example1 (from EDL) continued: here the RenderEngine to be created by the Builder from the Input shown in Example1

+

+

Engine Example2



+

Example2 (from EDL) continued: notably in this RenderEngine the Effect has been partitioned into 2 segments with constant configuration.

Class RenderEngine
+
Class Processor
+
Class ExitNode
+
Class ProcNode
+
Class Trafo
+
Class Link
+
Class Hub
+
Class Projector
+
Class Mask
+
Class PluginAdapter
+
Class OpenGLPipe
+
Class ARender
+
Class VRender
+
Class GLRender
+
Class Frame
+
Class AFrame
+
Class VFrame
+
Class GLBuf
+
Class Source
- +

5 Package CommonLib

- +

6 Package Vault

This package is used here just to hold entities thought to belong to the backend layer. The Backend is not in Focus for this Design draft.

- +

6.1 Class View Backend Components

-
Class StreamProvider
+
Class FrameProvider
- +

7 Package GUI

GUI is here just a container to hold any entities considered to be User Interface related, which is not in focus for this Design draft

diff --git a/wiki/renderengine/index_65.html b/doc/devel/uml/index_65.html similarity index 72% rename from wiki/renderengine/index_65.html rename to doc/devel/uml/index_65.html index 4bdf8591a..27060d747 100644 --- a/wiki/renderengine/index_65.html +++ b/doc/devel/uml/index_65.html @@ -17,16 +17,17 @@ - - - - + + + + - - + + - + +
NameKindDescription
AbstractMOclass
AFrameclass
Allocationclassa directive to place a MObject in a specific way
anchorrelation
AbstractMOclass
AFrameclass
Allocationclassa directive to place a MObject in a specific way
anchorrelation
Architecturecomponent viewThe various Components comprising the Cinelerra3 Video editing Application
ARenderclass
Assemblerclass
ARenderclass
Assemblerclass
AssetManagementcomponent
AssetManagerpackage
Autoclass
ATTACHattributeattach subject to anchor (e.g. an effect to a clip)
Autoclass
diff --git a/wiki/renderengine/index_66.html b/doc/devel/uml/index_66.html similarity index 77% rename from wiki/renderengine/index_66.html rename to doc/devel/uml/index_66.html index 717e561c1..03a105600 100644 --- a/wiki/renderengine/index_66.html +++ b/doc/devel/uml/index_66.html @@ -17,15 +17,15 @@ - - - - + + + + - - - - + + + +
NameKindDescription
Backend Componentsclass view
buildoperation
build processcollaboration diagramThis figure shows the process of building and starting a RenderEngine
buildEngineoperation
Backend Componentsclass view
buildoperation
build processcollaboration diagramThis figure shows the process of building and starting a RenderEngine
buildEngineoperation
Buildercomponent
Builderpackage
Builder Workingsclass view
BuilderFacadeclass
buildProcessoroperation
Builderpackage
Builder Workingsclass view
BuilderFacadeclass
buildProcessoroperation
diff --git a/wiki/renderengine/index_67.html b/doc/devel/uml/index_67.html similarity index 69% rename from wiki/renderengine/index_67.html rename to doc/devel/uml/index_67.html index e5c04a7ec..2ab1febc9 100644 --- a/wiki/renderengine/index_67.html +++ b/doc/devel/uml/index_67.html @@ -18,19 +18,19 @@ - - - - - - - + + + + + + + - - - - - + + + + +
NameKindDescription
Cachecomponent
cin3package
Clipclass
clipsrelation
CommonLibpackage
configureoperation
ConManagerclass
Constraintclass
cinelerra3package
Clipclass
clipsrelation
CommonLibpackage
configureoperation
ConManagerclass
Constraintclass
Controllercomponent
Controllerpackage
Controller Entitiesclass diagram
Controller Workingsclass view
ControllerFacadeclass
currFramerelation
Controllerpackage
Controller Entitiesclass diagram
Controller Workingsclass view
ControllerFacadeclass
currFramerelation
diff --git a/wiki/renderengine/index_68.html b/doc/devel/uml/index_68.html similarity index 80% rename from wiki/renderengine/index_68.html rename to doc/devel/uml/index_68.html index 36986e68d..f289ee221 100644 --- a/wiki/renderengine/index_68.html +++ b/doc/devel/uml/index_68.html @@ -17,8 +17,9 @@ + - +
NameKindDescription
datasrcrelationThe predecessor in a processing pipeline, i.e. a source to get data to be processed
designpackageAll things concering the big picture.
Not a real code package, rather a container for design drafts, specifications, decisions.
DirectPlacementclass
DirectPlacementclass
Dispatchercomponent
diff --git a/doc/devel/uml/index_69.html b/doc/devel/uml/index_69.html new file mode 100644 index 000000000..34ddca130 --- /dev/null +++ b/doc/devel/uml/index_69.html @@ -0,0 +1,36 @@ + + + + + + +E + + + + + +
E
+

+ + + + + + + + + + + + + + + + + + + +
NameKindDescription
EDLclass
EDLcomponent
EDL Example1object diagramA simple example showing how the actual objects are placed in the Fixture (=definitive playlist). It shows a Video and Audio clip placed on two tracks
EDL Example2object diagramMore complex example showing the Object graph in the EDL and how it is linked into the Fixture to yield the actual locations. In this example, an HUE Effect is applied on a part of the Clip
edlsrelation
Effectclass
endattributeend of the timerange (excl)
Enginecomponent
Engine Example1object diagramExample1 (from EDL) continued: here the RenderEngine to be created by the Builder from the Input shown in Example1
Engine Example2object diagramExample2 (from EDL) continued: notably in this RenderEngine the Effect has been partitioned into 2 segments with constant configuration.
Engine Partsdeployment view
Engine Workingsclass view
ExitNodeclass
ExplicitePlacementclass
+ + diff --git a/wiki/renderengine/index_70.html b/doc/devel/uml/index_70.html similarity index 70% rename from wiki/renderengine/index_70.html rename to doc/devel/uml/index_70.html index b094de41d..c59d89abd 100644 --- a/wiki/renderengine/index_70.html +++ b/doc/devel/uml/index_70.html @@ -17,10 +17,11 @@ - - + - + + +
NameKindDescription
fixturerelation
Fixtureclass
Fixtureclass
Fixturecomponent
Frameclass
fixturerelation
Frameclass
FrameProviderclassNote: just a Placeholder for my design. Cehteh will ceratinly know much better how to organize this
diff --git a/wiki/renderengine/index_71.html b/doc/devel/uml/index_71.html similarity index 72% rename from wiki/renderengine/index_71.html rename to doc/devel/uml/index_71.html index ff1cf9ec9..a0af49c7b 100644 --- a/wiki/renderengine/index_71.html +++ b/doc/devel/uml/index_71.html @@ -17,14 +17,14 @@ - - - - - - - - + + + + + + + +
NameKindDescription
getAutomationoperation
getConnectionoperation
getPlaylistForRenderoperation
getReadyoperation
getStateProxyoperation
GLBufclass
GLRenderclass
GUIpackageGUI is here just a container to hold any entities considered to be User Interface related, which is not in focus for this Design draft
getAutomationoperation
getConnectionoperation
getPlaylistForRenderoperation
getReadyoperation
getStateProxyoperation
GLBufclass
GLRenderclass
GUIpackageGUI is here just a container to hold any entities considered to be User Interface related, which is not in focus for this Design draft
diff --git a/wiki/renderengine/index_72.html b/doc/devel/uml/index_72.html similarity index 84% rename from wiki/renderengine/index_72.html rename to doc/devel/uml/index_72.html index f7f8cb3a7..4c5e6bbaf 100644 --- a/wiki/renderengine/index_72.html +++ b/doc/devel/uml/index_72.html @@ -17,7 +17,7 @@ - +
NameKindDescription
Hubclass
Hubclass
diff --git a/wiki/renderengine/index_76.html b/doc/devel/uml/index_76.html similarity index 69% rename from wiki/renderengine/index_76.html rename to doc/devel/uml/index_76.html index a6432f656..5cb7cac68 100644 --- a/wiki/renderengine/index_76.html +++ b/doc/devel/uml/index_76.html @@ -17,8 +17,9 @@ - - + + +
NameKindDescription
Labelclass
Linkclass
Labelclass
lengthattribute
Linkclass
diff --git a/wiki/renderengine/index_77.html b/doc/devel/uml/index_77.html similarity index 75% rename from wiki/renderengine/index_77.html rename to doc/devel/uml/index_77.html index e9228808d..fc50e0afc 100644 --- a/wiki/renderengine/index_77.html +++ b/doc/devel/uml/index_77.html @@ -17,11 +17,11 @@ - - + + - - + +
NameKindDescription
Maskclass
Metaclass
Maskclass
Metaclass
MObjectpackage
MObjectclass
mStreamnode
MObjectclass
mStreamnode
diff --git a/wiki/renderengine/index_79.html b/doc/devel/uml/index_79.html similarity index 64% rename from wiki/renderengine/index_79.html rename to doc/devel/uml/index_79.html index f3c5d810b..5b3b9a39f 100644 --- a/wiki/renderengine/index_79.html +++ b/doc/devel/uml/index_79.html @@ -17,10 +17,11 @@ - - + + + - +
NameKindDescription
OpenGLPipeclass
outputrelation
offsetattributeOffset the actual position by this (time) value relative to the anchor point
OpenGLPipeclass
outputrelation
Overviewcomponent diagramThis drawing shows the top level compoents and relations
Overview Render Enginedeployment diagram
Overview Render Enginedeployment diagram
diff --git a/doc/devel/uml/index_80.html b/doc/devel/uml/index_80.html new file mode 100644 index 000000000..6bcc14e27 --- /dev/null +++ b/doc/devel/uml/index_80.html @@ -0,0 +1,35 @@ + + + + + + +P + + + + + +
P
+

+ + + + + + + + + + + + + + + + + + +
NameKindDescription
PathManagerclass
placementrelation
Placementclass
playoperation
playlistnode
plugIDattributeIdentifier of the Plugin to be used
PluginAdapterclass
pnodenode
prepareStreamoperation
procnode
Processorclass
ProcNodeclass
Projectorclass
+ + diff --git a/wiki/renderengine/index_82.html b/doc/devel/uml/index_82.html similarity index 63% rename from wiki/renderengine/index_82.html rename to doc/devel/uml/index_82.html index af0a7ecab..f3d2d9b84 100644 --- a/wiki/renderengine/index_82.html +++ b/doc/devel/uml/index_82.html @@ -17,15 +17,17 @@ - - - - - + + + + + + - - - + + + +
NameKindDescription
RelativePlacementclass
relTypeattribute
Render Entitiesclass diagram
RenderEnginepackage
RenderEngineclass
RelativePlacementclass
RelTypeclass
relTypeattribute
Render Entitiesclass diagram
RenderEnginepackage
RenderEngineclass
RenderPathManagercomponent
renderSegmentsrelation
RenderStateclass
resolveoperationcreate an actual (explicite) placement while trying to satisfy the network of adjacent objects and placements.
renderSegmentsrelation
RenderStateclass
reprattributehuman readable representation of the condition characterizing this allocaton, e.g. "t >= 10"
resolveoperationcreate an actual (explicite) placement while trying to satisfy the network of adjacent objects and placements.
diff --git a/wiki/renderengine/index_83.html b/doc/devel/uml/index_83.html similarity index 65% rename from wiki/renderengine/index_83.html rename to doc/devel/uml/index_83.html index 1e7c56117..2a62511af 100644 --- a/wiki/renderengine/index_83.html +++ b/doc/devel/uml/index_83.html @@ -17,16 +17,18 @@ + - + - - - + + + + + - - +
NameKindDescription
SAMETIMEattributeplace subject at the sime time then the anchor
Sessioncomponent
Sessionclass view
Sessionclass
Sessionclass
Session structureclass diagram
Sourceclass
Statenode
StateProxyclass
Sourceclass
startattributestartpos in source
startattributebegin of the timerange covered by this processor
Statenode
StateProxyclass
Stream Providercomponent
StreamProviderclassNote: just a Placeholder for my design. Cehteh will ceratinly know much better how to organize this
subjectrelation
subjectrelation
diff --git a/wiki/renderengine/index_84.html b/doc/devel/uml/index_84.html similarity index 65% rename from wiki/renderengine/index_84.html rename to doc/devel/uml/index_84.html index c4478df6e..d12031219 100644 --- a/wiki/renderengine/index_84.html +++ b/doc/devel/uml/index_84.html @@ -17,15 +17,15 @@ - - - - - - - - - + + + + + + + + +
NameKindDescription
timeattribute
timelinenode
timelinerelation
ToolFactoryclass
trackattribute
Trackclass
tracksrelation
tracksrelation
Trafoclass
timeattribute
timelinenode
timelinerelation
ToolFactoryclass
trackattribute
Trackclass
tracksrelation
tracksrelation
Trafoclass
diff --git a/wiki/renderengine/index_86.html b/doc/devel/uml/index_86.html similarity index 84% rename from wiki/renderengine/index_86.html rename to doc/devel/uml/index_86.html index bf2a140e5..ea666a484 100644 --- a/wiki/renderengine/index_86.html +++ b/doc/devel/uml/index_86.html @@ -17,9 +17,9 @@ - - - + + +
NameKindDescription
VaultpackageThis package is used here just to hold entities thought to belong to the backend layer. The Backend is not in Focus for this Design draft.
VFrameclass
VRenderclass
VaultpackageThis package is used here just to hold entities thought to belong to the backend layer. The Backend is not in Focus for this Design draft.
VFrameclass
VRenderclass
diff --git a/wiki/renderengine/index_87.html b/doc/devel/uml/index_87.html similarity index 92% rename from wiki/renderengine/index_87.html rename to doc/devel/uml/index_87.html index 6c1f93d5d..a7bc429e3 100644 --- a/wiki/renderengine/index_87.html +++ b/doc/devel/uml/index_87.html @@ -17,7 +17,7 @@ - +
NameKindDescription
Wishclass
Wishclass
diff --git a/wiki/renderengine/navig.html b/doc/devel/uml/navig.html similarity index 81% rename from wiki/renderengine/navig.html rename to doc/devel/uml/navig.html index e8901be71..5f4f179f5 100644 --- a/wiki/renderengine/navig.html +++ b/doc/devel/uml/navig.html @@ -4,12 +4,12 @@ -/mnt/Lager/heim/devel/cin3/wiki/renderengine/navig +/mnt/Lager/heim/devel/cin3/doc/devel/uml/navig

-

-Top- -Classes- -Public Operations- -Packages- -Class Diagrams- -Collaboration Diagrams- -Component Diagrams- -Deployment Diagrams-

+

-Top- -Classes- -Public Operations- -Packages- -Class Diagrams- -Object Diagrams- -Collaboration Diagrams- -Component Diagrams- -Deployment Diagrams-

A B C D E F G H L M O P R S T V W

diff --git a/doc/devel/uml/objectdiagrams.html b/doc/devel/uml/objectdiagrams.html new file mode 100644 index 000000000..aa70e6527 --- /dev/null +++ b/doc/devel/uml/objectdiagrams.html @@ -0,0 +1,25 @@ + + + + + + +Object Diagram Index + + + + + +
Object Diagram Index
+

+ + + + + + + + +
EDL Example1A simple example showing how the actual objects are placed in the Fixture (=definitive playlist). It shows a Video and Audio clip placed on two tracks
EDL Example2More complex example showing the Object graph in the EDL and how it is linked into the Fixture to yield the actual locations. In this example, an HUE Effect is applied on a part of the Clip
Engine Example1Example1 (from EDL) continued: here the RenderEngine to be created by the Builder from the Input shown in Example1
Engine Example2Example2 (from EDL) continued: notably in this RenderEngine the Effect has been partitioned into 2 segments with constant configuration.
+ + diff --git a/wiki/renderengine/packages.html b/doc/devel/uml/packages.html similarity index 79% rename from wiki/renderengine/packages.html rename to doc/devel/uml/packages.html index db48a6682..03e5443db 100644 --- a/wiki/renderengine/packages.html +++ b/doc/devel/uml/packages.html @@ -17,15 +17,15 @@ - - - - + + + + - + - - + +
AssetManager
Builder
cin3
CommonLib
Controller
Builder
cinelerra3
CommonLib
Controller
designAll things concering the big picture.
Not a real code package, rather a container for design drafts, specifications, decisions.
GUIGUI is here just a container to hold any entities considered to be User Interface related, which is not in focus for this Design draft
GUIGUI is here just a container to hold any entities considered to be User Interface related, which is not in focus for this Design draft
MObject
RenderEngine
VaultThis package is used here just to hold entities thought to belong to the backend layer. The Backend is not in Focus for this Design draft.
RenderEngine
VaultThis package is used here just to hold entities thought to belong to the backend layer. The Backend is not in Focus for this Design draft.
diff --git a/doc/devel/uml/public_operations.html b/doc/devel/uml/public_operations.html new file mode 100644 index 000000000..71e620af7 --- /dev/null +++ b/doc/devel/uml/public_operations.html @@ -0,0 +1,34 @@ + + + + + + +Public Operations Index + + + + + +
Public Operations Index
+

+ + + + + + + + + + + + + + + + + +
OperationClassDescription
buildAssembler
buildEngineBuilderFacade
buildProcessorPathManager
configureToolFactory
getAutomationFixture
getConnectionConManager
getPlaylistForRenderFixture
getReadyFrameProvider
getStateProxyRenderState
playRenderEngine
prepareStreamFrameProvider
resolvePlacementcreate an actual (explicite) placement while trying to satisfy the network of adjacent objects and placements.
+ + diff --git a/wiki/renderengine/style.css b/doc/devel/uml/style.css similarity index 100% rename from wiki/renderengine/style.css rename to doc/devel/uml/style.css diff --git a/uml/renderengine/cin3/128005 b/uml/cinelerra3/128005 similarity index 100% rename from uml/renderengine/cin3/128005 rename to uml/cinelerra3/128005 diff --git a/uml/renderengine/cin3/128005.diagram b/uml/cinelerra3/128005.diagram similarity index 100% rename from uml/renderengine/cin3/128005.diagram rename to uml/cinelerra3/128005.diagram diff --git a/uml/renderengine/cin3/128133 b/uml/cinelerra3/128133 similarity index 100% rename from uml/renderengine/cin3/128133 rename to uml/cinelerra3/128133 diff --git a/uml/renderengine/cin3/128133.diagram b/uml/cinelerra3/128133.diagram similarity index 96% rename from uml/renderengine/cin3/128133.diagram rename to uml/cinelerra3/128133.diagram index d0d705143..fca9a8889 100644 --- a/uml/renderengine/cin3/128133.diagram +++ b/uml/cinelerra3/128133.diagram @@ -2,7 +2,7 @@ format 38 classcanvas 128005 class_ref 128005 // Session 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 29 609 2000 + xyz 30 608 2000 end classcanvas 128133 class_ref 128133 // EDL 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 @@ -30,15 +30,15 @@ classcanvas 129925 class_ref 128389 // Track end classcanvas 130949 class_ref 128773 // AbstractMO 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 317 258 2000 + xyz 317 251 2000 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 279 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 - xyz 336 368 2000 + xyz 336 361 2000 end classcanvas 131973 class_ref 129157 // Meta 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,11 +50,11 @@ 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 483 361 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 - xyz 590 373 2000 + xyz 590 366 2000 end classcanvas 134405 class_ref 129669 // Label 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 @@ -87,12 +87,10 @@ classcanvas 137349 class_ref 130181 // Constraint xyz 623 485 2000 end relationcanvas 128389 relation_ref 128005 // - geometry VH - from ref 128005 z 1999 to point 54 626 - line 136453 z 1999 stereotype "<>" xyz 126 606 3000 to ref 128133 + from ref 128005 z 1999 stereotype "<>" xyz 139 627 3000 to ref 128133 role_a_pos 201 604 3000 no_role_b multiplicity_a_pos 205 637 3000 no_multiplicity_b -relationcanvas 128517 relation_ref 128133 // +relationcanvas 128517 relation_ref 128133 // from ref 128005 z 1999 to ref 128261 role_a_pos 240 870 3000 no_role_b multiplicity_a_pos 214 870 3000 no_multiplicity_b @@ -111,7 +109,7 @@ relationcanvas 129157 relation_ref 128389 // relationcanvas 129797 relation_ref 128645 // from ref 129413 z 1999 to ref 129669 role_a_pos 513 144 3000 role_b_pos 401 144 3000 - multiplicity_a_pos 557 177 3000 multiplicity_b_pos 401 177 3000 + multiplicity_a_pos 547 177 3000 multiplicity_b_pos 405 169 3000 relationcanvas 130181 relation_ref 129029 // geometry HV from ref 128261 z 1999 stereotype "<>" xyz 314 935 3000 to point 339 931 @@ -149,8 +147,8 @@ relationcanvas 132485 relation_ref 129797 // relationcanvas 132997 relation_ref 129925 // from ref 132869 z 1999 to point 486 247 line 133893 z 1999 to ref 129413 - role_a_pos 427 197 3000 no_role_b - multiplicity_a_pos 401 205 3000 multiplicity_b_pos 507 336 3000 + role_a_pos 423 192 3000 no_role_b + 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/cinelerra3/128261 similarity index 85% rename from uml/renderengine/cin3/128261 rename to uml/cinelerra3/128261 index c807c30fb..0ca47fe6e 100644 --- a/uml/renderengine/cin3/128261 +++ b/uml/cinelerra3/128261 @@ -1,6 +1,6 @@ format 38 "MObject" // MObject - revision 5 + revision 7 modified_by 5 "hiv" // class settings //class diagram settings @@ -48,6 +48,18 @@ format 38 size A4 end + objectdiagram 128773 "EDL Example1" + write_horizontally default package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default + comment "A simple example showing how the actual objects are placed in the Fixture (=definitive playlist). It shows a Video and Audio clip placed on two tracks" + size A4 + end + + objectdiagram 128901 "EDL Example2" + write_horizontally default package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default + comment "More complex example showing the Object graph in the EDL and how it is linked into the Fixture to yield the actual locations. In this example, an HUE Effect is applied on a part of the Clip" + size A4 + end + class 128005 "Session" visibility package cpp_decl "${comment}${template}class ${name}${inherit} { @@ -68,12 +80,12 @@ ${inlines} b multiplicity "" parent class_ref 128133 // EDL end - classrelation 128261 // fixture () - relation 128133 *--> + classrelation 128261 // fixture () + relation 128133 ---> a role_name "fixture" multiplicity "1" protected - cpp default " ${comment}${static}${mutable}${volatile}${const}${type} ${name}${value}; + cpp default " ${comment}${static}${mutable}${volatile}${const}${type} * ${name}${value}; " - classrelation_ref 128261 // fixture () + classrelation_ref 128261 // fixture () b multiplicity "" parent class_ref 128261 // Fixture end end @@ -200,7 +212,7 @@ ${members}}; classrelation 129029 // placement () relation 128645 ---- - a role_name "placement" multiplicity "1" protected + a role_name "placement" multiplicity "1..*" protected cpp default " ${comment}${static}${mutable}${volatile}${const}${type} * ${name}${value}; " classrelation_ref 129029 // placement () @@ -260,6 +272,15 @@ ${inlines} classrelation_ref 129925 // b multiplicity "" parent class_ref 128517 // MObject end + + attribute 128517 "length" + protected explicit_type "long" + init_value "0" + cpp_decl " ${comment}${static}${mutable}${volatile}${const}${type} ${name}${value}; +" + java_decl "" + idl_decl "" + end end class 128901 "Clip" @@ -279,6 +300,16 @@ ${inlines} classrelation_ref 130053 // b multiplicity "" parent class_ref 128773 // AbstractMO end + + attribute 128645 "start" + protected explicit_type "long" + init_value "0" + cpp_decl " ${comment}${static}${mutable}${volatile}${const}${type} ${name}${value}; +" + java_decl "" + idl_decl "" + comment "startpos in source" + end end class 129029 "Effect" @@ -298,6 +329,15 @@ ${inlines} classrelation_ref 130181 // b multiplicity "" parent class_ref 128773 // AbstractMO end + + attribute 128901 "plugID" + protected explicit_type "string" + cpp_decl " ${comment}${static}${mutable}${volatile}${const}${type} ${name}${value}; +" + java_decl "" + idl_decl "" + comment "Identifier of the Plugin to be used" + end end class 129157 "Meta" @@ -381,6 +421,48 @@ ${inlines} classrelation_ref 131333 // b multiplicity "" parent class_ref 128645 // Placement end + + attribute 129029 "offset" + protected explicit_type "long" + init_value "0" + cpp_decl " ${comment}${static}${mutable}${volatile}${const}${type} ${name}${value}; +" + java_decl "" + idl_decl "" + comment "Offset the actual position by this (time) value relative to the anchor point" + end + + class 133893 "RelType" + visibility protected stereotype "enum" + cpp_decl "${comment}enum ${name} { +${items} +}; +" + java_decl "${comment}${@}${visibility}${final}${abstract}enum ${name}${implements} { +${items}; +${members}} +" + idl_decl "${comment}enum ${name} { +${items}}; +" + explicit_switch_type "" + + attribute 129157 "SAMETIME" + public explicit_type "" + cpp_decl " ${name}${value},${comment}" + java_decl "" + idl_decl "" + comment "place subject at the sime time then the anchor" + end + + attribute 129285 "ATTACH" + public explicit_type "" + cpp_decl " ${name}${value},${comment}" + java_decl "" + idl_decl "" + comment "attach subject to anchor (e.g. an effect to a clip)" + end + end end class 129541 "Allocation" @@ -401,6 +483,15 @@ ${inlines} classrelation_ref 131205 // b multiplicity "" parent class_ref 128645 // Placement end + + attribute 128773 "repr" + protected explicit_type "string" + cpp_decl " ${comment}${static}${mutable}${volatile}${const}${type} ${name}${value}; +" + java_decl "" + idl_decl "" + comment "human readable representation of the condition characterizing this allocaton, e.g. \"t >= 10\"" + end end class 129669 "Label" diff --git a/uml/renderengine/cin3/128261.diagram b/uml/cinelerra3/128261.diagram similarity index 100% rename from uml/renderengine/cin3/128261.diagram rename to uml/cinelerra3/128261.diagram diff --git a/uml/renderengine/cin3/128389 b/uml/cinelerra3/128389 similarity index 90% rename from uml/renderengine/cin3/128389 rename to uml/cinelerra3/128389 index ab4598401..d46a3e0ee 100644 --- a/uml/renderengine/cin3/128389 +++ b/uml/cinelerra3/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/cinelerra3/128389.diagram similarity index 94% rename from uml/renderengine/cin3/128389.diagram rename to uml/cinelerra3/128389.diagram index 501e7fe3c..a70ea7935 100644 --- a/uml/renderengine/cin3/128389.diagram +++ b/uml/cinelerra3/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 b/uml/cinelerra3/128517 similarity index 100% rename from uml/renderengine/cin3/128517 rename to uml/cinelerra3/128517 diff --git a/uml/renderengine/cin3/128517.diagram b/uml/cinelerra3/128517.diagram similarity index 96% rename from uml/renderengine/cin3/128517.diagram rename to uml/cinelerra3/128517.diagram index 14becd3dc..a43b9596e 100644 --- a/uml/renderengine/cin3/128517.diagram +++ b/uml/cinelerra3/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 @@ -40,7 +40,7 @@ linkcanvas 129669 from ref 129285 z 1999 to ref 129413 dirscanvas 132357 z 1000 linkcanvas_ref 129669 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 "4 getPlaylistForRender()" xyz 216 167 3000 + forward_label "4 getPlaylistForRender()" xyz 126 222 3000 linkcanvas 130309 from ref 128133 z 1999 to ref 130053 dirscanvas 132229 z 1000 linkcanvas_ref 130309 @@ -70,7 +70,7 @@ linkcanvas 131589 from ref 129925 z 1999 to ref 129413 dirscanvas 132869 z 1000 linkcanvas_ref 131589 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 "8 getAutomation()" xyz 71 294 3000 + forward_label "8 getAutomation()" xyz 63 297 3000 linkcanvas 131845 from ref 128005 z 1999 to ref 131717 dirscanvas 133125 z 1000 linkcanvas_ref 131845 @@ -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/cinelerra3/128645 similarity index 99% rename from uml/renderengine/cin3/128645 rename to uml/cinelerra3/128645 index 8a7a234a3..34c90b8c6 100644 --- a/uml/renderengine/cin3/128645 +++ b/uml/cinelerra3/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/128645.diagram b/uml/cinelerra3/128645.diagram similarity index 100% rename from uml/renderengine/cin3/128645.diagram rename to uml/cinelerra3/128645.diagram diff --git a/uml/renderengine/cin3/128773 b/uml/cinelerra3/128773 similarity index 100% rename from uml/renderengine/cin3/128773 rename to uml/cinelerra3/128773 diff --git a/uml/cinelerra3/128773.diagram b/uml/cinelerra3/128773.diagram new file mode 100644 index 000000000..6bf42028f --- /dev/null +++ b/uml/cinelerra3/128773.diagram @@ -0,0 +1,77 @@ +format 38 + +classinstance 128005 class_ref 128261 // Fixture + xyz 65 271 2000 name "" +end +classinstance 128133 class_ref 129797 // ExplicitePlacement + xyz 217 249 2000 name "" + values + attribute_ref 128261 // time + "2" + attribute_ref 128389 // track + "video1" +end +classinstance 128389 class_ref 129797 // ExplicitePlacement + xyz 332 249 2000 name "" + values + attribute_ref 128261 // time + "2" + attribute_ref 128389 // track + "audio1" +end +fragment 128773 "seq" + xyzwh 175 235 1994 282 93 +end +classinstance 128901 class_ref 128389 // Track + xyz 70 101 2000 name "audio1" +end +classinstance 129029 class_ref 128389 // Track + xyz 71 156 2000 name "video1" +end +fragment 129285 "seq" + xyzwh 62 63 1994 94 155 +end +classinstance 130821 class_ref 128901 // Clip + xyz 239 399 2000 name "vid_A" + values + attribute_ref 128517 // length + "5" + attribute_ref 128645 // start + "100" +end +classinstance 131077 class_ref 128901 // Clip + xyz 344 399 2000 name "aud_A" + values + attribute_ref 128517 // length + "8820" + attribute_ref 128645 // start + "176400" +end +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 + from ref 128005 z 1999 to ref 128133 + no_role_a no_role_b +objectlinkcanvas 129157 norel + geometry HV + from ref 128005 z 1999 to point 107 282 + line 81 z 1999 to ref 129029 + no_role_a no_role_b +objectlinkcanvas 130565 norel + geometry HVr + from ref 128133 z 1999 to point 268 167 + line 81 z 1999 to ref 129029 + no_role_a no_role_b +objectlinkcanvas 130693 norel + geometry HVr + from ref 128389 z 1999 to point 383 112 + line 81 z 1999 to ref 128901 + no_role_a no_role_b +objectlinkcanvas 130949 norel + from ref 130821 z 1999 to ref 128133 + no_role_a no_role_b +objectlinkcanvas 131205 norel + from ref 131077 z 1999 to ref 128389 + no_role_a no_role_b +end diff --git a/uml/renderengine/cin3/128901 b/uml/cinelerra3/128901 similarity index 99% rename from uml/renderengine/cin3/128901 rename to uml/cinelerra3/128901 index dcd651815..a31f075ba 100644 --- a/uml/renderengine/cin3/128901 +++ b/uml/cinelerra3/128901 @@ -1,6 +1,6 @@ format 38 "Builder" // MObject::Builder - revision 3 + revision 5 modified_by 5 "hiv" // class settings //class diagram settings diff --git a/uml/cinelerra3/128901.diagram b/uml/cinelerra3/128901.diagram new file mode 100644 index 000000000..9d8326da8 --- /dev/null +++ b/uml/cinelerra3/128901.diagram @@ -0,0 +1,167 @@ +format 38 + +fragment 128005 "seq" + xyzwh 176 409 1994 282 93 +end +classinstance 128133 class_ref 128389 // Track + xyz 71 275 2000 name "audio1" +end +classinstance 128389 class_ref 129797 // ExplicitePlacement + xyz 218 423 2000 name "" + values + attribute_ref 128261 // time + "2" + attribute_ref 128389 // track + "video1" +end +classinstance 128645 class_ref 128389 // Track + xyz 72 330 2000 name "video1" +end +classinstance 128773 class_ref 128261 // Fixture + xyz 66 445 2000 name "" +end +classinstance 128901 class_ref 128901 // Clip + xyz 240 573 2000 name "vid_A" + values + attribute_ref 128517 // length + "5" + attribute_ref 128645 // start + "100" +end +fragment 129029 "seq" + xyzwh 63 237 1994 94 155 +end +classinstance 130309 class_ref 128133 // EDL + xyz 69 79 2000 name "" +end +classinstance 131333 class_ref 129669 // Label + xyz 224 70 2000 name "refPoint" + values + attribute_ref 128517 // length + "0" +end +classinstance 131461 class_ref 129541 // Allocation + xyz 230 158 2000 name "" + values + attribute_ref 128773 // repr + "\"t=2\"" +end +classinstance 131717 class_ref 128901 // Clip + xyz 386 71 2000 name "vid_A" + values + attribute_ref 128517 // length + "5" + attribute_ref 128645 // start + "100" +end +classinstance 131845 class_ref 129413 // RelativePlacement + xyz 361 195 2000 name "" + values + attribute_ref 128133 // relType + "SAMETIME" +end +classinstance 132229 class_ref 129029 // Effect + xyz 562 71 2000 name "" + values + attribute_ref 128517 // length + "3" + attribute_ref 128901 // plugID + "\"Hue\"" +end +classinstance 132357 class_ref 129413 // RelativePlacement + xyz 551 197 2000 name "" + values + attribute_ref 129029 // offset + "+3" + attribute_ref 128133 // relType + "ATTACH" +end +fragment 132869 "seq" + xyzwh 172 46 1994 494 102 +end +classinstance 132997 class_ref 129029 // Effect + xyz 354 573 2000 name "" + values + attribute_ref 128517 // length + "3" + attribute_ref 128901 // plugID + "\"Hue\"" +end +classinstance 133125 class_ref 129797 // ExplicitePlacement + xyz 342 423 2000 name "" + values + attribute_ref 128261 // time + "5" + attribute_ref 128389 // track + "video1" +end +note 135941 "actually the same object" + xyzwh 635 341 2004 148 41 +textcanvas 136197 "Video Clip anchored at a Label, with an attached HUE effect starting 3 frames after beginn" + xyzwh 524 565 2000 175 87 +objectlinkcanvas 129413 norel + geometry HVr + from ref 128389 z 1999 to point 269 341 + line 129541 z 1999 to ref 128645 + no_role_a no_role_b +objectlinkcanvas 129797 norel + from ref 128901 z 1999 to ref 128389 + no_role_a no_role_b +objectlinkcanvas 129925 norel + from ref 128773 z 1999 to ref 128389 + no_role_a no_role_b +objectlinkcanvas 130053 norel + geometry HV + from ref 128773 z 1999 to point 108 456 + line 130181 z 1999 to ref 128645 + no_role_a no_role_b +objectlinkcanvas 131205 norel + geometry HVr + from ref 128645 z 1999 to point 108 90 + line 81 z 1999 to ref 130309 + no_role_a no_role_b +objectlinkcanvas 131589 norel + from ref 131461 z 1999 to ref 131333 + no_role_a no_role_b +objectlinkcanvas 131973 rel relation_ref 128645 // + from ref 131717 z 1999 to ref 131845 + role_a_pos 428 170 3000 role_b_pos 428 150 3000 +objectlinkcanvas 132101 rel relation_ref 129925 // + from ref 131845 z 1999 to ref 131333 + 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 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 +objectlinkcanvas 132741 norel + geometry HV + from ref 130309 z 1999 to point 261 90 + line 81 z 1999 to ref 131333 + no_role_a no_role_b +objectlinkcanvas 133253 norel + geometry HVr + from ref 133125 z 1999 to point 393 341 + line 81 z 1999 to ref 128645 + no_role_a no_role_b +objectlinkcanvas 133381 norel + geometry VH + from ref 133125 z 1999 to point 393 606 + line 81 z 1999 to ref 132997 + no_role_a no_role_b +objectlinkcanvas 135685 rel relation_ref 128645 // + from ref 132997 z 1999 to point 600 432 + line 135813 z 1999 to ref 132357 + role_a_pos 612 276 3000 role_b_pos 444 540 3000 +line 134149 -_-_ + from ref 131717 z 1993 to ref 132869 +line 134277 -_-_ + from ref 131717 z 1999 to point 524 55 + line 134533 z 1999 to point 524 476 + line 134405 z 1999 to ref 128901 +line 134661 -_-_ + from ref 132229 z 1999 to point 707 55 + line 134917 z 1999 to point 707 464 + line 134789 z 1999 to ref 132997 +end diff --git a/uml/renderengine/cin3/129029 b/uml/cinelerra3/129029 similarity index 100% rename from uml/renderengine/cin3/129029 rename to uml/cinelerra3/129029 diff --git a/uml/cinelerra3/129029.diagram b/uml/cinelerra3/129029.diagram new file mode 100644 index 000000000..3ec7b8843 --- /dev/null +++ b/uml/cinelerra3/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/cinelerra3/129157.diagram b/uml/cinelerra3/129157.diagram new file mode 100644 index 000000000..3cd13c11b --- /dev/null +++ b/uml/cinelerra3/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/cinelerra3/5.session b/uml/cinelerra3/5.session new file mode 100644 index 000000000..b5a9699dd --- /dev/null +++ b/uml/cinelerra3/5.session @@ -0,0 +1,38 @@ +window_sizes 1140 830 287 843 693 58 +diagrams + classdiagram_ref 128389 // Render Entities + 843 689 100 4 147 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 objectdiagram_ref 128901 // EDL Example2 +open + class_ref 128005 // Session + classrelation_ref 128645 // tracks () + class_ref 128261 // Fixture + class_ref 128645 // Placement + class_ref 128773 // AbstractMO + class_ref 128901 // Clip + class_ref 129029 // Effect + class_ref 133893 // RelType + class_ref 129541 // Allocation + class_ref 129797 // ExplicitePlacement + 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 131589 // ExitNode + class_ref 131717 // ProcNode + class_ref 133253 // Frame + classview_ref 128517 // Backend Components +end +end diff --git a/uml/renderengine/cin3/cin3.prj b/uml/cinelerra3/cinelerra3.prj similarity index 98% rename from uml/renderengine/cin3/cin3.prj rename to uml/cinelerra3/cinelerra3.prj index 27e6b19c1..99c2e4353 100644 --- a/uml/renderengine/cin3/cin3.prj +++ b/uml/cinelerra3/cinelerra3.prj @@ -1,8 +1,8 @@ format 38 -"cin3" +"cinelerra3" revision 5 modified_by 5 "hiv" - cpp_root_dir "../../../src/" + cpp_root_dir "../../src/" diff --git a/uml/renderengine/cin3/cpp_includes b/uml/cinelerra3/cpp_includes similarity index 100% rename from uml/renderengine/cin3/cpp_includes rename to uml/cinelerra3/cpp_includes diff --git a/uml/renderengine/cin3/generation_settings b/uml/cinelerra3/generation_settings similarity index 100% rename from uml/renderengine/cin3/generation_settings rename to uml/cinelerra3/generation_settings diff --git a/uml/renderengine/cin3/idl_includes b/uml/cinelerra3/idl_includes similarity index 100% rename from uml/renderengine/cin3/idl_includes rename to uml/cinelerra3/idl_includes diff --git a/uml/renderengine/cin3/java_imports b/uml/cinelerra3/java_imports similarity index 100% rename from uml/renderengine/cin3/java_imports rename to uml/cinelerra3/java_imports diff --git a/uml/renderengine/cin3/stereotypes b/uml/cinelerra3/stereotypes similarity index 100% rename from uml/renderengine/cin3/stereotypes rename to uml/cinelerra3/stereotypes diff --git a/uml/renderengine/cin3/tools b/uml/cinelerra3/tools similarity index 100% rename from uml/renderengine/cin3/tools rename to uml/cinelerra3/tools diff --git a/uml/renderengine/cin3/5.session b/uml/renderengine/cin3/5.session deleted file mode 100644 index 4fea246cb..000000000 --- a/uml/renderengine/cin3/5.session +++ /dev/null @@ -1,38 +0,0 @@ -window_sizes 1140 830 287 843 689 62 -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 -end -show_stereotypes -selected - package_ref 129 // cin3 -open - class_ref 128005 // Session - classrelation_ref 128645 // tracks () - class_ref 128261 // Fixture - class_ref 128645 // Placement - class_ref 129413 // RelativePlacement - class_ref 129797 // ExplicitePlacement - class_ref 130181 // Constraint - 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 -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]]
diff --git a/wiki/renderengine/class89.html b/wiki/renderengine/class89.html deleted file mode 100644 index b0cdec94d..000000000 --- a/wiki/renderengine/class89.html +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - -Class Processor - - - - - -
Class Processor
-

- - - - -

Declaration :

  • C++ : class Processor

Directly inherited by : RenderEngine

-
- -
Relation output (<unidirectional association>)

Declaration :

- - diff --git a/wiki/renderengine/class92.html b/wiki/renderengine/class92.html deleted file mode 100644 index d0f7ee496..000000000 --- a/wiki/renderengine/class92.html +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - -Class ProcNode - - - - - -
Class ProcNode
-

- - - - -

Declaration :

  • C++ : class ProcNode
  • Java : public interface ProcNode

Directly inherited by : ExitNode Hub Link Source Trafo

- - diff --git a/wiki/renderengine/classes_list.html b/wiki/renderengine/classes_list.html deleted file mode 100644 index 48091ba7e..000000000 --- a/wiki/renderengine/classes_list.html +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - -Classes - - - - - -
Classes
-

- - - - - - - -
AbstractMO
-AFrame
-Allocation
-ARender
-Assembler
-Auto
-BuilderFacade
-Clip
-ConManager
-Constraint
-ControllerFacade
-DirectPlacement
-EDL
-Effect
-ExitNode
-ExplicitePlacement
-Fixture
-Frame
-GLBuf
-GLRender
-Hub
-Label
-Link
-Mask
-Meta
-MObject
-OpenGLPipe
-PathManager
-Placement
-PluginAdapter
-Processor
-ProcNode
-Projector
-RelativePlacement
-RenderEngine
-RenderState
-Session
-Source
-StateProxy
-StreamProvider
-ToolFactory
-Track
-Trafo
-VFrame
-VRender
-Wish
-
- - diff --git a/wiki/renderengine/fig1.png b/wiki/renderengine/fig1.png deleted file mode 100644 index 6c40efdf4..000000000 Binary files a/wiki/renderengine/fig1.png and /dev/null differ diff --git a/wiki/renderengine/fig2.png b/wiki/renderengine/fig2.png deleted file mode 100644 index 57d4aea7a..000000000 Binary files a/wiki/renderengine/fig2.png and /dev/null differ diff --git a/wiki/renderengine/fig3.png b/wiki/renderengine/fig3.png deleted file mode 100644 index 2cd1c7ebe..000000000 Binary files a/wiki/renderengine/fig3.png and /dev/null differ diff --git a/wiki/renderengine/fig6.png b/wiki/renderengine/fig6.png deleted file mode 100644 index a45bb4c3a..000000000 Binary files a/wiki/renderengine/fig6.png and /dev/null differ diff --git a/wiki/renderengine/index_69.html b/wiki/renderengine/index_69.html deleted file mode 100644 index 0f638c86c..000000000 --- a/wiki/renderengine/index_69.html +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - -E - - - - - -
E
-

- - - - - - - - - - - - - - -
NameKindDescription
EDLcomponent
EDLclass
edlsrelation
Effectclass
Enginecomponent
Engine Partsdeployment view
Engine Workingsclass view
ExitNodeclass
ExplicitePlacementclass
- - diff --git a/wiki/renderengine/index_80.html b/wiki/renderengine/index_80.html deleted file mode 100644 index 15b636f18..000000000 --- a/wiki/renderengine/index_80.html +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - -P - - - - - -
P
-

- - - - - - - - - - - - - - - - - -
NameKindDescription
PathManagerclass
placementrelation
Placementclass
playoperation
playlistnode
PluginAdapterclass
pnodenode
prepareStreamoperation
procnode
Processorclass
ProcNodeclass
Projectorclass
- - diff --git a/wiki/renderengine/public_operations.html b/wiki/renderengine/public_operations.html deleted file mode 100644 index d39f5b605..000000000 --- a/wiki/renderengine/public_operations.html +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - -Public Operations Index - - - - - -
Public Operations Index
-

- - - - - - - - - - - - - - - - - -
OperationClassDescription
buildAssembler
buildEngineBuilderFacade
buildProcessorPathManager
configureToolFactory
getAutomationFixture
getConnectionConManager
getPlaylistForRenderFixture
getReadyStreamProvider
getStateProxyRenderState
playRenderEngine
prepareStreamStreamProvider
resolvePlacementcreate an actual (explicite) placement while trying to satisfy the network of adjacent objects and placements.
- - diff --git a/wiki/uml b/wiki/uml new file mode 120000 index 000000000..a59e206ca --- /dev/null +++ b/wiki/uml @@ -0,0 +1 @@ +../doc/devel/uml \ No newline at end of file