Move logs to be ignored by git

log/aGeneratedRoomLayout

@@ -1,57 +0,0 @@
-Seed: 7114951007332849727
-Room layout (compact): 
-0,1,2,3
-|
-+- 4,5
-|
-+- 6,7
-|
-+- 8,9,10
-|
-11,12,13,14,15,16,17,18,19,20,21
-
-Layout with room names:
-tutRezBox-0
-|
-autoDoor-1
-|
-Corridor-2
-|
-doorToggle-6gon-3
-|
-+- triggerDoorRoom-4
-|  |
-|  autoRect-5
-|
-+- triggerDoorRoom-6
-|  |
-|  autoRect-7
-|
-+- Corridor-8
-|  |
-|  autoDoor-9
-|  |
-|  roomCenterPillar-10
-|
-triggerDoorRoom-11
-|
-6gon-12
-|
-Corridor-13
-|
-autoRect-14
-|
-Corridor-15
-|
-autoRect-16
-|
-Corridor-17
-|
-6gon-18
-|
-defaultRoom-19
-|
-autoRect-20
-|
-Corridor-21
-

log/attemptedSeeds

@@ -1,4 +0,0 @@
-Generating level with seed 7114951007332849727
-
-After 1 attempt(s), Successful generation of level with seed 7114951007332849727
-22 rooms in total

log/treeCluster

@@ -1,67 +0,0 @@
-Seed: 7114951007332849727
-0:TutStartRez
-|
-1:corDoor
-|
-2:DoorTest
-|
-3:TutLight
-|
-4:TutDrop
-|
-5:cor
-
-0:0:TutStartRez
-
-0:0:0:tutRezBox
-
-1:0:corDoor
-
-1:0:0:autoDoor
-|
-1:0:1:Corridor
-
-2:0:DoorTest
-
-2:0:0:doorToggle-6gon
-|
-+- 2:0:1:triggerDoorRoom
-|  |
-|  2:0:2:autoRect
-|
-+- 2:0:3:triggerDoorRoom
-|  |
-|  2:0:4:autoRect
-|
-+- 2:0:5:Corridor
-|  |
-|  2:0:6:autoDoor
-|  |
-|  2:0:7:roomCenterPillar
-|
-2:0:8:triggerDoorRoom
-
-3:0:TutLight
-
-3:0:0:6gon
-|
-3:0:1:Corridor
-|
-3:0:2:autoRect
-|
-3:0:3:Corridor
-|
-3:0:4:autoRect
-|
-3:0:5:Corridor
-
-4:0:TutDrop
-
-4:0:0:6gon
-|
-4:0:1:defaultRoom
-|
-4:0:2:autoRect
-
-5:0:Corridor
-

src/Dodge/LevelGen.hs

@@ -18,11 +18,11 @@ import System.Random
 
 generateWorldFromSeed :: RenderData -> Int -> IO World
 generateWorldFromSeed rdata i = do
-    createDirectoryIfMissing True "log"
+    createDirectoryIfMissing True "generated/log"
-    createDirectoryIfMissing True "graph"
+    createDirectoryIfMissing True "generated/graph"
-    writeFile "log/attemptedSeeds" ""
+    writeFile "generated/log/attemptedSeeds" ""
-    writeFile "log/treeCluster" ""
+    writeFile "generated/log/treeCluster" ""
-    writeFile "log/aGeneratedRoomLayout" ""
+    writeFile "generated/log/aGeneratedRoomLayout" ""
     generateGraphs
     (roomList, bounds) <- layoutLevelFromSeed 0 i
     postGenerationProcessing rdata
@@ -49,34 +49,36 @@ assignPushDoors w dr = case dr ^?! drPushedBy of
 layoutLevelFromSeed :: Int -> Int -> IO (IM.IntMap Room, [ConvexPoly])
 layoutLevelFromSeed i seed = do
     let i' = i + 1
-    putStrLnAppend "log/attemptedSeeds" $ "Generating level with seed " ++ show seed
+    createDirectoryIfMissing True "generated/log"
-    appendFile "log/attemptedSeeds" "\n"
+    putStrLnAppend "generated/log/attemptedSeeds" $ "Generating level with seed " ++ show seed
+    appendFile "generated/log/attemptedSeeds" "\n"
     let g = mkStdGen seed
     let treecluster = evalState tutRoomTree (LayVars g 0)
 --    let treecluster = evalState initialRoomTree (LayVars g 0)
     let labts = decomposeSelfTree $ numSelfTree $ combineTree _rmName treecluster
-    appendFile "log/treeCluster" ("Seed: " ++ show seed ++ "\n")
+    appendFile "generated/log/treeCluster" ("Seed: " ++ show seed ++ "\n")
     putStrLn "MetaTree clusters:"
-    mapM_ (putStrLnAppend "log/treeCluster" . smallDrawTree . fmap showIntsString) labts
+    mapM_ (putStrLnAppend "generated/log/treeCluster" . smallDrawTree . fmap showIntsString)
+        labts
     let tc = composeTree treecluster
     let rmtree = inorderNumberTree tc
