From 184ec7e548b03a21836fb3c69c517a5bf5b0f854 Mon Sep 17 00:00:00 2001 From: Tomi Korpipaa Date: Fri, 4 May 2018 13:52:44 +0300 Subject: Update SampleProject MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QT3DS-1541 Change-Id: Icda4411f35b724e03291f07a7ccd29d8136ac839 Reviewed-by: Tomi Korpipää --- examples/studio3d/SampleProject/SampleProject.uia | 12 +- examples/studio3d/SampleProject/SampleProject.uip | 557 ++++++++++++++++++--- .../studio3d/SampleProject/effects/Corona.effect | 97 ---- .../SampleProject/effects/VignetteEffect.effect | 41 ++ .../SampleProject/fonts/TitilliumWeb-Regular.ttf | Bin 0 -> 63752 bytes .../SampleProject/maps/Icon_TurnLeft_ON.png | Bin 0 -> 16151 bytes .../maps/OpenfootageNET_garage-512.hdr | Bin 0 -> 422659 bytes examples/studio3d/SampleProject/maps/Rpm7.png | Bin 0 -> 29968 bytes .../studio3d/SampleProject/maps/effects/noise.dds | Bin 4224 -> 0 bytes .../SampleProject/maps/gradient_lines_001.png | Bin 0 -> 285262 bytes examples/studio3d/SampleProject/maps/kmh260.png | Bin 0 -> 20767 bytes .../SampleProject/maps/materials/shadow.png | Bin 334 -> 0 bytes .../maps/materials/spherical_checker.png | Bin 11066 -> 0 bytes examples/studio3d/SampleProject/maps/road.png | Bin 0 -> 21290 bytes .../SampleProject/materials/simple_glass.material | 197 -------- .../SampleProject/models/Ring_2/Ring_2.import | 18 + .../models/Ring_2/meshes/qt_gauge_ring_2.mesh | Bin 0 -> 25608 bytes .../models/Speedometer/Speedometer.import | 39 -- .../models/Speedometer/maps/Speed.png | Bin 485677 -> 0 bytes .../models/Speedometer/meshes/NeedleSpeed.mesh | Bin 10880 -> 0 bytes .../models/Speedometer/meshes/Speedometer.mesh | Bin 484416 -> 0 bytes .../models/Sportscar_15k/Sportscar_15k.import | 62 +++ .../models/Sportscar_15k/maps/c_tex.jpg | Bin 0 -> 145692 bytes .../models/Sportscar_15k/meshes/BodyBack.mesh | Bin 0 -> 1361004 bytes .../models/Sportscar_15k/meshes/BodyFront.mesh | Bin 0 -> 858284 bytes .../models/Sportscar_15k/meshes/backWheels.mesh | Bin 0 -> 427336 bytes .../models/Sportscar_15k/meshes/frontWheels.mesh | Bin 0 -> 426216 bytes .../models/needle_2/meshes/qt_gauge_needles_2.mesh | Bin 0 -> 16860 bytes .../SampleProject/models/needle_2/needle_2.import | 20 + .../models/roundbg_1/maps/gradient.png | Bin 0 -> 164954 bytes .../meshes/qt_gauge_background_round_1.mesh | Bin 0 -> 2892 bytes .../models/roundbg_1/roundbg_1.import | 24 + .../meshes/qt_gauge_tickmarks_260.mesh | Bin 0 -> 40952 bytes .../models/tickmark_260/tickmark_260.import | 18 + .../meshes/qt_gauge_tickmarks_8_small.mesh | Bin 0 -> 2248 bytes .../tickmark_8_small/tickmark_8_small.import | 18 + examples/studio3d/SampleProject/scripts/Map.jpg | Bin 0 -> 48073 bytes .../studio3d/SampleProject/scripts/Navigation.qml | 74 +++ 38 files changed, 783 insertions(+), 394 deletions(-) delete mode 100644 examples/studio3d/SampleProject/effects/Corona.effect create mode 100644 examples/studio3d/SampleProject/effects/VignetteEffect.effect create mode 100644 examples/studio3d/SampleProject/fonts/TitilliumWeb-Regular.ttf create mode 100644 examples/studio3d/SampleProject/maps/Icon_TurnLeft_ON.png create mode 100644 examples/studio3d/SampleProject/maps/OpenfootageNET_garage-512.hdr create mode 100644 examples/studio3d/SampleProject/maps/Rpm7.png delete mode 100644 examples/studio3d/SampleProject/maps/effects/noise.dds create mode 100644 examples/studio3d/SampleProject/maps/gradient_lines_001.png create mode 100644 examples/studio3d/SampleProject/maps/kmh260.png delete mode 100644 examples/studio3d/SampleProject/maps/materials/shadow.png delete mode 100644 examples/studio3d/SampleProject/maps/materials/spherical_checker.png create mode 100644 examples/studio3d/SampleProject/maps/road.png delete mode 100644 examples/studio3d/SampleProject/materials/simple_glass.material create mode 100644 examples/studio3d/SampleProject/models/Ring_2/Ring_2.import create mode 100644 examples/studio3d/SampleProject/models/Ring_2/meshes/qt_gauge_ring_2.mesh delete mode 100644 examples/studio3d/SampleProject/models/Speedometer/Speedometer.import delete mode 100644 examples/studio3d/SampleProject/models/Speedometer/maps/Speed.png delete mode 100644 examples/studio3d/SampleProject/models/Speedometer/meshes/NeedleSpeed.mesh delete mode 100644 examples/studio3d/SampleProject/models/Speedometer/meshes/Speedometer.mesh create mode 100644 examples/studio3d/SampleProject/models/Sportscar_15k/Sportscar_15k.import create mode 100644 examples/studio3d/SampleProject/models/Sportscar_15k/maps/c_tex.jpg create mode 100644 examples/studio3d/SampleProject/models/Sportscar_15k/meshes/BodyBack.mesh create mode 100644 examples/studio3d/SampleProject/models/Sportscar_15k/meshes/BodyFront.mesh create mode 100644 examples/studio3d/SampleProject/models/Sportscar_15k/meshes/backWheels.mesh create mode 100644 examples/studio3d/SampleProject/models/Sportscar_15k/meshes/frontWheels.mesh create mode 100644 examples/studio3d/SampleProject/models/needle_2/meshes/qt_gauge_needles_2.mesh create mode 100644 examples/studio3d/SampleProject/models/needle_2/needle_2.import create mode 100644 examples/studio3d/SampleProject/models/roundbg_1/maps/gradient.png create mode 100644 examples/studio3d/SampleProject/models/roundbg_1/meshes/qt_gauge_background_round_1.mesh create mode 100644 examples/studio3d/SampleProject/models/roundbg_1/roundbg_1.import create mode 100644 examples/studio3d/SampleProject/models/tickmark_260/meshes/qt_gauge_tickmarks_260.mesh create mode 100644 examples/studio3d/SampleProject/models/tickmark_260/tickmark_260.import create mode 100644 examples/studio3d/SampleProject/models/tickmark_8_small/meshes/qt_gauge_tickmarks_8_small.mesh create mode 100644 examples/studio3d/SampleProject/models/tickmark_8_small/tickmark_8_small.import create mode 100644 examples/studio3d/SampleProject/scripts/Map.jpg create mode 100644 examples/studio3d/SampleProject/scripts/Navigation.qml (limited to 'examples') diff --git a/examples/studio3d/SampleProject/SampleProject.uia b/examples/studio3d/SampleProject/SampleProject.uia index d59165ec..3550fbe3 100644 --- a/examples/studio3d/SampleProject/SampleProject.uia +++ b/examples/studio3d/SampleProject/SampleProject.uia @@ -1,9 +1,13 @@ - - + + - + + + + + + - diff --git a/examples/studio3d/SampleProject/SampleProject.uip b/examples/studio3d/SampleProject/SampleProject.uip index 37b0cdfb..aaac343c 100644 --- a/examples/studio3d/SampleProject/SampleProject.uip +++ b/examples/studio3d/SampleProject/SampleProject.uip @@ -1,78 +1,521 @@ - - #ff5500 #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff + + #7391ff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff + + + + + + - - + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + - - - - 0 0 100 100 5 0 100 100 - 0 0 100 100 5 0 100 100 - 0 45 100 100 5 -225 100 100 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 -90 0 0 1 -90 0 0 + 0 0 0 0 1 0 0 0 + 0 0 0 0 1 0 0 0 + + + + + + + + + + + + + + 0 -90 0 0 1 -90 0 0 + 0 0 0 0 1 0 0 0 + 0 0 0 0 1 0 0 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 -90 0 0 1 -60 0 0 + 0 0 0 0 1 -30 0 0 + 0 0 0 0 1 0 0 0 + + + + + + + + + + + + + + 0 -90 0 0 1 -60 0 0 + 0 0 0 0 1 30 0 0 + 0 0 0 0 1 0 0 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 100 0 0 1 0 0 0 + + + + + 0 100 0 0 1 0 0 0 + + + + + + + + + + + + 0 0 0 0 10 6.10667e-13 0 0 + 0 -136 0 0 10 134 0 0 + 0 0 0 0 10 -1.01778e-12 0 0 + + + 0 1 100 100 + 0 1 100 100 + 0 1 100 100 + + + + + + + + + + + + 0 4.07111e-13 0 0 7 0 0 0 + 0 -136 0 0 7 136 0 0 + 0 4.07111e-13 0 0 7 0 0 0 - - - - - - - - - 0 0 100 100 2.13 0 0 0 5 0 100 100 - 0 0 100 100 2.13 0 0 0 5 0 100 100 - 0 0 100 100 2.13 -105.249 0 0 5 -270 100 100 + + + + + + + + + + + + + + + + + + 0 0 0 0 2 -96.16 0 0 4 0 0 0 + 0 -65.64 0 0 2 -65.64 0 0 4 -65.64 0 0 + 0 0 0 0 2 0 0 0 4 0 0 0 + + + + + + + + 0 0 0 0 4 900 0 0 + 0 0 0 0 4 0 0 0 + 0 0 0 0 4 0 0 0 - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + 0 0 0 0 4 900 0 0 + 0 0 0 0 4 0 0 0 + 0 0 0 0 4 0 0 0 + + + + + + + + + + + + 0 0 0 0 4 0.1 0 0 + + + + + + + + + + + diff --git a/examples/studio3d/SampleProject/effects/Corona.effect b/examples/studio3d/SampleProject/effects/Corona.effect deleted file mode 100644 index 4fc77755..00000000 --- a/examples/studio3d/SampleProject/effects/Corona.effect +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - - - - - - - - - - - - - -#include "blur.glsllib" -uniform float AppFrame; // frame number since app starts -uniform float FPS; - - - -varying vec2 crawl; // corona crawl direction and magnitude - - -void vert () -{ - SetupHorizontalGaussianBlur(Texture0Info.x, HBlurBias, TexCoord); - // compute crawl - float alpha = radians(CrawlAngle + 180.0); - crawl = vec2(CrawlLen * sin(alpha), CrawlLen * cos(alpha)); -} - - -void frag() -{ - //Passing in 1.0 means the value will not get alpha-multiplied again - float OutCol = GaussianAlphaBlur( GlowSampler, 1.0 ); - OutCol *= Trailfade; // fade away glow color - OutCol += texture2D_0( TexCoord ).a; // add glow color in the original tex area - - vec2 nuv = NoiseScale * TexCoord3 + AppFrame / FPS * crawl; - vec4 noise = texture2D_NoiseSamp(fract(nuv)); - float ns = (1.0 - NoiseRatio) + NoiseRatio * NoiseBright * noise.x; - OutCol *= ns; - gl_FragColor = vec4( OutCol ); -} - - - - -void vert () -{ - SetupVerticalGaussianBlur( Texture0Info.y, VBlurBias, TexCoord ); -} - - -void frag() // PS_Blur_Vertical_9tap -{ - float OutCol = GaussianAlphaBlur( Texture0, Texture0Info.z ); - gl_FragColor = OutCol * vec4(GlowCol, 1.0); -} - - - - -void vert() -{ -} - - -void frag () -{ - vec4 src = texture2D_0( TexCoord ); - vec4 dst = texture2D_Sprite(TexCoord); - colorOutput( src * (1.0 - dst.a) + dst ); -} - - - - - - - - - - - - - - - - - diff --git a/examples/studio3d/SampleProject/effects/VignetteEffect.effect b/examples/studio3d/SampleProject/effects/VignetteEffect.effect new file mode 100644 index 00000000..a4591208 --- /dev/null +++ b/examples/studio3d/SampleProject/effects/VignetteEffect.effect @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/studio3d/SampleProject/fonts/TitilliumWeb-Regular.ttf b/examples/studio3d/SampleProject/fonts/TitilliumWeb-Regular.ttf new file mode 100644 index 00000000..6da82193 Binary files /dev/null and b/examples/studio3d/SampleProject/fonts/TitilliumWeb-Regular.ttf differ diff --git a/examples/studio3d/SampleProject/maps/Icon_TurnLeft_ON.png b/examples/studio3d/SampleProject/maps/Icon_TurnLeft_ON.png new file mode 100644 index 00000000..d886ede9 Binary files /dev/null and b/examples/studio3d/SampleProject/maps/Icon_TurnLeft_ON.png differ diff --git a/examples/studio3d/SampleProject/maps/OpenfootageNET_garage-512.hdr b/examples/studio3d/SampleProject/maps/OpenfootageNET_garage-512.hdr new file mode 100644 index 00000000..015b4789 Binary files /dev/null and b/examples/studio3d/SampleProject/maps/OpenfootageNET_garage-512.hdr differ diff --git a/examples/studio3d/SampleProject/maps/Rpm7.png b/examples/studio3d/SampleProject/maps/Rpm7.png new file mode 100644 index 00000000..08ba173e Binary files /dev/null and b/examples/studio3d/SampleProject/maps/Rpm7.png differ diff --git a/examples/studio3d/SampleProject/maps/effects/noise.dds b/examples/studio3d/SampleProject/maps/effects/noise.dds deleted file mode 100644 index fdb5f205..00000000 Binary files a/examples/studio3d/SampleProject/maps/effects/noise.dds and /dev/null differ diff --git a/examples/studio3d/SampleProject/maps/gradient_lines_001.png b/examples/studio3d/SampleProject/maps/gradient_lines_001.png new file mode 100644 index 00000000..f63aa7cc Binary files /dev/null and b/examples/studio3d/SampleProject/maps/gradient_lines_001.png differ diff --git a/examples/studio3d/SampleProject/maps/kmh260.png b/examples/studio3d/SampleProject/maps/kmh260.png new file mode 100644 index 00000000..7a4aac67 Binary files /dev/null and b/examples/studio3d/SampleProject/maps/kmh260.png differ diff --git a/examples/studio3d/SampleProject/maps/materials/shadow.png b/examples/studio3d/SampleProject/maps/materials/shadow.png deleted file mode 100644 index 599b1ccc..00000000 Binary files a/examples/studio3d/SampleProject/maps/materials/shadow.png and /dev/null differ diff --git a/examples/studio3d/SampleProject/maps/materials/spherical_checker.png b/examples/studio3d/SampleProject/maps/materials/spherical_checker.png deleted file mode 100644 index e42394dd..00000000 Binary files a/examples/studio3d/SampleProject/maps/materials/spherical_checker.png and /dev/null differ diff --git a/examples/studio3d/SampleProject/maps/road.png b/examples/studio3d/SampleProject/maps/road.png new file mode 100644 index 00000000..ace1f612 Binary files /dev/null and b/examples/studio3d/SampleProject/maps/road.png differ diff --git a/examples/studio3d/SampleProject/materials/simple_glass.material b/examples/studio3d/SampleProject/materials/simple_glass.material deleted file mode 100644 index a6b4ee09..00000000 --- a/examples/studio3d/SampleProject/materials/simple_glass.material +++ /dev/null @@ -1,197 +0,0 @@ - - - - - - - - - - - - - - - - - -// add enum defines -#define scatter_reflect 0 -#define scatter_transmit 1 -#define scatter_reflect_transmit 2 - -#define QT3DS_ENABLE_UV0 1 -#define QT3DS_ENABLE_WORLD_POSITION 1 -#define QT3DS_ENABLE_TEXTAN 1 -#define QT3DS_ENABLE_BINORMAL 0 - -#include "vertexFragmentBase.glsllib" - -// set shader output -out vec4 fragColor; - -// add structure defines -struct layer_result -{ - vec4 base; - vec4 layer; - mat3 tanFrame; -}; - - -// temporary declarations -vec3 ftmp0; - vec4 tmpShadowTerm; - -layer_result layers[1]; - -#include "SSAOCustomMaterial.glsllib" -#include "sampleLight.glsllib" -#include "sampleProbe.glsllib" -#include "sampleArea.glsllib" -#include "square.glsllib" -#include "calculateRoughness.glsllib" -#include "evalBakedShadowMap.glsllib" -#include "evalEnvironmentMap.glsllib" -#include "luminance.glsllib" -#include "microfacetBSDF.glsllib" -#include "physGlossyBSDF.glsllib" -#include "simpleGlossyBSDF.glsllib" -#include "abbeNumberIOR.glsllib" -#include "fresnelLayer.glsllib" -#include "refraction.glsllib" - -bool evalTwoSided() -{ - return( true ); -} - -vec3 computeFrontMaterialEmissive() -{ - return( vec3( 0, 0, 0 ) ); -} - -void computeFrontLayerColor( in vec3 normal, in vec3 lightDir, in vec3 viewDir, in vec3 lightDiffuse, in vec3 lightSpecular, in float materialIOR, float aoFactor ) -{ -#if QT3DS_ENABLE_CG_LIGHTING - layers[0].base += tmpShadowTerm * microfacetBSDF( layers[0].tanFrame, lightDir, viewDir, lightSpecular, materialIOR, 0.000000, 0.000000, scatter_reflect_transmit ); - -#endif -} - -void computeFrontAreaColor( in int lightIdx, in vec4 lightDiffuse, in vec4 lightSpecular ) -{ -#if QT3DS_ENABLE_CG_LIGHTING - layers[0].base += tmpShadowTerm * lightSpecular * sampleAreaGlossy( layers[0].tanFrame, varWorldPos, lightIdx, viewDir, 0.000000, 0.000000 ); - -#endif -} - -void computeFrontLayerEnvironment( in vec3 normal, in vec3 viewDir, float aoFactor ) -{ -#if !QT3DS_ENABLE_LIGHT_PROBE - layers[0].base += tmpShadowTerm * microfacetSampledBSDF( layers[0].tanFrame, viewDir, 0.000000, 0.000000, scatter_reflect_transmit ); - -#else - layers[0].base += tmpShadowTerm * sampleGlossyAniso( layers[0].tanFrame, viewDir, 0.000000, 0.000000 ); - -#endif -} - -vec3 computeBackMaterialEmissive() -{ - return( vec3(0, 0, 0) ); -} - -void computeBackLayerColor( in vec3 normal, in vec3 lightDir, in vec3 viewDir, in vec3 lightDiffuse, in vec3 lightSpecular, in float materialIOR, float aoFactor ) -{ -#if QT3DS_ENABLE_CG_LIGHTING - layers[0].base += vec4( 0.0, 0.0, 0.0, 1.0 ); - layers[0].layer += vec4( 0.0, 0.0, 0.0, 1.0 ); -#endif -} - -void computeBackAreaColor( in int lightIdx, in vec4 lightDiffuse, in vec4 lightSpecular ) -{ -#if QT3DS_ENABLE_CG_LIGHTING - layers[0].base += vec4( 0.0, 0.0, 0.0, 1.0 ); - layers[0].layer += vec4( 0.0, 0.0, 0.0, 1.0 ); -#endif -} - -void computeBackLayerEnvironment( in vec3 normal, in vec3 viewDir, float aoFactor ) -{ -#if !QT3DS_ENABLE_LIGHT_PROBE - layers[0].base += vec4( 0.0, 0.0, 0.0, 1.0 ); - layers[0].layer += vec4( 0.0, 0.0, 0.0, 1.0 ); -#else - layers[0].base += vec4( 0.0, 0.0, 0.0, 1.0 ); - layers[0].layer += vec4( 0.0, 0.0, 0.0, 1.0 ); -#endif -} - -float computeIOR() -{ - return( true ? 1.0 : luminance( vec3( abbeNumberIOR(glass_ior, 0.000000 ) ) ) ); -} - -float evalCutout() -{ - return( 1.000000 ); -} - -vec3 computeNormal() -{ - return( normal ); -} - -void computeTemporaries() -{ - ftmp0 = vec3( reflectivity_amount ); - tmpShadowTerm = evalBakedShadowMap( texCoord0 ); -} - -vec4 computeLayerWeights( in float alpha ) -{ - vec4 color; - color = layers[0].base * vec4( ftmp0, 1.0); - return color; -} - - -void initializeLayerVariables(void) -{ - // clear layers - layers[0].base = vec4(0.0, 0.0, 0.0, 1.0); - layers[0].layer = vec4(0.0, 0.0, 0.0, 1.0); - layers[0].tanFrame = orthoNormalize( tangentFrame( normal, varWorldPos ) ); -} - -vec4 computeGlass(in vec3 normal, in float materialIOR, in float alpha, in vec4 color) -{ - vec4 rgba = color; - float ratio = simpleFresnel( normal, materialIOR, uFresnelPower ); - vec3 absorb_color = ( log( glass_color )/-1.000000 ); - // prevent log(0) -> inf number issue - if ( isinf(absorb_color.r) ) absorb_color.r = 1.0; - if ( isinf(absorb_color.g) ) absorb_color.g = 1.0; - if ( isinf(absorb_color.b) ) absorb_color.b = 1.0; - rgba.rgb = mix(vec3(1.0) - absorb_color, rgba.rgb * (vec3(1.0) - absorb_color), ratio); - rgba.a = mix(uMinOpacity, alpha, ratio); - return rgba; -} - - - - - - - - - - - - - diff --git a/examples/studio3d/SampleProject/models/Ring_2/Ring_2.import b/examples/studio3d/SampleProject/models/Ring_2/Ring_2.import new file mode 100644 index 00000000..ca9354dc --- /dev/null +++ b/examples/studio3d/SampleProject/models/Ring_2/Ring_2.import @@ -0,0 +1,18 @@ + + + + + + + + + + + + + qt_gauge_ring_2 + meshes/qt_gauge_ring_2.mesh + + + + diff --git a/examples/studio3d/SampleProject/models/Ring_2/meshes/qt_gauge_ring_2.mesh b/examples/studio3d/SampleProject/models/Ring_2/meshes/qt_gauge_ring_2.mesh new file mode 100644 index 00000000..743e448c Binary files /dev/null and b/examples/studio3d/SampleProject/models/Ring_2/meshes/qt_gauge_ring_2.mesh differ diff --git a/examples/studio3d/SampleProject/models/Speedometer/Speedometer.import b/examples/studio3d/SampleProject/models/Speedometer/Speedometer.import deleted file mode 100644 index d74ef62d..00000000 --- a/examples/studio3d/SampleProject/models/Speedometer/Speedometer.import +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - Speed.png - maps/Speed.png - - - Speedometer - meshes/Speedometer.mesh - - - NeedleSpeed - meshes/NeedleSpeed.mesh - - - - diff --git a/examples/studio3d/SampleProject/models/Speedometer/maps/Speed.png b/examples/studio3d/SampleProject/models/Speedometer/maps/Speed.png deleted file mode 100644 index 84b7e4db..00000000 Binary files a/examples/studio3d/SampleProject/models/Speedometer/maps/Speed.png and /dev/null differ diff --git a/examples/studio3d/SampleProject/models/Speedometer/meshes/NeedleSpeed.mesh b/examples/studio3d/SampleProject/models/Speedometer/meshes/NeedleSpeed.mesh deleted file mode 100644 index 72220cd6..00000000 Binary files a/examples/studio3d/SampleProject/models/Speedometer/meshes/NeedleSpeed.mesh and /dev/null differ diff --git a/examples/studio3d/SampleProject/models/Speedometer/meshes/Speedometer.mesh b/examples/studio3d/SampleProject/models/Speedometer/meshes/Speedometer.mesh deleted file mode 100644 index 9f7ba34b..00000000 Binary files a/examples/studio3d/SampleProject/models/Speedometer/meshes/Speedometer.mesh and /dev/null differ diff --git a/examples/studio3d/SampleProject/models/Sportscar_15k/Sportscar_15k.import b/examples/studio3d/SampleProject/models/Sportscar_15k/Sportscar_15k.import new file mode 100644 index 00000000..32e0f192 --- /dev/null +++ b/examples/studio3d/SampleProject/models/Sportscar_15k/Sportscar_15k.import @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + c_tex.jpg + maps/c_tex.jpg + + + frontWheels + meshes/frontWheels.mesh + + + backWheels + meshes/backWheels.mesh + + + BodyBack + meshes/BodyBack.mesh + + + BodyFront + meshes/BodyFront.mesh + + + + diff --git a/examples/studio3d/SampleProject/models/Sportscar_15k/maps/c_tex.jpg b/examples/studio3d/SampleProject/models/Sportscar_15k/maps/c_tex.jpg new file mode 100644 index 00000000..b1b3b100 Binary files /dev/null and b/examples/studio3d/SampleProject/models/Sportscar_15k/maps/c_tex.jpg differ diff --git a/examples/studio3d/SampleProject/models/Sportscar_15k/meshes/BodyBack.mesh b/examples/studio3d/SampleProject/models/Sportscar_15k/meshes/BodyBack.mesh new file mode 100644 index 00000000..bd1cd657 Binary files /dev/null and b/examples/studio3d/SampleProject/models/Sportscar_15k/meshes/BodyBack.mesh differ diff --git a/examples/studio3d/SampleProject/models/Sportscar_15k/meshes/BodyFront.mesh b/examples/studio3d/SampleProject/models/Sportscar_15k/meshes/BodyFront.mesh new file mode 100644 index 00000000..cb7705f8 Binary files /dev/null and b/examples/studio3d/SampleProject/models/Sportscar_15k/meshes/BodyFront.mesh differ diff --git a/examples/studio3d/SampleProject/models/Sportscar_15k/meshes/backWheels.mesh b/examples/studio3d/SampleProject/models/Sportscar_15k/meshes/backWheels.mesh new file mode 100644 index 00000000..bf15dd8f Binary files /dev/null and b/examples/studio3d/SampleProject/models/Sportscar_15k/meshes/backWheels.mesh differ diff --git a/examples/studio3d/SampleProject/models/Sportscar_15k/meshes/frontWheels.mesh b/examples/studio3d/SampleProject/models/Sportscar_15k/meshes/frontWheels.mesh new file mode 100644 index 00000000..5410200d Binary files /dev/null and b/examples/studio3d/SampleProject/models/Sportscar_15k/meshes/frontWheels.mesh differ diff --git a/examples/studio3d/SampleProject/models/needle_2/meshes/qt_gauge_needles_2.mesh b/examples/studio3d/SampleProject/models/needle_2/meshes/qt_gauge_needles_2.mesh new file mode 100644 index 00000000..6498edfc Binary files /dev/null and b/examples/studio3d/SampleProject/models/needle_2/meshes/qt_gauge_needles_2.mesh differ diff --git a/examples/studio3d/SampleProject/models/needle_2/needle_2.import b/examples/studio3d/SampleProject/models/needle_2/needle_2.import new file mode 100644 index 00000000..b4204ebf --- /dev/null +++ b/examples/studio3d/SampleProject/models/needle_2/needle_2.import @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + qt_gauge_needles_2 + meshes/qt_gauge_needles_2.mesh + + + + diff --git a/examples/studio3d/SampleProject/models/roundbg_1/maps/gradient.png b/examples/studio3d/SampleProject/models/roundbg_1/maps/gradient.png new file mode 100644 index 00000000..70b9fb8b Binary files /dev/null and b/examples/studio3d/SampleProject/models/roundbg_1/maps/gradient.png differ diff --git a/examples/studio3d/SampleProject/models/roundbg_1/meshes/qt_gauge_background_round_1.mesh b/examples/studio3d/SampleProject/models/roundbg_1/meshes/qt_gauge_background_round_1.mesh new file mode 100644 index 00000000..511e46ca Binary files /dev/null and b/examples/studio3d/SampleProject/models/roundbg_1/meshes/qt_gauge_background_round_1.mesh differ diff --git a/examples/studio3d/SampleProject/models/roundbg_1/roundbg_1.import b/examples/studio3d/SampleProject/models/roundbg_1/roundbg_1.import new file mode 100644 index 00000000..653f759c --- /dev/null +++ b/examples/studio3d/SampleProject/models/roundbg_1/roundbg_1.import @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + roundbg_1.fbm/gradient.png + maps/gradient.png + + + qt_gauge_background_round_1 + meshes/qt_gauge_background_round_1.mesh + + + + diff --git a/examples/studio3d/SampleProject/models/tickmark_260/meshes/qt_gauge_tickmarks_260.mesh b/examples/studio3d/SampleProject/models/tickmark_260/meshes/qt_gauge_tickmarks_260.mesh new file mode 100644 index 00000000..d5119b00 Binary files /dev/null and b/examples/studio3d/SampleProject/models/tickmark_260/meshes/qt_gauge_tickmarks_260.mesh differ diff --git a/examples/studio3d/SampleProject/models/tickmark_260/tickmark_260.import b/examples/studio3d/SampleProject/models/tickmark_260/tickmark_260.import new file mode 100644 index 00000000..b95b5805 --- /dev/null +++ b/examples/studio3d/SampleProject/models/tickmark_260/tickmark_260.import @@ -0,0 +1,18 @@ + + + + + + + + + + + + + qt_gauge_tickmarks_260 + meshes/qt_gauge_tickmarks_260.mesh + + + + diff --git a/examples/studio3d/SampleProject/models/tickmark_8_small/meshes/qt_gauge_tickmarks_8_small.mesh b/examples/studio3d/SampleProject/models/tickmark_8_small/meshes/qt_gauge_tickmarks_8_small.mesh new file mode 100644 index 00000000..32dd46db Binary files /dev/null and b/examples/studio3d/SampleProject/models/tickmark_8_small/meshes/qt_gauge_tickmarks_8_small.mesh differ diff --git a/examples/studio3d/SampleProject/models/tickmark_8_small/tickmark_8_small.import b/examples/studio3d/SampleProject/models/tickmark_8_small/tickmark_8_small.import new file mode 100644 index 00000000..d3437193 --- /dev/null +++ b/examples/studio3d/SampleProject/models/tickmark_8_small/tickmark_8_small.import @@ -0,0 +1,18 @@ + + + + + + + + + + + + + qt_gauge_tickmarks_8_small + meshes/qt_gauge_tickmarks_8_small.mesh + + + + diff --git a/examples/studio3d/SampleProject/scripts/Map.jpg b/examples/studio3d/SampleProject/scripts/Map.jpg new file mode 100644 index 00000000..4db7a3fd Binary files /dev/null and b/examples/studio3d/SampleProject/scripts/Map.jpg differ diff --git a/examples/studio3d/SampleProject/scripts/Navigation.qml b/examples/studio3d/SampleProject/scripts/Navigation.qml new file mode 100644 index 00000000..7635d985 --- /dev/null +++ b/examples/studio3d/SampleProject/scripts/Navigation.qml @@ -0,0 +1,74 @@ +/**************************************************************************** +** +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt 3D Studio. +** +** $QT_BEGIN_LICENSE:BSD$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, you may use this file under the terms of the BSD license +** as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 + +Item { + width: 768 + height: 288 + + Image { + id: fakeMap + source: "./Map.jpg" + y: -231 + width: 768 + height: 462 + } + + PropertyAnimation { + target: fakeMap + property: "y" + loops: Animation.Infinite + duration: 25000 + running: true + from: -231 + to: 0 + } +} -- cgit v1.2.3