From 54cc12e4d6f10bc33811713286a1931bf96f64f3 Mon Sep 17 00:00:00 2001 From: Csaba Hruska Date: Thu, 18 Feb 2016 13:04:34 +0100 Subject: update test data --- ddl/Definitions.hs | 8 +++++++- ddl/out/LambdaCube.IR.cpp | 2 +- ddl/out/LambdaCube.IR.hpp | 2 +- ddl/out/LambdaCube.IR.hs | 2 +- ddl/out/LambdaCube.IR.purs | 2 +- ddl/out/LambdaCube.IR.swift | 2 +- ddl/out/LambdaCube.IR2.hpp | 2 +- ddl/out/LambdaCube.Mesh.cpp | 2 +- ddl/out/LambdaCube.Mesh.hpp | 2 +- ddl/out/LambdaCube.Mesh.hs | 2 +- ddl/out/LambdaCube.Mesh.purs | 2 +- ddl/out/LambdaCube.Mesh.swift | 2 +- ddl/out/LambdaCube.Mesh2.hpp | 2 +- ddl/out/LambdaCube.PipelineSchema.cpp | 2 +- ddl/out/LambdaCube.PipelineSchema.hpp | 2 +- ddl/out/LambdaCube.PipelineSchema.hs | 2 +- ddl/out/LambdaCube.PipelineSchema.purs | 2 +- ddl/out/LambdaCube.PipelineSchema.swift | 2 +- ddl/out/LambdaCube.PipelineSchema2.hpp | 2 +- ddl/out/LambdaCube.TypeInfo.cpp | 2 +- ddl/out/LambdaCube.TypeInfo.hpp | 2 +- ddl/out/LambdaCube.TypeInfo.hs | 2 +- ddl/out/LambdaCube.TypeInfo.purs | 2 +- ddl/out/LambdaCube.TypeInfo.swift | 2 +- ddl/out/LambdaCube.TypeInfo2.hpp | 2 +- ddl/out/TestData.cpp | 35 +++++++++++++++++++++++++++++++-- ddl/out/TestData.hpp | 18 +++++++++++++++-- ddl/out/TestData.hs | 33 +++++++++++++++++++++++++++++-- ddl/out/TestData.purs | 32 ++++++++++++++++++++++++++++-- ddl/out/TestData.swift | 24 ++++++++++++++++++++-- ddl/out/TestData2.hpp | 18 +++++++++++++++-- 31 files changed, 179 insertions(+), 37 deletions(-) diff --git a/ddl/Definitions.hs b/ddl/Definitions.hs index 89c4af3..6fd6afd 100644 --- a/ddl/Definitions.hs +++ b/ddl/Definitions.hs @@ -532,13 +532,19 @@ testData = do , "frames" #:: Array "Frame" ] + data_ "PipelineInfo" $ do + constR_ "PipelineInfo" + [ "pipelineName" #:: String + , "pipeline" #:: "Pipeline" + ] + data_ "RenderJob" $ do constR_ "RenderJob" [ "meshes" #:: Array "Mesh" , "textures" #:: Array String -- png texture , "schema" #:: "PipelineSchema" , "scenes" #:: Array "Scene" - , "pipelines" #:: Array "Pipeline" + , "pipelines" #:: Array "PipelineInfo" ] -- test result diff --git a/ddl/out/LambdaCube.IR.cpp b/ddl/out/LambdaCube.IR.cpp index 66ca8b3..335a512 100644 --- a/ddl/out/LambdaCube.IR.cpp +++ b/ddl/out/LambdaCube.IR.cpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-02-08T13:33:23.674070000000Z +// 2016-02-12T16:05:12.941660000000Z #include "LambdaCube.IR.hpp" template<> json toJSON>(std::shared_ptr &v) { diff --git a/ddl/out/LambdaCube.IR.hpp b/ddl/out/LambdaCube.IR.hpp index bba849e..06e5835 100644 --- a/ddl/out/LambdaCube.IR.hpp +++ b/ddl/out/LambdaCube.IR.hpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-02-08T13:33:23.674070000000Z +// 2016-02-12T16:05:12.941660000000Z #ifndef HEADER_LambdaCube.IR_H #define HEADER_LambdaCube.IR_H diff --git a/ddl/out/LambdaCube.IR.hs b/ddl/out/LambdaCube.IR.hs index b81163f..fdf8116 100644 --- a/ddl/out/LambdaCube.IR.hs +++ b/ddl/out/LambdaCube.IR.hs @@ -1,5 +1,5 @@ -- generated file, do not modify! --- 2016-02-08T13:33:23.674070000000Z +-- 2016-02-12T16:05:12.941660000000Z {-# LANGUAGE OverloadedStrings, RecordWildCards #-} module LambdaCube.IR where diff --git a/ddl/out/LambdaCube.IR.purs b/ddl/out/LambdaCube.IR.purs index 3e88ad7..f62464e 100644 --- a/ddl/out/LambdaCube.IR.purs +++ b/ddl/out/LambdaCube.IR.purs @@ -1,5 +1,5 @@ -- generated file, do not modify! --- 2016-02-08T13:33:23.674070000000Z +-- 2016-02-12T16:05:12.941660000000Z module LambdaCube.IR where import Prelude diff --git a/ddl/out/LambdaCube.IR.swift b/ddl/out/LambdaCube.IR.swift index cfc61da..2dd9300 100644 --- a/ddl/out/LambdaCube.IR.swift +++ b/ddl/out/LambdaCube.IR.swift @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-02-08T13:33:23.674070000000Z +// 2016-02-12T16:05:12.941660000000Z typealias StreamName = Int diff --git a/ddl/out/LambdaCube.IR2.hpp b/ddl/out/LambdaCube.IR2.hpp index d3c1eee..d353460 100644 --- a/ddl/out/LambdaCube.IR2.hpp +++ b/ddl/out/LambdaCube.IR2.hpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-02-08T13:33:23.674070000000Z +// 2016-02-12T16:05:12.941660000000Z #ifndef HEADER_LambdaCube.IR_H #define HEADER_LambdaCube.IR_H diff --git a/ddl/out/LambdaCube.Mesh.cpp b/ddl/out/LambdaCube.Mesh.cpp index 4179c3d..9e704e1 100644 --- a/ddl/out/LambdaCube.Mesh.cpp +++ b/ddl/out/LambdaCube.Mesh.cpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-02-08T13:33:24.058473000000Z +// 2016-02-12T16:05:13.332951000000Z #include "LambdaCube.Mesh.hpp" template<> json toJSON>(std::shared_ptr &v) { diff --git a/ddl/out/LambdaCube.Mesh.hpp b/ddl/out/LambdaCube.Mesh.hpp index 730e04e..b93ec58 100644 --- a/ddl/out/LambdaCube.Mesh.hpp +++ b/ddl/out/LambdaCube.Mesh.hpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-02-08T13:33:24.058473000000Z +// 2016-02-12T16:05:13.332951000000Z #ifndef HEADER_LambdaCube.Mesh_H #define HEADER_LambdaCube.Mesh_H diff --git a/ddl/out/LambdaCube.Mesh.hs b/ddl/out/LambdaCube.Mesh.hs index 47b7da6..da937f3 100644 --- a/ddl/out/LambdaCube.Mesh.hs +++ b/ddl/out/LambdaCube.Mesh.hs @@ -1,5 +1,5 @@ -- generated file, do not modify! --- 2016-02-08T13:33:24.058473000000Z +-- 2016-02-12T16:05:13.332951000000Z {-# LANGUAGE OverloadedStrings, RecordWildCards #-} module LambdaCube.Mesh where diff --git a/ddl/out/LambdaCube.Mesh.purs b/ddl/out/LambdaCube.Mesh.purs index 829bf91..d418ac2 100644 --- a/ddl/out/LambdaCube.Mesh.purs +++ b/ddl/out/LambdaCube.Mesh.purs @@ -1,5 +1,5 @@ -- generated file, do not modify! --- 2016-02-08T13:33:24.058473000000Z +-- 2016-02-12T16:05:13.332951000000Z module LambdaCube.Mesh where import Prelude diff --git a/ddl/out/LambdaCube.Mesh.swift b/ddl/out/LambdaCube.Mesh.swift index 7380a34..82c8ba5 100644 --- a/ddl/out/LambdaCube.Mesh.swift +++ b/ddl/out/LambdaCube.Mesh.swift @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-02-08T13:33:24.058473000000Z +// 2016-02-12T16:05:13.332951000000Z enum MeshAttribute { case A_Float(Array) diff --git a/ddl/out/LambdaCube.Mesh2.hpp b/ddl/out/LambdaCube.Mesh2.hpp index 5c81c54..a6a7cfe 100644 --- a/ddl/out/LambdaCube.Mesh2.hpp +++ b/ddl/out/LambdaCube.Mesh2.hpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-02-08T13:33:24.058473000000Z +// 2016-02-12T16:05:13.332951000000Z #ifndef HEADER_LambdaCube.Mesh_H #define HEADER_LambdaCube.Mesh_H diff --git a/ddl/out/LambdaCube.PipelineSchema.cpp b/ddl/out/LambdaCube.PipelineSchema.cpp index 7dced29..283aa31 100644 --- a/ddl/out/LambdaCube.PipelineSchema.cpp +++ b/ddl/out/LambdaCube.PipelineSchema.cpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-02-08T13:33:24.035933000000Z +// 2016-02-12T16:05:13.310528000000Z #include "LambdaCube.PipelineSchema.hpp" template<> json toJSON>(std::shared_ptr &v) { diff --git a/ddl/out/LambdaCube.PipelineSchema.hpp b/ddl/out/LambdaCube.PipelineSchema.hpp index d0ad084..68b309f 100644 --- a/ddl/out/LambdaCube.PipelineSchema.hpp +++ b/ddl/out/LambdaCube.PipelineSchema.hpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-02-08T13:33:24.035933000000Z +// 2016-02-12T16:05:13.310528000000Z #ifndef HEADER_LambdaCube.PipelineSchema_H #define HEADER_LambdaCube.PipelineSchema_H diff --git a/ddl/out/LambdaCube.PipelineSchema.hs b/ddl/out/LambdaCube.PipelineSchema.hs index 69998de..a573d27 100644 --- a/ddl/out/LambdaCube.PipelineSchema.hs +++ b/ddl/out/LambdaCube.PipelineSchema.hs @@ -1,5 +1,5 @@ -- generated file, do not modify! --- 2016-02-08T13:33:24.035933000000Z +-- 2016-02-12T16:05:13.310528000000Z {-# LANGUAGE OverloadedStrings, RecordWildCards #-} module LambdaCube.PipelineSchema where diff --git a/ddl/out/LambdaCube.PipelineSchema.purs b/ddl/out/LambdaCube.PipelineSchema.purs index 059008b..b31416b 100644 --- a/ddl/out/LambdaCube.PipelineSchema.purs +++ b/ddl/out/LambdaCube.PipelineSchema.purs @@ -1,5 +1,5 @@ -- generated file, do not modify! --- 2016-02-08T13:33:24.035933000000Z +-- 2016-02-12T16:05:13.310528000000Z module LambdaCube.PipelineSchema where import Prelude diff --git a/ddl/out/LambdaCube.PipelineSchema.swift b/ddl/out/LambdaCube.PipelineSchema.swift index 3d90f40..542e8e2 100644 --- a/ddl/out/LambdaCube.PipelineSchema.swift +++ b/ddl/out/LambdaCube.PipelineSchema.swift @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-02-08T13:33:24.035933000000Z +// 2016-02-12T16:05:13.310528000000Z enum StreamType { case Attribute_Word diff --git a/ddl/out/LambdaCube.PipelineSchema2.hpp b/ddl/out/LambdaCube.PipelineSchema2.hpp index e4ec5e3..153a9f6 100644 --- a/ddl/out/LambdaCube.PipelineSchema2.hpp +++ b/ddl/out/LambdaCube.PipelineSchema2.hpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-02-08T13:33:24.035933000000Z +// 2016-02-12T16:05:13.310528000000Z #ifndef HEADER_LambdaCube.PipelineSchema_H #define HEADER_LambdaCube.PipelineSchema_H diff --git a/ddl/out/LambdaCube.TypeInfo.cpp b/ddl/out/LambdaCube.TypeInfo.cpp index f79e093..ce2dcff 100644 --- a/ddl/out/LambdaCube.TypeInfo.cpp +++ b/ddl/out/LambdaCube.TypeInfo.cpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-02-08T13:33:24.089367000000Z +// 2016-02-12T16:05:13.364534000000Z #include "LambdaCube.TypeInfo.hpp" template<> json toJSON>(std::shared_ptr &v) { diff --git a/ddl/out/LambdaCube.TypeInfo.hpp b/ddl/out/LambdaCube.TypeInfo.hpp index 3a6e2bb..6e302f3 100644 --- a/ddl/out/LambdaCube.TypeInfo.hpp +++ b/ddl/out/LambdaCube.TypeInfo.hpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-02-08T13:33:24.089367000000Z +// 2016-02-12T16:05:13.364534000000Z #ifndef HEADER_LambdaCube.TypeInfo_H #define HEADER_LambdaCube.TypeInfo_H diff --git a/ddl/out/LambdaCube.TypeInfo.hs b/ddl/out/LambdaCube.TypeInfo.hs index 9405419..a2df59c 100644 --- a/ddl/out/LambdaCube.TypeInfo.hs +++ b/ddl/out/LambdaCube.TypeInfo.hs @@ -1,5 +1,5 @@ -- generated file, do not modify! --- 2016-02-08T13:33:24.089367000000Z +-- 2016-02-12T16:05:13.364534000000Z {-# LANGUAGE OverloadedStrings, RecordWildCards #-} module LambdaCube.TypeInfo where diff --git a/ddl/out/LambdaCube.TypeInfo.purs b/ddl/out/LambdaCube.TypeInfo.purs index cf00b8e..afd8a86 100644 --- a/ddl/out/LambdaCube.TypeInfo.purs +++ b/ddl/out/LambdaCube.TypeInfo.purs @@ -1,5 +1,5 @@ -- generated file, do not modify! --- 2016-02-08T13:33:24.089367000000Z +-- 2016-02-12T16:05:13.364534000000Z module LambdaCube.TypeInfo where import Prelude diff --git a/ddl/out/LambdaCube.TypeInfo.swift b/ddl/out/LambdaCube.TypeInfo.swift index 8322914..d3b03d1 100644 --- a/ddl/out/LambdaCube.TypeInfo.swift +++ b/ddl/out/LambdaCube.TypeInfo.swift @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-02-08T13:33:24.089367000000Z +// 2016-02-12T16:05:13.364534000000Z enum TypeInfo { case TypeInfo(TypeInfo_Data) diff --git a/ddl/out/LambdaCube.TypeInfo2.hpp b/ddl/out/LambdaCube.TypeInfo2.hpp index ae6412b..c6d5f4b 100644 --- a/ddl/out/LambdaCube.TypeInfo2.hpp +++ b/ddl/out/LambdaCube.TypeInfo2.hpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-02-08T13:33:24.089367000000Z +// 2016-02-12T16:05:13.364534000000Z #ifndef HEADER_LambdaCube.TypeInfo_H #define HEADER_LambdaCube.TypeInfo_H diff --git a/ddl/out/TestData.cpp b/ddl/out/TestData.cpp index bbb2251..558a45b 100644 --- a/ddl/out/TestData.cpp +++ b/ddl/out/TestData.cpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-02-08T13:33:24.109009000000Z +// 2016-02-12T16:05:13.383716000000Z #include "TestData.hpp" template<> json toJSON>(std::shared_ptr &v) { @@ -101,6 +101,37 @@ template<> std::shared_ptr fromJSON>(W json toJSON>(std::shared_ptr &v) { + json obj({}); + switch (v->tag) { + case ::PipelineInfo::tag::PipelineInfo: + obj["tag"] = "PipelineInfo"; + { + std::shared_ptr tv = std::static_pointer_cast(v); + obj["pipelineName"] = toJSON(tv->pipelineName); + obj["pipeline"] = toJSON(tv->pipeline); + } + break; + } + return obj; +} + +template<> std::shared_ptr fromJSON>(W> v, json &obj) { + enum ::PipelineInfo::tag tagType; + std::string tag = obj["tag"]; + if (tag == "PipelineInfo") { + tagType = ::PipelineInfo::tag::PipelineInfo; + std::shared_ptr tv(new data::PipelineInfo()); + tv->pipelineName = fromJSON(W(), obj["pipelineName"]); + tv->pipeline = fromJSON(W>(), obj["pipeline"]); + return tv; + } + else throw "unknown constructor: " + tag; + std::shared_ptr<::PipelineInfo> o(new ::PipelineInfo()); + o->tag = tagType; + return o; +} + template<> json toJSON>(std::shared_ptr &v) { json obj({}); switch (v->tag) { @@ -129,7 +160,7 @@ template<> std::shared_ptr fromJSON>(Wtextures = fromJSON(W>(), obj["textures"]); tv->schema = fromJSON(W>(), obj["schema"]); tv->scenes = fromJSON(W>>(), obj["scenes"]); - tv->pipelines = fromJSON(W>>(), obj["pipelines"]); + tv->pipelines = fromJSON(W>>(), obj["pipelines"]); return tv; } else throw "unknown constructor: " + tag; diff --git a/ddl/out/TestData.hpp b/ddl/out/TestData.hpp index 08b6020..39aa824 100644 --- a/ddl/out/TestData.hpp +++ b/ddl/out/TestData.hpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-02-08T13:33:24.109009000000Z +// 2016-02-12T16:05:13.383716000000Z #ifndef HEADER_TestData_H #define HEADER_TestData_H @@ -55,6 +55,20 @@ namespace data { Scene() { tag = tag::Scene; } }; } +class PipelineInfo { + public: + enum class tag { + PipelineInfo + } tag; +}; +namespace data { + class PipelineInfo : public ::PipelineInfo { + public: + String pipelineName; + std::shared_ptr<::Pipeline> pipeline; + PipelineInfo() { tag = tag::PipelineInfo; } + }; +} class RenderJob { public: enum class tag { @@ -68,7 +82,7 @@ namespace data { std::vector textures; std::shared_ptr<::PipelineSchema> schema; std::vector> scenes; - std::vector> pipelines; + std::vector> pipelines; RenderJob() { tag = tag::RenderJob; } }; } diff --git a/ddl/out/TestData.hs b/ddl/out/TestData.hs index a81134f..d6d8e38 100644 --- a/ddl/out/TestData.hs +++ b/ddl/out/TestData.hs @@ -1,5 +1,5 @@ -- generated file, do not modify! --- 2016-02-08T13:33:24.109009000000Z +-- 2016-02-12T16:05:13.383716000000Z {-# LANGUAGE OverloadedStrings, RecordWildCards #-} module TestData where @@ -46,13 +46,21 @@ data Scene deriving (Show, Eq, Ord) +data PipelineInfo + = PipelineInfo + { pipelineName :: String + , pipeline :: Pipeline + } + + deriving (Show, Eq, Ord) + data RenderJob = RenderJob { meshes :: Vector Mesh , textures :: Vector String , schema :: PipelineSchema , scenes :: Vector Scene - , pipelines :: Vector Pipeline + , pipelines :: Vector PipelineInfo } deriving (Show, Eq, Ord) @@ -144,6 +152,27 @@ instance FromJSON Scene where } parseJSON _ = mzero +instance ToJSON PipelineInfo where + toJSON v = case v of + PipelineInfo{..} -> object + [ "tag" .= ("PipelineInfo" :: Text) + , "pipelineName" .= pipelineName + , "pipeline" .= pipeline + ] + +instance FromJSON PipelineInfo where + parseJSON (Object obj) = do + tag <- obj .: "tag" + case tag :: Text of + "PipelineInfo" -> do + pipelineName <- obj .: "pipelineName" + pipeline <- obj .: "pipeline" + pure $ PipelineInfo + { pipelineName = pipelineName + , pipeline = pipeline + } + parseJSON _ = mzero + instance ToJSON RenderJob where toJSON v = case v of RenderJob{..} -> object diff --git a/ddl/out/TestData.purs b/ddl/out/TestData.purs index 891704d..426da42 100644 --- a/ddl/out/TestData.purs +++ b/ddl/out/TestData.purs @@ -1,5 +1,5 @@ -- generated file, do not modify! --- 2016-02-08T13:33:24.109009000000Z +-- 2016-02-12T16:05:13.383716000000Z module TestData where import Prelude @@ -44,13 +44,20 @@ data Scene } +data PipelineInfo + = PipelineInfo + { pipelineName :: String + , pipeline :: Pipeline + } + + data RenderJob = RenderJob { meshes :: Array Mesh , textures :: Array String , schema :: PipelineSchema , scenes :: Array Scene - , pipelines :: Array Pipeline + , pipelines :: Array PipelineInfo } @@ -140,6 +147,27 @@ instance decodeJsonScene :: DecodeJson Scene where , frames:frames } +instance encodeJsonPipelineInfo :: EncodeJson PipelineInfo where + encodeJson v = case v of + PipelineInfo r -> + "tag" := "PipelineInfo" ~> + "pipelineName" := r.pipelineName ~> + "pipeline" := r.pipeline ~> + jsonEmptyObject + +instance decodeJsonPipelineInfo :: DecodeJson PipelineInfo where + decodeJson json = do + obj <- decodeJson json + tag <- obj .? "tag" + case tag of + "PipelineInfo" -> do + pipelineName <- obj .? "pipelineName" + pipeline <- obj .? "pipeline" + pure $ PipelineInfo + { pipelineName:pipelineName + , pipeline:pipeline + } + instance encodeJsonRenderJob :: EncodeJson RenderJob where encodeJson v = case v of RenderJob r -> diff --git a/ddl/out/TestData.swift b/ddl/out/TestData.swift index 398ce23..671c6bf 100644 --- a/ddl/out/TestData.swift +++ b/ddl/out/TestData.swift @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-02-08T13:33:24.109009000000Z +// 2016-02-12T16:05:13.383716000000Z enum ClientInfo { case ClientInfo(ClientInfo_Data) @@ -28,6 +28,14 @@ enum Scene { } } +enum PipelineInfo { + case PipelineInfo(PipelineInfo_Data) + struct PipelineInfo_Data { + var pipelineName : String + var pipeline : Pipeline + } +} + enum RenderJob { case RenderJob(RenderJob_Data) struct RenderJob_Data { @@ -35,7 +43,7 @@ enum RenderJob { var textures : Array var schema : PipelineSchema var scenes : Array - var pipelines : Array + var pipelines : Array } } @@ -143,6 +151,17 @@ extension Scene { } } } +extension PipelineInfo { + var toJSON : [String: AnyObject] { + switch self { + case .PipelineInfo(let v): + return [ "tag" : "PipelineInfo" + , "pipelineName" : v.pipelineName.toJSON + , "pipeline" : v.pipeline.toJSON + ] + } + } +} extension RenderJob { var toJSON : [String: AnyObject] { switch self { @@ -200,6 +219,7 @@ enum Type { case ClientInfo case Frame case Scene + case PipelineInfo case RenderJob case FrameResult case RenderJobResult diff --git a/ddl/out/TestData2.hpp b/ddl/out/TestData2.hpp index 07ef071..e876551 100644 --- a/ddl/out/TestData2.hpp +++ b/ddl/out/TestData2.hpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-02-08T13:33:24.109009000000Z +// 2016-02-12T16:05:13.383716000000Z #ifndef HEADER_TestData_H #define HEADER_TestData_H @@ -55,6 +55,20 @@ public: } tag; std::shared_ptr Scene; }; +namespace data { + class PipelineInfo { + public: + String pipelineName; + std::shared_ptr<::Pipeline> pipeline; + }; +} +class PipelineInfo { +public: + enum class tag { + PipelineInfo + } tag; + std::shared_ptr PipelineInfo; +}; namespace data { class RenderJob { public: @@ -62,7 +76,7 @@ namespace data { std::vector textures; std::shared_ptr<::PipelineSchema> schema; std::vector> scenes; - std::vector> pipelines; + std::vector> pipelines; }; } class RenderJob { -- cgit v1.2.3