mirror of
https://github.com/aseprite/aseprite.git
synced 2025-03-19 19:21:08 +00:00
Renamed get_sprite() to getSprite() in Layer class and Undoable class.
This commit is contained in:
parent
898f43ff65
commit
c4afb1a236
@ -640,14 +640,14 @@ int get_color_for_layer(Layer *layer, color_t color)
|
|||||||
{
|
{
|
||||||
return
|
return
|
||||||
fixup_color_for_layer(layer,
|
fixup_color_for_layer(layer,
|
||||||
get_color_for_image(layer->get_sprite()->imgtype,
|
get_color_for_image(layer->getSprite()->imgtype,
|
||||||
color));
|
color));
|
||||||
}
|
}
|
||||||
|
|
||||||
int fixup_color_for_layer(Layer *layer, int color)
|
int fixup_color_for_layer(Layer *layer, int color)
|
||||||
{
|
{
|
||||||
if (layer->is_background())
|
if (layer->is_background())
|
||||||
return fixup_color_for_background(layer->get_sprite()->imgtype, color);
|
return fixup_color_for_background(layer->getSprite()->imgtype, color);
|
||||||
else
|
else
|
||||||
return color;
|
return color;
|
||||||
}
|
}
|
||||||
|
@ -72,7 +72,7 @@ static ImageRef* images_ref_get_from_layer(Sprite* sprite, Layer* layer, int tar
|
|||||||
{ \
|
{ \
|
||||||
ImageRef* image_ref = jnew(ImageRef, 1); \
|
ImageRef* image_ref = jnew(ImageRef, 1); \
|
||||||
\
|
\
|
||||||
image_ref->image = layer->get_sprite()->stock->image[cel->image]; \
|
image_ref->image = layer->getSprite()->stock->image[cel->image]; \
|
||||||
image_ref->layer = layer; \
|
image_ref->layer = layer; \
|
||||||
image_ref->cel = cel; \
|
image_ref->cel = cel; \
|
||||||
image_ref->next = NULL; \
|
image_ref->next = NULL; \
|
||||||
|
@ -128,9 +128,9 @@ LayerImage::LayerImage(LayerImage* src_layer, Sprite* dst_sprite)
|
|||||||
Cel* cel_copy = cel_new_copy(cel);
|
Cel* cel_copy = cel_new_copy(cel);
|
||||||
|
|
||||||
assert((cel->image >= 0) &&
|
assert((cel->image >= 0) &&
|
||||||
(cel->image < src_layer->get_sprite()->stock->nimage));
|
(cel->image < src_layer->getSprite()->stock->nimage));
|
||||||
|
|
||||||
Image* image = src_layer->get_sprite()->stock->image[cel->image];
|
Image* image = src_layer->getSprite()->stock->image[cel->image];
|
||||||
assert(image != NULL);
|
assert(image != NULL);
|
||||||
|
|
||||||
Image* image_copy = image_new_copy(image);
|
Image* image_copy = image_new_copy(image);
|
||||||
@ -162,11 +162,11 @@ void LayerImage::destroy_all_cels()
|
|||||||
Cel* cel = *it;
|
Cel* cel = *it;
|
||||||
|
|
||||||
if (!cel_is_link(cel, this)) {
|
if (!cel_is_link(cel, this)) {
|
||||||
Image* image = get_sprite()->stock->image[cel->image];
|
Image* image = getSprite()->stock->image[cel->image];
|
||||||
|
|
||||||
assert(image != NULL);
|
assert(image != NULL);
|
||||||
|
|
||||||
stock_remove_image(get_sprite()->stock, image);
|
stock_remove_image(getSprite()->stock, image);
|
||||||
image_free(image);
|
image_free(image);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -253,13 +253,13 @@ Cel* LayerImage::get_cel(int frame)
|
|||||||
*/
|
*/
|
||||||
void LayerImage::configure_as_background()
|
void LayerImage::configure_as_background()
|
||||||
{
|
{
|
||||||
assert(get_sprite() != NULL);
|
assert(getSprite() != NULL);
|
||||||
assert(sprite_get_background_layer(get_sprite()) == NULL);
|
assert(sprite_get_background_layer(getSprite()) == NULL);
|
||||||
|
|
||||||
*flags_addr() |= LAYER_IS_LOCKMOVE | LAYER_IS_BACKGROUND;
|
*flags_addr() |= LAYER_IS_LOCKMOVE | LAYER_IS_BACKGROUND;
|
||||||
set_name("Background");
|
set_name("Background");
|
||||||
|
|
||||||
get_sprite()->get_folder()->move_layer(this, NULL);
|
getSprite()->get_folder()->move_layer(this, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
//////////////////////////////////////////////////////////////////////
|
//////////////////////////////////////////////////////////////////////
|
||||||
@ -377,12 +377,12 @@ Layer* layer_new_flatten_copy(Sprite* dst_sprite, const Layer* src_layer,
|
|||||||
/* does this frame have cels to render? */
|
/* does this frame have cels to render? */
|
||||||
if (has_cels(src_layer, frame)) {
|
if (has_cels(src_layer, frame)) {
|
||||||
/* create a new image */
|
/* create a new image */
|
||||||
Image* image = image_new(flat_layer->get_sprite()->imgtype, w, h);
|
Image* image = image_new(flat_layer->getSprite()->imgtype, w, h);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
/* create the new cel for the output layer (add the image to
|
/* create the new cel for the output layer (add the image to
|
||||||
stock too) */
|
stock too) */
|
||||||
Cel* cel = cel_new(frame, stock_add_image(flat_layer->get_sprite()->stock, image));
|
Cel* cel = cel_new(frame, stock_add_image(flat_layer->getSprite()->stock, image));
|
||||||
cel_set_position(cel, x, y);
|
cel_set_position(cel, x, y);
|
||||||
|
|
||||||
/* clear the image and render this frame */
|
/* clear the image and render this frame */
|
||||||
@ -418,9 +418,9 @@ void layer_render(const Layer* layer, Image* image, int x, int y, int frame)
|
|||||||
|
|
||||||
if (cel) {
|
if (cel) {
|
||||||
assert((cel->image >= 0) &&
|
assert((cel->image >= 0) &&
|
||||||
(cel->image < layer->get_sprite()->stock->nimage));
|
(cel->image < layer->getSprite()->stock->nimage));
|
||||||
|
|
||||||
src_image = layer->get_sprite()->stock->image[cel->image];
|
src_image = layer->getSprite()->stock->image[cel->image];
|
||||||
assert(src_image != NULL);
|
assert(src_image != NULL);
|
||||||
|
|
||||||
image_merge(image, src_image,
|
image_merge(image, src_image,
|
||||||
|
@ -56,7 +56,7 @@ public:
|
|||||||
std::string get_name() const { return m_name; }
|
std::string get_name() const { return m_name; }
|
||||||
void set_name(const std::string& name) { m_name = name; }
|
void set_name(const std::string& name) { m_name = name; }
|
||||||
|
|
||||||
Sprite* get_sprite() const { return m_sprite; }
|
Sprite* getSprite() const { return m_sprite; }
|
||||||
LayerFolder* get_parent() const { return m_parent; }
|
LayerFolder* get_parent() const { return m_parent; }
|
||||||
void set_parent(LayerFolder* folder) { m_parent = folder; }
|
void set_parent(LayerFolder* folder) { m_parent = folder; }
|
||||||
Layer* get_prev() const;
|
Layer* get_prev() const;
|
||||||
|
@ -1994,7 +1994,7 @@ static Layer* read_raw_layer(ase_uint8* raw_data)
|
|||||||
Image* image = read_raw_image(raw_data);
|
Image* image = read_raw_image(raw_data);
|
||||||
raw_data += get_raw_image_size(image);
|
raw_data += get_raw_image_size(image);
|
||||||
|
|
||||||
stock_replace_image(layer->get_sprite()->stock, cel->image, image);
|
stock_replace_image(layer->getSprite()->stock, cel->image, image);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@ -2047,7 +2047,7 @@ static ase_uint8* write_raw_layer(ase_uint8* raw_data, Layer* layer)
|
|||||||
|
|
||||||
write_raw_uint8(*layer->flags_addr()); /* flags */
|
write_raw_uint8(*layer->flags_addr()); /* flags */
|
||||||
write_raw_uint16(layer->type); /* type */
|
write_raw_uint16(layer->type); /* type */
|
||||||
write_raw_uint32(layer->get_sprite()->id); /* sprite */
|
write_raw_uint32(layer->getSprite()->id); /* sprite */
|
||||||
|
|
||||||
switch (layer->type) {
|
switch (layer->type) {
|
||||||
|
|
||||||
@ -2069,7 +2069,7 @@ static ase_uint8* write_raw_layer(ase_uint8* raw_data, Layer* layer)
|
|||||||
write_raw_uint8(0);
|
write_raw_uint8(0);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
Image* image = layer->get_sprite()->stock->image[cel->image];
|
Image* image = layer->getSprite()->stock->image[cel->image];
|
||||||
assert(image != NULL);
|
assert(image != NULL);
|
||||||
|
|
||||||
write_raw_uint8(1);
|
write_raw_uint8(1);
|
||||||
@ -2114,7 +2114,7 @@ static int get_raw_layer_size(Layer* layer)
|
|||||||
size += get_raw_cel_size(cel);
|
size += get_raw_cel_size(cel);
|
||||||
size++; // has image?
|
size++; // has image?
|
||||||
if (!cel_is_link(cel, static_cast<LayerImage*>(layer))) {
|
if (!cel_is_link(cel, static_cast<LayerImage*>(layer))) {
|
||||||
Image* image = layer->get_sprite()->stock->image[cel->image];
|
Image* image = layer->getSprite()->stock->image[cel->image];
|
||||||
size += get_raw_image_size(image);
|
size += get_raw_image_size(image);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -425,7 +425,7 @@ void Undoable::background_from_layer(LayerImage* layer, int bgcolor)
|
|||||||
assert(layer->is_image());
|
assert(layer->is_image());
|
||||||
assert(layer->is_readable());
|
assert(layer->is_readable());
|
||||||
assert(layer->is_writable());
|
assert(layer->is_writable());
|
||||||
assert(layer->get_sprite() == m_sprite);
|
assert(layer->getSprite() == m_sprite);
|
||||||
assert(sprite_get_background_layer(m_sprite) == NULL);
|
assert(sprite_get_background_layer(m_sprite) == NULL);
|
||||||
|
|
||||||
// create a temporary image to draw each frame of the new
|
// create a temporary image to draw each frame of the new
|
||||||
|
@ -42,7 +42,7 @@ public:
|
|||||||
Undoable(SpriteWriter& sprite, const char* label);
|
Undoable(SpriteWriter& sprite, const char* label);
|
||||||
virtual ~Undoable();
|
virtual ~Undoable();
|
||||||
|
|
||||||
inline Sprite* get_sprite() const { return m_sprite; }
|
inline Sprite* getSprite() const { return m_sprite; }
|
||||||
inline bool is_enabled() const { return m_enabled_flag; }
|
inline bool is_enabled() const { return m_enabled_flag; }
|
||||||
|
|
||||||
void commit();
|
void commit();
|
||||||
|
@ -424,8 +424,8 @@ void RenderEngine::renderLayer(Sprite *sprite, Layer *layer, Image *image,
|
|||||||
}
|
}
|
||||||
/* if not, we use the original cel-image from the images' stock */
|
/* if not, we use the original cel-image from the images' stock */
|
||||||
else if ((cel->image >= 0) &&
|
else if ((cel->image >= 0) &&
|
||||||
(cel->image < layer->get_sprite()->stock->nimage))
|
(cel->image < layer->getSprite()->stock->nimage))
|
||||||
src_image = layer->get_sprite()->stock->image[cel->image];
|
src_image = layer->getSprite()->stock->image[cel->image];
|
||||||
else
|
else
|
||||||
src_image = NULL;
|
src_image = NULL;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user