ichthyo/LUMIERA.clone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

some namespace rearrangements

Browse source
This commit is contained in:
Fischlurch 2008-09-13 03:59:36 +02:00
parent f9452f654c
commit d4e3405f09
20 changed files with 448 additions and 106 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/common/streamtype.cpp
View file

@ -28,6 +28,7 @@ namespace lumiera
{
/** */
int bla = 3;
} // namespace lumiera

10
src/common/streamtype.hpp
View file

@ -20,6 +20,16 @@
*/
/** @file streamtype.hpp
** Framework for classification of media streams.
** Besides the actual implementation type of a media stream, the Proc-Layer
** needs a more general way for accessing, comparing and manipulating media streams
** based on type information.
**
** @see control::STypeManager
**
*/
#ifndef LUMIERA_STREAMTYPE_HPP
#define LUMIERA_STREAMTYPE_HPP

26
src/proc/mobject/controller/pathmanager.cpp → src/proc/control/pathmanager.cpp
View file

@ -21,23 +21,19 @@
* *****************************************************/
#include "proc/mobject/controller/pathmanager.hpp"
#include "proc/control/pathmanager.hpp"
namespace mobject
namespace control {
engine::Processor *
PathManager::buildProcessor ()
{
namespace controller
{
UNIMPLEMENTED ("build a complete processor and optimize render path");
return 0;//////////////////TODO
}
engine::Processor *
PathManager::buildProcessor ()
{
return 0;//////////////////TODO
}
} // namespace mobject::controller
} // namespace mobject
} // namespace control

37
src/proc/mobject/controller/pathmanager.hpp → src/proc/control/pathmanager.hpp
View file

@ -21,34 +21,29 @@
*/
#ifndef MOBJECT_CONTROLLER_PATHMANAGER_H
#define MOBJECT_CONTROLLER_PATHMANAGER_H
#ifndef CONTROL_PATHMANAGER_H
#define CONTROL_PATHMANAGER_H
#include "proc/engine/processor.hpp"
namespace mobject
{
namespace controller
namespace control {
/**
* While building a render engine, this Strategy class
* decides on the actual render strategy in accordance
* to the current controller settings (system state)
*/
class PathManager
{
/**
* While building a render engine, this Strategy class
* decides on the actual render strategy in accordance
* to the current controller settings (system state)
*/
class PathManager
{
public:
engine::Processor* buildProcessor () ;
// TODO: allocation, GC??
};
public:
engine::Processor* buildProcessor () ;
// TODO: allocation, GC??
};
} // namespace mobject::controller
} // namespace mobject
} // namespace control
#endif

45
src/proc/mobject/controller/renderstate.hpp → src/proc/control/renderstate.hpp
View file

@ -21,38 +21,33 @@
*/
#ifndef MOBJECT_CONTROLLER_RENDERSTATE_H
#define MOBJECT_CONTROLLER_RENDERSTATE_H
#ifndef CONTROL_RENDERSTATE_H
#define CONTROL_RENDERSTATE_H
#include "proc/state.hpp"
namespace mobject
{
namespace controller
namespace control {
typedef proc_interface::State State;
/**
* Encapsulates the logic used to get a "current render process"
* in accordance to the currently applicable controller settings.
* The provided StateProxy serves to hold any mutalbe state used
* in the render process, so the rest of the render engine
* can be stateless.
* @todo probably the state management will work different (6/08)
*/
class RenderState
{
typedef proc_interface::State State;
/**
* Encapsulates the logic used to get a "current render process"
* in accordance to the currently applicable controller settings.
* The provided StateProxy serves to hold any mutalbe state used
* in the render process, so the rest of the render engine
* can be stateless.
* @todo probably the state management will work different (6/08)
*/
class RenderState
{
public:
State& getRenderProcess () ;
};
public:
State& getRenderProcess () ;
};
} // namespace mobject::controller
} // namespace mobject
} // namespace control
#endif

8
src/proc/stypemanager.cpp → src/proc/control/stypemanager.cpp
View file

