diff --git a/src/steam/engine/bufftable-obsolete.hpp b/src/steam/engine/bufftable-obsolete.hpp index f74b3f9d3..5e0589fc9 100644 --- a/src/steam/engine/bufftable-obsolete.hpp +++ b/src/steam/engine/bufftable-obsolete.hpp @@ -34,7 +34,7 @@ #include "lib/error.hpp" #include "lib/nocopy.hpp" #include "steam/engine/channel-descriptor.hpp" -#include "steam/engine/procnode.hpp" +#include "steam/engine/proc-node.hpp" #include #include diff --git a/src/steam/engine/bufftable.hpp b/src/steam/engine/bufftable.hpp index ef6a7546e..2ec5400ac 100644 --- a/src/steam/engine/bufftable.hpp +++ b/src/steam/engine/bufftable.hpp @@ -36,7 +36,7 @@ #include "lib/error.hpp" #include "steam/engine/buffhandle.hpp" -#include "steam/engine/procnode.hpp" +#include "steam/engine/proc-node.hpp" #include "lib/iter-adapter.hpp" #include diff --git a/src/steam/engine/exit-node.hpp b/src/steam/engine/exit-node.hpp index c48821aea..945979440 100644 --- a/src/steam/engine/exit-node.hpp +++ b/src/steam/engine/exit-node.hpp @@ -24,7 +24,7 @@ ** Effective top-level exit point to pull rendered data from the nodes network. ** ** @todo 6/2023 WIP-WIP used as placeholder; relation to ProcNode not yet determined /////////////TICKET #1306 - ** @see procnode.hpp + ** @see proc-node.hpp */ #ifndef ENGINE_EXIT_NODE_H diff --git a/src/steam/engine/mask.hpp b/src/steam/engine/mask.hpp index 5388ebbd1..ed7a1d0d2 100644 --- a/src/steam/engine/mask.hpp +++ b/src/steam/engine/mask.hpp @@ -33,7 +33,7 @@ #ifndef STEAM_ENGINE_MASK_H #define STEAM_ENGINE_MASK_H -#include "steam/engine/procnode.hpp" +#include "steam/engine/proc-node.hpp" diff --git a/src/steam/engine/nodefactory.hpp b/src/steam/engine/nodefactory.hpp index 7b3da368e..25191a86e 100644 --- a/src/steam/engine/nodefactory.hpp +++ b/src/steam/engine/nodefactory.hpp @@ -32,7 +32,7 @@ #ifndef ENGINE_NODEFACTORY_H #define ENGINE_NODEFACTORY_H -#include "steam/engine/procnode.hpp" +#include "steam/engine/proc-node.hpp" #include "steam/mobject/placement.hpp" #include "steam/engine/nodewiring.hpp" diff --git a/src/steam/engine/nodeinvocation.hpp b/src/steam/engine/nodeinvocation.hpp index 7f10f5aa7..324363ad2 100644 --- a/src/steam/engine/nodeinvocation.hpp +++ b/src/steam/engine/nodeinvocation.hpp @@ -56,7 +56,7 @@ #include "steam/state.hpp" -#include "steam/engine/procnode.hpp" +#include "steam/engine/proc-node.hpp" #include "steam/engine/channel-descriptor.hpp" #include "steam/engine/bufftable-obsolete.hpp" diff --git a/src/steam/engine/nodeoperation.hpp b/src/steam/engine/nodeoperation.hpp index dbc06b441..15fd98982 100644 --- a/src/steam/engine/nodeoperation.hpp +++ b/src/steam/engine/nodeoperation.hpp @@ -58,7 +58,7 @@ #include "steam/state.hpp" -#include "steam/engine/procnode.hpp" +#include "steam/engine/proc-node.hpp" #include "steam/engine/channel-descriptor.hpp" #include "steam/engine/bufftable-obsolete.hpp" #include "steam/engine/nodeinvocation.hpp" diff --git a/src/steam/engine/nodewiring-def.hpp b/src/steam/engine/nodewiring-def.hpp index 996405cd2..d3588eade 100644 --- a/src/steam/engine/nodewiring-def.hpp +++ b/src/steam/engine/nodewiring-def.hpp @@ -40,7 +40,7 @@ #define ENGINE_NODEWIRING_DEF_H -#include "steam/engine/procnode.hpp" +#include "steam/engine/proc-node.hpp" #include "lib/ref-array.hpp" #include "lib/util-foreach.hpp" #include "lib/nocopy.hpp" diff --git a/src/steam/engine/nodewiring.cpp b/src/steam/engine/nodewiring.cpp index 0a43a0be1..3fc424424 100644 --- a/src/steam/engine/nodewiring.cpp +++ b/src/steam/engine/nodewiring.cpp @@ -27,7 +27,7 @@ */ -#include "steam/engine/procnode.hpp" +#include "steam/engine/proc-node.hpp" #include "steam/engine/nodewiring.hpp" #include "steam/engine/nodeoperation.hpp" #include "steam/engine/nodewiring-config.hpp" diff --git a/src/steam/engine/nodewiring.hpp b/src/steam/engine/nodewiring.hpp index 5c6498aa0..94637aeb6 100644 --- a/src/steam/engine/nodewiring.hpp +++ b/src/steam/engine/nodewiring.hpp @@ -31,7 +31,7 @@ #define ENGINE_NODEWIRING_H -#include "steam/engine/procnode.hpp" +#include "steam/engine/proc-node.hpp" #include "lib/allocation-cluster.hpp" #include "steam/engine/nodewiring-def.hpp" diff --git a/src/steam/engine/procnode.hpp b/src/steam/engine/proc-node.hpp similarity index 98% rename from src/steam/engine/procnode.hpp rename to src/steam/engine/proc-node.hpp index 4e23989bd..9ba5fa300 100644 --- a/src/steam/engine/procnode.hpp +++ b/src/steam/engine/proc-node.hpp @@ -1,5 +1,5 @@ /* - PROCNODE.hpp - Key abstraction of the Render Engine: a Processing Node + PROC-NODE.hpp - Key abstraction of the Render Engine: a Processing Node Copyright (C) Lumiera.org 2008, Hermann Vosseler @@ -20,7 +20,7 @@ */ -/** @file procnode.hpp +/** @file proc-node.hpp ** Interface to the processing nodes and the render nodes network. ** ** Actually, there are three different interfaces to consider diff --git a/src/steam/engine/render-invocation.hpp b/src/steam/engine/render-invocation.hpp index 69ecb34dc..37d2853c8 100644 --- a/src/steam/engine/render-invocation.hpp +++ b/src/steam/engine/render-invocation.hpp @@ -37,7 +37,7 @@ //#include "steam/state.hpp" -#include "steam/engine/procnode.hpp" +#include "steam/engine/proc-node.hpp" #include "steam/engine/buffhandle.hpp" //#include "steam/engine/bufftable-obsolete.hpp" diff --git a/src/steam/engine/source.hpp b/src/steam/engine/source.hpp index 279302113..ba729ec66 100644 --- a/src/steam/engine/source.hpp +++ b/src/steam/engine/source.hpp @@ -36,7 +36,7 @@ #ifndef ENGINE_SOURCE_H #define ENGINE_SOURCE_H -#include "steam/engine/procnode.hpp" +#include "steam/engine/proc-node.hpp" diff --git a/src/steam/mobject/builder/operationpoint.cpp b/src/steam/mobject/builder/operationpoint.cpp index 18bf15264..e9ed2e54d 100644 --- a/src/steam/mobject/builder/operationpoint.cpp +++ b/src/steam/mobject/builder/operationpoint.cpp @@ -28,7 +28,7 @@ #include "steam/mobject/builder/operationpoint.hpp" -#include "steam/engine/procnode.hpp" +#include "steam/engine/proc-node.hpp" #include "steam/asset/media.hpp" #include "steam/asset/proc.hpp" #include "steam/engine/nodefactory.hpp" diff --git a/src/steam/mobject/builder/operationpoint.hpp b/src/steam/mobject/builder/operationpoint.hpp index 12fa6ce21..6a8738b72 100644 --- a/src/steam/mobject/builder/operationpoint.hpp +++ b/src/steam/mobject/builder/operationpoint.hpp @@ -36,7 +36,7 @@ #ifndef MOBJECT_BUILDER_OPERATIONPOINT_H #define MOBJECT_BUILDER_OPERATIONPOINT_H -//#include "steam/engine/procnode.hpp" /////TODO can we get rid of this header here? +//#include "steam/engine/proc-node.hpp" /////TODO can we get rid of this header here? //#include "common/query.hpp" #include "lib/hash-standard.hpp" diff --git a/tests/core/steam/engine/buff-table-test.cpp b/tests/core/steam/engine/buff-table-test.cpp index 0a78a5e2b..432f93a16 100644 --- a/tests/core/steam/engine/buff-table-test.cpp +++ b/tests/core/steam/engine/buff-table-test.cpp @@ -28,7 +28,7 @@ #include "lib/test/run.hpp" #include "lib/error.hpp" -#include "steam/engine/procnode.hpp" +#include "steam/engine/proc-node.hpp" #include "steam/engine/bufftable-obsolete.hpp" #include "lib/ref-array.hpp" #include "lib/format-cout.hpp" diff --git a/wiki/thinkPad.ichthyo.mm b/wiki/thinkPad.ichthyo.mm index 81a89d8d0..3e8ff5fd6 100644 --- a/wiki/thinkPad.ichthyo.mm +++ b/wiki/thinkPad.ichthyo.mm @@ -68007,6 +68007,11 @@ + + + + + @@ -79562,9 +79567,9 @@ Date:   Thu Apr 20 18:53:17 2023 +0200
 - + - + @@ -79934,6 +79939,49 @@ Date:   Thu Apr 20 18:53:17 2023 +0200
