From 098493c683f83d451227b43e119131140f323336 Mon Sep 17 00:00:00 2001
From: Naliwe <r.fourdrilis@gmail.com>
Date: Wed, 19 Oct 2016 16:29:12 +0200
Subject: [PATCH] Switching

---
 .gitignore                                                     |   3 +++
 .idea/.idea.igem-quantifly/.idea/workspace.xml                 | 131 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------
 Assets/Materials/New Physics2D Material.physicsMaterial2D      | Bin 0 -> 4160 bytes
 Assets/Materials/New Physics2D Material.physicsMaterial2D.meta |   8 ++++++++
 Assets/Scenes/Main.unity                                       | Bin 20760 -> 0 bytes
 Assets/Scripts/GameController.cs                               |   4 ++--
 Assets/Scripts/SimpleEnnemy.cs                                 |  18 ++++++++++++++++++
 Assets/Scripts/SimpleEnnemy.cs.meta                            |  12 ++++++++++++
 8 files changed, 100 insertions(+), 76 deletions(-)
 create mode 100644 Assets/Materials/New Physics2D Material.physicsMaterial2D
 create mode 100644 Assets/Materials/New Physics2D Material.physicsMaterial2D.meta
 create mode 100644 Assets/Scripts/SimpleEnnemy.cs
 create mode 100644 Assets/Scripts/SimpleEnnemy.cs.meta

diff --git a/.gitignore b/.gitignore
index 1c10388..6ed41c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,6 @@ sysinfo.txt
 # Builds
 *.apk
 *.unitypackage
+
+Quantifly.x86_64
+Quantifly_Data
diff --git a/.idea/.idea.igem-quantifly/.idea/workspace.xml b/.idea/.idea.igem-quantifly/.idea/workspace.xml
index 6c083db..eb4b7db 100644
--- a/.idea/.idea.igem-quantifly/.idea/workspace.xml
+++ b/.idea/.idea.igem-quantifly/.idea/workspace.xml
@@ -2,7 +2,9 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="59a76139-b7c6-419c-b685-d99043abb4e4" name="Default" comment="">
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../Assets/Scenes/Main.unity" afterPath="$PROJECT_DIR$/../../Assets/Scenes/Main.unity" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../Assets/Scripts/GameController.cs" afterPath="$PROJECT_DIR$/../../Assets/Scripts/GameController.cs" />
     </list>
     <ignored path="igem-quantifly.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -24,20 +26,27 @@
   <component name="FileEditorManager">
     <splitter split-orientation="horizontal" split-proportion="0.5">
       <split-first>
-        <leaf>
-          <file leaf-file-name="GameController.cs" pinned="false" current-in-tab="true">
+        <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+          <file leaf-file-name="GameController.cs" pinned="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/../../Assets/Scripts/GameController.cs">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="68">
-                  <caret line="4" column="0" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
+                <state relative-caret-position="469">
+                  <caret line="63" column="47" selection-start-line="63" selection-start-column="47" selection-end-line="63" selection-end-column="47" />
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="SimpleEnnemy.cs" pinned="false" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/../../Assets/Scripts/SimpleEnnemy.cs">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="150">
+                  <caret line="10" column="44" selection-start-line="10" selection-start-column="44" selection-end-line="10" selection-end-column="44" />
                   <folding>
-                    <marker date="1476654271367" expanded="true" signature="6:97" ph="..." />
-                    <marker date="1476654271367" expanded="true" signature="122:1273" ph="{...}" />
-                    <marker date="1476654271367" expanded="true" signature="155:542" ph="{...}" />
-                    <marker date="1476654271367" expanded="true" signature="262:536" ph="{...}" />
-                    <marker date="1476654271367" expanded="true" signature="591:1271" ph="{...}" />
-                    <marker date="1476654271367" expanded="true" signature="859:1198" ph="{...}" />
-                    <marker date="1476654271367" expanded="true" signature="1221:1265" ph="{...}" />
+                    <marker date="1476886486979" expanded="true" signature="6:66" ph="..." />
+                    <marker date="1476886486979" expanded="true" signature="109:235" ph="{...}" />
+                    <marker date="1476886486979" expanded="true" signature="158:207" ph="{...}" />
+                    <marker date="1476886486979" expanded="true" signature="225:233" ph="{...}" />
                   </folding>
                 </state>
               </provider>
@@ -47,11 +56,11 @@
       </split-first>
       <split-second>
         <leaf>
-          <file leaf-file-name="NewBehaviourScript.cs" pinned="false" current-in-tab="true">
-            <entry file="file://$PROJECT_DIR$/../../Assets/Scripts/NewBehaviourScript.cs">
+          <file leaf-file-name="GameController.cs" pinned="false" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/../../Assets/Scripts/GameController.cs">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="255">
-                  <caret line="15" column="0" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />
+                <state relative-caret-position="0">
+                  <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
                   <folding />
                 </state>
               </provider>
