chibicitiberiu/city-generation
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added presentation

Browse Source
This commit is contained in:
Tiberiu Chibici 2015-07-01 10:03:14 +03:00
parent 6b008cfa9a
commit 566a993bad
9 changed files with 78 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Documentation/Presentation.pptx Normal file
View File

Binary file not shown.

BIN
Game/Assets/Data/Textures/Buildings/11402482_938759372854962_4809142899041178042_o.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 502 KiB

55
Game/Assets/Data/Textures/Buildings/11402482_938759372854962_4809142899041178042_o.jpg.meta Normal file
View File

@ -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:

2
Game/Game-csharp.sln
View File

@ -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

2
Game/Game.sln
View File

@ -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

15
Game/TransportGame_Data/output_log.txt
View File

@ -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
<RI> Initializing input.
<RI> 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.<Generate>c__Iterator2:MoveNext() (at C:\Users\Tibi\Google Drive\FacultateCY\$ Licenta\Game\Assets\Scripts\Unity\RoadMeshGenerator.cs:95)
TransportGame.Utils.<InParallel>c__Iterator8:MoveNext() (at C:\Users\Tibi\Google Drive\FacultateCY\$ Licenta\Game\Assets\Scripts\Utils\Task.cs:82)
<GenerateMap>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)

8
Tools/MapViewer/MapViewer/Business/MapRenderer.cs
View File

@ -51,7 +51,7 @@ namespace TransportGame.MapViewer
///<param name="file"></param>
///<param name="map"></param>
///<param name="layers"></param>
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)

4
Tools/MapViewer/MapViewer/MainWindow.xaml.cs
View File

@ -24,12 +24,12 @@ namespace TransportGame.MapViewer
#region Map property
private Map _map;
private CityMap _map;
/// <summary>
/// Gets the map displayed by the map viewer.
/// </summary>
public Map Map
public CityMap Map
{
get
{

4
Tools/MapViewer/MapViewer/Storage/MapStorage.cs
View File

@ -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<Map>(file);
return SerializationHelper.DeserializeXml<CityMap>(file);
}
}
}