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

annotate engine/core/view/camera.cpp @ 661:e3140f01749d

* Merged the light branch back into trunk. * Modified the demos so they work with the new loaders and setting.

author	helios2000@33b003aa-7bff-0310-803a-e67f0ece8222
date	Fri, 05 Nov 2010 15:21:10 +0000
parents	07b1cf8e92b5
children	e8a799239384

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
605 d242e6ce6f9f Fixed a few compiler warning messages. Also removed a bunch of extra whitespace. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 579 diff changeset	61 public:
482 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;
605 d242e6ce6f9f Fixed a few compiler warning messages. Also removed a bunch of extra whitespace. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 579 diff changeset	64 }
482 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
605 d242e6ce6f9f Fixed a few compiler warning messages. Also removed a bunch of extra whitespace. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 579 diff changeset	67 virtual void onMapChanged(Map* map, std::vector<Layer*>& changedLayers) {
d242e6ce6f9f Fixed a few compiler warning messages. Also removed a bunch of extra whitespace. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 579 diff changeset	68 }
482 16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	69
605 d242e6ce6f9f Fixed a few compiler warning messages. Also removed a bunch of extra whitespace. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 579 diff changeset	70 virtual void onLayerCreate(Map* map, Layer* layer) {
d242e6ce6f9f Fixed a few compiler warning messages. Also removed a bunch of extra whitespace. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 579 diff changeset	71 m_camera->addLayer(layer);
d242e6ce6f9f Fixed a few compiler warning messages. Also removed a bunch of extra whitespace. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 579 diff changeset	72 }
482 16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	73
605 d242e6ce6f9f Fixed a few compiler warning messages. Also removed a bunch of extra whitespace. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 579 diff changeset	74 virtual void onLayerDelete(Map* map, Layer* layer) {
d242e6ce6f9f Fixed a few compiler warning messages. Also removed a bunch of extra whitespace. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 579 diff changeset	75 m_camera->removeLayer(layer);
d242e6ce6f9f Fixed a few compiler warning messages. Also removed a bunch of extra whitespace. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 579 diff changeset	76 }
482 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,
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	82 RenderBackend* renderbackend,
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	83 ImagePool* ipool,
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	84 AnimationPool* apool):
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	85 m_id(id),
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	86 m_matrix(),
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	87 m_inverse_matrix(),
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	88 m_tilt(0),
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	89 m_rotation(0),
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	90 m_zoom(1),
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	91 m_location(),
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	92 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	93 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	94 m_viewport(),
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	95 m_screen_cell_width(1),
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	96 m_screen_cell_height(1),
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	97 m_reference_scale(1),
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	98 m_enabled(true),
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	99 m_attachedto(NULL),
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	100 m_image_dimensions(),
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	101 m_iswarped(false),
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	102 m_renderers(),
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	103 m_pipeline(),
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	104 m_updated(false),
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	105 m_renderbackend(renderbackend),
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	106 m_ipool(ipool),
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	107 m_apool(apool),
661 e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 646 diff changeset	108 m_layer_to_instances(),
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 646 diff changeset	109 m_lighting(false),
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 646 diff changeset	110 m_light_colors() {
482 16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	111
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	112 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	113 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	114 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	115 Location location;
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	116 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	117 setLocation(location);
579 b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 549 diff changeset	118 if(m_renderbackend->getName() == "SDL") {
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 549 diff changeset	119 m_backendSDL = true;
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 549 diff changeset	120 } else {
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 549 diff changeset	121 m_backendSDL = false;
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 549 diff changeset	122 }
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	123 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	124
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	125 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	126 // 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	127 updateMap(NULL);
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	128
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	129 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	130 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	131 delete r_it->second;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	132 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	133 m_renderers.clear();
634 5f381fa34769 * Added the clearBackBuffer() function to the renderbackends. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 633 diff changeset	134 m_renderbackend->setClearBackBuffer(true);
482 16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	135 delete m_map_observer;
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	136 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	137
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	138 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	139 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	140 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	141 updateReferenceScale();
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	142 updateMatrices();
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	143 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	144 }
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	145 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	146
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	147 double Camera::getTilt() const {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	148 return m_tilt;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	149 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	150
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	151 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	152 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	153 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	154 updateReferenceScale();
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	155 updateMatrices();
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	156 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	157 }
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	158 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	159
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	160 double Camera::getRotation() const {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	161 return m_rotation;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	162 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	163
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	164 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	165 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	166 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	167 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	168 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	169 }
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	170 updateMatrices();
0 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 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	173
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	174 double Camera::getZoom() const {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	175 return m_zoom;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	176 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	177
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	178 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	179 m_screen_cell_width = width;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	180 m_screen_cell_height = height;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	181 updateReferenceScale();
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	182 updateMatrices();
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	183 m_iswarped = true;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	184 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	185
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	186 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	187 // initialize first set properly
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	188 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	189 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	190 m_prev_origo = m_cur_origo;
245 ed1565a5a2a0 Fixed second camera in rio. phoku@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 240 diff changeset	191 }
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	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 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	194 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	195 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	196 } else {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	197 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	198 }
482 16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	199 if (!cell_grid) {
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	200 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	201 }
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	202
482 16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	203 m_location = location;
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	204 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	205
482 16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	206 // WARNING
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	207 // 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	208 // 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	209 // 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	210 // 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	211 updateMap(location.getMap());
605 d242e6ce6f9f Fixed a few compiler warning messages. Also removed a bunch of extra whitespace. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 579 diff changeset	212
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	213 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	214 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	215
482 16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	216 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	217 {
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	218 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	219 {
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	220 return;
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 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	223 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	224 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	225 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	226 removeLayer(*i);
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	227 }
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 if(map) {
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	230 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	231 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	232 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	233 addLayer(*i);
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	234 }
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	235 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	236 }
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	237
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	238 Point Camera::getCellImageDimensions() {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	239 return getCellImageDimensions(m_location.getLayer());
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	240 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	241
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	242 Point Camera::getCellImageDimensions(Layer* layer) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	243 if (layer == m_location.getLayer()) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	244 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	245 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	246 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	247 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	248 return it->second;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	249 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	250 Point p;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	251 CellGrid* cg = layer->getCellGrid();
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	252 assert(cg);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	253 DoublePoint dimensions = getLogicalCellDimensions(layer);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	254 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	255 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	256 m_image_dimensions[layer] = p;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	257 return p;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	258 }
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	259
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	260 Location Camera::getLocation() const {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	261 return m_location;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	262 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	263
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	264 Location& Camera::getLocationRef() {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	265 return m_location;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	266 }
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	267
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	268 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	269 m_viewport = viewport;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	270 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	271
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	272 const Rect& Camera::getViewPort() const {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	273 return m_viewport;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	274 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	275
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	276 void Camera::setEnabled(bool enabled) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	277 m_enabled = enabled;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	278 }
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	279
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	280 bool Camera::isEnabled() {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	281 return m_enabled;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	282 }
605 d242e6ce6f9f Fixed a few compiler warning messages. Also removed a bunch of extra whitespace. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 579 diff changeset	283
482 16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	284 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	285 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	286 }
605 d242e6ce6f9f Fixed a few compiler warning messages. Also removed a bunch of extra whitespace. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 579 diff changeset	287
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	288 void Camera::updateMatrices() {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	289 double scale = m_reference_scale;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	290 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	291 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	292 if (m_location.getLayer()) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	293 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	294 if (cg) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	295 ExactModelCoordinate pt = m_location.getMapCoordinates();
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	296 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	297 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	298 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	299 scale = m_zoom;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	300 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	301 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	302 m_matrix.applyRotate(-m_tilt, 1.0, 0.0, 0.0);
548 f45e3e2995e0 * Corrected the h,w calculation for zooming in layercache.cpp. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 482 diff changeset	303 m_matrix.applyTranslate(+m_viewport.x+m_viewport.w/2, +m_viewport.y+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	304 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	305
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	306
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	307 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	308 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	309 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	310 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	311
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	312 // 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	313 // 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	314 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	315 // 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	316 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	317 // 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	318 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	319 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	320 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	321 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	322 }
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	323 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	324 m_screen_2_vscreen = m_vscreen_2_screen.inverse();
605 d242e6ce6f9f Fixed a few compiler warning messages. Also removed a bunch of extra whitespace. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 579 diff changeset	325
482 16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	326 // 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	327 // 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	328 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	329
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	330 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	331 int dy = -(screen_coords.y - toScreenCoordinates(m_location.getMapCoordinates()).y);
646 07b1cf8e92b5 * Major improvements to fife_math.h and added corresponding Python bindings. Users now have access to FIFE's internal math functions. These functions are recommended to be used by all clients if required. Note: this may cause some problems with certain compilers. I hope this wont have to be reverted. TODO: remove the static constant globals somehow. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 634 diff changeset	332 screen_coords.z = static_cast<int>(Mathd::Tan(m_tilt * (Mathd::pi() / 180.0)) * static_cast<double>(dy));
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	333 }
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	334
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	335 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	336 if (!z_calculated) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	337 calculateZValue(screen_coords);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	338 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	339 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	340 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	341
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	342 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	343 ExactModelCoordinate p = elevation_coords;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	344 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	345 return pt;
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	346 }
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 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	349 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	350 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	351 return pt;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	352 }
605 d242e6ce6f9f Fixed a few compiler warning messages. Also removed a bunch of extra whitespace. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 579 diff changeset	353
482 16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	354 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	355 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	356 }
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	357
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	358 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	359 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	360 }
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	361
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	362 DoublePoint Camera::getLogicalCellDimensions(Layer* layer) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	363 CellGrid* cg = NULL;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	364 if (layer) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	365 cg = layer->getCellGrid();
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 assert(cg);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	368
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	369 ModelCoordinate cell(0,0);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	370 std::vector<ExactModelCoordinate> vertices;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	371 cg->getVertices(vertices, cell);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	372
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	373 DoubleMatrix mtx;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	374 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	375 mtx.applyRotate(m_tilt, 1.0, 0.0, 0.0);
605 d242e6ce6f9f Fixed a few compiler warning messages. Also removed a bunch of extra whitespace. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 579 diff changeset	376
d242e6ce6f9f Fixed a few compiler warning messages. Also removed a bunch of extra whitespace. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 579 diff changeset	377 double x1 = 0;
d242e6ce6f9f Fixed a few compiler warning messages. Also removed a bunch of extra whitespace. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 579 diff changeset	378 double x2 = 0;
d242e6ce6f9f Fixed a few compiler warning messages. Also removed a bunch of extra whitespace. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 579 diff changeset	379 double y1 = 0;
d242e6ce6f9f Fixed a few compiler warning messages. Also removed a bunch of extra whitespace. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 579 diff changeset	380 double y2 = 0;
d242e6ce6f9f Fixed a few compiler warning messages. Also removed a bunch of extra whitespace. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 579 diff changeset	381
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	382 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	383 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	384 vertices[i] = mtx * vertices[i];
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	385 if (i == 0) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	386 x1 = x2 = vertices[0].x;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	387 y1 = y2 = vertices[0].y;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	388 } else {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	389 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	390 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	391 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	392 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	393 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	394 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	395 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	396 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	397
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	398 void Camera::updateReferenceScale() {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	399 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	400 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	401
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	402 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	403 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	404 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	405 }
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	406
579 b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 549 diff changeset	407 bool Camera::testRenderedViewPort() {
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 549 diff changeset	408 Map* map = m_location.getMap();
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 549 diff changeset	409 Rect cv = m_viewport;
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 549 diff changeset	410 int cv2x = cv.x+cv.w;
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 549 diff changeset	411 int cv2y = cv.y+cv.h;
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 549 diff changeset	412 bool trec1 = false, trec2 = false, trec3 = false, trec4 = false;
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 549 diff changeset	413 Rect rec1 = Rect(cv.x, cv.y, 1, 1);
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 549 diff changeset	414 Rect rec2 = Rect(cv.x, cv2y, 1, 1);
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 549 diff changeset	415 Rect rec3 = Rect(cv2x, cv.y, 1, 1);
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 549 diff changeset	416 Rect rec4 = Rect(cv2x, cv2y, 1, 1);
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 549 diff changeset	417
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 549 diff changeset	418 const std::list<Layer*>& layers = map->getLayers();
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 549 diff changeset	419 std::list<Layer*>::const_iterator layer_it = layers.begin();
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 549 diff changeset	420 const RenderList& layer_instances = m_layer_to_instances[*layer_it];
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 549 diff changeset	421 RenderList::const_iterator instance_it = layer_instances.begin();
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 549 diff changeset	422 for(; instance_it != layer_instances.end(); ++instance_it) {
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 549 diff changeset	423 Instance* i = (*instance_it)->instance;
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 549 diff changeset	424 const RenderItem& vc = **instance_it;
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 549 diff changeset	425 if(vc.dimensions.intersects(rec1) && !trec1) {
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 549 diff changeset	426 trec1 = true;
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 549 diff changeset	427 }
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 549 diff changeset	428 if(vc.dimensions.intersects(rec2) && !trec2) {
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 549 diff changeset	429 trec2 = true;
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 549 diff changeset	430 }
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 549 diff changeset	431 if(trec1 && trec2) {
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 549 diff changeset	432 break;
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 549 diff changeset	433 }
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 549 diff changeset	434 }
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 549 diff changeset	435 if(trec1 && trec2) {
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 549 diff changeset	436 RenderList::const_reverse_iterator instance_itr = layer_instances.rbegin();
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 549 diff changeset	437 for(; instance_itr != layer_instances.rend(); ++instance_itr) {
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 549 diff changeset	438 Instance* i = (*instance_itr)->instance;
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 549 diff changeset	439 const RenderItem& vc = **instance_itr;
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 549 diff changeset	440 if(vc.dimensions.intersects(rec3) && !trec3) {
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 549 diff changeset	441 trec3 = true;
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 549 diff changeset	442 }
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 549 diff changeset	443 if(vc.dimensions.intersects(rec4) && !trec4) {
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 549 diff changeset	444 trec4 = true;
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 549 diff changeset	445 }
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 549 diff changeset	446 if(trec3 && trec4) {
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 549 diff changeset	447 break;
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 549 diff changeset	448 }
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 549 diff changeset	449 }
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 549 diff changeset	450 }
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 549 diff changeset	451
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 549 diff changeset	452 if(trec1 && trec2 && trec3 && trec4) {
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 549 diff changeset	453 return false;
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 549 diff changeset	454 }
634 5f381fa34769 * Added the clearBackBuffer() function to the renderbackends. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 633 diff changeset	455 m_renderbackend->clearBackBuffer();
579 b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 549 diff changeset	456 return true;
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 549 diff changeset	457 }
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 549 diff changeset	458
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	459 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	460 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	461 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	462 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	463 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	464 --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	465 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	466 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	467 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	468 assert(vc.image);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	469 Uint8 r, g, b, a;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	470 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	471 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	472 if (m_zoom != 1.0) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	473 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	474 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	475 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	476 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	477 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	478 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	479 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	480 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	481 }
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	482 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	483 // 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	484 if (a != 0) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	485 instances.push_back(i);
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 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	488 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	489 }
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	490
18 40a7c9618ade * new function which lists instances in a rect spq@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 10 diff changeset	491 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	492 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	493 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	494 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	495 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	496 --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	497 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	498 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	499 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	500 assert(vc.image);
40a7c9618ade * new function which lists instances in a rect spq@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 10 diff changeset	501 Uint8 r, g, b, a;
40a7c9618ade * new function which lists instances in a rect spq@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 10 diff changeset	502 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	503 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	504 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	505 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	506 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	507 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	508 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	509 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	510 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	511 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	512 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	513 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	514 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	515 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	516 }
29309cd5e240 fix searching for instances in a rect - old code had false positives spq@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 57 diff changeset	517 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	518 // 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	519 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	520 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	521 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	522 }
18 40a7c9618ade * new function which lists instances in a rect spq@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 10 diff changeset	523 }
40a7c9618ade * new function which lists instances in a rect spq@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 10 diff changeset	524 }
40a7c9618ade * new function which lists instances in a rect spq@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 10 diff changeset	525 }
40a7c9618ade * new function which lists instances in a rect spq@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 10 diff changeset	526 found_non_transparent_pixel:;
40a7c9618ade * new function which lists instances in a rect spq@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 10 diff changeset	527 }
40a7c9618ade * new function which lists instances in a rect spq@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 10 diff changeset	528 }
40a7c9618ade * new function which lists instances in a rect spq@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 10 diff changeset	529 }
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	530
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	531 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	532 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	533 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	534 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	535 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	536 --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	537 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	538 if (use_exactcoordinates) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	539 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	540 instances.push_back(i);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	541 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	542 } else {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	543 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	544 instances.push_back(i);
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 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	549
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	550 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	551 // 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	552 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	553 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	554 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	555 }
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	556 m_attachedto = instance;
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 void Camera::detach() {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	560 m_attachedto = NULL;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	561 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	562
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	563 void Camera::update() {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	564 if( !m_attachedto ) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	565 return;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	566 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	567 Location loc(m_location);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	568 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	569 setLocation(loc);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	570 updateMatrices();
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	571 }
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	572
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	573 void Camera::refresh() {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	574 updateMatrices();
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	575 m_iswarped = true;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	576 }
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 void Camera::resetUpdates() {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	579 m_iswarped = false;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	580 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	581 }
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	582
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	583 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	584 return (lhs->getPipelinePosition() < rhs->getPipelinePosition());
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 void Camera::addRenderer(RendererBase* renderer) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	588 renderer->setRendererListener(this);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	589 m_renderers[renderer->getName()] = renderer;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	590 if (renderer->isEnabled()) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	591 m_pipeline.push_back(renderer);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	592 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	593 m_pipeline.sort(pipelineSort);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	594 }
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	595
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	596 void Camera::onRendererPipelinePositionChanged(RendererBase* renderer) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	597 m_pipeline.sort(pipelineSort);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	598 }
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	599
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	600 void Camera::onRendererEnabledChanged(RendererBase* renderer) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	601 assert(m_renderers[renderer->getName()]);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	602 if (renderer->isEnabled()) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	603 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	604 m_pipeline.push_back(renderer);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	605 m_pipeline.sort(pipelineSort);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	606 } else {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	607 m_pipeline.remove(renderer);
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 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	610
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	611 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	612 return m_renderers[name];
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	613 }
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	614
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	615 void Camera::resetRenderers() {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	616 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	617 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	618 Map* map = m_location.getMap();
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	619 r_it->second->reset();
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	620 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	621 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	622
482 16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	623 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	624 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	625 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	626 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	627 }
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	628
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	629 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	630 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	631 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	632 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	633 }
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	634
661 e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 646 diff changeset	635 void Camera::setLightingColor(float red, float green, float blue, float alpha) {
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 646 diff changeset	636 m_lighting = true;
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 646 diff changeset	637 m_light_colors.clear();
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 646 diff changeset	638 m_light_colors.push_back(red);
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 646 diff changeset	639 m_light_colors.push_back(green);
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 646 diff changeset	640 m_light_colors.push_back(blue);
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 646 diff changeset	641 m_light_colors.push_back(alpha);
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 646 diff changeset	642 }
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 646 diff changeset	643
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 646 diff changeset	644 std::vector<float> Camera::getLightingColor() {
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 646 diff changeset	645 if(m_light_colors.empty()) {
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 646 diff changeset	646 for(int colors = 0; colors != 4; ++colors) {
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 646 diff changeset	647 m_light_colors.push_back(1.0f);
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 646 diff changeset	648 }
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 646 diff changeset	649 }
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 646 diff changeset	650 return m_light_colors;
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 646 diff changeset	651 }
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 646 diff changeset	652
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 646 diff changeset	653 void Camera::resetLightingColor() {
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 646 diff changeset	654 m_lighting = false;
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 646 diff changeset	655 m_renderbackend->resetLighting();
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 646 diff changeset	656 }
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 646 diff changeset	657
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	658 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	659 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	660 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	661 transform = WarpedTransform;
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	662 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	663
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	664 Map* map = m_location.getMap();
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	665 if (!map) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	666 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	667 return;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	668 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	669 //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	670 // return;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	671 //}
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	672
661 e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 646 diff changeset	673 if (m_renderbackend->getLightingModel() != 0) {
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 646 diff changeset	674 m_renderbackend->resetStencilBuffer(0);
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 646 diff changeset	675 if (m_lighting) {
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 646 diff changeset	676 m_renderbackend->setLighting(m_light_colors[0], m_light_colors[1], m_light_colors[2], m_light_colors[3]);
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 646 diff changeset	677 }
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 646 diff changeset	678 }
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 646 diff changeset	679
579 b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 549 diff changeset	680 if(m_backendSDL) {
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 549 diff changeset	681 m_renderbackend->pushClipArea(getViewPort());
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 549 diff changeset	682 } else {
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 549 diff changeset	683 m_renderbackend->pushClipArea(getViewPort(), testRenderedViewPort());
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 549 diff changeset	684 }
661 e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 646 diff changeset	685
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	686 // update each layer
482 16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	687 // m_layer_to_instances.clear();
661 e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 646 diff changeset	688
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	689 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	690 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	691 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	692 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	693 if(!cache) {
16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	694 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	695 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	696 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	697 }
482 16c2b3ee59ce * Merged the view performance branch back into trunk. fixes[ticket:419] helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 432 diff changeset	698 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	699 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	700
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	701 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	702 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	703 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	704 (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	705 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	706 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	707 }
661 e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 646 diff changeset	708
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 646 diff changeset	709 if (m_lighting) {
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 646 diff changeset	710 m_renderbackend->resetLighting();
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 646 diff changeset	711 }
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 646 diff changeset	712
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	713 m_renderbackend->popClipArea();
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	714 resetUpdates();
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	715 m_updated = true;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	716 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	717
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	718 }

Mercurial > fife-parpg

annotate engine/core/view/camera.cpp @ 661:e3140f01749d