Updates to make the samples compatible with Cinder v0.9.1

paulhoux · Mar 29, 2018 · 6f41aad · 6f41aad
1 parent fb4db00
commit 6f41aad
Show file tree

Hide file tree

Showing 143 changed files with 1,012 additions and 1,154 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,6 +11,8 @@
 /*/vc2013/Debug
 /*/vc2013/ipch
 /*/vc2013/Release
+/*/vc2015/Debug
+/*/vc2015/Release
 *.opensdf
 *.sdf
 *.opendb
@@ -33,3 +35,7 @@
 *.xcscheme
 *.xcbkptlist
 /build.log
+*.log
+*.idb
+*.iobj
+*.ipdb
diff --git a/AnalogClock/AnalogClock.exe b/AnalogClock/AnalogClock.exe
diff --git a/AnalogClock/vc2013/AnalogClock.sln → AnalogClock/vc2015/AnalogClock.sln b/AnalogClock/vc2013/AnalogClock.sln → AnalogClock/vc2015/AnalogClock.sln
diff --git a/AnalogClock/vc2013/AnalogClock.vcxproj → AnalogClock/vc2015/AnalogClock.vcxproj b/AnalogClock/vc2013/AnalogClock.vcxproj → AnalogClock/vc2015/AnalogClock.vcxproj
@@ -20,12 +20,12 @@
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -57,22 +57,25 @@
       <PrecompiledHeader>
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <ResourceCompile>
       <AdditionalIncludeDirectories>..\..\..\cinder_master\include;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>cinder-$(PlatformToolset)_d.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\cinder_master\lib;..\..\..\cinder_master\lib\msw\$(PlatformTarget);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>cinder.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\..\..\cinder_master\lib;..\..\..\cinder_master\lib\msw\$(PlatformTarget)\$(Configuration)\$(PlatformToolset);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
       <TargetMachine>MachineX86</TargetMachine>
       <IgnoreSpecificDefaultLibraries>LIBCMT</IgnoreSpecificDefaultLibraries>
-    </Link><PostBuildEvent><Command>copy /Y "$(TargetDir)$(ProjectName).exe" "$(TargetDir)..\..\$(ProjectName).exe"</Command></PostBuildEvent>
+    </Link>
+    <PostBuildEvent>
+      <Command>copy /Y "$(TargetDir)$(ProjectName).exe" "$(TargetDir)..\..\$(ProjectName).exe"</Command>
+    </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
@@ -91,8 +94,8 @@
       <AdditionalIncludeDirectories>..\..\..\cinder_master\include;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>cinder-$(PlatformToolset).lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\cinder_master\lib;..\..\..\cinder_master\lib\msw\$(PlatformTarget);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>cinder.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\..\..\cinder_master\lib;..\..\..\cinder_master\lib\msw\$(PlatformTarget)\$(Configuration)\$(PlatformToolset);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <GenerateMapFile>true</GenerateMapFile>
       <SubSystem>Windows</SubSystem>
@@ -103,7 +106,10 @@
       <DataExecutionPrevention>
       </DataExecutionPrevention>
       <TargetMachine>MachineX86</TargetMachine>
-    </Link><PostBuildEvent><Command>copy /Y "$(TargetDir)$(ProjectName).exe" "$(TargetDir)..\..\$(ProjectName).exe"</Command></PostBuildEvent>
+    </Link>
+    <PostBuildEvent>
+      <Command>copy /Y "$(TargetDir)$(ProjectName).exe" "$(TargetDir)..\..\$(ProjectName).exe"</Command>
+    </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\src\AnalogClockApp.cpp" />

diff --git a/...gClock/vc2013/AnalogClock.vcxproj.filters → ...gClock/vc2015/AnalogClock.vcxproj.filters b/...gClock/vc2013/AnalogClock.vcxproj.filters → ...gClock/vc2015/AnalogClock.vcxproj.filters
diff --git a/AnalogClock/vc2013/Resources.rc → AnalogClock/vc2015/Resources.rc b/AnalogClock/vc2013/Resources.rc → AnalogClock/vc2015/Resources.rc
diff --git a/AnalogClock/vc2013/cinder_app_icon.ico → AnalogClock/vc2015/cinder_app_icon.ico b/AnalogClock/vc2013/cinder_app_icon.ico → AnalogClock/vc2015/cinder_app_icon.ico
diff --git a/AudioVisualizer/assets/shaders/spectrum.frag b/AudioVisualizer/assets/shaders/spectrum.frag
@@ -10,7 +10,7 @@ void main(void)
 	// calculate glowing line strips based on texture coordinate
 	const float kResolution = 256.0;
 	const float kCenter = 0.5;
-	const float kWidth = 0.02;
+	const float kWidth = 0.2;
 
 	float f = fract( kResolution * vertTexCoord0.x );
 	float d = abs(kCenter - f);

diff --git a/AudioVisualizer/assets/shaders/spectrum.vert b/AudioVisualizer/assets/shaders/spectrum.vert
@@ -19,11 +19,11 @@ void main(void)
 	vec2 coord = ciTexCoord0 + vec2(0.0, uTexOffset);
 
 	// retrieve the FFT from left and right texture and average it
-	float fft = max(0.0001, mix( texture( uLeftTex, coord ).r, texture( uRightTex, coord ).r, 0.5));
+	float fft = max(0.0001, mix( texture( uLeftTex, coord ).r, texture( uRightTex, coord ).r, 0.0));
 
 	// convert to decibels
-	const float kLogBase10 = 1.0 / log(10.0);
-	float decibels = 10.0 * log( fft ) * kLogBase10;
+	const float kLogBase2 = 1.0 / log(2.0);
+	float decibels = 10.0 * log( fft ) * kLogBase2;
 
 	// offset the vertex based on the decibels
 	vec4 vertex = ciPosition;