summaryrefslogtreecommitdiff
path: root/scene/2d/sprite.h
diff options
context:
space:
mode:
Diffstat (limited to 'scene/2d/sprite.h')
-rw-r--r--scene/2d/sprite.h12
1 files changed, 5 insertions, 7 deletions
diff --git a/scene/2d/sprite.h b/scene/2d/sprite.h
index 32d3f476d1..05c0bd9eec 100644
--- a/scene/2d/sprite.h
+++ b/scene/2d/sprite.h
@@ -5,7 +5,7 @@
/* GODOT ENGINE */
/* http://www.godotengine.org */
/*************************************************************************/
-/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur. */
+/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur. */
/* */
/* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */
@@ -35,7 +35,7 @@
class Sprite : public Node2D {
- OBJ_TYPE( Sprite, Node2D );
+ GDCLASS( Sprite, Node2D );
Ref<Texture> texture;
@@ -52,7 +52,6 @@ class Sprite : public Node2D {
int vframes;
int hframes;
- Color modulate;
protected:
@@ -99,17 +98,15 @@ public:
void set_hframes(int p_amount);
int get_hframes() const;
- void set_modulate(const Color& p_color);
- Color get_modulate() const;
-
virtual Rect2 get_item_rect() const;
Sprite();
};
+#if 0
class ViewportSprite : public Node2D {
- OBJ_TYPE( ViewportSprite, Node2D );
+ GDCLASS( ViewportSprite, Node2D );
Ref<Texture> texture;
NodePath viewport_path;
@@ -149,4 +146,5 @@ public:
ViewportSprite();
};
+#endif
#endif // SPRITE_H