Fixed path splitting making duplicates
This commit is contained in:
parent
2c4a451195
commit
d901597391
5 changed files with 15 additions and 54 deletions
|
|
@ -68,48 +68,23 @@ bool clipper2_polygon_to_skpath_builder(SkPathBuilder& skPathBuilder, const Clip
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void sort_clipper_polytreed_into_skpaths(std::vector<SkPath>& paths, const Clipper2Lib::PolyTreeD& tree) {
|
void sort_clipper_polytreed_into_skpaths_CHILD(std::vector<SkPath> &paths, const Clipper2Lib::PolyTreeD &tree) {
|
||||||
using namespace Clipper2Lib;
|
using namespace Clipper2Lib;
|
||||||
for(auto& treeChild : tree) {
|
|
||||||
SkPathBuilder newPath;
|
SkPathBuilder newPath;
|
||||||
if(!clipper2_polygon_to_skpath_builder(newPath, treeChild->Polygon()))
|
if(!clipper2_polygon_to_skpath_builder(newPath, tree.Polygon()))
|
||||||
continue;
|
return;
|
||||||
for(auto& child : *treeChild) {
|
for(auto& treeChild : tree) {
|
||||||
if(child->IsHole()) {
|
clipper2_polygon_to_skpath_builder(newPath, treeChild->Polygon());
|
||||||
clipper2_polygon_to_skpath_builder(newPath, child->Polygon());
|
for(auto& childChild : *treeChild)
|
||||||
for(auto& childChild : *child) {
|
sort_clipper_polytreed_into_skpaths_CHILD(paths, *childChild);
|
||||||
if(childChild->IsHole())
|
|
||||||
continue;
|
|
||||||
else
|
|
||||||
sort_clipper_polytreed_into_skpaths(paths, *child);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
sort_clipper_polytreed_into_skpaths(paths, *child);
|
|
||||||
}
|
}
|
||||||
paths.emplace_back(newPath.detach());
|
paths.emplace_back(newPath.detach());
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
void sort_clipper_polytreed_into_skpath_builder(SkPathBuilder& skPathBuilder, const Clipper2Lib::PolyTreeD& tree) {
|
void sort_clipper_polytreed_into_skpaths(std::vector<SkPath>& paths, const Clipper2Lib::PolyTreeD& tree) {
|
||||||
using namespace Clipper2Lib;
|
using namespace Clipper2Lib;
|
||||||
for(auto& treeChild : tree) {
|
for(auto& treeChild : tree)
|
||||||
if(!clipper2_polygon_to_skpath_builder(skPathBuilder, treeChild->Polygon()))
|
sort_clipper_polytreed_into_skpaths_CHILD(paths, *treeChild);
|
||||||
continue;
|
|
||||||
for(auto& child : *treeChild) {
|
|
||||||
if(child->IsHole()) {
|
|
||||||
clipper2_polygon_to_skpath_builder(skPathBuilder, child->Polygon());
|
|
||||||
for(auto& childChild : *child) {
|
|
||||||
if(childChild->IsHole())
|
|
||||||
continue;
|
|
||||||
else
|
|
||||||
sort_clipper_polytreed_into_skpath_builder(skPathBuilder, *child);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
sort_clipper_polytreed_into_skpath_builder(skPathBuilder, *child);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void clipper2_polygons_to_skpath_builder(SkPathBuilder& skPathBuilder, const Clipper2Lib::PathsD& clipperPath) {
|
void clipper2_polygons_to_skpath_builder(SkPathBuilder& skPathBuilder, const Clipper2Lib::PathsD& clipperPath) {
|
||||||
|
|
|
||||||
|
|
@ -151,7 +151,7 @@ void CanvasComponentContainer::commit_transform_dont_invalidate_cache() {
|
||||||
CanvasComponentEraseDetailResult CanvasComponentContainer::collides_with_erase_detail(const CoordSpaceHelper& camCoords, const SkPath& checkAgainstCam) const {
|
CanvasComponentEraseDetailResult CanvasComponentContainer::collides_with_erase_detail(const CoordSpaceHelper& camCoords, const SkPath& checkAgainstCam) const {
|
||||||
if(!worldAABB.has_value())
|
if(!worldAABB.has_value())
|
||||||
return CanvasComponentEraseDetailResult::NO_CHANGE;
|
return CanvasComponentEraseDetailResult::NO_CHANGE;
|
||||||
if((camCoords.inverseScale << COMP_MAX_SHIFT_BEFORE_STOP_COLLISIONS) < coords.inverseScale) // Object is too large, just dismiss the collision
|
if((camCoords.inverseScale << COMP_MAX_SHIFT_BEFORE_STOP_ERASE) < coords.inverseScale) // Object is too large, just dismiss the collision
|
||||||
return CanvasComponentEraseDetailResult::NO_CHANGE;
|
return CanvasComponentEraseDetailResult::NO_CHANGE;
|
||||||
else if(coords.inverseScale < (camCoords.inverseScale >> COMP_COLLIDE_MIN_SHIFT_TINY)) {
|
else if(coords.inverseScale < (camCoords.inverseScale >> COMP_COLLIDE_MIN_SHIFT_TINY)) {
|
||||||
if(checkAgainstCam.contains(convert_vec2<SkPoint>(camCoords.to_space(worldAABB.value().min))))
|
if(checkAgainstCam.contains(convert_vec2<SkPoint>(camCoords.to_space(worldAABB.value().min))))
|
||||||
|
|
@ -212,7 +212,7 @@ void CanvasComponentContainer::canvas_do_transform(SkCanvas* canvas, const Trans
|
||||||
}
|
}
|
||||||
|
|
||||||
bool CanvasComponentContainer::should_draw(const DrawData& drawData) const {
|
bool CanvasComponentContainer::should_draw(const DrawData& drawData) const {
|
||||||
return (!drawData.clampDrawBetween || (drawData.clampDrawMinimum < coords.inverseScale)) && worldAABB.has_value() && SCollision::collide(worldAABB.value(), drawData.cam.viewingAreaGenerousCollider) && get_comp().should_draw_extra(drawData, coords);
|
return (drawData.clampDrawMinimum < coords.inverseScale) && worldAABB.has_value() && SCollision::collide(worldAABB.value(), drawData.cam.viewingAreaGenerousCollider) && get_comp().should_draw_extra(drawData, coords);
|
||||||
}
|
}
|
||||||
|
|
||||||
CanvasComponentContainer::PreDrawData CanvasComponentContainer::calculate_predraw_data(const DrawData& drawData) const {
|
CanvasComponentContainer::PreDrawData CanvasComponentContainer::calculate_predraw_data(const DrawData& drawData) const {
|
||||||
|
|
@ -238,15 +238,6 @@ void CanvasComponentContainer::scale_up(const WorldScalar& scaleUpAmount) {
|
||||||
calculate_world_bounds();
|
calculate_world_bounds();
|
||||||
}
|
}
|
||||||
|
|
||||||
unsigned CanvasComponentContainer::get_mipmap_level(const DrawData& drawData) const {
|
|
||||||
if(drawData.mipMapLevelTwo > coords.inverseScale)
|
|
||||||
return 2;
|
|
||||||
else if(drawData.mipMapLevelOne > coords.inverseScale)
|
|
||||||
return 1;
|
|
||||||
else
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
void CanvasComponentContainer::calculate_world_bounds() {
|
void CanvasComponentContainer::calculate_world_bounds() {
|
||||||
worldAABB = coords.collider_to_world<SCollision::AABB<WorldScalar>, SCollision::AABB<float>>(get_comp().get_obj_coord_bounds());
|
worldAABB = coords.collider_to_world<SCollision::AABB<WorldScalar>, SCollision::AABB<float>>(get_comp().get_obj_coord_bounds());
|
||||||
WorldVec dim = worldAABB.value().dim();
|
WorldVec dim = worldAABB.value().dim();
|
||||||
|
|
|
||||||
|
|
@ -44,6 +44,7 @@ class CanvasComponentContainer {
|
||||||
typedef NetworkingObjects::NetObjOrderedListObjectInfo<CanvasComponentContainer> ObjInfo;
|
typedef NetworkingObjects::NetObjOrderedListObjectInfo<CanvasComponentContainer> ObjInfo;
|
||||||
typedef NetworkingObjects::NetObjOrderedListIterator<CanvasComponentContainer> ObjInfoIterator;
|
typedef NetworkingObjects::NetObjOrderedListIterator<CanvasComponentContainer> ObjInfoIterator;
|
||||||
|
|
||||||
|
constexpr static int COMP_MAX_SHIFT_BEFORE_STOP_ERASE = 7;
|
||||||
constexpr static int COMP_MAX_SHIFT_BEFORE_STOP_COLLISIONS = 14;
|
constexpr static int COMP_MAX_SHIFT_BEFORE_STOP_COLLISIONS = 14;
|
||||||
constexpr static int COMP_MAX_SHIFT_BEFORE_STOP_SCALING = 14;
|
constexpr static int COMP_MAX_SHIFT_BEFORE_STOP_SCALING = 14;
|
||||||
constexpr static float COMP_MAX_BEFORE_STOP_SCALING = 1 << COMP_MAX_SHIFT_BEFORE_STOP_SCALING;
|
constexpr static float COMP_MAX_BEFORE_STOP_SCALING = 1 << COMP_MAX_SHIFT_BEFORE_STOP_SCALING;
|
||||||
|
|
@ -107,10 +108,10 @@ class CanvasComponentContainer {
|
||||||
|
|
||||||
static void write_constructor_func(const NetworkingObjects::NetObjTemporaryPtr<CanvasComponentContainer>& o, cereal::PortableBinaryOutputArchive& a);
|
static void write_constructor_func(const NetworkingObjects::NetObjTemporaryPtr<CanvasComponentContainer>& o, cereal::PortableBinaryOutputArchive& a);
|
||||||
|
|
||||||
unsigned get_mipmap_level(const DrawData& drawData) const;
|
|
||||||
CanvasComponent* allocate_comp(CanvasComponentType type);
|
CanvasComponent* allocate_comp(CanvasComponentType type);
|
||||||
void calculate_world_bounds();
|
void calculate_world_bounds();
|
||||||
|
|
||||||
std::optional<SCollision::AABB<WorldScalar>> worldAABB;
|
std::optional<SCollision::AABB<WorldScalar>> worldAABB;
|
||||||
|
|
||||||
NetworkingObjects::NetObjOwnerPtr<CanvasComponentAllocator> compAllocator;
|
NetworkingObjects::NetObjOwnerPtr<CanvasComponentAllocator> compAllocator;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -20,8 +20,5 @@
|
||||||
#include "CanvasComponents/CanvasComponentContainer.hpp"
|
#include "CanvasComponents/CanvasComponentContainer.hpp"
|
||||||
|
|
||||||
void DrawData::refresh_draw_optimizing_values() {
|
void DrawData::refresh_draw_optimizing_values() {
|
||||||
clampDrawBetween = true;
|
|
||||||
clampDrawMinimum = cam.c.inverseScale >> CanvasComponentContainer::COMP_MIN_SHIFT_BEFORE_DISAPPEAR;
|
clampDrawMinimum = cam.c.inverseScale >> CanvasComponentContainer::COMP_MIN_SHIFT_BEFORE_DISAPPEAR;
|
||||||
mipMapLevelOne = cam.c.inverseScale >> CanvasComponentContainer::COMP_MIPMAP_LEVEL_ONE;
|
|
||||||
mipMapLevelTwo = cam.c.inverseScale >> CanvasComponentContainer::COMP_MIPMAP_LEVEL_TWO;
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -32,12 +32,9 @@ struct DrawData {
|
||||||
MainProgram* main;
|
MainProgram* main;
|
||||||
bool takingScreenshot = false;
|
bool takingScreenshot = false;
|
||||||
bool isSVGRender = false;
|
bool isSVGRender = false;
|
||||||
bool clampDrawBetween = true;
|
|
||||||
bool drawGrids = true;
|
bool drawGrids = true;
|
||||||
bool transparentBackground = false;
|
bool transparentBackground = false;
|
||||||
bool skiaAA = false;
|
bool skiaAA = false;
|
||||||
WorldScalar clampDrawMinimum;
|
WorldScalar clampDrawMinimum;
|
||||||
WorldScalar mipMapLevelOne;
|
|
||||||
WorldScalar mipMapLevelTwo;
|
|
||||||
void refresh_draw_optimizing_values();
|
void refresh_draw_optimizing_values();
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue