From 1ff7fefe38f815eb797dcbddc091d68bea1b18e1 Mon Sep 17 00:00:00 2001 From: extrawurst Date: Mon, 5 May 2025 12:42:32 +0200 Subject: [PATCH] test platforms --- assets/maps/map1.map | 60 ++++++++++++++++++++++++++++++++++++++++++++ src/platforms.rs | 1 - 2 files changed, 60 insertions(+), 1 deletion(-) diff --git a/assets/maps/map1.map b/assets/maps/map1.map index c272d08..5254d72 100644 --- a/assets/maps/map1.map +++ b/assets/maps/map1.map @@ -1530,3 +1530,63 @@ ( 832 7360 -1568 ) ( 832 7360 -1567 ) ( 832 7361 -1568 ) water [ 0 1 0 0 ] [ 0 0 -1 -32 ] 270 1 1 } } +// entity 40 +{ +"classname" "platform" +"target" "test_target" +"angles" "0 0 0" +// brush 0 +{ +( 368 1120 16 ) ( 368 1121 16 ) ( 368 1120 17 ) origin [ 0 -1 0 0 ] [ 0 0 -1 0 ] 0 1 1 +( 368 1120 16 ) ( 368 1120 17 ) ( 369 1120 16 ) origin [ 1 0 0 0 ] [ 0 0 -1 0 ] 0 1 1 +( 368 1120 16 ) ( 369 1120 16 ) ( 368 1121 16 ) origin [ -1 0 0 0 ] [ 0 -1 0 0 ] 0 1 1 +( 400 1152 32 ) ( 400 1153 32 ) ( 401 1152 32 ) origin [ 1 0 0 0 ] [ 0 -1 0 0 ] 0 1 1 +( 400 1152 32 ) ( 401 1152 32 ) ( 400 1152 33 ) origin [ -1 0 0 0 ] [ 0 0 -1 0 ] 0 1 1 +( 400 1152 32 ) ( 400 1152 33 ) ( 400 1153 32 ) origin [ 0 1 0 0 ] [ 0 0 -1 0 ] 0 1 1 +} +// brush 1 +{ +( 256 976 -16 ) ( 256 977 -16 ) ( 256 976 -15 ) blue-metal [ 0 -1 0 16 ] [ 0 0 -1 -144 ] 90 1 1 +( 320 1008 -16 ) ( 320 1008 -15 ) ( 321 1008 -16 ) blue-metal [ 1 0 0 -32 ] [ 0 0 -1 -144 ] 90 1 1 +( 320 976 -48 ) ( 321 976 -48 ) ( 320 977 -48 ) blue-metal [ -1 0 0 32 ] [ 0 -1 0 16 ] 0 1 1 +( 512 1200 16 ) ( 512 1201 16 ) ( 513 1200 16 ) blue-metal [ 1 0 0 -32 ] [ 0 -1 0 16 ] 180 1 1 +( 512 1264 16 ) ( 513 1264 16 ) ( 512 1264 17 ) blue-metal [ -1 0 0 32 ] [ 0 0 -1 -144 ] 90 1 1 +( 512 1200 16 ) ( 512 1200 17 ) ( 512 1201 16 ) blue-metal [ 0 1 0 -16 ] [ 0 0 -1 -144 ] 180 1 1 +} +} +// entity 41 +{ +"classname" "platform_target" +"origin" "-40 1128 24" +"targetname" "test_target" +} +// entity 42 +{ +"classname" "platform" +"target" "test_target_2" +"angles" "0 0 0" +// brush 0 +{ +( 256 720 -16 ) ( 256 721 -16 ) ( 256 720 -15 ) blue-metal [ 0 -1 0 -240 ] [ 0 0 -1 -144 ] 90 1 1 +( 320 752 -16 ) ( 320 752 -15 ) ( 321 752 -16 ) blue-metal [ 1 0 0 -32 ] [ 0 0 -1 -144 ] 90 1 1 +( 320 720 -48 ) ( 321 720 -48 ) ( 320 721 -48 ) blue-metal [ -1 0 0 32 ] [ 0 -1 0 -240 ] 0 1 1 +( 512 944 16 ) ( 512 945 16 ) ( 513 944 16 ) blue-metal [ 1 0 0 -32 ] [ 0 -1 0 -240 ] 180 1 1 +( 512 1008 16 ) ( 513 1008 16 ) ( 512 1008 17 ) blue-metal [ -1 0 0 32 ] [ 0 0 -1 -144 ] 90 1 1 +( 512 944 16 ) ( 512 944 17 ) ( 512 945 16 ) blue-metal [ 0 1 0 240 ] [ 0 0 -1 -144 ] 180 1 1 +} +// brush 1 +{ +( 368 864 16 ) ( 368 865 16 ) ( 368 864 17 ) origin [ 0 -1 0 0 ] [ 0 0 -1 0 ] 0 1 1 +( 368 864 16 ) ( 368 864 17 ) ( 369 864 16 ) origin [ 1 0 0 0 ] [ 0 0 -1 0 ] 0 1 1 +( 368 864 16 ) ( 369 864 16 ) ( 368 865 16 ) origin [ -1 0 0 0 ] [ 0 -1 0 0 ] 0 1 1 +( 400 896 32 ) ( 400 897 32 ) ( 401 896 32 ) origin [ 1 0 0 0 ] [ 0 -1 0 0 ] 0 1 1 +( 400 896 32 ) ( 401 896 32 ) ( 400 896 33 ) origin [ -1 0 0 0 ] [ 0 0 -1 0 ] 0 1 1 +( 400 896 32 ) ( 400 896 33 ) ( 400 897 32 ) origin [ 0 1 0 0 ] [ 0 0 -1 0 ] 0 1 1 +} +} +// entity 43 +{ +"classname" "platform_target" +"origin" "104 552 568" +"targetname" "test_target_2" +} diff --git a/src/platforms.rs b/src/platforms.rs index 9615038..955cd83 100644 --- a/src/platforms.rs +++ b/src/platforms.rs @@ -35,7 +35,6 @@ fn init( continue; }; - let target = Vec3::new(transform.translation.x, target.y, transform.translation.z); let platform = ActivePlatform { start: transform.translation, target,