@@ -0,0 +1,34 @@
c:\users\yannick\onedrive\hiver2017\infographie\openglframework\openglframework\uiqt\release\vc140.pdb
c:\users\yannick\onedrive\hiver2017\infographie\openglframework\openglframework\uiqt\release\qrc_uiqt.obj
c:\users\yannick\onedrive\hiver2017\infographie\openglframework\openglframework\uiqt\release\uiqt.obj
c:\users\yannick\onedrive\hiver2017\infographie\openglframework\openglframework\uiqt\release\main.obj
c:\users\yannick\onedrive\hiver2017\infographie\openglframework\openglframework\uiqt\release\uiinterface.obj
c:\users\yannick\onedrive\hiver2017\infographie\openglframework\openglframework\uiqt\release\scene.obj
c:\users\yannick\onedrive\hiver2017\infographie\openglframework\openglframework\uiqt\release\moc_uiqt.obj
c:\users\yannick\onedrive\hiver2017\infographie\openglframework\openglframework\uiqt\release\customshader.obj
c:\users\yannick\onedrive\hiver2017\infographie\openglframework\openglframework\uiqt\generatedfiles\qrc_uiqt.cpp
c:\users\yannick\onedrive\hiver2017\infographie\openglframework\openglframework\uiqt\generatedfiles\ui_uiqt.h
c:\users\yannick\onedrive\hiver2017\infographie\openglframework\openglframework\uiqt\generatedfiles\release\moc_uiqt.cpp
c:\users\yannick\onedrive\hiver2017\infographie\openglframework\openglframework\release\uiqt.exe
c:\users\yannick\onedrive\hiver2017\infographie\openglframework\openglframework\release\uiqt.pdb
c:\users\yannick\onedrive\hiver2017\infographie\openglframework\openglframework\uiqt\release\uiqt.tlog\cl.command.1.tlog
c:\users\yannick\onedrive\hiver2017\infographie\openglframework\openglframework\uiqt\release\uiqt.tlog\cl.read.1.tlog
c:\users\yannick\onedrive\hiver2017\infographie\openglframework\openglframework\uiqt\release\uiqt.tlog\cl.write.1.tlog
c:\users\yannick\onedrive\hiver2017\infographie\openglframework\openglframework\uiqt\release\uiqt.tlog\custombuild.command.1.tlog
c:\users\yannick\onedrive\hiver2017\infographie\openglframework\openglframework\uiqt\release\uiqt.tlog\custombuild.read.1.tlog
c:\users\yannick\onedrive\hiver2017\infographie\openglframework\openglframework\uiqt\release\uiqt.tlog\custombuild.write.1.tlog
c:\users\yannick\onedrive\hiver2017\infographie\openglframework\openglframework\uiqt\release\uiqt.tlog\link.11344.read.1.tlog
c:\users\yannick\onedrive\hiver2017\infographie\openglframework\openglframework\uiqt\release\uiqt.tlog\link.11344.write.1.tlog
c:\users\yannick\onedrive\hiver2017\infographie\openglframework\openglframework\uiqt\release\uiqt.tlog\link.12856.read.1.tlog
c:\users\yannick\onedrive\hiver2017\infographie\openglframework\openglframework\uiqt\release\uiqt.tlog\link.12856.write.1.tlog
c:\users\yannick\onedrive\hiver2017\infographie\openglframework\openglframework\uiqt\release\uiqt.tlog\link.15260.read.1.tlog
c:\users\yannick\onedrive\hiver2017\infographie\openglframework\openglframework\uiqt\release\uiqt.tlog\link.15260.write.1.tlog
c:\users\yannick\onedrive\hiver2017\infographie\openglframework\openglframework\uiqt\release\uiqt.tlog\link.15344.read.1.tlog
c:\users\yannick\onedrive\hiver2017\infographie\openglframework\openglframework\uiqt\release\uiqt.tlog\link.15344.write.1.tlog
c:\users\yannick\onedrive\hiver2017\infographie\openglframework\openglframework\uiqt\release\uiqt.tlog\link.2828.read.1.tlog
c:\users\yannick\onedrive\hiver2017\infographie\openglframework\openglframework\uiqt\release\uiqt.tlog\link.2828.write.1.tlog
c:\users\yannick\onedrive\hiver2017\infographie\openglframework\openglframework\uiqt\release\uiqt.tlog\link.316.read.1.tlog
c:\users\yannick\onedrive\hiver2017\infographie\openglframework\openglframework\uiqt\release\uiqt.tlog\link.316.write.1.tlog
c:\users\yannick\onedrive\hiver2017\infographie\openglframework\openglframework\uiqt\release\uiqt.tlog\link.command.1.tlog
c:\users\yannick\onedrive\hiver2017\infographie\openglframework\openglframework\uiqt\release\uiqt.tlog\link.read.1.tlog
c:\users\yannick\onedrive\hiver2017\infographie\openglframework\openglframework\uiqt\release\uiqt.tlog\link.write.1.tlog
@@ -1,16 +1,27 @@
<<<<<<< HEAD
 uiqt.cpp
