Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • public-demos/qt3dstudio
1 result
Show changes
Commits on Source (32)
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 363 additions and 485 deletions
CoffeeMaker/presentation/CoffeeMaker.uia
View file @ af3f2745
<?xml version="1.0" encoding="UTF-8"?>
<application xmlns="http://qt.io/qt3dstudio/uia">
<assets initial="CoffeeMaker">
<presentation id="CoffeeMaker" src="CoffeeMaker.uip"/>
<presentation id="CoffeeMaker" src="presentations/CoffeeMaker.uip"/>
</assets>
<statemachine ref="#logic">
......
CoffeeMaker/presentation/CoffeeMaker.uip deleted 100644 → 0
View file @ 6597e7a2
This diff is collapsed.
CoffeeMaker/presentation/effects/VignetteEffect.effect
View file @ af3f2745
......@@ -15,20 +15,18 @@
void frag()
{
float radius = vig_radius;
vec4 origColor = texture2D_0(TexCoord);
vec2 uv = TexCoord.xy;
vec2 center = vec2(0.5);
vec4 bg = origColor;
uv *= 1.0 - uv.yx;
float vig = uv.x*uv.y * vig_strenght;
uv *= 1.0 - uv.yx;
float vig = uv.x * uv.y * vig_strenght;
vig = pow(vig, vig_radius);
vec4 vigmixcolor = vec4(vig_color,vig) * vec4(vig);
gl_FragColor = vec4(mix(origColor,vigmixcolor,1.0-vig));
vec4 vigColor = vec4(vig_color.xyz, vig) * vig;
gl_FragColor = mix(origColor, vigColor, 1.0 - vig);
}
]]></FragmentShader>
</Shader>
......
CoffeeMaker/presentation/presentations/CoffeeMaker.uip 0 → 100644
View file @ af3f2745
This diff is collapsed.
HomeAutomation/HomeAutom.qrc
View file @ af3f2745
......@@ -10,7 +10,6 @@
<file alias="LightSlider.qml">qml/HomeAutom/LightSlider.qml</file>
<file alias="RoomLabel.qml">qml/HomeAutom/RoomLabel.qml</file>
<file alias="LightSwitch.qml">qml/HomeAutom/LightSwitch.qml</file>
<file>uip/houseStudio.uip</file>
<file>uip/maps/Ground.png</file>
<file>uip/maps/HouseGroundOpacitymap.png</file>
<file>uip/maps/HouseTexture.png</file>
......@@ -32,8 +31,6 @@
<file>uip/models/House/meshes/Windows.mesh</file>
<file>uip/models/House/House.import</file>
<file>uip/models/Light/Light.import</file>
<file>uip/House/meshes/house1.mesh</file>
<file>uip/House/meshes/roof1.mesh</file>
<file>uip/maps/BathroomLightmap.png</file>
<file>uip/maps/BedRoomLightmap.png</file>
<file>uip/maps/EntranceLightmap.png</file>
......@@ -51,5 +48,6 @@
<file>qml/imports/Style/qmldir</file>
<file>qml/imports/Style/Style.qml</file>
<file>uip/houseStudio.uia</file>
<file>uip/presentations/houseStudio.uip</file>
</qresource>
</RCC>
HomeAutomation/HomeAutomation.pro
View file @ af3f2745
......@@ -12,7 +12,7 @@ KNX_BOARD {
CONFIG += c++11
}
QT += qml quick 3dstudioruntime2
QT += qml quick
CONFIG += resources_big
......
HomeAutomation/main.cpp
View file @ af3f2745
......@@ -59,7 +59,6 @@
#if defined(KNX_BACKEND)
#include "qmlknxdemo.h"
#endif
#include <q3dsruntimeglobal.h>
// Uncomment for 1280x900 window
//#define FIXEDWINDOW
......@@ -78,7 +77,15 @@ int main(int argc, char *argv[])
{
QGuiApplication app(argc, argv);
QSurfaceFormat::setDefaultFormat(Q3DS::surfaceFormat());
#if defined(Q_OS_MACOS)
QSurfaceFormat openGLFormat;
openGLFormat.setRenderableType(QSurfaceFormat::OpenGL);
openGLFormat.setProfile(QSurfaceFormat::CoreProfile);
openGLFormat.setMajorVersion(4);
openGLFormat.setMinorVersion(1);
openGLFormat.setStencilBufferSize(8);
QSurfaceFormat::setDefaultFormat(openGLFormat);
#endif
// Define size variants for scaling
qreal refDpi = 96.;
......
HomeAutomation/qml/HomeAutom/HomeView.qml
View file @ af3f2745
......@@ -50,7 +50,7 @@
import QtQuick 2.8
import QtQuick.Controls 2.1
import QtStudio3D 2.0
import QtStudio3D.OpenGL 2.4
Item {
id: home
......@@ -220,7 +220,7 @@ Item {
}
}
onPresentationReady: {
onPresentationLoaded: {
home.studio3DPresentationReady();
}
}
......@@ -364,15 +364,18 @@ Item {
onRedColorChanged: {
home.red = redColor;
currentTempTarget.setValue(Qt.vector3d(redColor, home.green, home.blue));
if (currentTempTarget)
currentTempTarget.setValue(Qt.vector3d(redColor, home.green, home.blue));
}
onBlueColorChanged: {
home.blue = blueColor;
currentTempTarget.setValue(Qt.vector3d(home.red, home.green, blueColor));
if (currentTempTarget)
currentTempTarget.setValue(Qt.vector3d(home.red, home.green, blueColor));
}
onGreenColorChanged: {
home.green = greenColor;
currentTempTarget.setValue(Qt.vector3d(home.red, greenColor, home.blue));
if (currentTempTarget)
currentTempTarget.setValue(Qt.vector3d(home.red, greenColor, home.blue));
}
onEconomyChanged: {
......
HomeAutomation/uip/House/House.import deleted 100644 → 0
View file @ 6597e7a2
<?xml version="1.0" encoding="UTF-8" ?>
<UIP Version="1" >
<Project Revision="1" >
<Graph >
<Group id="__import__root__" >
<Model id="Ground" name="Ground" orientation="Right Handed" position="-0.957248 -0.10826 -2.79746" rotation="0 -0 0" rotationorder="XYZr" scale="1.73739 1 1.00748" sourcepath=".\meshes\Ground.mesh#1" >
<Material id="phong1" name="phong1" blendmode="Normal" diffuse="0.233766 0.233766 0.233766" emissivepower="0" opacity="100" specularamount="0" specularroughness="20" />
</Model>
<Model id="roof1" name="roof1" orientation="Right Handed" position="0 0 -0" rotation="0 -0 0" rotationorder="XYZr" scale="1 1 1" sourcepath=".\meshes\roof1.mesh#1" >
<Material id="BaseWall" name="BaseWall" blendmode="Normal" diffuse="0.552284 0.552284 0.552284" emissivepower="0" opacity="100" specularamount="0" specularroughness="20" />
<Material id="roof" name="roof" blendmode="Normal" diffuse="0.0609137 0.0609137 0.0609137" emissivepower="0" opacity="100" specularamount="0" specularroughness="20" />
<Material id="lambert1" name="lambert1" blendmode="Normal" diffuse="1 1 1" emissivepower="0" opacity="100" specularamount="0" />
</Model>
<Group id="Group_HeatAreas" name="Group_HeatAreas" orientation="Right Handed" position="0 5.53285 -0" rotation="0 -0 0" rotationorder="XYZr" scale="1 1 1" >
<Model id="Heat_MasterBedroom" name="Heat_MasterBedroom" orientation="Right Handed" position="-6.01453 0.0613521 -9.90316" rotation="0 -0 0" rotationorder="XYZr" scale="1 1 1" sourcepath=".\meshes\Heat_MasterBedroom.mesh#1" >
<Material id="masterbedroomheat" name="masterbedroomheat" blendmode="Normal" diffuse="0.15472 0.15096 0.14256" emissivepower="0" opacity="100" specularamount="0" specularroughness="20" />
</Model>
<Model id="Heat_Entrance" name="Heat_Entrance" orientation="Right Handed" position="0.0827332 1.40091 -12.9964" rotation="8.53363 -0 0" rotationorder="XYZr" scale="0.852158 1 0.900558" sourcepath=".\meshes\Heat_Entrance.mesh#1" >
<Material id="entrance" name="entrance" blendmode="Normal" diffuse="0.519797 0.519797 0.519797" emissivepower="0" opacity="100" specularamount="0" specularroughness="20" />
</Model>
<Model id="Heat_BedRoom" name="Heat_BedRoom" orientation="Right Handed" position="6.03439 1.73831 -10.6134" rotation="7.55792 -0 0" rotationorder="XYZr" scale="1 1 1" sourcepath=".\meshes\Heat_BedRoom.mesh#1" >
<Material id="bedroom" name="bedroom" blendmode="Normal" diffuse="0.24488 0.388 0.46264" emissivepower="0" opacity="100" specularamount="0" specularroughness="20" />
</Model>
<Model id="Heat_DressRoom" name="Heat_DressRoom" orientation="Right Handed" position="8.02201 2.41339 -5.07462" rotation="8.34257 -0 0" rotationorder="XYZr" scale="1 1 1" sourcepath=".\meshes\Heat_DressRoom.mesh#1" >
<Material id="dressroom" name="dressroom" blendmode="Normal" diffuse="0.714721 0.714721 0.714721" emissivepower="0" opacity="100" specularamount="0" specularroughness="20" />
</Model>
<Model id="Heat_Toilet" name="Heat_Toilet" orientation="Right Handed" position="3.90588 2.58136 -5.05141" rotation="5.57327 -0 0" rotationorder="XYZr" scale="1 1 1" sourcepath=".\meshes\Heat_Toilet.mesh#1" >
<Material id="toilet" name="toilet" blendmode="Normal" diffuse="0.19208 0.24752 0.37672" emissivepower="0" opacity="100" specularamount="0" specularroughness="20" />
</Model>
<Model id="Heat_StoreRoom" name="Heat_StoreRoom" orientation="Right Handed" position="2.97044 0.814303 -17.1022" rotation="8.02365 -0 0" rotationorder="XYZr" scale="1 1 1" sourcepath=".\meshes\Heat_StoreRoom.mesh#1" >
<Material id="storeroom" name="storeroom" blendmode="Normal" diffuse="0.166497 0.166497 0.166497" emissivepower="0" opacity="100" specularamount="0" specularroughness="20" />
</Model>
<Model id="Heat_Sauna" name="Heat_Sauna" orientation="Right Handed" position="-7.99717 0.0613521 7.72293" rotation="0 -0 0" rotationorder="XYZr" scale="1 1 1" sourcepath=".\meshes\Heat_Sauna.mesh#1" >
<Material id="sauna1" name="sauna1" blendmode="Normal" diffuse="0.24984 0.24984 0.24984" emissivepower="0" opacity="100" specularamount="0" specularroughness="20" />
</Model>
<Model id="Heat_BathRoom" name="Heat_BathRoom" orientation="Right Handed" position="-8.61282 1.1588 -1.06378" rotation="0 -0 0" rotationorder="XYZr" scale="1.04514 1 1" sourcepath=".\meshes\Heat_BathRoom.mesh#1" >
<Material id="bathroom" name="bathroom" blendmode="Normal" diffuse="0.4 0.4 0.4" emissivepower="0" opacity="100" specularamount="0" specularroughness="20" />
</Model>
<Model id="Heat_LivingRoom" name="Heat_LivingRoom" orientation="Right Handed" position="2.34465 3.80193 4.35739" rotation="7.88151 -0 0" rotationorder="XYZr" scale="1 1 1" sourcepath=".\meshes\Heat_LivingRoom.mesh#1" >
<Material id="livingroom" name="livingroom" blendmode="Normal" diffuse="0.24984 0.23336 0.16168" emissivepower="0" opacity="100" specularamount="0" specularroughness="20" />
</Model>
</Group>
<Group id="Group_house" name="Group_house" orientation="Right Handed" position="0 0 -0" rotation="0 -0 0" rotationorder="XYZr" scale="1 1 1" >
<Model id="house1" name="house1" orientation="Right Handed" position="0 0 -0" rotation="0 -0 0" rotationorder="XYZr" scale="1 1 1" sourcepath=".\meshes\house1.mesh#1" >
<Material id="house2" name="house2" blendmode="Normal" diffuse="1 1 1" diffusemap="house2_diffusemap" emissivepower="0" opacity="100" specularamount="0" specularroughness="20" >
<Image id="house2_diffusemap" name="house2_diffusemap" sourcepath=".\maps\houseShape.png" />
</Material>
</Model>
</Group>
<Model id="Windows" name="Windows" orientation="Right Handed" position="0 0 -0" rotation="0 -0 0" rotationorder="XYZr" scale="1 1 1" sourcepath=".\meshes\Windows.mesh#1" >
<Material id="Window" name="Window" blendmode="Normal" diffuse="0.35152 0.66672 0.74704" emissivepower="0" opacity="100" specularamount="0" specularroughness="12.1818" />
</Model>
</Group>
</Graph>
<Import SrcFile="..\..\House\House.fbx" ImageDir="Images" MeshDir="Meshes" >
<Image >
<Source >.\houseShape.png</Source>
<Dest >.\maps\houseShape.png</Dest>
</Image>
<Mesh >
<Source >Heat_BathRoom</Source>
<Dest >.\meshes\Heat_BathRoom.mesh</Dest>
</Mesh>
<Mesh >
<Source >Heat_Sauna</Source>
<Dest >.\meshes\Heat_Sauna.mesh</Dest>
</Mesh>
<Mesh >
<Source >Heat_BedRoom</Source>
<Dest >.\meshes\Heat_BedRoom.mesh</Dest>
</Mesh>
<Mesh >
<Source >Ground</Source>
<Dest >.\meshes\Ground.mesh</Dest>
</Mesh>
<Mesh >
<Source >Heat_Toilet</Source>
<Dest >.\meshes\Heat_Toilet.mesh</Dest>
</Mesh>
<Mesh >
<Source >Heat_StoreRoom</Source>
<Dest >.\meshes\Heat_StoreRoom.mesh</Dest>
</Mesh>
<Mesh >
<Source >Heat_LivingRoom</Source>
<Dest >.\meshes\Heat_LivingRoom.mesh</Dest>
</Mesh>
<Mesh >
<Source >house1</Source>
<Dest >.\meshes\house1.mesh</Dest>
</Mesh>
<Mesh >
<Source >Heat_DressRoom</Source>
<Dest >.\meshes\Heat_DressRoom.mesh</Dest>
</Mesh>
<Mesh >
<Source >Windows</Source>
<Dest >.\meshes\Windows.mesh</Dest>
</Mesh>
<Mesh >
<Source >Heat_MasterBedroom</Source>
<Dest >.\meshes\Heat_MasterBedroom.mesh</Dest>
</Mesh>
<Mesh >
<Source >roof1</Source>
<Dest >.\meshes\roof1.mesh</Dest>
</Mesh>
<Mesh >
<Source >Heat_Entrance</Source>
<Dest >.\meshes\Heat_Entrance.mesh</Dest>
</Mesh>
</Import>
</Project>
</UIP>
HomeAutomation/uip/House/meshes/Ground.mesh deleted 100644 → 0
View file @ 6597e7a2
File deleted