-    appendFile "log/aGeneratedRoomLayout" ("Seed: " ++ show seed ++ "\n")
+    appendFile "generated/log/aGeneratedRoomLayout" ("Seed: " ++ show seed ++ "\n")
-    putStrLnAppend "log/aGeneratedRoomLayout" "Room layout (compact): "
+    putStrLnAppend "generated/log/aGeneratedRoomLayout" "Room layout (compact): "
-    putStrLnAppend "log/aGeneratedRoomLayout" $ compactDrawTree $ fmap (show . snd) rmtree
+    putStrLnAppend "generated/log/aGeneratedRoomLayout" $ compactDrawTree $ fmap (show . snd) rmtree
     let nameshow (r, rid) = _rmName r ++ "-" ++ show rid
-    putStrLnAppend "log/aGeneratedRoomLayout" "Layout with room names:"
+    putStrLnAppend "generated/log/aGeneratedRoomLayout" "Layout with room names:"
-    putStrLnAppend "log/aGeneratedRoomLayout" $ smallDrawTree $ fmap nameshow rmtree
+    putStrLnAppend "generated/log/aGeneratedRoomLayout" $ smallDrawTree $ fmap nameshow rmtree
     mrs <- positionRoomsFromTree rmtree
     case mrs of
         Just (PosRooms bounds rs) -> do
-            putStrLnAppend "log/attemptedSeeds" $
+            putStrLnAppend "generated/log/attemptedSeeds" $
                 "After " ++ show i'
                     ++ " attempt(s), Successful generation of level with seed "
                     ++ show seed
-            putStrLnAppend "log/attemptedSeeds" $ show (Prelude.length rs) ++ " rooms in total"
+            putStrLnAppend "generated/log/attemptedSeeds" $ show (Prelude.length rs) ++ " rooms in total"
             return (IM.fromList $ map reversePair rs, bounds)
         Nothing -> do
-            putStrLnAppend "log/attemptedSeeds" $ "Level generation with seed " ++ show seed ++ " failed: "
+            putStrLnAppend "generated/log/attemptedSeeds" $ "Level generation with seed " ++ show seed ++ " failed: "
             let (seed', _) = random g
             layoutLevelFromSeed i' seed'
 

src/Dodge/Update/Input/DebugTest.hs

@@ -18,6 +18,7 @@ import Data.Maybe
 import Dodge.Base.Collide
 import Dodge.Data.Universe
 import SDL
+import System.Directory
 
 doDebugTest :: Universe -> Universe
 --doDebugTest uv = uv & uvDebugFloat1 *~ 0.5
@@ -40,29 +41,33 @@ doDebugTest2 = uvDebugFloat1 .~ 20
 doDebugTestF6 :: Universe -> Universe
 doDebugTestF6 = uvIOEffects %~ \f u -> do
     Just ss <- decodeFileStrict "generated/saves/QuickSave"
-    writeFile "log/prettyQuickSave" ""
+    createDirectoryIfMissing True "generated/log"
-    mapM_ (\s -> appendFile "log/prettyQuickSave" (s ++ "\n")) $ prettyShort (ss :: CWorld)
+    writeFile "generated/log/prettyQuickSave" ""
-    putStrLn "log/prettyQuickSave written"
+    mapM_ (\s -> appendFile "generated/log/prettyQuickSave" (s ++ "\n")) 
+        $ prettyShort (ss :: CWorld)
+    putStrLn "generated/log/prettyQuickSave written"
     f u
 
 doDebugTestF7 :: Universe -> Universe
 doDebugTestF7 = uvIOEffects %~ \f u -> do
-    l <- readFile "log/heldL"
+    l <- readFile "generated/log/heldL"
-    r <- readFile "log/heldR"
+    r <- readFile "generated/log/heldR"
     f $ u
         & uvWorld . input . heldWorldPos . at ButtonLeft .~ read l
         & uvWorld . input . heldWorldPos . at ButtonRight .~ read r
         
 doDebugTestF8 :: Universe -> Universe
 doDebugTestF8 = uvIOEffects %~ \f u -> do
-    appendFile "log/proj" $ show 
+    createDirectoryIfMissing True "generated/log"
+    appendFile "generated/log/proj" $ show 
         (u ^?! uvWorld . cWorld . lWorld . projectiles . ix 5 . pjPos) ++ "/n"
-    putStrLn "log/proj written"
+    putStrLn "generated/log/proj written"
     f u
 doDebugTestF10 :: Universe -> Universe
 doDebugTestF10 = uvIOEffects %~ \f u -> do
-    writeFile "log/proj" ""
+    createDirectoryIfMissing True "generated/log"
-    putStrLn "log/proj cleared"
+    writeFile "generated/log/proj" ""
+    putStrLn "generated/log/proj cleared"
     f u
 doDebugTestF11 :: Universe -> Universe
 doDebugTestF11 = uvIOEffects %~ \f u -> do