Skip to content

GitLab

Q
qt3dstudio
Commit 1cdb0817 authored by Tomi Korpipää's avatar Tomi Korpipää
Browse files
Options

Removed missing file from qrc 

Plus minor coding convention fixes.
parent b6b1772d
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 6 deletions
Island_ShaderExample/main.qml
View file @ 1cdb0817
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
}
......
Island_ShaderExample/qml.qrc
View file @ 1cdb0817
......@@ -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>
......
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