c:\users\yannick\onedrive\hiver2017\infographie\openglframework\openglframework\uiqt\uiqt.cpp(48): warning C4700: uninitialized local variable '_rColor' used
c:\users\yannick\onedrive\hiver2017\infographie\openglframework\openglframework\uiqt\uiqt.cpp(54): warning C4700: uninitialized local variable '_gColor' used
c:\users\yannick\onedrive\hiver2017\infographie\openglframework\openglframework\uiqt\uiqt.cpp(60): warning C4700: uninitialized local variable '_bColor' used
c:\users\yannick\onedrive\hiver2017\infographie\openglframework\openglframework\uiqt\uiqt.cpp(84): warning C4700: uninitialized local variable '_xRotation' used
c:\users\yannick\onedrive\hiver2017\infographie\openglframework\openglframework\uiqt\uiqt.cpp(90): warning C4700: uninitialized local variable '_yRotation' used
c:\users\yannick\onedrive\hiver2017\infographie\openglframework\openglframework\uiqt\uiqt.cpp(96): warning C4700: uninitialized local variable '_zRotation' used
c:\users\yannick\onedrive\hiver2017\infographie\openglframework\openglframework\uiqt\uiqt.cpp(120): warning C4700: uninitialized local variable '_pitch' used
c:\users\yannick\onedrive\hiver2017\infographie\openglframework\openglframework\uiqt\uiqt.cpp(126): warning C4700: uninitialized local variable '_yaw' used
c:\users\yannick\onedrive\hiver2017\infographie\openglframework\openglframework\uiqt\uiqt.cpp(132): warning C4700: uninitialized local variable '_zoom' used
c:\users\yannick\onedrive\hiver2017\infographie\openglframework\openglframework\uiqt\uiqt.cpp(144): warning C4700: uninitialized local variable '_far' used
c:\users\yannick\onedrive\hiver2017\infographie\openglframework\openglframework\uiqt\uiqt.cpp(138): warning C4700: uninitialized local variable '_near' used
 Moc'ing uiqt.h...
Uic'ing uiqt.ui...
Rcc'ing uiqt.qrc...
RCC : warning : No resources in 'C:\Users\Yannick\OneDrive\Hiver2017\Infographie\OpenGLFramework\OpenGLFramework\UIQT\uiqt.qrc'.

