Syncro avec master

Projet-Infographie/Projet-Infographie.vcxproj

@@ -100,7 +100,7 @@
       <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);src;..\..\..\..\addons\ofxAssimpModelLoader\libs;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\assimp;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\assimp\Compiler;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\assimp\port;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\assimp\port\AndroidJNI;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\lib;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\lib\vs;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\lib\vs\Win32;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\lib\vs\x64;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\license;..\..\..\..\addons\ofxAssimpModelLoader\src;..\..\..\..\addons\ofxGui\src;..\..\..\..\addons\ofxVectorGraphics\libs;..\..\..\..\addons\ofxVectorGraphics\src</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);src;..\..\..\..\addons\ofxAssimpModelLoader\libs;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\assimp;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\assimp\Compiler;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\assimp\port;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\assimp\port\AndroidJNI;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\lib;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\lib\vs;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\lib\vs\Win32;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\lib\vs\x64;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\license;..\..\..\..\addons\ofxAssimpModelLoader\src;..\..\..\..\addons\ofxDelaunay\libs;..\..\..\..\addons\ofxDelaunay\libs\Delaunay;..\..\..\..\addons\ofxDelaunay\libs\Delaunay\src;..\..\..\..\addons\ofxDelaunay\src;..\..\..\..\addons\ofxGui\src;..\..\..\..\addons\ofxReflectionRefraction\src;..\..\..\..\addons\ofxSkyBox\src;..\..\..\..\addons\ofxVectorGraphics\libs;..\..\..\..\addons\ofxVectorGraphics\src</AdditionalIncludeDirectories>
       <CompileAs>CompileAsCpp</CompileAs>
       <ObjectFileName>$(IntDir)%(RelativeDir)</ObjectFileName>
     </ClCompile>
@@ -120,7 +120,7 @@
       <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);src;..\..\..\..\addons\ofxAssimpModelLoader\libs;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\assimp;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\assimp\Compiler;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\assimp\port;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\assimp\port\AndroidJNI;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\lib;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\lib\vs;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\lib\vs\Win32;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\lib\vs\x64;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\license;..\..\..\..\addons\ofxAssimpModelLoader\src;..\..\..\..\addons\ofxGui\src;..\..\..\..\addons\ofxVectorGraphics\libs;..\..\..\..\addons\ofxVectorGraphics\src</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);src;..\..\..\..\addons\ofxAssimpModelLoader\libs;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\assimp;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\assimp\Compiler;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\assimp\port;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\assimp\port\AndroidJNI;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\lib;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\lib\vs;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\lib\vs\Win32;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\lib\vs\x64;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\license;..\..\..\..\addons\ofxAssimpModelLoader\src;..\..\..\..\addons\ofxDelaunay\libs;..\..\..\..\addons\ofxDelaunay\libs\Delaunay;..\..\..\..\addons\ofxDelaunay\libs\Delaunay\src;..\..\..\..\addons\ofxDelaunay\src;..\..\..\..\addons\ofxGui\src;..\..\..\..\addons\ofxReflectionRefraction\src;..\..\..\..\addons\ofxSkyBox\src;..\..\..\..\addons\ofxVectorGraphics\libs;..\..\..\..\addons\ofxVectorGraphics\src</AdditionalIncludeDirectories>
       <CompileAs>CompileAsCpp</CompileAs>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <ObjectFileName>$(IntDir)%(RelativeDir)</ObjectFileName>
@@ -140,7 +140,7 @@
       <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);src;..\..\..\..\addons\ofxAssimpModelLoader\libs;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\assimp;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\assimp\Compiler;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\assimp\port;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\assimp\port\AndroidJNI;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\lib;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\lib\vs;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\lib\vs\Win32;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\lib\vs\x64;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\license;..\..\..\..\addons\ofxAssimpModelLoader\src;..\..\..\..\addons\ofxGui\src;..\..\..\..\addons\ofxVectorGraphics\libs;..\..\..\..\addons\ofxVectorGraphics\src</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);src;..\..\..\..\addons\ofxAssimpModelLoader\libs;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\assimp;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\assimp\Compiler;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\assimp\port;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\assimp\port\AndroidJNI;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\lib;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\lib\vs;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\lib\vs\Win32;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\lib\vs\x64;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\license;..\..\..\..\addons\ofxAssimpModelLoader\src;..\..\..\..\addons\ofxDelaunay\libs;..\..\..\..\addons\ofxDelaunay\libs\Delaunay;..\..\..\..\addons\ofxDelaunay\libs\Delaunay\src;..\..\..\..\addons\ofxDelaunay\src;..\..\..\..\addons\ofxGui\src;..\..\..\..\addons\ofxReflectionRefraction\src;..\..\..\..\addons\ofxSkyBox\src;..\..\..\..\addons\ofxVectorGraphics\libs;..\..\..\..\addons\ofxVectorGraphics\src</AdditionalIncludeDirectories>
       <CompileAs>CompileAsCpp</CompileAs>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <ObjectFileName>$(IntDir)%(RelativeDir)</ObjectFileName>
