Commit fc3cf82e authored by Tomi Korpipää's avatar Tomi Korpipää

Update LowEndCluster to OpenGL runtime 2.4

parent c5364f8c
......@@ -27,3 +27,6 @@ QML_DESIGNER_IMPORT_PATH =
qnx: target.path = /tmp/$${TARGET}/bin
else: unix:!android: target.path = /opt/$${TARGET}/bin
!isEmpty(target.path): INSTALLS += target
DISTFILES += \
SimulationData.qml
......@@ -5,13 +5,4 @@
<dataInput metadata="" name="carSlide" type="String"/>
<dataInput metadata="" name="roadSpeed" type="Float"/>
</assets>
<statemachine ref="#logic">
<visual-states>
<state ref="Initial">
<enter>
<goto-slide rel="next" element="main:Scene"/>
</enter>
</state>
</visual-states>
</statemachine>
</application>
<MaterialData version="1.0">
<Property name="shaderlighting">None</Property>
<Property name="blendmode">Normal</Property>
<Property name="diffuse">0.8 0.8 0.8</Property>
<Property name="diffuse">1 1 1 1</Property>
<Property name="diffusemap"><![CDATA[./maps/road.jpg]]></Property>
<Property name="specularamount">0</Property>
<Property name="specularroughness">0</Property>
<Property name="opacity">100</Property>
<Property name="emissivecolor">1 1 1</Property>
<Property name="emissivecolor">1 1 1 1</Property>
<Property name="emissivepower">0</Property>
<Property name="bumpamount">0.5</Property>
<Property name="displaceamount">20</Property>
<Property name="translucentfalloff">1</Property>
<Property name="diffuselightwrap">0</Property>
<Property name="specularmodel">Default</Property>
<Property name="speculartint">1 1 1</Property>
<Property name="speculartint">1 1 1 1</Property>
<Property name="ior">1.5</Property>
<Property name="fresnelPower">0</Property>
<Property name="vertexcolors">True</Property>
<Property name="sourcepath"></Property>
<Property name="importid">Plane_Diffuse_Default</Property>
<Property name="importfile">../models/road/road.import</Property>
<Property name="type">Material</Property>
<Property name="name"><![CDATA[materials/Plane_Diffuse_Default]]></Property>
<Property name="path"><![CDATA[C:/dev/lowendcluster/LowEndCluster/Presentation/materials/Plane_Diffuse_Default.materialdef]]></Property>
<Property name="type">Material</Property>
<Property name="path"><![CDATA[/home/tomi/dev/qt3dstudio-demos/LowEndCluster/Presentation/materials/Plane_Diffuse_Default.materialdef]]></Property>
<TextureData name="diffusemap">
<Property name="scaleu">1</Property>
<Property name="scalev">1</Property>
......@@ -38,7 +38,7 @@
<Property name="sourcepath"><![CDATA[./maps/road.jpg]]></Property>
<Property name="importid"></Property>
<Property name="importfile"></Property>
<Property name="type">Image</Property>
<Property name="name"><![CDATA[Image]]></Property>
<Property name="type">Image</Property>
</TextureData>
</MaterialData>
\ No newline at end of file
<MaterialData version="1.0">
<Property name="shaderlighting">None</Property>
<Property name="blendmode">Normal</Property>
<Property name="diffuse">1 1 1</Property>
<Property name="diffuse">1 1 1 1</Property>
<Property name="diffusemap"><![CDATA[./models/lowPolyCar/maps/Low_lowpolyCoupe_Diffuse.jpg]]></Property>
<Property name="specularamount">0</Property>
<Property name="specularroughness">0</Property>
<Property name="opacity">100</Property>
<Property name="emissivecolor">1 1 1</Property>
<Property name="emissivecolor">1 1 1 1</Property>
<Property name="emissivepower">0</Property>
<Property name="bumpamount">0.5</Property>
<Property name="displaceamount">20</Property>
<Property name="translucentfalloff">1</Property>
<Property name="diffuselightwrap">0</Property>
<Property name="specularmodel">Default</Property>
<Property name="speculartint">1 1 1</Property>
<Property name="speculartint">1 1 1 1</Property>
<Property name="ior">1.5</Property>
<Property name="fresnelPower">0</Property>
<Property name="vertexcolors">False</Property>
<Property name="sourcepath"></Property>
<Property name="importid">lowpolyCoupe</Property>
<Property name="importfile">../models/lowPolyCar/lowPolyCar.import</Property>
<Property name="type">Material</Property>
<Property name="name"><![CDATA[materials/lowpolyCoupe]]></Property>
<Property name="path"><![CDATA[C:/dev/lowendcluster/LowEndCluster/Presentation/materials/lowpolyCoupe.materialdef]]></Property>
<Property name="type">Material</Property>
<Property name="path"><![CDATA[/home/tomi/dev/qt3dstudio-demos/LowEndCluster/Presentation/materials/lowpolyCoupe.materialdef]]></Property>
<TextureData name="diffusemap">
<Property name="scaleu">1</Property>
<Property name="scalev">1</Property>
......@@ -38,7 +38,7 @@
<Property name="sourcepath"><![CDATA[./models/lowPolyCar/maps/Low_lowpolyCoupe_Diffuse.jpg]]></Property>
<Property name="importid">lowpolyCoupe_diffusemap</Property>
<Property name="importfile">../models/lowPolyCar/lowPolyCar.import</Property>
<Property name="type">Image</Property>
<Property name="name"><![CDATA[lowpolyCoupe_diffusemap]]></Property>
<Property name="type">Image</Property>
</TextureData>
</MaterialData>
\ No newline at end of file
<MaterialData version="1.0">
<Property name="shaderlighting">None</Property>
<Property name="blendmode">Normal</Property>
<Property name="diffuse">1 1 1</Property>
<Property name="diffuse">1 1 1 1</Property>
<Property name="diffusemap"><![CDATA[./models/lowPolyCar/maps/Low_lowpolyCoupe_Diffuse_red.jpg]]></Property>
<Property name="specularamount">0</Property>
<Property name="specularroughness">0</Property>
<Property name="opacity">100</Property>
<Property name="emissivecolor">1 1 1</Property>
<Property name="emissivecolor">1 1 1 1</Property>
<Property name="emissivepower">0</Property>
<Property name="bumpamount">0.5</Property>
<Property name="displaceamount">20</Property>
<Property name="translucentfalloff">1</Property>
<Property name="diffuselightwrap">0</Property>
<Property name="specularmodel">Default</Property>
<Property name="speculartint">1 1 1</Property>
<Property name="speculartint">1 1 1 1</Property>
<Property name="ior">1.5</Property>
<Property name="fresnelPower">0</Property>
<Property name="vertexcolors">False</Property>
<Property name="sourcepath"></Property>
<Property name="importid">lowpolyCoupe</Property>
<Property name="importfile">../models/lowPolyCar/lowPolyCar.import</Property>
<Property name="type">Material</Property>
<Property name="name"><![CDATA[materials/lowpolyCoupeRed]]></Property>
<Property name="path"><![CDATA[C:/dev/lowendcluster/LowEndCluster/Presentation/materials/lowpolyCoupeRed.materialdef]]></Property>
<Property name="type">Material</Property>
<Property name="path"><![CDATA[/home/tomi/dev/qt3dstudio-demos/LowEndCluster/Presentation/materials/lowpolyCoupeRed.materialdef]]></Property>
<TextureData name="diffusemap">
<Property name="scaleu">1</Property>
<Property name="scalev">1</Property>
......@@ -38,7 +38,7 @@
<Property name="sourcepath"><![CDATA[./models/lowPolyCar/maps/Low_lowpolyCoupe_Diffuse_red.jpg]]></Property>
<Property name="importid"></Property>
<Property name="importfile">../models/lowPolyCar/lowPolyCar.import</Property>
<Property name="type">Image</Property>
<Property name="name"><![CDATA[Image]]></Property>
<Property name="type">Image</Property>
</TextureData>
</MaterialData>
\ No newline at end of file
This diff is collapsed.
<RCC>
<qresource prefix="/">
<file>main.qml</file>
<file>barcenter.jpg</file>
<file>barside.jpg</file>
<file>needle.png</file>
<file>rpmgauge.jpg</file>
<file>speeedgauge.jpg</file>
<file>Presentation/maps/road.jpg</file>
<file>Presentation/materials/lowpolyCoupe.materialdef</file>
<file>Presentation/materials/Plane_Diffuse_Default.materialdef</file>
......@@ -16,14 +12,6 @@
<file>Presentation/Presentation.uia</file>
<file>main.cpp</file>
<file>TitilliumWeb-Italic.ttf</file>
<file>smallring.jpg</file>
<file>fuel.jpg</file>
<file>temp.jpg</file>
<file>tempFill.jpg</file>
<file>arrow.jpg</file>
<file>light.jpg</file>
<file>parkbrake.jpg</file>
<file>seatbelt.jpg</file>
<file>Presentation/models/lowPolyCar/maps/Low_lowpolyCoupe_Diffuse_red.jpg</file>
<file>FpsDisplay.qml</file>
<file>needleTrail.png</file>
......@@ -32,5 +20,17 @@
<file>Presentation/presentations/Presentation.uip</file>
<file>Presentation/models/road/meshes/Plane.mesh</file>
<file>Presentation/models/road/road.import</file>
<file>arrow.png</file>
<file>barcenter.png</file>
<file>barside.png</file>
<file>fuel.png</file>
<file>light.png</file>
<file>parkbrake.png</file>
<file>rpmgauge.png</file>
<file>seatbelt.png</file>
<file>smallring.png</file>
<file>speeedgauge.png</file>
<file>temp.png</file>
<file>tempFill.png</file>
</qresource>
</RCC>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment