From e05197302202c38ac7ba19cba2c6dec2920c5f9c Mon Sep 17 00:00:00 2001 From: KP Date: Tue, 30 Jul 2024 23:40:01 -0500 Subject: [PATCH] poopy --- Data/sandbox-log.txt | 461 +++++++++++++++++++++++++---------------- Sandbox/src/Editor.cpp | 92 ++++---- 2 files changed, 334 insertions(+), 219 deletions(-) diff --git a/Data/sandbox-log.txt b/Data/sandbox-log.txt index 1e26069..37ee6c9 100644 --- a/Data/sandbox-log.txt +++ b/Data/sandbox-log.txt @@ -1,180 +1,293 @@ -[11:09:01 PM] Info: Starting... +[11:38:30 PM] Info: Starting... KP3D version 2 =============================== Copyright (C) kpworld.xyz 2018-2024 Contact me! @kp_cftsz -[11:09:01 PM] Info: Initializing SDL -[11:09:01 PM] Info: Initializing OpenGL -[11:09:01 PM] Info: OpenGL version: 4.6.0 NVIDIA 536.23 -[11:09:01 PM] Info: Initializing GLEW -[11:09:01 PM] Info: Initializing SDL_mixer -[11:09:01 PM] Info: Reticulating splines... -[11:09:01 PM] Info: Ready! -[11:09:01 PM] Info: Loading material resource: block.png -[11:09:01 PM] Info: Found normal map texture: materials/block_n.png -[11:09:01 PM] Info: Loading material resource: FLAT5_7.png -[11:09:01 PM] Info: Found normal map texture: materials/FLAT5_7_n.png -[11:09:01 PM] Info: Loading material resource: floor0.png -[11:09:01 PM] Info: Found normal map texture: materials/floor0_n.png -[11:09:01 PM] Info: Loading material resource: floor1.png -[11:09:01 PM] Info: Found normal map texture: materials/floor1_n.png -[11:09:01 PM] Info: Loading material resource: GRASS2.png -[11:09:01 PM] Info: Found normal map texture: materials/GRASS2_n.png -[11:09:01 PM] Info: Map init -[11:09:01 PM] Info: Finalized mesh with 45 batches -[11:09:16 PM] Info: Finalized mesh with 44 batches -[11:09:16 PM] Info: Finalized mesh with 44 batches -[11:09:16 PM] Info: Finalized mesh with 44 batches -[11:09:16 PM] Info: Finalized mesh with 44 batches -[11:09:16 PM] Info: Finalized mesh with 44 batches -[11:09:16 PM] Info: Finalized mesh with 44 batches -[11:09:16 PM] Info: Finalized mesh with 44 batches -[11:09:16 PM] Info: Finalized mesh with 44 batches -[11:09:16 PM] Info: Finalized mesh with 44 batches -[11:09:16 PM] Info: Finalized mesh with 44 batches -[11:09:16 PM] Info: Finalized mesh with 44 batches -[11:09:16 PM] Info: Finalized mesh with 44 batches -[11:09:16 PM] Info: Finalized mesh with 44 batches -[11:09:16 PM] Info: Finalized mesh with 44 batches -[11:09:16 PM] Info: Finalized mesh with 44 batches -[11:09:16 PM] Info: Finalized mesh with 44 batches -[11:09:16 PM] Info: Finalized mesh with 44 batches -[11:09:16 PM] Info: Finalized mesh with 44 batches -[11:09:16 PM] Info: Finalized mesh with 44 batches -[11:09:16 PM] Info: Finalized mesh with 44 batches -[11:09:16 PM] Info: Finalized mesh with 44 batches -[11:09:16 PM] Info: Finalized mesh with 44 batches -[11:09:16 PM] Info: Finalized mesh with 44 batches -[11:09:16 PM] Info: Finalized mesh with 44 batches -[11:09:17 PM] Info: Finalized mesh with 44 batches -[11:09:17 PM] Info: Finalized mesh with 44 batches -[11:09:17 PM] Info: Finalized mesh with 44 batches -[11:09:17 PM] Info: Finalized mesh with 44 batches -[11:09:17 PM] Info: Finalized mesh with 44 batches -[11:09:17 PM] Info: Finalized mesh with 44 batches -[11:09:17 PM] Info: Finalized mesh with 44 batches -[11:09:17 PM] Info: Finalized mesh with 44 batches -[11:09:17 PM] Info: Finalized mesh with 44 batches -[11:09:17 PM] Info: Finalized mesh with 44 batches -[11:09:17 PM] Info: Finalized mesh with 44 batches -[11:09:17 PM] Info: Finalized mesh with 44 batches -[11:09:17 PM] Info: Finalized mesh with 44 batches -[11:09:17 PM] Info: Finalized mesh with 44 batches -[11:09:17 PM] Info: Finalized mesh with 44 batches -[11:09:17 PM] Info: Finalized mesh with 44 batches -[11:09:17 PM] Info: Finalized mesh with 44 batches -[11:09:17 PM] Info: Finalized mesh with 44 batches -[11:09:17 PM] Info: Finalized mesh with 44 batches -[11:09:17 PM] Info: Finalized mesh with 44 batches -[11:09:17 PM] Info: Finalized mesh with 44 batches -[11:09:17 PM] Info: Finalized mesh with 44 batches -[11:09:17 PM] Info: Finalized mesh with 44 batches -[11:09:17 PM] Info: Finalized mesh with 44 batches -[11:09:17 PM] Info: Finalized mesh with 44 batches -[11:09:17 PM] Info: Finalized mesh with 44 batches -[11:09:17 PM] Info: Finalized mesh with 44 batches -[11:09:17 PM] Info: Finalized mesh with 44 batches -[11:09:17 PM] Info: Finalized mesh with 44 batches -[11:09:17 PM] Info: Finalized mesh with 44 batches -[11:09:17 PM] Info: Finalized mesh with 44 batches -[11:09:17 PM] Info: Finalized mesh with 44 batches -[11:09:17 PM] Info: Finalized mesh with 44 batches -[11:09:17 PM] Info: Finalized mesh with 44 batches -[11:09:17 PM] Info: Finalized mesh with 44 batches -[11:09:17 PM] Info: Finalized mesh with 44 batches -[11:09:17 PM] Info: Finalized mesh with 44 batches -[11:09:17 PM] Info: Finalized mesh with 44 batches -[11:09:17 PM] Info: Finalized mesh with 44 batches -[11:09:17 PM] Info: Finalized mesh with 44 batches -[11:09:17 PM] Info: Finalized mesh with 44 batches -[11:09:17 PM] Info: Finalized mesh with 44 batches -[11:09:17 PM] Info: Finalized mesh with 44 batches -[11:09:17 PM] Info: Finalized mesh with 44 batches -[11:09:24 PM] Info: Finalized mesh with 44 batches -[11:09:24 PM] Info: Finalized mesh with 44 batches -[11:09:24 PM] Info: Finalized mesh with 44 batches -[11:09:24 PM] Info: Finalized mesh with 44 batches -[11:09:24 PM] Info: Finalized mesh with 44 batches -[11:09:24 PM] Info: Finalized mesh with 44 batches -[11:09:24 PM] Info: Finalized mesh with 44 batches -[11:09:24 PM] Info: Finalized mesh with 44 batches -[11:09:24 PM] Info: Finalized mesh with 44 batches -[11:09:24 PM] Info: Finalized mesh with 44 batches -[11:09:24 PM] Info: Finalized mesh with 44 batches -[11:09:24 PM] Info: Finalized mesh with 44 batches -[11:09:24 PM] Info: Finalized mesh with 44 batches -[11:09:24 PM] Info: Finalized mesh with 44 batches -[11:09:24 PM] Info: Finalized mesh with 44 batches -[11:09:24 PM] Info: Finalized mesh with 44 batches -[11:09:24 PM] Info: Finalized mesh with 44 batches -[11:09:24 PM] Info: Finalized mesh with 44 batches -[11:09:24 PM] Info: Finalized mesh with 44 batches -[11:09:24 PM] Info: Finalized mesh with 44 batches -[11:09:24 PM] Info: Finalized mesh with 44 batches -[11:09:24 PM] Info: Finalized mesh with 44 batches -[11:09:24 PM] Info: Finalized mesh with 44 batches -[11:09:24 PM] Info: Finalized mesh with 44 batches -[11:09:24 PM] Info: Finalized mesh with 44 batches -[11:09:24 PM] Info: Finalized mesh with 44 batches -[11:09:24 PM] Info: Finalized mesh with 44 batches -[11:09:24 PM] Info: Finalized mesh with 44 batches -[11:09:24 PM] Info: Finalized mesh with 44 batches -[11:09:25 PM] Info: Finalized mesh with 44 batches -[11:09:25 PM] Info: Finalized mesh with 44 batches -[11:09:25 PM] Info: Finalized mesh with 44 batches -[11:09:25 PM] Info: Finalized mesh with 44 batches -[11:09:25 PM] Info: Finalized mesh with 44 batches -[11:09:25 PM] Info: Finalized mesh with 44 batches -[11:09:25 PM] Info: Finalized mesh with 44 batches -[11:09:25 PM] Info: Finalized mesh with 44 batches -[11:09:25 PM] Info: Finalized mesh with 44 batches -[11:09:25 PM] Info: Finalized mesh with 44 batches -[11:09:25 PM] Info: Finalized mesh with 44 batches -[11:09:25 PM] Info: Finalized mesh with 44 batches -[11:09:25 PM] Info: Finalized mesh with 44 batches -[11:09:25 PM] Info: Finalized mesh with 44 batches -[11:09:25 PM] Info: Finalized mesh with 44 batches -[11:09:25 PM] Info: Finalized mesh with 44 batches -[11:09:25 PM] Info: Finalized mesh with 44 batches -[11:09:25 PM] Info: Finalized mesh with 44 batches -[11:09:25 PM] Info: Finalized mesh with 44 batches -[11:09:25 PM] Info: Finalized mesh with 44 batches -[11:09:25 PM] Info: Finalized mesh with 44 batches -[11:09:25 PM] Info: Finalized mesh with 44 batches -[11:09:25 PM] Info: Finalized mesh with 44 batches -[11:09:25 PM] Info: Finalized mesh with 44 batches -[11:09:25 PM] Info: Finalized mesh with 44 batches -[11:09:25 PM] Info: Finalized mesh with 44 batches -[11:09:25 PM] Info: Finalized mesh with 44 batches -[11:09:25 PM] Info: Finalized mesh with 44 batches -[11:09:25 PM] Info: Finalized mesh with 44 batches -[11:09:25 PM] Info: Finalized mesh with 44 batches -[11:09:26 PM] Info: Finalized mesh with 44 batches -[11:09:26 PM] Info: Finalized mesh with 44 batches -[11:09:26 PM] Info: Finalized mesh with 44 batches -[11:09:26 PM] Info: Finalized mesh with 44 batches -[11:09:26 PM] Info: Finalized mesh with 44 batches -[11:09:26 PM] Info: Finalized mesh with 44 batches -[11:09:26 PM] Info: Finalized mesh with 44 batches -[11:09:26 PM] Info: Finalized mesh with 44 batches -[11:09:26 PM] Info: Finalized mesh with 44 batches -[11:09:26 PM] Info: Finalized mesh with 44 batches -[11:09:26 PM] Info: Finalized mesh with 44 batches -[11:09:26 PM] Info: Finalized mesh with 44 batches -[11:09:26 PM] Info: Finalized mesh with 44 batches -[11:09:26 PM] Info: Finalized mesh with 44 batches -[11:09:26 PM] Info: Finalized mesh with 44 batches -[11:09:26 PM] Info: Finalized mesh with 44 batches -[11:09:26 PM] Info: Finalized mesh with 44 batches -[11:09:26 PM] Info: Finalized mesh with 44 batches -[11:09:26 PM] Info: Finalized mesh with 44 batches -[11:09:26 PM] Info: Finalized mesh with 44 batches -[11:09:26 PM] Info: Finalized mesh with 44 batches -[11:09:26 PM] Info: Finalized mesh with 44 batches -[11:09:26 PM] Info: Finalized mesh with 44 batches -[11:09:26 PM] Info: Finalized mesh with 44 batches -[11:09:26 PM] Info: Finalized mesh with 44 batches -[11:09:33 PM] Info: $ set-mode game -[11:09:33 PM] Info: $ +[11:38:30 PM] Info: Initializing SDL +[11:38:31 PM] Info: Initializing OpenGL +[11:38:31 PM] Info: OpenGL version: 4.6.0 NVIDIA 536.23 +[11:38:31 PM] Info: Initializing GLEW +[11:38:31 PM] Info: Initializing SDL_mixer +[11:38:31 PM] Info: Reticulating splines... +[11:38:31 PM] Info: Ready! +[11:38:31 PM] Info: Loading material resource: block.png +[11:38:31 PM] Info: Found normal map texture: materials/block_n.png +[11:38:31 PM] Info: Loading material resource: FLAT5_7.png +[11:38:31 PM] Info: Found normal map texture: materials/FLAT5_7_n.png +[11:38:31 PM] Info: Loading material resource: floor0.png +[11:38:31 PM] Info: Found normal map texture: materials/floor0_n.png +[11:38:31 PM] Info: Loading material resource: floor1.png +[11:38:31 PM] Info: Found normal map texture: materials/floor1_n.png +[11:38:31 PM] Info: Loading material resource: GRASS2.png +[11:38:31 PM] Info: Found normal map texture: materials/GRASS2_n.png +[11:38:31 PM] Info: Map init +[11:38:31 PM] Info: Finalized mesh with 45 batches +[11:38:35 PM] Info: Finalized mesh with 50 batches +[11:38:38 PM] Info: Finalized mesh with 56 batches +[11:38:41 PM] Info: Finalized mesh with 59 batches +[11:38:44 PM] Info: Finalized mesh with 61 batches +[11:38:44 PM] Info: Finalized mesh with 61 batches +[11:38:44 PM] Info: Finalized mesh with 61 batches +[11:38:44 PM] Info: Finalized mesh with 61 batches +[11:38:44 PM] Info: Finalized mesh with 61 batches +[11:38:44 PM] Info: Finalized mesh with 61 batches +[11:38:44 PM] Info: Finalized mesh with 61 batches +[11:38:44 PM] Info: Finalized mesh with 61 batches +[11:38:44 PM] Info: Finalized mesh with 61 batches +[11:38:44 PM] Info: Finalized mesh with 61 batches +[11:38:45 PM] Info: Finalized mesh with 61 batches +[11:38:45 PM] Info: Finalized mesh with 61 batches +[11:38:45 PM] Info: Finalized mesh with 61 batches +[11:38:45 PM] Info: Finalized mesh with 61 batches +[11:38:45 PM] Info: Finalized mesh with 61 batches +[11:38:45 PM] Info: Finalized mesh with 61 batches +[11:38:45 PM] Info: Finalized mesh with 61 batches +[11:38:45 PM] Info: Finalized mesh with 61 batches +[11:38:45 PM] Info: Finalized mesh with 62 batches +[11:38:45 PM] Info: Finalized mesh with 62 batches +[11:38:45 PM] Info: Finalized mesh with 62 batches +[11:38:45 PM] Info: Finalized mesh with 62 batches +[11:38:45 PM] Info: Finalized mesh with 62 batches +[11:38:45 PM] Info: Finalized mesh with 62 batches +[11:38:45 PM] Info: Finalized mesh with 62 batches +[11:38:45 PM] Info: Finalized mesh with 62 batches +[11:38:45 PM] Info: Finalized mesh with 62 batches +[11:38:47 PM] Info: Finalized mesh with 62 batches +[11:38:47 PM] Info: Finalized mesh with 62 batches +[11:38:47 PM] Info: Finalized mesh with 62 batches +[11:38:47 PM] Info: Finalized mesh with 62 batches +[11:38:47 PM] Info: Finalized mesh with 62 batches +[11:38:47 PM] Info: Finalized mesh with 62 batches +[11:38:47 PM] Info: Finalized mesh with 62 batches +[11:38:47 PM] Info: Finalized mesh with 62 batches +[11:38:47 PM] Info: Finalized mesh with 62 batches +[11:38:47 PM] Info: Finalized mesh with 62 batches +[11:38:47 PM] Info: Finalized mesh with 62 batches +[11:38:48 PM] Info: Finalized mesh with 62 batches +[11:38:48 PM] Info: Finalized mesh with 62 batches +[11:38:48 PM] Info: Finalized mesh with 62 batches +[11:38:48 PM] Info: Finalized mesh with 62 batches +[11:38:48 PM] Info: Finalized mesh with 62 batches +[11:38:48 PM] Info: Finalized mesh with 62 batches +[11:38:48 PM] Info: Finalized mesh with 62 batches +[11:38:48 PM] Info: Finalized mesh with 62 batches +[11:38:48 PM] Info: Finalized mesh with 62 batches +[11:38:48 PM] Info: Finalized mesh with 62 batches +[11:38:48 PM] Info: Finalized mesh with 62 batches +[11:38:48 PM] Info: Finalized mesh with 62 batches +[11:38:49 PM] Info: Finalized mesh with 62 batches +[11:38:49 PM] Info: Finalized mesh with 62 batches +[11:38:49 PM] Info: Finalized mesh with 62 batches +[11:38:49 PM] Info: Finalized mesh with 62 batches +[11:38:49 PM] Info: Finalized mesh with 62 batches +[11:38:49 PM] Info: Finalized mesh with 62 batches +[11:38:49 PM] Info: Finalized mesh with 62 batches +[11:38:49 PM] Info: Finalized mesh with 62 batches +[11:38:49 PM] Info: Finalized mesh with 62 batches +[11:38:49 PM] Info: Finalized mesh with 62 batches +[11:38:49 PM] Info: Finalized mesh with 62 batches +[11:38:49 PM] Info: Finalized mesh with 62 batches +[11:38:50 PM] Info: Finalized mesh with 62 batches +[11:38:50 PM] Info: Finalized mesh with 62 batches +[11:38:50 PM] Info: Finalized mesh with 62 batches +[11:38:50 PM] Info: Finalized mesh with 62 batches +[11:38:50 PM] Info: Finalized mesh with 62 batches +[11:38:50 PM] Info: Finalized mesh with 62 batches +[11:38:50 PM] Info: Finalized mesh with 62 batches +[11:39:01 PM] Info: Finalized mesh with 62 batches +[11:39:01 PM] Info: Finalized mesh with 62 batches +[11:39:01 PM] Info: Finalized mesh with 62 batches +[11:39:01 PM] Info: Finalized mesh with 62 batches +[11:39:01 PM] Info: Finalized mesh with 62 batches +[11:39:01 PM] Info: Finalized mesh with 62 batches +[11:39:01 PM] Info: Finalized mesh with 62 batches +[11:39:01 PM] Info: Finalized mesh with 62 batches +[11:39:01 PM] Info: Finalized mesh with 62 batches +[11:39:01 PM] Info: Finalized mesh with 62 batches +[11:39:01 PM] Info: Finalized mesh with 62 batches +[11:39:01 PM] Info: Finalized mesh with 62 batches +[11:39:01 PM] Info: Finalized mesh with 62 batches +[11:39:01 PM] Info: Finalized mesh with 62 batches +[11:39:01 PM] Info: Finalized mesh with 62 batches +[11:39:01 PM] Info: Finalized mesh with 62 batches +[11:39:01 PM] Info: Finalized mesh with 62 batches +[11:39:01 PM] Info: Finalized mesh with 62 batches +[11:39:01 PM] Info: Finalized mesh with 62 batches +[11:39:01 PM] Info: Finalized mesh with 62 batches +[11:39:01 PM] Info: Finalized mesh with 62 batches +[11:39:01 PM] Info: Finalized mesh with 62 batches +[11:39:01 PM] Info: Finalized mesh with 62 batches +[11:39:01 PM] Info: Finalized mesh with 62 batches +[11:39:01 PM] Info: Finalized mesh with 62 batches +[11:39:01 PM] Info: Finalized mesh with 62 batches +[11:39:01 PM] Info: Finalized mesh with 62 batches +[11:39:01 PM] Info: Finalized mesh with 62 batches +[11:39:01 PM] Info: Finalized mesh with 62 batches +[11:39:01 PM] Info: Finalized mesh with 62 batches +[11:39:01 PM] Info: Finalized mesh with 62 batches +[11:39:01 PM] Info: Finalized mesh with 62 batches +[11:39:01 PM] Info: Finalized mesh with 62 batches +[11:39:01 PM] Info: Finalized mesh with 62 batches +[11:39:01 PM] Info: Finalized mesh with 62 batches +[11:39:01 PM] Info: Finalized mesh with 62 batches +[11:39:01 PM] Info: Finalized mesh with 62 batches +[11:39:01 PM] Info: Finalized mesh with 62 batches +[11:39:01 PM] Info: Finalized mesh with 62 batches +[11:39:02 PM] Info: Finalized mesh with 62 batches +[11:39:02 PM] Info: Finalized mesh with 62 batches +[11:39:02 PM] Info: Finalized mesh with 62 batches +[11:39:02 PM] Info: Finalized mesh with 62 batches +[11:39:02 PM] Info: Finalized mesh with 62 batches +[11:39:02 PM] Info: Finalized mesh with 62 batches +[11:39:02 PM] Info: Finalized mesh with 62 batches +[11:39:02 PM] Info: Finalized mesh with 62 batches +[11:39:02 PM] Info: Finalized mesh with 62 batches +[11:39:02 PM] Info: Finalized mesh with 62 batches +[11:39:02 PM] Info: Finalized mesh with 62 batches +[11:39:02 PM] Info: Finalized mesh with 62 batches +[11:39:02 PM] Info: Finalized mesh with 62 batches +[11:39:02 PM] Info: Finalized mesh with 62 batches +[11:39:02 PM] Info: Finalized mesh with 62 batches +[11:39:02 PM] Info: Finalized mesh with 62 batches +[11:39:02 PM] Info: Finalized mesh with 62 batches +[11:39:02 PM] Info: Finalized mesh with 62 batches +[11:39:02 PM] Info: Finalized mesh with 62 batches +[11:39:02 PM] Info: Finalized mesh with 62 batches +[11:39:02 PM] Info: Finalized mesh with 62 batches +[11:39:02 PM] Info: Finalized mesh with 62 batches +[11:39:02 PM] Info: Finalized mesh with 62 batches +[11:39:02 PM] Info: Finalized mesh with 62 batches +[11:39:02 PM] Info: Finalized mesh with 62 batches +[11:39:02 PM] Info: Finalized mesh with 62 batches +[11:39:02 PM] Info: Finalized mesh with 62 batches +[11:39:02 PM] Info: Finalized mesh with 62 batches +[11:39:02 PM] Info: Finalized mesh with 62 batches +[11:39:02 PM] Info: Finalized mesh with 62 batches +[11:39:02 PM] Info: Finalized mesh with 62 batches +[11:39:02 PM] Info: Finalized mesh with 62 batches +[11:39:02 PM] Info: Finalized mesh with 62 batches +[11:39:02 PM] Info: Finalized mesh with 62 batches +[11:39:02 PM] Info: Finalized mesh with 62 batches +[11:39:02 PM] Info: Finalized mesh with 62 batches +[11:39:02 PM] Info: Finalized mesh with 62 batches +[11:39:02 PM] Info: Finalized mesh with 62 batches +[11:39:02 PM] Info: Finalized mesh with 62 batches +[11:39:02 PM] Info: Finalized mesh with 62 batches +[11:39:02 PM] Info: Finalized mesh with 62 batches +[11:39:02 PM] Info: Finalized mesh with 62 batches +[11:39:02 PM] Info: Finalized mesh with 62 batches +[11:39:02 PM] Info: Finalized mesh with 62 batches +[11:39:02 PM] Info: Finalized mesh with 62 batches +[11:39:02 PM] Info: Finalized mesh with 62 batches +[11:39:02 PM] Info: Finalized mesh with 62 batches +[11:39:02 PM] Info: Finalized mesh with 62 batches +[11:39:02 PM] Info: Finalized mesh with 62 batches +[11:39:02 PM] Info: Finalized mesh with 62 batches +[11:39:02 PM] Info: Finalized mesh with 62 batches +[11:39:02 PM] Info: Finalized mesh with 62 batches +[11:39:02 PM] Info: Finalized mesh with 62 batches +[11:39:02 PM] Info: Finalized mesh with 62 batches +[11:39:02 PM] Info: Finalized mesh with 62 batches +[11:39:02 PM] Info: Finalized mesh with 62 batches +[11:39:02 PM] Info: Finalized mesh with 62 batches +[11:39:03 PM] Info: Finalized mesh with 62 batches +[11:39:03 PM] Info: Finalized mesh with 62 batches +[11:39:03 PM] Info: Finalized mesh with 62 batches +[11:39:03 PM] Info: Finalized mesh with 62 batches +[11:39:03 PM] Info: Finalized mesh with 62 batches +[11:39:03 PM] Info: Finalized mesh with 62 batches +[11:39:03 PM] Info: Finalized mesh with 62 batches +[11:39:03 PM] Info: Finalized mesh with 62 batches +[11:39:03 PM] Info: Finalized mesh with 62 batches +[11:39:03 PM] Info: Finalized mesh with 62 batches +[11:39:03 PM] Info: Finalized mesh with 62 batches +[11:39:03 PM] Info: Finalized mesh with 62 batches +[11:39:03 PM] Info: Finalized mesh with 62 batches +[11:39:03 PM] Info: Finalized mesh with 62 batches +[11:39:03 PM] Info: Finalized mesh with 62 batches +[11:39:03 PM] Info: Finalized mesh with 62 batches +[11:39:03 PM] Info: Finalized mesh with 62 batches +[11:39:03 PM] Info: Finalized mesh with 62 batches +[11:39:03 PM] Info: Finalized mesh with 62 batches +[11:39:03 PM] Info: Finalized mesh with 62 batches +[11:39:03 PM] Info: Finalized mesh with 62 batches +[11:39:03 PM] Info: Finalized mesh with 62 batches +[11:39:03 PM] Info: Finalized mesh with 62 batches +[11:39:03 PM] Info: Finalized mesh with 62 batches +[11:39:03 PM] Info: Finalized mesh with 62 batches +[11:39:03 PM] Info: Finalized mesh with 62 batches +[11:39:03 PM] Info: Finalized mesh with 62 batches +[11:39:03 PM] Info: Finalized mesh with 62 batches +[11:39:03 PM] Info: Finalized mesh with 62 batches +[11:39:03 PM] Info: Finalized mesh with 62 batches +[11:39:03 PM] Info: Finalized mesh with 62 batches +[11:39:03 PM] Info: Finalized mesh with 62 batches +[11:39:03 PM] Info: Finalized mesh with 62 batches +[11:39:03 PM] Info: Finalized mesh with 62 batches +[11:39:03 PM] Info: Finalized mesh with 62 batches +[11:39:03 PM] Info: Finalized mesh with 62 batches +[11:39:03 PM] Info: Finalized mesh with 62 batches +[11:39:10 PM] Info: Finalized mesh with 62 batches +[11:39:10 PM] Info: Finalized mesh with 62 batches +[11:39:10 PM] Info: Finalized mesh with 62 batches +[11:39:10 PM] Info: Finalized mesh with 62 batches +[11:39:10 PM] Info: Finalized mesh with 62 batches +[11:39:10 PM] Info: Finalized mesh with 62 batches +[11:39:10 PM] Info: Finalized mesh with 62 batches +[11:39:10 PM] Info: Finalized mesh with 62 batches +[11:39:10 PM] Info: Finalized mesh with 62 batches +[11:39:10 PM] Info: Finalized mesh with 62 batches +[11:39:10 PM] Info: Finalized mesh with 62 batches +[11:39:10 PM] Info: Finalized mesh with 62 batches +[11:39:10 PM] Info: Finalized mesh with 62 batches +[11:39:10 PM] Info: Finalized mesh with 62 batches +[11:39:10 PM] Info: Finalized mesh with 62 batches +[11:39:10 PM] Info: Finalized mesh with 62 batches +[11:39:10 PM] Info: Finalized mesh with 62 batches +[11:39:10 PM] Info: Finalized mesh with 62 batches +[11:39:10 PM] Info: Finalized mesh with 62 batches +[11:39:10 PM] Info: Finalized mesh with 62 batches +[11:39:10 PM] Info: Finalized mesh with 62 batches +[11:39:10 PM] Info: Finalized mesh with 62 batches +[11:39:10 PM] Info: Finalized mesh with 62 batches +[11:39:10 PM] Info: Finalized mesh with 62 batches +[11:39:10 PM] Info: Finalized mesh with 62 batches +[11:39:10 PM] Info: Finalized mesh with 62 batches +[11:39:10 PM] Info: Finalized mesh with 62 batches +[11:39:10 PM] Info: Finalized mesh with 62 batches +[11:39:10 PM] Info: Finalized mesh with 62 batches +[11:39:10 PM] Info: Finalized mesh with 62 batches +[11:39:10 PM] Info: Finalized mesh with 62 batches +[11:39:10 PM] Info: Finalized mesh with 62 batches +[11:39:10 PM] Info: Finalized mesh with 62 batches +[11:39:10 PM] Info: Finalized mesh with 62 batches +[11:39:10 PM] Info: Finalized mesh with 62 batches +[11:39:10 PM] Info: Finalized mesh with 62 batches +[11:39:10 PM] Info: Finalized mesh with 62 batches +[11:39:10 PM] Info: Finalized mesh with 62 batches +[11:39:10 PM] Info: Finalized mesh with 62 batches +[11:39:10 PM] Info: Finalized mesh with 62 batches +[11:39:14 PM] Info: Finalized mesh with 62 batches +[11:39:14 PM] Info: Finalized mesh with 62 batches +[11:39:14 PM] Info: Finalized mesh with 62 batches +[11:39:14 PM] Info: Finalized mesh with 62 batches +[11:39:14 PM] Info: Finalized mesh with 62 batches +[11:39:14 PM] Info: Finalized mesh with 62 batches +[11:39:14 PM] Info: Finalized mesh with 62 batches +[11:39:15 PM] Info: Finalized mesh with 62 batches +[11:39:15 PM] Info: Finalized mesh with 62 batches +[11:39:15 PM] Info: Finalized mesh with 62 batches +[11:39:15 PM] Info: Finalized mesh with 62 batches +[11:39:15 PM] Info: Finalized mesh with 62 batches +[11:39:15 PM] Info: Finalized mesh with 62 batches +[11:39:15 PM] Info: Finalized mesh with 62 batches +[11:39:15 PM] Info: Finalized mesh with 62 batches +[11:39:15 PM] Info: Finalized mesh with 62 batches +[11:39:15 PM] Info: Finalized mesh with 62 batches +[11:39:15 PM] Info: Finalized mesh with 62 batches +[11:39:15 PM] Info: Finalized mesh with 62 batches +[11:39:15 PM] Info: Finalized mesh with 62 batches +[11:39:15 PM] Info: Finalized mesh with 62 batches +[11:39:15 PM] Info: Finalized mesh with 62 batches diff --git a/Sandbox/src/Editor.cpp b/Sandbox/src/Editor.cpp index dd155e6..8cbc59d 100644 --- a/Sandbox/src/Editor.cpp +++ b/Sandbox/src/Editor.cpp @@ -233,6 +233,11 @@ void Editor::UpdateModeNormal() // Raycast through everything on the map if (sandbox->IsMouseButtonDown(kp3d::MOUSE_BUTTON_LEFT) && !editing_gizmo) { + // editor_hovered_batch = nullptr; + if (!sandbox->IsKeyDown(kp3d::KEY_LSHIFT)) + { + editor_hovered_batch.clear(); + } struct Target { Vec3 position; @@ -258,57 +263,60 @@ void Editor::UpdateModeNormal() targets.push_back({ pos, dist, &b }); } } - if (!targets.empty()) + } + if (!targets.empty()) + { + std::sort(targets.begin(), targets.end(), [&](const Target& a, const Target& b) { return a.distance > b.distance; }); + const Target& target = targets.back(); + if (editor_hovered_batch.empty()) { - std::sort(targets.begin(), targets.end(), [&](const Target& a, const Target& b) { return a.distance > b.distance; }); - const Target& target = targets.back(); - if (editor_hovered_batch.empty()) - { - if (std::find(editor_hovered_batch.begin(), editor_hovered_batch.end(), target.b) == editor_hovered_batch.end()) - editor_hovered_batch.push_back(target.b); - } - else - { - try - { - const auto& info = std::any_cast(kp3d::editor_hovered_batch[0]->userdata); - const auto& target_info = std::any_cast(target.b->userdata); - if (info.wall && target_info.wall) - { - if (std::find(editor_hovered_batch.begin(), editor_hovered_batch.end(), target.b) == editor_hovered_batch.end()) - editor_hovered_batch.push_back(target.b); - } - else if (info.flat && target_info.flat) - { - if (std::find(editor_hovered_batch.begin(), editor_hovered_batch.end(), target.b) == editor_hovered_batch.end()) - editor_hovered_batch.push_back(target.b); - } - } - catch (std::bad_any_cast& e) - { - KP3D_LOG_ERROR("Bad any cast: {}", e.what()); - } - } + if (std::find(editor_hovered_batch.begin(), editor_hovered_batch.end(), target.b) == editor_hovered_batch.end()) + editor_hovered_batch.push_back(target.b); } else { - // editor_hovered_batch = nullptr; - if (!sandbox->IsKeyDown(kp3d::KEY_LSHIFT)) + try { - editor_hovered_batch.clear(); + const auto& info = std::any_cast(kp3d::editor_hovered_batch[0]->userdata); + const auto& target_info = std::any_cast(target.b->userdata); + if (info.wall && target_info.wall) + { + if (std::find(editor_hovered_batch.begin(), editor_hovered_batch.end(), target.b) == editor_hovered_batch.end()) + editor_hovered_batch.push_back(target.b); + } + else if (info.flat && target_info.flat) + { + if (std::find(editor_hovered_batch.begin(), editor_hovered_batch.end(), target.b) == editor_hovered_batch.end()) + editor_hovered_batch.push_back(target.b); + } + } + catch (std::bad_any_cast& e) + { + KP3D_LOG_ERROR("Bad any cast: {}", e.what()); } } } + else + { + } sandbox->MouseButtonReset(kp3d::MOUSE_BUTTON_LEFT); } - if (!editor_hovered_batch.empty()) + if (editing_gizmo) + kp3d::editor_hovered_batch.clear(); + + if (!editor_hovered_batch.empty() && !editing_gizmo) { try { const auto& info = std::any_cast(kp3d::editor_hovered_batch[0]->userdata); - if (info.wall) + if (info.wall)// && !(info.wall->portal && (info.wall->flags & Wall::FLAG_OPENING) && !(info.wall->flags & Wall::FLAG_SUBSECTOR_OPENING))) { + float y_val = (info.sector->floor.base_height + info.sector->ceiling.base_height) * 0.5f; + if (info.wall->flags & Wall::FLAG_OPENING) + { + y_val = info.sector->floor.base_height; + } // KP3D_LOG_INFO("poop j"); can_wall_update = true; wall_update.walls_to_update.clear(); @@ -321,22 +329,19 @@ void Editor::UpdateModeNormal() for (int i = 0; i < sp->walls.size(); i++) { Wall& wall = sp->walls[i]; - Wall& neighbor = sp->walls[(i - 1) % sp->walls.size()]; if (&wall == info.wall) { wall_update.gizmo_pos = { info.wall->start.x, - (info.sector->floor.base_height + info.sector->ceiling.base_height) * 0.5f, + y_val, -info.wall->start.y}; wall_update.main_wall = info.wall; - //wall_update.walls_to_update.emplace(&neighbor, WP_END); } } } + // Find any other points we need to update for (const auto& sp: sandbox->map.sectors) { - //if (sp.get() == info.sector) - // continue; for (int i = 0; i < sp->walls.size(); i++) { const float E = 4.0f / 128.0f; @@ -347,13 +352,11 @@ void Editor::UpdateModeNormal() FloatCmp(wall.start.y, wall_update.main_wall->start.y, E)) { wall_update.walls_to_update.emplace(&wall, WP_START); - // wall_update.walls_to_update.emplace(&neighbor_l, WP_END); } else if (FloatCmp(wall.end.x, wall_update.main_wall->start.x, E) && FloatCmp(wall.end.y, wall_update.main_wall->start.y, E)) { wall_update.walls_to_update.emplace(&wall, WP_END); - // wall_update.walls_to_update.emplace(&neighbor_r, WP_START); } } @@ -403,9 +406,7 @@ void Editor::RenderModeNormal() nullptr, nullptr ); - editing_gizmo = v; - if (v) - kp3d::editor_hovered_batch.clear(); + editing_gizmo = ImGuizmo::IsOver(); float translation[3]; float rotation[3]; @@ -436,6 +437,7 @@ void Editor::RenderModeNormal() if (v) { + kp3d::editor_hovered_batch.clear(); RebuildMap(); } }