diff --git a/Documentation/Presentation.pptx b/Documentation/Presentation.pptx new file mode 100644 index 0000000..40361d6 Binary files /dev/null and b/Documentation/Presentation.pptx differ diff --git a/Game/Assets/Data/Textures/Buildings/11402482_938759372854962_4809142899041178042_o.jpg b/Game/Assets/Data/Textures/Buildings/11402482_938759372854962_4809142899041178042_o.jpg new file mode 100644 index 0000000..b273f0b Binary files /dev/null and b/Game/Assets/Data/Textures/Buildings/11402482_938759372854962_4809142899041178042_o.jpg differ diff --git a/Game/Assets/Data/Textures/Buildings/11402482_938759372854962_4809142899041178042_o.jpg.meta b/Game/Assets/Data/Textures/Buildings/11402482_938759372854962_4809142899041178042_o.jpg.meta new file mode 100644 index 0000000..2c32d3b --- /dev/null +++ b/Game/Assets/Data/Textures/Buildings/11402482_938759372854962_4809142899041178042_o.jpg.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: 69024b4090082e64d9859f21d665fc3c +timeCreated: 1435691986 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + textureType: -1 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/Game-csharp.sln b/Game/Game-csharp.sln index 9012803..9bd2af2 100644 --- a/Game/Game-csharp.sln +++ b/Game/Game-csharp.sln @@ -23,7 +23,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(MonoDevelopProperties) = preSolution + GlobalSection(MonoDevelopProperties) = preSolution StartupItem = Assembly-CSharp.csproj Policies = $0 $0.TextStylePolicy = $1 diff --git a/Game/Game.sln b/Game/Game.sln index 584f99b..70b9727 100644 --- a/Game/Game.sln +++ b/Game/Game.sln @@ -29,7 +29,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(MonoDevelopProperties) = preSolution + GlobalSection(MonoDevelopProperties) = preSolution StartupItem = Assembly-CSharp.csproj Policies = $0 $0.TextStylePolicy = $1 diff --git a/Game/TransportGame_Data/output_log.txt b/Game/TransportGame_Data/output_log.txt index f3a55a7..4f64e2b 100644 --- a/Game/TransportGame_Data/output_log.txt +++ b/Game/TransportGame_Data/output_log.txt @@ -16,7 +16,7 @@ Platform assembly: C:\Users\Tibi\Google Drive\FacultateCY\$ Licenta\Game\Transpo Loading C:\Users\Tibi\Google Drive\FacultateCY\$ Licenta\Game\TransportGame_Data\Managed\Assembly-UnityScript-firstpass.dll into Unity Child Domain Platform assembly: C:\Users\Tibi\Google Drive\FacultateCY\$ Licenta\Game\TransportGame_Data\Managed\UnityEngine.UI.dll (this message is harmless) Loading C:\Users\Tibi\Google Drive\FacultateCY\$ Licenta\Game\TransportGame_Data\Managed\UnityEngine.UI.dll into Unity Child Domain -- Completed reload, in 0.045 seconds +- Completed reload, in 0.099 seconds desktop: 1920x1080 60Hz; virtual: 1920x1080 at 0,0 Initializing input. Input initialized. @@ -62,7 +62,7 @@ InitializeScript:Start() (at C:\Users\Tibi\Google Drive\FacultateCY\$ Licenta\Ga (Filename: C:/Users/Tibi/Google Drive/FacultateCY/$ Licenta/Game/Assets/Scripts/Utils/Logger.cs Line: 66) -Picked biome: Mountain +Picked biome: Grassland (Filename: C:/buildslave/unity/build/artifacts/generated/common/runtime/UnityEngineDebug.gen.cpp Line: 56) @@ -84,3 +84,14 @@ TransportGame.Utils.Logger:Info(String, Object[]) (at C:\Users\Tibi\Google Drive (Filename: C:/Users/Tibi/Google Drive/FacultateCY/$ Licenta/Game/Assets/Scripts/Utils/Logger.cs Line: 66) +Finished generating road mesh. +UnityEngine.Debug:Internal_Log(Int32, String, Object) +UnityEngine.Debug:Log(Object) +TransportGame.Utils.Logger:Log(Level, String, Object[]) (at C:\Users\Tibi\Google Drive\FacultateCY\$ Licenta\Game\Assets\Scripts\Utils\Logger.cs:66) +TransportGame.Utils.Logger:Info(String, Object[]) (at C:\Users\Tibi\Google Drive\FacultateCY\$ Licenta\Game\Assets\Scripts\Utils\Logger.cs:74) +TransportGame.Unity.c__Iterator2:MoveNext() (at C:\Users\Tibi\Google Drive\FacultateCY\$ Licenta\Game\Assets\Scripts\Unity\RoadMeshGenerator.cs:95) +TransportGame.Utils.c__Iterator8:MoveNext() (at C:\Users\Tibi\Google Drive\FacultateCY\$ Licenta\Game\Assets\Scripts\Utils\Task.cs:82) +c__Iterator3:MoveNext() (at C:\Users\Tibi\Google Drive\FacultateCY\$ Licenta\Game\Assets\Scripts\Unity\TerrainGeneratorScript.cs:146) + +(Filename: C:/Users/Tibi/Google Drive/FacultateCY/$ Licenta/Game/Assets/Scripts/Utils/Logger.cs Line: 66) + diff --git a/Tools/MapViewer/MapViewer/Business/MapRenderer.cs b/Tools/MapViewer/MapViewer/Business/MapRenderer.cs index 49060e8..4c94943 100644 --- a/Tools/MapViewer/MapViewer/Business/MapRenderer.cs +++ b/Tools/MapViewer/MapViewer/Business/MapRenderer.cs @@ -51,7 +51,7 @@ namespace TransportGame.MapViewer /// /// /// - public Bitmap24 Render(Map map, Layers layers = Layers.All) + public Bitmap24 Render(CityMap map, Layers layers = Layers.All) { lock (this) { @@ -60,7 +60,7 @@ namespace TransportGame.MapViewer // Elevation, population DrawPixels(bitmap, map, (layers & Layers.Elevation) > 0, (layers & Layers.Population) > 0); - + // Roads if ((layers & Layers.RoadArticulations) > 0) DrawRoads(bitmap, map); @@ -80,7 +80,7 @@ namespace TransportGame.MapViewer return Color.FromScRgb(A, R, G, B); } - private void DrawPixels(Bitmap24 bitmap, Map map, bool elevation, bool population) + private void DrawPixels(Bitmap24 bitmap, CityMap map, bool elevation, bool population) { for (int x = 0; x < bitmap.Width; x++) for (int y = 0; y < bitmap.Height; y++) @@ -120,7 +120,7 @@ namespace TransportGame.MapViewer } } - private void DrawRoads(Bitmap24 bitmap, Map map) + private void DrawRoads(Bitmap24 bitmap, CityMap map) { // Draw road segments foreach (var pair in map.RoadNetwork.ArticulationSegments) diff --git a/Tools/MapViewer/MapViewer/MainWindow.xaml.cs b/Tools/MapViewer/MapViewer/MainWindow.xaml.cs index 27dafe1..935d519 100644 --- a/Tools/MapViewer/MapViewer/MainWindow.xaml.cs +++ b/Tools/MapViewer/MapViewer/MainWindow.xaml.cs @@ -24,12 +24,12 @@ namespace TransportGame.MapViewer #region Map property - private Map _map; + private CityMap _map; /// /// Gets the map displayed by the map viewer. /// - public Map Map + public CityMap Map { get { diff --git a/Tools/MapViewer/MapViewer/Storage/MapStorage.cs b/Tools/MapViewer/MapViewer/Storage/MapStorage.cs index 55b223b..1af471f 100644 --- a/Tools/MapViewer/MapViewer/Storage/MapStorage.cs +++ b/Tools/MapViewer/MapViewer/Storage/MapStorage.cs @@ -12,9 +12,9 @@ namespace TransportGame.MapViewer.Storage { public static class MapStorage { - public static Map Read(string file) + public static CityMap Read(string file) { - return SerializationHelper.DeserializeXml(file); + return SerializationHelper.DeserializeXml(file); } } }