+ + + + + + + + + + + + + + + + + +

+ habe mit e1248d195af07febbdc die bestehende Impl beiseite geschoben +

+ + + + + + + + + + +

+ commit 1f13931640fe09f84b798722a6edd2aa95ebe7ea +

+

+ Date:   Sat Sep 17 01:50:11 2011 +0200 +

+ + + + + + + @@ -79993,6 +80041,77 @@ Date:   Thu Apr 20 18:53:17 2023 +0200
 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -98916,6 +99035,18 @@ Date:   Thu Apr 20 18:53:17 2023 +0200
 + + + + + + + + + + + + @@ -105592,8 +105723,14 @@ Date:   Thu Apr 20 18:53:17 2023 +0200
 - + + + + + + + @@ -114140,29 +114277,23 @@ std::cout << tmpl.render({"what", "World"}) << s - - - +

...also auf Top-Level einen Record<GenNode> annehmen. Teilweise wird das im Diff-Framework und auch in diversen Tests so gehandhabt (da es einfacher ist)

- - + - - - +

...weil eine DataSource ein Referenz-Wrapper ist, und damit einen Pointer auf das Start-Element haben muß

- - + @@ -114175,9 +114306,7 @@ std::cout << tmpl.render({"what", "World"}) << s - - - +

....je länger ich darüber nachdenke — @@ -114186,8 +114315,7 @@ std::cout << tmpl.render({"what", "World"}) << s umso mehr sehe ich diese Idee im Widerspruch zum GenNode-Design

- - + @@ -114225,16 +114353,13 @@ std::cout << tmpl.render({"what", "World"}) << s - - - +

DataSrc-Impl kann sich auf stabile Memory-Location verlassen

- - + @@ -114257,16 +114382,13 @@ std::cout << tmpl.render({"what", "World"}) << s - - - +

wir brauchen nur den Level traits + util + elementares Metaprogramming

- - + @@ -119506,7 +119628,7 @@ std::cout << tmpl.render({"what", "World"}) << s - + @@ -119566,6 +119688,34 @@ std::cout << tmpl.render({"what", "World"}) << s + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -126712,6 +126862,10 @@ unsigned int ThreadIdAsInt = *static_cast<unsigned int*>(static_cast<vo + + + + @@ -126761,15 +126915,15 @@ unsigned int ThreadIdAsInt = *static_cast<unsigned int*>(static_cast<vo - - - + + + - + - + - + @@ -126781,10 +126935,12 @@ unsigned int ThreadIdAsInt = *static_cast<unsigned int*>(static_cast<vo - + + - + +