From a4438692846ef5f947922c93b45afe15e92e0eca Mon Sep 17 00:00:00 2001 From: KP Date: Wed, 24 Jul 2024 16:41:15 -0500 Subject: [PATCH] poopy --- Data/sandbox-log.txt | 825 ++++++---------------------------------- KP3Dii/src/KP3D_Map.cpp | 89 +++-- 2 files changed, 174 insertions(+), 740 deletions(-) diff --git a/Data/sandbox-log.txt b/Data/sandbox-log.txt index 4ae4d1b..cfc554a 100644 --- a/Data/sandbox-log.txt +++ b/Data/sandbox-log.txt @@ -1,713 +1,124 @@ -[02:46:38 PM] Info: Starting... +[04:15:30 PM] Info: Starting... KP3D version 2 =============================== Copyright (C) kpworld.xyz 2018-2024 Contact me! @kp_cftsz -[02:46:38 PM] Info: Initializing SDL -[02:46:38 PM] Info: Initializing OpenGL -[02:46:38 PM] Info: OpenGL version: 4.6.0 NVIDIA 517.70 -[02:46:38 PM] Info: Initializing GLEW -[02:46:38 PM] Info: Initializing SDL_mixer -[02:46:38 PM] Info: Reticulating splines... -[02:46:38 PM] Info: Ready! -[02:46:38 PM] Info: SECTOR HIERARCHY -[02:46:38 PM] Info: Sector 3 (area: 1) -[02:46:38 PM] Info: Parent: -[02:46:38 PM] Info: - 1 -[02:46:38 PM] Info: Children: -[02:46:38 PM] Info: - [NO CHILDREN] -[02:46:38 PM] Info: ----- -[02:46:38 PM] Info: Sector 4 (area: 1) -[02:46:38 PM] Info: Parent: -[02:46:38 PM] Info: - 2 -[02:46:38 PM] Info: Children: -[02:46:38 PM] Info: - [NO CHILDREN] -[02:46:38 PM] Info: ----- -[02:46:38 PM] Info: Sector 6 (area: 6) -[02:46:38 PM] Info: Parent: -[02:46:38 PM] Info: - 1 -[02:46:38 PM] Info: Children: -[02:46:38 PM] Info: - [NO CHILDREN] -[02:46:38 PM] Info: ----- -[02:46:38 PM] Info: Sector 2 (area: 19) -[02:46:38 PM] Info: Parent: -[02:46:38 PM] Info: - 1 -[02:46:38 PM] Info: Children: -[02:46:38 PM] Info: - 4 -[02:46:38 PM] Info: ----- -[02:46:38 PM] Info: Sector 5 (area: 34) -[02:46:38 PM] Info: Parent: -[02:46:38 PM] Info: - [NO PARENT] -[02:46:38 PM] Info: Children: -[02:46:38 PM] Info: - [NO CHILDREN] -[02:46:38 PM] Info: ----- -[02:46:38 PM] Info: Sector 1 (area: 105.5) -[02:46:38 PM] Info: Parent: -[02:46:38 PM] Info: - [NO PARENT] -[02:46:38 PM] Info: Children: -[02:46:38 PM] Info: - 3 -[02:46:38 PM] Info: - 6 -[02:46:38 PM] Info: - 2 -[02:46:38 PM] Info: ----- -[02:46:38 PM] Info: 3 IS CONNECTED TO 2 -[02:46:38 PM] Info: 3 IS CONNECTED TO 2 -[02:46:38 PM] Info: 1 IS CONNECTED TO 5 -[02:46:52 PM] Info: SECTOR HIERARCHY -[02:46:52 PM] Info: Sector 3 (area: 1) -[02:46:52 PM] Info: Parent: -[02:46:52 PM] Info: - 1 -[02:46:52 PM] Info: Children: -[02:46:52 PM] Info: - [NO CHILDREN] -[02:46:52 PM] Info: ----- -[02:46:52 PM] Info: Sector 4 (area: 1) -[02:46:52 PM] Info: Parent: -[02:46:52 PM] Info: - 2 -[02:46:52 PM] Info: Children: -[02:46:52 PM] Info: - [NO CHILDREN] -[02:46:52 PM] Info: ----- -[02:46:52 PM] Info: Sector 6 (area: 6) -[02:46:52 PM] Info: Parent: -[02:46:52 PM] Info: - 1 -[02:46:52 PM] Info: Children: -[02:46:52 PM] Info: - [NO CHILDREN] -[02:46:52 PM] Info: ----- -[02:46:52 PM] Info: Sector 2 (area: 19) -[02:46:52 PM] Info: Parent: -[02:46:52 PM] Info: - 1 -[02:46:52 PM] Info: Children: -[02:46:52 PM] Info: - 4 -[02:46:52 PM] Info: ----- -[02:46:52 PM] Info: Sector 5 (area: 34) -[02:46:52 PM] Info: Parent: -[02:46:52 PM] Info: - [NO PARENT] -[02:46:52 PM] Info: Children: -[02:46:52 PM] Info: - [NO CHILDREN] -[02:46:52 PM] Info: ----- -[02:46:52 PM] Info: Sector 7 (area: 98.5) -[02:46:52 PM] Info: Parent: -[02:46:52 PM] Info: - [NO PARENT] -[02:46:52 PM] Info: Children: -[02:46:52 PM] Info: - [NO CHILDREN] -[02:46:52 PM] Info: ----- -[02:46:52 PM] Info: Sector 1 (area: 105.5) -[02:46:52 PM] Info: Parent: -[02:46:52 PM] Info: - [NO PARENT] -[02:46:52 PM] Info: Children: -[02:46:52 PM] Info: - 3 -[02:46:52 PM] Info: - 6 -[02:46:52 PM] Info: - 2 -[02:46:52 PM] Info: ----- -[02:46:52 PM] Info: 3 IS CONNECTED TO 2 -[02:46:52 PM] Info: 3 IS CONNECTED TO 2 -[02:46:52 PM] Info: 5 IS CONNECTED TO 7 -[02:46:52 PM] Info: 1 IS CONNECTED TO 5 -[02:47:03 PM] Info: SECTOR HIERARCHY -[02:47:03 PM] Info: Sector 3 (area: 1) -[02:47:03 PM] Info: Parent: -[02:47:03 PM] Info: - 1 -[02:47:03 PM] Info: Children: -[02:47:03 PM] Info: - [NO CHILDREN] -[02:47:03 PM] Info: ----- -[02:47:03 PM] Info: Sector 4 (area: 1) -[02:47:03 PM] Info: Parent: -[02:47:03 PM] Info: - 2 -[02:47:03 PM] Info: Children: -[02:47:03 PM] Info: - [NO CHILDREN] -[02:47:03 PM] Info: ----- -[02:47:03 PM] Info: Sector 6 (area: 6) -[02:47:03 PM] Info: Parent: -[02:47:03 PM] Info: - 1 -[02:47:03 PM] Info: Children: -[02:47:03 PM] Info: - [NO CHILDREN] -[02:47:03 PM] Info: ----- -[02:47:03 PM] Info: Sector 2 (area: 19) -[02:47:03 PM] Info: Parent: -[02:47:03 PM] Info: - 1 -[02:47:03 PM] Info: Children: -[02:47:03 PM] Info: - 4 -[02:47:03 PM] Info: ----- -[02:47:03 PM] Info: Sector 5 (area: 34) -[02:47:03 PM] Info: Parent: -[02:47:03 PM] Info: - [NO PARENT] -[02:47:03 PM] Info: Children: -[02:47:03 PM] Info: - [NO CHILDREN] -[02:47:03 PM] Info: ----- -[02:47:03 PM] Info: Sector 7 (area: 98.5) -[02:47:03 PM] Info: Parent: -[02:47:03 PM] Info: - [NO PARENT] -[02:47:03 PM] Info: Children: -[02:47:03 PM] Info: - [NO CHILDREN] -[02:47:03 PM] Info: ----- -[02:47:03 PM] Info: Sector 1 (area: 105.5) -[02:47:03 PM] Info: Parent: -[02:47:03 PM] Info: - [NO PARENT] -[02:47:03 PM] Info: Children: -[02:47:03 PM] Info: - 3 -[02:47:03 PM] Info: - 6 -[02:47:03 PM] Info: - 2 -[02:47:03 PM] Info: ----- -[02:47:03 PM] Info: Sector 8 (area: 134.5) -[02:47:03 PM] Info: Parent: -[02:47:03 PM] Info: - [NO PARENT] -[02:47:03 PM] Info: Children: -[02:47:03 PM] Info: - [NO CHILDREN] -[02:47:03 PM] Info: ----- -[02:47:03 PM] Info: 3 IS CONNECTED TO 2 -[02:47:03 PM] Info: 3 IS CONNECTED TO 2 -[02:47:03 PM] Info: 5 IS CONNECTED TO 7 -[02:47:03 PM] Info: 7 IS CONNECTED TO 8 -[02:47:03 PM] Info: 1 IS CONNECTED TO 5 -[02:47:07 PM] Info: SECTOR HIERARCHY -[02:47:07 PM] Info: Sector 3 (area: 1) -[02:47:07 PM] Info: Parent: -[02:47:07 PM] Info: - 1 -[02:47:07 PM] Info: Children: -[02:47:07 PM] Info: - [NO CHILDREN] -[02:47:07 PM] Info: ----- -[02:47:07 PM] Info: Sector 4 (area: 1) -[02:47:07 PM] Info: Parent: -[02:47:07 PM] Info: - 2 -[02:47:07 PM] Info: Children: -[02:47:07 PM] Info: - [NO CHILDREN] -[02:47:07 PM] Info: ----- -[02:47:07 PM] Info: Sector 6 (area: 6) -[02:47:07 PM] Info: Parent: -[02:47:07 PM] Info: - 1 -[02:47:07 PM] Info: Children: -[02:47:07 PM] Info: - [NO CHILDREN] -[02:47:07 PM] Info: ----- -[02:47:07 PM] Info: Sector 2 (area: 19) -[02:47:07 PM] Info: Parent: -[02:47:07 PM] Info: - 1 -[02:47:07 PM] Info: Children: -[02:47:07 PM] Info: - 4 -[02:47:07 PM] Info: ----- -[02:47:07 PM] Info: Sector 9 (area: 32) -[02:47:07 PM] Info: Parent: -[02:47:07 PM] Info: - [NO PARENT] -[02:47:07 PM] Info: Children: -[02:47:07 PM] Info: - [NO CHILDREN] -[02:47:07 PM] Info: ----- -[02:47:07 PM] Info: Sector 5 (area: 34) -[02:47:07 PM] Info: Parent: -[02:47:07 PM] Info: - [NO PARENT] -[02:47:07 PM] Info: Children: -[02:47:07 PM] Info: - [NO CHILDREN] -[02:47:07 PM] Info: ----- -[02:47:07 PM] Info: Sector 7 (area: 98.5) -[02:47:07 PM] Info: Parent: -[02:47:07 PM] Info: - [NO PARENT] -[02:47:07 PM] Info: Children: -[02:47:07 PM] Info: - [NO CHILDREN] -[02:47:07 PM] Info: ----- -[02:47:07 PM] Info: Sector 1 (area: 105.5) -[02:47:07 PM] Info: Parent: -[02:47:07 PM] Info: - [NO PARENT] -[02:47:07 PM] Info: Children: -[02:47:07 PM] Info: - 3 -[02:47:07 PM] Info: - 6 -[02:47:07 PM] Info: - 2 -[02:47:07 PM] Info: ----- -[02:47:07 PM] Info: Sector 8 (area: 134.5) -[02:47:07 PM] Info: Parent: -[02:47:07 PM] Info: - [NO PARENT] -[02:47:07 PM] Info: Children: -[02:47:07 PM] Info: - [NO CHILDREN] -[02:47:07 PM] Info: ----- -[02:47:07 PM] Info: 3 IS CONNECTED TO 2 -[02:47:07 PM] Info: 3 IS CONNECTED TO 2 -[02:47:07 PM] Info: 9 IS CONNECTED TO 8 -[02:47:07 PM] Info: 5 IS CONNECTED TO 7 -[02:47:07 PM] Info: 7 IS CONNECTED TO 8 -[02:47:07 PM] Info: 1 IS CONNECTED TO 5 -[02:47:14 PM] Info: SECTOR HIERARCHY -[02:47:14 PM] Info: Sector 3 (area: 1) -[02:47:14 PM] Info: Parent: -[02:47:14 PM] Info: - 1 -[02:47:14 PM] Info: Children: -[02:47:14 PM] Info: - [NO CHILDREN] -[02:47:14 PM] Info: ----- -[02:47:14 PM] Info: Sector 4 (area: 1) -[02:47:14 PM] Info: Parent: -[02:47:14 PM] Info: - 2 -[02:47:14 PM] Info: Children: -[02:47:14 PM] Info: - [NO CHILDREN] -[02:47:14 PM] Info: ----- -[02:47:14 PM] Info: Sector 6 (area: 6) -[02:47:14 PM] Info: Parent: -[02:47:14 PM] Info: - 1 -[02:47:14 PM] Info: Children: -[02:47:14 PM] Info: - [NO CHILDREN] -[02:47:14 PM] Info: ----- -[02:47:14 PM] Info: Sector 2 (area: 19) -[02:47:14 PM] Info: Parent: -[02:47:14 PM] Info: - 1 -[02:47:14 PM] Info: Children: -[02:47:14 PM] Info: - 4 -[02:47:14 PM] Info: ----- -[02:47:14 PM] Info: Sector 9 (area: 32) -[02:47:14 PM] Info: Parent: -[02:47:14 PM] Info: - [NO PARENT] -[02:47:14 PM] Info: Children: -[02:47:14 PM] Info: - [NO CHILDREN] -[02:47:14 PM] Info: ----- -[02:47:14 PM] Info: Sector 5 (area: 34) -[02:47:14 PM] Info: Parent: -[02:47:14 PM] Info: - [NO PARENT] -[02:47:14 PM] Info: Children: -[02:47:14 PM] Info: - [NO CHILDREN] -[02:47:14 PM] Info: ----- -[02:47:14 PM] Info: Sector 10 (area: 51) -[02:47:14 PM] Info: Parent: -[02:47:14 PM] Info: - [NO PARENT] -[02:47:14 PM] Info: Children: -[02:47:14 PM] Info: - [NO CHILDREN] -[02:47:14 PM] Info: ----- -[02:47:14 PM] Info: Sector 7 (area: 98.5) -[02:47:14 PM] Info: Parent: -[02:47:14 PM] Info: - [NO PARENT] -[02:47:14 PM] Info: Children: -[02:47:14 PM] Info: - [NO CHILDREN] -[02:47:14 PM] Info: ----- -[02:47:14 PM] Info: Sector 1 (area: 105.5) -[02:47:14 PM] Info: Parent: -[02:47:14 PM] Info: - [NO PARENT] -[02:47:14 PM] Info: Children: -[02:47:14 PM] Info: - 3 -[02:47:14 PM] Info: - 6 -[02:47:14 PM] Info: - 2 -[02:47:14 PM] Info: ----- -[02:47:14 PM] Info: Sector 8 (area: 134.5) -[02:47:14 PM] Info: Parent: -[02:47:14 PM] Info: - [NO PARENT] -[02:47:14 PM] Info: Children: -[02:47:14 PM] Info: - [NO CHILDREN] -[02:47:14 PM] Info: ----- -[02:47:14 PM] Info: 3 IS CONNECTED TO 2 -[02:47:14 PM] Info: 3 IS CONNECTED TO 2 -[02:47:14 PM] Info: 9 IS CONNECTED TO 8 -[02:47:14 PM] Info: 9 IS CONNECTED TO 10 -[02:47:14 PM] Info: 5 IS CONNECTED TO 7 -[02:47:14 PM] Info: 7 IS CONNECTED TO 8 -[02:47:14 PM] Info: 1 IS CONNECTED TO 5 -[02:47:37 PM] Info: SECTOR HIERARCHY -[02:47:37 PM] Info: Sector 3 (area: 1) -[02:47:37 PM] Info: Parent: -[02:47:37 PM] Info: - 1 -[02:47:37 PM] Info: Children: -[02:47:37 PM] Info: - [NO CHILDREN] -[02:47:37 PM] Info: ----- -[02:47:37 PM] Info: Sector 4 (area: 1) -[02:47:37 PM] Info: Parent: -[02:47:37 PM] Info: - 2 -[02:47:37 PM] Info: Children: -[02:47:37 PM] Info: - [NO CHILDREN] -[02:47:37 PM] Info: ----- -[02:47:37 PM] Info: Sector 6 (area: 6) -[02:47:37 PM] Info: Parent: -[02:47:37 PM] Info: - 1 -[02:47:37 PM] Info: Children: -[02:47:37 PM] Info: - [NO CHILDREN] -[02:47:37 PM] Info: ----- -[02:47:37 PM] Info: Sector 2 (area: 19) -[02:47:37 PM] Info: Parent: -[02:47:37 PM] Info: - 1 -[02:47:37 PM] Info: Children: -[02:47:37 PM] Info: - 4 -[02:47:37 PM] Info: ----- -[02:47:37 PM] Info: Sector 9 (area: 32) -[02:47:37 PM] Info: Parent: -[02:47:37 PM] Info: - [NO PARENT] -[02:47:37 PM] Info: Children: -[02:47:37 PM] Info: - [NO CHILDREN] -[02:47:37 PM] Info: ----- -[02:47:37 PM] Info: Sector 5 (area: 34) -[02:47:37 PM] Info: Parent: -[02:47:37 PM] Info: - [NO PARENT] -[02:47:37 PM] Info: Children: -[02:47:37 PM] Info: - [NO CHILDREN] -[02:47:37 PM] Info: ----- -[02:47:37 PM] Info: Sector 10 (area: 51) -[02:47:37 PM] Info: Parent: -[02:47:37 PM] Info: - [NO PARENT] -[02:47:37 PM] Info: Children: -[02:47:37 PM] Info: - [NO CHILDREN] -[02:47:37 PM] Info: ----- -[02:47:37 PM] Info: Sector 7 (area: 98.5) -[02:47:37 PM] Info: Parent: -[02:47:37 PM] Info: - [NO PARENT] -[02:47:37 PM] Info: Children: -[02:47:37 PM] Info: - [NO CHILDREN] -[02:47:37 PM] Info: ----- -[02:47:37 PM] Info: Sector 1 (area: 105.5) -[02:47:37 PM] Info: Parent: -[02:47:37 PM] Info: - [NO PARENT] -[02:47:37 PM] Info: Children: -[02:47:37 PM] Info: - 3 -[02:47:37 PM] Info: - 6 -[02:47:37 PM] Info: - 2 -[02:47:37 PM] Info: ----- -[02:47:37 PM] Info: Sector 11 (area: 105.5) -[02:47:37 PM] Info: Parent: -[02:47:37 PM] Info: - [NO PARENT] -[02:47:37 PM] Info: Children: -[02:47:37 PM] Info: - [NO CHILDREN] -[02:47:37 PM] Info: ----- -[02:47:37 PM] Info: Sector 8 (area: 134.5) -[02:47:37 PM] Info: Parent: -[02:47:37 PM] Info: - [NO PARENT] -[02:47:37 PM] Info: Children: -[02:47:37 PM] Info: - [NO CHILDREN] -[02:47:37 PM] Info: ----- -[02:47:37 PM] Info: 3 IS CONNECTED TO 2 -[02:47:37 PM] Info: 3 IS CONNECTED TO 2 -[02:47:37 PM] Info: 9 IS CONNECTED TO 8 -[02:47:37 PM] Info: 9 IS CONNECTED TO 10 -[02:47:37 PM] Info: 5 IS CONNECTED TO 7 -[02:47:37 PM] Info: 7 IS CONNECTED TO 8 -[02:47:37 PM] Info: 1 IS CONNECTED TO 5 -[02:47:37 PM] Info: 1 IS CONNECTED TO 11 -[02:48:01 PM] Info: SECTOR HIERARCHY -[02:48:01 PM] Info: Sector 3 (area: 1) -[02:48:01 PM] Info: Parent: -[02:48:01 PM] Info: - 1 -[02:48:01 PM] Info: Children: -[02:48:01 PM] Info: - [NO CHILDREN] -[02:48:01 PM] Info: ----- -[02:48:01 PM] Info: Sector 4 (area: 1) -[02:48:01 PM] Info: Parent: -[02:48:01 PM] Info: - 2 -[02:48:01 PM] Info: Children: -[02:48:01 PM] Info: - [NO CHILDREN] -[02:48:01 PM] Info: ----- -[02:48:01 PM] Info: Sector 6 (area: 6) -[02:48:01 PM] Info: Parent: -[02:48:01 PM] Info: - 1 -[02:48:01 PM] Info: Children: -[02:48:01 PM] Info: - [NO CHILDREN] -[02:48:01 PM] Info: ----- -[02:48:01 PM] Info: Sector 2 (area: 19) -[02:48:01 PM] Info: Parent: -[02:48:01 PM] Info: - 1 -[02:48:01 PM] Info: Children: -[02:48:01 PM] Info: - 4 -[02:48:01 PM] Info: ----- -[02:48:01 PM] Info: Sector 9 (area: 32) -[02:48:01 PM] Info: Parent: -[02:48:01 PM] Info: - [NO PARENT] -[02:48:01 PM] Info: Children: -[02:48:01 PM] Info: - [NO CHILDREN] -[02:48:01 PM] Info: ----- -[02:48:01 PM] Info: Sector 5 (area: 34) -[02:48:01 PM] Info: Parent: -[02:48:01 PM] Info: - [NO PARENT] -[02:48:01 PM] Info: Children: -[02:48:01 PM] Info: - [NO CHILDREN] -[02:48:01 PM] Info: ----- -[02:48:01 PM] Info: Sector 10 (area: 51) -[02:48:01 PM] Info: Parent: -[02:48:01 PM] Info: - [NO PARENT] -[02:48:01 PM] Info: Children: -[02:48:01 PM] Info: - [NO CHILDREN] -[02:48:01 PM] Info: ----- -[02:48:01 PM] Info: Sector 12 (area: 91) -[02:48:01 PM] Info: Parent: -[02:48:01 PM] Info: - [NO PARENT] -[02:48:01 PM] Info: Children: -[02:48:01 PM] Info: - [NO CHILDREN] -[02:48:01 PM] Info: ----- -[02:48:01 PM] Info: Sector 7 (area: 98.5) -[02:48:01 PM] Info: Parent: -[02:48:01 PM] Info: - [NO PARENT] -[02:48:01 PM] Info: Children: -[02:48:01 PM] Info: - [NO CHILDREN] -[02:48:01 PM] Info: ----- -[02:48:01 PM] Info: Sector 1 (area: 105.5) -[02:48:01 PM] Info: Parent: -[02:48:01 PM] Info: - [NO PARENT] -[02:48:01 PM] Info: Children: -[02:48:01 PM] Info: - 3 -[02:48:01 PM] Info: - 6 -[02:48:01 PM] Info: - 2 -[02:48:01 PM] Info: ----- -[02:48:01 PM] Info: Sector 11 (area: 105.5) -[02:48:01 PM] Info: Parent: -[02:48:01 PM] Info: - [NO PARENT] -[02:48:01 PM] Info: Children: -[02:48:01 PM] Info: - [NO CHILDREN] -[02:48:01 PM] Info: ----- -[02:48:01 PM] Info: Sector 8 (area: 134.5) -[02:48:01 PM] Info: Parent: -[02:48:01 PM] Info: - [NO PARENT] -[02:48:01 PM] Info: Children: -[02:48:01 PM] Info: - [NO CHILDREN] -[02:48:01 PM] Info: ----- -[02:48:01 PM] Info: 3 IS CONNECTED TO 2 -[02:48:01 PM] Info: 3 IS CONNECTED TO 2 -[02:48:01 PM] Info: 9 IS CONNECTED TO 8 -[02:48:01 PM] Info: 9 IS CONNECTED TO 10 -[02:48:01 PM] Info: 5 IS CONNECTED TO 7 -[02:48:01 PM] Info: 5 IS CONNECTED TO 12 -[02:48:01 PM] Info: 7 IS CONNECTED TO 8 -[02:48:01 PM] Info: 1 IS CONNECTED TO 5 -[02:48:01 PM] Info: 1 IS CONNECTED TO 11 -[02:48:07 PM] Info: $ set-mode game -[02:48:07 PM] Info: $ -[02:48:09 PM] Info: SECTOR HIERARCHY -[02:48:09 PM] Info: Sector 3 (area: 1) -[02:48:09 PM] Info: Parent: -[02:48:09 PM] Info: - 1 -[02:48:09 PM] Info: Children: -[02:48:09 PM] Info: - [NO CHILDREN] -[02:48:09 PM] Info: ----- -[02:48:09 PM] Info: Sector 4 (area: 1) -[02:48:09 PM] Info: Parent: -[02:48:09 PM] Info: - 2 -[02:48:09 PM] Info: Children: -[02:48:09 PM] Info: - [NO CHILDREN] -[02:48:09 PM] Info: ----- -[02:48:09 PM] Info: Sector 6 (area: 6) -[02:48:09 PM] Info: Parent: -[02:48:09 PM] Info: - 1 -[02:48:09 PM] Info: Children: -[02:48:09 PM] Info: - [NO CHILDREN] -[02:48:09 PM] Info: ----- -[02:48:09 PM] Info: Sector 2 (area: 19) -[02:48:09 PM] Info: Parent: -[02:48:09 PM] Info: - 1 -[02:48:09 PM] Info: Children: -[02:48:09 PM] Info: - 4 -[02:48:09 PM] Info: ----- -[02:48:09 PM] Info: Sector 9 (area: 32) -[02:48:09 PM] Info: Parent: -[02:48:09 PM] Info: - [NO PARENT] -[02:48:09 PM] Info: Children: -[02:48:09 PM] Info: - [NO CHILDREN] -[02:48:09 PM] Info: ----- -[02:48:09 PM] Info: Sector 5 (area: 34) -[02:48:09 PM] Info: Parent: -[02:48:09 PM] Info: - [NO PARENT] -[02:48:09 PM] Info: Children: -[02:48:09 PM] Info: - [NO CHILDREN] -[02:48:09 PM] Info: ----- -[02:48:09 PM] Info: Sector 10 (area: 51) -[02:48:09 PM] Info: Parent: -[02:48:09 PM] Info: - [NO PARENT] -[02:48:09 PM] Info: Children: -[02:48:09 PM] Info: - [NO CHILDREN] -[02:48:09 PM] Info: ----- -[02:48:09 PM] Info: Sector 12 (area: 91) -[02:48:09 PM] Info: Parent: -[02:48:09 PM] Info: - [NO PARENT] -[02:48:09 PM] Info: Children: -[02:48:09 PM] Info: - [NO CHILDREN] -[02:48:09 PM] Info: ----- -[02:48:09 PM] Info: Sector 7 (area: 98.5) -[02:48:09 PM] Info: Parent: -[02:48:09 PM] Info: - [NO PARENT] -[02:48:09 PM] Info: Children: -[02:48:09 PM] Info: - [NO CHILDREN] -[02:48:09 PM] Info: ----- -[02:48:09 PM] Info: Sector 1 (area: 105.5) -[02:48:09 PM] Info: Parent: -[02:48:09 PM] Info: - [NO PARENT] -[02:48:09 PM] Info: Children: -[02:48:09 PM] Info: - 3 -[02:48:09 PM] Info: - 6 -[02:48:09 PM] Info: - 2 -[02:48:09 PM] Info: ----- -[02:48:09 PM] Info: Sector 11 (area: 105.5) -[02:48:09 PM] Info: Parent: -[02:48:09 PM] Info: - [NO PARENT] -[02:48:09 PM] Info: Children: -[02:48:09 PM] Info: - [NO CHILDREN] -[02:48:09 PM] Info: ----- -[02:48:09 PM] Info: Sector 8 (area: 134.5) -[02:48:09 PM] Info: Parent: -[02:48:09 PM] Info: - [NO PARENT] -[02:48:09 PM] Info: Children: -[02:48:09 PM] Info: - [NO CHILDREN] -[02:48:09 PM] Info: ----- -[02:48:09 PM] Info: 3 IS CONNECTED TO 2 -[02:48:09 PM] Info: 3 IS CONNECTED TO 2 -[02:48:09 PM] Info: 9 IS CONNECTED TO 8 -[02:48:09 PM] Info: 9 IS CONNECTED TO 10 -[02:48:09 PM] Info: 5 IS CONNECTED TO 7 -[02:48:09 PM] Info: 5 IS CONNECTED TO 12 -[02:48:09 PM] Info: 7 IS CONNECTED TO 8 -[02:48:09 PM] Info: 1 IS CONNECTED TO 5 -[02:48:09 PM] Info: 1 IS CONNECTED TO 11 -[02:48:10 PM] Info: SECTOR HIERARCHY -[02:48:10 PM] Info: Sector 3 (area: 1) -[02:48:10 PM] Info: Parent: -[02:48:10 PM] Info: - 1 -[02:48:10 PM] Info: Children: -[02:48:10 PM] Info: - [NO CHILDREN] -[02:48:10 PM] Info: ----- -[02:48:10 PM] Info: Sector 4 (area: 1) -[02:48:10 PM] Info: Parent: -[02:48:10 PM] Info: - 2 -[02:48:10 PM] Info: Children: -[02:48:10 PM] Info: - [NO CHILDREN] -[02:48:10 PM] Info: ----- -[02:48:10 PM] Info: Sector 6 (area: 6) -[02:48:10 PM] Info: Parent: -[02:48:10 PM] Info: - 1 -[02:48:10 PM] Info: Children: -[02:48:10 PM] Info: - [NO CHILDREN] -[02:48:10 PM] Info: ----- -[02:48:10 PM] Info: Sector 2 (area: 19) -[02:48:10 PM] Info: Parent: -[02:48:10 PM] Info: - 1 -[02:48:10 PM] Info: Children: -[02:48:10 PM] Info: - 4 -[02:48:10 PM] Info: ----- -[02:48:10 PM] Info: Sector 9 (area: 32) -[02:48:10 PM] Info: Parent: -[02:48:10 PM] Info: - [NO PARENT] -[02:48:10 PM] Info: Children: -[02:48:10 PM] Info: - [NO CHILDREN] -[02:48:10 PM] Info: ----- -[02:48:10 PM] Info: Sector 5 (area: 34) -[02:48:10 PM] Info: Parent: -[02:48:10 PM] Info: - [NO PARENT] -[02:48:10 PM] Info: Children: -[02:48:10 PM] Info: - [NO CHILDREN] -[02:48:10 PM] Info: ----- -[02:48:10 PM] Info: Sector 10 (area: 51) -[02:48:10 PM] Info: Parent: -[02:48:10 PM] Info: - [NO PARENT] -[02:48:10 PM] Info: Children: -[02:48:10 PM] Info: - [NO CHILDREN] -[02:48:10 PM] Info: ----- -[02:48:10 PM] Info: Sector 12 (area: 91) -[02:48:10 PM] Info: Parent: -[02:48:10 PM] Info: - [NO PARENT] -[02:48:10 PM] Info: Children: -[02:48:10 PM] Info: - [NO CHILDREN] -[02:48:10 PM] Info: ----- -[02:48:10 PM] Info: Sector 7 (area: 98.5) -[02:48:10 PM] Info: Parent: -[02:48:10 PM] Info: - [NO PARENT] -[02:48:10 PM] Info: Children: -[02:48:10 PM] Info: - [NO CHILDREN] -[02:48:10 PM] Info: ----- -[02:48:10 PM] Info: Sector 1 (area: 105.5) -[02:48:10 PM] Info: Parent: -[02:48:10 PM] Info: - [NO PARENT] -[02:48:10 PM] Info: Children: -[02:48:10 PM] Info: - 3 -[02:48:10 PM] Info: - 6 -[02:48:10 PM] Info: - 2 -[02:48:10 PM] Info: ----- -[02:48:10 PM] Info: Sector 11 (area: 105.5) -[02:48:10 PM] Info: Parent: -[02:48:10 PM] Info: - [NO PARENT] -[02:48:10 PM] Info: Children: -[02:48:10 PM] Info: - [NO CHILDREN] -[02:48:10 PM] Info: ----- -[02:48:10 PM] Info: Sector 8 (area: 134.5) -[02:48:10 PM] Info: Parent: -[02:48:10 PM] Info: - [NO PARENT] -[02:48:10 PM] Info: Children: -[02:48:10 PM] Info: - [NO CHILDREN] -[02:48:10 PM] Info: ----- -[02:48:10 PM] Info: 3 IS CONNECTED TO 2 -[02:48:10 PM] Info: 3 IS CONNECTED TO 2 -[02:48:10 PM] Info: 9 IS CONNECTED TO 8 -[02:48:10 PM] Info: 9 IS CONNECTED TO 10 -[02:48:10 PM] Info: 5 IS CONNECTED TO 7 -[02:48:10 PM] Info: 5 IS CONNECTED TO 12 -[02:48:10 PM] Info: 7 IS CONNECTED TO 8 -[02:48:10 PM] Info: 1 IS CONNECTED TO 5 -[02:48:10 PM] Info: 1 IS CONNECTED TO 11 -[02:48:35 PM] Info: $ set-mode edit -[02:48:35 PM] Info: $ -[02:48:51 PM] Info: SECTOR HIERARCHY -[02:48:51 PM] Info: Sector 3 (area: 1) -[02:48:51 PM] Info: Parent: -[02:48:51 PM] Info: - 1 -[02:48:51 PM] Info: Children: -[02:48:51 PM] Info: - [NO CHILDREN] -[02:48:51 PM] Info: ----- -[02:48:51 PM] Info: Sector 4 (area: 1) -[02:48:51 PM] Info: Parent: -[02:48:51 PM] Info: - 2 -[02:48:51 PM] Info: Children: -[02:48:51 PM] Info: - [NO CHILDREN] -[02:48:51 PM] Info: ----- -[02:48:51 PM] Info: Sector 6 (area: 6) -[02:48:51 PM] Info: Parent: -[02:48:51 PM] Info: - 1 -[02:48:51 PM] Info: Children: -[02:48:51 PM] Info: - [NO CHILDREN] -[02:48:51 PM] Info: ----- -[02:48:51 PM] Info: Sector 2 (area: 19) -[02:48:51 PM] Info: Parent: -[02:48:51 PM] Info: - 1 -[02:48:51 PM] Info: Children: -[02:48:51 PM] Info: - 4 -[02:48:51 PM] Info: ----- -[02:48:51 PM] Info: Sector 9 (area: 32) -[02:48:51 PM] Info: Parent: -[02:48:51 PM] Info: - [NO PARENT] -[02:48:51 PM] Info: Children: -[02:48:51 PM] Info: - [NO CHILDREN] -[02:48:51 PM] Info: ----- -[02:48:51 PM] Info: Sector 5 (area: 34) -[02:48:51 PM] Info: Parent: -[02:48:51 PM] Info: - [NO PARENT] -[02:48:51 PM] Info: Children: -[02:48:51 PM] Info: - [NO CHILDREN] -[02:48:51 PM] Info: ----- -[02:48:51 PM] Info: Sector 10 (area: 51) -[02:48:51 PM] Info: Parent: -[02:48:51 PM] Info: - [NO PARENT] -[02:48:51 PM] Info: Children: -[02:48:51 PM] Info: - [NO CHILDREN] -[02:48:51 PM] Info: ----- -[02:48:51 PM] Info: Sector 13 (area: 80.5) -[02:48:51 PM] Info: Parent: -[02:48:51 PM] Info: - [NO PARENT] -[02:48:51 PM] Info: Children: -[02:48:51 PM] Info: - [NO CHILDREN] -[02:48:51 PM] Info: ----- -[02:48:51 PM] Info: Sector 12 (area: 91) -[02:48:51 PM] Info: Parent: -[02:48:51 PM] Info: - [NO PARENT] -[02:48:51 PM] Info: Children: -[02:48:51 PM] Info: - [NO CHILDREN] -[02:48:51 PM] Info: ----- -[02:48:51 PM] Info: Sector 7 (area: 98.5) -[02:48:51 PM] Info: Parent: -[02:48:51 PM] Info: - [NO PARENT] -[02:48:51 PM] Info: Children: -[02:48:51 PM] Info: - [NO CHILDREN] -[02:48:51 PM] Info: ----- -[02:48:51 PM] Info: Sector 1 (area: 105.5) -[02:48:51 PM] Info: Parent: -[02:48:51 PM] Info: - [NO PARENT] -[02:48:51 PM] Info: Children: -[02:48:51 PM] Info: - 3 -[02:48:51 PM] Info: - 6 -[02:48:51 PM] Info: - 2 -[02:48:51 PM] Info: ----- -[02:48:51 PM] Info: Sector 11 (area: 105.5) -[02:48:51 PM] Info: Parent: -[02:48:51 PM] Info: - [NO PARENT] -[02:48:51 PM] Info: Children: -[02:48:51 PM] Info: - [NO CHILDREN] -[02:48:51 PM] Info: ----- -[02:48:51 PM] Info: Sector 8 (area: 134.5) -[02:48:51 PM] Info: Parent: -[02:48:51 PM] Info: - [NO PARENT] -[02:48:51 PM] Info: Children: -[02:48:51 PM] Info: - [NO CHILDREN] -[02:48:51 PM] Info: ----- -[02:48:51 PM] Info: 3 IS CONNECTED TO 2 -[02:48:51 PM] Info: 3 IS CONNECTED TO 2 -[02:48:51 PM] Info: 9 IS CONNECTED TO 8 -[02:48:51 PM] Info: 9 IS CONNECTED TO 10 -[02:48:51 PM] Info: 5 IS \ No newline at end of file +[04:15:30 PM] Info: Initializing SDL +[04:15:30 PM] Info: Initializing OpenGL +[04:15:30 PM] Info: OpenGL version: 4.6.0 NVIDIA 517.70 +[04:15:30 PM] Info: Initializing GLEW +[04:15:30 PM] Info: Initializing SDL_mixer +[04:15:30 PM] Info: Reticulating splines... +[04:15:30 PM] Info: Ready! +[04:15:31 PM] Info: SECTOR HIERARCHY +[04:15:31 PM] Info: Sector 3 (area: 1) +[04:15:31 PM] Info: Parent: +[04:15:31 PM] Info: - 1 +[04:15:31 PM] Info: Children: +[04:15:31 PM] Info: - [NO CHILDREN] +[04:15:31 PM] Info: ----- +[04:15:31 PM] Info: Sector 4 (area: 1) +[04:15:31 PM] Info: Parent: +[04:15:31 PM] Info: - 2 +[04:15:31 PM] Info: Children: +[04:15:31 PM] Info: - [NO CHILDREN] +[04:15:31 PM] Info: ----- +[04:15:31 PM] Info: Sector 6 (area: 6) +[04:15:31 PM] Info: Parent: +[04:15:31 PM] Info: - 1 +[04:15:31 PM] Info: Children: +[04:15:31 PM] Info: - [NO CHILDREN] +[04:15:31 PM] Info: ----- +[04:15:31 PM] Info: Sector 2 (area: 19) +[04:15:31 PM] Info: Parent: +[04:15:31 PM] Info: - 1 +[04:15:31 PM] Info: Children: +[04:15:31 PM] Info: - 4 +[04:15:31 PM] Info: ----- +[04:15:31 PM] Info: Sector 5 (area: 34) +[04:15:31 PM] Info: Parent: +[04:15:31 PM] Info: - [NO PARENT] +[04:15:31 PM] Info: Children: +[04:15:31 PM] Info: - [NO CHILDREN] +[04:15:31 PM] Info: ----- +[04:15:31 PM] Info: Sector 1 (area: 105.5) +[04:15:31 PM] Info: Parent: +[04:15:31 PM] Info: - [NO PARENT] +[04:15:31 PM] Info: Children: +[04:15:31 PM] Info: - 3 +[04:15:31 PM] Info: - 6 +[04:15:31 PM] Info: - 2 +[04:15:31 PM] Info: ----- +[04:16:52 PM] Info: SECTOR HIERARCHY +[04:16:52 PM] Info: Sector 3 (area: 1) +[04:16:52 PM] Info: Parent: +[04:16:52 PM] Info: - 1 +[04:16:52 PM] Info: Children: +[04:16:52 PM] Info: - [NO CHILDREN] +[04:16:52 PM] Info: ----- +[04:16:52 PM] Info: Sector 4 (area: 1) +[04:16:52 PM] Info: Parent: +[04:16:52 PM] Info: - 2 +[04:16:52 PM] Info: Children: +[04:16:52 PM] Info: - [NO CHILDREN] +[04:16:52 PM] Info: ----- +[04:16:52 PM] Info: Sector 6 (area: 6) +[04:16:52 PM] Info: Parent: +[04:16:52 PM] Info: - 1 +[04:16:52 PM] Info: Children: +[04:16:52 PM] Info: - [NO CHILDREN] +[04:16:52 PM] Info: ----- +[04:16:52 PM] Info: Sector 7 (area: 16) +[04:16:52 PM] Info: Parent: +[04:16:52 PM] Info: - [NO PARENT] +[04:16:52 PM] Info: Children: +[04:16:52 PM] Info: - [NO CHILDREN] +[04:16:52 PM] Info: ----- +[04:16:52 PM] Info: Sector 2 (area: 19) +[04:16:52 PM] Info: Parent: +[04:16:52 PM] Info: - 1 +[04:16:52 PM] Info: Children: +[04:16:52 PM] Info: - 4 +[04:16:52 PM] Info: ----- +[04:16:52 PM] Info: Sector 5 (area: 34) +[04:16:52 PM] Info: Parent: +[04:16:52 PM] Info: - [NO PARENT] +[04:16:52 PM] Info: Children: +[04:16:52 PM] Info: - [NO CHILDREN] +[04:16:52 PM] Info: ----- +[04:16:52 PM] Info: Sector 1 (area: 105.5) +[04:16:52 PM] Info: Parent: +[04:16:52 PM] Info: - [NO PARENT] +[04:16:52 PM] Info: Children: +[04:16:52 PM] Info: - 3 +[04:16:52 PM] Info: - 6 +[04:16:52 PM] Info: - 2 +[04:16:52 PM] Info: ----- +[04:16:57 PM] Info: SECTOR HIERARCHY +[04:16:57 PM] Info: Sector 3 (area: 1) +[04:16:57 PM] Info: Parent: +[04:16:57 PM] Info: - 1 +[04:16:57 PM] Info: Children: +[04:16:57 PM] Info: - [NO CHILDREN] +[04:16:57 PM] Info: ----- +[04:16:57 PM] Info: Sector 4 (area: 1) +[04:16:57 PM] Info: Parent: +[04:16:57 PM] Info: - 2 +[04:16:57 PM] Info: Children: +[04:16:57 PM] Info: - [NO CHILDREN] +[04:16:57 PM] Info: ----- +[04:16:57 PM] Info: Sector 8 (area: 4) +[04:16:57 PM] Info: Parent: +[04:16:57 PM] Info: - [NO PARENT] +[04:16:57 PM] Info: Children: +[04:16:57 PM] Info: - [NO CHILDREN] +[04:16:57 PM] Info: ----- +[04:16:57 PM] Info: Sector 6 (area: 6) +[04:16:57 PM] Info: Parent: +[04:16:57 PM] Info: - 1 +[04:16:57 PM] Info: Children: +[04:16:57 PM] Info: - [NO CHILDREN] +[04:16:57 PM] Info: ----- +[04:16:57 PM] Info: Sector 7 \ No newline at end of file diff --git a/KP3Dii/src/KP3D_Map.cpp b/KP3Dii/src/KP3D_Map.cpp index 0ce4c8b..439a3d7 100644 --- a/KP3Dii/src/KP3D_Map.cpp +++ b/KP3Dii/src/KP3D_Map.cpp @@ -265,12 +265,11 @@ void Map::BuildWall(Sector& sector, Wall& wall) if (wall.flags & Wall::FLAG_OPENING) { - // Build upper and lower walls for sectors connected to other sectors - // Kinda inefficient the way I'm doing this but whatever YOLO etc. - BuildQuad(sector, sector.floor, wall.portal->floor, wall.textures[TEX_LOWER], a, b, false, false, false, wall.uv_offset[TEX_LOWER]); - BuildQuad(sector, sector.floor, wall.portal->floor, wall.textures[TEX_LOWER], a, b, true, false, false, wall.uv_offset[TEX_LOWER]); - BuildQuad(sector, sector.ceiling, wall.portal->ceiling, wall.textures[TEX_UPPER], a, b, true, false, false, wall.uv_offset[TEX_UPPER]); - BuildQuad(sector, sector.ceiling, wall.portal->ceiling, wall.textures[TEX_UPPER], a, b, false, false, false, wall.uv_offset[TEX_UPPER]); + // Build upper and lower walls for sectors connected to other sectors (or sectors within sectors) + bool flip = wall.portal->floor.base_height < sector.floor.base_height; + BuildQuad(sector, sector.floor, wall.portal->floor, wall.textures[TEX_LOWER], a, b, flip, false, false, wall.uv_offset[TEX_LOWER]); + flip = wall.portal->ceiling.base_height < sector.ceiling.base_height; + BuildQuad(sector, sector.ceiling, wall.portal->ceiling, wall.textures[TEX_UPPER], a, b, !flip, false, false, wall.uv_offset[TEX_UPPER]); } } @@ -281,8 +280,6 @@ void Map::JoinSectors(Sector& sector) for (int i = 0; i < sector.walls.size(); i++) { Wall& ld = sector.walls[i]; - // Clipper2Lib::PathD p; - // p.push_back({ld.start.x, ld.start.y}); for (Sector& s: sectors) { if (s.id == sector.id) @@ -299,28 +296,54 @@ void Map::JoinSectors(Sector& sector) for (Wall& l : s.walls) { - // Clipper2Lib::PointD pi = { l.start.x, l.start.y }; - bool good = false; - bool same_points = PosCmp({l.start.x, 0.0f, l.start.y}, {pos_a.x, 0.0f, pos_a.z}, e) || - PosCmp({l.start.x, 0.0f, l.start.y}, {pos_b.x, 0.0f, pos_b.z}, e) || - PosCmp({l.end.x, 0.0f, l.end.y}, {pos_b.x, 0.0f, pos_b.z}, e) || - PosCmp({l.end.x, 0.0f, l.end.y}, {pos_a.x, 0.0f, pos_a.z}, e); + bool start_cmp = PosCmp({l.start.x, 0.0f, l.start.y}, {pos_a.x, 0.0f, pos_a.z}, e) || + PosCmp({l.start.x, 0.0f, l.start.y}, {pos_b.x, 0.0f, pos_b.z}, e); + bool end_cmp = PosCmp({l.end.x, 0.0f, l.end.y}, {pos_b.x, 0.0f, pos_b.z}, e) || + PosCmp({l.end.x, 0.0f, l.end.y}, {pos_a.x, 0.0f, pos_a.z}, e); + bool same_points = start_cmp || end_cmp; + bool start_on_seg = PointInLine(l.start, {pos_a.x, pos_a.z}, {pos_b.x, pos_b.z}); + bool end_on_seg = PointInLine(l.end, {pos_a.x, pos_a.z}, {pos_b.x, pos_b.z}); + bool on_segment = start_on_seg && end_on_seg; - bool on_segment = PointInLine(l.start, {pos_a.x, pos_a.z}, {pos_b.x, pos_b.z}) && - PointInLine(l.end, {pos_a.x, pos_a.z}, {pos_b.x, pos_b.z}); + bool left_join = start_on_seg && end_cmp; + bool right_join = end_on_seg && start_cmp; if (on_segment && not_child) good = true; if (good && !l.portal && !ld.portal) { + // Partial join + //if (left_join && !right_join) + //{ + // XYf old_end = ld.end; + // ld.end.x = l.start.x; + // ld.end.y = l.start.y; + // ld.flags = Wall::FLAG_TOUCHED; + // ld.textures[TEX_FRONT] = nullptr; + // ld.flags = Wall::FLAG_OPENING; + // ld.portal = &s; + // Wall w1 = ld; + // w1.flags = Wall::FLAG_TOUCHED; + // w1.start.x = ld.end.x; + // w1.start.y = ld.end.y; + // w1.end.x = l.end.x; + // w1.end.y = l.end.y; + // + // InsertLine(sector.walls, i + 1, w1); + // // InsertLine(sector.walls, i + 2, w2); + //} + //else if (same_points) { - ld.textures[TEX_FRONT] = nullptr; - ld.flags = Wall::FLAG_OPENING | Wall::FLAG_TOUCHED; - ld.portal = &s; + if (!sector.inverted) + { + ld.textures[TEX_FRONT] = nullptr; + ld.flags = Wall::FLAG_OPENING | Wall::FLAG_TOUCHED; + ld.portal = &s; + } } - else + else if (on_segment) { XYf old_end = ld.end; ld.end.x = l.end.x; @@ -335,18 +358,18 @@ void Map::JoinSectors(Sector& sector) w1.flags = Wall::FLAG_OPENING; w1.portal = &s; w1.flags = Wall::FLAG_TOUCHED; - Wall w2 = ld; - w2.start.x = w1.end.x; - w2.start.y = w1.end.y; - w2.end.x = old_end.x; - w2.end.y = old_end.y; - w2.flags = Wall::FLAG_TOUCHED; - InsertLine(sector.walls, i + 1, w1); - InsertLine(sector.walls, i + 2, w2); - } + if (right_join && !left_join) { + Wall w2 = ld; + w2.start.x = w1.end.x; + w2.start.y = w1.end.y; + w2.end.x = old_end.x; + w2.end.y = old_end.y; + w2.flags = Wall::FLAG_TOUCHED; + InsertLine(sector.walls, i + 2, w2); + } - KP3D_LOG_INFO("{} IS CONNECTED TO {}", sector.id, s.id); + } // Mark the other one as an opening // This really shouldn't be necessary I think, but whatever @@ -408,7 +431,7 @@ void Map::Init() build_sector(&tex4, &tex2, &tex2, -1.5f, 4.0f, 2, points2, std::size(points2)); build_sector(&tex4, &tex, &tex2, -1.5f, 5.0f, 3, points3, std::size(points3), true); build_sector(&tex4, &tex, &tex2, -1.5f, 4.0f, 4, points4, std::size(points4), true); - build_sector(&tex3, &tex, &tex2, test_u, test_l, 5, points5, std::size(points5), false); + build_sector(&tex3, &tex, &tex2, 0.0f, 2.0f, 5, points5, std::size(points5), false); build_sector(&tex4, &tex4, &tex4, 1.0f, 1.4f, 6, points6, std::size(points6), true); Rebuild(GEN_NORMALS); @@ -528,8 +551,8 @@ void Map::Rebuild(NormalGenType gen_normals) { float yv0 = PerlinNoise2D(steiner_point.x, steiner_point.y, 1.0, 10.0); float yv1 = -PerlinNoise2D(steiner_point.x, steiner_point.y, 0.5, 9.0); - //s.floor.steiner_points.push_back({ steiner_point.x, yv0, steiner_point.y }); - //s.ceiling.steiner_points.push_back({ steiner_point.x, yv1, steiner_point.y }); + s.floor.steiner_points.push_back({ steiner_point.x, yv0, steiner_point.y }); + s.ceiling.steiner_points.push_back({ steiner_point.x, yv1, steiner_point.y }); } } }