Fix audioengine example.
- Add missing audio files - Fix 'Unable to assign double to QVector3D' warning - Don't show decimal part of the volume Task-number: QTBUG-41841 Task-number: QTBUG-44304 Change-Id: Ie24284242bbac0d10bd85841932c506d7634a514 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
This commit is contained in:
@@ -65,7 +65,7 @@ Rectangle {
|
||||
loops: Animation.Infinite
|
||||
running: true
|
||||
NumberAnimation {
|
||||
duration: 8000
|
||||
duration: 12000
|
||||
from: 0
|
||||
to: 1
|
||||
}
|
||||
@@ -113,7 +113,7 @@ Rectangle {
|
||||
}
|
||||
velocity: {
|
||||
var speed = root.twoPi * root.radius / 4;
|
||||
return shipSound.direction * speed;
|
||||
return shipSound.direction.times(speed);
|
||||
}
|
||||
|
||||
Component.onCompleted: shipSound.play()
|
||||
@@ -137,7 +137,7 @@ Rectangle {
|
||||
color: "lightgreen"
|
||||
}
|
||||
Text {
|
||||
text: " volume:" + volumeBar.volumeCtrl.volume * 100 +"%";
|
||||
text: " volume:" + Math.round(volumeBar.volumeCtrl.volume * 100) +"%";
|
||||
font.pointSize: 16;
|
||||
font.italic: true;
|
||||
color: "black"
|
||||
|
||||
@@ -68,22 +68,18 @@ AudioEngine {
|
||||
}
|
||||
|
||||
AudioSample {
|
||||
name:"fire"
|
||||
source: "fire-03-loop.wav"
|
||||
name:"engine"
|
||||
source: "engine-loop.wav"
|
||||
preloaded:true
|
||||
}
|
||||
|
||||
AudioSample {
|
||||
name:"explosion"
|
||||
source: "explosion-02.wav"
|
||||
name:"horn"
|
||||
source: "horn.wav"
|
||||
}
|
||||
AudioSample {
|
||||
name:"lava"
|
||||
source: "lava-bubbling-01.wav"
|
||||
}
|
||||
AudioSample {
|
||||
name:"water"
|
||||
source: "running-water-01.wav"
|
||||
name:"whistle"
|
||||
source: "whistle.wav"
|
||||
}
|
||||
Sound {
|
||||
name:"shipengine"
|
||||
@@ -91,7 +87,7 @@ AudioEngine {
|
||||
category:"sfx"
|
||||
PlayVariation {
|
||||
looping:true
|
||||
sample:"fire"
|
||||
sample:"engine"
|
||||
maxGain:0.9
|
||||
minGain:0.8
|
||||
}
|
||||
@@ -101,23 +97,14 @@ AudioEngine {
|
||||
name:"effects"
|
||||
category:"sfx"
|
||||
PlayVariation {
|
||||
sample:"lava"
|
||||
maxGain:1.5
|
||||
minGain:1.2
|
||||
maxPitch:2.0
|
||||
minPitch:0.5
|
||||
sample:"horn"
|
||||
maxGain:2.0
|
||||
minGain:0.9
|
||||
}
|
||||
PlayVariation {
|
||||
sample:"explosion"
|
||||
maxGain:1.1
|
||||
minGain:0.7
|
||||
maxPitch:1.5
|
||||
minPitch:0.5
|
||||
}
|
||||
PlayVariation {
|
||||
sample:"water"
|
||||
maxGain:1.5
|
||||
minGain:1.2
|
||||
sample:"whistle"
|
||||
maxGain:1.0
|
||||
minGain:0.8
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
BIN
examples/multimedia/audioengine/qml/content/engine-loop.wav
Normal file
BIN
examples/multimedia/audioengine/qml/content/engine-loop.wav
Normal file
Binary file not shown.
BIN
examples/multimedia/audioengine/qml/content/horn.wav
Normal file
BIN
examples/multimedia/audioengine/qml/content/horn.wav
Normal file
Binary file not shown.
BIN
examples/multimedia/audioengine/qml/content/whistle.wav
Normal file
BIN
examples/multimedia/audioengine/qml/content/whistle.wav
Normal file
Binary file not shown.
Reference in New Issue
Block a user