BlackMATov/enduro2d
1
0
Fork 0
mirror of https://github.com/enduro2d/enduro2d.git synced 2025-12-16 14:08:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

remove sprite pivot

Browse Source
This commit is contained in:
BlackMATov
2020-04-24 21:47:11 +07:00
parent f136051589
commit cd971c269d
6 changed files with 10 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
headers/enduro2d/high/resources/sprite.hpp
View File

@@ -29,17 +29,14 @@ namespace e2d
sprite& assign(sprite&& other) noexcept; sprite& assign(sprite&& other) noexcept;
sprite& assign(const sprite& other); sprite& assign(const sprite& other);
sprite& set_pivot(const v2f& pivot) noexcept;
sprite& set_inner_texrect(const b2f& texrect) noexcept; sprite& set_inner_texrect(const b2f& texrect) noexcept;
sprite& set_outer_texrect(const b2f& texrect) noexcept; sprite& set_outer_texrect(const b2f& texrect) noexcept;
sprite& set_texture(const texture_asset::ptr& texture) noexcept; sprite& set_texture(const texture_asset::ptr& texture) noexcept;
const v2f& pivot() const noexcept;
const b2f& inner_texrect() const noexcept; const b2f& inner_texrect() const noexcept;
const b2f& outer_texrect() const noexcept; const b2f& outer_texrect() const noexcept;
const texture_asset::ptr& texture() const noexcept; const texture_asset::ptr& texture() const noexcept;
private: private:
v2f pivot_;
b2f inner_texrect_; b2f inner_texrect_;
b2f outer_texrect_; b2f outer_texrect_;
texture_asset::ptr texture_; texture_asset::ptr texture_;

14
sources/enduro2d/high/assets/atlas_asset.cpp
View File

