From 886d0c92a3181320ae7030e6dcc83370b95e9d15 Mon Sep 17 00:00:00 2001 From: jianmingyong Date: Sat, 15 Apr 2017 21:44:03 +0800 Subject: [PATCH] Update new build tool. --- .../SharedResources/Effects/BackdropShader.fx | 2 +- .../SharedResources/Effects/DiffuseShader.fx | 2 +- .../SharedResources/Effects/GaussianBlur.fx | 2 +- 2.5DHero_Jian_MGCB.sln | 72 ------------------- Universal Content Builder | 2 +- 5 files changed, 4 insertions(+), 76 deletions(-) diff --git a/2.5DHero/2.5DHeroContent/SharedResources/Effects/BackdropShader.fx b/2.5DHero/2.5DHeroContent/SharedResources/Effects/BackdropShader.fx index 6c79625c6..aa4cab07d 100644 --- a/2.5DHero/2.5DHeroContent/SharedResources/Effects/BackdropShader.fx +++ b/2.5DHero/2.5DHeroContent/SharedResources/Effects/BackdropShader.fx @@ -1,4 +1,4 @@ -float4x4 World; +float4x4 World; float4x4 View; float4x4 Projection; diff --git a/2.5DHero/2.5DHeroContent/SharedResources/Effects/DiffuseShader.fx b/2.5DHero/2.5DHeroContent/SharedResources/Effects/DiffuseShader.fx index 3742f792e..1d83604ae 100644 --- a/2.5DHero/2.5DHeroContent/SharedResources/Effects/DiffuseShader.fx +++ b/2.5DHero/2.5DHeroContent/SharedResources/Effects/DiffuseShader.fx @@ -1,4 +1,4 @@ -float4x4 WorldMatrix; +float4x4 WorldMatrix; float4x4 ViewMatrix; float4x4 ProjectionMatrix; diff --git a/2.5DHero/2.5DHeroContent/SharedResources/Effects/GaussianBlur.fx b/2.5DHero/2.5DHeroContent/SharedResources/Effects/GaussianBlur.fx index c548d5646..de1d5099d 100644 --- a/2.5DHero/2.5DHeroContent/SharedResources/Effects/GaussianBlur.fx +++ b/2.5DHero/2.5DHeroContent/SharedResources/Effects/GaussianBlur.fx @@ -1,4 +1,4 @@ -#define RADIUS 7 +#define RADIUS 7 #define KERNEL_SIZE (RADIUS * 2 + 1) //----------------------------------------------------------------------------- diff --git a/2.5DHero_Jian_MGCB.sln b/2.5DHero_Jian_MGCB.sln index a5c3fe28a..9fbe75b6c 100644 --- a/2.5DHero_Jian_MGCB.sln +++ b/2.5DHero_Jian_MGCB.sln @@ -14,128 +14,56 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Modules.System", "Universal EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|MonoGame 3.5.1 = Debug|MonoGame 3.5.1 - Debug|MonoGame 3.6 = Debug|MonoGame 3.6 - DebugJian|Any CPU = DebugJian|Any CPU DebugJian|MonoGame 3.5.1 = DebugJian|MonoGame 3.5.1 DebugJian|MonoGame 3.6 = DebugJian|MonoGame 3.6 - DebugNoContent|Any CPU = DebugNoContent|Any CPU DebugNoContent|MonoGame 3.5.1 = DebugNoContent|MonoGame 3.5.1 DebugNoContent|MonoGame 3.6 = DebugNoContent|MonoGame 3.6 - Release|Any CPU = Release|Any CPU - Release|MonoGame 3.5.1 = Release|MonoGame 3.5.1 - Release|MonoGame 3.6 = Release|MonoGame 3.6 - ReleaseJian|Any CPU = ReleaseJian|Any CPU ReleaseJian|MonoGame 3.5.1 = ReleaseJian|MonoGame 3.5.1 ReleaseJian|MonoGame 3.6 = ReleaseJian|MonoGame 3.6 - ReleaseNoContent|Any CPU = ReleaseNoContent|Any CPU ReleaseNoContent|MonoGame 3.5.1 = ReleaseNoContent|MonoGame 3.5.1 ReleaseNoContent|MonoGame 3.6 = ReleaseNoContent|MonoGame 3.6 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.Debug|Any CPU.ActiveCfg = DebugJian|Any CPU - {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.Debug|Any CPU.Build.0 = DebugJian|Any CPU - {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.Debug|MonoGame 3.5.1.ActiveCfg = DebugJian|Any CPU - {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.Debug|MonoGame 3.5.1.Build.0 = DebugJian|Any CPU - {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.Debug|MonoGame 3.6.ActiveCfg = DebugJian|Any CPU - {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.Debug|MonoGame 3.6.Build.0 = DebugJian|Any CPU - {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.DebugJian|Any CPU.ActiveCfg = DebugJian|Any CPU - {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.DebugJian|Any CPU.Build.0 = DebugJian|Any CPU {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.DebugJian|MonoGame 3.5.1.ActiveCfg = DebugJianNew|Any CPU {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.DebugJian|MonoGame 3.5.1.Build.0 = DebugJianNew|Any CPU {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.DebugJian|MonoGame 3.6.ActiveCfg = DebugJianNew|Any CPU {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.DebugJian|MonoGame 3.6.Build.0 = DebugJianNew|Any CPU - {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.DebugNoContent|Any CPU.ActiveCfg = DebugNoContent|Any CPU - {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.DebugNoContent|Any CPU.Build.0 = DebugNoContent|Any CPU {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.DebugNoContent|MonoGame 3.5.1.ActiveCfg = DebugNoContent|Any CPU {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.DebugNoContent|MonoGame 3.5.1.Build.0 = DebugNoContent|Any CPU {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.DebugNoContent|MonoGame 3.6.ActiveCfg = DebugNoContent|Any CPU {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.DebugNoContent|MonoGame 3.6.Build.0 = DebugNoContent|Any CPU - {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.Release|Any CPU.ActiveCfg = ReleaseJian|Any CPU - {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.Release|Any CPU.Build.0 = ReleaseJian|Any CPU - {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.Release|MonoGame 3.5.1.ActiveCfg = ReleaseJian|Any CPU - {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.Release|MonoGame 3.5.1.Build.0 = ReleaseJian|Any CPU - {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.Release|MonoGame 3.6.ActiveCfg = ReleaseJian|Any CPU - {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.Release|MonoGame 3.6.Build.0 = ReleaseJian|Any CPU - {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.ReleaseJian|Any CPU.ActiveCfg = ReleaseJian|Any CPU - {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.ReleaseJian|Any CPU.Build.0 = ReleaseJian|Any CPU {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.ReleaseJian|MonoGame 3.5.1.ActiveCfg = ReleaseJianNew|Any CPU {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.ReleaseJian|MonoGame 3.5.1.Build.0 = ReleaseJianNew|Any CPU {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.ReleaseJian|MonoGame 3.6.ActiveCfg = ReleaseJianNew|Any CPU {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.ReleaseJian|MonoGame 3.6.Build.0 = ReleaseJianNew|Any CPU - {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.ReleaseNoContent|Any CPU.ActiveCfg = ReleaseNoContent|Any CPU - {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.ReleaseNoContent|Any CPU.Build.0 = ReleaseNoContent|Any CPU {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.ReleaseNoContent|MonoGame 3.5.1.ActiveCfg = ReleaseNoContent|Any CPU {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.ReleaseNoContent|MonoGame 3.5.1.Build.0 = ReleaseNoContent|Any CPU {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.ReleaseNoContent|MonoGame 3.6.ActiveCfg = ReleaseNoContent|Any CPU {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.ReleaseNoContent|MonoGame 3.6.Build.0 = ReleaseNoContent|Any CPU - {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.Debug|Any CPU.ActiveCfg = MonoGame|x86 - {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.Debug|Any CPU.Build.0 = MonoGame|x86 - {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.Debug|MonoGame 3.5.1.ActiveCfg = MonoGame|x86 - {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.Debug|MonoGame 3.5.1.Build.0 = MonoGame|x86 - {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.Debug|MonoGame 3.6.ActiveCfg = MonoGame|x86 - {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.Debug|MonoGame 3.6.Build.0 = MonoGame|x86 - {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.DebugJian|Any CPU.ActiveCfg = MonoGame|x86 - {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.DebugJian|Any CPU.Build.0 = MonoGame|x86 {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.DebugJian|MonoGame 3.5.1.ActiveCfg = MonoGame|3.5.1 {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.DebugJian|MonoGame 3.5.1.Build.0 = MonoGame|3.5.1 {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.DebugJian|MonoGame 3.6.ActiveCfg = MonoGame|3.6 {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.DebugJian|MonoGame 3.6.Build.0 = MonoGame|3.6 - {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.DebugNoContent|Any CPU.ActiveCfg = MonoGame|x86 - {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.DebugNoContent|Any CPU.Build.0 = MonoGame|x86 {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.DebugNoContent|MonoGame 3.5.1.ActiveCfg = MonoGame|3.5.1 {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.DebugNoContent|MonoGame 3.6.ActiveCfg = MonoGame|3.6 - {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.Release|Any CPU.ActiveCfg = MonoGame|x86 - {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.Release|Any CPU.Build.0 = MonoGame|x86 - {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.Release|MonoGame 3.5.1.ActiveCfg = MonoGame|x86 - {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.Release|MonoGame 3.5.1.Build.0 = MonoGame|x86 - {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.Release|MonoGame 3.6.ActiveCfg = MonoGame|x86 - {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.Release|MonoGame 3.6.Build.0 = MonoGame|x86 - {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.ReleaseJian|Any CPU.ActiveCfg = MonoGame|x86 - {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.ReleaseJian|Any CPU.Build.0 = MonoGame|x86 {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.ReleaseJian|MonoGame 3.5.1.ActiveCfg = MonoGame|3.5.1 {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.ReleaseJian|MonoGame 3.5.1.Build.0 = MonoGame|3.5.1 {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.ReleaseJian|MonoGame 3.6.ActiveCfg = MonoGame|3.6 {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.ReleaseJian|MonoGame 3.6.Build.0 = MonoGame|3.6 - {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.ReleaseNoContent|Any CPU.ActiveCfg = MonoGame|x86 - {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.ReleaseNoContent|Any CPU.Build.0 = MonoGame|x86 {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.ReleaseNoContent|MonoGame 3.5.1.ActiveCfg = MonoGame|3.5.1 {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.ReleaseNoContent|MonoGame 3.6.ActiveCfg = MonoGame|3.6 - {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.Debug|MonoGame 3.5.1.ActiveCfg = Debug|Any CPU - {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.Debug|MonoGame 3.5.1.Build.0 = Debug|Any CPU - {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.Debug|MonoGame 3.6.ActiveCfg = Debug|Any CPU - {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.Debug|MonoGame 3.6.Build.0 = Debug|Any CPU - {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.DebugJian|Any CPU.ActiveCfg = Debug|Any CPU - {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.DebugJian|Any CPU.Build.0 = Debug|Any CPU {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.DebugJian|MonoGame 3.5.1.ActiveCfg = Debug|Any CPU {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.DebugJian|MonoGame 3.5.1.Build.0 = Debug|Any CPU {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.DebugJian|MonoGame 3.6.ActiveCfg = Debug|Any CPU {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.DebugJian|MonoGame 3.6.Build.0 = Debug|Any CPU - {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.DebugNoContent|Any CPU.ActiveCfg = Debug|Any CPU - {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.DebugNoContent|Any CPU.Build.0 = Debug|Any CPU {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.DebugNoContent|MonoGame 3.5.1.ActiveCfg = Debug|Any CPU - {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.DebugNoContent|MonoGame 3.5.1.Build.0 = Debug|Any CPU {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.DebugNoContent|MonoGame 3.6.ActiveCfg = Debug|Any CPU {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.DebugNoContent|MonoGame 3.6.Build.0 = Debug|Any CPU - {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.Release|Any CPU.Build.0 = Release|Any CPU - {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.Release|MonoGame 3.5.1.ActiveCfg = Release|Any CPU - {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.Release|MonoGame 3.5.1.Build.0 = Release|Any CPU - {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.Release|MonoGame 3.6.ActiveCfg = Release|Any CPU - {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.Release|MonoGame 3.6.Build.0 = Release|Any CPU - {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.ReleaseJian|Any CPU.ActiveCfg = Release|Any CPU - {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.ReleaseJian|Any CPU.Build.0 = Release|Any CPU {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.ReleaseJian|MonoGame 3.5.1.ActiveCfg = Release|Any CPU {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.ReleaseJian|MonoGame 3.5.1.Build.0 = Release|Any CPU {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.ReleaseJian|MonoGame 3.6.ActiveCfg = Release|Any CPU {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.ReleaseJian|MonoGame 3.6.Build.0 = Release|Any CPU - {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.ReleaseNoContent|Any CPU.ActiveCfg = Release|Any CPU - {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.ReleaseNoContent|Any CPU.Build.0 = Release|Any CPU {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.ReleaseNoContent|MonoGame 3.5.1.ActiveCfg = Release|Any CPU - {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.ReleaseNoContent|MonoGame 3.5.1.Build.0 = Release|Any CPU {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.ReleaseNoContent|MonoGame 3.6.ActiveCfg = Release|Any CPU {ABDB3EEC-AB40-466F-9FCC-D4EA21385962}.ReleaseNoContent|MonoGame 3.6.Build.0 = Release|Any CPU EndGlobalSection diff --git a/Universal Content Builder b/Universal Content Builder index f8b6f0171..853f6b54b 160000 --- a/Universal Content Builder +++ b/Universal Content Builder @@ -1 +1 @@ -Subproject commit f8b6f017112091d667202d1b7bf6effa4ce1ab88 +Subproject commit 853f6b54b18b4ae9b9d6041507e2f937d6bfec06