gmp(M02): extract player terrain query
Work-Package: M02-GMP-TERRAIN-QUERY-001 Agent: sindo-main-codex Tests: terrain query, player input and movement regressions; asset-free scene; renderer dry-run; coordinate, streaming, documentation and coordination gates Fidelity: preserves existing ADT outer-grid interpolation and player ground snap; build-12340 collision parity remains unverified
This commit is contained in:
@@ -0,0 +1,166 @@
|
||||
class_name AdtTerrainQuery
|
||||
extends TerrainQuery
|
||||
|
||||
## TerrainQuery adapter for existing native ADT dictionaries.
|
||||
## Parsed tiles, including unavailable results, are cached for this query's
|
||||
## lifetime. The adapter is main-thread owned and creates no scene resources.
|
||||
|
||||
const COORDINATE_MAPPER_SCRIPT := preload("res://src/domain/coordinates/coordinate_mapper.gd")
|
||||
|
||||
const CHUNK_SIZE_UNITS := COORDINATE_MAPPER_SCRIPT.ADT_CHUNK_SIZE_YARDS
|
||||
const OUTER_GRID_UNIT_SIZE := CHUNK_SIZE_UNITS / 8.0
|
||||
|
||||
var _extracted_directory: String
|
||||
var _map_directory_name: String
|
||||
var _adt_tile_loader_override: Callable
|
||||
var _adt_tile_cache: Dictionary = {}
|
||||
var _failure_code_by_tile_key: Dictionary = {}
|
||||
|
||||
|
||||
## Creates an ADT query for one map. `adt_tile_loader_override` is an optional
|
||||
## test/data-source seam receiving the absolute ADT path and returning a Dictionary.
|
||||
func _init(
|
||||
extracted_directory: String,
|
||||
map_directory_name: String,
|
||||
adt_tile_loader_override: Callable = Callable()
|
||||
) -> void:
|
||||
_extracted_directory = extracted_directory
|
||||
_map_directory_name = map_directory_name
|
||||
_adt_tile_loader_override = adt_tile_loader_override
|
||||
|
||||
|
||||
## Samples the existing 9x9 outer-height grid with bilinear interpolation.
|
||||
func sample_ground_height(godot_world_position: GodotWorldPosition) -> TerrainGroundSample:
|
||||
var tile_coordinate = COORDINATE_MAPPER_SCRIPT.godot_to_adt_tile(godot_world_position)
|
||||
var tile_local_position = COORDINATE_MAPPER_SCRIPT.godot_to_adt_tile_local(godot_world_position)
|
||||
var chunk_coordinate = COORDINATE_MAPPER_SCRIPT.adt_tile_local_to_chunk(
|
||||
tile_coordinate,
|
||||
tile_local_position
|
||||
)
|
||||
var tile_key := _tile_key(tile_coordinate.tile_x, tile_coordinate.tile_y)
|
||||
var adt_tile_data := _load_adt_tile(tile_coordinate.tile_x, tile_coordinate.tile_y)
|
||||
if adt_tile_data.is_empty():
|
||||
return TerrainGroundSample.unavailable(
|
||||
_failure_code_by_tile_key.get(tile_key, &"adt_tile_unavailable")
|
||||
)
|
||||
|
||||
var tile_origin := _find_tile_origin(adt_tile_data)
|
||||
var chunk := _find_chunk(
|
||||
adt_tile_data,
|
||||
clampi(chunk_coordinate.chunk_x, 0, 15),
|
||||
clampi(chunk_coordinate.chunk_y, 0, 15),
|
||||
tile_origin
|
||||
)
|
||||
if chunk.is_empty():
|
||||
return TerrainGroundSample.unavailable(&"adt_chunk_missing")
|
||||
|
||||
var heights: PackedFloat32Array = chunk.get("heights", PackedFloat32Array())
|
||||
if heights.size() < 145:
|
||||
return TerrainGroundSample.unavailable(&"adt_chunk_heights_invalid")
|
||||
|
||||
var chunk_origin: Vector3 = chunk.get("origin", Vector3.ZERO)
|
||||
var chunk_local_x := godot_world_position.x_units - chunk_origin.x
|
||||
var chunk_local_z := godot_world_position.z_units - chunk_origin.z
|
||||
var grid_x := clampf(chunk_local_x / OUTER_GRID_UNIT_SIZE, 0.0, 8.0)
|
||||
var grid_z := clampf(chunk_local_z / OUTER_GRID_UNIT_SIZE, 0.0, 8.0)
|
||||
var x0 := clampi(int(floor(grid_x)), 0, 8)
|
||||
var z0 := clampi(int(floor(grid_z)), 0, 8)
|
||||
var x1 := mini(x0 + 1, 8)
|
||||
var z1 := mini(z0 + 1, 8)
|
||||
var fraction_x := grid_x - float(x0)
|
||||
var fraction_z := grid_z - float(z0)
|
||||
|
||||
var height_x0 := lerpf(
|
||||
heights[_outer_height_index(z0, x0)],
|
||||
heights[_outer_height_index(z0, x1)],
|
||||
fraction_x
|
||||
)
|
||||
var height_x1 := lerpf(
|
||||
heights[_outer_height_index(z1, x0)],
|
||||
heights[_outer_height_index(z1, x1)],
|
||||
fraction_x
|
||||
)
|
||||
return TerrainGroundSample.available(
|
||||
chunk_origin.y + lerpf(height_x0, height_x1, fraction_z)
|
||||
)
|
||||
|
||||
|
||||
func _load_adt_tile(tile_x: int, tile_y: int) -> Dictionary:
|
||||
var tile_key := _tile_key(tile_x, tile_y)
|
||||
if _adt_tile_cache.has(tile_key):
|
||||
return _adt_tile_cache[tile_key]
|
||||
|
||||
var resource_path := _extracted_directory.path_join(
|
||||
"World/Maps/%s/%s_%d_%d.adt" % [_map_directory_name, _map_directory_name, tile_x, tile_y]
|
||||
)
|
||||
var absolute_path := ProjectSettings.globalize_path(resource_path)
|
||||
var adt_tile_data: Dictionary = {}
|
||||
var failure_code: StringName = &""
|
||||
if _adt_tile_loader_override.is_valid():
|
||||
var override_result = _adt_tile_loader_override.call(absolute_path)
|
||||
if override_result is Dictionary:
|
||||
adt_tile_data = override_result
|
||||
else:
|
||||
failure_code = &"adt_loader_result_invalid"
|
||||
elif not ClassDB.class_exists("ADTLoader"):
|
||||
failure_code = &"adt_loader_unavailable"
|
||||
elif not FileAccess.file_exists(absolute_path):
|
||||
failure_code = &"adt_source_missing"
|
||||
else:
|
||||
var loader = ClassDB.instantiate("ADTLoader")
|
||||
if loader != null:
|
||||
var load_result = loader.call("load_adt", absolute_path)
|
||||
if load_result is Dictionary:
|
||||
adt_tile_data = load_result
|
||||
if adt_tile_data.is_empty():
|
||||
failure_code = &"adt_load_failed"
|
||||
|
||||
if adt_tile_data.is_empty() and failure_code.is_empty():
|
||||
failure_code = &"adt_tile_unavailable"
|
||||
_adt_tile_cache[tile_key] = adt_tile_data
|
||||
_failure_code_by_tile_key[tile_key] = failure_code
|
||||
return adt_tile_data
|
||||
|
||||
|
||||
func _find_chunk(
|
||||
adt_tile_data: Dictionary,
|
||||
chunk_x: int,
|
||||
chunk_y: int,
|
||||
tile_origin: Vector3
|
||||
) -> Dictionary:
|
||||
for chunk in adt_tile_data.get("chunks", []) as Array:
|
||||
if chunk.is_empty():
|
||||
continue
|
||||
var chunk_origin: Vector3 = chunk.get("origin", Vector3.ZERO)
|
||||
var local_origin := chunk_origin - tile_origin
|
||||
var candidate_chunk_x := clampi(int(round(local_origin.x / CHUNK_SIZE_UNITS)), 0, 15)
|
||||
var candidate_chunk_y := clampi(int(round(local_origin.z / CHUNK_SIZE_UNITS)), 0, 15)
|
||||
if candidate_chunk_x == chunk_x and candidate_chunk_y == chunk_y:
|
||||
return chunk
|
||||
return {}
|
||||
|
||||
|
||||
func _find_tile_origin(adt_tile_data: Dictionary) -> Vector3:
|
||||
var has_origin := false
|
||||
var minimum_x := 0.0
|
||||
var minimum_z := 0.0
|
||||
for chunk in adt_tile_data.get("chunks", []) as Array:
|
||||
if chunk.is_empty():
|
||||
continue
|
||||
var chunk_origin: Vector3 = chunk.get("origin", Vector3.ZERO)
|
||||
if not has_origin:
|
||||
minimum_x = chunk_origin.x
|
||||
minimum_z = chunk_origin.z
|
||||
has_origin = true
|
||||
else:
|
||||
minimum_x = minf(minimum_x, chunk_origin.x)
|
||||
minimum_z = minf(minimum_z, chunk_origin.z)
|
||||
return Vector3(minimum_x, 0.0, minimum_z) if has_origin else Vector3.ZERO
|
||||
|
||||
|
||||
func _tile_key(tile_x: int, tile_y: int) -> String:
|
||||
return "%d_%d" % [tile_x, tile_y]
|
||||
|
||||
|
||||
func _outer_height_index(row: int, column: int) -> int:
|
||||
return row * 17 + column
|
||||
@@ -0,0 +1 @@
|
||||
uid://cq7scvxqw6ffm
|
||||
@@ -0,0 +1,49 @@
|
||||
class_name TerrainGroundSample
|
||||
extends RefCounted
|
||||
|
||||
## Immutable result of a terrain ground-height query in Godot world units.
|
||||
## An unavailable sample carries a stable failure code instead of overloading a
|
||||
## numeric height with `NAN` at the public boundary.
|
||||
|
||||
var is_available: bool:
|
||||
get:
|
||||
return _is_available
|
||||
|
||||
var height_units: float:
|
||||
get:
|
||||
return _height_units
|
||||
|
||||
var failure_code: StringName:
|
||||
get:
|
||||
return _failure_code
|
||||
|
||||
var _is_available: bool
|
||||
var _height_units: float
|
||||
var _failure_code: StringName
|
||||
|
||||
|
||||
## Creates an available ground sample in Godot world units.
|
||||
static func available(height_units_value: float) -> TerrainGroundSample:
|
||||
return TerrainGroundSample.new(true, height_units_value, &"")
|
||||
|
||||
|
||||
## Creates an unavailable sample with a stable diagnostic code.
|
||||
static func unavailable(failure_code_value: StringName) -> TerrainGroundSample:
|
||||
return TerrainGroundSample.new(false, 0.0, failure_code_value)
|
||||
|
||||
|
||||
## Normalizes factory inputs so available samples are finite and unavailable
|
||||
## samples always carry a non-empty failure code.
|
||||
func _init(
|
||||
is_available_value: bool,
|
||||
height_units_value: float,
|
||||
failure_code_value: StringName
|
||||
) -> void:
|
||||
_is_available = is_available_value and is_finite(height_units_value)
|
||||
_height_units = height_units_value if _is_available else 0.0
|
||||
if _is_available:
|
||||
_failure_code = &""
|
||||
elif not is_finite(height_units_value):
|
||||
_failure_code = &"terrain_height_not_finite"
|
||||
else:
|
||||
_failure_code = failure_code_value if not failure_code_value.is_empty() else &"terrain_unavailable"
|
||||
@@ -0,0 +1 @@
|
||||
uid://boe5qkip6ffku
|
||||
@@ -0,0 +1,12 @@
|
||||
class_name TerrainQuery
|
||||
extends RefCounted
|
||||
|
||||
## Replaceable scene-free boundary for gameplay terrain height sampling.
|
||||
## Implementations receive a typed Godot world position and must return an
|
||||
## explicit available/unavailable result without mutating the caller.
|
||||
|
||||
|
||||
## Samples terrain ground height at a typed Godot world position.
|
||||
## The base implementation reports `terrain_query_not_implemented`.
|
||||
func sample_ground_height(_godot_world_position: GodotWorldPosition) -> TerrainGroundSample:
|
||||
return TerrainGroundSample.unavailable(&"terrain_query_not_implemented")
|
||||
@@ -0,0 +1 @@
|
||||
uid://d3f2hetuo342q
|
||||
@@ -10,9 +10,7 @@ const ADT_TILE_LOCAL_POSITION_SCRIPT := preload("res://src/domain/coordinates/ad
|
||||
const PLAYER_INPUT_SOURCE_SCRIPT := preload("res://src/gameplay/input/player_input_source.gd")
|
||||
const PLAYER_INPUT_ACTIONS_SCRIPT := preload("res://src/gameplay/input/player_input_actions.gd")
|
||||
const LOCAL_PLAYER_MOVEMENT_CONTROLLER_SCRIPT := preload("res://src/gameplay/movement/local_player_movement_controller.gd")
|
||||
|
||||
const CHUNK_SIZE := COORDINATE_MAPPER_SCRIPT.ADT_CHUNK_SIZE_YARDS
|
||||
const UNIT_SIZE := CHUNK_SIZE / 8.0
|
||||
const ADT_TERRAIN_QUERY_SCRIPT := preload("res://src/gameplay/terrain/adt_terrain_query.gd")
|
||||
|
||||
@export var extracted_dir: String = "res://data/extracted"
|
||||
@export var map_name: String = "Azeroth"
|
||||
@@ -55,13 +53,24 @@ var _active_animation := ""
|
||||
var _captured := false
|
||||
var _yaw := 0.0
|
||||
var _pitch := deg_to_rad(-18.0)
|
||||
var _adt_cache: Dictionary = {}
|
||||
var _player_input_source: PlayerInputSource
|
||||
var _local_movement_controller: LocalPlayerMovementController
|
||||
var _terrain_query: TerrainQuery
|
||||
|
||||
|
||||
## Replaces the ground-height backend without changing player movement or presentation.
|
||||
## Passing null is a composition error and leaves the current query unchanged.
|
||||
func set_terrain_query(terrain_query: TerrainQuery) -> void:
|
||||
if terrain_query == null:
|
||||
push_error("ThirdPersonWowController: terrain query cannot be null")
|
||||
return
|
||||
_terrain_query = terrain_query
|
||||
|
||||
|
||||
func _ready() -> void:
|
||||
_player_input_source = PLAYER_INPUT_SOURCE_SCRIPT.new()
|
||||
if _terrain_query == null:
|
||||
_terrain_query = ADT_TERRAIN_QUERY_SCRIPT.new(extracted_dir, map_name)
|
||||
_local_movement_controller = LOCAL_PLAYER_MOVEMENT_CONTROLLER_SCRIPT.new(
|
||||
run_speed,
|
||||
backward_speed,
|
||||
@@ -83,9 +92,9 @@ func _ready() -> void:
|
||||
var spawn_position = COORDINATE_MAPPER_SCRIPT.adt_tile_local_to_godot(spawn_tile, spawn_local)
|
||||
global_position = Vector3(spawn_position.x_units, spawn_position.y_units, spawn_position.z_units)
|
||||
_load_character_visual()
|
||||
var ground := _sample_ground_height(global_position)
|
||||
if is_finite(ground):
|
||||
global_position.y = ground + ground_offset
|
||||
var spawn_ground_sample := _sample_ground_height(global_position)
|
||||
if spawn_ground_sample.is_available:
|
||||
global_position.y = spawn_ground_sample.height_units + ground_offset
|
||||
_yaw = rotation.y
|
||||
_apply_camera_transform()
|
||||
|
||||
@@ -124,9 +133,9 @@ func _physics_process(delta: float) -> void:
|
||||
global_position += _local_movement_controller.advance(move_intent, godot_world_movement_basis, delta)
|
||||
|
||||
if not _local_movement_controller.is_flight_enabled:
|
||||
var ground := _sample_ground_height(global_position)
|
||||
if is_finite(ground):
|
||||
var target_y := ground + ground_offset
|
||||
var ground_sample := _sample_ground_height(global_position)
|
||||
if ground_sample.is_available:
|
||||
var target_y := ground_sample.height_units + ground_offset
|
||||
global_position.y = lerpf(global_position.y, target_y, clampf(ground_snap_speed * delta, 0.0, 1.0))
|
||||
|
||||
var movement_velocity := _local_movement_controller.godot_world_velocity_units_per_second
|
||||
@@ -298,95 +307,11 @@ func _apply_camera_transform() -> void:
|
||||
_camera.rotation = Vector3.ZERO
|
||||
|
||||
|
||||
func _sample_ground_height(world_pos: Vector3) -> float:
|
||||
var typed_world_position = GODOT_WORLD_POSITION_SCRIPT.new(world_pos.x, world_pos.y, world_pos.z)
|
||||
var tile_coordinate = COORDINATE_MAPPER_SCRIPT.godot_to_adt_tile(typed_world_position)
|
||||
var tile_local_position = COORDINATE_MAPPER_SCRIPT.godot_to_adt_tile_local(typed_world_position)
|
||||
var chunk_coordinate = COORDINATE_MAPPER_SCRIPT.adt_tile_local_to_chunk(tile_coordinate, tile_local_position)
|
||||
var data := _load_adt(tile_coordinate.tile_x, tile_coordinate.tile_y)
|
||||
if data.is_empty():
|
||||
return NAN
|
||||
|
||||
var tile_origin := _get_tile_origin(data)
|
||||
var chunk_x := clampi(chunk_coordinate.chunk_x, 0, 15)
|
||||
var chunk_y := clampi(chunk_coordinate.chunk_y, 0, 15)
|
||||
var chunk := _find_chunk(data, chunk_x, chunk_y, tile_origin)
|
||||
if chunk.is_empty():
|
||||
return NAN
|
||||
|
||||
var origin: Vector3 = chunk.get("origin", Vector3.ZERO)
|
||||
var chunk_local := world_pos - origin
|
||||
var gx := clampf(chunk_local.x / UNIT_SIZE, 0.0, 8.0)
|
||||
var gz := clampf(chunk_local.z / UNIT_SIZE, 0.0, 8.0)
|
||||
var x0 := clampi(int(floor(gx)), 0, 8)
|
||||
var z0 := clampi(int(floor(gz)), 0, 8)
|
||||
var x1 := mini(x0 + 1, 8)
|
||||
var z1 := mini(z0 + 1, 8)
|
||||
var fx := gx - float(x0)
|
||||
var fz := gz - float(z0)
|
||||
var heights: PackedFloat32Array = chunk.get("heights", PackedFloat32Array())
|
||||
if heights.size() < 145:
|
||||
return NAN
|
||||
|
||||
var h00 := heights[_outer(z0, x0)]
|
||||
var h10 := heights[_outer(z0, x1)]
|
||||
var h01 := heights[_outer(z1, x0)]
|
||||
var h11 := heights[_outer(z1, x1)]
|
||||
var hx0 := lerpf(h00, h10, fx)
|
||||
var hx1 := lerpf(h01, h11, fx)
|
||||
return origin.y + lerpf(hx0, hx1, fz)
|
||||
|
||||
|
||||
func _load_adt(tx: int, ty: int) -> Dictionary:
|
||||
var key := "%d_%d" % [tx, ty]
|
||||
if _adt_cache.has(key):
|
||||
return _adt_cache[key]
|
||||
if not ClassDB.class_exists("ADTLoader"):
|
||||
_adt_cache[key] = {}
|
||||
return {}
|
||||
|
||||
var res_path := extracted_dir.path_join("World/Maps/%s/%s_%d_%d.adt" % [map_name, map_name, tx, ty])
|
||||
var abs_path := ProjectSettings.globalize_path(res_path)
|
||||
if not FileAccess.file_exists(abs_path):
|
||||
_adt_cache[key] = {}
|
||||
return {}
|
||||
|
||||
var loader = ClassDB.instantiate("ADTLoader")
|
||||
var data: Dictionary = loader.call("load_adt", abs_path) if loader else {}
|
||||
_adt_cache[key] = data
|
||||
return data
|
||||
|
||||
|
||||
func _find_chunk(data: Dictionary, chunk_x: int, chunk_y: int, tile_origin: Vector3) -> Dictionary:
|
||||
for chunk in data.get("chunks", []) as Array:
|
||||
if chunk.is_empty():
|
||||
continue
|
||||
var origin: Vector3 = chunk.get("origin", Vector3.ZERO)
|
||||
var local := origin - tile_origin
|
||||
var cx := clampi(int(round(local.x / CHUNK_SIZE)), 0, 15)
|
||||
var cy := clampi(int(round(local.z / CHUNK_SIZE)), 0, 15)
|
||||
if cx == chunk_x and cy == chunk_y:
|
||||
return chunk
|
||||
return {}
|
||||
|
||||
|
||||
func _get_tile_origin(data: Dictionary) -> Vector3:
|
||||
var found := false
|
||||
var min_x := 0.0
|
||||
var min_z := 0.0
|
||||
for chunk in data.get("chunks", []) as Array:
|
||||
if chunk.is_empty():
|
||||
continue
|
||||
var origin: Vector3 = chunk.get("origin", Vector3.ZERO)
|
||||
if not found:
|
||||
min_x = origin.x
|
||||
min_z = origin.z
|
||||
found = true
|
||||
else:
|
||||
min_x = minf(min_x, origin.x)
|
||||
min_z = minf(min_z, origin.z)
|
||||
return Vector3(min_x, 0.0, min_z) if found else Vector3.ZERO
|
||||
|
||||
|
||||
func _outer(row: int, col: int) -> int:
|
||||
return row * 17 + col
|
||||
func _sample_ground_height(godot_world_position: Vector3) -> TerrainGroundSample:
|
||||
return _terrain_query.sample_ground_height(
|
||||
GODOT_WORLD_POSITION_SCRIPT.new(
|
||||
godot_world_position.x,
|
||||
godot_world_position.y,
|
||||
godot_world_position.z
|
||||
)
|
||||
)
|
||||
|
||||
@@ -20,7 +20,8 @@ const ALLOWED_LEGACY_NAME_PATHS: Array[String] = [
|
||||
const REQUIRED_MAPPER_CALLS := {
|
||||
"res://src/scenes/sky/wow_sky_controller.gd": ["godot_to_canonical", "godot_to_adt_tile", "godot_to_adt_tile_local"],
|
||||
"res://src/scenes/streaming/streaming_world_loader.gd": ["godot_to_adt_tile", "godot_to_adt_tile_local", "adt_tile_local_to_godot"],
|
||||
"res://src/scenes/player/third_person_wow_controller.gd": ["godot_to_adt_tile", "adt_tile_local_to_godot"],
|
||||
"res://src/scenes/player/third_person_wow_controller.gd": ["adt_tile_local_to_godot"],
|
||||
"res://src/gameplay/terrain/adt_terrain_query.gd": ["godot_to_adt_tile", "godot_to_adt_tile_local", "adt_tile_local_to_chunk"],
|
||||
"res://src/tools/probe_render_terrain_height.gd": ["godot_to_adt_tile"],
|
||||
}
|
||||
|
||||
@@ -59,7 +60,7 @@ func _initialize() -> void:
|
||||
quit(1)
|
||||
return
|
||||
|
||||
print("COORDINATE_CONVERSION_BOUNDARIES PASS files=%d native_boundary=1 oracle=1 consumers=4 classifier_cases=6" % source_paths.size())
|
||||
print("COORDINATE_CONVERSION_BOUNDARIES PASS files=%d native_boundary=1 oracle=1 consumers=5 classifier_cases=6" % source_paths.size())
|
||||
quit(0)
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,198 @@
|
||||
extends SceneTree
|
||||
|
||||
## Headless M02 contract, interpolation, cache and player-injection regression.
|
||||
|
||||
const TERRAIN_QUERY_PATH := "res://src/gameplay/terrain/terrain_query.gd"
|
||||
const ADT_TERRAIN_QUERY_PATH := "res://src/gameplay/terrain/adt_terrain_query.gd"
|
||||
const PLAYER_CONTROLLER_PATH := "res://src/scenes/player/third_person_wow_controller.gd"
|
||||
const REGRESSION_SCENE_PATH := "res://src/tests/scenes/player_input_regression.tscn"
|
||||
|
||||
var _synthetic_adt_tile_data: Dictionary = {}
|
||||
var _synthetic_loader_call_count := 0
|
||||
|
||||
|
||||
class FlatTerrainQuery extends TerrainQuery:
|
||||
var _height_units: float
|
||||
|
||||
func _init(height_units: float) -> void:
|
||||
_height_units = height_units
|
||||
|
||||
func sample_ground_height(_godot_world_position: GodotWorldPosition) -> TerrainGroundSample:
|
||||
return TerrainGroundSample.available(_height_units)
|
||||
|
||||
|
||||
func _initialize() -> void:
|
||||
_run_verification.call_deferred()
|
||||
|
||||
|
||||
func _run_verification() -> void:
|
||||
var failures: Array[String] = []
|
||||
_verify_typed_result_contract(failures)
|
||||
_verify_synthetic_adt_interpolation_and_cache(failures)
|
||||
_verify_unavailable_tile(failures)
|
||||
_verify_player_injection(failures)
|
||||
_verify_source_boundaries(failures)
|
||||
|
||||
if not failures.is_empty():
|
||||
for failure in failures:
|
||||
push_error("TERRAIN_QUERY: %s" % failure)
|
||||
quit(1)
|
||||
return
|
||||
|
||||
print("TERRAIN_QUERY PASS contract=4 interpolation=1 cache=1 failures=2 player_injection=1")
|
||||
quit(0)
|
||||
|
||||
|
||||
func _verify_typed_result_contract(failures: Array[String]) -> void:
|
||||
var available_sample := TerrainGroundSample.available(123.5)
|
||||
_expect_true(available_sample.is_available, "available sample state", failures)
|
||||
_expect_near(available_sample.height_units, 123.5, "available sample height", failures)
|
||||
_expect_true(available_sample.failure_code.is_empty(), "available sample has no failure", failures)
|
||||
|
||||
var unavailable_sample := TerrainGroundSample.unavailable(&"synthetic_failure")
|
||||
_expect_true(not unavailable_sample.is_available, "unavailable sample state", failures)
|
||||
_expect_equal(unavailable_sample.failure_code, &"synthetic_failure", "unavailable failure code", failures)
|
||||
|
||||
var base_sample := TerrainQuery.new().sample_ground_height(GodotWorldPosition.new(0.0, 0.0, 0.0))
|
||||
_expect_equal(base_sample.failure_code, &"terrain_query_not_implemented", "base query failure", failures)
|
||||
|
||||
var non_finite_sample := TerrainGroundSample.available(NAN)
|
||||
_expect_true(not non_finite_sample.is_available, "non-finite sample unavailable", failures)
|
||||
_expect_equal(non_finite_sample.failure_code, &"terrain_height_not_finite", "non-finite failure code", failures)
|
||||
|
||||
|
||||
func _verify_synthetic_adt_interpolation_and_cache(failures: Array[String]) -> void:
|
||||
var query_position := GodotWorldPosition.new(17000.0, 999.0, 26525.0)
|
||||
_synthetic_adt_tile_data = _build_synthetic_adt_tile(query_position)
|
||||
_synthetic_loader_call_count = 0
|
||||
var terrain_query := AdtTerrainQuery.new("res://synthetic", "Azeroth", _load_synthetic_adt_tile)
|
||||
|
||||
var first_sample := terrain_query.sample_ground_height(query_position)
|
||||
_expect_true(first_sample.is_available, "synthetic ADT sample available", failures)
|
||||
_expect_near_with_tolerance(first_sample.height_units, 137.0, 0.002, "synthetic bilinear height", failures)
|
||||
var second_sample := terrain_query.sample_ground_height(query_position)
|
||||
_expect_near_with_tolerance(second_sample.height_units, 137.0, 0.002, "cached synthetic height", failures)
|
||||
_expect_equal(_synthetic_loader_call_count, 1, "ADT tile loaded once", failures)
|
||||
|
||||
|
||||
func _verify_unavailable_tile(failures: Array[String]) -> void:
|
||||
var query_position := GodotWorldPosition.new(17000.0, 0.0, 26525.0)
|
||||
var empty_query := AdtTerrainQuery.new("res://synthetic", "Azeroth", func(_path: String) -> Dictionary: return {})
|
||||
var empty_sample := empty_query.sample_ground_height(query_position)
|
||||
_expect_true(not empty_sample.is_available, "empty ADT unavailable", failures)
|
||||
_expect_equal(empty_sample.failure_code, &"adt_tile_unavailable", "empty ADT failure", failures)
|
||||
|
||||
var invalid_heights_data := _build_synthetic_adt_tile(query_position)
|
||||
var invalid_chunks: Array = invalid_heights_data.get("chunks", [])
|
||||
(invalid_chunks[invalid_chunks.size() - 1] as Dictionary)["heights"] = PackedFloat32Array()
|
||||
var invalid_query := AdtTerrainQuery.new(
|
||||
"res://synthetic",
|
||||
"Azeroth",
|
||||
func(_path: String) -> Dictionary: return invalid_heights_data
|
||||
)
|
||||
var invalid_sample := invalid_query.sample_ground_height(query_position)
|
||||
_expect_equal(invalid_sample.failure_code, &"adt_chunk_heights_invalid", "invalid heights failure", failures)
|
||||
|
||||
|
||||
func _verify_player_injection(failures: Array[String]) -> void:
|
||||
var packed_scene := load(REGRESSION_SCENE_PATH) as PackedScene
|
||||
_expect_true(packed_scene != null, "regression scene loads", failures)
|
||||
if packed_scene == null:
|
||||
return
|
||||
var player := packed_scene.instantiate() as CharacterBody3D
|
||||
player.set_terrain_query(FlatTerrainQuery.new(20.0))
|
||||
root.add_child(player)
|
||||
player.set_physics_process(false)
|
||||
_expect_near(player.position.y, 20.05, "injected spawn ground height", failures)
|
||||
player.position.y = 30.0
|
||||
player.call("_physics_process", 1.0)
|
||||
_expect_near(player.position.y, 20.05, "injected physics ground snap", failures)
|
||||
player.free()
|
||||
|
||||
|
||||
func _verify_source_boundaries(failures: Array[String]) -> void:
|
||||
var terrain_contract_source := _read_text(TERRAIN_QUERY_PATH, failures)
|
||||
_expect_true(not terrain_contract_source.contains("extends Node"), "TerrainQuery omits Node", failures)
|
||||
_expect_true(not terrain_contract_source.contains("Vector3"), "TerrainQuery omits untyped Vector3 position", failures)
|
||||
|
||||
var adt_query_source := _read_text(ADT_TERRAIN_QUERY_PATH, failures)
|
||||
_expect_true(adt_query_source.contains("ADTLoader"), "ADT adapter owns native loader", failures)
|
||||
_expect_true(adt_query_source.contains("_adt_tile_cache"), "ADT adapter owns tile cache", failures)
|
||||
|
||||
var player_source := _read_text(PLAYER_CONTROLLER_PATH, failures)
|
||||
for forbidden_text in ["ADTLoader", "load_adt", "_adt_cache", "_find_chunk", "_outer_height_index"]:
|
||||
_expect_true(not player_source.contains(forbidden_text), "player omits %s" % forbidden_text, failures)
|
||||
_expect_true(player_source.contains("set_terrain_query"), "player exposes terrain query injection", failures)
|
||||
_expect_true(player_source.contains("_terrain_query.sample_ground_height"), "player delegates ground sampling", failures)
|
||||
|
||||
|
||||
func _build_synthetic_adt_tile(query_position: GodotWorldPosition) -> Dictionary:
|
||||
var tile_coordinate := CoordinateMapper.godot_to_adt_tile(query_position)
|
||||
var tile_local_position := CoordinateMapper.godot_to_adt_tile_local(query_position)
|
||||
var chunk_coordinate := CoordinateMapper.adt_tile_local_to_chunk(tile_coordinate, tile_local_position)
|
||||
var chunk_size := CoordinateMapper.ADT_CHUNK_SIZE_YARDS
|
||||
var outer_grid_unit_size := chunk_size / 8.0
|
||||
var target_chunk_origin := Vector3(
|
||||
query_position.x_units - outer_grid_unit_size * 4.5,
|
||||
100.0,
|
||||
query_position.z_units - outer_grid_unit_size * 3.25
|
||||
)
|
||||
var tile_origin := target_chunk_origin - Vector3(
|
||||
chunk_coordinate.chunk_x * chunk_size,
|
||||
0.0,
|
||||
chunk_coordinate.chunk_y * chunk_size
|
||||
)
|
||||
|
||||
var heights := PackedFloat32Array()
|
||||
heights.resize(145)
|
||||
for row in range(9):
|
||||
for column in range(9):
|
||||
heights[row * 17 + column] = float(row * 10 + column)
|
||||
var target_chunk := {"origin": target_chunk_origin, "heights": heights}
|
||||
if chunk_coordinate.chunk_x == 0 and chunk_coordinate.chunk_y == 0:
|
||||
return {"chunks": [target_chunk]}
|
||||
return {
|
||||
"chunks": [
|
||||
{"origin": tile_origin, "heights": PackedFloat32Array()},
|
||||
target_chunk,
|
||||
]
|
||||
}
|
||||
|
||||
|
||||
func _load_synthetic_adt_tile(_absolute_path: String) -> Dictionary:
|
||||
_synthetic_loader_call_count += 1
|
||||
return _synthetic_adt_tile_data
|
||||
|
||||
|
||||
func _read_text(path: String, failures: Array[String]) -> String:
|
||||
var file := FileAccess.open(path, FileAccess.READ)
|
||||
if file == null:
|
||||
failures.append("cannot open %s" % path)
|
||||
return ""
|
||||
return file.get_as_text()
|
||||
|
||||
|
||||
func _expect_near(actual_value: float, expected_value: float, label: String, failures: Array[String]) -> void:
|
||||
if absf(actual_value - expected_value) > 0.000001:
|
||||
failures.append("%s expected %.6f, got %.6f" % [label, expected_value, actual_value])
|
||||
|
||||
|
||||
func _expect_near_with_tolerance(
|
||||
actual_value: float,
|
||||
expected_value: float,
|
||||
tolerance: float,
|
||||
label: String,
|
||||
failures: Array[String]
|
||||
) -> void:
|
||||
if absf(actual_value - expected_value) > tolerance:
|
||||
failures.append("%s expected %.6f ± %.6f, got %.6f" % [label, expected_value, tolerance, actual_value])
|
||||
|
||||
|
||||
func _expect_equal(actual_value: Variant, expected_value: Variant, label: String, failures: Array[String]) -> void:
|
||||
if actual_value != expected_value:
|
||||
failures.append("%s expected %s, got %s" % [label, expected_value, actual_value])
|
||||
|
||||
|
||||
func _expect_true(actual_value: bool, label: String, failures: Array[String]) -> void:
|
||||
if not actual_value:
|
||||
failures.append("%s expected true" % label)
|
||||
Reference in New Issue
Block a user