From c8208c3e43223f249b7fcb8de59d740ca4282571 Mon Sep 17 00:00:00 2001
From: Tomi Korpipaa <tomi.korpipaa@qt.io>
Date: Thu, 26 Apr 2018 12:54:38 +0300
Subject: [PATCH] Updated lighting for the car model in kria cluster
---
kria-cluster-3d-demo/main.cpp | 1 +
.../presentation/contentPresentation.uip | 10 +++++-----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/kria-cluster-3d-demo/main.cpp b/kria-cluster-3d-demo/main.cpp
index 8115a00..c298285 100644
--- a/kria-cluster-3d-demo/main.cpp
+++ b/kria-cluster-3d-demo/main.cpp
@@ -66,6 +66,7 @@ int main(int argc, char *argv[])
QSurfaceFormat::setDefaultFormat(openGLFormat);
#endif
+ QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
QGuiApplication app(argc, argv);
QQuickView viewer;
diff --git a/kria-cluster-3d-demo/presentation/contentPresentation.uip b/kria-cluster-3d-demo/presentation/contentPresentation.uip
index e686072..20232cd 100644
--- a/kria-cluster-3d-demo/presentation/contentPresentation.uip
+++ b/kria-cluster-3d-demo/presentation/contentPresentation.uip
@@ -55,7 +55,7 @@
<State name="Master Slide" component="#Scene" >
<Add ref="#Layer" multisampleaa="4x" />
<Add ref="#Camera" fov="13.2" position="0 242 -600" rotation="17 0 0" />
- <Add ref="#Light" rotation="39 0 0" />
+ <Add ref="#Light" brightness="100" castshadow="False" expfade="500" lightambient="0 0 0" lighttype="Point" linearfade="0" position="0 31.4202 97.0824" rotation="0 0 0" />
<Add ref="#Car" name="Car" importfile=".\Car\Car.import" position="0 -24.7187 194" rotation="0 40 0" sourcepath=".\Car\Car.import" />
<Add ref="#Car_001" importfile=".\Car\Car.import" >
<AnimationTrack property="position.x" type="EaseInOut" >0 0 100 100 2.971 -0.586441 100 100 8 0 100 100</AnimationTrack>
@@ -66,17 +66,17 @@
<AnimationTrack property="rotation.z" type="EaseInOut" >0 0 0 0 8 0 0 0</AnimationTrack>
</Add>
<Add ref="#Brakes" importfile=".\Car\Car.import" />
- <Add ref="#SmallDetails" importfile=".\Car\Car.import" />
+ <Add ref="#SmallDetails" diffuse="0 0 0" importfile=".\Car\Car.import" />
<Add ref="#Seats" diffuse="1 1 1" diffusemap="#Seats_diffusemap" importfile=".\Car\Car.import" normalmap="#Seats_normalmap" />
<Add ref="#Seats_diffusemap" sourcepath=".\Car\maps\Seats_diffuse.jpg" />
<Add ref="#Seats_normalmap" sourcepath=".\Car\maps\Seats_normal.jpg" />
- <Add ref="#Glass" fresnelPower="10" importfile=".\Car\Car.import" opacity="59.2593" specularamount="3" specularreflection="#Glass_specularreflection" specularroughness="0.06094" speculartint="0.388235 0.388235 0.388235" />
+ <Add ref="#Glass" diffuse="0.42417 0.530648 0.639994" fresnelPower="10" importfile=".\Car\Car.import" opacity="59.2593" specularamount="3" specularreflection="#Glass_specularreflection" specularroughness="0.06094" speculartint="0.388235 0.388235 0.388235" />
<Add ref="#Glass_specularreflection" mappingmode="Environmental Mapping" sourcepath="Gauges/maps/environment.jpg" />
<Add ref="#CarBottom" diffuse="0.101961 0.101961 0.101961" importfile=".\Car\Car.import" shaderlighting="None" />
<Add ref="#Interior" diffuse="0.0901961 0.0901961 0.0901961" importfile=".\Car\Car.import" />
<Add ref="#body" importfile=".\Car\Car.import" />
- <Add ref="#lambert2" bumpamount="1" controlledproperty="$displayColor diffuse" diffuse="0.870588 0 0" fresnelPower="5" importfile=".\Car\Car.import" normalmap="#lambert2_normalmap" opacity="100" specularamount="2" specularmodel="Default" specularroughness="0.001" speculartint="0.298039 0.298039 0.298039" />
- <Add ref="#lambert2_normalmap" sourcepath=".\Car\maps\outUV_normals.png" />
+ <Add ref="#lambert2" bumpamount="1" controlledproperty="$displayColor diffuse" diffuse="0.870588 0 0" fresnelPower="5" importfile=".\Car\Car.import" ior="0.3" normalmap="#lambert2_normalmap" opacity="100" specularamount="30" specularmodel="KWard" specularroughness="0.05" speculartint="1 1 1" />
+ <Add ref="#lambert2_normalmap" sourcepath="Car/maps/outUV_normals.png" />
<Add ref="#Wheel_Back_Left" importfile=".\Car\Car.import" scale="90 38.141 38.141" >
<AnimationTrack property="rotation.x" type="EaseInOut" >0 720 0 0 8 0 0 0</AnimationTrack>
<AnimationTrack property="rotation.y" type="EaseInOut" >0 0 0 0 8 -0 0 0</AnimationTrack>
--
GitLab