diff --git a/clients/unity/simple_sample/.gitignore b/clients/unity/simple_sample/.gitignore new file mode 100644 index 000000000..6ea3f8947 --- /dev/null +++ b/clients/unity/simple_sample/.gitignore @@ -0,0 +1,12 @@ +*.sln +*.userprefs +*.csproj +*.pidb +*.unityproj +.DS_Store +/Library/FailedAssetImports.txt +/Library/cache/ +/Library/previews/ +/Library/ScriptAssemblies +/obj +/Temp \ No newline at end of file diff --git a/clients/unity/simple_sample/Assembly-CSharp-Editor-vs.csproj b/clients/unity/simple_sample/Assembly-CSharp-Editor-vs.csproj deleted file mode 100644 index c22a3b8ce..000000000 --- a/clients/unity/simple_sample/Assembly-CSharp-Editor-vs.csproj +++ /dev/null @@ -1,69 +0,0 @@ - - - - Debug - AnyCPU - 10.0.20506 - 2.0 - {AEF4C46B-71B7-6E0B-EF7E-154F411C7DF8} - Library - Properties - - Assembly-CSharp-Editor - v3.5 - 512 - - - true - full - false - Temp\bin\Debug\ - DEBUG;TRACE;UNITY_STANDALONE_WIN;ENABLE_MICROPHONE;ENABLE_IMAGEEFFECTS;ENABLE_WEBCAM;ENABLE_AUDIO_FMOD;UNITY_STANDALONE;ENABLE_NETWORK;ENABLE_MONO;ENABLE_PHYSICS;ENABLE_TERRAIN;ENABLE_CACHING;ENABLE_SUBSTANCE;ENABLE_GENERICS;ENABLE_CLOTH;ENABLE_MOVIES;ENABLE_AUDIO;ENABLE_WWW;ENABLE_SHADOWS;ENABLE_DUCK_TYPING;UNITY_4_1_5;UNITY_4_1;ENABLE_PROFILER;UNITY_EDITOR - prompt - 4 - 0169 - - - pdbonly - true - Temp\bin\Release\ - TRACE - prompt - 4 - 0169 - - - - - - - C:/Program Files (x86)/Unity/Editor/Data/Managed/UnityEngine.dll - - - C:/Program Files (x86)/Unity/Editor/Data/Managed/UnityEditor.dll - - - - - - - Assets\protobuf-net.dll - - - C:\Program Files (x86)\Unity\Editor\Data\Managed\UnityEditor.Graphs.dll - - - - - {AE3AFC6C-A022-3549-CF6C-7716EC410CE6} Assembly-CSharp-vs - - - - - diff --git a/clients/unity/simple_sample/Assembly-CSharp-Editor.csproj b/clients/unity/simple_sample/Assembly-CSharp-Editor.csproj deleted file mode 100644 index 0545b4be8..000000000 --- a/clients/unity/simple_sample/Assembly-CSharp-Editor.csproj +++ /dev/null @@ -1,69 +0,0 @@ - - - - Debug - AnyCPU - 10.0.20506 - 2.0 - {AEF4C46B-71B7-6E0B-EF7E-154F411C7DF8} - Library - Properties - - Assembly-CSharp-Editor - v3.5 - 512 - - - true - full - false - Temp\bin\Debug\ - DEBUG;TRACE;UNITY_STANDALONE_WIN;ENABLE_MICROPHONE;ENABLE_IMAGEEFFECTS;ENABLE_WEBCAM;ENABLE_AUDIO_FMOD;UNITY_STANDALONE;ENABLE_NETWORK;ENABLE_MONO;ENABLE_PHYSICS;ENABLE_TERRAIN;ENABLE_CACHING;ENABLE_SUBSTANCE;ENABLE_GENERICS;ENABLE_CLOTH;ENABLE_MOVIES;ENABLE_AUDIO;ENABLE_WWW;ENABLE_SHADOWS;ENABLE_DUCK_TYPING;UNITY_4_1_5;UNITY_4_1;ENABLE_PROFILER;UNITY_EDITOR - prompt - 4 - 0169 - - - pdbonly - true - Temp\bin\Release\ - TRACE - prompt - 4 - 0169 - - - - - - - C:/Program Files (x86)/Unity/Editor/Data/Managed/UnityEngine.dll - - - C:/Program Files (x86)/Unity/Editor/Data/Managed/UnityEditor.dll - - - - - - - Assets\protobuf-net.dll - - - C:\Program Files (x86)\Unity\Editor\Data\Managed\UnityEditor.Graphs.dll - - - - - {AE3AFC6C-A022-3549-CF6C-7716EC410CE6} Assembly-CSharp - - - - - diff --git a/clients/unity/simple_sample/Assembly-CSharp-Editor.pidb b/clients/unity/simple_sample/Assembly-CSharp-Editor.pidb deleted file mode 100644 index 7aee5c8f3..000000000 Binary files a/clients/unity/simple_sample/Assembly-CSharp-Editor.pidb and /dev/null differ diff --git a/clients/unity/simple_sample/Assembly-CSharp-vs.csproj b/clients/unity/simple_sample/Assembly-CSharp-vs.csproj deleted file mode 100644 index 0ad90a354..000000000 --- a/clients/unity/simple_sample/Assembly-CSharp-vs.csproj +++ /dev/null @@ -1,73 +0,0 @@ - - - - Debug - AnyCPU - 10.0.20506 - 2.0 - {AE3AFC6C-A022-3549-CF6C-7716EC410CE6} - Library - Properties - - Assembly-CSharp - v3.5 - 512 - - - true - full - false - Temp\bin\Debug\ - DEBUG;TRACE;UNITY_STANDALONE_WIN;ENABLE_MICROPHONE;ENABLE_IMAGEEFFECTS;ENABLE_WEBCAM;ENABLE_AUDIO_FMOD;UNITY_STANDALONE;ENABLE_NETWORK;ENABLE_MONO;ENABLE_PHYSICS;ENABLE_TERRAIN;ENABLE_CACHING;ENABLE_SUBSTANCE;ENABLE_GENERICS;ENABLE_CLOTH;ENABLE_MOVIES;ENABLE_AUDIO;ENABLE_WWW;ENABLE_SHADOWS;ENABLE_DUCK_TYPING;UNITY_4_1_5;UNITY_4_1;ENABLE_PROFILER;UNITY_EDITOR - prompt - 4 - 0169 - - - pdbonly - true - Temp\bin\Release\ - TRACE - prompt - 4 - 0169 - - - - - - - C:/Program Files (x86)/Unity/Editor/Data/Managed/UnityEngine.dll - - - C:/Program Files (x86)/Unity/Editor/Data/Managed/UnityEditor.dll - - - - - - - - - - - - - - - - - - Assets\protobuf-net.dll - - - - - - diff --git a/clients/unity/simple_sample/Assembly-CSharp.csproj b/clients/unity/simple_sample/Assembly-CSharp.csproj deleted file mode 100644 index 0ad90a354..000000000 --- a/clients/unity/simple_sample/Assembly-CSharp.csproj +++ /dev/null @@ -1,73 +0,0 @@ - - - - Debug - AnyCPU - 10.0.20506 - 2.0 - {AE3AFC6C-A022-3549-CF6C-7716EC410CE6} - Library - Properties - - Assembly-CSharp - v3.5 - 512 - - - true - full - false - Temp\bin\Debug\ - DEBUG;TRACE;UNITY_STANDALONE_WIN;ENABLE_MICROPHONE;ENABLE_IMAGEEFFECTS;ENABLE_WEBCAM;ENABLE_AUDIO_FMOD;UNITY_STANDALONE;ENABLE_NETWORK;ENABLE_MONO;ENABLE_PHYSICS;ENABLE_TERRAIN;ENABLE_CACHING;ENABLE_SUBSTANCE;ENABLE_GENERICS;ENABLE_CLOTH;ENABLE_MOVIES;ENABLE_AUDIO;ENABLE_WWW;ENABLE_SHADOWS;ENABLE_DUCK_TYPING;UNITY_4_1_5;UNITY_4_1;ENABLE_PROFILER;UNITY_EDITOR - prompt - 4 - 0169 - - - pdbonly - true - Temp\bin\Release\ - TRACE - prompt - 4 - 0169 - - - - - - - C:/Program Files (x86)/Unity/Editor/Data/Managed/UnityEngine.dll - - - C:/Program Files (x86)/Unity/Editor/Data/Managed/UnityEditor.dll - - - - - - - - - - - - - - - - - - Assets\protobuf-net.dll - - - - - - diff --git a/clients/unity/simple_sample/Assembly-CSharp.pidb b/clients/unity/simple_sample/Assembly-CSharp.pidb deleted file mode 100644 index b50da3cb0..000000000 Binary files a/clients/unity/simple_sample/Assembly-CSharp.pidb and /dev/null differ diff --git a/clients/unity/simple_sample/Assets/DFHack/isoworldremote.pb.cs b/clients/unity/simple_sample/Assets/DFHack/isoworldremote.pb.cs index 46c85e370..95ef929f9 100644 --- a/clients/unity/simple_sample/Assets/DFHack/isoworldremote.pb.cs +++ b/clients/unity/simple_sample/Assets/DFHack/isoworldremote.pb.cs @@ -10,6 +10,37 @@ // Generated from: isoworldremote.proto namespace isoworldremote { + [global::System.Serializable, global::ProtoBuf.ProtoContract(Name=@"ColorDefinition")] + public partial class ColorDefinition : global::ProtoBuf.IExtensible + { + public ColorDefinition() {} + + private int _red; + [global::ProtoBuf.ProtoMember(1, IsRequired = true, Name=@"red", DataFormat = global::ProtoBuf.DataFormat.TwosComplement)] + public int red + { + get { return _red; } + set { _red = value; } + } + private int _green; + [global::ProtoBuf.ProtoMember(2, IsRequired = true, Name=@"green", DataFormat = global::ProtoBuf.DataFormat.TwosComplement)] + public int green + { + get { return _green; } + set { _green = value; } + } + private int _blue; + [global::ProtoBuf.ProtoMember(3, IsRequired = true, Name=@"blue", DataFormat = global::ProtoBuf.DataFormat.TwosComplement)] + public int blue + { + get { return _blue; } + set { _blue = value; } + } + private global::ProtoBuf.IExtension extensionObject; + global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) + { return global::ProtoBuf.Extensible.GetExtensionObject(ref extensionObject, createIfMissing); } + } + [global::System.Serializable, global::ProtoBuf.ProtoContract(Name=@"EmbarkTileLayer")] public partial class EmbarkTileLayer : global::ProtoBuf.IExtensible { @@ -36,6 +67,13 @@ namespace isoworldremote get { return _tile_shape_table; } } + private readonly global::System.Collections.Generic.List _tile_color_table = new global::System.Collections.Generic.List(); + [global::ProtoBuf.ProtoMember(7, Name=@"tile_color_table", DataFormat = global::ProtoBuf.DataFormat.Default)] + public global::System.Collections.Generic.List tile_color_table + { + get { return _tile_color_table; } + } + private global::ProtoBuf.IExtension extensionObject; global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) { return global::ProtoBuf.Extensible.GetExtensionObject(ref extensionObject, createIfMissing); } @@ -306,7 +344,13 @@ namespace isoworldremote WALL = 3, [global::ProtoBuf.ProtoEnum(Name=@"FLOOR", Value=4)] - FLOOR = 4 + FLOOR = 4, + + [global::ProtoBuf.ProtoEnum(Name=@"RAMP_UP", Value=5)] + RAMP_UP = 5, + + [global::ProtoBuf.ProtoEnum(Name=@"RAMP_DOWN", Value=6)] + RAMP_DOWN = 6 } } \ No newline at end of file diff --git a/clients/unity/simple_sample/Assets/Editor/MapBlockEditor.cs b/clients/unity/simple_sample/Assets/Editor/MapBlockEditor.cs index c4d5c6a1a..db9a093df 100644 --- a/clients/unity/simple_sample/Assets/Editor/MapBlockEditor.cs +++ b/clients/unity/simple_sample/Assets/Editor/MapBlockEditor.cs @@ -65,6 +65,12 @@ public class MapBlockEditor : Editor case BasicShape.OPEN: buttonIcon = "\u00A0"; break; + case BasicShape.RAMP_UP: + buttonIcon = "▲"; + break; + case BasicShape.RAMP_DOWN: + buttonIcon = "▼"; + break; default: buttonIcon = "?"; break; diff --git a/clients/unity/simple_sample/Assets/MapGen/MapBlock.cs b/clients/unity/simple_sample/Assets/MapGen/MapBlock.cs index 6d8f7014a..489299fdc 100644 --- a/clients/unity/simple_sample/Assets/MapGen/MapBlock.cs +++ b/clients/unity/simple_sample/Assets/MapGen/MapBlock.cs @@ -6,6 +6,7 @@ using isoworldremote; public class MapBlock : MonoBehaviour { public static float floorHeight = 0.1f; + public static float rampDistance = 2.0f; DFCoord coordinates; GameMap parent; @@ -148,17 +149,68 @@ public class MapBlock : MonoBehaviour return GetSingleTile(relativePosition); } + enum Layer + { + Base, + Floor, + Top + } + + float convertDistanceToOffset(float input) + { + if (input == float.MaxValue) + return 0; + input = Mathf.Pow(input, 0.5f); + input = (rampDistance - input) / rampDistance; + if (input < 0) + return 0; + return Mathf.Sin(input * Mathf.PI / 4.0f); + } + + Vector3 AdjustForRamps(Vector3 input, Layer layer = Layer.Floor) + { + float nearestUpRamp = float.MaxValue; + float nearestDownRamp = float.MaxValue; + for (int x = (int)(input.x - rampDistance); x < (int)(input.x + rampDistance + 1.0f); x++) + for (int y = (int)(-input.z - rampDistance); y < (int)(-input.z + rampDistance + 1.0f); y++) + { + BasicShape tile = GetSingleTile(new DFCoord2d(x, y)); + if(tile == BasicShape.RAMP_UP || tile == BasicShape.RAMP_DOWN) + { + float tempDistance = Mathf.Pow(input.x - x, 2) + Mathf.Pow(-input.z - y, 2); + if (tile == BasicShape.RAMP_DOWN && tempDistance < nearestDownRamp) + nearestDownRamp = tempDistance; + if (tile == BasicShape.RAMP_UP && tempDistance < nearestUpRamp) + nearestUpRamp = tempDistance; + } + } + + nearestUpRamp = convertDistanceToOffset(nearestUpRamp); + nearestDownRamp = convertDistanceToOffset(nearestDownRamp); + + if (layer == Layer.Floor) + input.y = input.y + nearestUpRamp - nearestDownRamp; + if (layer == Layer.Top) + input.y = input.y - nearestUpRamp; + + return input; + } + void AddSideFace(DFCoord2d position, FaceDirection direction) { + Layer topLayer = Layer.Top; + Layer bottomLayer = Layer.Base; float currentFloorHeight = -0.5f; float adjacentFloorHeight = -0.5f; switch (GetSingleTile(position)) { case BasicShape.WALL: currentFloorHeight = 0.5f; + topLayer = Layer.Top; break; case BasicShape.FLOOR: currentFloorHeight = floorHeight - 0.5f; + topLayer = Layer.Floor; break; default: break; @@ -167,9 +219,11 @@ public class MapBlock : MonoBehaviour { case BasicShape.WALL: adjacentFloorHeight = 0.5f; + bottomLayer = Layer.Top; break; case BasicShape.FLOOR: adjacentFloorHeight = floorHeight - 0.5f; + bottomLayer = Layer.Floor; break; default: break; @@ -181,31 +235,31 @@ public class MapBlock : MonoBehaviour switch (direction) { case FaceDirection.North: - finalVertices.Add(new Vector3(position.x + 0.5f, currentFloorHeight, -(position.y - 0.5f))); - finalVertices.Add(new Vector3(position.x - 0.5f, currentFloorHeight, -(position.y - 0.5f))); - finalVertices.Add(new Vector3(position.x + 0.5f, adjacentFloorHeight, -(position.y - 0.5f))); - finalVertices.Add(new Vector3(position.x - 0.5f, adjacentFloorHeight, -(position.y - 0.5f))); + finalVertices.Add(AdjustForRamps(new Vector3(position.x + 0.5f, currentFloorHeight, -(position.y - 0.5f)), topLayer)); + finalVertices.Add(AdjustForRamps(new Vector3(position.x - 0.5f, currentFloorHeight, -(position.y - 0.5f)), topLayer)); + finalVertices.Add(AdjustForRamps(new Vector3(position.x + 0.5f, adjacentFloorHeight, -(position.y - 0.5f)), bottomLayer)); + finalVertices.Add(AdjustForRamps(new Vector3(position.x - 0.5f, adjacentFloorHeight, -(position.y - 0.5f)), bottomLayer)); uvPos = position.x; break; case FaceDirection.South: - finalVertices.Add(new Vector3(position.x - 0.5f, currentFloorHeight, -(position.y + 0.5f))); - finalVertices.Add(new Vector3(position.x + 0.5f, currentFloorHeight, -(position.y + 0.5f))); - finalVertices.Add(new Vector3(position.x - 0.5f, adjacentFloorHeight, -(position.y + 0.5f))); - finalVertices.Add(new Vector3(position.x + 0.5f, adjacentFloorHeight, -(position.y + 0.5f))); + finalVertices.Add(AdjustForRamps(new Vector3(position.x - 0.5f, currentFloorHeight, -(position.y + 0.5f)), topLayer)); + finalVertices.Add(AdjustForRamps(new Vector3(position.x + 0.5f, currentFloorHeight, -(position.y + 0.5f)), topLayer)); + finalVertices.Add(AdjustForRamps(new Vector3(position.x - 0.5f, adjacentFloorHeight, -(position.y + 0.5f)), bottomLayer)); + finalVertices.Add(AdjustForRamps(new Vector3(position.x + 0.5f, adjacentFloorHeight, -(position.y + 0.5f)), bottomLayer)); uvPos = 16 - position.x; break; case FaceDirection.East: - finalVertices.Add(new Vector3(position.x + 0.5f, currentFloorHeight, -(position.y + 0.5f))); - finalVertices.Add(new Vector3(position.x + 0.5f, currentFloorHeight, -(position.y - 0.5f))); - finalVertices.Add(new Vector3(position.x + 0.5f, adjacentFloorHeight, -(position.y + 0.5f))); - finalVertices.Add(new Vector3(position.x + 0.5f, adjacentFloorHeight, -(position.y - 0.5f))); + finalVertices.Add(AdjustForRamps(new Vector3(position.x + 0.5f, currentFloorHeight, -(position.y + 0.5f)), topLayer)); + finalVertices.Add(AdjustForRamps(new Vector3(position.x + 0.5f, currentFloorHeight, -(position.y - 0.5f)), topLayer)); + finalVertices.Add(AdjustForRamps(new Vector3(position.x + 0.5f, adjacentFloorHeight, -(position.y + 0.5f)), bottomLayer)); + finalVertices.Add(AdjustForRamps(new Vector3(position.x + 0.5f, adjacentFloorHeight, -(position.y - 0.5f)), bottomLayer)); uvPos = position.y; break; case FaceDirection.West: - finalVertices.Add(new Vector3(position.x - 0.5f, currentFloorHeight, -(position.y - 0.5f))); - finalVertices.Add(new Vector3(position.x - 0.5f, currentFloorHeight, -(position.y + 0.5f))); - finalVertices.Add(new Vector3(position.x - 0.5f, adjacentFloorHeight, -(position.y - 0.5f))); - finalVertices.Add(new Vector3(position.x - 0.5f, adjacentFloorHeight, -(position.y + 0.5f))); + finalVertices.Add(AdjustForRamps(new Vector3(position.x - 0.5f, currentFloorHeight, -(position.y - 0.5f)), topLayer)); + finalVertices.Add(AdjustForRamps(new Vector3(position.x - 0.5f, currentFloorHeight, -(position.y + 0.5f)), topLayer)); + finalVertices.Add(AdjustForRamps(new Vector3(position.x - 0.5f, adjacentFloorHeight, -(position.y - 0.5f)), bottomLayer)); + finalVertices.Add(AdjustForRamps(new Vector3(position.x - 0.5f, adjacentFloorHeight, -(position.y + 0.5f)), bottomLayer)); uvPos = 16 - position.y; break; default: @@ -232,14 +286,19 @@ public class MapBlock : MonoBehaviour void AddTopFace(DFCoord2d position, float height) { + Layer layer = Layer.Base; + if (GetSingleTile(position) == BasicShape.FLOOR) + layer = Layer.Floor; + else if (GetSingleTile(position) == BasicShape.WALL) + layer = Layer.Top; height -= 0.5f; //Todo: Weld vertices that should be welded //On second though, not with vertex colors there. int startindex = finalVertices.Count; - finalVertices.Add(new Vector3(position.x - 0.5f, height, -(position.y - 0.5f))); - finalVertices.Add(new Vector3(position.x + 0.5f, height, -(position.y - 0.5f))); - finalVertices.Add(new Vector3(position.x - 0.5f, height, -(position.y + 0.5f))); - finalVertices.Add(new Vector3(position.x + 0.5f, height, -(position.y + 0.5f))); + finalVertices.Add(AdjustForRamps(new Vector3(position.x - 0.5f, height, -(position.y - 0.5f)), layer)); + finalVertices.Add(AdjustForRamps(new Vector3(position.x + 0.5f, height, -(position.y - 0.5f)), layer)); + finalVertices.Add(AdjustForRamps(new Vector3(position.x - 0.5f, height, -(position.y + 0.5f)), layer)); + finalVertices.Add(AdjustForRamps(new Vector3(position.x + 0.5f, height, -(position.y + 0.5f)), layer)); finalUVs.Add(new Vector2((float)(position.x) / 16.0f, -(float)(position.y) / 16.0f)); finalUVs.Add(new Vector2((float)(position.x + 1) / 16.0f, -(float)(position.y) / 16.0f)); diff --git a/clients/unity/simple_sample/Assets/Start.unity b/clients/unity/simple_sample/Assets/Start.unity index 71c631052..c8dc84353 100644 Binary files a/clients/unity/simple_sample/Assets/Start.unity and b/clients/unity/simple_sample/Assets/Start.unity differ diff --git a/clients/unity/simple_sample/Library/FailedAssetImports.txt b/clients/unity/simple_sample/Library/FailedAssetImports.txt deleted file mode 100644 index e69de29bb..000000000 diff --git a/clients/unity/simple_sample/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll b/clients/unity/simple_sample/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll deleted file mode 100644 index 00da08664..000000000 Binary files a/clients/unity/simple_sample/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll and /dev/null differ diff --git a/clients/unity/simple_sample/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb b/clients/unity/simple_sample/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb deleted file mode 100644 index 6efbc8d17..000000000 Binary files a/clients/unity/simple_sample/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb and /dev/null differ diff --git a/clients/unity/simple_sample/Library/ScriptAssemblies/Assembly-CSharp.dll b/clients/unity/simple_sample/Library/ScriptAssemblies/Assembly-CSharp.dll deleted file mode 100644 index 9a5761e46..000000000 Binary files a/clients/unity/simple_sample/Library/ScriptAssemblies/Assembly-CSharp.dll and /dev/null differ diff --git a/clients/unity/simple_sample/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb b/clients/unity/simple_sample/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb deleted file mode 100644 index 2c961426f..000000000 Binary files a/clients/unity/simple_sample/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb and /dev/null differ diff --git a/clients/unity/simple_sample/Library/ScriptAssemblies/CompilationCompleted.txt b/clients/unity/simple_sample/Library/ScriptAssemblies/CompilationCompleted.txt deleted file mode 100644 index d25ad0dae..000000000 --- a/clients/unity/simple_sample/Library/ScriptAssemblies/CompilationCompleted.txt +++ /dev/null @@ -1 +0,0 @@ -Completed diff --git a/clients/unity/simple_sample/Library/assetDatabase3 b/clients/unity/simple_sample/Library/assetDatabase3 index 79a8b56cc..819bca161 100644 Binary files a/clients/unity/simple_sample/Library/assetDatabase3 and b/clients/unity/simple_sample/Library/assetDatabase3 differ diff --git a/clients/unity/simple_sample/Library/metadata/49/49176d7675a998345966feca21555311 b/clients/unity/simple_sample/Library/metadata/49/49176d7675a998345966feca21555311 index 35b1bc928..f1ac8e88a 100644 Binary files a/clients/unity/simple_sample/Library/metadata/49/49176d7675a998345966feca21555311 and b/clients/unity/simple_sample/Library/metadata/49/49176d7675a998345966feca21555311 differ diff --git a/clients/unity/simple_sample/Library/metadata/6e/6e1305e96d61f204f8229e0a0cb7f8c1 b/clients/unity/simple_sample/Library/metadata/6e/6e1305e96d61f204f8229e0a0cb7f8c1 index a5f934d8f..4293ba525 100644 Binary files a/clients/unity/simple_sample/Library/metadata/6e/6e1305e96d61f204f8229e0a0cb7f8c1 and b/clients/unity/simple_sample/Library/metadata/6e/6e1305e96d61f204f8229e0a0cb7f8c1 differ diff --git a/clients/unity/simple_sample/Library/metadata/8d/8d11b6dacbf85e24ead2e95cafce40fd b/clients/unity/simple_sample/Library/metadata/8d/8d11b6dacbf85e24ead2e95cafce40fd index e5cccaf31..4be65887e 100644 Binary files a/clients/unity/simple_sample/Library/metadata/8d/8d11b6dacbf85e24ead2e95cafce40fd and b/clients/unity/simple_sample/Library/metadata/8d/8d11b6dacbf85e24ead2e95cafce40fd differ diff --git a/clients/unity/simple_sample/simple_sample-csharp.sln b/clients/unity/simple_sample/simple_sample-csharp.sln deleted file mode 100644 index e72b09594..000000000 --- a/clients/unity/simple_sample/simple_sample-csharp.sln +++ /dev/null @@ -1,45 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2008 - -Project("{277888DF-B633-98F9-AF58-18CFF25BE876}") = "simple_sample", "Assembly-CSharp-vs.csproj", "{AE3AFC6C-A022-3549-CF6C-7716EC410CE6}" -EndProject -Project("{277888DF-B633-98F9-AF58-18CFF25BE876}") = "simple_sample", "Assembly-CSharp-Editor-vs.csproj", "{AEF4C46B-71B7-6E0B-EF7E-154F411C7DF8}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {AE3AFC6C-A022-3549-CF6C-7716EC410CE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AE3AFC6C-A022-3549-CF6C-7716EC410CE6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AE3AFC6C-A022-3549-CF6C-7716EC410CE6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AE3AFC6C-A022-3549-CF6C-7716EC410CE6}.Release|Any CPU.Build.0 = Release|Any CPU - {AEF4C46B-71B7-6E0B-EF7E-154F411C7DF8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AEF4C46B-71B7-6E0B-EF7E-154F411C7DF8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AEF4C46B-71B7-6E0B-EF7E-154F411C7DF8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AEF4C46B-71B7-6E0B-EF7E-154F411C7DF8}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(MonoDevelopProperties) = preSolution - StartupItem = Assembly-CSharp.csproj - Policies = $0 - $0.TextStylePolicy = $1 - $1.inheritsSet = null - $1.scope = text/x-csharp - $0.CSharpFormattingPolicy = $2 - $2.inheritsSet = Mono - $2.inheritsScope = text/x-csharp - $2.scope = text/x-csharp - $0.TextStylePolicy = $3 - $3.FileWidth = 120 - $3.TabWidth = 4 - $3.EolMarker = Unix - $3.inheritsSet = Mono - $3.inheritsScope = text/plain - $3.scope = text/plain - EndGlobalSection - -EndGlobal diff --git a/clients/unity/simple_sample/simple_sample.sln b/clients/unity/simple_sample/simple_sample.sln deleted file mode 100644 index 98aaf602e..000000000 --- a/clients/unity/simple_sample/simple_sample.sln +++ /dev/null @@ -1,45 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2008 - -Project("{277888DF-B633-98F9-AF58-18CFF25BE876}") = "simple_sample", "Assembly-CSharp.csproj", "{AE3AFC6C-A022-3549-CF6C-7716EC410CE6}" -EndProject -Project("{277888DF-B633-98F9-AF58-18CFF25BE876}") = "simple_sample", "Assembly-CSharp-Editor.csproj", "{AEF4C46B-71B7-6E0B-EF7E-154F411C7DF8}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {AE3AFC6C-A022-3549-CF6C-7716EC410CE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AE3AFC6C-A022-3549-CF6C-7716EC410CE6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AE3AFC6C-A022-3549-CF6C-7716EC410CE6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AE3AFC6C-A022-3549-CF6C-7716EC410CE6}.Release|Any CPU.Build.0 = Release|Any CPU - {AEF4C46B-71B7-6E0B-EF7E-154F411C7DF8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AEF4C46B-71B7-6E0B-EF7E-154F411C7DF8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AEF4C46B-71B7-6E0B-EF7E-154F411C7DF8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AEF4C46B-71B7-6E0B-EF7E-154F411C7DF8}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(MonoDevelopProperties) = preSolution - StartupItem = Assembly-CSharp.csproj - Policies = $0 - $0.TextStylePolicy = $1 - $1.inheritsSet = null - $1.scope = text/x-csharp - $0.CSharpFormattingPolicy = $2 - $2.inheritsSet = Mono - $2.inheritsScope = text/x-csharp - $2.scope = text/x-csharp - $0.TextStylePolicy = $3 - $3.FileWidth = 120 - $3.TabWidth = 4 - $3.EolMarker = Unix - $3.inheritsSet = Mono - $3.inheritsScope = text/plain - $3.scope = text/plain - EndGlobalSection - -EndGlobal diff --git a/clients/unity/simple_sample/simple_sample.userprefs b/clients/unity/simple_sample/simple_sample.userprefs deleted file mode 100644 index 8a063dbf7..000000000 --- a/clients/unity/simple_sample/simple_sample.userprefs +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/plugins/proto/isoworldremote.proto b/plugins/proto/isoworldremote.proto index 295cd03f1..811df6dfa 100644 --- a/plugins/proto/isoworldremote.proto +++ b/plugins/proto/isoworldremote.proto @@ -37,7 +37,7 @@ message EmbarkTileLayer { repeated BasicMaterial mat_type_table = 4 [packed=true]; repeated int32 mat_subtype_table = 5 [packed=true]; repeated BasicShape tile_shape_table = 6 [packed=true]; - repeated ColorDefinition tile_color_table = 7 [packed=true]; + repeated ColorDefinition tile_color_table = 7; } message EmbarkTile {