summaryrefslogtreecommitdiffstats
path: root/src/Runtime/Qt3DSRuntimeStatic
diff options
context:
space:
mode:
authorJanne Kangas <janne.kangas@symbio.com>2017-09-26 15:00:52 +0300
committerJanne Kangas <janne.kangas@qt.io>2017-12-18 12:16:24 +0000
commit85da752abaad18450716ec03586c03a800277ff6 (patch)
tree9ef7300c61edd7723fedf9be349d2e4e2d95a9cc /src/Runtime/Qt3DSRuntimeStatic
parent28be612ad6429f8197ebb3095a2852d0b78c2602 (diff)
Add Datainput part 1
Implements Datainput as graph object that can be parsed from UIP files and fed data from QML. Adding Datainput object from studio UI is disabled intentionally as functionality will be fleshed out in the following patches. Task-ID: QT3DS-2 Change-Id: I449087aa968ae2331f203c4cb6e41b8ac6eef5cf Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/Runtime/Qt3DSRuntimeStatic')
-rw-r--r--src/Runtime/Qt3DSRuntimeStatic/Qt3DSRuntimeStatic.pro2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/Runtime/Qt3DSRuntimeStatic/Qt3DSRuntimeStatic.pro b/src/Runtime/Qt3DSRuntimeStatic/Qt3DSRuntimeStatic.pro
index e13cf9e4..b0f277eb 100644
--- a/src/Runtime/Qt3DSRuntimeStatic/Qt3DSRuntimeStatic.pro
+++ b/src/Runtime/Qt3DSRuntimeStatic/Qt3DSRuntimeStatic.pro
@@ -66,6 +66,7 @@ SOURCES += \
../Source/Runtime/Source/Qt3DSSlideSystem.cpp \
../Source/Runtime/Source/Qt3DSTimePolicy.cpp \
../Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderCamera.cpp \
+ ../Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderDataInput.cpp \
../Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderDefaultMaterial.cpp \
../Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderDynamicObject.cpp \
../Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderEffect.cpp \
@@ -292,6 +293,7 @@ HEADERS += \
../Source/Runtime/Include/Qt3DSLuaIncludes.h \
../Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderCamera.h \
../Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderCustomMaterial.h \
+ ../Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderDataInput.h \
../Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderDefaultMaterial.h \
../Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderDynamicObject.h \
../Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderEffect.h \