Disable Skeleton3D when compiling without 3D

Make animation code not depend on Skeleton3D or even Node3D
This commit is contained in:
Aaron Franke 2021-03-17 19:35:42 -04:00
parent 5dc923d386
commit bbd49dec23
No known key found for this signature in database
GPG key ID: 40A1750B977E56BF
10 changed files with 58 additions and 59 deletions

View file

@ -4,6 +4,5 @@ Import("env")
if env["disable_3d"]: if env["disable_3d"]:
env.add_source_files(env.scene_sources, "node_3d.cpp") env.add_source_files(env.scene_sources, "node_3d.cpp")
env.add_source_files(env.scene_sources, "skeleton_3d.cpp")
else: else:
env.add_source_files(env.scene_sources, "*.cpp") env.add_source_files(env.scene_sources, "*.cpp")

View file

@ -337,7 +337,6 @@ void Skeleton3D::_notification(int p_what) {
} break; } break;
#ifndef _3D_DISABLED
case NOTIFICATION_INTERNAL_PHYSICS_PROCESS: { case NOTIFICATION_INTERNAL_PHYSICS_PROCESS: {
// This is active only if the skeleton animates the physical bones // This is active only if the skeleton animates the physical bones
// and the state of the bone is not active. // and the state of the bone is not active.
@ -356,7 +355,6 @@ void Skeleton3D::_notification(int p_what) {
set_physics_process_internal(true); set_physics_process_internal(true);
} }
} break; } break;
#endif
} }
} }
@ -621,8 +619,6 @@ void Skeleton3D::localize_rests() {
} }
} }
#ifndef _3D_DISABLED
void Skeleton3D::set_animate_physical_bones(bool p_animate) { void Skeleton3D::set_animate_physical_bones(bool p_animate) {
animate_physical_bones = p_animate; animate_physical_bones = p_animate;
@ -783,8 +779,6 @@ void Skeleton3D::physical_bones_remove_collision_exception(RID p_exception) {
_physical_bones_add_remove_collision_exception(false, this, p_exception); _physical_bones_add_remove_collision_exception(false, this, p_exception);
} }
#endif // _3D_DISABLED
void Skeleton3D::_skin_changed() { void Skeleton3D::_skin_changed() {
_make_dirty(); _make_dirty();
} }
@ -898,8 +892,6 @@ void Skeleton3D::_bind_methods() {
ClassDB::bind_method(D_METHOD("bone_transform_to_world_transform", "bone_transform"), &Skeleton3D::bone_transform_to_world_transform); ClassDB::bind_method(D_METHOD("bone_transform_to_world_transform", "bone_transform"), &Skeleton3D::bone_transform_to_world_transform);
ClassDB::bind_method(D_METHOD("world_transform_to_bone_transform", "world_transform"), &Skeleton3D::world_transform_to_bone_transform); ClassDB::bind_method(D_METHOD("world_transform_to_bone_transform", "world_transform"), &Skeleton3D::world_transform_to_bone_transform);
#ifndef _3D_DISABLED
ClassDB::bind_method(D_METHOD("set_animate_physical_bones"), &Skeleton3D::set_animate_physical_bones); ClassDB::bind_method(D_METHOD("set_animate_physical_bones"), &Skeleton3D::set_animate_physical_bones);
ClassDB::bind_method(D_METHOD("get_animate_physical_bones"), &Skeleton3D::get_animate_physical_bones); ClassDB::bind_method(D_METHOD("get_animate_physical_bones"), &Skeleton3D::get_animate_physical_bones);
@ -909,7 +901,6 @@ void Skeleton3D::_bind_methods() {
ClassDB::bind_method(D_METHOD("physical_bones_remove_collision_exception", "exception"), &Skeleton3D::physical_bones_remove_collision_exception); ClassDB::bind_method(D_METHOD("physical_bones_remove_collision_exception", "exception"), &Skeleton3D::physical_bones_remove_collision_exception);
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "animate_physical_bones"), "set_animate_physical_bones", "get_animate_physical_bones"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "animate_physical_bones"), "set_animate_physical_bones", "get_animate_physical_bones");
#endif // _3D_DISABLED
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
ADD_SIGNAL(MethodInfo("pose_updated")); ADD_SIGNAL(MethodInfo("pose_updated"));

View file

@ -35,12 +35,9 @@
#include "scene/3d/node_3d.h" #include "scene/3d/node_3d.h"
#include "scene/resources/skin.h" #include "scene/resources/skin.h"
#ifndef _3D_DISABLED
typedef int BoneId; typedef int BoneId;
class PhysicalBone3D; class PhysicalBone3D;
#endif // _3D_DISABLED
class Skeleton3D; class Skeleton3D;
class SkinReference : public Reference { class SkinReference : public Reference {
@ -92,10 +89,8 @@ private:
bool global_pose_override_reset = false; bool global_pose_override_reset = false;
Transform3D global_pose_override; Transform3D global_pose_override;
#ifndef _3D_DISABLED
PhysicalBone3D *physical_bone = nullptr; PhysicalBone3D *physical_bone = nullptr;
PhysicalBone3D *cache_parent_physical_bone = nullptr; PhysicalBone3D *cache_parent_physical_bone = nullptr;
#endif // _3D_DISABLED
List<ObjectID> nodes_bound; List<ObjectID> nodes_bound;
}; };
@ -181,7 +176,6 @@ public:
Transform3D bone_transform_to_world_transform(Transform3D p_transform); Transform3D bone_transform_to_world_transform(Transform3D p_transform);
Transform3D world_transform_to_bone_transform(Transform3D p_transform); Transform3D world_transform_to_bone_transform(Transform3D p_transform);
#ifndef _3D_DISABLED
// Physical bone API // Physical bone API
void set_animate_physical_bones(bool p_animate); void set_animate_physical_bones(bool p_animate);
@ -203,7 +197,6 @@ public:
void physical_bones_start_simulation_on(const TypedArray<StringName> &p_bones); void physical_bones_start_simulation_on(const TypedArray<StringName> &p_bones);
void physical_bones_add_collision_exception(RID p_exception); void physical_bones_add_collision_exception(RID p_exception);
void physical_bones_remove_collision_exception(RID p_exception); void physical_bones_remove_collision_exception(RID p_exception);
#endif // _3D_DISABLED
public: public:
Skeleton3D(); Skeleton3D();

View file

@ -81,6 +81,7 @@ void AnimationCache::_update_cache() {
Ref<Resource> res; Ref<Resource> res;
if (animation->track_get_type(i) == Animation::TYPE_TRANSFORM3D) { if (animation->track_get_type(i) == Animation::TYPE_TRANSFORM3D) {
#ifndef _3D_DISABLED
if (np.get_subname_count() > 1) { if (np.get_subname_count() > 1) {
path_cache.push_back(Path()); path_cache.push_back(Path());
ERR_CONTINUE_MSG(animation->track_get_type(i) == Animation::TYPE_TRANSFORM3D, "Transform tracks can't have a subpath '" + np + "'."); ERR_CONTINUE_MSG(animation->track_get_type(i) == Animation::TYPE_TRANSFORM3D, "Transform tracks can't have a subpath '" + np + "'.");
@ -113,8 +114,8 @@ void AnimationCache::_update_cache() {
path.skeleton = sk; path.skeleton = sk;
} }
path.spatial = sp; path.node_3d = sp;
#endif // _3D_DISABLED
} else { } else {
if (np.get_subname_count() > 0) { if (np.get_subname_count() > 0) {
RES res2; RES res2;
@ -179,14 +180,16 @@ void AnimationCache::set_track_transform(int p_idx, const Transform3D &p_transfo
return; return;
} }
#ifndef _3D_DISABLED
ERR_FAIL_COND(!p.node); ERR_FAIL_COND(!p.node);
ERR_FAIL_COND(!p.spatial); ERR_FAIL_COND(!p.node_3d);
if (p.skeleton) { if (p.skeleton) {
p.skeleton->set_bone_pose(p.bone_idx, p_transform); p.skeleton->set_bone_pose(p.bone_idx, p_transform);
} else { } else {
p.spatial->set_transform(p_transform); p.node_3d->set_transform(p_transform);
} }
#endif // _3D_DISABLED
} }
void AnimationCache::set_track_value(int p_idx, const Variant &p_value) { void AnimationCache::set_track_value(int p_idx, const Variant &p_value) {

View file

@ -40,9 +40,11 @@ class AnimationCache : public Object {
struct Path { struct Path {
RES resource; RES resource;
Object *object = nullptr; Object *object = nullptr;
Skeleton3D *skeleton = nullptr; // haxor #ifndef _3D_DISABLED
Skeleton3D *skeleton = nullptr;
Node3D *node_3d = nullptr;
#endif // _3D_DISABLED
Node *node = nullptr; Node *node = nullptr;
Node3D *spatial = nullptr;
int bone_idx = -1; int bone_idx = -1;
Vector<StringName> subpath; Vector<StringName> subpath;

View file

@ -252,6 +252,7 @@ void AnimationPlayer::_ensure_node_caches(AnimationData *p_anim, Node *p_root_ov
ObjectID id = resource.is_valid() ? resource->get_instance_id() : child->get_instance_id(); ObjectID id = resource.is_valid() ? resource->get_instance_id() : child->get_instance_id();
int bone_idx = -1; int bone_idx = -1;
#ifndef _3D_DISABLED
if (a->track_get_path(i).get_subname_count() == 1 && Object::cast_to<Skeleton3D>(child)) { if (a->track_get_path(i).get_subname_count() == 1 && Object::cast_to<Skeleton3D>(child)) {
Skeleton3D *sk = Object::cast_to<Skeleton3D>(child); Skeleton3D *sk = Object::cast_to<Skeleton3D>(child);
bone_idx = sk->find_bone(a->track_get_path(i).get_subname(0)); bone_idx = sk->find_bone(a->track_get_path(i).get_subname(0));
@ -259,6 +260,7 @@ void AnimationPlayer::_ensure_node_caches(AnimationData *p_anim, Node *p_root_ov
continue; continue;
} }
} }
#endif // _3D_DISABLED
{ {
if (!child->is_connected("tree_exiting", callable_mp(this, &AnimationPlayer::_node_removed))) { if (!child->is_connected("tree_exiting", callable_mp(this, &AnimationPlayer::_node_removed))) {
@ -279,11 +281,12 @@ void AnimationPlayer::_ensure_node_caches(AnimationData *p_anim, Node *p_root_ov
p_anim->node_cache[i]->node = child; p_anim->node_cache[i]->node = child;
p_anim->node_cache[i]->resource = resource; p_anim->node_cache[i]->resource = resource;
p_anim->node_cache[i]->node_2d = Object::cast_to<Node2D>(child); p_anim->node_cache[i]->node_2d = Object::cast_to<Node2D>(child);
#ifndef _3D_DISABLED
if (a->track_get_type(i) == Animation::TYPE_TRANSFORM3D) { if (a->track_get_type(i) == Animation::TYPE_TRANSFORM3D) {
// special cases and caches for transform tracks // special cases and caches for transform tracks
// cache spatial // cache node_3d
p_anim->node_cache[i]->spatial = Object::cast_to<Node3D>(child); p_anim->node_cache[i]->node_3d = Object::cast_to<Node3D>(child);
// cache skeleton // cache skeleton
p_anim->node_cache[i]->skeleton = Object::cast_to<Skeleton3D>(child); p_anim->node_cache[i]->skeleton = Object::cast_to<Skeleton3D>(child);
if (p_anim->node_cache[i]->skeleton) { if (p_anim->node_cache[i]->skeleton) {
@ -294,7 +297,7 @@ void AnimationPlayer::_ensure_node_caches(AnimationData *p_anim, Node *p_root_ov
if (p_anim->node_cache[i]->bone_idx < 0) { if (p_anim->node_cache[i]->bone_idx < 0) {
// broken track (nonexistent bone) // broken track (nonexistent bone)
p_anim->node_cache[i]->skeleton = nullptr; p_anim->node_cache[i]->skeleton = nullptr;
p_anim->node_cache[i]->spatial = nullptr; p_anim->node_cache[i]->node_3d = nullptr;
ERR_CONTINUE(p_anim->node_cache[i]->bone_idx < 0); ERR_CONTINUE(p_anim->node_cache[i]->bone_idx < 0);
} }
} else { } else {
@ -303,6 +306,7 @@ void AnimationPlayer::_ensure_node_caches(AnimationData *p_anim, Node *p_root_ov
} }
} }
} }
#endif // _3D_DISABLED
if (a->track_get_type(i) == Animation::TYPE_VALUE) { if (a->track_get_type(i) == Animation::TYPE_VALUE) {
if (!p_anim->node_cache[i]->property_anim.has(a->track_get_path(i).get_concatenated_subnames())) { if (!p_anim->node_cache[i]->property_anim.has(a->track_get_path(i).get_concatenated_subnames())) {
@ -367,7 +371,8 @@ void AnimationPlayer::_animation_process_animation(AnimationData *p_anim, float
switch (a->track_get_type(i)) { switch (a->track_get_type(i)) {
case Animation::TYPE_TRANSFORM3D: { case Animation::TYPE_TRANSFORM3D: {
if (!nc->spatial) { #ifndef _3D_DISABLED
if (!nc->node_3d) {
continue; continue;
} }
@ -395,7 +400,7 @@ void AnimationPlayer::_animation_process_animation(AnimationData *p_anim, float
nc->rot_accum = nc->rot_accum.slerp(rot, p_interp); nc->rot_accum = nc->rot_accum.slerp(rot, p_interp);
nc->scale_accum = nc->scale_accum.lerp(scale, p_interp); nc->scale_accum = nc->scale_accum.lerp(scale, p_interp);
} }
#endif // _3D_DISABLED
} break; } break;
case Animation::TYPE_VALUE: { case Animation::TYPE_VALUE: {
if (!nc->node) { if (!nc->node) {
@ -846,12 +851,13 @@ void AnimationPlayer::_animation_update_transforms() {
t.origin = nc->loc_accum; t.origin = nc->loc_accum;
t.basis.set_quat_scale(nc->rot_accum, nc->scale_accum); t.basis.set_quat_scale(nc->rot_accum, nc->scale_accum);
#ifndef _3D_DISABLED
if (nc->skeleton && nc->bone_idx >= 0) { if (nc->skeleton && nc->bone_idx >= 0) {
nc->skeleton->set_bone_pose(nc->bone_idx, t); nc->skeleton->set_bone_pose(nc->bone_idx, t);
} else if (nc->node_3d) {
} else if (nc->spatial) { nc->node_3d->set_transform(t);
nc->spatial->set_transform(t);
} }
#endif // _3D_DISABLED
} }
} }
@ -1523,11 +1529,11 @@ Ref<AnimatedValuesBackup> AnimationPlayer::backup_animated_values(Node *p_root_o
entry.value = nc->skeleton->get_bone_pose(nc->bone_idx); entry.value = nc->skeleton->get_bone_pose(nc->bone_idx);
backup->entries.push_back(entry); backup->entries.push_back(entry);
} else { } else {
if (nc->spatial) { if (nc->node_3d) {
AnimatedValuesBackup::Entry entry; AnimatedValuesBackup::Entry entry;
entry.object = nc->spatial; entry.object = nc->node_3d;
entry.subpath.push_back("transform"); entry.subpath.push_back("transform");
entry.value = nc->spatial->get_transform(); entry.value = nc->node_3d->get_transform();
entry.bone_idx = -1; entry.bone_idx = -1;
backup->entries.push_back(entry); backup->entries.push_back(entry);
} else { } else {

View file

@ -93,9 +93,11 @@ private:
uint32_t id = 0; uint32_t id = 0;
RES resource; RES resource;
Node *node = nullptr; Node *node = nullptr;
Node3D *spatial = nullptr;
Node2D *node_2d = nullptr; Node2D *node_2d = nullptr;
#ifndef _3D_DISABLED
Node3D *node_3d = nullptr;
Skeleton3D *skeleton = nullptr; Skeleton3D *skeleton = nullptr;
#endif // _3D_DISABLED
int bone_idx = -1; int bone_idx = -1;
// accumulated transforms // accumulated transforms

View file

@ -582,21 +582,22 @@ bool AnimationTree::_update_caches(AnimationPlayer *player) {
} break; } break;
case Animation::TYPE_TRANSFORM3D: { case Animation::TYPE_TRANSFORM3D: {
Node3D *spatial = Object::cast_to<Node3D>(child); #ifndef _3D_DISABLED
Node3D *node_3d = Object::cast_to<Node3D>(child);
if (!spatial) { if (!node_3d) {
ERR_PRINT("AnimationTree: '" + String(E->get()) + "', transform track does not point to spatial: '" + String(path) + "'"); ERR_PRINT("AnimationTree: '" + String(E->get()) + "', transform track does not point to Node3D: '" + String(path) + "'");
continue; continue;
} }
TrackCacheTransform *track_xform = memnew(TrackCacheTransform); TrackCacheTransform *track_xform = memnew(TrackCacheTransform);
track_xform->spatial = spatial; track_xform->node_3d = node_3d;
track_xform->skeleton = nullptr; track_xform->skeleton = nullptr;
track_xform->bone_idx = -1; track_xform->bone_idx = -1;
if (path.get_subname_count() == 1 && Object::cast_to<Skeleton3D>(spatial)) { if (path.get_subname_count() == 1 && Object::cast_to<Skeleton3D>(node_3d)) {
Skeleton3D *sk = Object::cast_to<Skeleton3D>(spatial); Skeleton3D *sk = Object::cast_to<Skeleton3D>(node_3d);
track_xform->skeleton = sk; track_xform->skeleton = sk;
int bone_idx = sk->find_bone(path.get_subname(0)); int bone_idx = sk->find_bone(path.get_subname(0));
if (bone_idx != -1) { if (bone_idx != -1) {
@ -604,11 +605,11 @@ bool AnimationTree::_update_caches(AnimationPlayer *player) {
} }
} }
track_xform->object = spatial; track_xform->object = node_3d;
track_xform->object_id = track_xform->object->get_instance_id(); track_xform->object_id = track_xform->object->get_instance_id();
track = track_xform; track = track_xform;
#endif // _3D_DISABLED
} break; } break;
case Animation::TYPE_METHOD: { case Animation::TYPE_METHOD: {
TrackCacheMethod *track_method = memnew(TrackCacheMethod); TrackCacheMethod *track_method = memnew(TrackCacheMethod);
@ -845,6 +846,7 @@ void AnimationTree::_process_graph(float p_delta) {
switch (track->type) { switch (track->type) {
case Animation::TYPE_TRANSFORM3D: { case Animation::TYPE_TRANSFORM3D: {
#ifndef _3D_DISABLED
TrackCacheTransform *t = static_cast<TrackCacheTransform *>(track); TrackCacheTransform *t = static_cast<TrackCacheTransform *>(track);
if (track->root_motion) { if (track->root_motion) {
@ -930,7 +932,7 @@ void AnimationTree::_process_graph(float p_delta) {
} }
t->scale = t->scale.lerp(scale, blend); t->scale = t->scale.lerp(scale, blend);
} }
#endif // _3D_DISABLED
} break; } break;
case Animation::TYPE_VALUE: { case Animation::TYPE_VALUE: {
TrackCacheValue *t = static_cast<TrackCacheValue *>(track); TrackCacheValue *t = static_cast<TrackCacheValue *>(track);
@ -1189,6 +1191,7 @@ void AnimationTree::_process_graph(float p_delta) {
switch (track->type) { switch (track->type) {
case Animation::TYPE_TRANSFORM3D: { case Animation::TYPE_TRANSFORM3D: {
#ifndef _3D_DISABLED
TrackCacheTransform *t = static_cast<TrackCacheTransform *>(track); TrackCacheTransform *t = static_cast<TrackCacheTransform *>(track);
Transform3D xform; Transform3D xform;
@ -1206,9 +1209,9 @@ void AnimationTree::_process_graph(float p_delta) {
t->skeleton->set_bone_pose(t->bone_idx, xform); t->skeleton->set_bone_pose(t->bone_idx, xform);
} else if (!t->skeleton) { } else if (!t->skeleton) {
t->spatial->set_transform(xform); t->node_3d->set_transform(xform);
} }
#endif // _3D_DISABLED
} break; } break;
case Animation::TYPE_VALUE: { case Animation::TYPE_VALUE: {
TrackCacheValue *t = static_cast<TrackCacheValue *>(track); TrackCacheValue *t = static_cast<TrackCacheValue *>(track);

View file

@ -184,8 +184,10 @@ private:
}; };
struct TrackCacheTransform : public TrackCache { struct TrackCacheTransform : public TrackCache {
Node3D *spatial = nullptr; #ifndef _3D_DISABLED
Node3D *node_3d = nullptr;
Skeleton3D *skeleton = nullptr; Skeleton3D *skeleton = nullptr;
#endif // _3D_DISABLED
int bone_idx = -1; int bone_idx = -1;
Vector3 loc; Vector3 loc;
Quat rot; Quat rot;

View file

@ -180,10 +180,6 @@
#include "scene/resources/world_margin_shape_3d.h" #include "scene/resources/world_margin_shape_3d.h"
#include "scene/scene_string_names.h" #include "scene/scene_string_names.h"
// Needed by animation code, so keep when 3D disabled.
#include "scene/3d/node_3d.h"
#include "scene/3d/skeleton_3d.h"
#include "scene/main/shader_globals_override.h" #include "scene/main/shader_globals_override.h"
#ifndef _3D_DISABLED #ifndef _3D_DISABLED
@ -208,6 +204,7 @@
#include "scene/3d/navigation_agent_3d.h" #include "scene/3d/navigation_agent_3d.h"
#include "scene/3d/navigation_obstacle_3d.h" #include "scene/3d/navigation_obstacle_3d.h"
#include "scene/3d/navigation_region_3d.h" #include "scene/3d/navigation_region_3d.h"
#include "scene/3d/node_3d.h"
#include "scene/3d/occluder_instance_3d.h" #include "scene/3d/occluder_instance_3d.h"
#include "scene/3d/path_3d.h" #include "scene/3d/path_3d.h"
#include "scene/3d/physics_body_3d.h" #include "scene/3d/physics_body_3d.h"
@ -217,6 +214,7 @@
#include "scene/3d/ray_cast_3d.h" #include "scene/3d/ray_cast_3d.h"
#include "scene/3d/reflection_probe.h" #include "scene/3d/reflection_probe.h"
#include "scene/3d/remote_transform_3d.h" #include "scene/3d/remote_transform_3d.h"
#include "scene/3d/skeleton_3d.h"
#include "scene/3d/skeleton_ik_3d.h" #include "scene/3d/skeleton_ik_3d.h"
#include "scene/3d/soft_body_3d.h" #include "scene/3d/soft_body_3d.h"
#include "scene/3d/spring_arm_3d.h" #include "scene/3d/spring_arm_3d.h"
@ -395,14 +393,7 @@ void register_scene_types() {
AcceptDialog::set_swap_cancel_ok(swap_cancel_ok); AcceptDialog::set_swap_cancel_ok(swap_cancel_ok);
#endif #endif
/* REGISTER 3D */ /* REGISTER ANIMATION */
// Needed even with _3D_DISABLED as used in animation code.
ClassDB::register_class<Node3D>();
ClassDB::register_virtual_class<Node3DGizmo>();
ClassDB::register_class<Skin>();
ClassDB::register_virtual_class<SkinReference>();
ClassDB::register_class<Skeleton3D>();
ClassDB::register_class<AnimationPlayer>(); ClassDB::register_class<AnimationPlayer>();
ClassDB::register_class<Tween>(); ClassDB::register_class<Tween>();
@ -432,7 +423,14 @@ void register_scene_types() {
OS::get_singleton()->yield(); //may take time to init OS::get_singleton()->yield(); //may take time to init
/* REGISTER 3D */
#ifndef _3D_DISABLED #ifndef _3D_DISABLED
ClassDB::register_class<Node3D>();
ClassDB::register_virtual_class<Node3DGizmo>();
ClassDB::register_class<Skin>();
ClassDB::register_virtual_class<SkinReference>();
ClassDB::register_class<Skeleton3D>();
ClassDB::register_virtual_class<VisualInstance3D>(); ClassDB::register_virtual_class<VisualInstance3D>();
ClassDB::register_virtual_class<GeometryInstance3D>(); ClassDB::register_virtual_class<GeometryInstance3D>();
ClassDB::register_class<Camera3D>(); ClassDB::register_class<Camera3D>();