diff --git a/engine/imgui/src/sgpu/backend_impl.zig b/engine/imgui/src/sgpu/backend_impl.zig index bb585c8..c506d0d 100644 --- a/engine/imgui/src/sgpu/backend_impl.zig +++ b/engine/imgui/src/sgpu/backend_impl.zig @@ -42,6 +42,8 @@ pub const Impl = struct { pub fn onPreDraw(p: *anyopaque, cmd: *gpu.GPUCommandBuffer) void { const self: *@This() = @ptrCast(@alignCast(p)); + platform.context().imguiMouseConsumed = ig.isWindowHovered(.{ .any_window = true }); + ig.render(); if (platform.getInstance().imguiVisible) { @@ -56,7 +58,6 @@ pub const Impl = struct { if (platform.getInstance().imguiVisible) { //const renderpass = cmd.beginGPURenderPass(color_target_infos: [*c]const GPUColorTargetInfo, num_color_targets: u32, depth_stencil_target_info: [*c]const GPUDepthStencilTargetInfo); - var targetInfo: gpu.GPUColorTargetInfo = std.mem.zeroes(gpu.GPUColorTargetInfo); targetInfo.texture = rend.context().state.swapchainTargetTexture.?; targetInfo.clear_color = .{ .r = 0.0, .g = 0.0, .b = 0.0, .a = 0.0 }; diff --git a/engine/physics/src/physics.zig b/engine/physics/src/physics.zig index a939858..bd122f9 100644 --- a/engine/physics/src/physics.zig +++ b/engine/physics/src/physics.zig @@ -111,6 +111,7 @@ pub fn releaseShape(name: core.Name) void { pub const RayCastSettings = struct { entityLookup: bool = false, + getNormalsSlow: bool = false, bodyFilter: ?*const anyopaque = null, }; @@ -143,6 +144,19 @@ pub fn traceLine(start: core.Vectorf, direction: core.Vectorf, settings: RayCast rv.entity = context().idToEntity.get(rv.body).?; } + // VERY SLOW + if (settings.getNormalsSlow) { + const lock_interface = context().system.getBodyLockInterfaceNoLock(); + + var read_lock: zphysics.BodyLockRead = .{}; + read_lock.lock(lock_interface, rv.body); + defer read_lock.unlock(); + + if (read_lock.body) |body| { + rv.normal = core.Vectorf.fromArr3(body.getWorldSpaceSurfaceNormal(result.hit.sub_shape_id, rv.point.toArr3())); + } + } + return rv; } diff --git a/engine/platform/src/windowing.zig b/engine/platform/src/windowing.zig index 22f13ae..cc48d6b 100644 --- a/engine/platform/src/windowing.zig +++ b/engine/platform/src/windowing.zig @@ -83,6 +83,7 @@ pub const PlatformInstance = struct { enableImguiEvents: bool = true, imguiVisible: bool = true, + imguiMouseConsumed: bool = false, windowDestroyed: bool = false, @@ -192,14 +193,19 @@ pub const PlatformInstance = struct { sdl3.getMouseState(&self.cursorPos.x, &self.cursorPos.y); } - if (core.inputs.convertEvent(event)) |converted| { - inputStack.routeEvent(converted); - } - for (self.processFuncs.items) |func| { func(@ptrCast(event)); } + if (core.inputs.convertEvent(event)) |converted| { + var shouldSkip: bool = false; + if (self.imguiMouseConsumed and (event.type == sdl3.events.mouse_button_down or event.type == sdl3.events.mouse_button_up)) { + shouldSkip = true; + } + if (!shouldSkip) + inputStack.routeEvent(converted); + } + switch (event.type) { sdl3.events.quit => { core.exitNow(); diff --git a/projects/content/bsp/testmap.map b/projects/content/bsp/testmap.map index 76a64e6..d9c60f5 100644 --- a/projects/content/bsp/testmap.map +++ b/projects/content/bsp/testmap.map @@ -608,15 +608,6 @@ } // brush 67 { -( -1536 -540 80 ) ( -1536 -539 80 ) ( -1536 -540 81 ) mapping_defaults/ProtoWhite 16 -128 0 1 1 -( -1536 -864 80 ) ( -1536 -864 81 ) ( -1535 -864 80 ) mapping_defaults/ProtoWhite 64 -128 0 1 1 -( -1536 -540 4 ) ( -1535 -540 4 ) ( -1536 -539 4 ) mapping_defaults/ProtoWhite 64 -16 0 1 1 -( -1532 -536 180 ) ( -1532 -535 180 ) ( -1531 -536 180 ) mapping_defaults/ProtoWhite 64 -16 0 1 1 -( -1532 -536 84 ) ( -1531 -536 84 ) ( -1532 -536 85 ) mapping_defaults/ProtoWhite 64 -128 0 1 1 -( -1532 -536 84 ) ( -1532 -536 85 ) ( -1532 -535 84 ) mapping_defaults/ProtoWhite 16 -128 0 1 1 -} -// brush 68 -{ ( -1592 -820 180 ) ( -1592 -819 180 ) ( -1592 -820 181 ) mapping_defaults/ProtoWhite 16 -128 0 1 1 ( -1264 -864 180 ) ( -1264 -864 181 ) ( -1263 -864 180 ) mapping_defaults/ProtoWhite 64 -128 0 1 1 ( -1264 -820 180 ) ( -1263 -820 180 ) ( -1264 -819 180 ) mapping_defaults/ProtoWhite 64 -16 0 1 1 @@ -624,7 +615,7 @@ ( -1248 -816 184 ) ( -1247 -816 184 ) ( -1248 -816 185 ) mapping_defaults/ProtoWhite 64 -128 0 1 1 ( -1300 -816 184 ) ( -1300 -816 185 ) ( -1300 -815 184 ) mapping_defaults/ProtoWhite 16 -128 0 1 1 } -// brush 69 +// brush 68 { ( -1536 -868 80 ) ( -1536 -867 80 ) ( -1536 -868 81 ) mapping_defaults/ProtoDark 16 -128 0 1 1 ( -1536 -868 80 ) ( -1536 -868 81 ) ( -1535 -868 80 ) mapping_defaults/ProtoDark 64 -128 0 1 1 @@ -633,7 +624,7 @@ ( -1248 -864 84 ) ( -1247 -864 84 ) ( -1248 -864 85 ) mapping_defaults/ProtoDark 64 -128 0 1 1 ( -1104 -864 84 ) ( -1104 -864 85 ) ( -1104 -863 84 ) mapping_defaults/ProtoDark 16 -128 0 1 1 } -// brush 70 +// brush 69 { ( -1160 -864 192 ) ( -1160 -863 192 ) ( -1160 -864 193 ) mapping_defaults/ProtoGrey 16 -128 0 1 1 ( -1148 -816 296 ) ( -1136 -816 288 ) ( -1136 -688 288 ) mapping_defaults/ProtoGrey 64 -16 0 1 1 @@ -642,7 +633,7 @@ ( -936 -816 196 ) ( -935 -816 196 ) ( -936 -816 197 ) mapping_defaults/ProtoGrey 64 -128 0 1 1 ( -1160 -844 312 ) ( -1148 -716 304 ) ( -1148 -844 304 ) mapping_defaults/ProtoGrey 64 -16 0 1 1 } -// brush 71 +// brush 70 { ( -1152 -320 192 ) ( -1152 -319 192 ) ( -1152 -320 193 ) mapping_defaults/ProtoWhite 16 -128 0 1 1 ( -1152 -320 192 ) ( -1152 -320 193 ) ( -1151 -320 192 ) mapping_defaults/ProtoWhite 64 -128 0 1 1 @@ -651,7 +642,7 @@ ( -1144 -304 200 ) ( -1143 -304 200 ) ( -1144 -304 201 ) mapping_defaults/ProtoWhite 64 -128 0 1 1 ( -976 -288 200 ) ( -976 -288 201 ) ( -976 -287 200 ) mapping_defaults/ProtoWhite 16 -128 0 1 1 } -// brush 72 +// brush 71 { ( -1152 -320 192 ) ( -1152 -319 192 ) ( -1152 -320 193 ) mapping_defaults/ProtoWhite 16 -128 0 1 1 ( -1152 -320 192 ) ( -1152 -320 193 ) ( -1151 -320 192 ) mapping_defaults/ProtoWhite 64 -128 0 1 1 @@ -660,7 +651,7 @@ ( -1144 -288 200 ) ( -1143 -288 200 ) ( -1144 -288 201 ) mapping_defaults/ProtoWhite 64 -128 0 1 1 ( -976 -288 200 ) ( -976 -288 201 ) ( -976 -287 200 ) mapping_defaults/ProtoWhite 16 -128 0 1 1 } -// brush 73 +// brush 72 { ( -1152 -304 204 ) ( -1152 -303 204 ) ( -1152 -304 205 ) mapping_defaults/ProtoWhite 16 -128 0 1 1 ( -1152 -304 204 ) ( -1152 -304 205 ) ( -1151 -304 204 ) mapping_defaults/ProtoWhite 64 -128 0 1 1 @@ -669,7 +660,7 @@ ( -976 -288 208 ) ( -975 -288 208 ) ( -976 -288 209 ) mapping_defaults/ProtoWhite 64 -128 0 1 1 ( -976 -284 208 ) ( -976 -284 209 ) ( -976 -283 208 ) mapping_defaults/ProtoWhite 16 -128 0 1 1 } -// brush 74 +// brush 73 { ( -1188 -348 296 ) ( -1188 -347 296 ) ( -1188 -348 297 ) mapping_defaults/ProtoWhite 16 -128 0 1 1 ( -1196 -400 296 ) ( -1196 -400 297 ) ( -1195 -400 296 ) mapping_defaults/ProtoWhite 64 -128 0 1 1 @@ -678,7 +669,7 @@ ( -1184 -232 300 ) ( -1183 -232 300 ) ( -1184 -232 301 ) mapping_defaults/ProtoWhite 64 -128 0 1 1 ( -1184 -236 300 ) ( -1184 -236 301 ) ( -1184 -235 300 ) mapping_defaults/ProtoWhite 16 -128 0 1 1 } -// brush 75 +// brush 74 { ( -1184 -236 304 ) ( -1184 -235 304 ) ( -1184 -236 305 ) mapping_defaults/ProtoWhite 16 -128 0 1 1 ( -1184 -236 304 ) ( -1184 -236 305 ) ( -1183 -236 304 ) mapping_defaults/ProtoWhite 64 -128 0 1 1 @@ -687,7 +678,7 @@ ( -972 -232 308 ) ( -971 -232 308 ) ( -972 -232 309 ) mapping_defaults/ProtoWhite 64 -128 0 1 1 ( -968 -232 308 ) ( -968 -232 309 ) ( -968 -231 308 ) mapping_defaults/ProtoWhite 16 -128 0 1 1 } -// brush 76 +// brush 75 { ( -736 -608 192 ) ( -736 -607 192 ) ( -736 -608 193 ) mapping_defaults/ProtoWhite 16 -128 0 1 1 ( -736 -608 192 ) ( -736 -608 193 ) ( -735 -608 192 ) mapping_defaults/ProtoWhite 64 -128 0 1 1 @@ -696,7 +687,7 @@ ( -720 -384 208 ) ( -719 -384 208 ) ( -720 -384 209 ) mapping_defaults/ProtoWhite 64 -128 0 1 1 ( -720 -384 208 ) ( -720 -384 209 ) ( -720 -383 208 ) mapping_defaults/ProtoWhite 16 -128 0 1 1 } -// brush 77 +// brush 76 { ( -832 -304 192 ) ( -832 -303 192 ) ( -832 -304 193 ) mapping_defaults/ProtoWhite 16 -128 0 1 1 ( -832 -304 192 ) ( -832 -304 193 ) ( -831 -304 192 ) mapping_defaults/ProtoWhite 64 -128 0 1 1 @@ -705,7 +696,7 @@ ( -624 -288 208 ) ( -623 -288 208 ) ( -624 -288 209 ) mapping_defaults/ProtoWhite 64 -128 0 1 1 ( -624 -288 208 ) ( -624 -288 209 ) ( -624 -287 208 ) mapping_defaults/ProtoWhite 16 -128 0 1 1 } -// brush 78 +// brush 77 { ( -400 -624 352 ) ( -416 -624 336 ) ( -416 -496 336 ) mapping_defaults/ProtoWhite 64 -16 0 1 1 ( -592 -624 192 ) ( -592 -624 193 ) ( -591 -624 192 ) mapping_defaults/ProtoWhite 64 -128 0 1 1 @@ -713,7 +704,7 @@ ( -384 -544 208 ) ( -383 -544 208 ) ( -384 -544 209 ) mapping_defaults/ProtoWhite 64 -128 0 1 1 ( -352 -576 208 ) ( -352 -576 209 ) ( -352 -575 208 ) mapping_defaults/ProtoWhite 16 -128 0 1 1 } -// brush 79 +// brush 78 { ( -352 -624 224 ) ( -352 -623 224 ) ( -352 -624 225 ) mapping_defaults/ProtoWhite 16 -128 0 1 1 ( -384 -624 224 ) ( -384 -624 225 ) ( -383 -624 224 ) mapping_defaults/ProtoWhite 64 -128 0 1 1 @@ -722,7 +713,7 @@ ( -288 -544 240 ) ( -287 -544 240 ) ( -288 -544 241 ) mapping_defaults/ProtoWhite 64 -128 0 1 1 ( -288 -544 240 ) ( -288 -544 241 ) ( -288 -543 240 ) mapping_defaults/ProtoWhite 16 -128 0 1 1 } -// brush 80 +// brush 79 { ( -560 -544 192 ) ( -560 -543 192 ) ( -560 -544 193 ) mapping_defaults/ProtoWhite 16 -128 0 1 1 ( -560 -544 192 ) ( -560 -544 193 ) ( -559 -544 192 ) mapping_defaults/ProtoWhite 64 -128 0 1 1 @@ -731,7 +722,7 @@ ( -288 -464 208 ) ( -287 -464 208 ) ( -288 -464 209 ) mapping_defaults/ProtoWhite 64 -128 0 1 1 ( -464 -544 288 ) ( -464 -416 272 ) ( -464 -544 272 ) mapping_defaults/ProtoWhite 16 -128 0 1 1 } -// brush 81 +// brush 80 { ( -288 -624 384 ) ( -288 -623 384 ) ( -288 -624 385 ) mapping_defaults/ProtoWhite 16 -128 0 1 1 ( -288 -624 384 ) ( -288 -624 385 ) ( -287 -624 384 ) mapping_defaults/ProtoWhite 64 -128 0 1 1 @@ -740,7 +731,7 @@ ( -272 -384 400 ) ( -271 -384 400 ) ( -272 -384 401 ) mapping_defaults/ProtoWhite 64 -128 0 1 1 ( -224 -592 400 ) ( -224 -592 401 ) ( -224 -591 400 ) mapping_defaults/ProtoWhite 16 -128 0 1 1 } -// brush 82 +// brush 81 { ( -544 -464 384 ) ( -544 -463 384 ) ( -544 -464 385 ) mapping_defaults/ProtoWhite 16 -128 0 1 1 ( -304 -464 384 ) ( -304 -464 385 ) ( -303 -464 384 ) mapping_defaults/ProtoWhite 64 -128 0 1 1 @@ -749,7 +740,7 @@ ( -288 -384 400 ) ( -352 -384 416 ) ( -352 -256 416 ) mapping_defaults/ProtoWhite 64 -16 0 1 1 ( -288 -400 400 ) ( -288 -400 401 ) ( -288 -399 400 ) mapping_defaults/ProtoWhite 16 -128 0 1 1 } -// brush 83 +// brush 82 { ( -640 -464 384 ) ( -640 -463 384 ) ( -640 -464 385 ) mapping_defaults/ProtoWhite 16 -128 0 1 1 ( -640 -464 384 ) ( -640 -464 385 ) ( -639 -464 384 ) mapping_defaults/ProtoWhite 64 -128 0 1 1 @@ -758,7 +749,7 @@ ( -560 -384 400 ) ( -559 -384 400 ) ( -560 -384 401 ) mapping_defaults/ProtoWhite 64 -128 0 1 1 ( -544 -384 400 ) ( -544 -384 401 ) ( -544 -383 400 ) mapping_defaults/ProtoWhite 16 -128 0 1 1 } -// brush 84 +// brush 83 { ( -1456 -880 192 ) ( -1456 -879 192 ) ( -1456 -880 193 ) mapping_defaults/ProtoWhite -64 -64 0 0.25 0.25 ( -1456 -880 192 ) ( -1456 -880 193 ) ( -1455 -880 192 ) mapping_defaults/ProtoWhite 64 -64 0 0.25 0.25 @@ -767,7 +758,7 @@ ( -1408 -736 208 ) ( -1407 -736 208 ) ( -1408 -736 209 ) mapping_defaults/ProtoWhite 64 -64 0 0.25 0.25 ( -1408 -736 208 ) ( -1408 -736 209 ) ( -1408 -735 208 ) mapping_defaults/ProtoWhite -64 -64 0 0.25 0.25 } -// brush 85 +// brush 84 { ( -1472 -656 192 ) ( -1472 -655 192 ) ( -1472 -656 193 ) mapping_defaults/ProtoWhite -64 -64 0 0.25 0.25 ( -1472 -656 192 ) ( -1472 -656 193 ) ( -1471 -656 192 ) mapping_defaults/ProtoWhite 64 -64 0 0.25 0.25 @@ -776,7 +767,7 @@ ( -1408 -512 208 ) ( -1407 -512 208 ) ( -1408 -512 209 ) mapping_defaults/ProtoWhite 64 -64 0 0.25 0.25 ( -1408 -512 208 ) ( -1408 -512 209 ) ( -1408 -511 208 ) mapping_defaults/ProtoWhite -64 -64 0 0.25 0.25 } -// brush 86 +// brush 85 { ( -1648 -1024 192 ) ( -1648 -1023 192 ) ( -1648 -1024 193 ) mapping_defaults/ProtoWhite -64 -64 0 0.25 0.25 ( -1648 -1024 192 ) ( -1648 -1024 193 ) ( -1647 -1024 192 ) mapping_defaults/ProtoWhite 64 -64 0 0.25 0.25 @@ -785,7 +776,7 @@ ( -1392 -976 208 ) ( -1391 -976 208 ) ( -1392 -976 209 ) mapping_defaults/ProtoWhite 64 -64 0 0.25 0.25 ( -1392 -976 208 ) ( -1392 -976 209 ) ( -1392 -975 208 ) mapping_defaults/ProtoWhite -64 -64 0 0.25 0.25 } -// brush 87 +// brush 86 { ( -1584 -992 320 ) ( -1584 -991 320 ) ( -1584 -992 321 ) mapping_defaults/ProtoWhite -64 -64 0 0.25 0.25 ( -1584 -992 320 ) ( -1584 -992 321 ) ( -1583 -992 320 ) mapping_defaults/ProtoWhite 64 -64 0 0.25 0.25 @@ -794,7 +785,7 @@ ( -1456 -528 336 ) ( -1455 -528 336 ) ( -1456 -528 337 ) mapping_defaults/ProtoWhite 64 -64 0 0.25 0.25 ( -1456 -976 336 ) ( -1456 -976 337 ) ( -1456 -975 336 ) mapping_defaults/ProtoWhite -64 -64 0 0.25 0.25 } -// brush 88 +// brush 87 { ( -848 -1136 192 ) ( -848 -1135 192 ) ( -848 -1136 193 ) mapping_defaults/ProtoWhite -64 -64 0 0.25 0.25 ( -848 -1136 192 ) ( -848 -1136 193 ) ( -847 -1136 192 ) mapping_defaults/ProtoWhite 64 -64 0 0.25 0.25 @@ -803,7 +794,7 @@ ( -720 -1040 208 ) ( -719 -1040 208 ) ( -720 -1040 209 ) mapping_defaults/ProtoWhite 64 -64 0 0.25 0.25 ( -720 -1040 208 ) ( -720 -1040 209 ) ( -720 -1039 208 ) mapping_defaults/ProtoWhite -64 -64 0 0.25 0.25 } -// brush 89 +// brush 88 { ( -1256 -880 192 ) ( -1256 -879 192 ) ( -1256 -880 193 ) mapping_defaults/ProtoOrange 16 -128 0 1 1 ( -1256 -872 192 ) ( -1256 -872 193 ) ( -1255 -872 192 ) mapping_defaults/ProtoOrange 64 -128 0 1 1 @@ -812,7 +803,7 @@ ( -888 -864 200 ) ( -887 -864 200 ) ( -888 -864 201 ) mapping_defaults/ProtoOrange 64 -128 0 1 1 ( -1104 -872 240 ) ( -1104 -872 272 ) ( -1104 -744 272 ) mapping_defaults/ProtoOrange 16 -128 0 1 1 } -// brush 90 +// brush 89 { ( -1056 -872 240 ) ( -1056 -744 272 ) ( -1056 -872 272 ) mapping_defaults/ProtoOrange 16 -128 0 1 1 ( -1256 -872 192 ) ( -1256 -872 193 ) ( -1255 -872 192 ) mapping_defaults/ProtoOrange 64 -128 0 1 1 @@ -821,7 +812,7 @@ ( -888 -864 200 ) ( -887 -864 200 ) ( -888 -864 201 ) mapping_defaults/ProtoOrange 64 -128 0 1 1 ( -888 -864 200 ) ( -888 -864 201 ) ( -888 -863 200 ) mapping_defaults/ProtoOrange 16 -128 0 1 1 } -// brush 91 +// brush 90 { ( -1104 -872 240 ) ( -1104 -744 272 ) ( -1104 -872 272 ) mapping_defaults/ProtoOrange 16 -128 0 1 1 ( -1256 -872 192 ) ( -1256 -872 193 ) ( -1255 -872 192 ) mapping_defaults/ProtoOrange 64 -128 0 1 1 @@ -830,7 +821,7 @@ ( -888 -864 200 ) ( -887 -864 200 ) ( -888 -864 201 ) mapping_defaults/ProtoOrange 64 -128 0 1 1 ( -1056 -872 240 ) ( -1056 -872 272 ) ( -1056 -744 272 ) mapping_defaults/ProtoOrange 16 -128 0 1 1 } -// brush 92 +// brush 91 { ( -720 -1600 192 ) ( -720 -1568 192 ) ( -720 -1568 320 ) mapping_defaults/ProtoDark 0 -64 0 0.25 0.25 ( -320 -1024 192 ) ( -352 -1024 192 ) ( -352 -1024 320 ) mapping_defaults/ProtoDark 64 -64 0 0.25 0.25 @@ -839,7 +830,7 @@ ( -1424 -64 192 ) ( -1423 -64 192 ) ( -1424 -64 193 ) mapping_defaults/ProtoDark 64 -64 0 0.25 0.25 ( -96 -1536 192 ) ( -96 -1536 193 ) ( -96 -1535 192 ) mapping_defaults/ProtoDark 0 -64 0 0.25 0.25 } -// brush 93 +// brush 92 { ( -1712 -1664 160 ) ( -1712 -1663 160 ) ( -1712 -1664 161 ) mapping_defaults/ProtoDark 0 -64 0 0.25 0.25 ( -1552 -1760 160 ) ( -1552 -1760 161 ) ( -1551 -1760 160 ) mapping_defaults/ProtoDark 64 -64 0 0.25 0.25 @@ -848,7 +839,7 @@ ( -320 -1024 192 ) ( -352 -1024 320 ) ( -352 -1024 192 ) mapping_defaults/ProtoDark 64 -64 0 0.25 0.25 ( -720 -1600 192 ) ( -720 -1568 320 ) ( -720 -1568 192 ) mapping_defaults/ProtoDark 0 -64 0 0.25 0.25 } -// brush 94 +// brush 93 { ( -560 -544 192 ) ( -560 -543 192 ) ( -560 -544 193 ) mapping_defaults/ProtoWhite 16 -128 0 1 1 ( -560 -544 192 ) ( -560 -544 193 ) ( -559 -544 192 ) mapping_defaults/ProtoWhite 64 -128 0 1 1 @@ -857,7 +848,7 @@ ( -288 -464 208 ) ( -287 -464 208 ) ( -288 -464 209 ) mapping_defaults/ProtoWhite 64 -128 0 1 1 ( -464 -544 288 ) ( -464 -416 272 ) ( -464 -544 272 ) mapping_defaults/ProtoWhite 16 -128 0 1 1 } -// brush 95 +// brush 94 { ( -560 -544 192 ) ( -560 -543 192 ) ( -560 -544 193 ) mapping_defaults/ProtoWhite 16 -128 0 1 1 ( -560 -544 192 ) ( -560 -544 193 ) ( -559 -544 192 ) mapping_defaults/ProtoWhite 64 -128 0 1 1 @@ -866,7 +857,7 @@ ( -288 -464 208 ) ( -287 -464 208 ) ( -288 -464 209 ) mapping_defaults/ProtoWhite 64 -128 0 1 1 ( -368 -544 288 ) ( -368 -416 272 ) ( -368 -544 272 ) mapping_defaults/ProtoWhite 16 -128 0 1 1 } -// brush 96 +// brush 95 { ( -368 -544 288 ) ( -368 -544 272 ) ( -368 -416 272 ) mapping_defaults/ProtoWhite 16 -128 0 1 1 ( -560 -544 192 ) ( -560 -544 193 ) ( -559 -544 192 ) mapping_defaults/ProtoWhite 64 -128 0 1 1 @@ -875,7 +866,7 @@ ( -288 -464 208 ) ( -287 -464 208 ) ( -288 -464 209 ) mapping_defaults/ProtoWhite 64 -128 0 1 1 ( -288 -464 208 ) ( -288 -464 209 ) ( -288 -463 208 ) mapping_defaults/ProtoWhite 16 -128 0 1 1 } -// brush 97 +// brush 96 { ( -464 -496 336 ) ( -464 -512 336 ) ( -464 -512 304 ) mapping_defaults/ProtoWhite 16 -128 0 1 1 ( -464 -512 336 ) ( -304 -512 336 ) ( -304 -512 304 ) mapping_defaults/ProtoWhite 64 -128 0 1 1 @@ -884,7 +875,7 @@ ( -304 -496 304 ) ( -304 -496 336 ) ( -464 -496 336 ) mapping_defaults/ProtoWhite 64 -128 0 1 1 ( -304 -512 336 ) ( -304 -496 336 ) ( -304 -496 304 ) mapping_defaults/ProtoWhite 16 -128 0 1 1 } -// brush 98 +// brush 97 { ( -464 -512 336 ) ( -464 -544 336 ) ( -464 -544 288 ) mapping_defaults/ProtoWhite 16 -128 0 1 1 ( -464 -544 336 ) ( -288 -544 336 ) ( -312 -544 288 ) mapping_defaults/ProtoWhite 64 -128 0 1 1 @@ -893,7 +884,7 @@ ( -312 -512 288 ) ( -288 -512 336 ) ( -464 -512 336 ) mapping_defaults/ProtoWhite 64 -128 0 1 1 ( -288 -544 336 ) ( -288 -512 336 ) ( -312 -512 288 ) mapping_defaults/ProtoWhite 20 -124 0 1 1 } -// brush 99 +// brush 98 { ( -1256 -400 352 ) ( -1256 -399 352 ) ( -1256 -400 353 ) mapping_defaults/ProtoOrange 16 -128 0 1 1 ( -1180 -404 352 ) ( -1180 -404 353 ) ( -1179 -404 352 ) mapping_defaults/ProtoOrange 64 -128 0 1 1 @@ -902,7 +893,7 @@ ( -1076 -396 356 ) ( -1075 -396 356 ) ( -1076 -396 357 ) mapping_defaults/ProtoOrange 64 -128 0 1 1 ( -976 -404 368 ) ( -976 -404 384 ) ( -976 -276 384 ) mapping_defaults/ProtoOrange 16 -128 0 1 1 } -// brush 100 +// brush 99 { ( -976 -404 368 ) ( -976 -276 384 ) ( -976 -404 384 ) mapping_defaults/ProtoOrange 16 -128 0 1 1 ( -1180 -404 352 ) ( -1180 -404 353 ) ( -1179 -404 352 ) mapping_defaults/ProtoOrange 64 -128 0 1 1 @@ -911,7 +902,7 @@ ( -1076 -396 356 ) ( -1075 -396 356 ) ( -1076 -396 357 ) mapping_defaults/ProtoOrange 64 -128 0 1 1 ( -928 -396 356 ) ( -928 -396 357 ) ( -928 -395 356 ) mapping_defaults/ProtoOrange 16 -128 0 1 1 } -// brush 101 +// brush 100 { ( -2400 0 311.7987421383648 ) ( -2400 0.48742138364779025 311.7987421383648 ) ( -2400 0 312.28616352201254 ) mapping_defaults/ProtoWhite 0 -65.23633 0 0.12185524 0.12185524 ( -2324.025157232706 0 311.7987421383648 ) ( -2324.025157232706 0 312.28616352201254 ) ( -2323.5377358490623 0 311.7987421383648 ) mapping_defaults/ProtoWhite 128.00781 -65.23633 0 0.12185528 0.12185524 @@ -920,7 +911,7 @@ ( -1247.7987421383655 452.3270440251566 319.5974842767296 ) ( -1247.311320754719 452.3270440251566 319.5974842767296 ) ( -1247.7987421383655 452.3270440251566 320.08490566037733 ) mapping_defaults/ProtoWhite 128.00781 -65.23633 0 0.12185528 0.12185524 ( -1247.7987421383655 452.3270440251566 319.5974842767296 ) ( -1247.7987421383655 452.3270440251566 320.08490566037733 ) ( -1247.7987421383655 452.81446540879915 319.5974842767296 ) mapping_defaults/ProtoWhite 0 -65.23633 0 0.12185524 0.12185524 } -// brush 102 +// brush 101 { ( -2394.2138364779876 0 176 ) ( -2394.2138364779876 0.48742138364779025 176 ) ( -2394.2138364779876 0 176.48742138364787 ) mapping_defaults/ProtoWhite -154.00293 -227.66321 0 0.12185524 0.12185524 ( -132.57861635220132 0 176 ) ( -132.57861635220132 0 176.48742138364787 ) ( -132.09119496855445 0 176 ) mapping_defaults/ProtoWhite 36.004883 -227.66321 0 0.12185528 0.12185524 @@ -929,7 +920,7 @@ ( -2027.6729559748442 787.6729559748417 183.7987421383648 ) ( -1996.4779874213846 787.6729559748417 183.7987421383648 ) ( -1996.4779874213846 787.6729559748417 246.18867924528308 ) mapping_defaults/ProtoWhite 36.004883 -227.66321 0 0.12185528 0.12185524 ( 0 23.396226415094315 183.7987421383648 ) ( 0 23.396226415094315 184.28616352201254 ) ( 0 23.88364779874179 183.7987421383648 ) mapping_defaults/ProtoWhite -154.00293 -227.66321 0 0.12185524 0.12185524 } -// brush 103 +// brush 102 { ( -569.3081761006292 2480 183.7987421383648 ) ( -569.3081761006292 787.6729559748417 183.7987421383648 ) ( -569.3081761006292 787.6729559748417 176 ) mapping_defaults/ProtoWhite -154.01172 -227.66321 0 0.12185524 0.12185524 ( -569.3081761006292 787.6729559748417 183.7987421383648 ) ( 0 787.6729559748417 183.7987421383648 ) ( 0 787.6729559748417 176 ) mapping_defaults/ProtoWhite 36.00122 -227.66321 0 0.12185528 0.12185524 @@ -938,7 +929,7 @@ ( 0 2480 176 ) ( 0 2480 183.7987421383648 ) ( -569.3081761006292 2480 183.7987421383648 ) mapping_defaults/ProtoWhite 36.00122 -227.66321 0 0.12185528 0.12185524 ( 0 787.6729559748417 183.7987421383648 ) ( 0 2480 183.7987421383648 ) ( 0 2480 176 ) mapping_defaults/ProtoWhite -154.01172 -227.66321 0 0.12185524 0.12185524 } -// brush 104 +// brush 103 { ( -2394.2138364779876 2480 183.7987421383648 ) ( -2394.2138364779876 787.6729559748417 183.7987421383648 ) ( -2394.2138364779876 787.6729559748417 176 ) mapping_defaults/ProtoWhite -154.01172 -227.66321 0 0.12185524 0.12185524 ( -2394.2138364779876 787.6729559748417 183.7987421383648 ) ( -569.3081761006292 787.6729559748417 183.7987421383648 ) ( -569.3081761006292 787.6729559748417 176 ) mapping_defaults/ProtoWhite 36.006836 -227.66321 0 0.12185528 0.12185524 @@ -947,7 +938,7 @@ ( -569.3081761006292 2480 176 ) ( -569.3081761006292 2480 183.7987421383648 ) ( -2394.2138364779876 2480 183.7987421383648 ) mapping_defaults/ProtoWhite 36.006836 -227.66321 0 0.12185528 0.12185524 ( -569.3081761006292 787.6729559748417 183.7987421383648 ) ( -569.3081761006292 2480 183.7987421383648 ) ( -569.3081761006292 2480 176 ) mapping_defaults/ProtoWhite -154.01172 -227.66321 0 0.12185524 0.12185524 } -// brush 105 +// brush 104 { ( -358.74213836478003 -0.2012578616368046 378.76729559748424 ) ( -358.74213836478003 0.28616352199628636 378.76729559748424 ) ( -358.74213836478003 -0.2012578616368046 379.2547169811321 ) mapping_defaults/ProtoWhite -62.35254 -27.661621 0 0.12185524 0.12185524 ( -358.74213836478003 -0.2012578616368046 378.76729559748424 ) ( -358.74213836478003 -0.2012578616368046 379.2547169811321 ) ( -358.25471698113336 -0.2012578616368046 378.76729559748424 ) mapping_defaults/ProtoWhite 0 -27.661621 0 0.12185528 0.12185524 @@ -956,7 +947,7 @@ ( 0 1068.226415094337 386.566037735849 ) ( 0.48742138364694654 1068.226415094337 386.566037735849 ) ( 0 1068.226415094337 387.05345911949644 ) mapping_defaults/ProtoWhite 0 -27.661621 0 0.12185528 0.12185524 ( 0 1068.226415094337 386.566037735849 ) ( 0 1068.226415094337 387.05345911949644 ) ( 0 1068.7138364779544 386.566037735849 ) mapping_defaults/ProtoWhite -62.35254 -27.661621 0 0.12185524 0.12185524 } -// brush 106 +// brush 105 { ( -1248 0 176 ) ( -1248 1 176 ) ( -1248 0 177 ) mapping_defaults/ProtoWhite 128 -64 0 0.25 0.25 ( -1248 0 176 ) ( -1248 0 177 ) ( -1247 0 176 ) mapping_defaults/ProtoWhite 0 -64 0 0.25 0.25 @@ -965,7 +956,7 @@ ( -1232 80 192 ) ( -1231 80 192 ) ( -1232 80 193 ) mapping_defaults/ProtoWhite 0 -64 0 0.25 0.25 ( -1232 80 192 ) ( -1232 80 193 ) ( -1232 81 192 ) mapping_defaults/ProtoWhite 128 -64 0 0.25 0.25 } -// brush 107 +// brush 106 { ( -1248 80 304 ) ( -1248 81 304 ) ( -1248 80 305 ) mapping_defaults/ProtoWhite 0 -64 0 0.25 0.25 ( -1296 80 304 ) ( -1296 80 305 ) ( -1295 80 304 ) mapping_defaults/ProtoWhite 0 -64 0 0.25 0.25 @@ -974,7 +965,7 @@ ( -1232 368 320 ) ( -1231 368 320 ) ( -1232 368 321 ) mapping_defaults/ProtoWhite 0 -64 0 0.25 0.25 ( -1232 96 320 ) ( -1232 96 321 ) ( -1232 97 320 ) mapping_defaults/ProtoWhite 0 -64 0 0.25 0.25 } -// brush 108 +// brush 107 { ( -1248 368 176 ) ( -1248 369 176 ) ( -1248 368 177 ) mapping_defaults/ProtoWhite -64 -64 0 0.25 0.25 ( -1248 368 176 ) ( -1248 368 177 ) ( -1247 368 176 ) mapping_defaults/ProtoWhite 0 -64 0 0.25 0.25 @@ -983,7 +974,7 @@ ( -1232 464 192 ) ( -1231 464 192 ) ( -1232 464 193 ) mapping_defaults/ProtoWhite 0 -64 0 0.25 0.25 ( -1232 448 192 ) ( -1232 448 193 ) ( -1232 449 192 ) mapping_defaults/ProtoWhite -64 -64 0 0.25 0.25 } -// brush 109 +// brush 108 { ( -2416 448 304 ) ( -2416 449 304 ) ( -2416 448 305 ) mapping_defaults/ProtoWhite 0 -64 0 0.25 0.25 ( -1264 448 304 ) ( -1264 448 305 ) ( -1263 448 304 ) mapping_defaults/ProtoWhite 0 -64 0 0.25 0.25 @@ -992,7 +983,7 @@ ( -1248 464 320 ) ( -1247 464 320 ) ( -1248 464 321 ) mapping_defaults/ProtoWhite 0 -64 0 0.25 0.25 ( -1248 464 320 ) ( -1248 464 321 ) ( -1248 465 320 ) mapping_defaults/ProtoWhite 0 -64 0 0.25 0.25 } -// brush 110 +// brush 109 { ( -2400 -16 176 ) ( -2400 -15 176 ) ( -2400 -16 177 ) mapping_defaults/ProtoWhite 0 -64 0 0.25 0.25 ( -2400 -16 176 ) ( -2400 -16 177 ) ( -2399 -16 176 ) mapping_defaults/ProtoWhite 0 -64 0 0.25 0.25 @@ -1001,7 +992,7 @@ ( -2384 2480 192 ) ( -2383 2480 192 ) ( -2384 2480 193 ) mapping_defaults/ProtoWhite 0 -64 0 0.25 0.25 ( -2384 16 192 ) ( -2384 16 193 ) ( -2384 17 192 ) mapping_defaults/ProtoWhite 0 -64 0 0.25 0.25 } -// brush 111 +// brush 110 { ( -1712 -1664 160 ) ( -1712 -1663 160 ) ( -1712 -1664 161 ) mapping_defaults/ProtoDark 0 -64 0 0.25 0.25 ( -1120 -816 192 ) ( -1136 -816 192 ) ( -1136 -816 320 ) mapping_defaults/ProtoDark 64 -64 0 0.25 0.25 @@ -1010,7 +1001,7 @@ ( -1424 -64 192 ) ( -1423 -64 192 ) ( -1424 -64 193 ) mapping_defaults/ProtoDark 64 -64 0 0.25 0.25 ( -720 -1600 192 ) ( -720 -1568 320 ) ( -720 -1568 192 ) mapping_defaults/ProtoDark 0 -64 0 0.25 0.25 } -// brush 112 +// brush 111 { ( -1088 -832 192 ) ( -1088 -848 320 ) ( -1088 -848 192 ) mapping_defaults/ProtoDark 0 -64 0 0.25 0.25 ( -320 -1024 192 ) ( -352 -1024 192 ) ( -352 -1024 320 ) mapping_defaults/ProtoDark 64 -64 0 0.25 0.25 @@ -1019,7 +1010,7 @@ ( -1120 -816 192 ) ( -1136 -816 320 ) ( -1136 -816 192 ) mapping_defaults/ProtoDark 64 -64 0 0.25 0.25 ( -720 -1600 192 ) ( -720 -1568 320 ) ( -720 -1568 192 ) mapping_defaults/ProtoDark 0 -64 0 0.25 0.25 } -// brush 113 +// brush 112 { ( -1712 -1664 160 ) ( -1712 -1663 160 ) ( -1712 -1664 161 ) mapping_defaults/ProtoDark 0 -64 0 0.25 0.25 ( -320 -1024 192 ) ( -352 -1024 192 ) ( -352 -1024 320 ) mapping_defaults/ProtoDark 64 -64 0 0.25 0.25 @@ -1028,7 +1019,7 @@ ( -1104 -864 192 ) ( -1120 -864 320 ) ( -1120 -864 192 ) mapping_defaults/ProtoDark 64 -64 0 0.25 0.25 ( -1088 -832 192 ) ( -1088 -848 192 ) ( -1088 -848 320 ) mapping_defaults/ProtoDark 0 -64 0 0.25 0.25 } -// brush 114 +// brush 113 { ( -1712 -864 176 ) ( -1712 -863 176 ) ( -1712 -864 177 ) mapping_defaults/ProtoWhite 0 -64 0 0.25 0.25 ( -1376 -864 176 ) ( -1376 -864 177 ) ( -1375 -864 176 ) mapping_defaults/ProtoWhite 0 -64 0 0.25 0.25 @@ -1037,7 +1028,7 @@ ( -1360 -816 192 ) ( -1359 -816 192 ) ( -1360 -816 193 ) mapping_defaults/ProtoWhite 0 -64 0 0.25 0.25 ( -1248 -832 192 ) ( -1248 -832 193 ) ( -1248 -831 192 ) mapping_defaults/ProtoWhite 0 -64 0 0.25 0.25 } -// brush 115 +// brush 114 { ( -31040 -160 16 ) ( -31040 -159 16 ) ( -31040 -160 17 ) mapping_defaults/ProtoOrange 0 128 0 0.25 0.25 ( 16 -14416 16 ) ( 16 -14416 17 ) ( 17 -14416 16 ) mapping_defaults/ProtoOrange 0 128 0 0.25 0.25 @@ -1046,7 +1037,7 @@ ( 96 31312 32 ) ( 97 31312 32 ) ( 96 31312 33 ) mapping_defaults/ProtoOrange 0 128 0 0.25 0.25 ( 18048 16 32 ) ( 18048 16 33 ) ( 18048 17 32 ) mapping_defaults/ProtoOrange 0 128 0 0.25 0.25 } -// brush 116 +// brush 115 { ( 2366.4599679967682 1648 -122.66245073290474 ) ( 2366.4599679967682 1649 -122.66245073290474 ) ( 2366.959967996768 1648 -121.79642532912021 ) mapping_defaults/ProtoWhite -128 -182.55273 0 0.25 0.21650635 ( 2366.4599679967682 1648 -122.66245073290474 ) ( 2367.3259934005523 1648 -123.16245073290474 ) ( 2366.4599679967682 1649 -122.66245073290474 ) mapping_defaults/ProtoWhite 77.78906 128 0 0.21650635 0.25 @@ -1055,7 +1046,7 @@ ( 9834.59325198393 1888 12396.523834829071 ) ( 9834.59325198393 1889 12396.523834829071 ) ( 9835.459277387716 1888 12396.023834829071 ) mapping_defaults/ProtoWhite -48.04297 128 0 0.21650635 0.25 ( 2554.593251983931 1888 -212.8060442723537 ) ( 2555.0932519839316 1888 -211.94001886856927 ) ( 2554.593251983931 1889 -212.8060442723537 ) mapping_defaults/ProtoWhite -128 -150.9082 0 0.25 0.21650635 } -// brush 117 +// brush 116 { ( -8448 -13504 0 ) ( -8448 -13503 0 ) ( -8448 -13504 1 ) mapping_defaults/ProtoDark 0 0 0 0.25 0.25 ( -8448 -4864 0 ) ( -8448 -4864 1 ) ( -8447 -4864 0 ) mapping_defaults/ProtoDark 0 0 0 0.25 0.25 @@ -1064,7 +1055,7 @@ ( -2816 -2112 64 ) ( -2815 -2112 64 ) ( -2816 -2112 65 ) mapping_defaults/ProtoDark 0 0 0 0.25 0.25 ( -2816 -2112 64 ) ( -2816 -2112 65 ) ( -2816 -2111 64 ) mapping_defaults/ProtoDark 0 0 0 0.25 0.25 } -// brush 118 +// brush 117 { ( -15680 -13824 0 ) ( -15680 -13823 0 ) ( -15680 -13824 1 ) mapping_defaults/ProtoDark 0 0 0 0.25 0.25 ( -15680 -5184 0 ) ( -15680 -5184 1 ) ( -15679 -5184 0 ) mapping_defaults/ProtoDark 0 0 0 0.25 0.25 @@ -1073,7 +1064,7 @@ ( -10048 -2432 64 ) ( -10047 -2432 64 ) ( -10048 -2432 65 ) mapping_defaults/ProtoDark 0 0 0 0.25 0.25 ( -10048 -2432 64 ) ( -10048 -2432 65 ) ( -10048 -2431 64 ) mapping_defaults/ProtoDark 0 0 0 0.25 0.25 } -// brush 119 +// brush 118 { ( -7488 -5504 0 ) ( -7488 -5503 0 ) ( -7488 -5504 1 ) mapping_defaults/ProtoDark 0 0 0 0.25 0.25 ( -7488 3136 0 ) ( -7488 3136 1 ) ( -7487 3136 0 ) mapping_defaults/ProtoDark 0 0 0 0.25 0.25 @@ -1082,7 +1073,7 @@ ( -1856 5888 64 ) ( -1855 5888 64 ) ( -1856 5888 65 ) mapping_defaults/ProtoDark 0 0 0 0.25 0.25 ( -1856 5888 64 ) ( -1856 5888 65 ) ( -1856 5889 64 ) mapping_defaults/ProtoDark 0 0 0 0.25 0.25 } -// brush 120 +// brush 119 { ( -15488 -5888 0 ) ( -15488 -5887 0 ) ( -15488 -5888 1 ) mapping_defaults/ProtoDark 0 0 0 0.25 0.25 ( -15488 2752 0 ) ( -15488 2752 1 ) ( -15487 2752 0 ) mapping_defaults/ProtoDark 0 0 0 0.25 0.25 @@ -1091,7 +1082,7 @@ ( -9856 5504 64 ) ( -9855 5504 64 ) ( -9856 5504 65 ) mapping_defaults/ProtoDark 0 0 0 0.25 0.25 ( -9856 5504 64 ) ( -9856 5504 65 ) ( -9856 5505 64 ) mapping_defaults/ProtoDark 0 0 0 0.25 0.25 } -// brush 121 +// brush 120 { ( -24000 -13824 0 ) ( -24000 -13823 0 ) ( -24000 -13824 1 ) mapping_defaults/ProtoDark 0 0 0 0.25 0.25 ( -24000 -5184 0 ) ( -24000 -5184 1 ) ( -23999 -5184 0 ) mapping_defaults/ProtoDark 0 0 0 0.25 0.25 @@ -1100,7 +1091,7 @@ ( -18368 -2432 64 ) ( -18367 -2432 64 ) ( -18368 -2432 65 ) mapping_defaults/ProtoDark 0 0 0 0.25 0.25 ( -18368 -2432 64 ) ( -18368 -2432 65 ) ( -18368 -2431 64 ) mapping_defaults/ProtoDark 0 0 0 0.25 0.25 } -// brush 122 +// brush 121 { ( -31232 -14144 0 ) ( -31232 -14143 0 ) ( -31232 -14144 1 ) mapping_defaults/ProtoDark 0 0 0 0.25 0.25 ( -31232 -5504 0 ) ( -31232 -5504 1 ) ( -31231 -5504 0 ) mapping_defaults/ProtoDark 0 0 0 0.25 0.25 @@ -1109,7 +1100,7 @@ ( -25600 -2752 64 ) ( -25599 -2752 64 ) ( -25600 -2752 65 ) mapping_defaults/ProtoDark 0 0 0 0.25 0.25 ( -25600 -2752 64 ) ( -25600 -2752 65 ) ( -25600 -2751 64 ) mapping_defaults/ProtoDark 0 0 0 0.25 0.25 } -// brush 123 +// brush 122 { ( -23040 -5824 0 ) ( -23040 -5823 0 ) ( -23040 -5824 1 ) mapping_defaults/ProtoDark 0 0 0 0.25 0.25 ( -23040 2816 0 ) ( -23040 2816 1 ) ( -23039 2816 0 ) mapping_defaults/ProtoDark 0 0 0 0.25 0.25 @@ -1118,7 +1109,7 @@ ( -17408 5568 64 ) ( -17407 5568 64 ) ( -17408 5568 65 ) mapping_defaults/ProtoDark 0 0 0 0.25 0.25 ( -17408 5568 64 ) ( -17408 5568 65 ) ( -17408 5569 64 ) mapping_defaults/ProtoDark 0 0 0 0.25 0.25 } -// brush 124 +// brush 123 { ( -31040 -6208 0 ) ( -31040 -6207 0 ) ( -31040 -6208 1 ) mapping_defaults/ProtoDark 0 0 0 0.25 0.25 ( -31040 2432 0 ) ( -31040 2432 1 ) ( -31039 2432 0 ) mapping_defaults/ProtoDark 0 0 0 0.25 0.25 @@ -1127,7 +1118,7 @@ ( -25408 5184 64 ) ( -25407 5184 64 ) ( -25408 5184 65 ) mapping_defaults/ProtoDark 0 0 0 0.25 0.25 ( -25408 5184 64 ) ( -25408 5184 65 ) ( -25408 5185 64 ) mapping_defaults/ProtoDark 0 0 0 0.25 0.25 } -// brush 125 +// brush 124 { ( -21440 -2432 20864 ) ( -21440 -2431 20864 ) ( -21440 -2432 20865 ) mapping_defaults/ProtoDark 0 0 0 0.25 0.25 ( -20032 -2432 20864 ) ( -20032 -2432 20865 ) ( -20031 -2432 20864 ) mapping_defaults/ProtoDark 0 0 0 0.25 0.25 @@ -1136,7 +1127,7 @@ ( -19584 -2048 20928 ) ( -19583 -2048 20928 ) ( -19584 -2048 20929 ) mapping_defaults/ProtoDark 0 0 0 0.25 0.25 ( -19584 -2048 20928 ) ( -19584 -2048 20929 ) ( -19584 -2047 20928 ) mapping_defaults/ProtoDark 0 0 0 0.25 0.25 } -// brush 126 +// brush 125 { ( -20544 -2432 20928 ) ( -20544 -2431 20928 ) ( -20544 -2432 20929 ) mapping_defaults/ProtoOrange 0 0 0 0.25 0.25 ( -20544 -2432 20928 ) ( -20544 -2432 20929 ) ( -20543 -2432 20928 ) mapping_defaults/ProtoOrange 0 0 0 0.25 0.25 @@ -1145,6 +1136,42 @@ ( -20288 -2368 20992 ) ( -20287 -2368 20992 ) ( -20288 -2368 20993 ) mapping_defaults/ProtoOrange 0 0 0 0.25 0.25 ( -20288 -2368 20992 ) ( -20288 -2368 20993 ) ( -20288 -2367 20992 ) mapping_defaults/ProtoOrange 0 0 0 0.25 0.25 } +// brush 126 +{ +( -1536 -540 80 ) ( -1536 -539 80 ) ( -1536 -540 81 ) mapping_defaults/ProtoWhite 16 -128 0 1 1 +( -1532 -672 64 ) ( -1532 -672 80 ) ( -1404 -672 80 ) mapping_defaults/ProtoWhite 64 -128 0 1 1 +( -1536 -540 4 ) ( -1535 -540 4 ) ( -1536 -539 4 ) mapping_defaults/ProtoWhite 64 -16 0 1 1 +( -1532 -536 180 ) ( -1532 -535 180 ) ( -1531 -536 180 ) mapping_defaults/ProtoWhite 64 -16 0 1 1 +( -1532 -536 84 ) ( -1531 -536 84 ) ( -1532 -536 85 ) mapping_defaults/ProtoWhite 64 -128 0 1 1 +( -1532 -536 84 ) ( -1532 -536 85 ) ( -1532 -535 84 ) mapping_defaults/ProtoWhite 16 -128 0 1 1 +} +// brush 127 +{ +( -1536 -540 80 ) ( -1536 -539 80 ) ( -1536 -540 81 ) mapping_defaults/ProtoWhite 16 -128 0 1 1 +( -1536 -864 80 ) ( -1536 -864 81 ) ( -1535 -864 80 ) mapping_defaults/ProtoWhite 64 -128 0 1 1 +( -1536 -540 4 ) ( -1535 -540 4 ) ( -1536 -539 4 ) mapping_defaults/ProtoWhite 64 -16 0 1 1 +( -1532 -536 180 ) ( -1532 -535 180 ) ( -1531 -536 180 ) mapping_defaults/ProtoWhite 64 -16 0 1 1 +( -1532 -720 64 ) ( -1404 -720 96 ) ( -1532 -720 96 ) mapping_defaults/ProtoWhite 64 -128 0 1 1 +( -1532 -536 84 ) ( -1532 -536 85 ) ( -1532 -535 84 ) mapping_defaults/ProtoWhite 16 -128 0 1 1 +} +// brush 128 +{ +( -1536 -540 64 ) ( -1536 -539 64 ) ( -1536 -540 65 ) mapping_defaults/ProtoWhite 16 -144 0 1 1 +( -1532 -720 48 ) ( -1532 -720 80 ) ( -1404 -720 80 ) mapping_defaults/ProtoWhite 64 -144 0 1 1 +( -1536 -540 -12 ) ( -1535 -540 -12 ) ( -1536 -539 -12 ) mapping_defaults/ProtoWhite 64 -16 0 1 1 +( -1532 -704 16 ) ( -1532 -688 16 ) ( -1404 -688 16 ) mapping_defaults/ProtoWhite 64 -16 0 1 1 +( -1532 -672 48 ) ( -1404 -672 64 ) ( -1532 -672 64 ) mapping_defaults/ProtoWhite 64 -144 0 1 1 +( -1532 -536 68 ) ( -1532 -536 69 ) ( -1532 -535 68 ) mapping_defaults/ProtoWhite 16 -144 0 1 1 +} +// brush 129 +{ +( -1536 -540 80 ) ( -1536 -539 80 ) ( -1536 -540 81 ) mapping_defaults/ProtoWhite 16 -128 0 1 1 +( -1532 -720 64 ) ( -1532 -720 96 ) ( -1404 -720 96 ) mapping_defaults/ProtoWhite 64 -128 0 1 1 +( -1532 -704 112 ) ( -1404 -688 112 ) ( -1532 -688 112 ) mapping_defaults/ProtoWhite 64 -16 0 1 1 +( -1532 -536 180 ) ( -1532 -535 180 ) ( -1531 -536 180 ) mapping_defaults/ProtoWhite 64 -16 0 1 1 +( -1532 -672 64 ) ( -1404 -672 80 ) ( -1532 -672 80 ) mapping_defaults/ProtoWhite 64 -128 0 1 1 +( -1532 -536 84 ) ( -1532 -536 85 ) ( -1532 -535 84 ) mapping_defaults/ProtoWhite 16 -128 0 1 1 +} } // entity 1 { diff --git a/projects/sampleGame/externGame/externGame.zig b/projects/sampleGame/externGame/externGame.zig index 7650660..d36d56c 100644 --- a/projects/sampleGame/externGame/externGame.zig +++ b/projects/sampleGame/externGame/externGame.zig @@ -96,12 +96,16 @@ pub const ExternGameObject = struct { if (platform.context().isCursorEnabled()) { core.engine_logs("moving light "); const ray = rend.context().activeCamera.?.getNormalRayFromScreen(platform.getCursorPosition()); + if (physics.traceLine(ray.start, ray.dir.fmul(10000), .{ .bodyFilter = &self.fireTraceFilter, .getNormalsSlow = true })) |r| { + if (r.normal) |n| { + const p = r.point.add(n.fmul(0.2)); + core.debugSphere(p, 0.2, .{ .color = .{ .y = 1.0 }, .duration = 10.0 }); + + rend.context().lightPosition = p; + } - if (physics.traceLine(ray.start, ray.dir.fmul(10000), .{ .bodyFilter = &self.fireTraceFilter })) |r| { - core.debugSphere(r.point, 0.2, .{ .color = .{ .y = 1.0 }, .duration = 10.0 }); // core.debugLine(ray.start, ray.start.add(ray.dir.fmul(1000)), .{ .duration = 2.5 }); // physics.applyForce(r.body, ray.dir.fmul(400), r.point); - rend.context().lightPosition = r.point.add(.{ .y = 0.1 }); } } } @@ -138,12 +142,14 @@ pub const ExternGameObject = struct { if (rend.context().activeCamera) |cam| { const ray = cam.getNormalRayFromScreen(platform.getCursorPosition()); - if (physics.traceLine(ray.start, ray.dir.fmul(10000), .{ .bodyFilter = &self.fireTraceFilter })) |r| { + if (physics.traceLine(ray.start, ray.dir.fmul(10000), .{ .bodyFilter = &self.fireTraceFilter, .getNormalsSlow = false })) |r| { core.debugSphere(r.point, 0.2, .{ .color = .{ .x = 1.0 }, .duration = 0 }); // core.debugLine(ray.start, ray.start.add(ray.dir.fmul(1000)), .{ .duration = 2.5 }); // physics.applyForce(r.body, ray.dir.fmul(400), r.point); ig.textf("{d} {d} {d}", .{ r.point.x, r.point.y, r.point.z }); } + + ig.textf("imgui mouse consumed {any}", .{platform.getInstance().imguiMouseConsumed}); } } ig.end();