@@ -71,14 +80,14 @@
         <option value="$PROJECT_DIR$/../../Assets/Scripts/Utils/Map.cs" />
         <option value="$PROJECT_DIR$/../../Assets/Scripts/MapGeneration/Cell.cs" />
         <option value="$PROJECT_DIR$/../../Assets/Scripts/GameController.cs" />
+        <option value="$PROJECT_DIR$/../../Assets/Scripts/SimpleEnnemy.cs" />
       </list>
     </option>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="-8" />
-    <option name="y" value="-8" />
-    <option name="width" value="1936" />
-    <option name="height" value="1056" />
+    <option name="y" value="27" />
+    <option name="width" value="1920" />
+    <option name="height" value="1053" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true">
     <OptionsSetting value="true" id="Add" />
@@ -216,11 +225,12 @@
       <workItem from="1476632678696" duration="296000" />
       <workItem from="1476633454562" duration="1491000" />
       <workItem from="1476654268053" duration="92000" />
+      <workItem from="1476881573454" duration="2518000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="6518000" />
+    <option name="totallyTimeSpent" value="9036000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -232,8 +242,8 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
-    <editor active="true" />
+    <frame x="0" y="27" width="1920" height="1053" extended-state="6" />
+    <editor active="false" />
     <layout>
       <window_info id="Change Signature" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24947916" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
@@ -266,11 +276,18 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/../../Assets/Scripts/GameController.cs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/../../Assets/Scripts/MapGeneration/CellularAutomaton.cs">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="51">
           <caret line="3" column="17" selection-start-line="3" selection-start-column="17" selection-end-line="3" selection-end-column="17" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -278,7 +295,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="289">
           <caret line="17" column="8" selection-start-line="17" selection-start-column="8" selection-end-line="17" selection-end-column="8" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -286,7 +302,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -294,15 +309,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="459">
           <caret line="27" column="0" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
-          <folding>
-            <marker date="1476654271367" expanded="true" signature="6:97" ph="..." />
-            <marker date="1476654271367" expanded="true" signature="122:1273" ph="{...}" />
-            <marker date="1476654271367" expanded="true" signature="155:542" ph="{...}" />
-            <marker date="1476654271367" expanded="true" signature="262:536" ph="{...}" />
-            <marker date="1476654271367" expanded="true" signature="591:1271" ph="{...}" />
-            <marker date="1476654271367" expanded="true" signature="859:1198" ph="{...}" />
-            <marker date="1476654271367" expanded="true" signature="1221:1265" ph="{...}" />
-          </folding>
+          <folding />
         </state>
       </provider>
     </entry>
@@ -310,7 +317,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="60">
           <caret line="4" column="20" selection-start-line="4" selection-start-column="20" selection-end-line="4" selection-end-column="20" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -318,15 +324,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding>
-            <marker date="1476654271367" expanded="true" signature="6:97" ph="..." />
-            <marker date="1476654271367" expanded="true" signature="122:1273" ph="{...}" />
-            <marker date="1476654271367" expanded="true" signature="155:542" ph="{...}" />
-            <marker date="1476654271367" expanded="true" signature="262:536" ph="{...}" />
-            <marker date="1476654271367" expanded="true" signature="591:1271" ph="{...}" />
-            <marker date="1476654271367" expanded="true" signature="859:1198" ph="{...}" />
-            <marker date="1476654271367" expanded="true" signature="1221:1265" ph="{...}" />
-          </folding>
+          <folding />
         </state>
       </provider>
     </entry>
@@ -334,7 +332,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="105">
           <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -342,15 +339,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="28" selection-start-line="0" selection-start-column="28" selection-end-line="0" selection-end-column="28" />
-          <folding>
-            <marker date="1476654271367" expanded="true" signature="6:97" ph="..." />
-            <marker date="1476654271367" expanded="true" signature="122:1273" ph="{...}" />
-            <marker date="1476654271367" expanded="true" signature="155:542" ph="{...}" />
-            <marker date="1476654271367" expanded="true" signature="262:536" ph="{...}" />
-            <marker date="1476654271367" expanded="true" signature="591:1271" ph="{...}" />
-            <marker date="1476654271367" expanded="true" signature="859:1198" ph="{...}" />
-            <marker date="1476654271367" expanded="true" signature="1221:1265" ph="{...}" />
-          </folding>
+          <folding />
         </state>
       </provider>
     </entry>
@@ -358,7 +347,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1815">
           <caret line="121" column="0" selection-start-line="121" selection-start-column="0" selection-end-line="121" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -374,7 +362,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="255">
           <caret line="17" column="8" selection-start-line="17" selection-start-column="8" selection-end-line="17" selection-end-column="8" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -382,38 +369,34 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-881">
           <caret line="3" column="17" selection-start-line="3" selection-start-column="17" selection-end-line="3" selection-end-column="17" />