@@ -163,7 +163,7 @@
       <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);src;..\..\..\..\addons\ofxAssimpModelLoader\libs;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\assimp;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\assimp\Compiler;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\assimp\port;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\assimp\port\AndroidJNI;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\lib;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\lib\vs;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\lib\vs\Win32;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\lib\vs\x64;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\license;..\..\..\..\addons\ofxAssimpModelLoader\src;..\..\..\..\addons\ofxGui\src;..\..\..\..\addons\ofxVectorGraphics\libs;..\..\..\..\addons\ofxVectorGraphics\src</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);src;..\..\..\..\addons\ofxAssimpModelLoader\libs;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\assimp;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\assimp\Compiler;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\assimp\port;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\assimp\port\AndroidJNI;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\lib;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\lib\vs;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\lib\vs\Win32;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\lib\vs\x64;..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\license;..\..\..\..\addons\ofxAssimpModelLoader\src;..\..\..\..\addons\ofxDelaunay\libs;..\..\..\..\addons\ofxDelaunay\libs\Delaunay;..\..\..\..\addons\ofxDelaunay\libs\Delaunay\src;..\..\..\..\addons\ofxDelaunay\src;..\..\..\..\addons\ofxGui\src;..\..\..\..\addons\ofxReflectionRefraction\src;..\..\..\..\addons\ofxSkyBox\src;..\..\..\..\addons\ofxVectorGraphics\libs;..\..\..\..\addons\ofxVectorGraphics\src</AdditionalIncludeDirectories>
       <CompileAs>CompileAsCpp</CompileAs>
       <ObjectFileName>$(IntDir)%(RelativeDir)</ObjectFileName>
     </ClCompile>
@@ -185,12 +185,15 @@
     <ClCompile Include="src\bezierSurface.cpp" />
     <ClCompile Include="src\object2D.cpp" />
     <ClCompile Include="src\object3D.cpp" />
+    <ClCompile Include="src\Quad.cpp" />
     <ClCompile Include="src\renderer.cpp" />
-    <ClCompile Include="src\sphere.cpp" />
+    <ClCompile Include="src\Skybox.cpp" />
     <ClCompile Include="..\..\..\..\addons\ofxAssimpModelLoader\src\ofxAssimpAnimation.cpp" />
     <ClCompile Include="..\..\..\..\addons\ofxAssimpModelLoader\src\ofxAssimpMeshHelper.cpp" />
     <ClCompile Include="..\..\..\..\addons\ofxAssimpModelLoader\src\ofxAssimpModelLoader.cpp" />
     <ClCompile Include="..\..\..\..\addons\ofxAssimpModelLoader\src\ofxAssimpTexture.cpp" />
+    <ClCompile Include="..\..\..\..\addons\ofxDelaunay\src\ofxDelaunay.cpp" />
+    <ClCompile Include="..\..\..\..\addons\ofxDelaunay\libs\Delaunay\src\Delaunay.cpp" />
     <ClCompile Include="..\..\..\..\addons\ofxGui\src\ofxBaseGui.cpp" />
     <ClCompile Include="..\..\..\..\addons\ofxGui\src\ofxButton.cpp" />
     <ClCompile Include="..\..\..\..\addons\ofxGui\src\ofxColorPicker.cpp" />
@@ -201,6 +204,8 @@
     <ClCompile Include="..\..\..\..\addons\ofxGui\src\ofxSlider.cpp" />
     <ClCompile Include="..\..\..\..\addons\ofxGui\src\ofxSliderGroup.cpp" />
     <ClCompile Include="..\..\..\..\addons\ofxGui\src\ofxToggle.cpp" />
+    <ClCompile Include="..\..\..\..\addons\ofxSkyBox\src\ofxCubeMap.cpp" />
+    <ClCompile Include="..\..\..\..\addons\ofxSkyBox\src\ofxSkyBox.cpp" />
     <ClCompile Include="..\..\..\..\addons\ofxVectorGraphics\src\ofxVectorGraphics.cpp" />
     <ClCompile Include="..\..\..\..\addons\ofxVectorGraphics\libs\CreEPS.cpp" />
   </ItemGroup>