@@ -36,20 +36,18 @@ namespace
"sprite" : { "sprite" : {
"anyOf" : [{ "anyOf" : [{
"type" : "object", "type" : "object",
"required" : [ "name", "pivot", "texrect" ], "required" : [ "name", "texrect" ],
"additionalProperties" : false, "additionalProperties" : false,
"properties" : { "properties" : {
"name" : { "$ref": "#/common_definitions/name" }, "name" : { "$ref": "#/common_definitions/name" },
"pivot" : { "$ref": "#/common_definitions/v2" },
"texrect" : { "$ref": "#/common_definitions/b2" } "texrect" : { "$ref": "#/common_definitions/b2" }
} }
},{ },{
"type" : "object", "type" : "object",
"required" : [ "name", "pivot", "inner_texrect", "outer_texrect" ], "required" : [ "name", "inner_texrect", "outer_texrect" ],
"additionalProperties" : false, "additionalProperties" : false,
"properties" : { "properties" : {
"name" : { "$ref": "#/common_definitions/name" }, "name" : { "$ref": "#/common_definitions/name" },
"pivot" : { "$ref": "#/common_definitions/v2" },
"inner_texrect" : { "$ref": "#/common_definitions/b2" }, "inner_texrect" : { "$ref": "#/common_definitions/b2" },
"outer_texrect" : { "$ref": "#/common_definitions/b2" } "outer_texrect" : { "$ref": "#/common_definitions/b2" }
} }
@@ -78,7 +76,6 @@ namespace
struct sprite_desc { struct sprite_desc {
str_hash name; str_hash name;
v2f pivot;
b2f inner_texrect; b2f inner_texrect;
b2f outer_texrect; b2f outer_texrect;
}; };
@@ -100,12 +97,6 @@ namespace
return false; return false;
} }
E2D_ASSERT(sprite_json.HasMember("pivot"));
if ( !json_utils::try_parse_value(sprite_json["pivot"], tsprite_descs[i].pivot) ) {
the<debug>().error("ATLAS: Incorrect formatting of 'pivot' property");
return false;
}
E2D_ASSERT( E2D_ASSERT(
sprite_json.HasMember("texrect") || sprite_json.HasMember("texrect") ||
(sprite_json.HasMember("inner_texrect") && sprite_json.HasMember("outer_texrect"))); (sprite_json.HasMember("inner_texrect") && sprite_json.HasMember("outer_texrect")));
@@ -163,7 +154,6 @@ namespace
nested_content ncontent; nested_content ncontent;
for ( const sprite_desc& desc : sprite_descs ) { for ( const sprite_desc& desc : sprite_descs ) {
sprite spr; sprite spr;
spr.set_pivot(desc.pivot);
spr.set_inner_texrect(desc.inner_texrect); spr.set_inner_texrect(desc.inner_texrect);
spr.set_outer_texrect(desc.outer_texrect); spr.set_outer_texrect(desc.outer_texrect);
spr.set_texture(texture); spr.set_texture(texture);

15
sources/enduro2d/high/assets/sprite_asset.cpp
View File

@@ -23,20 +23,18 @@ namespace
const char* sprite_asset_schema_source = R"json({ const char* sprite_asset_schema_source = R"json({
"anyOf" : [{ "anyOf" : [{
"type" : "object", "type" : "object",
"required" : [ "texture", "pivot", "texrect" ], "required" : [ "texture", "texrect" ],
"additionalProperties" : false, "additionalProperties" : false,
"properties" : { "properties" : {
"texture" : { "$ref": "#/common_definitions/address" }, "texture" : { "$ref": "#/common_definitions/address" },
"pivot" : { "$ref": "#/common_definitions/v2" },
"texrect" : { "$ref": "#/common_definitions/b2" } "texrect" : { "$ref": "#/common_definitions/b2" }
} }
},{ },{
"type" : "object", "type" : "object",
"required" : [ "texture", "pivot", "inner_texrect", "outer_texrect" ], "required" : [ "texture", "inner_texrect", "outer_texrect" ],
"additionalProperties" : false, "additionalProperties" : false,
"properties" : { "properties" : {
"texture" : { "$ref": "#/common_definitions/address" }, "texture" : { "$ref": "#/common_definitions/address" },
"pivot" : { "$ref": "#/common_definitions/v2" },
"inner_texrect" : { "$ref": "#/common_definitions/b2" }, "inner_texrect" : { "$ref": "#/common_definitions/b2" },
"outer_texrect" : { "$ref": "#/common_definitions/b2" } "outer_texrect" : { "$ref": "#/common_definitions/b2" }
} }
@@ -70,16 +68,9 @@ namespace
auto texture_p = library.load_asset_async<texture_asset>( auto texture_p = library.load_asset_async<texture_asset>(
path::combine(parent_address, root["texture"].GetString())); path::combine(parent_address, root["texture"].GetString()));
v2f pivot;
b2f inner_texrect; b2f inner_texrect;
b2f outer_texrect; b2f outer_texrect;
E2D_ASSERT(root.HasMember("pivot"));
if ( !json_utils::try_parse_value(root["pivot"], pivot) ) {
the<debug>().error("SPRITE: Incorrect formatting of 'pivot' property");
return stdex::make_rejected_promise<sprite>(sprite_asset_loading_exception());
}
E2D_ASSERT( E2D_ASSERT(
root.HasMember("texrect") || root.HasMember("texrect") ||
(root.HasMember("inner_texrect") && root.HasMember("outer_texrect"))); (root.HasMember("inner_texrect") && root.HasMember("outer_texrect")));
@@ -105,12 +96,10 @@ namespace
} }
return texture_p.then([ return texture_p.then([
pivot,
inner_texrect, inner_texrect,
outer_texrect outer_texrect
](const texture_asset::load_result& texture){ ](const texture_asset::load_result& texture){
sprite content; sprite content;
content.set_pivot(pivot);
content.set_inner_texrect(inner_texrect); content.set_inner_texrect(inner_texrect);
content.set_outer_texrect(outer_texrect); content.set_outer_texrect(outer_texrect);
content.set_texture(texture); content.set_texture(texture);

3
sources/enduro2d/high/components/sprite_renderer.cpp
View File

@@ -245,10 +245,9 @@ namespace e2d
const b2f& outer_r = spr.outer_texrect(); const b2f& outer_r = spr.outer_texrect();
const v2f size = outer_r.size * c->scale(); const v2f size = outer_r.size * c->scale();
const v2f poff = (outer_r.position - spr.pivot()) * c->scale();
ctx.draw_wire_rect( ctx.draw_wire_rect(
poff + size * 0.5f, size * 0.5f,
size, size,
ctx.selected() ? color32::yellow() : color32::magenta()); ctx.selected() ? color32::yellow() : color32::magenta());
} }

15
sources/enduro2d/high/resources/sprite.cpp
View File

@@ -25,7 +25,6 @@ namespace e2d
} }
void sprite::clear() noexcept { void sprite::clear() noexcept {
pivot_ = v2f::zero();
inner_texrect_ = b2f::zero(); inner_texrect_ = b2f::zero();
outer_texrect_ = b2f::zero(); outer_texrect_ = b2f::zero();
texture_.reset(); texture_.reset();
@@ -33,7 +32,6 @@ namespace e2d
void sprite::swap(sprite& other) noexcept { void sprite::swap(sprite& other) noexcept {
using std::swap; using std::swap;
swap(pivot_, other.pivot_);
swap(inner_texrect_, other.inner_texrect_); swap(inner_texrect_, other.inner_texrect_);
swap(outer_texrect_, other.outer_texrect_); swap(outer_texrect_, other.outer_texrect_);
swap(texture_, other.texture_); swap(texture_, other.texture_);
@@ -50,7 +48,6 @@ namespace e2d
sprite& sprite::assign(const sprite& other) { sprite& sprite::assign(const sprite& other) {
if ( this != &other ) { if ( this != &other ) {
sprite s; sprite s;
s.pivot_ = other.pivot_;
s.inner_texrect_ = other.inner_texrect_; s.inner_texrect_ = other.inner_texrect_;
s.outer_texrect_ = other.outer_texrect_; s.outer_texrect_ = other.outer_texrect_;
s.texture_ = other.texture_; s.texture_ = other.texture_;
@@ -59,11 +56,6 @@ namespace e2d
return *this; return *this;
} }
sprite& sprite::set_pivot(const v2f& pivot) noexcept {
pivot_ = pivot;
return *this;
}
sprite& sprite::set_inner_texrect(const b2f& texrect) noexcept { sprite& sprite::set_inner_texrect(const b2f& texrect) noexcept {
inner_texrect_ = texrect; inner_texrect_ = texrect;
return *this; return *this;
@@ -79,10 +71,6 @@ namespace e2d
return *this; return *this;
} }
const v2f& sprite::pivot() const noexcept {
return pivot_;
}
const b2f& sprite::inner_texrect() const noexcept { const b2f& sprite::inner_texrect() const noexcept {
return inner_texrect_; return inner_texrect_;
} }
@@ -103,8 +91,7 @@ namespace e2d
} }
bool operator==(const sprite& l, const sprite& r) noexcept { bool operator==(const sprite& l, const sprite& r) noexcept {
return l.pivot() == r.pivot() return l.inner_texrect() == r.inner_texrect()
&& l.inner_texrect() == r.inner_texrect()
&& l.outer_texrect() == r.outer_texrect() && l.outer_texrect() == r.outer_texrect()
&& l.texture() == r.texture(); && l.texture() == r.texture();
} }

10
sources/enduro2d/high/systems/render_system_impl/render_system_drawer.cpp
View File

@@ -496,13 +496,12 @@ namespace e2d::render_system_impl
const b2f& outer_r = spr.outer_texrect(); const b2f& outer_r = spr.outer_texrect();
const v2f size = outer_r.size * spr_r.scale(); const v2f size = outer_r.size * spr_r.scale();
const v2f poff = (outer_r.position - spr.pivot()) * spr_r.scale();
const v2f pos_xs = v2f{ const v2f pos_xs = v2f{
0.f, size.x} + poff.x; 0.f, size.x};
const v2f pos_ys = v2f{ const v2f pos_ys = v2f{
0.f, size.y} + poff.y; 0.f, size.y};
const v2f tex_xs = v2f{ const v2f tex_xs = v2f{
outer_r.position.x, outer_r.position.x,
@@ -550,7 +549,6 @@ namespace e2d::render_system_impl
const f32 top = (outer_r.size.y - inner_r.size.y) - bottom; const f32 top = (outer_r.size.y - inner_r.size.y) - bottom;
const v2f size = outer_r.size * spr_r.scale(); const v2f size = outer_r.size * spr_r.scale();
const v2f poff = (outer_r.position - spr.pivot()) * spr_r.scale();
const f32 sides_width = left + right; const f32 sides_width = left + right;
const f32 sides_height = bottom + top; const f32 sides_height = bottom + top;
@@ -569,13 +567,13 @@ namespace e2d::render_system_impl
0.f, 0.f,
adj_left, adj_left,
size.x - adj_right, size.x - adj_right,
size.x} + poff.x; size.x};
const v4f pos_ys = v4f{ const v4f pos_ys = v4f{
0.f, 0.f,
adj_bottom, adj_bottom,
size.y - adj_top, size.y - adj_top,
size.y} + poff.y; size.y};
const v4f tex_xs = v4f{ const v4f tex_xs = v4f{
outer_r.position.x, outer_r.position.x,