Skip to content

I
igem-quantifly
Commit f1307d78 by Naliwe GS
Options

Small changes

parent 1ba11f7e
Showing with 82 additions and 91 deletions
.idea.igem-quantifly/.idea/workspace.xml
...@@ -2,13 +2,9 @@ ...@@ -2,13 +2,9 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="5ae8e509-4645-4305-8aec-662b1997deba" name="Default" comment=""> <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$/../Assets/Materials/Ground - Block.mat" afterPath="$PROJECT_DIR$/../Assets/Materials/Ground - Block.mat" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/riderModule.iml" afterPath="$PROJECT_DIR$/riderModule.iml" /> <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/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/Scripts/MapGeneration/CellularAutomaton.cs" afterPath="$PROJECT_DIR$/../Assets/Scripts/MapGeneration/CellularAutomaton.cs" /> <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> </list>
<ignored path="igem-quantifly.iws" /> <ignored path="igem-quantifly.iws" />
<ignored path=".idea/workspace.xml" /> <ignored path=".idea/workspace.xml" />
...@@ -34,26 +30,26 @@ ...@@ -34,26 +30,26 @@
<file leaf-file-name="CellularAutomaton.cs" pinned="false" current-in-tab="true"> <file leaf-file-name="CellularAutomaton.cs" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/../Assets/Scripts/MapGeneration/CellularAutomaton.cs"> <entry file="file://$PROJECT_DIR$/../Assets/Scripts/MapGeneration/CellularAutomaton.cs">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="432"> <state relative-caret-position="789">
<caret line="99" column="64" selection-start-line="99" selection-start-column="64" selection-end-line="99" selection-end-column="64" /> <caret line="115" column="0" selection-start-line="115" selection-start-column="0" selection-end-line="115" selection-end-column="0" />
<folding> <folding>
<marker date="1470401124813" expanded="true" signature="6:120" ph="..." /> <marker date="1470408547196" expanded="true" signature="6:120" ph="..." />
<marker date="1470401124813" expanded="true" signature="6:139" ph="..." /> <marker date="1470408547196" expanded="true" signature="6:139" ph="..." />
<marker date="1470401124813" expanded="true" signature="179:3393" ph="{...}" /> <marker date="1470408547196" expanded="true" signature="179:3180" ph="{...}" />
<marker date="1470401124813" expanded="true" signature="221:600" ph="{...}" /> <marker date="1470408547196" expanded="false" signature="221:600" ph="{...}" />
<marker date="1470401124813" expanded="true" signature="280:325" ph="{...}" /> <marker date="1470408547196" expanded="true" signature="280:325" ph="{...}" />
<marker date="1470401124813" expanded="true" signature="380:425" ph="{...}" /> <marker date="1470408547196" expanded="true" signature="380:425" ph="{...}" />
<marker date="1470401124813" expanded="true" signature="493:594" ph="{...}" /> <marker date="1470408547196" expanded="true" signature="493:594" ph="{...}" />
<marker date="1470401124813" expanded="true" signature="636:3391" ph="{...}" /> <marker date="1470408547196" expanded="true" signature="636:3178" ph="{...}" />
<marker date="1470401124813" expanded="true" signature="651:913" ph="Delegates" /> <marker date="1470408547196" expanded="false" signature="651:913" ph="Delegates" />
<marker date="1470401124813" expanded="true" signature="921:1183" ph="Fields" /> <marker date="1470408547196" expanded="false" signature="921:1183" ph="Fields" />
<marker date="1470401124813" expanded="true" signature="1193:1686" ph="Ctors" /> <marker date="1470408547196" expanded="true" signature="1193:1686" ph="Ctors" />
<marker date="1470401124813" expanded="true" signature="1304:1668" ph="{...}" /> <marker date="1470408547196" expanded="true" signature="1304:1668" ph="{...}" />
<marker date="1470401124813" expanded="true" signature="1698:3385" ph="Methods" /> <marker date="1470408547196" expanded="true" signature="1698:3172" ph="Methods" />
<marker date="1470401124813" expanded="true" signature="1741:2113" ph="{...}" /> <marker date="1470408547196" expanded="true" signature="1741:2113" ph="{...}" />
<marker date="1470401124813" expanded="true" signature="2189:2983" ph="{...}" /> <marker date="1470408547196" expanded="true" signature="2189:2846" ph="{...}" />
<marker date="1470401124813" expanded="true" signature="3048:3110" ph="{...}" /> <marker date="1470408547196" expanded="true" signature="2911:2973" ph="{...}" />
<marker date="1470401124813" expanded="true" signature="3175:3365" ph="{...}" /> <marker date="1470408547196" expanded="true" signature="3038:3152" ph="{...}" />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -66,14 +62,14 @@ ...@@ -66,14 +62,14 @@
<file leaf-file-name="Map.cs" pinned="false" current-in-tab="true"> <file leaf-file-name="Map.cs" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/../Assets/Scripts/Utils/Map.cs"> <entry file="file://$PROJECT_DIR$/../Assets/Scripts/Utils/Map.cs">
<provider selected="true" editor-type-id="text-editor"> <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" /> <caret line="43" column="38" selection-start-line="43" selection-start-column="38" selection-end-line="43" selection-end-column="38" />
<folding> <folding>
<marker date="1470398652139" expanded="true" signature="30:899" ph="{...}" /> <marker date="1470398652139" expanded="true" signature="30:899" ph="{...}" />
<marker date="1470398652139" expanded="true" signature="57:119" 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="141:897" ph="{...}" />
<marker date="1470398652139" expanded="true" signature="156:307" ph="Fields" /> <marker date="1470398652139" expanded="false" signature="156:307" ph="Fields" />
<marker date="1470398652139" expanded="true" signature="317:746" ph="Ctors" /> <marker date="1470398652139" expanded="false" signature="317:746" ph="Ctors" />
<marker date="1470398652139" expanded="true" signature="372:726" ph="{...}" /> <marker date="1470398652139" expanded="true" signature="372:726" ph="{...}" />
</folding> </folding>
</state> </state>
...@@ -290,12 +286,12 @@ ...@@ -290,12 +286,12 @@
<workItem from="1469993497246" duration="1025000" /> <workItem from="1469993497246" duration="1025000" />
<workItem from="1469994566860" duration="8371000" /> <workItem from="1469994566860" duration="8371000" />
<workItem from="1470317006204" duration="284000" /> <workItem from="1470317006204" duration="284000" />
<workItem from="1470317331087" duration="15978000" /> <workItem from="1470317331087" duration="17767000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="27380000" /> <option name="totallyTimeSpent" value="29169000" />
</component> </component>
<component name="TodoView"> <component name="TodoView">
<todo-panel id="selected-file"> <todo-panel id="selected-file">
...@@ -377,23 +373,23 @@ ...@@ -377,23 +373,23 @@
<state relative-caret-position="238"> <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" /> <caret line="14" column="0" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" />
<folding> <folding>
<marker date="1470401124813" expanded="true" signature="6:120" ph="..." /> <marker date="1470408547196" expanded="true" signature="6:120" ph="..." />
<marker date="1470401124813" expanded="true" signature="6:139" ph="..." /> <marker date="1470408547196" expanded="true" signature="6:139" ph="..." />
<marker date="1470401124813" expanded="true" signature="179:3393" ph="{...}" /> <marker date="1470408547196" expanded="true" signature="179:3180" ph="{...}" />
<marker date="1470401124813" expanded="true" signature="221:600" ph="{...}" /> <marker date="1470408547196" expanded="false" signature="221:600" ph="{...}" />
<marker date="1470401124813" expanded="true" signature="280:325" ph="{...}" /> <marker date="1470408547196" expanded="true" signature="280:325" ph="{...}" />
<marker date="1470401124813" expanded="true" signature="380:425" ph="{...}" /> <marker date="1470408547196" expanded="true" signature="380:425" ph="{...}" />
<marker date="1470401124813" expanded="true" signature="493:594" ph="{...}" /> <marker date="1470408547196" expanded="true" signature="493:594" ph="{...}" />
<marker date="1470401124813" expanded="true" signature="636:3391" ph="{...}" /> <marker date="1470408547196" expanded="true" signature="636:3178" ph="{...}" />
<marker date="1470401124813" expanded="true" signature="651:913" ph="Delegates" /> <marker date="1470408547196" expanded="false" signature="651:913" ph="Delegates" />
<marker date="1470401124813" expanded="true" signature="921:1183" ph="Fields" /> <marker date="1470408547196" expanded="false" signature="921:1183" ph="Fields" />
<marker date="1470401124813" expanded="true" signature="1193:1686" ph="Ctors" /> <marker date="1470408547196" expanded="true" signature="1193:1686" ph="Ctors" />
<marker date="1470401124813" expanded="true" signature="1304:1668" ph="{...}" /> <marker date="1470408547196" expanded="true" signature="1304:1668" ph="{...}" />
<marker date="1470401124813" expanded="true" signature="1698:3385" ph="Methods" /> <marker date="1470408547196" expanded="true" signature="1698:3172" ph="Methods" />
<marker date="1470401124813" expanded="true" signature="1741:2113" ph="{...}" /> <marker date="1470408547196" expanded="true" signature="1741:2113" ph="{...}" />
<marker date="1470401124813" expanded="true" signature="2189:2983" ph="{...}" /> <marker date="1470408547196" expanded="true" signature="2189:2846" ph="{...}" />
<marker date="1470401124813" expanded="true" signature="3048:3110" ph="{...}" /> <marker date="1470408547196" expanded="true" signature="2911:2973" ph="{...}" />
<marker date="1470401124813" expanded="true" signature="3175:3365" ph="{...}" /> <marker date="1470408547196" expanded="true" signature="3038:3152" ph="{...}" />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -418,23 +414,23 @@ ...@@ -418,23 +414,23 @@
<state relative-caret-position="136"> <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" /> <caret line="8" column="16" selection-start-line="8" selection-start-column="16" selection-end-line="8" selection-end-column="16" />
<folding> <folding>
<marker date="1470401124813" expanded="true" signature="6:120" ph="..." /> <marker date="1470408547196" expanded="true" signature="6:120" ph="..." />
<marker date="1470401124813" expanded="true" signature="6:139" ph="..." /> <marker date="1470408547196" expanded="true" signature="6:139" ph="..." />
<marker date="1470401124813" expanded="true" signature="179:3393" ph="{...}" /> <marker date="1470408547196" expanded="true" signature="179:3180" ph="{...}" />
<marker date="1470401124813" expanded="true" signature="221:600" ph="{...}" /> <marker date="1470408547196" expanded="false" signature="221:600" ph="{...}" />
<marker date="1470401124813" expanded="true" signature="280:325" ph="{...}" /> <marker date="1470408547196" expanded="true" signature="280:325" ph="{...}" />
<marker date="1470401124813" expanded="true" signature="380:425" ph="{...}" /> <marker date="1470408547196" expanded="true" signature="380:425" ph="{...}" />
<marker date="1470401124813" expanded="true" signature="493:594" ph="{...}" /> <marker date="1470408547196" expanded="true" signature="493:594" ph="{...}" />
<marker date="1470401124813" expanded="true" signature="636:3391" ph="{...}" /> <marker date="1470408547196" expanded="true" signature="636:3178" ph="{...}" />
<marker date="1470401124813" expanded="true" signature="651:913" ph="Delegates" /> <marker date="1470408547196" expanded="false" signature="651:913" ph="Delegates" />
<marker date="1470401124813" expanded="true" signature="921:1183" ph="Fields" /> <marker date="1470408547196" expanded="false" signature="921:1183" ph="Fields" />
<marker date="1470401124813" expanded="true" signature="1193:1686" ph="Ctors" /> <marker date="1470408547196" expanded="true" signature="1193:1686" ph="Ctors" />
<marker date="1470401124813" expanded="true" signature="1304:1668" ph="{...}" /> <marker date="1470408547196" expanded="true" signature="1304:1668" ph="{...}" />
<marker date="1470401124813" expanded="true" signature="1698:3385" ph="Methods" /> <marker date="1470408547196" expanded="true" signature="1698:3172" ph="Methods" />
<marker date="1470401124813" expanded="true" signature="1741:2113" ph="{...}" /> <marker date="1470408547196" expanded="true" signature="1741:2113" ph="{...}" />
<marker date="1470401124813" expanded="true" signature="2189:2983" ph="{...}" /> <marker date="1470408547196" expanded="true" signature="2189:2846" ph="{...}" />
<marker date="1470401124813" expanded="true" signature="3048:3110" ph="{...}" /> <marker date="1470408547196" expanded="true" signature="2911:2973" ph="{...}" />
<marker date="1470401124813" expanded="true" signature="3175:3365" ph="{...}" /> <marker date="1470408547196" expanded="true" signature="3038:3152" ph="{...}" />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -532,14 +528,14 @@ ...@@ -532,14 +528,14 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/../Assets/Scripts/Utils/Map.cs"> <entry file="file://$PROJECT_DIR$/../Assets/Scripts/Utils/Map.cs">
<provider selected="true" editor-type-id="text-editor"> <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" /> <caret line="43" column="38" selection-start-line="43" selection-start-column="38" selection-end-line="43" selection-end-column="38" />
<folding> <folding>
<marker date="1470398652139" expanded="true" signature="30:899" ph="{...}" /> <marker date="1470398652139" expanded="true" signature="30:899" ph="{...}" />
<marker date="1470398652139" expanded="true" signature="57:119" 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="141:897" ph="{...}" />
<marker date="1470398652139" expanded="true" signature="156:307" ph="Fields" /> <marker date="1470398652139" expanded="false" signature="156:307" ph="Fields" />
<marker date="1470398652139" expanded="true" signature="317:746" ph="Ctors" /> <marker date="1470398652139" expanded="false" signature="317:746" ph="Ctors" />
<marker date="1470398652139" expanded="true" signature="372:726" ph="{...}" /> <marker date="1470398652139" expanded="true" signature="372:726" ph="{...}" />
</folding> </folding>
</state> </state>
...@@ -547,26 +543,26 @@ ...@@ -547,26 +543,26 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/../Assets/Scripts/MapGeneration/CellularAutomaton.cs"> <entry file="file://$PROJECT_DIR$/../Assets/Scripts/MapGeneration/CellularAutomaton.cs">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="432"> <state relative-caret-position="789">
<caret line="99" column="64" selection-start-line="99" selection-start-column="64" selection-end-line="99" selection-end-column="64" /> <caret line="115" column="0" selection-start-line="115" selection-start-column="0" selection-end-line="115" selection-end-column="0" />
<folding> <folding>
<marker date="1470401124813" expanded="true" signature="6:120" ph="..." /> <marker date="1470408547196" expanded="true" signature="6:120" ph="..." />
<marker date="1470401124813" expanded="true" signature="6:139" ph="..." /> <marker date="1470408547196" expanded="true" signature="6:139" ph="..." />
<marker date="1470401124813" expanded="true" signature="179:3393" ph="{...}" /> <marker date="1470408547196" expanded="true" signature="179:3180" ph="{...}" />
<marker date="1470401124813" expanded="true" signature="221:600" ph="{...}" /> <marker date="1470408547196" expanded="false" signature="221:600" ph="{...}" />
<marker date="1470401124813" expanded="true" signature="280:325" ph="{...}" /> <marker date="1470408547196" expanded="true" signature="280:325" ph="{...}" />
<marker date="1470401124813" expanded="true" signature="380:425" ph="{...}" /> <marker date="1470408547196" expanded="true" signature="380:425" ph="{...}" />
<marker date="1470401124813" expanded="true" signature="493:594" ph="{...}" /> <marker date="1470408547196" expanded="true" signature="493:594" ph="{...}" />
<marker date="1470401124813" expanded="true" signature="636:3391" ph="{...}" /> <marker date="1470408547196" expanded="true" signature="636:3178" ph="{...}" />
<marker date="1470401124813" expanded="true" signature="651:913" ph="Delegates" /> <marker date="1470408547196" expanded="false" signature="651:913" ph="Delegates" />
<marker date="1470401124813" expanded="true" signature="921:1183" ph="Fields" /> <marker date="1470408547196" expanded="false" signature="921:1183" ph="Fields" />
<marker date="1470401124813" expanded="true" signature="1193:1686" ph="Ctors" /> <marker date="1470408547196" expanded="true" signature="1193:1686" ph="Ctors" />
<marker date="1470401124813" expanded="true" signature="1304:1668" ph="{...}" /> <marker date="1470408547196" expanded="true" signature="1304:1668" ph="{...}" />
<marker date="1470401124813" expanded="true" signature="1698:3385" ph="Methods" /> <marker date="1470408547196" expanded="true" signature="1698:3172" ph="Methods" />
<marker date="1470401124813" expanded="true" signature="1741:2113" ph="{...}" /> <marker date="1470408547196" expanded="true" signature="1741:2113" ph="{...}" />
<marker date="1470401124813" expanded="true" signature="2189:2983" ph="{...}" /> <marker date="1470408547196" expanded="true" signature="2189:2846" ph="{...}" />
<marker date="1470401124813" expanded="true" signature="3048:3110" ph="{...}" /> <marker date="1470408547196" expanded="true" signature="2911:2973" ph="{...}" />
<marker date="1470401124813" expanded="true" signature="3175:3365" ph="{...}" /> <marker date="1470408547196" expanded="true" signature="3038:3152" ph="{...}" />
</folding> </folding>
</state> </state>
</provider> </provider>
......
Assets/Scenes/Main.unity
No preview for this file type
Assets/Scripts/MapGeneration/CellularAutomaton.cs
...@@ -95,8 +95,6 @@ namespace Assets.Scripts.MapGeneration ...@@ -95,8 +95,6 @@ namespace Assets.Scripts.MapGeneration
{ {
for (var y = origin.Position.y - 1; y <= origin.Position.y + 1; y++) 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) 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) && IsInMapRange(map, (int) x, (int) y) && map[(uint) x, (uint) y] != origin.Type)
{ {
...@@ -105,8 +103,6 @@ namespace Assets.Scripts.MapGeneration ...@@ -105,8 +103,6 @@ namespace Assets.Scripts.MapGeneration
} }
} }
Debug.Log(string.Format("{0}", ret.Count));
return ret; return ret;
} }
...@@ -117,7 +113,6 @@ namespace Assets.Scripts.MapGeneration ...@@ -117,7 +113,6 @@ namespace Assets.Scripts.MapGeneration
private static bool IsInMapRange(Map map, int x, int y) 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 && return (x >= 0 && x < map.Columns &&
y >= 0 && y < map.Rows); y >= 0 && y < map.Rows);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment