diff --git a/Island_ShaderExample/main.qml b/Island_ShaderExample/main.qml index e4b836498acd3a5012c9634c9665265dd35e54b5..a070a4ed9c772a2a4c74cf7c6eb2d2553c0337ce 100644 --- a/Island_ShaderExample/main.qml +++ b/Island_ShaderExample/main.qml @@ -1,7 +1,6 @@ import QtQuick 2.12 import QtQuick.Window 2.12 import QtStudio3D.OpenGL 2.4 -//import QtStudio3D 2.3 import QtQuick.Controls 2.5 Window { @@ -51,14 +50,14 @@ Window { } } } - Timer{ + Timer { id:watertimer interval: 20 running: true repeat: true onTriggered: time.value += 0.02 } - Timer{ + Timer { id:causticstimer interval: 1 running: true @@ -86,7 +85,7 @@ Window { anchors.topMargin: 30 anchors.rightMargin: 10 anchors.leftMargin: 10 - value:0.2 + value: 0.2 to: 1.1 from: 0.2 } @@ -113,7 +112,7 @@ Window { anchors.topMargin: 30 anchors.rightMargin: 10 anchors.leftMargin: 10 - value:-1000.0 + value: -1000.0 to: 1000.0 from: -1000.0 } diff --git a/Island_ShaderExample/qml.qrc b/Island_ShaderExample/qml.qrc index 652f0f249d036888a979d10807ca19f0bb41f4f5..d8c64db08ef587aaf17064add4f7d6653bcd373e 100644 --- a/Island_ShaderExample/qml.qrc +++ b/Island_ShaderExample/qml.qrc @@ -15,7 +15,6 @@ <file>3d_presentation/maps/Waterwave.jpg</file> <file>3d_presentation/maps/waveGradient.png</file> <file>3d_presentation/materials/Glass.materialdef</file> - <file>3d_presentation/materials/ground.materialdef</file> <file>3d_presentation/materials/groundBlending.shader</file> <file>3d_presentation/materials/Sky.materialdef</file> <file>3d_presentation/materials/skybox.shader</file>