← all fixtures

cpp-godot-small-bugfix

CPP View before/after files on GitHub Upstream commit godotengine-godot.git@6f86914 scene/2d/animated_sprite_2d.cpp
Code view:

A painting is a person's account of this edit as text, recorded independently of the node mapping - a rendering often has several equally defensible answers where the mapping has one. Deletions and insertions carry no position on the opposite side in a painting, so that panel draws no caret for them.

Before

…lines 1–113 unchanged (113 lines)
114
115void AnimatedSprite2D::_validate_property(PropertyInfo &p_property) const {
116 if (frames.is_null()) {
117 return;
118 }
119 if (!Engine::get_singleton()->is_editor_hint()) {
120 if (p_property.name == "frame" && playing) {
121 p_property.usage = PROPERTY_USAGE_EDITOR | PROPERTY_USAGE_READ_ONLY;
122 }
123 return;
124 }
125 if (p_property.name == "animation") {
126 List<StringName> names;
127 frames->get_animation_list(&names);
128 names.sort_custom<StringName::AlphCompare>();
129
…lines 130–686 unchanged (557 lines)

After

…lines 1–113 unchanged (113 lines)
114
115void AnimatedSprite2D::_validate_property(PropertyInfo &p_property) const {
116 if (frames.is_null()) {
117 return;
118 }
119 if (!Engine::get_singleton()->is_editor_hint()) {
120 if (p_property.name == "frame") {
121 if (playing) {
122 p_property.usage = PROPERTY_USAGE_EDITOR | PROPERTY_USAGE_READ_ONLY;
123 }
124 return;
125 }
126 }
127 if (p_property.name == "animation") {
128 List<StringName> names;
129 frames->get_animation_list(&names);
130 names.sort_custom<StringName::AlphCompare>();
131
…lines 132–688 unchanged (557 lines)

Before

translation_unit
comment "/***********************************************************"...
comment "/* animated_sprite_2d.cpp "...
comment "/***********************************************************"...
comment "/* This file is part of: "...
comment "/* GODOT ENGINE "...
comment "/* https://godotengine.org "...
comment "/***********************************************************"...
comment "/* Copyright (c) 2014-present Godot Engine contributors (see"...
comment "/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. "...
comment "/* "...
comment "/* Permission is hereby granted, free of charge, to any pers"...
comment "/* a copy of this software and associated documentation file"...
comment "/* \"Software\"), to deal in the Software without restriction,"...
comment "/* without limitation the rights to use, copy, modify, merge"...
comment "/* distribute, sublicense, and/or sell copies of the Softwar"...
comment "/* permit persons to whom the Software is furnished to do so"...
comment "/* the following conditions: "...
comment "/* "...
comment "/* The above copyright notice and this permission notice sha"...
comment "/* included in all copies or substantial portions of the Sof"...
comment "/* "...
comment "/* THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY"...
comment "/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARR"...
comment "/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON"...
comment "/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIA"...
comment "/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION O"...
comment "/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION "...
comment "/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. "...
comment "/***********************************************************"...
preproc_include
#include "#include"
string_literal
" "\""
string_content "animated_sprite_2d.h"
" "\""
preproc_include
#include "#include"
string_literal
" "\""
string_content "scene/main/viewport.h"
" "\""
preproc_ifdef (+195 nodes collapsed)
comment "// TOOLS_ENABLED"
preproc_ifdef (+151 nodes collapsed)
comment "// DEBUG_ENABLED"
function_definition (+23 nodes collapsed)
function_definition (+227 nodes collapsed)
function_definition
primitive_type "void"
function_declarator
qualified_identifier
namespace_identifier "AnimatedSprite2D"
:: "::"
identifier "_validate_property"
parameter_list
( "("
parameter_declaration
type_identifier "PropertyInfo"
reference_declarator
& "&"
identifier "p_property"
) ")"
type_qualifier
const "const"
compound_statement
{ "{"
if_statement
if "if"
condition_clause
( "("
call_expression
field_expression
identifier "frames"
. "."
field_identifier "is_null"
argument_list
( "("
) ")"
) ")"
compound_statement
{ "{"
return_statement
return "return"
; ";"
} "}"
if_statement
if "if"
condition_clause
( "("
unary_expression
! "!"
call_expression
field_expression
call_expression
qualified_identifier
namespace_identifier "Engine"
:: "::"
identifier "get_singleton"
argument_list
( "("
) ")"
-> "->"
field_identifier "is_editor_hint"
argument_list
( "("
) ")"
) ")"
compound_statement
{ "{"
if_statement
if "if"
condition_clause
( "("
binary_expression
binary_expression
field_expression
identifier "p_property"
. "."
field_identifier "name"
== "=="
string_literal
" "\""
string_content "frame"
" "\""
&& "&&"
identifier "playing"
) ")"
compound_statement
{ "{"
expression_statement
assignment_expression
field_expression
identifier "p_property"
. "."
field_identifier "usage"
= "="
binary_expression
identifier "PROPERTY_USAGE_EDITOR"
| "|"
identifier "PROPERTY_USAGE_READ_ONLY"
; ";"
} "}"
return_statement
return "return"
; ";"
} "}"
if_statement (+233 nodes collapsed)
if_statement (+146 nodes collapsed)
} "}"
function_definition (+1048 nodes collapsed)
function_definition (+314 nodes collapsed)
function_definition (+25 nodes collapsed)
function_definition (+43 nodes collapsed)
function_definition
primitive_type "int"
function_declarator
qualified_identifier
namespace_identifier "AnimatedSprite2D"
:: "::"
identifier "get_frame"
parameter_list
( "("
) ")"
type_qualifier
const "const"
compound_statement
{ "{"
return_statement
return "return"
identifier "frame"
; ";"
} "}"
function_definition (+22 nodes collapsed)
function_definition
type_identifier "real_t"
function_declarator
qualified_identifier
namespace_identifier "AnimatedSprite2D"
:: "::"
identifier "get_frame_progress"
parameter_list
( "("
) ")"
type_qualifier
const "const"
compound_statement
{ "{"
return_statement
return "return"
identifier "frame_progress"
; ";"
} "}"
function_definition (+194 nodes collapsed)
function_definition (+22 nodes collapsed)
function_definition
primitive_type "float"
function_declarator
qualified_identifier
namespace_identifier "AnimatedSprite2D"
:: "::"
identifier "get_speed_scale"
parameter_list
( "("
) ")"
type_qualifier
const "const"
compound_statement
{ "{"
return_statement
return "return"
identifier "speed_scale"
; ";"
} "}"
function_definition (+37 nodes collapsed)
function_definition (+51 nodes collapsed)
function_definition
primitive_type "bool"
function_declarator
qualified_identifier
namespace_identifier "AnimatedSprite2D"
:: "::"
identifier "is_centered"
parameter_list
( "("
) ")"
type_qualifier
const "const"
compound_statement
{ "{"
return_statement
return "return"
identifier "centered"
; ";"
} "}"
function_definition (+55 nodes collapsed)
function_definition
type_identifier "Point2"
function_declarator
qualified_identifier
namespace_identifier "AnimatedSprite2D"
:: "::"
identifier "get_offset"
parameter_list
( "("
) ")"
type_qualifier
const "const"
compound_statement
{ "{"
return_statement
return "return"
identifier "offset"
; ";"
} "}"
function_definition (+44 nodes collapsed)
function_definition
primitive_type "bool"
function_declarator
qualified_identifier
namespace_identifier "AnimatedSprite2D"
:: "::"
identifier "is_flipped_h"
parameter_list
( "("
) ")"
type_qualifier
const "const"
compound_statement
{ "{"
return_statement
return "return"
identifier "hflip"
; ";"
} "}"
function_definition (+44 nodes collapsed)
function_definition
primitive_type "bool"
function_declarator
qualified_identifier
namespace_identifier "AnimatedSprite2D"
:: "::"
identifier "is_flipped_v"
parameter_list
( "("
) ")"
type_qualifier
const "const"
compound_statement
{ "{"
return_statement
return "return"
identifier "vflip"
; ";"
} "}"
function_definition (+37 nodes collapsed)
function_definition
primitive_type "bool"
function_declarator
qualified_identifier
namespace_identifier "AnimatedSprite2D"
:: "::"
identifier "is_playing"
parameter_list
( "("
) ")"
type_qualifier
const "const"
compound_statement
{ "{"
return_statement
return "return"
identifier "playing"
; ";"
} "}"
function_definition (+69 nodes collapsed)
function_definition
type_identifier "String"
function_declarator
qualified_identifier
namespace_identifier "AnimatedSprite2D"
:: "::"
identifier "get_autoplay"
parameter_list
( "("
) ")"
type_qualifier
const "const"
compound_statement
{ "{"
return_statement
return "return"
identifier "autoplay"
; ";"
} "}"
function_definition (+390 nodes collapsed)
function_definition (+32 nodes collapsed)
function_definition (+62 nodes collapsed)
function_definition (+21 nodes collapsed)
function_definition (+21 nodes collapsed)
function_definition (+58 nodes collapsed)
function_definition (+26 nodes collapsed)
function_definition (+279 nodes collapsed)
function_definition
type_identifier "StringName"
function_declarator
qualified_identifier
namespace_identifier "AnimatedSprite2D"
:: "::"
identifier "get_animation"
parameter_list
( "("
) ")"
type_qualifier
const "const"
compound_statement
{ "{"
return_statement
return "return"
identifier "animation"
; ";"
} "}"
function_definition (+72 nodes collapsed)
preproc_ifdef (+191 nodes collapsed)
comment "// TOOLS_ENABLED"
preproc_ifdef (+71 nodes collapsed)
function_definition (+1276 nodes collapsed)
function_definition
function_declarator
qualified_identifier
namespace_identifier "AnimatedSprite2D"
:: "::"
identifier "AnimatedSprite2D"
parameter_list
( "("
) ")"
compound_statement
{ "{"
} "}"

After

translation_unit
comment "/***********************************************************"...
comment "/* animated_sprite_2d.cpp "...
comment "/***********************************************************"...
comment "/* This file is part of: "...
comment "/* GODOT ENGINE "...
comment "/* https://godotengine.org "...
comment "/***********************************************************"...
comment "/* Copyright (c) 2014-present Godot Engine contributors (see"...
comment "/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. "...
comment "/* "...
comment "/* Permission is hereby granted, free of charge, to any pers"...
comment "/* a copy of this software and associated documentation file"...
comment "/* \"Software\"), to deal in the Software without restriction,"...
comment "/* without limitation the rights to use, copy, modify, merge"...
comment "/* distribute, sublicense, and/or sell copies of the Softwar"...
comment "/* permit persons to whom the Software is furnished to do so"...
comment "/* the following conditions: "...
comment "/* "...
comment "/* The above copyright notice and this permission notice sha"...
comment "/* included in all copies or substantial portions of the Sof"...
comment "/* "...
comment "/* THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY"...
comment "/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARR"...
comment "/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON"...
comment "/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIA"...
comment "/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION O"...
comment "/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION "...
comment "/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. "...
comment "/***********************************************************"...
preproc_include
#include "#include"
string_literal
" "\""
string_content "animated_sprite_2d.h"
" "\""
preproc_include
#include "#include"
string_literal
" "\""
string_content "scene/main/viewport.h"
" "\""
preproc_ifdef (+195 nodes collapsed)
comment "// TOOLS_ENABLED"
preproc_ifdef (+151 nodes collapsed)
comment "// DEBUG_ENABLED"
function_definition (+23 nodes collapsed)
function_definition (+227 nodes collapsed)
function_definition
primitive_type "void"
function_declarator
qualified_identifier
namespace_identifier "AnimatedSprite2D"
:: "::"
identifier "_validate_property"
parameter_list
( "("
parameter_declaration
type_identifier "PropertyInfo"
reference_declarator
& "&"
identifier "p_property"
) ")"
type_qualifier
const "const"
compound_statement
{ "{"
if_statement
if "if"
condition_clause
( "("
call_expression
field_expression
identifier "frames"
. "."
field_identifier "is_null"
argument_list
( "("
) ")"
) ")"
compound_statement
{ "{"
return_statement
return "return"
; ";"
} "}"
if_statement
if "if"
condition_clause
( "("
unary_expression
! "!"
call_expression
field_expression
call_expression
qualified_identifier
namespace_identifier "Engine"
:: "::"
identifier "get_singleton"
argument_list
( "("
) ")"
-> "->"
field_identifier "is_editor_hint"
argument_list
( "("
) ")"
) ")"
compound_statement
{ "{"
if_statement
if "if"
condition_clause
( "("
binary_expression
field_expression
identifier "p_property"
. "."
field_identifier "name"
== "=="
string_literal
" "\""
string_content "frame"
" "\""
) ")"
compound_statement
{ "{"
if_statement
if "if"
condition_clause
( "("
identifier "playing"
) ")"
compound_statement
{ "{"
expression_statement
assignment_expression
field_expression
identifier "p_property"
. "."
field_identifier "usage"
= "="
binary_expression
identifier "PROPERTY_USAGE_EDITOR"
| "|"
identifier "PROPERTY_USAGE_READ_ONLY"
; ";"
} "}"
return_statement
return "return"
; ";"
} "}"
} "}"
if_statement (+233 nodes collapsed)
if_statement (+146 nodes collapsed)
} "}"
function_definition (+1048 nodes collapsed)
function_definition (+314 nodes collapsed)
function_definition (+25 nodes collapsed)
function_definition (+43 nodes collapsed)
function_definition
primitive_type "int"
function_declarator
qualified_identifier
namespace_identifier "AnimatedSprite2D"
:: "::"
identifier "get_frame"
parameter_list
( "("
) ")"
type_qualifier
const "const"
compound_statement
{ "{"
return_statement
return "return"
identifier "frame"
; ";"
} "}"
function_definition (+22 nodes collapsed)
function_definition
type_identifier "real_t"
function_declarator
qualified_identifier
namespace_identifier "AnimatedSprite2D"
:: "::"
identifier "get_frame_progress"
parameter_list
( "("
) ")"
type_qualifier
const "const"
compound_statement
{ "{"
return_statement
return "return"
identifier "frame_progress"
; ";"
} "}"
function_definition (+194 nodes collapsed)
function_definition (+22 nodes collapsed)
function_definition
primitive_type "float"
function_declarator
qualified_identifier
namespace_identifier "AnimatedSprite2D"
:: "::"
identifier "get_speed_scale"
parameter_list
( "("
) ")"
type_qualifier
const "const"
compound_statement
{ "{"
return_statement
return "return"
identifier "speed_scale"
; ";"
} "}"
function_definition (+37 nodes collapsed)
function_definition (+51 nodes collapsed)
function_definition
primitive_type "bool"
function_declarator
qualified_identifier
namespace_identifier "AnimatedSprite2D"
:: "::"
identifier "is_centered"
parameter_list
( "("
) ")"
type_qualifier
const "const"
compound_statement
{ "{"
return_statement
return "return"
identifier "centered"
; ";"
} "}"
function_definition (+55 nodes collapsed)
function_definition
type_identifier "Point2"
function_declarator
qualified_identifier
namespace_identifier "AnimatedSprite2D"
:: "::"
identifier "get_offset"
parameter_list
( "("
) ")"
type_qualifier
const "const"
compound_statement
{ "{"
return_statement
return "return"
identifier "offset"
; ";"
} "}"
function_definition (+44 nodes collapsed)
function_definition
primitive_type "bool"
function_declarator
qualified_identifier
namespace_identifier "AnimatedSprite2D"
:: "::"
identifier "is_flipped_h"
parameter_list
( "("
) ")"
type_qualifier
const "const"
compound_statement
{ "{"
return_statement
return "return"
identifier "hflip"
; ";"
} "}"
function_definition (+44 nodes collapsed)
function_definition
primitive_type "bool"
function_declarator
qualified_identifier
namespace_identifier "AnimatedSprite2D"
:: "::"
identifier "is_flipped_v"
parameter_list
( "("
) ")"
type_qualifier
const "const"
compound_statement
{ "{"
return_statement
return "return"
identifier "vflip"
; ";"
} "}"
function_definition (+37 nodes collapsed)
function_definition
primitive_type "bool"
function_declarator
qualified_identifier
namespace_identifier "AnimatedSprite2D"
:: "::"
identifier "is_playing"
parameter_list
( "("
) ")"
type_qualifier
const "const"
compound_statement
{ "{"
return_statement
return "return"
identifier "playing"
; ";"
} "}"
function_definition (+69 nodes collapsed)
function_definition
type_identifier "String"
function_declarator
qualified_identifier
namespace_identifier "AnimatedSprite2D"
:: "::"
identifier "get_autoplay"
parameter_list
( "("
) ")"
type_qualifier
const "const"
compound_statement
{ "{"
return_statement
return "return"
identifier "autoplay"
; ";"
} "}"
function_definition (+390 nodes collapsed)
function_definition (+32 nodes collapsed)
function_definition (+62 nodes collapsed)
function_definition (+21 nodes collapsed)
function_definition (+21 nodes collapsed)
function_definition (+58 nodes collapsed)
function_definition (+26 nodes collapsed)
function_definition (+279 nodes collapsed)
function_definition
type_identifier "StringName"
function_declarator
qualified_identifier
namespace_identifier "AnimatedSprite2D"
:: "::"
identifier "get_animation"
parameter_list
( "("
) ")"
type_qualifier
const "const"
compound_statement
{ "{"
return_statement
return "return"
identifier "animation"
; ";"
} "}"
function_definition (+72 nodes collapsed)
preproc_ifdef (+191 nodes collapsed)
comment "// TOOLS_ENABLED"
preproc_ifdef (+71 nodes collapsed)
function_definition (+1276 nodes collapsed)
function_definition
function_declarator
qualified_identifier
namespace_identifier "AnimatedSprite2D"
:: "::"
identifier "AnimatedSprite2D"
parameter_list
( "("
) ")"
compound_statement
{ "{"
} "}"