Pasted objects scale properly
This commit is contained in:
parent
53f0c97a5c
commit
8b1c423791
4 changed files with 21 additions and 2 deletions
|
|
@ -122,11 +122,11 @@ void DrawCamera::update_main(World& w) {
|
||||||
startZoomCameraPos = c.pos;
|
startZoomCameraPos = c.pos;
|
||||||
}
|
}
|
||||||
isAccurateZooming = newIsAccurateZooming;
|
isAccurateZooming = newIsAccurateZooming;
|
||||||
if(isAccurateZooming) {
|
if(isAccurateZooming && startZoomVal != WorldScalar(0)) {
|
||||||
WorldScalar zoomFactor(std::pow(1.0 + w.main.toolbar.dragZoomSpeed, w.main.toolbar.flipZoomToolDirection ? w.main.input.mouse.move.y() : -w.main.input.mouse.move.y()));
|
WorldScalar zoomFactor(std::pow(1.0 + w.main.toolbar.dragZoomSpeed, w.main.toolbar.flipZoomToolDirection ? w.main.input.mouse.move.y() : -w.main.input.mouse.move.y()));
|
||||||
c.scale(zoomFactor);
|
c.scale(zoomFactor);
|
||||||
WorldVec mVec = startZoomCameraPos - startZoomMousePos;
|
WorldVec mVec = startZoomCameraPos - startZoomMousePos;
|
||||||
WorldScalar mX = c.inverseScale / startZoomVal;
|
WorldScalar mX = static_cast<WorldScalar>(WorldMultiplier(c.inverseScale) / WorldMultiplier(startZoomVal));
|
||||||
c.pos = startZoomMousePos + mVec * mX;
|
c.pos = startZoomMousePos + mVec * mX;
|
||||||
}
|
}
|
||||||
else if(w.drawProg.controls.middleClickHeld || (w.drawProg.controls.leftClickHeld && w.drawProg.drawTool->get_type() == DrawingProgramToolType::PAN))
|
else if(w.drawProg.controls.middleClickHeld || (w.drawProg.controls.leftClickHeld && w.drawProg.drawTool->get_type() == DrawingProgramToolType::PAN))
|
||||||
|
|
|
||||||
|
|
@ -201,6 +201,9 @@ void DrawingProgramCache::build_bvh_node(const std::shared_ptr<DrawingProgramCac
|
||||||
for(auto& c : components)
|
for(auto& c : components)
|
||||||
bvhNode->bounds.include_aabb_in_bounds(c->obj->worldAABB.value());
|
bvhNode->bounds.include_aabb_in_bounds(c->obj->worldAABB.value());
|
||||||
|
|
||||||
|
//std::cout << "component count: " << components.size() << std::endl;
|
||||||
|
//std::cout << "bvhNode->bounds " << vec_pretty(bvhNode->bounds.min) << " " << vec_pretty(bvhNode->bounds.max) << std::endl;
|
||||||
|
|
||||||
build_bvh_node_coords_and_resolution(*bvhNode);
|
build_bvh_node_coords_and_resolution(*bvhNode);
|
||||||
|
|
||||||
if(components.size() < MAXIMUM_COMPONENTS_IN_SINGLE_NODE) {
|
if(components.size() < MAXIMUM_COMPONENTS_IN_SINGLE_NODE) {
|
||||||
|
|
@ -250,6 +253,7 @@ void DrawingProgramCache::build_bvh_node_coords_and_resolution(DrawingProgramCac
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
WorldVec cacheBoundDim = node.bounds.dim();
|
WorldVec cacheBoundDim = node.bounds.dim();
|
||||||
|
//std::cout << "cache bound: " << vec_pretty(cacheBoundDim) << std::endl;
|
||||||
if(cacheBoundDim.x() > cacheBoundDim.y()) {
|
if(cacheBoundDim.x() > cacheBoundDim.y()) {
|
||||||
node.resolution.x() = MAX_DIMENSION_RESOLUTION;
|
node.resolution.x() = MAX_DIMENSION_RESOLUTION;
|
||||||
node.resolution.y() = MAX_DIMENSION_RESOLUTION * static_cast<double>(cacheBoundDim.y() / cacheBoundDim.x());
|
node.resolution.y() = MAX_DIMENSION_RESOLUTION * static_cast<double>(cacheBoundDim.y() / cacheBoundDim.x());
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,7 @@
|
||||||
#include "Helpers/FixedPoint.hpp"
|
#include "Helpers/FixedPoint.hpp"
|
||||||
#include <Helpers/MathExtras.hpp>
|
#include <Helpers/MathExtras.hpp>
|
||||||
#include <Helpers/SCollision.hpp>
|
#include <Helpers/SCollision.hpp>
|
||||||
|
#include <Helpers/Logger.hpp>
|
||||||
#include <Helpers/Parallel.hpp>
|
#include <Helpers/Parallel.hpp>
|
||||||
|
|
||||||
#ifdef USE_SKIA_BACKEND_GRAPHITE
|
#ifdef USE_SKIA_BACKEND_GRAPHITE
|
||||||
|
|
@ -274,6 +275,7 @@ void DrawingProgramSelection::selection_to_clipboard() {
|
||||||
for(auto& c : compVecSort)
|
for(auto& c : compVecSort)
|
||||||
clipboard.components.emplace_back(c->obj);
|
clipboard.components.emplace_back(c->obj);
|
||||||
clipboard.pos = initialSelectionAABB.center();
|
clipboard.pos = initialSelectionAABB.center();
|
||||||
|
clipboard.inverseScale = drawP.world.drawData.cam.c.inverseScale;
|
||||||
drawP.world.rMan.copy_resource_set_to_map(resourceSet, clipboard.resources);
|
drawP.world.rMan.copy_resource_set_to_map(resourceSet, clipboard.resources);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -404,6 +406,14 @@ void DrawingProgramSelection::paste_clipboard() {
|
||||||
std::vector<std::shared_ptr<DrawComponent>> placedComponents;
|
std::vector<std::shared_ptr<DrawComponent>> placedComponents;
|
||||||
WorldVec mousePos = drawP.world.get_mouse_world_pos();
|
WorldVec mousePos = drawP.world.get_mouse_world_pos();
|
||||||
WorldVec moveVec = drawP.world.main.clipboard.pos - mousePos;
|
WorldVec moveVec = drawP.world.main.clipboard.pos - mousePos;
|
||||||
|
WorldMultiplier scaleMultiplier = WorldMultiplier(drawP.world.main.clipboard.inverseScale) / WorldMultiplier(drawP.world.drawData.cam.c.inverseScale);
|
||||||
|
for(auto& c : drawP.world.main.clipboard.components) {
|
||||||
|
if((c->coords.inverseScale / scaleMultiplier) < WorldScalar(0.001)) {
|
||||||
|
Logger::get().log("WORLDFATAL", "Some pasted objects will be too small! Scale up the canvas first (zoom in alot)");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
std::unordered_map<ServerClientID, ServerClientID> resourceRemapIDs;
|
std::unordered_map<ServerClientID, ServerClientID> resourceRemapIDs;
|
||||||
for(auto& r : clipboard.resources)
|
for(auto& r : clipboard.resources)
|
||||||
resourceRemapIDs[r.first] = drawP.world.rMan.add_resource(r.second);
|
resourceRemapIDs[r.first] = drawP.world.rMan.add_resource(r.second);
|
||||||
|
|
@ -414,6 +424,10 @@ void DrawingProgramSelection::paste_clipboard() {
|
||||||
parallel_loop_container(compListInserted, [&](auto& c) {
|
parallel_loop_container(compListInserted, [&](auto& c) {
|
||||||
c->obj->remap_resource_ids(resourceRemapIDs);
|
c->obj->remap_resource_ids(resourceRemapIDs);
|
||||||
c->obj->coords.translate(-moveVec);
|
c->obj->coords.translate(-moveVec);
|
||||||
|
c->obj->coords.scale_about(mousePos, scaleMultiplier);
|
||||||
|
//std::cout << c->obj->coords.inverseScale << std::endl;
|
||||||
|
//if(c->obj->coords.inverseScale == WorldScalar(0))
|
||||||
|
// throw std::runtime_error("DONE");
|
||||||
c->obj->commit_transform(drawP, false);
|
c->obj->commit_transform(drawP, false);
|
||||||
});
|
});
|
||||||
DrawComponent::client_send_place_many(drawP, compListInserted);
|
DrawComponent::client_send_place_many(drawP, compListInserted);
|
||||||
|
|
|
||||||
|
|
@ -60,6 +60,7 @@ class MainProgram {
|
||||||
std::vector<std::shared_ptr<DrawComponent>> components;
|
std::vector<std::shared_ptr<DrawComponent>> components;
|
||||||
std::unordered_map<ServerClientID, ResourceData> resources;
|
std::unordered_map<ServerClientID, ResourceData> resources;
|
||||||
WorldVec pos;
|
WorldVec pos;
|
||||||
|
WorldScalar inverseScale;
|
||||||
} clipboard;
|
} clipboard;
|
||||||
|
|
||||||
FontData fonts;
|
FontData fonts;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue