asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #79524 from aaronfranke/gds-test-inst-placeholder

Browse source 
Change GDScript tests to use InstancePlaceholder as the example abstract class
This commit is contained in:
Yuri Sizov 2023-07-21 17:15:32 +02:00
commit de0f7935dd
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/gdscript/tests/scripts/analyzer/errors/abstract_class_instantiate.gd
View file

@ -1,2 +1,2 @@
func test(): func test():
CanvasItem.new() InstancePlaceholder.new()

2
modules/gdscript/tests/scripts/analyzer/errors/abstract_class_instantiate.out
View file

@ -1,2 +1,2 @@
GDTEST_ANALYZER_ERROR GDTEST_ANALYZER_ERROR
Native class "CanvasItem" cannot be constructed as it is abstract. Native class "InstancePlaceholder" cannot be constructed as it is abstract.

2
modules/gdscript/tests/scripts/analyzer/errors/abstract_script_instantiate.gd
View file

@ -1,4 +1,4 @@
class A extends CanvasItem: class A extends InstancePlaceholder:
func _init(): func _init():
print('no') print('no')

2
modules/gdscript/tests/scripts/analyzer/errors/abstract_script_instantiate.out
View file

@ -1,2 +1,2 @@
GDTEST_ANALYZER_ERROR GDTEST_ANALYZER_ERROR
Class "abstract_script_instantiate.gd::B" cannot be constructed as it is based on abstract native class "CanvasItem". Class "abstract_script_instantiate.gd::B" cannot be constructed as it is based on abstract native class "InstancePlaceholder".

4
scene/main/canvas_item.h
View file

@ -170,6 +170,7 @@ protected:
_FORCE_INLINE_ void set_hide_clip_children(bool p_value) { hide_clip_children = p_value; } _FORCE_INLINE_ void set_hide_clip_children(bool p_value) { hide_clip_children = p_value; }
GDVIRTUAL0(_draw) GDVIRTUAL0(_draw)
public: public:
enum { enum {
NOTIFICATION_TRANSFORM_CHANGED = SceneTree::NOTIFICATION_TRANSFORM_CHANGED, //unique NOTIFICATION_TRANSFORM_CHANGED = SceneTree::NOTIFICATION_TRANSFORM_CHANGED, //unique
@ -179,7 +180,6 @@ public:
NOTIFICATION_EXIT_CANVAS = 33, NOTIFICATION_EXIT_CANVAS = 33,
NOTIFICATION_LOCAL_TRANSFORM_CHANGED = 35, NOTIFICATION_LOCAL_TRANSFORM_CHANGED = 35,
NOTIFICATION_WORLD_2D_CHANGED = 36, NOTIFICATION_WORLD_2D_CHANGED = 36,
}; };
/* EDITOR */ /* EDITOR */
@ -189,7 +189,7 @@ public:
// Save and restore a CanvasItem state // Save and restore a CanvasItem state
virtual void _edit_set_state(const Dictionary &p_state) {} virtual void _edit_set_state(const Dictionary &p_state) {}
virtual Dictionary _edit_get_state() const { return Dictionary(); }; virtual Dictionary _edit_get_state() const { return Dictionary(); }
// Used to move the node // Used to move the node
virtual void _edit_set_position(const Point2 &p_position) = 0; virtual void _edit_set_position(const Point2 &p_position) = 0;