-          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../Assets/Scripts/NewBehaviourScript.cs">
+    <entry file="file://$PROJECT_DIR$/../../Assets/Scripts/NewBehaviourScript.cs" />
+    <entry file="file://$PROJECT_DIR$/../../Assets/Scripts/Utils/Map.cs">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="255">
-          <caret line="15" column="0" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />
-          <folding />
+        <state relative-caret-position="357">
+          <caret line="21" column="0" selection-start-line="21" selection-start-column="0" selection-end-line="21" selection-end-column="0" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../Assets/Scripts/Utils/Map.cs">
+    <entry file="file://$PROJECT_DIR$/../../Assets/Scripts/GameController.cs">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="357">
-          <caret line="21" column="0" selection-start-line="21" selection-start-column="0" selection-end-line="21" selection-end-column="0" />
+        <state relative-caret-position="469">
+          <caret line="63" column="47" selection-start-line="63" selection-start-column="47" selection-end-line="63" selection-end-column="47" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../Assets/Scripts/GameController.cs">
+    <entry file="file://$PROJECT_DIR$/../../Assets/Scripts/SimpleEnnemy.cs">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="68">
-          <caret line="4" column="0" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
+        <state relative-caret-position="150">
+          <caret line="10" column="44" selection-start-line="10" selection-start-column="44" selection-end-line="10" selection-end-column="44" />
           <folding>
-            <marker date="1476654271367" expanded="true" signature="6:97" ph="..." />
-            <marker date="1476654271367" expanded="true" signature="122:1273" ph="{...}" />
-            <marker date="1476654271367" expanded="true" signature="155:542" ph="{...}" />
-            <marker date="1476654271367" expanded="true" signature="262:536" ph="{...}" />
-            <marker date="1476654271367" expanded="true" signature="591:1271" ph="{...}" />
-            <marker date="1476654271367" expanded="true" signature="859:1198" ph="{...}" />
-            <marker date="1476654271367" expanded="true" signature="1221:1265" ph="{...}" />
+            <marker date="1476886486979" expanded="true" signature="6:66" ph="..." />
+            <marker date="1476886486979" expanded="true" signature="109:235" ph="{...}" />
+            <marker date="1476886486979" expanded="true" signature="158:207" ph="{...}" />
+            <marker date="1476886486979" expanded="true" signature="225:233" ph="{...}" />
           </folding>
         </state>
       </provider>
diff --git a/Assets/Materials/New Physics2D Material.physicsMaterial2D b/Assets/Materials/New Physics2D Material.physicsMaterial2D
new file mode 100644
index 0000000..8f45ed4
Binary files /dev/null and b/Assets/Materials/New Physics2D Material.physicsMaterial2D differ
diff --git a/Assets/Materials/New Physics2D Material.physicsMaterial2D.meta b/Assets/Materials/New Physics2D Material.physicsMaterial2D.meta
new file mode 100644
index 0000000..dcfdf9c
--- /dev/null
+++ b/Assets/Materials/New Physics2D Material.physicsMaterial2D.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: adfab8cd143014eb3a222bdc2532d7a2
+timeCreated: 1476885487
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity
index 3d45144..564af21 100644
Binary files a/Assets/Scenes/Main.unity and b/Assets/Scenes/Main.unity differ
diff --git a/Assets/Scripts/GameController.cs b/Assets/Scripts/GameController.cs
index a1ed9d2..d0ea86e 100644
--- a/Assets/Scripts/GameController.cs
+++ b/Assets/Scripts/GameController.cs
@@ -59,9 +59,9 @@ namespace Assets.Scripts
             var rightBorder = Camera.main.ScreenToWorldPoint(new Vector3(Screen.width,
                 Screen.height, 0)).x;
             var leftBorder = Camera.main.ScreenToWorldPoint(new Vector3(0, 0, 0)).x;
-            _ca.Step(rightBorder);
+            // _ca.Step(rightBorder);
 
-            DrawMap(leftBorder, rightBorder);
+            // DrawMap(leftBorder, rightBorder);
             // Debug.Log(_map);
         }
 
diff --git a/Assets/Scripts/SimpleEnnemy.cs b/Assets/Scripts/SimpleEnnemy.cs
new file mode 100644
index 0000000..76f9677
--- /dev/null
+++ b/Assets/Scripts/SimpleEnnemy.cs
@@ -0,0 +1,18 @@
+using UnityEngine;
+using System.Collections;
+using UnityEngine.UI;
+
+public class SimpleEnnemy : MonoBehaviour
+{
+    public Transform position;
+
+	void Start ()
+	{
+	    position = GetComponent<Transform>();
+	}
+	
+	void Update ()
+	{
+	
+	}
+}
diff --git a/Assets/Scripts/SimpleEnnemy.cs.meta b/Assets/Scripts/SimpleEnnemy.cs.meta
new file mode 100644
index 0000000..f1fca18
--- /dev/null
+++ b/Assets/Scripts/SimpleEnnemy.cs.meta
@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 8a8556a579ff24a88a913247670250d2
+timeCreated: 1476886271
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--
libgit2 0.27.0