@@ -209,8 +214,9 @@
     <ClInclude Include="src\bezierSurface.h" />
     <ClInclude Include="src\object2D.h" />
     <ClInclude Include="src\object3D.h" />
+    <ClInclude Include="src\Quad.h" />
     <ClInclude Include="src\renderer.h" />
-    <ClInclude Include="src\sphere.h" />
+    <ClInclude Include="src\Skybox.h" />
     <ClInclude Include="..\..\..\..\addons\ofxAssimpModelLoader\src\ofxAssimpAnimation.h" />
     <ClInclude Include="..\..\..\..\addons\ofxAssimpModelLoader\src\ofxAssimpMeshHelper.h" />
     <ClInclude Include="..\..\..\..\addons\ofxAssimpModelLoader\src\ofxAssimpModelLoader.h" />
@@ -257,6 +263,8 @@
     <ClInclude Include="..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\assimp\vector2.h" />
     <ClInclude Include="..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\assimp\vector3.h" />
     <ClInclude Include="..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\assimp\version.h" />
+    <ClInclude Include="..\..\..\..\addons\ofxDelaunay\src\ofxDelaunay.h" />
+    <ClInclude Include="..\..\..\..\addons\ofxDelaunay\libs\Delaunay\src\Delaunay.h" />
     <ClInclude Include="..\..\..\..\addons\ofxGui\src\ofxBaseGui.h" />
     <ClInclude Include="..\..\..\..\addons\ofxGui\src\ofxButton.h" />
     <ClInclude Include="..\..\..\..\addons\ofxGui\src\ofxColorPicker.h" />
@@ -269,6 +277,10 @@
     <ClInclude Include="..\..\..\..\addons\ofxGui\src\ofxSlider.h" />
     <ClInclude Include="..\..\..\..\addons\ofxGui\src\ofxSliderGroup.h" />
     <ClInclude Include="..\..\..\..\addons\ofxGui\src\ofxToggle.h" />
+    <ClInclude Include="..\..\..\..\addons\ofxReflectionRefraction\src\glsl.h" />
+    <ClInclude Include="..\..\..\..\addons\ofxReflectionRefraction\src\ofxReflectionRefraction.h" />
+    <ClInclude Include="..\..\..\..\addons\ofxSkyBox\src\ofxCubeMap.h" />
+    <ClInclude Include="..\..\..\..\addons\ofxSkyBox\src\ofxSkyBox.h" />
     <ClInclude Include="..\..\..\..\addons\ofxVectorGraphics\src\ofxVectorGraphics.h" />
     <ClInclude Include="..\..\..\..\addons\ofxVectorGraphics\libs\CreEPS.hpp" />
     <ClInclude Include="..\..\..\..\addons\ofxVectorGraphics\libs\CreEPS_Types.hpp" />

Projet-Infographie/Projet-Infographie.vcxproj.filters

@@ -19,10 +19,13 @@
     <ClCompile Include="src\object3D.cpp">
       <Filter>src</Filter>
     </ClCompile>
+    <ClCompile Include="src\Quad.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
     <ClCompile Include="src\renderer.cpp">
       <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="src\sphere.cpp">
+    <ClCompile Include="src\Skybox.cpp">
       <Filter>src</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\..\addons\ofxAssimpModelLoader\src\ofxAssimpAnimation.cpp">
@@ -37,6 +40,12 @@
     <ClCompile Include="..\..\..\..\addons\ofxAssimpModelLoader\src\ofxAssimpTexture.cpp">
       <Filter>addons\ofxAssimpModelLoader\src</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\addons\ofxDelaunay\src\ofxDelaunay.cpp">
+      <Filter>addons\ofxDelaunay\src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\addons\ofxDelaunay\libs\Delaunay\src\Delaunay.cpp">
+      <Filter>addons\ofxDelaunay\libs\Delaunay\src</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\addons\ofxGui\src\ofxBaseGui.cpp">
       <Filter>addons\ofxGui\src</Filter>
     </ClCompile>
@@ -67,6 +76,12 @@
     <ClCompile Include="..\..\..\..\addons\ofxGui\src\ofxToggle.cpp">
       <Filter>addons\ofxGui\src</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\addons\ofxSkyBox\src\ofxCubeMap.cpp">
+      <Filter>addons\ofxSkyBox\src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\addons\ofxSkyBox\src\ofxSkyBox.cpp">
+      <Filter>addons\ofxSkyBox\src</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\addons\ofxVectorGraphics\src\ofxVectorGraphics.cpp">
       <Filter>addons\ofxVectorGraphics\src</Filter>
     </ClCompile>
@@ -108,12 +123,39 @@
     <Filter Include="addons\ofxAssimpModelLoader\libs\assimp\include\assimp\port\AndroidJNI">
       <UniqueIdentifier>{CA012BC2-060F-2F55-47FD-5ACF}</UniqueIdentifier>
     </Filter>
+    <Filter Include="addons\ofxDelaunay">
+      <UniqueIdentifier>{33AEF2BD-546A-734A-577D-708F}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="addons\ofxDelaunay\src">
+      <UniqueIdentifier>{52C9C640-A7D0-8CA7-C82E-2759}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="addons\ofxDelaunay\libs">
+      <UniqueIdentifier>{30A85846-14CF-0582-4723-B04D}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="addons\ofxDelaunay\libs\Delaunay">
+      <UniqueIdentifier>{D243CA4C-1F20-F2E6-59F6-244B}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="addons\ofxDelaunay\libs\Delaunay\src">
+      <UniqueIdentifier>{01F42909-79F6-7284-E180-BCAD}</UniqueIdentifier>
+    </Filter>
     <Filter Include="addons\ofxGui">
       <UniqueIdentifier>{4F2A59AF-5F4E-704B-D067-EC13}</UniqueIdentifier>
     </Filter>
     <Filter Include="addons\ofxGui\src">
       <UniqueIdentifier>{645E9533-4DCD-6179-1CDF-CB65}</UniqueIdentifier>
     </Filter>
+    <Filter Include="addons\ofxReflectionRefraction">
+      <UniqueIdentifier>{FCEE8873-1FF9-CFC3-7AA4-4571}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="addons\ofxReflectionRefraction\src">
+      <UniqueIdentifier>{6CEEFBE7-0952-9EDB-3766-ED3B}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="addons\ofxSkyBox">
+      <UniqueIdentifier>{01BD29BA-9FB4-6940-5EF5-4F44}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="addons\ofxSkyBox\src">
+      <UniqueIdentifier>{4FACB685-CC3E-BE4D-8F50-4EBA}</UniqueIdentifier>
+    </Filter>
     <Filter Include="addons\ofxVectorGraphics">
       <UniqueIdentifier>{5A7F3658-B06B-DB97-F4E1-DD19}</UniqueIdentifier>
     </Filter>
@@ -137,10 +179,13 @@
     <ClInclude Include="src\object3D.h">
       <Filter>src</Filter>
     </ClInclude>
+    <ClInclude Include="src\Quad.h">
+      <Filter>src</Filter>
+    </ClInclude>
     <ClInclude Include="src\renderer.h">
       <Filter>src</Filter>
     </ClInclude>
-    <ClInclude Include="src\sphere.h">
+    <ClInclude Include="src\Skybox.h">
       <Filter>src</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\..\addons\ofxAssimpModelLoader\src\ofxAssimpAnimation.h">
@@ -281,6 +326,12 @@
     <ClInclude Include="..\..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\assimp\version.h">
       <Filter>addons\ofxAssimpModelLoader\libs\assimp\include\assimp</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\..\addons\ofxDelaunay\src\ofxDelaunay.h">
+      <Filter>addons\ofxDelaunay\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\addons\ofxDelaunay\libs\Delaunay\src\Delaunay.h">
+      <Filter>addons\ofxDelaunay\libs\Delaunay\src</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\..\addons\ofxGui\src\ofxBaseGui.h">
       <Filter>addons\ofxGui\src</Filter>
     </ClInclude>
@@ -317,6 +368,18 @@
     <ClInclude Include="..\..\..\..\addons\ofxGui\src\ofxToggle.h">
       <Filter>addons\ofxGui\src</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\..\addons\ofxReflectionRefraction\src\glsl.h">
+      <Filter>addons\ofxReflectionRefraction\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\addons\ofxReflectionRefraction\src\ofxReflectionRefraction.h">
+      <Filter>addons\ofxReflectionRefraction\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\addons\ofxSkyBox\src\ofxCubeMap.h">
+      <Filter>addons\ofxSkyBox\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\addons\ofxSkyBox\src\ofxSkyBox.h">
+      <Filter>addons\ofxSkyBox\src</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\..\addons\ofxVectorGraphics\src\ofxVectorGraphics.h">
       <Filter>addons\ofxVectorGraphics\src</Filter>
     </ClInclude>

Projet-Infographie/addons.make

@@ -1,3 +1,6 @@
 ofxAssimpModelLoader
+ofxDelaunay
 ofxGui
+ofxReflectionRefraction
+ofxSkyBox
 ofxVectorGraphics