diff --git a/.gitignore b/.gitignore
index 5e405026..58aa2a68 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,14 +29,12 @@
/Minecraft.World/*ContentPackage_SYMBOLS
/Minecraft.World/*ReleaseForArt
-# PS3 SPU
-/Minecraft.Client/PS3/SPU_Tasks/objFiles/
-/Minecraft.Client/PS3/SPU_Tasks/Texture_blit/PS3*
-/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_FindNearestChunk/PS3*
-/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_cull/PS3*
-/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_compress/PS3*
-/Minecraft.Client/PS3/SPU_Tasks/CompressedTile/PS3*
-/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/PS3*
+# PS3 SPU Tasks
+/Minecraft.Client/PS3/SPU_Tasks/objFiles
+/Minecraft.Client/PS3/SPU_Tasks/*/PS3*
+/Minecraft.Client/PS3/SPU_Tasks/*/Debug
+/Minecraft.Client/PS3/SPU_Tasks/*/Release
+/Minecraft.Client/PS3/SPU_Tasks/*/ContentPackage
# Misc
*.pkg
diff --git a/Minecraft.Client/Common/CommonMedia.sln b/Minecraft.Client/Common/CommonMedia.sln
index 86953838..5fbe9d84 100644
--- a/Minecraft.Client/Common/CommonMedia.sln
+++ b/Minecraft.Client/Common/CommonMedia.sln
@@ -4,14 +4,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CommonMedia", "CommonMedia.vcxproj", "{21BBD32C-AF5E-4741-8B80-3B73FC0D0F27}"
EndProject
Global
- GlobalSection(TeamFoundationVersionControl) = preSolution
- SccNumberOfProjects = 2
- SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
- SccTeamFoundationServer = http://tfs_server:8080/tfs/storiespark
- SccProjectUniqueName0 = CommonMedia.vcxproj
- SccLocalPath0 = .
- SccLocalPath1 = .
- EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
diff --git a/Minecraft.Client/Durango/Layout/Image/Loose/Common/res/TitleUpdate/GameRules/BuildOnly/GameRules.sln b/Minecraft.Client/Durango/Layout/Image/Loose/Common/res/TitleUpdate/GameRules/BuildOnly/GameRules.sln
index 2db538d5..ca450112 100644
--- a/Minecraft.Client/Durango/Layout/Image/Loose/Common/res/TitleUpdate/GameRules/BuildOnly/GameRules.sln
+++ b/Minecraft.Client/Durango/Layout/Image/Loose/Common/res/TitleUpdate/GameRules/BuildOnly/GameRules.sln
@@ -4,14 +4,6 @@ Microsoft Visual Studio Solution File, Format Version 11.00
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GameRules", "GameRules.vcxproj", "{0DD2FD59-36AC-476F-9201-D687A4CE9E98}"
EndProject
Global
- GlobalSection(TeamFoundationVersionControl) = preSolution
- SccNumberOfProjects = 2
- SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
- SccTeamFoundationServer = http://tfs_server:8080/tfs/storiespark
- SccProjectUniqueName0 = GameRules.vcxproj
- SccLocalPath0 = .
- SccLocalPath1 = .
- EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Xbox 360 = Debug|Xbox 360
Release|Xbox 360 = Release|Xbox 360
diff --git a/Minecraft.Client/Minecraft.Client.vcxproj b/Minecraft.Client/Minecraft.Client.vcxproj
index cad806f6..352bc05b 100644
--- a/Minecraft.Client/Minecraft.Client.vcxproj
+++ b/Minecraft.Client/Minecraft.Client.vcxproj
@@ -809,6 +809,12 @@
powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/PS3-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/"
Run PS3 postbuild script
+
+ "C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" "$(ProjectDir)PS3\SPU_Tasks\SPU_Tasks.sln" /p:Configuration=Debug /v:quiet
+
+
+ Build PS3 SPU Tasks
+
@@ -898,6 +904,12 @@
Run PS3 postbuild script
+
+ "C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" "$(ProjectDir)PS3\SPU_Tasks\SPU_Tasks.sln" /p:Configuration=Release /v:minimal
+
+
+ Build PS3 SPU Tasks
+
@@ -1345,6 +1357,12 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CU
Run PS3 postbuild script
+
+ "C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" "$(ProjectDir)PS3\SPU_Tasks\SPU_Tasks.sln" /p:Configuration=ContentPackage /v:minimal
+
+
+ Build PS3 SPU Tasks
+
@@ -1436,6 +1454,12 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CU
Run PS3 postbuild script
+
+ "C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" "$(ProjectDir)PS3\SPU_Tasks\SPU_Tasks.sln" /p:Configuration=ContentPackage /v:minimal
+
+
+ Build PS3 SPU Tasks
+
@@ -1535,6 +1559,12 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CU
Run PS3 postbuild script
+
+ "C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" "$(ProjectDir)PS3\SPU_Tasks\SPU_Tasks.sln" /p:Configuration=Release /v:minimal
+
+
+ Build PS3 SPU Tasks
+
@@ -1625,6 +1655,12 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CU
Run PS3 postbuild script
+
+ "C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" "$(ProjectDir)PS3\SPU_Tasks\SPU_Tasks.sln" /p:Configuration=ContentPackage /v:minimal
+
+
+ Build PS3 SPU Tasks
+
diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate.ppu.o b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate.ppu.o
deleted file mode 100644
index d1eb56d8..00000000
Binary files a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate.ppu.o and /dev/null differ
diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ChunkUpdate.spu.vcxproj b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ChunkUpdate.spu.vcxproj
index 2d024f54..41f42cbd 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ChunkUpdate.spu.vcxproj
+++ b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ChunkUpdate.spu.vcxproj
@@ -213,6 +213,9 @@
JobBin2
..\ObjFiles\Debug\$(TargetName).ppu$(ObjectExt)
+
+ powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/"
+
@@ -236,6 +239,9 @@
JobBin2
..\ObjFiles\Release\$(TargetName).ppu$(ObjectExt)
+
+ powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/"
+
@@ -260,6 +266,9 @@
..\ObjFiles\ContentPackage\$(TargetName).ppu$(ObjectExt)
Hard
+
+ powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/"
+
diff --git a/Minecraft.Client/PS3/SPU_Tasks/Common/Prebuild.ps1 b/Minecraft.Client/PS3/SPU_Tasks/Common/Prebuild.ps1
new file mode 100644
index 00000000..c1971dde
--- /dev/null
+++ b/Minecraft.Client/PS3/SPU_Tasks/Common/Prebuild.ps1
@@ -0,0 +1,15 @@
+# str1k3r - This prebuild makes sure that the ObjFiles directory exists so the PS3 SPU tasks can properly build
+param(
+ [string]$ProjectDir,
+ [string]$Configuration
+)
+
+$ParentDir = Split-Path -Path $ProjectDir -Parent
+
+$directories = @(
+ "ObjFiles\$Configuration"
+)
+
+foreach ($dir in $directories) {
+ New-Item -ItemType Directory -Path (Join-Path $ParentDir $dir) -Force | Out-Null
+}
\ No newline at end of file
diff --git a/Minecraft.Client/PS3/SPU_Tasks/CompressedTile.ppu.o b/Minecraft.Client/PS3/SPU_Tasks/CompressedTile.ppu.o
deleted file mode 100644
index 5631bed8..00000000
Binary files a/Minecraft.Client/PS3/SPU_Tasks/CompressedTile.ppu.o and /dev/null differ
diff --git a/Minecraft.Client/PS3/SPU_Tasks/CompressedTile/CompressedTile.spu.vcxproj b/Minecraft.Client/PS3/SPU_Tasks/CompressedTile/CompressedTile.spu.vcxproj
index 2e908d07..82bc7723 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/CompressedTile/CompressedTile.spu.vcxproj
+++ b/Minecraft.Client/PS3/SPU_Tasks/CompressedTile/CompressedTile.spu.vcxproj
@@ -106,6 +106,9 @@
JobBin2
..\ObjFiles\Debug\$(TargetName).ppu$(ObjectExt)
+
+ powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/"
+
@@ -129,6 +132,9 @@
JobBin2
..\ObjFiles\Release\$(TargetName).ppu$(ObjectExt)
+
+ powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/"
+
@@ -153,6 +159,9 @@
..\ObjFiles\ContentPackage\$(TargetName).ppu$(ObjectExt)
Hard
+
+ powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/"
+
diff --git a/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_compress.ppu.o b/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_compress.ppu.o
deleted file mode 100644
index edd2503f..00000000
Binary files a/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_compress.ppu.o and /dev/null differ
diff --git a/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_compress/CompressedTileStorage_compress.spu.vcxproj b/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_compress/CompressedTileStorage_compress.spu.vcxproj
index c86bb632..b39454bb 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_compress/CompressedTileStorage_compress.spu.vcxproj
+++ b/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_compress/CompressedTileStorage_compress.spu.vcxproj
@@ -102,6 +102,9 @@
JobBin2
..\ObjFiles\Debug\$(TargetName).ppu$(ObjectExt)
+
+ powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/"
+
@@ -125,6 +128,9 @@
JobBin2
..\ObjFiles\Release\$(TargetName).ppu$(ObjectExt)
+
+ powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/"
+
@@ -149,6 +155,9 @@
..\ObjFiles\ContentPackage\$(TargetName).ppu$(ObjectExt)
Hard
+
+ powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/"
+
diff --git a/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_getData.ppu.o b/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_getData.ppu.o
deleted file mode 100644
index 9d51f78c..00000000
Binary files a/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_getData.ppu.o and /dev/null differ
diff --git a/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_getData/CompressedTileStorage_getData.spu.vcxproj b/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_getData/CompressedTileStorage_getData.spu.vcxproj
index bcf4e559..bf763ae7 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_getData/CompressedTileStorage_getData.spu.vcxproj
+++ b/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_getData/CompressedTileStorage_getData.spu.vcxproj
@@ -98,6 +98,9 @@
JobBin2
..\ObjFiles\Debug\$(TargetName).ppu$(ObjectExt)
+
+ powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/"
+
@@ -121,6 +124,9 @@
JobBin2
..\ObjFiles\Release\$(TargetName).ppu$(ObjectExt)
+
+ powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/"
+
@@ -144,6 +150,9 @@
JobBin2
..\ObjFiles\ContentPackage\$(TargetName).ppu$(ObjectExt)
+
+ powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/"
+
diff --git a/Minecraft.Client/PS3/SPU_Tasks/GameRenderer_updateLightTexture.ppu.o b/Minecraft.Client/PS3/SPU_Tasks/GameRenderer_updateLightTexture.ppu.o
deleted file mode 100644
index 8b2e5c2f..00000000
Binary files a/Minecraft.Client/PS3/SPU_Tasks/GameRenderer_updateLightTexture.ppu.o and /dev/null differ
diff --git a/Minecraft.Client/PS3/SPU_Tasks/GameRenderer_updateLightTexture/GameRenderer_updateLightTexture.spu.vcxproj b/Minecraft.Client/PS3/SPU_Tasks/GameRenderer_updateLightTexture/GameRenderer_updateLightTexture.spu.vcxproj
index 6459acb4..0fdfb657 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/GameRenderer_updateLightTexture/GameRenderer_updateLightTexture.spu.vcxproj
+++ b/Minecraft.Client/PS3/SPU_Tasks/GameRenderer_updateLightTexture/GameRenderer_updateLightTexture.spu.vcxproj
@@ -75,6 +75,9 @@
JobBin2
+
+ powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/"
+
@@ -98,6 +101,9 @@
JobBin2
..\$(TargetName).ppu$(ObjectExt)
+
+ powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/"
+
diff --git a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderChunks.ppu.o b/Minecraft.Client/PS3/SPU_Tasks/LevelRenderChunks.ppu.o
deleted file mode 100644
index 5a1c08c2..00000000
Binary files a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderChunks.ppu.o and /dev/null differ
diff --git a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_FindNearestChunk.ppu.o b/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_FindNearestChunk.ppu.o
deleted file mode 100644
index 7979e985..00000000
Binary files a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_FindNearestChunk.ppu.o and /dev/null differ
diff --git a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_FindNearestChunk/LevelRenderer_FindNearestChunk.spu.vcxproj b/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_FindNearestChunk/LevelRenderer_FindNearestChunk.spu.vcxproj
index 32533dd9..c4a5c2c0 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_FindNearestChunk/LevelRenderer_FindNearestChunk.spu.vcxproj
+++ b/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_FindNearestChunk/LevelRenderer_FindNearestChunk.spu.vcxproj
@@ -97,6 +97,9 @@
JobBin2
..\ObjFiles\Debug\$(TargetName).ppu$(ObjectExt)
+
+ powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/"
+
@@ -121,6 +124,9 @@
JobBin2
..\ObjFiles\Release\$(TargetName).ppu$(ObjectExt)
+
+ powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/"
+
@@ -146,6 +152,9 @@
..\ObjFiles\ContentPackage\$(TargetName).ppu$(ObjectExt)
Hard
+
+ powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/"
+
diff --git a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_cull.ppu.o b/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_cull.ppu.o
deleted file mode 100644
index eb3eb279..00000000
Binary files a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_cull.ppu.o and /dev/null differ
diff --git a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_cull/LevelRenderer_cull.spu.vcxproj b/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_cull/LevelRenderer_cull.spu.vcxproj
index 30350107..d85fd0dd 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_cull/LevelRenderer_cull.spu.vcxproj
+++ b/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_cull/LevelRenderer_cull.spu.vcxproj
@@ -97,6 +97,9 @@
JobBin2
..\ObjFiles\Debug\$(TargetName).ppu$(ObjectExt)
+
+ powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/"
+
@@ -121,6 +124,9 @@
JobBin2
..\ObjFiles\Release\$(TargetName).ppu$(ObjectExt)
+
+ powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/"
+
@@ -146,6 +152,9 @@
..\ObjFiles\ContentPackage\$(TargetName).ppu$(ObjectExt)
Hard
+
+ powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/"
+
diff --git a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_cull_d.ppu.o b/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_cull_d.ppu.o
deleted file mode 100644
index fac885e0..00000000
Binary files a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_cull_d.ppu.o and /dev/null differ
diff --git a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_zSort.ppu.o b/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_zSort.ppu.o
deleted file mode 100644
index f1a3c176..00000000
Binary files a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_zSort.ppu.o and /dev/null differ
diff --git a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_zSort/LevelRenderer_zSort.spu.vcxproj b/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_zSort/LevelRenderer_zSort.spu.vcxproj
index 2d04a393..c44f8df7 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_zSort/LevelRenderer_zSort.spu.vcxproj
+++ b/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_zSort/LevelRenderer_zSort.spu.vcxproj
@@ -97,6 +97,9 @@
JobBin2
..\ObjFiles\Debug\$(TargetName).ppu$(ObjectExt)
+
+ powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/"
+
@@ -121,6 +124,9 @@
JobBin2
..\ObjFiles\Release\$(TargetName).ppu$(ObjectExt)
+
+ powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/"
+
@@ -146,6 +152,9 @@
..\ObjFiles\ContentPackage\$(TargetName).ppu$(ObjectExt)
Hard
+
+ powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/"
+
diff --git a/Minecraft.Client/PS3/SPU_Tasks/PerlinNoise.ppu.o b/Minecraft.Client/PS3/SPU_Tasks/PerlinNoise.ppu.o
deleted file mode 100644
index 264ca850..00000000
Binary files a/Minecraft.Client/PS3/SPU_Tasks/PerlinNoise.ppu.o and /dev/null differ
diff --git a/Minecraft.Client/PS3/SPU_Tasks/PerlinNoise/PerlinNoise.spu.vcxproj b/Minecraft.Client/PS3/SPU_Tasks/PerlinNoise/PerlinNoise.spu.vcxproj
index 2402c902..77c80b6e 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/PerlinNoise/PerlinNoise.spu.vcxproj
+++ b/Minecraft.Client/PS3/SPU_Tasks/PerlinNoise/PerlinNoise.spu.vcxproj
@@ -103,6 +103,9 @@
JobBin2
..\ObjFiles\Debug\$(TargetName).ppu$(ObjectExt)
+
+ powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/"
+
@@ -127,6 +130,9 @@
JobBin2
..\ObjFiles\Release\$(TargetName).ppu$(ObjectExt)
+
+ powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/"
+
@@ -152,6 +158,9 @@
..\ObjFiles\ContentPackage\$(TargetName).ppu$(ObjectExt)
Hard
+
+ powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/"
+
diff --git a/Minecraft.Client/PS3/SPU_Tasks/RLECompress.ppu.o b/Minecraft.Client/PS3/SPU_Tasks/RLECompress.ppu.o
deleted file mode 100644
index fd72ba7f..00000000
Binary files a/Minecraft.Client/PS3/SPU_Tasks/RLECompress.ppu.o and /dev/null differ
diff --git a/Minecraft.Client/PS3/SPU_Tasks/Renderer_TextureUpdate.ppu.o b/Minecraft.Client/PS3/SPU_Tasks/Renderer_TextureUpdate.ppu.o
deleted file mode 100644
index 010789d5..00000000
Binary files a/Minecraft.Client/PS3/SPU_Tasks/Renderer_TextureUpdate.ppu.o and /dev/null differ
diff --git a/Minecraft.Client/PS3/SPU_Tasks/Renderer_TextureUpdate/Renderer_TextureUpdate.spu.vcxproj b/Minecraft.Client/PS3/SPU_Tasks/Renderer_TextureUpdate/Renderer_TextureUpdate.spu.vcxproj
index 78bb8e6c..fc4d1ee1 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/Renderer_TextureUpdate/Renderer_TextureUpdate.spu.vcxproj
+++ b/Minecraft.Client/PS3/SPU_Tasks/Renderer_TextureUpdate/Renderer_TextureUpdate.spu.vcxproj
@@ -97,6 +97,9 @@
JobBin2
..\ObjFiles\Debug\$(TargetName).ppu$(ObjectExt)
+
+ powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/"
+
@@ -121,6 +124,9 @@
JobBin2
..\ObjFiles\Release\$(TargetName).ppu$(ObjectExt)
+
+ powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/"
+
@@ -146,6 +152,9 @@
..\ObjFiles\ContentPackage\$(TargetName).ppu$(ObjectExt)
Hard
+
+ powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/"
+
diff --git a/Minecraft.Client/PS3/SPU_Tasks/SPU_Tasks.sln b/Minecraft.Client/PS3/SPU_Tasks/SPU_Tasks.sln
index 7b7214db..d825f957 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/SPU_Tasks.sln
+++ b/Minecraft.Client/PS3/SPU_Tasks/SPU_Tasks.sln
@@ -13,60 +13,89 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LevelRenderer_FindNearestCh
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Texture_blit", "Texture_blit\Texture_blit.spu.vcxproj", "{A71AAA51-6541-4348-9814-E5FE2D36183B}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CompressedTileStorage_getData", "CompressedTileStorage_getData\CompressedTileStorage_getData.spu.vcxproj", "{ED672663-B86E-436B-9530-A6589DE02366}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GameRenderer_updateLightTexture", "GameRenderer_updateLightTexture\GameRenderer_updateLightTexture.spu.vcxproj", "{1F6ECBFE-3089-457D-8A11-5CFDC0392439}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LevelRenderer_zSort", "LevelRenderer_zSort\LevelRenderer_zSort.spu.vcxproj", "{BE7A14B2-1761-4FDF-82C0-B50F8BC9633A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PerlinNoise", "PerlinNoise\PerlinNoise.spu.vcxproj", "{4CDF5745-FCF3-474D-941B-ABBEA788E8DA}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Renderer_TextureUpdate", "Renderer_TextureUpdate\Renderer_TextureUpdate.spu.vcxproj", "{AEC81E5C-04B5-4F77-91A0-D94065F885B7}"
+EndProject
Global
- GlobalSection(TeamFoundationVersionControl) = preSolution
- SccNumberOfProjects = 7
- SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
- SccTeamFoundationServer = http://tfs_server:8080/tfs/storiespark
- SccLocalPath0 = .
- SccProjectUniqueName1 = CompressedTile\\CompressedTile.spu.vcxproj
- SccProjectName1 = CompressedTile
- SccLocalPath1 = CompressedTile
- SccProjectUniqueName2 = LevelRenderer_cull\\LevelRenderer_cull.spu.vcxproj
- SccProjectName2 = LevelRenderer_cull
- SccLocalPath2 = LevelRenderer_cull
- SccProjectUniqueName3 = ChunkUpdate\\ChunkUpdate.spu.vcxproj
- SccProjectName3 = ChunkUpdate
- SccLocalPath3 = ChunkUpdate
- SccProjectUniqueName4 = CompressedTileStorage_compress\\CompressedTileStorage_compress.spu.vcxproj
- SccProjectName4 = CompressedTileStorage_compress
- SccLocalPath4 = CompressedTileStorage_compress
- SccProjectUniqueName5 = LevelRenderer_FindNearestChunk\\LevelRenderer_FindNearestChunk.spu.vcxproj
- SccProjectName5 = LevelRenderer_FindNearestChunk
- SccLocalPath5 = LevelRenderer_FindNearestChunk
- SccProjectUniqueName6 = Texture_blit\\Texture_blit.spu.vcxproj
- SccProjectName6 = Texture_blit
- SccLocalPath6 = Texture_blit
- EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ ContentPackage|PS3 = ContentPackage|PS3
Debug|PS3 = Debug|PS3
Release|PS3 = Release|PS3
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {4B7786BE-4F10-4FAA-A75A-631DF39570DD}.ContentPackage|PS3.ActiveCfg = ContentPackage|PS3
+ {4B7786BE-4F10-4FAA-A75A-631DF39570DD}.ContentPackage|PS3.Build.0 = ContentPackage|PS3
{4B7786BE-4F10-4FAA-A75A-631DF39570DD}.Debug|PS3.ActiveCfg = Debug|PS3
{4B7786BE-4F10-4FAA-A75A-631DF39570DD}.Debug|PS3.Build.0 = Debug|PS3
{4B7786BE-4F10-4FAA-A75A-631DF39570DD}.Release|PS3.ActiveCfg = Release|PS3
{4B7786BE-4F10-4FAA-A75A-631DF39570DD}.Release|PS3.Build.0 = Release|PS3
+ {4B436D43-D35B-4E56-988A-A3543B70C8E5}.ContentPackage|PS3.ActiveCfg = ContentPackage|PS3
+ {4B436D43-D35B-4E56-988A-A3543B70C8E5}.ContentPackage|PS3.Build.0 = ContentPackage|PS3
{4B436D43-D35B-4E56-988A-A3543B70C8E5}.Debug|PS3.ActiveCfg = Debug|PS3
{4B436D43-D35B-4E56-988A-A3543B70C8E5}.Debug|PS3.Build.0 = Debug|PS3
{4B436D43-D35B-4E56-988A-A3543B70C8E5}.Release|PS3.ActiveCfg = Release|PS3
{4B436D43-D35B-4E56-988A-A3543B70C8E5}.Release|PS3.Build.0 = Release|PS3
+ {297888B4-8234-461B-9861-214988A95711}.ContentPackage|PS3.ActiveCfg = ContentPackage|PS3
+ {297888B4-8234-461B-9861-214988A95711}.ContentPackage|PS3.Build.0 = ContentPackage|PS3
{297888B4-8234-461B-9861-214988A95711}.Debug|PS3.ActiveCfg = Debug|PS3
{297888B4-8234-461B-9861-214988A95711}.Debug|PS3.Build.0 = Debug|PS3
{297888B4-8234-461B-9861-214988A95711}.Release|PS3.ActiveCfg = Release|PS3
{297888B4-8234-461B-9861-214988A95711}.Release|PS3.Build.0 = Release|PS3
+ {0FC6FCFB-7793-4EEE-8356-2C129621C67A}.ContentPackage|PS3.ActiveCfg = ContentPackage|PS3
+ {0FC6FCFB-7793-4EEE-8356-2C129621C67A}.ContentPackage|PS3.Build.0 = ContentPackage|PS3
{0FC6FCFB-7793-4EEE-8356-2C129621C67A}.Debug|PS3.ActiveCfg = Debug|PS3
{0FC6FCFB-7793-4EEE-8356-2C129621C67A}.Debug|PS3.Build.0 = Debug|PS3
{0FC6FCFB-7793-4EEE-8356-2C129621C67A}.Release|PS3.ActiveCfg = Release|PS3
{0FC6FCFB-7793-4EEE-8356-2C129621C67A}.Release|PS3.Build.0 = Release|PS3
+ {E26485AE-71A5-4785-A14D-6456FF7C4FB0}.ContentPackage|PS3.ActiveCfg = ContentPackage|PS3
+ {E26485AE-71A5-4785-A14D-6456FF7C4FB0}.ContentPackage|PS3.Build.0 = ContentPackage|PS3
{E26485AE-71A5-4785-A14D-6456FF7C4FB0}.Debug|PS3.ActiveCfg = Debug|PS3
{E26485AE-71A5-4785-A14D-6456FF7C4FB0}.Debug|PS3.Build.0 = Debug|PS3
{E26485AE-71A5-4785-A14D-6456FF7C4FB0}.Release|PS3.ActiveCfg = Release|PS3
{E26485AE-71A5-4785-A14D-6456FF7C4FB0}.Release|PS3.Build.0 = Release|PS3
+ {A71AAA51-6541-4348-9814-E5FE2D36183B}.ContentPackage|PS3.ActiveCfg = ContentPackage|PS3
+ {A71AAA51-6541-4348-9814-E5FE2D36183B}.ContentPackage|PS3.Build.0 = ContentPackage|PS3
{A71AAA51-6541-4348-9814-E5FE2D36183B}.Debug|PS3.ActiveCfg = Debug|PS3
{A71AAA51-6541-4348-9814-E5FE2D36183B}.Debug|PS3.Build.0 = Debug|PS3
{A71AAA51-6541-4348-9814-E5FE2D36183B}.Release|PS3.ActiveCfg = Release|PS3
{A71AAA51-6541-4348-9814-E5FE2D36183B}.Release|PS3.Build.0 = Release|PS3
+ {ED672663-B86E-436B-9530-A6589DE02366}.ContentPackage|PS3.ActiveCfg = ContentPackage|PS3
+ {ED672663-B86E-436B-9530-A6589DE02366}.ContentPackage|PS3.Build.0 = ContentPackage|PS3
+ {ED672663-B86E-436B-9530-A6589DE02366}.Debug|PS3.ActiveCfg = Debug|PS3
+ {ED672663-B86E-436B-9530-A6589DE02366}.Debug|PS3.Build.0 = Debug|PS3
+ {ED672663-B86E-436B-9530-A6589DE02366}.Release|PS3.ActiveCfg = Release|PS3
+ {ED672663-B86E-436B-9530-A6589DE02366}.Release|PS3.Build.0 = Release|PS3
+ {1F6ECBFE-3089-457D-8A11-5CFDC0392439}.ContentPackage|PS3.ActiveCfg = Release|PS3
+ {1F6ECBFE-3089-457D-8A11-5CFDC0392439}.ContentPackage|PS3.Build.0 = Release|PS3
+ {1F6ECBFE-3089-457D-8A11-5CFDC0392439}.Debug|PS3.ActiveCfg = Debug|PS3
+ {1F6ECBFE-3089-457D-8A11-5CFDC0392439}.Debug|PS3.Build.0 = Debug|PS3
+ {1F6ECBFE-3089-457D-8A11-5CFDC0392439}.Release|PS3.ActiveCfg = Release|PS3
+ {1F6ECBFE-3089-457D-8A11-5CFDC0392439}.Release|PS3.Build.0 = Release|PS3
+ {BE7A14B2-1761-4FDF-82C0-B50F8BC9633A}.ContentPackage|PS3.ActiveCfg = ContentPackage|PS3
+ {BE7A14B2-1761-4FDF-82C0-B50F8BC9633A}.ContentPackage|PS3.Build.0 = ContentPackage|PS3
+ {BE7A14B2-1761-4FDF-82C0-B50F8BC9633A}.Debug|PS3.ActiveCfg = Debug|PS3
+ {BE7A14B2-1761-4FDF-82C0-B50F8BC9633A}.Debug|PS3.Build.0 = Debug|PS3
+ {BE7A14B2-1761-4FDF-82C0-B50F8BC9633A}.Release|PS3.ActiveCfg = Release|PS3
+ {BE7A14B2-1761-4FDF-82C0-B50F8BC9633A}.Release|PS3.Build.0 = Release|PS3
+ {4CDF5745-FCF3-474D-941B-ABBEA788E8DA}.ContentPackage|PS3.ActiveCfg = ContentPackage|PS3
+ {4CDF5745-FCF3-474D-941B-ABBEA788E8DA}.ContentPackage|PS3.Build.0 = ContentPackage|PS3
+ {4CDF5745-FCF3-474D-941B-ABBEA788E8DA}.Debug|PS3.ActiveCfg = Debug|PS3
+ {4CDF5745-FCF3-474D-941B-ABBEA788E8DA}.Debug|PS3.Build.0 = Debug|PS3
+ {4CDF5745-FCF3-474D-941B-ABBEA788E8DA}.Release|PS3.ActiveCfg = Release|PS3
+ {4CDF5745-FCF3-474D-941B-ABBEA788E8DA}.Release|PS3.Build.0 = Release|PS3
+ {AEC81E5C-04B5-4F77-91A0-D94065F885B7}.ContentPackage|PS3.ActiveCfg = ContentPackage|PS3
+ {AEC81E5C-04B5-4F77-91A0-D94065F885B7}.ContentPackage|PS3.Build.0 = ContentPackage|PS3
+ {AEC81E5C-04B5-4F77-91A0-D94065F885B7}.Debug|PS3.ActiveCfg = Debug|PS3
+ {AEC81E5C-04B5-4F77-91A0-D94065F885B7}.Debug|PS3.Build.0 = Debug|PS3
+ {AEC81E5C-04B5-4F77-91A0-D94065F885B7}.Release|PS3.ActiveCfg = Release|PS3
+ {AEC81E5C-04B5-4F77-91A0-D94065F885B7}.Release|PS3.Build.0 = Release|PS3
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/Minecraft.Client/PS3/SPU_Tasks/Texture_blit.ppu.o b/Minecraft.Client/PS3/SPU_Tasks/Texture_blit.ppu.o
deleted file mode 100644
index 698e0fa7..00000000
Binary files a/Minecraft.Client/PS3/SPU_Tasks/Texture_blit.ppu.o and /dev/null differ
diff --git a/Minecraft.Client/PS3/SPU_Tasks/Texture_blit/Texture_blit.spu.vcxproj b/Minecraft.Client/PS3/SPU_Tasks/Texture_blit/Texture_blit.spu.vcxproj
index 0d0bb861..b074a499 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/Texture_blit/Texture_blit.spu.vcxproj
+++ b/Minecraft.Client/PS3/SPU_Tasks/Texture_blit/Texture_blit.spu.vcxproj
@@ -97,6 +97,9 @@
JobBin2
..\ObjFiles\Debug\$(TargetName).ppu$(ObjectExt)
+
+ powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/"
+
@@ -121,6 +124,9 @@
JobBin2
..\ObjFiles\Release\$(TargetName).ppu$(ObjectExt)
+
+ powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/"
+
@@ -146,6 +152,9 @@
..\ObjFiles\ContentPackage\$(TargetName).ppu$(ObjectExt)
Hard
+
+ powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/"
+
diff --git a/Minecraft.Client/PS3/SPU_Tasks/mssspurs.elf b/Minecraft.Client/PS3/SPU_Tasks/mssspurs.elf
deleted file mode 100644
index 31ade45d..00000000
Binary files a/Minecraft.Client/PS3/SPU_Tasks/mssspurs.elf and /dev/null differ