Changeset 2442Tweet

Timestamp:

Feb 19, 2013, 1:14:11 AM (8 years ago)

Author:

touky

Message:

tactics : first commit. Arena, characters, state machine and all the funny stuff.

Location:

trunk

Files:

• build/vs2010/Lol.sln (modified) (3 diffs)
• src/easymesh/easymesh.h (modified) (1 diff)

trunk/build/vs2010/Lol.sln

@@ -129 +129 @@
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MeshViewer", "..\..\test\MeshViewer.vcxproj", "{7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tactics", "..\..\people\touky\private\Tactics\Tactics.vcxproj", "{25493FC8-75AC-4703-AD57-AB0C2A0FB79C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tactics", "..\..\people\touky\private\Tactics\Tactics.vcxproj", "{25493FC8-75AC-4703-AD58-AB0C4A0FB79C}"
 EndProject
 Global
@@ -712 +712 @@
                 {7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}.Release|x64.Build.0 = Release|x64
                 {7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}.Release|Xbox 360.ActiveCfg = Release|x64
-                {25493FC8-75AC-4703-AD57-AB0C2A0FB79C}.Debug|Any CPU.ActiveCfg = Debug|x64
-                {25493FC8-75AC-4703-AD57-AB0C2A0FB79C}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-                {25493FC8-75AC-4703-AD57-AB0C2A0FB79C}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-                {25493FC8-75AC-4703-AD57-AB0C2A0FB79C}.Debug|PS3.ActiveCfg = Debug|x64
-                {25493FC8-75AC-4703-AD57-AB0C2A0FB79C}.Debug|Win32.ActiveCfg = Debug|Win32
-                {25493FC8-75AC-4703-AD57-AB0C2A0FB79C}.Debug|Win32.Build.0 = Debug|Win32
-                {25493FC8-75AC-4703-AD57-AB0C2A0FB79C}.Debug|x64.ActiveCfg = Debug|x64
-                {25493FC8-75AC-4703-AD57-AB0C2A0FB79C}.Debug|x64.Build.0 = Debug|x64
-                {25493FC8-75AC-4703-AD57-AB0C2A0FB79C}.Debug|Xbox 360.ActiveCfg = Debug|x64
-                {25493FC8-75AC-4703-AD57-AB0C2A0FB79C}.Release|Any CPU.ActiveCfg = Release|x64
-                {25493FC8-75AC-4703-AD57-AB0C2A0FB79C}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-                {25493FC8-75AC-4703-AD57-AB0C2A0FB79C}.Release|Mixed Platforms.Build.0 = Release|Win32
-                {25493FC8-75AC-4703-AD57-AB0C2A0FB79C}.Release|PS3.ActiveCfg = Release|x64
-                {25493FC8-75AC-4703-AD57-AB0C2A0FB79C}.Release|Win32.ActiveCfg = Release|Win32
-                {25493FC8-75AC-4703-AD57-AB0C2A0FB79C}.Release|Win32.Build.0 = Release|Win32
-                {25493FC8-75AC-4703-AD57-AB0C2A0FB79C}.Release|x64.ActiveCfg = Release|x64
-                {25493FC8-75AC-4703-AD57-AB0C2A0FB79C}.Release|x64.Build.0 = Release|x64
-                {25493FC8-75AC-4703-AD57-AB0C2A0FB79C}.Release|Xbox 360.ActiveCfg = Release|x64
+                {25493FC8-75AC-4703-AD58-AB0C4A0FB79C}.Debug|Any CPU.ActiveCfg = Debug|x64
+                {25493FC8-75AC-4703-AD58-AB0C4A0FB79C}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+                {25493FC8-75AC-4703-AD58-AB0C4A0FB79C}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+                {25493FC8-75AC-4703-AD58-AB0C4A0FB79C}.Debug|PS3.ActiveCfg = Debug|x64
+                {25493FC8-75AC-4703-AD58-AB0C4A0FB79C}.Debug|Win32.ActiveCfg = Debug|Win32
+                {25493FC8-75AC-4703-AD58-AB0C4A0FB79C}.Debug|Win32.Build.0 = Debug|Win32
+                {25493FC8-75AC-4703-AD58-AB0C4A0FB79C}.Debug|x64.ActiveCfg = Debug|x64
+                {25493FC8-75AC-4703-AD58-AB0C4A0FB79C}.Debug|x64.Build.0 = Debug|x64
+                {25493FC8-75AC-4703-AD58-AB0C4A0FB79C}.Debug|Xbox 360.ActiveCfg = Debug|x64
+                {25493FC8-75AC-4703-AD58-AB0C4A0FB79C}.Release|Any CPU.ActiveCfg = Release|x64
+                {25493FC8-75AC-4703-AD58-AB0C4A0FB79C}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+                {25493FC8-75AC-4703-AD58-AB0C4A0FB79C}.Release|Mixed Platforms.Build.0 = Release|Win32
+                {25493FC8-75AC-4703-AD58-AB0C4A0FB79C}.Release|PS3.ActiveCfg = Release|x64
+                {25493FC8-75AC-4703-AD58-AB0C4A0FB79C}.Release|Win32.ActiveCfg = Release|Win32
+                {25493FC8-75AC-4703-AD58-AB0C4A0FB79C}.Release|Win32.Build.0 = Release|Win32
+                {25493FC8-75AC-4703-AD58-AB0C4A0FB79C}.Release|x64.ActiveCfg = Release|x64
+                {25493FC8-75AC-4703-AD58-AB0C4A0FB79C}.Release|x64.Build.0 = Release|x64
+                {25493FC8-75AC-4703-AD58-AB0C4A0FB79C}.Release|Xbox 360.ActiveCfg = Release|x64
         EndGlobalSection
         GlobalSection(SolutionProperties) = preSolution
@@ -766 +766 @@
                 {587FCCE9-1D8D-4398-B8B6-E8F4E9A92233} = {B357514A-7881-422D-8358-161B689E7620}
                 {EE203B88-44CF-4859-9D42-7A5F43FECB52} = {9EA99B18-D352-47F6-BC04-A0B49CAA2772}
-                {25493FC8-75AC-4703-AD57-AB0C2A0FB79C} = {9EA99B18-D352-47F6-BC04-A0B49CAA2772}
+                {25493FC8-75AC-4703-AD58-AB0C4A0FB79C} = {9EA99B18-D352-47F6-BC04-A0B49CAA2772}
                 {A69411B3-6DE8-404E-8E70-0D3375A7492A} = {0A1651FC-322B-4B04-82CB-28E9046D9383}
                 {5A77DCDD-2CBA-43E9-8B45-00C281443F77} = {0A1651FC-322B-4B04-82CB-28E9046D9383}

trunk/src/easymesh/easymesh.h

@@ -270 +270 @@
         else
         {
+            /* unused for now, but will be if new BuildType are added. */
             TexCoordBuildType tcbt = GetTexCoordBuildType(mt);
+            UNUSED(tcbt);
             if (mt == MeshType::Triangle)
                 mt = mt;