@ -21,13 +21,13 @@
* *****************************************************/
#include "proc/stypemanager.hpp"
#include "proc/control/stypemanager.hpp"
namespace proc_interface
{
namespace control {
/** */
} // namespace proc_interface
} // namespace control

13
src/proc/stypemanager.hpp → src/proc/control/stypemanager.hpp
View file

@ -21,15 +21,15 @@
*/
#ifndef PROC_INTERFACE_STATE_H
#define PROC_INTERFACE_STATE_H
#ifndef CONTROL_STYPEMANAGER_H
#define CONTROL_STYPEMANAGER_H
#include "common/streamtype.hpp"
namespace proc_interface {
namespace control {
using lumiera::Symbol;
@ -45,6 +45,13 @@ namespace proc_interface {
};
} // namespace control
namespace proc_interface {
using control::STypeManager;
} // namespace proc_interface
#endif

3
src/proc/engine/nodewiringconfig.hpp
View file

@ -19,6 +19,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
/** @file nodewiringconfig.hpp
** Sometimes we need to coose a different implementation for dealing with
** some special cases. While for simple cases, just testing a flag or using a
@ -44,6 +45,8 @@
** @see configflags.hpp
**
*/
#ifndef ENGINE_NODEWIRINGCONFIG_H
#define ENGINE_NODEWIRINGCONFIG_H

74
src/proc/lumiera.hpp
View file

@ -22,6 +22,18 @@
*/
/** @file lumiera.hpp
** Basic set of definitions and includes commonly used together.
** Including lumiera.hpp gives you a common set of elementary declarations
** widely used within the C++ code of the Proc-Layer.
**
** @see main.cpp
** @see pre.hpp
**
*/
#ifndef LUMIERA_H
#define LUMIERA_H
@ -37,11 +49,67 @@
#include "lib/appconfig.hpp"
namespace lumiera
{
/* additional global configuration goes here... */
/**
* Namespace for globals.
* A small number of definitions and facilities of application wide relevance.
* It's probably a good idea to pull it in explicitly and to avoid nesting
* implementation namespaces within \c lumiera::
*/
namespace lumiera {
/* additional global configuration goes here... */
} // namespace lumiera
/**
* Namespace for support and library code.
*/
namespace lib {
}
/**
* The asset subsystem of the Proc-Layer.
*/
namespace asset { }
/**
* Proc-Layer dispatcher, controller and administrative facilities.
*/
namespace control { }
/**
* Render engine code as part of the Proc-Layer.
* Backbone of the engine, render nodes base and cooperation.
* A good deal of the active engine code is outside the scope of the
* Proc-Layer, e.g. code located in backend services and plugins.
*/
namespace engine { }
/**
* Media-Objects, edit operations and high-level session.
*/
namespace mobject {
/**
* Namespace of Session, EDL and user visible high-level objects.
*/
namespace session { }
/**
* Namespace of the Builder, transforming high-level into low-level.
*/
namespace builder { }
}
#endif /*LUMIERA_H*/

4
uml/lumiera/128261
View file

@ -1,6 +1,6 @@
format 40
"MObject" // ProcessingLayer::MObject
revision 31
revision 32
modified_by 5 "hiv"
// class settings
//class diagram settings
@ -1189,8 +1189,6 @@ ${inlines}
package_ref 128901 // Builder
package_ref 129029 // Controller
usecaseview 128261 "config examples"
//use case diagram settings
package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default

128
uml/lumiera/128517
View file

@ -1,6 +1,6 @@
format 40
"CommonLib" // CommonLib
revision 12
revision 13
modified_by 5 "hiv"
// class settings
//class diagram settings
@ -26,6 +26,132 @@ format 40
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
classview 129285 "StreamType"
//class diagram settings
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
//collaboration diagram settings
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
//object diagram settings
write_horizontally default package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default
//sequence diagram settings
show_full_operations_definition default write_horizontally default class_drawing_mode default drawing_language default draw_all_relations default shadow default
//state diagram settings
package_name_in_tab default show_context default auto_label_position default write_trans_label_horizontally default show_trans_definition default draw_all_relations default shadow default
show_activities default region_horizontally default drawing_language default
//class settings
//activity diagram settings
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
classdiagram 132485 "Stream Type Framework"
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
size A4
end
class 144773 "StreamType"
visibility package
cpp_decl "${comment}${template}class ${name}${inherit}
{
${members} };
${inlines}
"
java_decl ""
idl_decl ""
explicit_switch_type ""
classrelation 158469 // <unidirectional association>
relation 154373 --->
a role_name "" multiplicity "" protected
cpp default " ${comment}${static}${mutable}${volatile}${const}${type}* ${name}${value};
"
classrelation_ref 158469 // <unidirectional association>
b multiplicity "" parent class_ref 145285 // MediaKind
end
classrelation 158597 // <unidirectional association>
relation 154501 --->
a role_name "" multiplicity "" protected
cpp default " ${comment}${static}${mutable}${volatile}${const}${type}* ${name}${value};
"
classrelation_ref 158597 // <unidirectional association>
b multiplicity "" parent class_ref 144901 // Prototype
end
classrelation 158725 // <unidirectional association>
relation 154629 --->
a role_name "" multiplicity "" protected
cpp default " ${comment}${static}${mutable}${volatile}${const}${type}* ${name}${value};
"
classrelation_ref 158725 // <unidirectional association>
b multiplicity "" parent class_ref 145029 // ImplFacade
end
end
class 144901 "Prototype"
visibility package
cpp_decl "${comment}${template}class ${name}${inherit}
{
${members} };
${inlines}
"
java_decl ""
idl_decl ""
explicit_switch_type ""
end
class 145029 "ImplFacade"
visibility package
cpp_decl "${comment}${template}class ${name}${inherit}
{
${members} };
${inlines}
"
java_decl ""
idl_decl ""
explicit_switch_type ""
end
class 145157 "StreamTypeID"
visibility package
cpp_decl "${comment}${template}class ${name}${inherit}
{
${members} };
${inlines}
"
java_decl ""
idl_decl ""
explicit_switch_type ""
classrelation 158341 // <dependency>
relation 154245 -_->
a default
cpp default "Generated"
classrelation_ref 158341 // <dependency>
b multiplicity "" parent class_ref 144773 // StreamType
end
end
class 145285 "MediaKind"
visibility package 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 ""
end
end
package_ref 131077 // ConfigQuery
classview 128773 "error"

25
uml/lumiera/129029
View file

@ -1,6 +1,6 @@
format 38
"Controller" // ProcessingLayer::MObject::Controller
revision 5
format 40
"Control" // ProcessingLayer::Control
revision 6
modified_by 5 "hiv"
// class settings
//class diagram settings
@ -8,7 +8,7 @@ format 38
//use case diagram settings
package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default
//sequence diagram settings
show_full_operations_definition default write_horizontally default drawing_language default draw_all_relations default shadow default
show_full_operations_definition default write_horizontally default class_drawing_mode default drawing_language default draw_all_relations default shadow default
//collaboration diagram settings
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
//object diagram settings
@ -34,7 +34,7 @@ format 38
//object diagram settings
write_horizontally default package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default
//sequence diagram settings
show_full_operations_definition default write_horizontally default drawing_language default draw_all_relations default shadow default
show_full_operations_definition default write_horizontally default class_drawing_mode default drawing_language default draw_all_relations default shadow default
//state diagram settings
package_name_in_tab default show_context default auto_label_position default write_trans_label_horizontally default show_trans_definition default draw_all_relations default shadow default
show_activities default region_horizontally default drawing_language default
@ -172,7 +172,7 @@ ${inlines}
comment "Encapsulates the logic used to get a \"current render process\" in accordance to the currentyl applicable controller settings. The provided StateProxy serves to hold any mutalbe state used in the render process, so the rest of the render engine can be stateless."
operation 128389 "getStateProxy"
public return_type class_ref 132741 // StateProxy
public return_type class_ref 132741 // State
nparams 0
cpp_decl " ${comment}${friend}${static}${inline}${virtual}${type} ${name} ${(}${)}${const}${volatile} ${throw}${abstract};"
cpp_def "${comment}${inline}${type}
@ -186,5 +186,18 @@ ${class}::${name} ${(}${)}${const}${volatile} ${throw}${staticnl}
end
end
class 145413 "STypeManager"
visibility package
cpp_decl "${comment}${template}class ${name}${inherit}
{
${members} };
${inlines}
"
java_decl ""
idl_decl ""
explicit_switch_type ""
end
end
end

4
uml/lumiera/129285
View file

@ -1,6 +1,6 @@
format 40
"ProcessingLayer" // ProcessingLayer
revision 22
revision 23
modified_by 5 "hiv"
// class settings
//class diagram settings
@ -28,6 +28,8 @@ format 40
package_ref 128133 // Asset
package_ref 129029 // Control
package_ref 128261 // MObject
package_ref 128389 // RenderEngine

42
uml/lumiera/129413
View file

@ -1,6 +1,6 @@
format 40
"common" // design::codegen::common
revision 14
revision 15
modified_by 5 "hiv"
// class settings
//class diagram settings
@ -201,6 +201,46 @@ ${namespace_end}"
end
comment "unified representation of a time point, including conversion functions"
end
artifact 139653 "streamtype"
stereotype "source"
cpp_h "/*
${NAME}.hpp - ${description}
@{CopyrightClaim}@{GPLHeader}
*/
#ifndef ${NAMESPACE}_${NAME}_H
#define ${NAMESPACE}_${NAME}_H
${includes}
${declarations}
${namespace_start}
${definition}
${namespace_end}
#endif
"
cpp_src "/*
${Name} - ${description}
@{CopyrightClaim}@{GPLHeader}
* *****************************************************/
${includes}
${namespace_start}
${members}
${namespace_end}"
associated_classes
class_ref 144773 // StreamType
class_ref 144901 // Prototype
class_ref 145029 // ImplFacade
end
end
end
package_ref 130821 // error

6
uml/lumiera/129669
View file

@ -1,6 +1,6 @@
format 40
"proc" // design::codegen::proc
revision 7
revision 8
modified_by 5 "hiv"
// class settings
//class diagram settings
@ -150,7 +150,7 @@ ${namespace_start}
${members}
${namespace_end}"
associated_classes
class_ref 132741 // StateProxy
class_ref 132741 // State
end
comment "Key Interface representing a render process and encapsulating state"
end
@ -236,6 +236,8 @@ ${namespace_end}"
package_ref 130053 // asset
package_ref 130693 // control
package_ref 130181 // mobject
package_ref 130309 // engine

4
uml/lumiera/130181
View file

@ -1,6 +1,6 @@
format 40
"mobject" // design::codegen::proc::mobject
revision 8
revision 9
modified_by 5 "hiv"
// class settings
//class diagram settings
@ -394,6 +394,4 @@ ${namespace_end}"
package_ref 130437 // session
package_ref 130565 // builder
package_ref 130693 // controller
end

50
uml/lumiera/130693
View file

@ -1,6 +1,6 @@
format 40
"controller" // design::codegen::proc::mobject::controller
revision 6
"control" // design::codegen::proc::control
revision 7
modified_by 5 "hiv"
// class settings
//class diagram settings
@ -27,13 +27,13 @@ format 40
show_infonote default drawing_language default
stereotype "src"
cpp_h_dir "proc/mobject/controller"
cpp_src_dir "proc/mobject/controller"
cpp_namespace "mobject::controller"
cpp_h_dir "proc/control"
cpp_src_dir "proc/control"
cpp_namespace "control"
comment "sourcecode package
The Processing and Render Controller,
located within the MObject Subsystem"
and the Proc-Layer dispatcher"
deploymentview 129157 "gen"
//deployment diagram settings
package_name_in_tab default show_context default write_horizontally default auto_label_position default draw_all_relations default shadow default
@ -116,5 +116,43 @@ ${namespace_end}"
end
comment "renderengine state manager"
end
artifact 139781 "stypemanager"
stereotype "source"
cpp_h "/*
${NAME}.hpp - ${description}
@{CopyrightClaim}@{GPLHeader}
*/
#ifndef ${NAMESPACE}_${NAME}_H
#define ${NAMESPACE}_${NAME}_H
${includes}
${declarations}
${namespace_start}
${definition}
${namespace_end}
#endif
"
cpp_src "/*
${Name} - ${description}
@{CopyrightClaim}@{GPLHeader}
* *****************************************************/
${includes}
${namespace_start}
${members}
${namespace_end}"
associated_classes
class_ref 145413 // STypeManager
end
end
end
end

6
uml/lumiera/131077
View file

@ -1,6 +1,6 @@
format 40
"ConfigQuery" // CommonLib::ConfigQuery
revision 1
revision 2
modified_by 5 "hiv"
// class settings
//class diagram settings
@ -239,7 +239,7 @@ ${inlines}
classrelation 150405 // <dependency>
relation 147717 -_->
a default
cpp default "Generated"
cpp default "#include in header"
classrelation_ref 150405 // <dependency>
b multiplicity "" parent class_ref 140805 // TypeHandler
end
@ -390,7 +390,7 @@ ${inlines}
classrelation 150533 // <dependency>
relation 147845 -_->
a default
cpp default "Generated"
cpp default "#include in header"
classrelation_ref 150533 // <dependency>
b multiplicity "" parent class_ref 140549 // ConfigRules
end

49
uml/lumiera/132485.diagram Normal file
View file

@ -0,0 +1,49 @@
format 40
classcanvas 128005 class_ref 144773 // StreamType
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 188 72 2000
end
classcanvas 128133 class_ref 144901 // Prototype
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 261 208 2000
end
classcanvas 128261 class_ref 145029 // ImplFacade
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 261 271 2000
end
classcanvas 128389 class_ref 145157 // StreamTypeID
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 38 72 2000
end
classcanvas 128645 class_ref 145285 // MediaKind
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 263 132 2000
end
classcanvas 129541 class_ref 145413 // STypeManager
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 40 256 2000
end
relationcanvas 128517 relation_ref 154245 // <dependency>
from ref 128389 z 1999 to ref 128005
no_role_a no_role_b
no_multiplicity_a no_multiplicity_b
relationcanvas 128773 relation_ref 154373 // <unidirectional association>
geometry VH
from ref 128005 z 1999 to point 223 162
line 128901 z 1999 to ref 128645
no_role_a no_role_b
no_multiplicity_a no_multiplicity_b
relationcanvas 129029 relation_ref 154501 // <unidirectional association>
geometry VH
from ref 128005 z 1999 to point 223 227
line 129157 z 1999 to ref 128133
no_role_a no_role_b
no_multiplicity_a no_multiplicity_b
relationcanvas 129285 relation_ref 154629 // <unidirectional association>
geometry VH
from ref 128005 z 1999 to point 223 290
line 129413 z 1999 to ref 128261
no_role_a no_role_b
no_multiplicity_a no_multiplicity_b
end

19
uml/lumiera/5.session
View file

@ -4,16 +4,21 @@ diagrams
407 690 100 4 2 0
collaborationdiagram_ref 132229 // Render Process
825 684 100 4 0 0
active classdiagram_ref 132357 // StateAdapter composition
classdiagram_ref 132357 // StateAdapter composition
414 658 100 4 0 0
active classdiagram_ref 132485 // Stream Type Framework
463 594 100 4 0 0
end
show_stereotypes
selected
package_ref 129 // lumiera
package_ref 129 // lumiera
open
class_ref 132741 // State
deploymentview_ref 128261 // gen
deploymentview_ref 129157 // gen
package_ref 129029 // Controller
package_ref 130181 // mobject
classview_ref 128389 // Controller Workings
class_ref 132741 // State
class_ref 131717 // ProcNode
class_ref 142469 // StateProxy
class_ref 142597 // StateAdapter
@ -28,11 +33,7 @@ package_ref 129029 // Controller
class_ref 144005 // BuffTable
class_ref 144261 // Invocation
usecaseview_ref 128005 // Renderengine Use
class_ref 140677 // QueryHandler
class_ref 140805 // TypeHandler
class_ref 140933 // ResolverBase
class_ref 141189 // QueryHandlerImpl
usecaseview_ref 128389 // query use
classview_ref 129285 // StreamType
classview_ref 128773 // error
class_ref 140165 // Visitable
end