Skip to content

Commit

Permalink
Merge pull request godotengine#27 from Shatur/player_proto
Browse files Browse the repository at this point in the history
Add tests for interpolator
  • Loading branch information
AndreaCatania committed Jun 1, 2021
2 parents d7995ef + 97479ef commit 707aeb6
Show file tree
Hide file tree
Showing 4 changed files with 171 additions and 36 deletions.
68 changes: 34 additions & 34 deletions modules/network_synchronizer/interpolator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -164,40 +164,6 @@ void Interpolator::end_write() {
write_position = UINT32_MAX;
}

Variant interpolate(const Variant &p_v1, const Variant &p_v2, real_t p_delta) {
ERR_FAIL_COND_V(p_v1.get_type() != p_v2.get_type(), p_v1);

switch (p_v1.get_type()) {
case Variant::Type::INT:
return int(Math::round(Math::lerp(p_v1.operator real_t(), p_v2.operator real_t(), p_delta)));
case Variant::Type::FLOAT:
return Math::lerp(p_v1, p_v2, p_delta);
case Variant::Type::VECTOR2:
return p_v1.operator Vector2().lerp(p_v2.operator Vector2(), p_delta);
case Variant::Type::VECTOR2I:
return Vector2i(
int(Math::round(Math::lerp(p_v1.operator Vector2i()[0], p_v2.operator Vector2i()[0], p_delta))),
int(Math::round(Math::lerp(p_v1.operator Vector2i()[1], p_v2.operator Vector2i()[1], p_delta))));
case Variant::Type::TRANSFORM2D:
return p_v1.operator Transform2D().interpolate_with(p_v2.operator Transform2D(), p_delta);
case Variant::Type::VECTOR3:
return p_v1.operator Vector3().lerp(p_v2.operator Vector3(), p_delta);
case Variant::Type::VECTOR3I:
return Vector3i(
int(Math::round(Math::lerp(p_v1.operator Vector3i()[0], p_v2.operator Vector3i()[0], p_delta))),
int(Math::round(Math::lerp(p_v1.operator Vector3i()[1], p_v2.operator Vector3i()[1], p_delta))),
int(Math::round(Math::lerp(p_v1.operator Vector3i()[2], p_v2.operator Vector3i()[2], p_delta))));
case Variant::Type::QUAT:
return p_v1.operator Quat().slerp(p_v2.operator Quat(), p_delta);
case Variant::Type::BASIS:
return p_v1.operator Basis().slerp(p_v2.operator Basis(), p_delta);
case Variant::Type::TRANSFORM:
return p_v1.operator Transform().interpolate_with(p_v2.operator Transform(), p_delta);
default:
return p_delta > 0.5 ? p_v2 : p_v1;
}
}

Vector<Variant> Interpolator::pop_epoch(uint32_t p_epoch, real_t p_fraction) {
ERR_FAIL_COND_V_MSG(init_phase, Vector<Variant>(), "You can't pop data if the interpolator is not fully initialized.");
ERR_FAIL_COND_V_MSG(write_position != UINT32_MAX, Vector<Variant>(), "You can't pop data while writing the epoch");
Expand Down Expand Up @@ -413,3 +379,37 @@ uint32_t Interpolator::epochs_between_last_time_window() const {

return epochs[epochs.size() - 1] - epochs[epochs.size() - 2];
}

Variant Interpolator::interpolate(const Variant &p_v1, const Variant &p_v2, real_t p_delta) {
ERR_FAIL_COND_V(p_v1.get_type() != p_v2.get_type(), p_v1);

switch (p_v1.get_type()) {
case Variant::Type::INT:
return int(Math::round(Math::lerp(p_v1.operator real_t(), p_v2.operator real_t(), p_delta)));
case Variant::Type::FLOAT:
return Math::lerp(p_v1, p_v2, p_delta);
case Variant::Type::VECTOR2:
return p_v1.operator Vector2().lerp(p_v2.operator Vector2(), p_delta);
case Variant::Type::VECTOR2I:
return Vector2i(
int(Math::round(Math::lerp(p_v1.operator Vector2i()[0], p_v2.operator Vector2i()[0], p_delta))),
int(Math::round(Math::lerp(p_v1.operator Vector2i()[1], p_v2.operator Vector2i()[1], p_delta))));
case Variant::Type::TRANSFORM2D:
return p_v1.operator Transform2D().interpolate_with(p_v2.operator Transform2D(), p_delta);
case Variant::Type::VECTOR3:
return p_v1.operator Vector3().lerp(p_v2.operator Vector3(), p_delta);
case Variant::Type::VECTOR3I:
return Vector3i(
int(Math::round(Math::lerp(p_v1.operator Vector3i()[0], p_v2.operator Vector3i()[0], p_delta))),
int(Math::round(Math::lerp(p_v1.operator Vector3i()[1], p_v2.operator Vector3i()[1], p_delta))),
int(Math::round(Math::lerp(p_v1.operator Vector3i()[2], p_v2.operator Vector3i()[2], p_delta))));
case Variant::Type::QUAT:
return p_v1.operator Quat().slerp(p_v2.operator Quat(), p_delta);
case Variant::Type::BASIS:
return p_v1.operator Basis().slerp(p_v2.operator Basis(), p_delta);
case Variant::Type::TRANSFORM:
return p_v1.operator Transform().interpolate_with(p_v2.operator Transform(), p_delta);
default:
return p_delta > 0.5 ? p_v2 : p_v1;
}
}
2 changes: 2 additions & 0 deletions modules/network_synchronizer/interpolator.h
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,8 @@ class Interpolator : public Object {

/// Returns the epochs count between the two last received time window.
uint32_t epochs_between_last_time_window() const;

static Variant interpolate(const Variant &p_v1, const Variant &p_v2, real_t p_delta);
};

VARIANT_ENUM_CAST(Interpolator::Fallback);
Expand Down
6 changes: 4 additions & 2 deletions modules/network_synchronizer/tests/test_data_buffer.h
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,8 @@ TEST_CASE("[Modules][DataBuffer] Vector2") {
#ifdef REAL_T_IS_DOUBLE
const Vector2 value = Vector2(values[i], values[i]);
#else
const Vector2 value = Vector2(CLAMP(values[i], -FLT_MIN, FLT_MAX), CLAMP(values[i], -FLT_MIN, FLT_MAX));
const real_t clamped_value = CLAMP(values[i], -FLT_MIN, FLT_MAX);
const Vector2 value = Vector2(clamped_value, clamped_value);
#endif
buffer.begin_write(0);
const Vector2 added_value = buffer.add_vector2(value, compression_level);
Expand Down Expand Up @@ -353,7 +354,8 @@ TEST_CASE("[Modules][DataBuffer] Vector3") {
#ifdef REAL_T_IS_DOUBLE
const Vector3 value = Vector3(values[i], values[i], values[i]);
#else
const Vector3 value = Vector3(CLAMP(values[i], -FLT_MIN, FLT_MAX), CLAMP(values[i], -FLT_MIN, FLT_MAX), CLAMP(values[i], -FLT_MIN, FLT_MAX));
const real_t clamped_value = CLAMP(values[i], -FLT_MIN, FLT_MAX);
const Vector3 value = Vector3(clamped_value, clamped_value, clamped_value);
#endif
buffer.begin_write(0);
const Vector3 added_value = buffer.add_vector3(value, compression_level);
Expand Down
131 changes: 131 additions & 0 deletions modules/network_synchronizer/tests/test_interpolator.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,131 @@
/*************************************************************************/
/* test_interpolator.h */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
/* https://godotengine.org */
/*************************************************************************/
/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */
/* */
/* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */
/* "Software"), to deal in the Software without restriction, including */
/* without limitation the rights to use, copy, modify, merge, publish, */
/* distribute, sublicense, and/or sell copies of the Software, and to */
/* permit persons to whom the Software is furnished to do so, subject to */
/* the following conditions: */
/* */
/* The above copyright notice and this permission notice shall be */
/* included in all copies or substantial portions of the Software. */
/* */
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/

#ifndef TEST_INTERPOLATOR_H
#define TEST_INTERPOLATOR_H

#include "modules/network_synchronizer/interpolator.h"

#include "tests/test_macros.h"

namespace TestInterpolator {

template <class T>
T generate_value(real_t value) {
if constexpr (std::is_same_v<T, Vector2> || std::is_same_v<T, Vector2i>) {
return T(value, value);
} else if constexpr (std::is_same_v<T, Vector3> || std::is_same_v<T, Vector3i>) {
return T(value, value, value);
} else {
return static_cast<T>(value);
}
}

// TODO: Add other types
TEST_CASE_TEMPLATE("[Modules][Interpolator] Interpolation", T, int, real_t, Vector2, Vector2i, Vector3) {
LocalVector<real_t> fractions;
fractions.reserve(7);
fractions.push_back(0.0);
fractions.push_back(1.0);
fractions.push_back(0.5);
fractions.push_back(0.001);
fractions.push_back(0.999);
fractions.push_back(0.25);
fractions.push_back(0.75);

Map<real_t, real_t> values;
values.insert(0.0, 1.0);
values.insert(-1.0, 1.0);
values.insert(0.0, -1.0);
values.insert(10, 15);

Interpolator interpolator;
for (const Map<real_t, real_t>::Element *E = values.front(); E; E = E->next()) {
for (uint32_t j = 0; j < fractions.size(); ++j) {
// Skip custom interpolator for now
for (int k = Interpolator::FALLBACK_INTERPOLATE; k < Interpolator::FALLBACK_CUSTOM_INTERPOLATOR; ++k) {
const T first_value = generate_value<T>(E->key());
const T second_value = generate_value<T>(E->value());

interpolator.reset();
const int variable_id = interpolator.register_variable(T(), static_cast<Interpolator::Fallback>(k));
interpolator.terminate_init();
interpolator.begin_write(0);
interpolator.epoch_insert(variable_id, first_value);
interpolator.end_write();

interpolator.begin_write(1);
interpolator.epoch_insert(variable_id, second_value);
interpolator.end_write();

CAPTURE(k);
CAPTURE(fractions[j]);
CAPTURE(first_value);
CAPTURE(second_value);
const T result = interpolator.pop_epoch(0, fractions[j])[0];
switch (k) {
case Interpolator::FALLBACK_INTERPOLATE: {
CHECK(result == Interpolator::interpolate(first_value, second_value, fractions[j]).operator T());
} break;
case Interpolator::FALLBACK_DEFAULT: {
if (fractions[j] == 0.0) {
CHECK(result == first_value);
} else if (fractions[j] == 1.0) {
CHECK(result == second_value);
} else {
CHECK(result == T());
}
} break;
case Interpolator::FALLBACK_OLD_OR_NEAREST: {
if (fractions[j] == 0.0) {
CHECK(result == first_value);
} else if (fractions[j] == 1.0) {
CHECK(result == second_value);
} else {
CHECK(result == first_value);
}
} break;
case Interpolator::FALLBACK_NEW_OR_NEAREST: {
if (fractions[j] == 0.0) {
CHECK(result == first_value);
} else if (fractions[j] == 1.0) {
CHECK(result == second_value);
} else {
CHECK(result == second_value);
}
} break;
}
}
}
}
}
} // namespace TestInterpolator

#endif // TEST_INTERPOLATOR_H

0 comments on commit 707aeb6

Please sign in to comment.