From f1307d78c5f51916a1866ae5d04a64bf1e2dbc81 Mon Sep 17 00:00:00 2001
From: Naliwe GS <Naliwe GS>
Date: Wed, 10 Aug 2016 00:41:36 +0200
Subject: [PATCH] Small changes
---
.idea.igem-quantifly/.idea/workspace.xml | 168 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------
Assets/Materials/Ground - Block.mat | Bin 5028 -> 0 bytes
Assets/Scenes/Main.unity | Bin 19896 -> 0 bytes
Assets/Scripts/MapGeneration/CellularAutomaton.cs | 5 -----
4 files changed, 82 insertions(+), 91 deletions(-)
diff --git a/.idea.igem-quantifly/.idea/workspace.xml b/.idea.igem-quantifly/.idea/workspace.xml
index 591d499..d408ec5 100644
--- a/.idea.igem-quantifly/.idea/workspace.xml
+++ b/.idea.igem-quantifly/.idea/workspace.xml
@@ -2,13 +2,9 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="5ae8e509-4645-4305-8aec-662b1997deba" name="Default" comment="">
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/riderModule.iml" afterPath="$PROJECT_DIR$/riderModule.iml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../Assets/Scripts/GameController.cs" afterPath="$PROJECT_DIR$/../Assets/Scripts/GameController.cs" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../Assets/Scripts/MapGeneration/Cell.cs" afterPath="$PROJECT_DIR$/../Assets/Scripts/MapGeneration/Cell.cs" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../Assets/Materials/Ground - Block.mat" afterPath="$PROJECT_DIR$/../Assets/Materials/Ground - Block.mat" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../Assets/Scenes/Main.unity" afterPath="$PROJECT_DIR$/../Assets/Scenes/Main.unity" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/../Assets/Scripts/MapGeneration/CellularAutomaton.cs" afterPath="$PROJECT_DIR$/../Assets/Scripts/MapGeneration/CellularAutomaton.cs" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../Assets/Scripts/Utils/Map.cs" afterPath="$PROJECT_DIR$/../Assets/Scripts/Utils/Map.cs" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../Assets/Scripts/Utils/ObjectPool.cs" afterPath="$PROJECT_DIR$/../Assets/Scripts/Utils/ObjectPool.cs" />
</list>
<ignored path="igem-quantifly.iws" />
<ignored path=".idea/workspace.xml" />
@@ -34,26 +30,26 @@
<file leaf-file-name="CellularAutomaton.cs" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/../Assets/Scripts/MapGeneration/CellularAutomaton.cs">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="432">
- <caret line="99" column="64" selection-start-line="99" selection-start-column="64" selection-end-line="99" selection-end-column="64" />
+ <state relative-caret-position="789">
+ <caret line="115" column="0" selection-start-line="115" selection-start-column="0" selection-end-line="115" selection-end-column="0" />
<folding>
- <marker date="1470401124813" expanded="true" signature="6:120" ph="..." />
- <marker date="1470401124813" expanded="true" signature="6:139" ph="..." />
- <marker date="1470401124813" expanded="true" signature="179:3393" ph="{...}" />
- <marker date="1470401124813" expanded="true" signature="221:600" ph="{...}" />
- <marker date="1470401124813" expanded="true" signature="280:325" ph="{...}" />
- <marker date="1470401124813" expanded="true" signature="380:425" ph="{...}" />
- <marker date="1470401124813" expanded="true" signature="493:594" ph="{...}" />
- <marker date="1470401124813" expanded="true" signature="636:3391" ph="{...}" />
- <marker date="1470401124813" expanded="true" signature="651:913" ph="Delegates" />
- <marker date="1470401124813" expanded="true" signature="921:1183" ph="Fields" />
- <marker date="1470401124813" expanded="true" signature="1193:1686" ph="Ctors" />
- <marker date="1470401124813" expanded="true" signature="1304:1668" ph="{...}" />
- <marker date="1470401124813" expanded="true" signature="1698:3385" ph="Methods" />
- <marker date="1470401124813" expanded="true" signature="1741:2113" ph="{...}" />
- <marker date="1470401124813" expanded="true" signature="2189:2983" ph="{...}" />
- <marker date="1470401124813" expanded="true" signature="3048:3110" ph="{...}" />
- <marker date="1470401124813" expanded="true" signature="3175:3365" ph="{...}" />
+ <marker date="1470408547196" expanded="true" signature="6:120" ph="..." />
+ <marker date="1470408547196" expanded="true" signature="6:139" ph="..." />
+ <marker date="1470408547196" expanded="true" signature="179:3180" ph="{...}" />
+ <marker date="1470408547196" expanded="false" signature="221:600" ph="{...}" />
+ <marker date="1470408547196" expanded="true" signature="280:325" ph="{...}" />
+ <marker date="1470408547196" expanded="true" signature="380:425" ph="{...}" />
+ <marker date="1470408547196" expanded="true" signature="493:594" ph="{...}" />
+ <marker date="1470408547196" expanded="true" signature="636:3178" ph="{...}" />
+ <marker date="1470408547196" expanded="false" signature="651:913" ph="Delegates" />
+ <marker date="1470408547196" expanded="false" signature="921:1183" ph="Fields" />
+ <marker date="1470408547196" expanded="true" signature="1193:1686" ph="Ctors" />
+ <marker date="1470408547196" expanded="true" signature="1304:1668" ph="{...}" />
+ <marker date="1470408547196" expanded="true" signature="1698:3172" ph="Methods" />
+ <marker date="1470408547196" expanded="true" signature="1741:2113" ph="{...}" />
+ <marker date="1470408547196" expanded="true" signature="2189:2846" ph="{...}" />
+ <marker date="1470408547196" expanded="true" signature="2911:2973" ph="{...}" />
+ <marker date="1470408547196" expanded="true" signature="3038:3152" ph="{...}" />
</folding>
</state>
</provider>
@@ -66,14 +62,14 @@
<file leaf-file-name="Map.cs" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/../Assets/Scripts/Utils/Map.cs">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="731">
+ <state relative-caret-position="306">
<caret line="43" column="38" selection-start-line="43" selection-start-column="38" selection-end-line="43" selection-end-column="38" />
<folding>
<marker date="1470398652139" expanded="true" signature="30:899" ph="{...}" />
<marker date="1470398652139" expanded="true" signature="57:119" ph="{...}" />
<marker date="1470398652139" expanded="true" signature="141:897" ph="{...}" />
- <marker date="1470398652139" expanded="true" signature="156:307" ph="Fields" />
- <marker date="1470398652139" expanded="true" signature="317:746" ph="Ctors" />
+ <marker date="1470398652139" expanded="false" signature="156:307" ph="Fields" />
+ <marker date="1470398652139" expanded="false" signature="317:746" ph="Ctors" />
<marker date="1470398652139" expanded="true" signature="372:726" ph="{...}" />
</folding>
</state>
@@ -290,12 +286,12 @@
<workItem from="1469993497246" duration="1025000" />
<workItem from="1469994566860" duration="8371000" />
<workItem from="1470317006204" duration="284000" />
- <workItem from="1470317331087" duration="15978000" />
+ <workItem from="1470317331087" duration="17767000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="27380000" />
+ <option name="totallyTimeSpent" value="29169000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
@@ -377,23 +373,23 @@
<state relative-caret-position="238">
<caret line="14" column="0" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" />
<folding>
- <marker date="1470401124813" expanded="true" signature="6:120" ph="..." />
- <marker date="1470401124813" expanded="true" signature="6:139" ph="..." />
- <marker date="1470401124813" expanded="true" signature="179:3393" ph="{...}" />
- <marker date="1470401124813" expanded="true" signature="221:600" ph="{...}" />
- <marker date="1470401124813" expanded="true" signature="280:325" ph="{...}" />
- <marker date="1470401124813" expanded="true" signature="380:425" ph="{...}" />
- <marker date="1470401124813" expanded="true" signature="493:594" ph="{...}" />
- <marker date="1470401124813" expanded="true" signature="636:3391" ph="{...}" />
- <marker date="1470401124813" expanded="true" signature="651:913" ph="Delegates" />
- <marker date="1470401124813" expanded="true" signature="921:1183" ph="Fields" />
- <marker date="1470401124813" expanded="true" signature="1193:1686" ph="Ctors" />
- <marker date="1470401124813" expanded="true" signature="1304:1668" ph="{...}" />
- <marker date="1470401124813" expanded="true" signature="1698:3385" ph="Methods" />
- <marker date="1470401124813" expanded="true" signature="1741:2113" ph="{...}" />
- <marker date="1470401124813" expanded="true" signature="2189:2983" ph="{...}" />
- <marker date="1470401124813" expanded="true" signature="3048:3110" ph="{...}" />
- <marker date="1470401124813" expanded="true" signature="3175:3365" ph="{...}" />
+ <marker date="1470408547196" expanded="true" signature="6:120" ph="..." />
+ <marker date="1470408547196" expanded="true" signature="6:139" ph="..." />
+ <marker date="1470408547196" expanded="true" signature="179:3180" ph="{...}" />
+ <marker date="1470408547196" expanded="false" signature="221:600" ph="{...}" />
+ <marker date="1470408547196" expanded="true" signature="280:325" ph="{...}" />
+ <marker date="1470408547196" expanded="true" signature="380:425" ph="{...}" />
+ <marker date="1470408547196" expanded="true" signature="493:594" ph="{...}" />
+ <marker date="1470408547196" expanded="true" signature="636:3178" ph="{...}" />
+ <marker date="1470408547196" expanded="false" signature="651:913" ph="Delegates" />
+ <marker date="1470408547196" expanded="false" signature="921:1183" ph="Fields" />
+ <marker date="1470408547196" expanded="true" signature="1193:1686" ph="Ctors" />
+ <marker date="1470408547196" expanded="true" signature="1304:1668" ph="{...}" />
+ <marker date="1470408547196" expanded="true" signature="1698:3172" ph="Methods" />
+ <marker date="1470408547196" expanded="true" signature="1741:2113" ph="{...}" />
+ <marker date="1470408547196" expanded="true" signature="2189:2846" ph="{...}" />
+ <marker date="1470408547196" expanded="true" signature="2911:2973" ph="{...}" />
+ <marker date="1470408547196" expanded="true" signature="3038:3152" ph="{...}" />
</folding>
</state>
</provider>
@@ -418,23 +414,23 @@
<state relative-caret-position="136">
<caret line="8" column="16" selection-start-line="8" selection-start-column="16" selection-end-line="8" selection-end-column="16" />
<folding>
- <marker date="1470401124813" expanded="true" signature="6:120" ph="..." />
- <marker date="1470401124813" expanded="true" signature="6:139" ph="..." />
- <marker date="1470401124813" expanded="true" signature="179:3393" ph="{...}" />
- <marker date="1470401124813" expanded="true" signature="221:600" ph="{...}" />
- <marker date="1470401124813" expanded="true" signature="280:325" ph="{...}" />
- <marker date="1470401124813" expanded="true" signature="380:425" ph="{...}" />
- <marker date="1470401124813" expanded="true" signature="493:594" ph="{...}" />
- <marker date="1470401124813" expanded="true" signature="636:3391" ph="{...}" />
- <marker date="1470401124813" expanded="true" signature="651:913" ph="Delegates" />
- <marker date="1470401124813" expanded="true" signature="921:1183" ph="Fields" />
- <marker date="1470401124813" expanded="true" signature="1193:1686" ph="Ctors" />
- <marker date="1470401124813" expanded="true" signature="1304:1668" ph="{...}" />
- <marker date="1470401124813" expanded="true" signature="1698:3385" ph="Methods" />
- <marker date="1470401124813" expanded="true" signature="1741:2113" ph="{...}" />
- <marker date="1470401124813" expanded="true" signature="2189:2983" ph="{...}" />
- <marker date="1470401124813" expanded="true" signature="3048:3110" ph="{...}" />
- <marker date="1470401124813" expanded="true" signature="3175:3365" ph="{...}" />
+ <marker date="1470408547196" expanded="true" signature="6:120" ph="..." />
+ <marker date="1470408547196" expanded="true" signature="6:139" ph="..." />
+ <marker date="1470408547196" expanded="true" signature="179:3180" ph="{...}" />
+ <marker date="1470408547196" expanded="false" signature="221:600" ph="{...}" />
+ <marker date="1470408547196" expanded="true" signature="280:325" ph="{...}" />
+ <marker date="1470408547196" expanded="true" signature="380:425" ph="{...}" />
+ <marker date="1470408547196" expanded="true" signature="493:594" ph="{...}" />
+ <marker date="1470408547196" expanded="true" signature="636:3178" ph="{...}" />
+ <marker date="1470408547196" expanded="false" signature="651:913" ph="Delegates" />
+ <marker date="1470408547196" expanded="false" signature="921:1183" ph="Fields" />
+ <marker date="1470408547196" expanded="true" signature="1193:1686" ph="Ctors" />
+ <marker date="1470408547196" expanded="true" signature="1304:1668" ph="{...}" />
+ <marker date="1470408547196" expanded="true" signature="1698:3172" ph="Methods" />
+ <marker date="1470408547196" expanded="true" signature="1741:2113" ph="{...}" />
+ <marker date="1470408547196" expanded="true" signature="2189:2846" ph="{...}" />
+ <marker date="1470408547196" expanded="true" signature="2911:2973" ph="{...}" />
+ <marker date="1470408547196" expanded="true" signature="3038:3152" ph="{...}" />
</folding>
</state>
</provider>
@@ -532,14 +528,14 @@
</entry>
<entry file="file://$PROJECT_DIR$/../Assets/Scripts/Utils/Map.cs">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="731">
+ <state relative-caret-position="306">
<caret line="43" column="38" selection-start-line="43" selection-start-column="38" selection-end-line="43" selection-end-column="38" />
<folding>
<marker date="1470398652139" expanded="true" signature="30:899" ph="{...}" />
<marker date="1470398652139" expanded="true" signature="57:119" ph="{...}" />
<marker date="1470398652139" expanded="true" signature="141:897" ph="{...}" />
- <marker date="1470398652139" expanded="true" signature="156:307" ph="Fields" />
- <marker date="1470398652139" expanded="true" signature="317:746" ph="Ctors" />
+ <marker date="1470398652139" expanded="false" signature="156:307" ph="Fields" />
+ <marker date="1470398652139" expanded="false" signature="317:746" ph="Ctors" />
<marker date="1470398652139" expanded="true" signature="372:726" ph="{...}" />
</folding>
</state>
@@ -547,26 +543,26 @@
</entry>
<entry file="file://$PROJECT_DIR$/../Assets/Scripts/MapGeneration/CellularAutomaton.cs">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="432">
- <caret line="99" column="64" selection-start-line="99" selection-start-column="64" selection-end-line="99" selection-end-column="64" />
+ <state relative-caret-position="789">
+ <caret line="115" column="0" selection-start-line="115" selection-start-column="0" selection-end-line="115" selection-end-column="0" />
<folding>
- <marker date="1470401124813" expanded="true" signature="6:120" ph="..." />
- <marker date="1470401124813" expanded="true" signature="6:139" ph="..." />
- <marker date="1470401124813" expanded="true" signature="179:3393" ph="{...}" />
- <marker date="1470401124813" expanded="true" signature="221:600" ph="{...}" />
- <marker date="1470401124813" expanded="true" signature="280:325" ph="{...}" />
- <marker date="1470401124813" expanded="true" signature="380:425" ph="{...}" />
- <marker date="1470401124813" expanded="true" signature="493:594" ph="{...}" />
- <marker date="1470401124813" expanded="true" signature="636:3391" ph="{...}" />
- <marker date="1470401124813" expanded="true" signature="651:913" ph="Delegates" />
- <marker date="1470401124813" expanded="true" signature="921:1183" ph="Fields" />
- <marker date="1470401124813" expanded="true" signature="1193:1686" ph="Ctors" />
- <marker date="1470401124813" expanded="true" signature="1304:1668" ph="{...}" />
- <marker date="1470401124813" expanded="true" signature="1698:3385" ph="Methods" />
- <marker date="1470401124813" expanded="true" signature="1741:2113" ph="{...}" />
- <marker date="1470401124813" expanded="true" signature="2189:2983" ph="{...}" />
- <marker date="1470401124813" expanded="true" signature="3048:3110" ph="{...}" />
- <marker date="1470401124813" expanded="true" signature="3175:3365" ph="{...}" />
+ <marker date="1470408547196" expanded="true" signature="6:120" ph="..." />
+ <marker date="1470408547196" expanded="true" signature="6:139" ph="..." />
+ <marker date="1470408547196" expanded="true" signature="179:3180" ph="{...}" />
+ <marker date="1470408547196" expanded="false" signature="221:600" ph="{...}" />
+ <marker date="1470408547196" expanded="true" signature="280:325" ph="{...}" />
+ <marker date="1470408547196" expanded="true" signature="380:425" ph="{...}" />
+ <marker date="1470408547196" expanded="true" signature="493:594" ph="{...}" />
+ <marker date="1470408547196" expanded="true" signature="636:3178" ph="{...}" />
+ <marker date="1470408547196" expanded="false" signature="651:913" ph="Delegates" />
+ <marker date="1470408547196" expanded="false" signature="921:1183" ph="Fields" />
+ <marker date="1470408547196" expanded="true" signature="1193:1686" ph="Ctors" />
+ <marker date="1470408547196" expanded="true" signature="1304:1668" ph="{...}" />
+ <marker date="1470408547196" expanded="true" signature="1698:3172" ph="Methods" />
+ <marker date="1470408547196" expanded="true" signature="1741:2113" ph="{...}" />
+ <marker date="1470408547196" expanded="true" signature="2189:2846" ph="{...}" />
+ <marker date="1470408547196" expanded="true" signature="2911:2973" ph="{...}" />
+ <marker date="1470408547196" expanded="true" signature="3038:3152" ph="{...}" />
</folding>
</state>
</provider>
diff --git a/Assets/Materials/Ground - Block.mat b/Assets/Materials/Ground - Block.mat
index 3b8c134..a8ce1d1 100644
Binary files a/Assets/Materials/Ground - Block.mat and b/Assets/Materials/Ground - Block.mat differ
diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity
index c093d36..dc1dc9c 100644
Binary files a/Assets/Scenes/Main.unity and b/Assets/Scenes/Main.unity differ
diff --git a/Assets/Scripts/MapGeneration/CellularAutomaton.cs b/Assets/Scripts/MapGeneration/CellularAutomaton.cs
index cf1717c..5ecf6c6 100644
--- a/Assets/Scripts/MapGeneration/CellularAutomaton.cs
+++ b/Assets/Scripts/MapGeneration/CellularAutomaton.cs
@@ -95,8 +95,6 @@ namespace Assets.Scripts.MapGeneration
{
for (var y = origin.Position.y - 1; y <= origin.Position.y + 1; y++)
{
- Debug.Log(string.Format("Processing cell {0}:{1}", x, y));
-
if ((Math.Abs(x - origin.Position.x) > .1f || Math.Abs(y - origin.Position.y) > .1f)
&& IsInMapRange(map, (int) x, (int) y) && map[(uint) x, (uint) y] != origin.Type)
{
@@ -105,8 +103,6 @@ namespace Assets.Scripts.MapGeneration
}
}
- Debug.Log(string.Format("{0}", ret.Count));
-
return ret;
}
@@ -117,7 +113,6 @@ namespace Assets.Scripts.MapGeneration
private static bool IsInMapRange(Map map, int x, int y)
{
- Debug.Log(string.Format("Is cell {0}:{1} in map range", x, y));
return (x >= 0 && x < map.Columns &&
y >= 0 && y < map.Rows);
}
--
libgit2 0.27.0