CustomShader.cpp
moc_uiqt.cpp
main.cpp
Scene.cpp
UIInterface.cpp
uiqt.cpp
Generating Code...
c:\users\yannick\onedrive\hiver2017\infographie\openglframework\openglframework\uiqt\uiqt.cpp(56): warning C4700: uninitialized local variable '_rColor' used
c:\users\yannick\onedrive\hiver2017\infographie\openglframework\openglframework\uiqt\uiqt.cpp(62): warning C4700: uninitialized local variable '_gColor' used
c:\users\yannick\onedrive\hiver2017\infographie\openglframework\openglframework\uiqt\uiqt.cpp(68): warning C4700: uninitialized local variable '_bColor' used
c:\users\yannick\onedrive\hiver2017\infographie\openglframework\openglframework\uiqt\uiqt.cpp(92): warning C4700: uninitialized local variable '_xRotation' used
c:\users\yannick\onedrive\hiver2017\infographie\openglframework\openglframework\uiqt\uiqt.cpp(98): warning C4700: uninitialized local variable '_yRotation' used
c:\users\yannick\onedrive\hiver2017\infographie\openglframework\openglframework\uiqt\uiqt.cpp(104): warning C4700: uninitialized local variable '_zRotation' used
c:\users\yannick\onedrive\hiver2017\infographie\openglframework\openglframework\uiqt\uiqt.cpp(135): warning C4700: uninitialized local variable '_yaw' used
c:\users\yannick\onedrive\hiver2017\infographie\openglframework\openglframework\uiqt\uiqt.cpp(129): warning C4700: uninitialized local variable '_pitch' used
c:\users\yannick\onedrive\hiver2017\infographie\openglframework\openglframework\uiqt\uiqt.cpp(141): warning C4700: uninitialized local variable '_zoom' used
c:\users\yannick\onedrive\hiver2017\infographie\openglframework\openglframework\uiqt\uiqt.cpp(147): warning C4700: uninitialized local variable '_near' used
c:\users\yannick\onedrive\hiver2017\infographie\openglframework\openglframework\uiqt\uiqt.cpp(153): warning C4700: uninitialized local variable '_far' used
qrc_uiqt.cpp
SOIL.lib(SOIL.obj) : MSIL .netmodule or module compiled with /GL found; restarting link with /LTCG; add /LTCG to the link command line to improve linker performance
LINK : warning LNK4098: defaultlib 'LIBCMT' conflicts with use of other libs; use /NODEFAULTLIB:library
Generating code
@@ -21,6 +32,3 @@ SOIL.lib(stb_image_aug.obj) : warning LNK4099: PDB 'SOIL.pdb' was not found with
SOIL.lib(image_DXT.obj) : warning LNK4099: PDB 'SOIL.pdb' was not found with 'SOIL.lib(image_DXT.obj)' or at 'C:\Users\Yannick\OneDrive\Hiver2017\Infographie\OpenGLFramework\OpenGLFramework\Release\SOIL.pdb'; linking object as if no debug info
UIQT.vcxproj -> C:\Users\Yannick\OneDrive\Hiver2017\Infographie\OpenGLFramework\OpenGLFramework\Release\UIQT.exe
UIQT.vcxproj -> C:\Users\Yannick\OneDrive\Hiver2017\Infographie\OpenGLFramework\OpenGLFramework\Release\UIQT.pdb (Full PDB)
=======

>>>>>>> master
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -157,6 +157,11 @@ namespace Application
return *m_rootObject;
}

ICamera& Scene::getCamera()
{
return *m_camera;
}

void Scene::Update()
{
//m_physicsWorld->Update();
@@ -33,6 +33,7 @@ namespace Application
void Update() override;
void Render() const override;
Framework::BaseObject& getHierarchy() override;
ICamera& getCamera() override;

private:
void UpdateHierarchyText();
@@ -18,11 +18,13 @@ namespace Application
}
}

void UIInterface::ShowPopup(Framework::BaseObject& _baseObject)
void UIInterface::ShowPopup(Framework::BaseObject& _baseObject, ICamera& _camera)
{

UIQT* popup = new UIQT();
popup->updateHierarchy(_baseObject);
popup->updateHierarchy(_baseObject, _camera);


m_popups.push_back(popup);
popup->show();

@@ -4,6 +4,7 @@
#include "..\OpenGLFramework\UI\UIPopup.h"
#include "uiqt.h"
#include "..\OpenGLFramework\Interface\IUIInterface.h"
#include "..\OpenGLFramework\Camera\Camera.h"

#include <map>
#include <vector>
@@ -19,7 +20,7 @@ namespace Application
UIInterface();
~UIInterface();

void ShowPopup(Framework::BaseObject& _baseObject) override;
void ShowPopup(Framework::BaseObject& _baseObject, ICamera& _camera) override;
void AddShape(ShapeNames _name, UI::UIShape& _shape) override;
void SetApplication(const QApplication& _application);

@@ -10,16 +10,23 @@ UIQT::UIQT(QWidget *parent)



void UIQT::updateHierarchy(Framework::BaseObject& _hierarchy)
void UIQT::updateHierarchy(Framework::BaseObject& _hierarchy,ICamera& _camera)
{
m_hierarchyText.clear();
m_hierarchyObjects.clear();

createHierarchyList(m_hierarchyText, _hierarchy, 0);

m_camera = (Camera::Camera*)&_camera;

QListWidgetItem* newItem = new QListWidgetItem;
newItem->setText("Camera");
ui.CameraListWidget->insertItem(0, newItem);
}

void UIQT::createHierarchyList(QStringList _hierarchyText, Framework::BaseObject& _parent, int _depth)
{

std::string childText = " ";
for (int j = 0; j < _depth; j++)
childText += "-";
@@ -32,6 +39,7 @@ void UIQT::createHierarchyList(QStringList _hierarchyText, Framework::BaseObject
newItem->setText(_hierarchyText[_depth]);
ui.listWidget->insertItem(_depth, newItem);
//ui.listWidget-


std::vector<Framework::BaseObject*> childObjects = _parent.GetChilds();
for (int i = 0; i < childObjects.size(); i++)
@@ -114,13 +122,14 @@ void UIQT::presentZScale()
emit currentZScale(_zScale);
}

void UIQT::presentPitch()
void UIQT::presentPitch() //pitch = tilt
{

int _pitch;
emit currentPitch(_pitch);
}

void UIQT::presentYaw()
void UIQT::presentYaw() //yaw = bearing
{
int _yaw;
emit currentYaw(_yaw);
@@ -9,6 +9,7 @@
#include "qmatrix4x4.h"
#include <QtQuick/qquickitem.h>
#include <QtQuick/qquickview.h>
#include "..\OpenGLFramework\Camera\Camera.h"


class UIQT : public QMainWindow, public UI::UIPopup
@@ -36,7 +37,7 @@ void presentYaw();
void presentZoom();
void presentNear();
void presentFar();
void updateHierarchy(Framework::BaseObject& _hierarchy);
void updateHierarchy(Framework::BaseObject& _hierarchy,ICamera& _camera);
void createHierarchyList(QStringList _hierarchyText, Framework::BaseObject& _hierarchy, int _depth);
void setCurrentObjectName(QString _objectName);
void setCurrentStackedIndex(int _index);
@@ -97,6 +98,7 @@ void changeStackedWidgetIndex(int _index);
QStringList m_hierarchyText;
std::vector<Framework::BaseObject*> m_hierarchyObjects;
QModelIndex m_selectedObject;
Camera::Camera* m_camera;

};

@@ -14,16 +14,16 @@
<string>UIQT</string>
</property>
<property name="windowOpacity">
<double>0.500000000000000</double>
<double>1.000000000000000</double>
</property>
<widget class="QWidget" name="centralWidget">
<widget class="QStackedWidget" name="stackedWidget">
<property name="geometry">
<rect>
<x>450</x>
<x>30</x>
<y>80</y>
<width>371</width>
<height>361</height>
<width>801</width>
<height>371</height>
</rect>
</property>
<property name="frameShadow">
@@ -36,7 +36,7 @@
<widget class="QFrame" name="objet">
<property name="geometry">
<rect>
<x>20</x>
<x>430</x>
<y>50</y>
<width>333</width>
<height>226</height>
@@ -342,14 +342,27 @@
</item>
</layout>
</widget>
<widget class="QListWidget" name="listWidget">
<property name="geometry">
<rect>
<x>60</x>
<y>30</y>
<width>321</width>
<height>321</height>
</rect>
</property>
<property name="cursor" stdset="0">
<cursorShape>PointingHandCursor</cursorShape>
</property>
</widget>
</widget>
<widget class="QWidget" name="cameraPage">
<widget class="QFrame" name="camera">
<property name="geometry">
<rect>
<x>120</x>
<y>40</y>
<width>121</width>
<x>550</x>
<y>30</y>
<width>131</width>
<height>271</height>
</rect>
</property>
@@ -502,19 +515,42 @@
<zorder>nearSpinBox</zorder>
<zorder>farSpinBox</zorder>
</widget>
<widget class="QListWidget" name="CameraListWidget">
<property name="geometry">
<rect>
<x>60</x>
<y>30</y>
<width>321</width>
<height>321</height>
</rect>
</property>
</widget>
</widget>
</widget>
<widget class="QListWidget" name="listWidget">
<widget class="QSpinBox" name="spinBox">
<property name="geometry">
<rect>
<x>70</x>
<y>70</y>
<width>331</width>
<height>371</height>
<x>730</x>
<y>490</y>
<width>42</width>
<height>22</height>
</rect>
</property>
<property name="maximum">
<number>1</number>
</property>
</widget>
<widget class="QLabel" name="pageLabel">
<property name="geometry">
<rect>
<x>680</x>
<y>490</y>
<width>31</width>
<height>21</height>
</rect>
</property>
<property name="cursor" stdset="0">
<cursorShape>PointingHandCursor</cursorShape>
<property name="text">
<string>Page</string>
</property>
</widget>
</widget>
@@ -579,7 +615,7 @@
<slot>newZPosition(int)</slot>
<hints>
<hint type="sourcelabel">
<x>791</x>
<x>781</x>
<y>209</y>
</hint>
<hint type="destinationlabel">
@@ -627,7 +663,7 @@
<slot>newZRotation(int)</slot>
<hints>
<hint type="sourcelabel">
<x>791</x>
<x>781</x>
<y>254</y>
</hint>
<hint type="destinationlabel">
@@ -675,7 +711,7 @@
<slot>newBColor(int)</slot>
<hints>
<hint type="sourcelabel">
<x>791</x>
<x>781</x>
<y>344</y>
</hint>
<hint type="destinationlabel">
@@ -707,8 +743,8 @@
<slot>newPitch(int)</slot>
<hints>
<hint type="sourcelabel">
<x>581</x>
<y>199</y>
<x>602</x>
<y>189</y>
</hint>
<hint type="destinationlabel">
<x>35</x>
@@ -723,8 +759,8 @@
<slot>newYaw(int)</slot>
<hints>
<hint type="sourcelabel">
<x>581</x>
<y>244</y>
<x>602</x>
<y>234</y>
</hint>
<hint type="destinationlabel">
<x>30</x>
@@ -739,8 +775,8 @@
<slot>newZoom(int)</slot>
<hints>
<hint type="sourcelabel">
<x>581</x>
<y>289</y>
<x>602</x>
<y>279</y>
</hint>
<hint type="destinationlabel">
<x>32</x>
@@ -755,8 +791,8 @@
<slot>newNear(int)</slot>
<hints>
<hint type="sourcelabel">
<x>581</x>
<y>334</y>
<x>602</x>
<y>324</y>
</hint>
<hint type="destinationlabel">
<x>30</x>
@@ -771,8 +807,8 @@
<slot>newFar(int)</slot>
<hints>
<hint type="sourcelabel">
<x>581</x>
<y>379</y>
<x>602</x>
<y>369</y>
</hint>
<hint type="destinationlabel">
<x>51</x>
@@ -823,7 +859,7 @@
<y>40</y>
</hint>
<hint type="destinationlabel">
<x>791</x>
<x>781</x>
<y>209</y>
</hint>
</hints>
@@ -871,7 +907,7 @@
<y>207</y>
</hint>
<hint type="destinationlabel">
<x>791</x>
<x>781</x>
<y>254</y>
</hint>
</hints>
@@ -919,7 +955,7 @@
<y>244</y>
</hint>
<hint type="destinationlabel">
<x>791</x>
<x>781</x>
<y>344</y>
</hint>
</hints>
@@ -951,8 +987,8 @@
<y>191</y>
</hint>
<hint type="destinationlabel">
<x>581</x>
<y>199</y>
<x>602</x>
<y>189</y>
</hint>
</hints>
</connection>
@@ -967,8 +1003,8 @@
<y>247</y>
</hint>
<hint type="destinationlabel">
<x>581</x>
<y>244</y>
<x>602</x>
<y>234</y>
</hint>
</hints>
</connection>
@@ -983,8 +1019,8 @@
<y>268</y>
</hint>
<hint type="destinationlabel">
<x>581</x>
<y>289</y>
<x>602</x>
<y>279</y>
</hint>
</hints>
</connection>
@@ -999,8 +1035,8 @@
<y>333</y>
</hint>
<hint type="destinationlabel">
<x>581</x>
<y>334</y>
<x>602</x>
<y>324</y>
</hint>
</hints>
</connection>
@@ -1015,8 +1051,8 @@
<y>379</y>
</hint>
<hint type="destinationlabel">
<x>581</x>
<y>379</y>
<x>602</x>
<y>369</y>
</hint>
</hints>
</connection>
@@ -1132,6 +1168,22 @@
</hint>
</hints>
</connection>
<connection>
<sender>spinBox</sender>
<signal>valueChanged(int)</signal>
<receiver>stackedWidget</receiver>
<slot>setCurrentIndex(int)</slot>
<hints>
<hint type="sourcelabel">
<x>745</x>
<y>497</y>
</hint>
<hint type="destinationlabel">
<x>715</x>
<y>442</y>
</hint>
</hints>
</connection>
</connections>
<slots>
<signal>currentRColor(int)</signal>
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,2 @@
#TargetFrameworkVersion=v4.0:PlatformToolSet=v140:EnableManagedIncrementalBuild=false:VCToolArchitecture=Native32Bit:WindowsTargetPlatformVersion=8.1
Debug|x64|C:\Users\Yannick\Documents\OpenGLFramework\OpenGLFramework\|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Empty file.
Binary file not shown.
@@ -0,0 +1,24 @@
c:\users\yannick\documents\openglframework\openglframework\uiqt\x64\release\uiqt.obj
c:\users\yannick\documents\openglframework\openglframework\uiqt\x64\release\main.obj
c:\users\yannick\documents\openglframework\openglframework\uiqt\x64\release\moc_uiqt.obj
c:\users\yannick\documents\openglframework\openglframework\uiqt\x64\release\scene.obj
c:\users\yannick\documents\openglframework\openglframework\uiqt\x64\release\customshader.obj
c:\users\yannick\documents\openglframework\openglframework\uiqt\x64\release\qrc_uiqt.obj
c:\users\yannick\documents\openglframework\openglframework\uiqt\generatedfiles\release\moc_uiqt.cpp
c:\users\yannick\documents\openglframework\openglframework\uiqt\generatedfiles\ui_uiqt.h
c:\users\yannick\documents\openglframework\openglframework\uiqt\generatedfiles\qrc_uiqt.cpp
c:\users\yannick\documents\openglframework\openglframework\uiqt\x64\release\uiqt.tlog\cl.command.1.tlog
c:\users\yannick\documents\openglframework\openglframework\uiqt\x64\release\uiqt.tlog\cl.read.1.tlog
c:\users\yannick\documents\openglframework\openglframework\uiqt\x64\release\uiqt.tlog\cl.write.1.tlog
c:\users\yannick\documents\openglframework\openglframework\uiqt\x64\release\uiqt.tlog\custombuild.command.1.tlog
c:\users\yannick\documents\openglframework\openglframework\uiqt\x64\release\uiqt.tlog\custombuild.read.1.tlog
c:\users\yannick\documents\openglframework\openglframework\uiqt\x64\release\uiqt.tlog\custombuild.write.1.tlog
c:\users\yannick\documents\openglframework\openglframework\uiqt\x64\release\uiqt.tlog\link.11664.read.1.tlog
c:\users\yannick\documents\openglframework\openglframework\uiqt\x64\release\uiqt.tlog\link.11664.write.1.tlog
c:\users\yannick\documents\openglframework\openglframework\uiqt\x64\release\uiqt.tlog\link.14484.read.1.tlog
c:\users\yannick\documents\openglframework\openglframework\uiqt\x64\release\uiqt.tlog\link.14484.write.1.tlog
c:\users\yannick\documents\openglframework\openglframework\uiqt\x64\release\uiqt.tlog\link.4176.read.1.tlog
c:\users\yannick\documents\openglframework\openglframework\uiqt\x64\release\uiqt.tlog\link.4176.write.1.tlog
c:\users\yannick\documents\openglframework\openglframework\uiqt\x64\release\uiqt.tlog\link.command.1.tlog
c:\users\yannick\documents\openglframework\openglframework\uiqt\x64\release\uiqt.tlog\link.read.1.tlog
c:\users\yannick\documents\openglframework\openglframework\uiqt\x64\release\uiqt.tlog\link.write.1.tlog
@@ -0,0 +1 @@
��
@@ -0,0 +1 @@
��
@@ -0,0 +1 @@
��
@@ -0,0 +1 @@
��
@@ -0,0 +1 @@
��
@@ -0,0 +1 @@
��
Binary file not shown.
Binary file not shown.