fife-parpg: engine/core/view/camera.cpp annotate

annotate engine/core/view/camera.cpp @ 482:16c2b3ee59ce

* Merged the view performance branch back into trunk. fixes[ticket:419]

author	helios2000@33b003aa-7bff-0310-803a-e67f0ece8222
date	Thu, 29 Apr 2010 13:51:45 +0000
parents	4f2752d45458
children	f45e3e2995e0

rev	line source
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	1 /***************************************************************************
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	2 * Copyright (C) 2005-2008 by the FIFE team *
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	3 * http://www.fifengine.de *
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	4 * This file is part of FIFE. *
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	5 * *
46 90005975cdbb * Final LGPL switch step by adjusting the file headers mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 34 diff changeset	6 * FIFE is free software; you can redistribute it and/or *
90005975cdbb * Final LGPL switch step by adjusting the file headers mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 34 diff changeset	7 * modify it under the terms of the GNU Lesser General Public *
90005975cdbb * Final LGPL switch step by adjusting the file headers mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 34 diff changeset	8 * License as published by the Free Software Foundation; either *
90005975cdbb * Final LGPL switch step by adjusting the file headers mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 34 diff changeset	9 * version 2.1 of the License, or (at your option) any later version. *
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	10 * *
46 90005975cdbb * Final LGPL switch step by adjusting the file headers mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 34 diff changeset	11 * This library is distributed in the hope that it will be useful, *
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	12 * but WITHOUT ANY WARRANTY; without even the implied warranty of *
46 90005975cdbb * Final LGPL switch step by adjusting the file headers mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 34 diff changeset	13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
90005975cdbb * Final LGPL switch step by adjusting the file headers mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 34 diff changeset	14 * Lesser General Public License for more details. *
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	15 * *
46 90005975cdbb * Final LGPL switch step by adjusting the file headers mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 34 diff changeset	16 * You should have received a copy of the GNU Lesser General Public *
90005975cdbb * Final LGPL switch step by adjusting the file headers mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 34 diff changeset	17 * License along with this library; if not, write to the *
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	18 * Free Software Foundation, Inc., *
46 90005975cdbb * Final LGPL switch step by adjusting the file headers mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 34 diff changeset	19 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	20 ***************************************************************************/
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	21
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	22 // Standard C++ library includes
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	23
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	24 // 3rd party library includes
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	25 #include <SDL.h>
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	26
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	27 // FIFE includes
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	28 // These includes are split up in two parts, separated by one empty line
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	29 // First block: files included from the FIFE root src directory
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	30 // Second block: files included from the same folder
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	31
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	32 #include "model/metamodel/grids/cellgrid.h"
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	33 #include "model/metamodel/action.h"
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	34 #include "model/metamodel/timeprovider.h"
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	35 #include "model/structures/map.h"
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	36 #include "model/structures/layer.h"
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	37 #include "model/structures/instancetree.h"
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	38 #include "model/structures/instance.h"
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	39 #include "model/structures/location.h"
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	40 #include "util/log/logger.h"
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	41 #include "util/math/fife_math.h"
407 f27880d4c08c Moved getAngleBetween() form Camera to angles.h and updated it to not use the camera angle in it's calculation. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 405 diff changeset	42 #include "util/math/angles.h"
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	43 #include "util/time/timemanager.h"
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	44 #include "video/renderbackend.h"
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	45 #include "video/image.h"
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	46 #include "video/imagepool.h"
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	47 #include "video/animation.h"
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	48 #include "video/animationpool.h"
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	49
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	50 #include "camera.h"
482 16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	51 #include "layercache.h"
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	52 #include "visual.h"
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	53
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	54
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	55 namespace FIFE {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	56 static Logger _log(LM_CAMERA);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	57
482 16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	58 class MapObserver : public MapChangeListener {
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	59 Camera* m_camera;
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	60
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	61 public:
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	62 MapObserver(Camera* camera) {
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	63 m_camera = camera;
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	64 }
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	65 virtual ~MapObserver() {}
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	66
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	67 virtual void onMapChanged(Map* map, std::vector<Layer*>& changedLayers) {
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	68 }
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	69
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	70 virtual void onLayerCreate(Map* map, Layer* layer) {
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	71 m_camera->addLayer(layer);
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	72 }
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	73
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	74 virtual void onLayerDelete(Map* map, Layer* layer) {
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	75 m_camera->removeLayer(layer);
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	76 }
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	77 };
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	78
405 cfe2f6db4964 Reverting my last change to camera.cpp. It caused unexpected results with rotated tiles. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 399 diff changeset	79 Camera::Camera(const std::string& id,
cfe2f6db4964 Reverting my last change to camera.cpp. It caused unexpected results with rotated tiles. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 399 diff changeset	80 Layer *layer,
422 9d94f4676d17 Moved the management of cameras into the Map class. The View class no longer exists since it now serves no purpose. The engine class itself holds the renderers and these get passed to each map that is loaded and then passed to each camera on each map. This change makes it possible for multiple maps to be loaded at the same time with the same camera id without a name clash. fixes[t:342] vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 408 diff changeset	81 const Rect& viewport,
9d94f4676d17 Moved the management of cameras into the Map class. The View class no longer exists since it now serves no purpose. The engine class itself holds the renderers and these get passed to each map that is loaded and then passed to each camera on each map. This change makes it possible for multiple maps to be loaded at the same time with the same camera id without a name clash. fixes[t:342] vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 408 diff changeset	82 const ExactModelCoordinate& emc,
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	83 RenderBackend* renderbackend,
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	84 ImagePool* ipool,
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	85 AnimationPool* apool):
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	86 m_id(id),
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	87 m_matrix(),
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	88 m_inverse_matrix(),
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	89 m_tilt(0),
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	90 m_rotation(0),
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	91 m_zoom(1),
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	92 m_location(),
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	93 m_prev_origo(ScreenPoint(0,0,0)),
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	94 m_cur_origo(ScreenPoint(0,0,0)),
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	95 m_viewport(),
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	96 m_screen_cell_width(1),
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	97 m_screen_cell_height(1),
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	98 m_reference_scale(1),
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	99 m_enabled(true),
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	100 m_attachedto(NULL),
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	101 m_image_dimensions(),
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	102 m_iswarped(false),
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	103 m_renderers(),
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	104 m_pipeline(),
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	105 m_updated(false),
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	106 m_renderbackend(renderbackend),
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	107 m_ipool(ipool),
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	108 m_apool(apool),
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	109 m_layer_to_instances() {
482 16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	110
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	111 m_viewport = viewport;
482 16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	112 m_map_observer = new MapObserver(this);
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	113 m_map = 0;
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	114 Location location;
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	115 location.setLayer(layer);
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	116 location.setExactLayerCoordinates(emc);
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	117 setLocation(location);
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	118 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	119
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	120 Camera::~Camera() {
482 16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	121 // Trigger removal of LayerCaches and MapObserver
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	122 updateMap(NULL);
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	123
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	124 std::map<std::string, RendererBase*>::iterator r_it = m_renderers.begin();
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	125 for(; r_it != m_renderers.end(); ++r_it) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	126 delete r_it->second;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	127 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	128 m_renderers.clear();
482 16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	129 delete m_map_observer;
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	130 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	131
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	132 void Camera::setTilt(double tilt) {
482 16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	133 if(m_tilt != tilt) {
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	134 m_tilt = tilt;
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	135 updateReferenceScale();
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	136 updateMatrices();
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	137 m_iswarped = true;
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	138 }
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	139 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	140
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	141 double Camera::getTilt() const {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	142 return m_tilt;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	143 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	144
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	145 void Camera::setRotation(double rotation) {
482 16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	146 if(m_rotation != rotation) {
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	147 m_rotation = rotation;
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	148 updateReferenceScale();
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	149 updateMatrices();
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	150 m_iswarped = true;
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	151 }
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	152 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	153
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	154 double Camera::getRotation() const {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	155 return m_rotation;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	156 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	157
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	158 void Camera::setZoom(double zoom) {
482 16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	159 if(m_zoom!=zoom) {
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	160 m_zoom = zoom;
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	161 if (m_zoom < 0.001) {
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	162 m_zoom = 0.001;
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	163 }
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	164 updateMatrices();
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	165 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	166 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	167
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	168 double Camera::getZoom() const {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	169 return m_zoom;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	170 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	171
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	172 void Camera::setCellImageDimensions(unsigned int width, unsigned int height) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	173 m_screen_cell_width = width;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	174 m_screen_cell_height = height;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	175 updateReferenceScale();
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	176 updateMatrices();
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	177 m_iswarped = true;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	178 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	179
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	180 void Camera::setLocation(const Location& location) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	181 // initialize first set properly
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	182 if ((m_prev_origo == m_cur_origo) && (m_prev_origo == ScreenPoint(0,0,0))) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	183 m_cur_origo = toScreenCoordinates(ExactModelCoordinate(0,0,0));
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	184 m_prev_origo = m_cur_origo;
245 ed1565a5a2a0 Fixed second camera in rio. phoku@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 240 diff changeset	185 }
405 cfe2f6db4964 Reverting my last change to camera.cpp. It caused unexpected results with rotated tiles. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 399 diff changeset	186
482 16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	187 CellGrid* cell_grid = NULL;
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	188 if (location.getLayer()) {
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	189 cell_grid = location.getLayer()->getCellGrid();
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	190 } else {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	191 throw Exception("Location without layer given to Camera::setLocation");
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	192 }
482 16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	193 if (!cell_grid) {
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	194 throw Exception("Camera layer has no cellgrid specified");
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	195 }
405 cfe2f6db4964 Reverting my last change to camera.cpp. It caused unexpected results with rotated tiles. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 399 diff changeset	196
482 16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	197 m_location = location;
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	198 updateMatrices();
405 cfe2f6db4964 Reverting my last change to camera.cpp. It caused unexpected results with rotated tiles. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 399 diff changeset	199
482 16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	200 // WARNING
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	201 // It is important that m_location is already set,
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	202 // as the updates which are triggered here
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	203 // need to calculate screen-coordinates
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	204 // which depend on m_location.
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	205 updateMap(location.getMap());
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	206
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	207 m_cur_origo = toScreenCoordinates(ExactModelCoordinate(0,0,0));
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	208 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	209
482 16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	210 void Camera::updateMap(Map* map)
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	211 {
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	212 if(m_map == map)
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	213 {
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	214 return;
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	215 }
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	216 if(m_map) {
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	217 m_map->removeChangeListener(m_map_observer);
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	218 const std::list<Layer*>& layers = m_map->getLayers();
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	219 for(std::list<Layer*>::const_iterator i = layers.begin(); i !=layers.end(); ++i) {
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	220 removeLayer(*i);
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	221 }
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	222 }
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	223 if(map) {
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	224 map->addChangeListener(m_map_observer);
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	225 const std::list<Layer*>& layers = map->getLayers();
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	226 for(std::list<Layer*>::const_iterator i = layers.begin(); i !=layers.end(); ++i)
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	227 addLayer(*i);
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	228 }
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	229 m_map = map;
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	230 }
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	231
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	232 Point Camera::getCellImageDimensions() {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	233 return getCellImageDimensions(m_location.getLayer());
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	234 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	235
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	236 Point Camera::getCellImageDimensions(Layer* layer) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	237 if (layer == m_location.getLayer()) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	238 return Point( m_screen_cell_width, m_screen_cell_height );
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	239 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	240 std::map<Layer*, Point>::iterator it = m_image_dimensions.find(layer);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	241 if (it != m_image_dimensions.end()) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	242 return it->second;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	243 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	244 Point p;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	245 CellGrid* cg = layer->getCellGrid();
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	246 assert(cg);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	247 DoublePoint dimensions = getLogicalCellDimensions(layer);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	248 p.x = static_cast<int>(round(m_reference_scale * dimensions.x));
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	249 p.y = static_cast<int>(round(m_reference_scale * dimensions.y));
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	250 m_image_dimensions[layer] = p;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	251 return p;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	252 }
405 cfe2f6db4964 Reverting my last change to camera.cpp. It caused unexpected results with rotated tiles. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 399 diff changeset	253
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	254 Location Camera::getLocation() const {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	255 return m_location;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	256 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	257
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	258 Location& Camera::getLocationRef() {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	259 return m_location;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	260 }
405 cfe2f6db4964 Reverting my last change to camera.cpp. It caused unexpected results with rotated tiles. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 399 diff changeset	261
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	262 void Camera::setViewPort(const Rect& viewport) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	263 m_viewport = viewport;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	264 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	265
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	266 const Rect& Camera::getViewPort() const {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	267 return m_viewport;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	268 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	269
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	270 void Camera::setEnabled(bool enabled) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	271 m_enabled = enabled;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	272 }
405 cfe2f6db4964 Reverting my last change to camera.cpp. It caused unexpected results with rotated tiles. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 399 diff changeset	273
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	274 bool Camera::isEnabled() {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	275 return m_enabled;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	276 }
482 16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	277
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	278 Point3D Camera::getOrigin() const {
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	279 return m_cur_origo;
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	280 }
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	281
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	282 void Camera::updateMatrices() {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	283 double scale = m_reference_scale;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	284 m_matrix.loadScale(scale, scale, scale);
482 16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	285 m_vs_matrix.loadScale(scale,scale,scale);
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	286 if (m_location.getLayer()) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	287 CellGrid* cg = m_location.getLayer()->getCellGrid();
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	288 if (cg) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	289 ExactModelCoordinate pt = m_location.getMapCoordinates();
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	290 m_matrix.applyTranslate( -pt.x m_reference_scale,-pt.y m_reference_scale, 0);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	291 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	292 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	293 scale = m_zoom;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	294 m_matrix.applyScale(scale, scale, scale);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	295 m_matrix.applyRotate(-m_rotation, 0.0, 0.0, 1.0);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	296 m_matrix.applyRotate(-m_tilt, 1.0, 0.0, 0.0);
482 16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	297 m_matrix.applyTranslate(+m_viewport.w/2, +m_viewport.h/2, 0);
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	298 m_inverse_matrix = m_matrix.inverse();
482 16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	299
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	300
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	301 m_vs_matrix.applyTranslate(0,0,0);
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	302 m_vs_matrix.applyRotate(-m_rotation, 0.0, 0.0, 1.0);
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	303 m_vs_matrix.applyRotate(-m_tilt, 1.0, 0.0, 0.0);
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	304 m_vs_inverse_matrix = m_vs_matrix.inverse();
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	305
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	306 // calculate the screen<->virtual screen transformation
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	307 // this explicitly ignores the z-value.
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	308 m_vscreen_2_screen = m_matrix;
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	309 // NOTE: mult4by4 is an in-place modification.
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	310 m_vscreen_2_screen.mult4by4(m_vs_inverse_matrix);
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	311 // set the z transformation to unity
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	312 const int N=4;
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	313 for(int i=0; i!=N; ++i) {
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	314 m_vscreen_2_screen[2*N + i] = 0;
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	315 m_vscreen_2_screen[i*N + 2] = 0;
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	316 }
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	317 m_vscreen_2_screen[2*N + 2] = 1;
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	318 m_screen_2_vscreen = m_vscreen_2_screen.inverse();
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	319
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	320 // FL_WARN(_log, LMsg("matrix: ") << m_matrix << " 1: " << m_matrix.inverse().mult4by4(m_matrix));
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	321 // FL_WARN(_log, LMsg("vs2s matrix: ") << m_vscreen_2_screen << " s2vs matrix: " << m_screen_2_vscreen);
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	322 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	323
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	324 void Camera::calculateZValue(ScreenPoint& screen_coords) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	325 int dy = -(screen_coords.y - toScreenCoordinates(m_location.getMapCoordinates()).y);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	326 screen_coords.z = static_cast<int>(tan(m_tilt * (M_PI / 180.0)) * static_cast<double>(dy));
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	327 }
405 cfe2f6db4964 Reverting my last change to camera.cpp. It caused unexpected results with rotated tiles. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 399 diff changeset	328
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	329 ExactModelCoordinate Camera::toMapCoordinates(ScreenPoint screen_coords, bool z_calculated) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	330 if (!z_calculated) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	331 calculateZValue(screen_coords);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	332 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	333 return m_inverse_matrix * intPt2doublePt(screen_coords);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	334 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	335
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	336 ScreenPoint Camera::toScreenCoordinates(ExactModelCoordinate elevation_coords) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	337 ExactModelCoordinate p = elevation_coords;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	338 ScreenPoint pt = doublePt2intPt( m_matrix* p );
482 16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	339 return pt;
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	340 }
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	341
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	342 DoublePoint3D Camera::toVirtualScreenCoordinates(ExactModelCoordinate elevation_coords) {
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	343 ExactModelCoordinate p = elevation_coords;
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	344 DoublePoint3D pt = (m_vs_matrix * p);
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	345 return pt;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	346 }
482 16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	347
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	348 ScreenPoint Camera::virtualScreenToScreen(const DoublePoint3D& p) {
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	349 return doublePt2intPt(m_vscreen_2_screen * p);
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	350 }
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	351
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	352 DoublePoint3D Camera::screenToVirtualScreen(const ScreenPoint& p) {
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	353 return m_screen_2_vscreen * intPt2doublePt(p);
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	354 }
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	355
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	356 DoublePoint Camera::getLogicalCellDimensions(Layer* layer) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	357 CellGrid* cg = NULL;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	358 if (layer) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	359 cg = layer->getCellGrid();
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	360 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	361 assert(cg);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	362
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	363 ModelCoordinate cell(0,0);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	364 std::vector<ExactModelCoordinate> vertices;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	365 cg->getVertices(vertices, cell);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	366
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	367 DoubleMatrix mtx;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	368 mtx.loadRotate(m_rotation, 0.0, 0.0, 1.0);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	369 mtx.applyRotate(m_tilt, 1.0, 0.0, 0.0);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	370 double x1, x2, y1, y2;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	371 for (unsigned int i = 0; i < vertices.size(); i++) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	372 vertices[i] = cg->toMapCoordinates(vertices[i]);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	373 vertices[i] = mtx * vertices[i];
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	374 if (i == 0) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	375 x1 = x2 = vertices[0].x;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	376 y1 = y2 = vertices[0].y;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	377 } else {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	378 x1 = std::min(vertices[i].x, x1);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	379 x2 = std::max(vertices[i].x, x2);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	380 y1 = std::min(vertices[i].y, y1);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	381 y2 = std::max(vertices[i].y, y2);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	382 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	383 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	384 return DoublePoint( x2 - x1, y2 - y1 );
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	385 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	386
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	387 void Camera::updateReferenceScale() {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	388 DoublePoint dim = getLogicalCellDimensions(m_location.getLayer());
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	389 m_reference_scale = static_cast<double>(m_screen_cell_width) / dim.x;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	390
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	391 FL_DBG(_log, "Updating reference scale");
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	392 FL_DBG(_log, LMsg(" tilt=") << m_tilt << " rot=" << m_rotation);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	393 FL_DBG(_log, LMsg(" m_screen_cell_width=") << m_screen_cell_width);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	394 }
405 cfe2f6db4964 Reverting my last change to camera.cpp. It caused unexpected results with rotated tiles. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 399 diff changeset	395
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	396 void Camera::getMatchingInstances(ScreenPoint screen_coords, Layer& layer, std::list<Instance*>& instances) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	397 instances.clear();
482 16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	398 const RenderList& layer_instances = m_layer_to_instances[&layer];
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	399 RenderList::const_iterator instance_it = layer_instances.end();
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	400 while (instance_it != layer_instances.begin()) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	401 --instance_it;
482 16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	402 Instance* i = (*instance_it)->instance;
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	403 const RenderItem& vc = **instance_it;
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	404 if ((vc.dimensions.contains(Point(screen_coords.x, screen_coords.y)))) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	405 assert(vc.image);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	406 Uint8 r, g, b, a;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	407 int x = screen_coords.x - vc.dimensions.x;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	408 int y = screen_coords.y - vc.dimensions.y;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	409 if (m_zoom != 1.0) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	410 double fx = static_cast<double>(x);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	411 double fy = static_cast<double>(y);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	412 double fow = static_cast<double>(vc.image->getWidth());
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	413 double foh = static_cast<double>(vc.image->getHeight());
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	414 double fsw = static_cast<double>(vc.dimensions.w);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	415 double fsh = static_cast<double>(vc.dimensions.h);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	416 x = static_cast<int>(round(fx / fsw * fow));
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	417 y = static_cast<int>(round(fy / fsh * foh));
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	418 }
34 d66538926e78 fix getPixelRGBA - it should return r g b and not r b g... spq@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 28 diff changeset	419 vc.image->getPixelRGBA(x, y, &r, &g, &b, &a);
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	420 // instance is hit with mouse if not totally transparent
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	421 if (a != 0) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	422 instances.push_back(i);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	423 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	424 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	425 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	426 }
405 cfe2f6db4964 Reverting my last change to camera.cpp. It caused unexpected results with rotated tiles. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 399 diff changeset	427
18 40a7c9618ade * new function which lists instances in a rect spq@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 10 diff changeset	428 void Camera::getMatchingInstances(Rect screen_rect, Layer& layer, std::list<Instance*>& instances) {
40a7c9618ade * new function which lists instances in a rect spq@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 10 diff changeset	429 instances.clear();
482 16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	430 const RenderList& layer_instances = m_layer_to_instances[&layer];
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	431 RenderList::const_iterator instance_it = layer_instances.end();
18 40a7c9618ade * new function which lists instances in a rect spq@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 10 diff changeset	432 while (instance_it != layer_instances.begin()) {
40a7c9618ade * new function which lists instances in a rect spq@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 10 diff changeset	433 --instance_it;
482 16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	434 Instance* i = (*instance_it)->instance;;
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	435 const RenderItem& vc = **instance_it;
18 40a7c9618ade * new function which lists instances in a rect spq@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 10 diff changeset	436 if ((vc.dimensions.intersects(screen_rect))) {
40a7c9618ade * new function which lists instances in a rect spq@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 10 diff changeset	437 assert(vc.image);
40a7c9618ade * new function which lists instances in a rect spq@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 10 diff changeset	438 Uint8 r, g, b, a;
40a7c9618ade * new function which lists instances in a rect spq@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 10 diff changeset	439 for(int xx = screen_rect.x; xx < screen_rect.x + screen_rect.w; xx++) {
40a7c9618ade * new function which lists instances in a rect spq@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 10 diff changeset	440 for(int yy = screen_rect.y; yy < screen_rect.y + screen_rect.h; yy++) {
155 29309cd5e240 fix searching for instances in a rect - old code had false positives spq@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 57 diff changeset	441 if ((vc.dimensions.contains(Point(xx, yy)))) {
29309cd5e240 fix searching for instances in a rect - old code had false positives spq@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 57 diff changeset	442 int x = xx - vc.dimensions.x;
29309cd5e240 fix searching for instances in a rect - old code had false positives spq@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 57 diff changeset	443 int y = yy - vc.dimensions.y;
29309cd5e240 fix searching for instances in a rect - old code had false positives spq@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 57 diff changeset	444 if (m_zoom != 1.0) {
29309cd5e240 fix searching for instances in a rect - old code had false positives spq@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 57 diff changeset	445 double fx = static_cast<double>(x);
29309cd5e240 fix searching for instances in a rect - old code had false positives spq@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 57 diff changeset	446 double fy = static_cast<double>(y);
29309cd5e240 fix searching for instances in a rect - old code had false positives spq@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 57 diff changeset	447 double fow = static_cast<double>(vc.image->getWidth());
29309cd5e240 fix searching for instances in a rect - old code had false positives spq@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 57 diff changeset	448 double foh = static_cast<double>(vc.image->getHeight());
29309cd5e240 fix searching for instances in a rect - old code had false positives spq@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 57 diff changeset	449 double fsw = static_cast<double>(vc.dimensions.w);
29309cd5e240 fix searching for instances in a rect - old code had false positives spq@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 57 diff changeset	450 double fsh = static_cast<double>(vc.dimensions.h);
29309cd5e240 fix searching for instances in a rect - old code had false positives spq@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 57 diff changeset	451 x = static_cast<int>(round(fx / fsw * fow));
29309cd5e240 fix searching for instances in a rect - old code had false positives spq@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 57 diff changeset	452 y = static_cast<int>(round(fy / fsh * foh));
29309cd5e240 fix searching for instances in a rect - old code had false positives spq@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 57 diff changeset	453 }
29309cd5e240 fix searching for instances in a rect - old code had false positives spq@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 57 diff changeset	454 vc.image->getPixelRGBA(x, y, &r, &g, &b, &a);
29309cd5e240 fix searching for instances in a rect - old code had false positives spq@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 57 diff changeset	455 // instance is hit with mouse if not totally transparent
29309cd5e240 fix searching for instances in a rect - old code had false positives spq@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 57 diff changeset	456 if (a != 0) {
29309cd5e240 fix searching for instances in a rect - old code had false positives spq@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 57 diff changeset	457 instances.push_back(i);
29309cd5e240 fix searching for instances in a rect - old code had false positives spq@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 57 diff changeset	458 goto found_non_transparent_pixel;
29309cd5e240 fix searching for instances in a rect - old code had false positives spq@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 57 diff changeset	459 }
18 40a7c9618ade * new function which lists instances in a rect spq@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 10 diff changeset	460 }
40a7c9618ade * new function which lists instances in a rect spq@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 10 diff changeset	461 }
40a7c9618ade * new function which lists instances in a rect spq@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 10 diff changeset	462 }
40a7c9618ade * new function which lists instances in a rect spq@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 10 diff changeset	463 found_non_transparent_pixel:;
40a7c9618ade * new function which lists instances in a rect spq@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 10 diff changeset	464 }
40a7c9618ade * new function which lists instances in a rect spq@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 10 diff changeset	465 }
40a7c9618ade * new function which lists instances in a rect spq@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 10 diff changeset	466 }
405 cfe2f6db4964 Reverting my last change to camera.cpp. It caused unexpected results with rotated tiles. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 399 diff changeset	467
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	468 void Camera::getMatchingInstances(Location& loc, std::list<Instance*>& instances, bool use_exactcoordinates) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	469 instances.clear();
482 16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	470 const RenderList& layer_instances = m_layer_to_instances[loc.getLayer()];
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	471 RenderList::const_iterator instance_it = layer_instances.end();
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	472 while (instance_it != layer_instances.begin()) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	473 --instance_it;
482 16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	474 Instance* i = (*instance_it)->instance;
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	475 if (use_exactcoordinates) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	476 if (i->getLocationRef().getExactLayerCoordinatesRef() == loc.getExactLayerCoordinatesRef()) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	477 instances.push_back(i);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	478 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	479 } else {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	480 if (i->getLocationRef().getLayerCoordinates() == loc.getLayerCoordinates()) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	481 instances.push_back(i);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	482 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	483 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	484 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	485 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	486
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	487 void Camera::attach(Instance *instance) {
10 ab09325f901e Camera was attached to instance on a different layer, resulting in strange scrolling. Fixed it, and added a check to prevent this happening again (attach-to-other-layer fails and logs a warning). jwt@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 0 diff changeset	488 // fail if the layers aren't the same
ab09325f901e Camera was attached to instance on a different layer, resulting in strange scrolling. Fixed it, and added a check to prevent this happening again (attach-to-other-layer fails and logs a warning). jwt@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 0 diff changeset	489 if (m_location.getLayer()->getId() != instance->getLocation().getLayer()->getId()) {
ab09325f901e Camera was attached to instance on a different layer, resulting in strange scrolling. Fixed it, and added a check to prevent this happening again (attach-to-other-layer fails and logs a warning). jwt@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 0 diff changeset	490 FL_WARN(_log, "Tried to attach camera to instance on different layer.");
ab09325f901e Camera was attached to instance on a different layer, resulting in strange scrolling. Fixed it, and added a check to prevent this happening again (attach-to-other-layer fails and logs a warning). jwt@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 0 diff changeset	491 return ;
ab09325f901e Camera was attached to instance on a different layer, resulting in strange scrolling. Fixed it, and added a check to prevent this happening again (attach-to-other-layer fails and logs a warning). jwt@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 0 diff changeset	492 }
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	493 m_attachedto = instance;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	494 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	495
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	496 void Camera::detach() {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	497 m_attachedto = NULL;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	498 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	499
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	500 void Camera::update() {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	501 if( !m_attachedto ) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	502 return;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	503 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	504 Location loc(m_location);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	505 loc.setExactLayerCoordinates( m_attachedto->getLocationRef().getExactLayerCoordinates(m_location.getLayer()) );
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	506 setLocation(loc);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	507 updateMatrices();
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	508 }
405 cfe2f6db4964 Reverting my last change to camera.cpp. It caused unexpected results with rotated tiles. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 399 diff changeset	509
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	510 void Camera::refresh() {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	511 updateMatrices();
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	512 m_iswarped = true;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	513 }
405 cfe2f6db4964 Reverting my last change to camera.cpp. It caused unexpected results with rotated tiles. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 399 diff changeset	514
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	515 void Camera::resetUpdates() {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	516 m_iswarped = false;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	517 m_prev_origo = m_cur_origo;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	518 }
405 cfe2f6db4964 Reverting my last change to camera.cpp. It caused unexpected results with rotated tiles. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 399 diff changeset	519
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	520 bool pipelineSort(const RendererBase* lhs, const RendererBase* rhs) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	521 return (lhs->getPipelinePosition() < rhs->getPipelinePosition());
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	522 }
405 cfe2f6db4964 Reverting my last change to camera.cpp. It caused unexpected results with rotated tiles. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 399 diff changeset	523
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	524 void Camera::addRenderer(RendererBase* renderer) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	525 renderer->setRendererListener(this);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	526 m_renderers[renderer->getName()] = renderer;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	527 if (renderer->isEnabled()) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	528 m_pipeline.push_back(renderer);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	529 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	530 m_pipeline.sort(pipelineSort);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	531 }
405 cfe2f6db4964 Reverting my last change to camera.cpp. It caused unexpected results with rotated tiles. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 399 diff changeset	532
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	533 void Camera::onRendererPipelinePositionChanged(RendererBase* renderer) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	534 m_pipeline.sort(pipelineSort);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	535 }
405 cfe2f6db4964 Reverting my last change to camera.cpp. It caused unexpected results with rotated tiles. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 399 diff changeset	536
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	537 void Camera::onRendererEnabledChanged(RendererBase* renderer) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	538 assert(m_renderers[renderer->getName()]);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	539 if (renderer->isEnabled()) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	540 FL_LOG(_log, LMsg("Enabling renderer ") << renderer->getName());
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	541 m_pipeline.push_back(renderer);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	542 m_pipeline.sort(pipelineSort);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	543 } else {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	544 m_pipeline.remove(renderer);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	545 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	546 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	547
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	548 RendererBase* Camera::getRenderer(const std::string& name) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	549 return m_renderers[name];
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	550 }
405 cfe2f6db4964 Reverting my last change to camera.cpp. It caused unexpected results with rotated tiles. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 399 diff changeset	551
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	552 void Camera::resetRenderers() {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	553 std::map<std::string, RendererBase*>::iterator r_it = m_renderers.begin();
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	554 for (; r_it != m_renderers.end(); ++r_it) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	555 Map* map = m_location.getMap();
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	556 r_it->second->reset();
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	557 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	558 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	559
482 16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	560 void Camera::addLayer(Layer* layer) {
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	561 m_cache[layer] = new LayerCache(this, m_ipool, m_apool);
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	562 m_cache[layer]->setLayer(layer);
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	563 m_layer_to_instances[layer] = RenderList();
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	564 }
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	565
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	566 void Camera::removeLayer(Layer* layer) {
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	567 delete m_cache[layer];
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	568 m_cache.erase(layer);
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	569 m_layer_to_instances.erase(layer);
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	570 }
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	571
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	572 void Camera::render() {
482 16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	573 Transform transform = NormalTransform;
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	574 if(m_iswarped)
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	575 transform = WarpedTransform;
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	576 m_iswarped = false;
405 cfe2f6db4964 Reverting my last change to camera.cpp. It caused unexpected results with rotated tiles. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 399 diff changeset	577
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	578 Map* map = m_location.getMap();
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	579 if (!map) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	580 FL_ERR(_log, "No map for camera found");
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	581 return;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	582 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	583 //if ((!map->isChanged()) && (!m_iswarped) && (cammove == ScreenPoint(0,0,0))) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	584 // return;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	585 //}
405 cfe2f6db4964 Reverting my last change to camera.cpp. It caused unexpected results with rotated tiles. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 399 diff changeset	586
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	587 // update each layer
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	588 m_renderbackend->pushClipArea(getViewPort());
482 16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	589 // m_layer_to_instances.clear();
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	590 const std::list<Layer*>& layers = map->getLayers();
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	591 std::list<Layer*>::const_iterator layer_it = layers.begin();
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	592 for (;layer_it != layers.end(); ++layer_it) {
482 16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	593 LayerCache* cache = m_cache[*layer_it];
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	594 if(!cache) {
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	595 addLayer(*layer_it);
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	596 cache = m_cache[*layer_it];
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	597 FL_ERR(_log, LMsg("Layer Cache miss! (This shouldn't happen!)") << (*layer_it)->getId());
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	598 }
482 16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	599 RenderList& instances_to_render = m_layer_to_instances[*layer_it];
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	600 cache->update(transform, instances_to_render);
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	601
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	602 std::list<RendererBase*>::iterator r_it = m_pipeline.begin();
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	603 for (; r_it != m_pipeline.end(); ++r_it) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	604 if ((r_it)->isActivedLayer(layer_it)) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	605 (r_it)->render(this, layer_it, instances_to_render);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	606 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	607 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	608 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	609 m_renderbackend->popClipArea();
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	610 resetUpdates();
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	611 m_updated = true;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	612 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	613
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	614 }

Mercurial > fife-parpg

annotate engine/core/view/camera.cpp @ 482:16c2b3ee59ce