summaryrefslogtreecommitdiffstats
path: root/scene/3d/look_at_modifier_3d.h
diff options
context:
space:
mode:
authorGeorge L. Albany <Megacake1234@gmail.com>2024-11-27 21:15:49 +0000
committerGitHub <noreply@github.com>2024-11-27 21:15:49 +0000
commit85d87116e184e7923b8d6804cab2681b61c62d83 (patch)
tree55ec5bfa061a5c27272b831e697b78ed1b756a70 /scene/3d/look_at_modifier_3d.h
parentb06d20bf39d15ec736d08d4e4fcb32e0c3c1ce1e (diff)
parent721f53fde47c2727d99e3ecccdb789a67df36de0 (diff)
downloadredot-engine-master.tar.gz
Merge pull request #886 from Spartan322/merge/f128f38HEADmaster
Merge commit godotengine/godot@f128f38
Diffstat (limited to 'scene/3d/look_at_modifier_3d.h')
-rw-r--r--scene/3d/look_at_modifier_3d.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/scene/3d/look_at_modifier_3d.h b/scene/3d/look_at_modifier_3d.h
index f4bdc381ad..b793152ec9 100644
--- a/scene/3d/look_at_modifier_3d.h
+++ b/scene/3d/look_at_modifier_3d.h
@@ -56,7 +56,8 @@ public:
};
private:
- int bone = 0;
+ String bone_name;
+ int bone = -1;
Vector3 forward_vector;
Vector3 forward_vector_nrm;
@@ -66,6 +67,7 @@ private:
bool use_secondary_rotation = true;
OriginFrom origin_from = ORIGIN_FROM_SELF;
+ String origin_bone_name;
int origin_bone = -1;
NodePath origin_external_node;
@@ -125,6 +127,8 @@ protected:
virtual void _process_modification() override;
public:
+ void set_bone_name(const String &p_bone_name);
+ String get_bone_name() const;
void set_bone(int p_bone);
int get_bone() const;
@@ -137,6 +141,8 @@ public:
void set_origin_from(OriginFrom p_origin_from);
OriginFrom get_origin_from() const;
+ void set_origin_bone_name(const String &p_bone_name);
+ String get_origin_bone_name() const;
void set_origin_bone(int p_bone);
int get_origin_bone() const;
void set_origin_external_node(const NodePath &p_external_node);