Mercurial > fife-parpg

changeset 290:84f53a4abd91

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove linear pather
author wenlin_fife@33b003aa-7bff-0310-803a-e67f0ece8222
date Wed, 24 Jun 2009 13:52:51 +0000
parents 8aae3fabcf41
children 89c71d202ab7
files engine/core/pathfinder/linearpather/linearpather.cpp engine/core/pathfinder/linearpather/linearpather.h engine/core/pathfinder/linearpather/linearpather.i
diffstat 3 files changed, 0 insertions(+), 214 deletions(-) [+]
line wrap: on
line diff
--- a/engine/core/pathfinder/linearpather/linearpather.cpp	Wed Jun 24 13:47:32 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,109 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2005-2008 by the FIFE team                              *
- *   http://www.fifengine.de                                               *
- *   This file is part of FIFE.                                            *
- *                                                                         *
- *   FIFE is free software; you can redistribute it and/or                 *
- *   modify it under the terms of the GNU Lesser General Public            *
- *   License as published by the Free Software Foundation; either          *
- *   version 2.1 of the License, or (at your option) any later version.    *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the                 *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
- ***************************************************************************/
-
-// Standard C++ library includes
-
-// 3rd party library includes
-
-// FIFE includes
-// These includes are split up in two parts, separated by one empty line
-// First block: files included from the FIFE root src directory
-// Second block: files included from the same folder
-#include "util/log/logger.h"
-#include "model/metamodel/grids/cellgrid.h"
-#include "model/structures/instance.h"
-#include "model/structures/layer.h"
-
-#include "linearpather.h"
-
-namespace FIFE {
-	static Logger _log(LM_PATHFINDER);
-	
-	int LinearPather::getNextLocation(const Instance* instance, const Location& target,
-		                            double distance_to_travel, Location& nextLocation,
-		                            Location& facingLocation, int session_id, int priority) {
-		Location curloc = instance->getLocation();
-		assert(curloc.getMap() == target.getMap());
-		Layer* layer = curloc.getLayer();
-		assert(layer == target.getLayer());
-		CellGrid* cg = layer->getCellGrid();
-		assert(layer == target.getLayer());
-		
-		assert(curloc.getLayer() == target.getLayer());
-		m_map = curloc.getMap();
-		
-		int cur_session_id = session_id;
-		if (cur_session_id < 0) {
-			cur_session_id = m_session_counter++;
-			
-			// extrapolate facing location for this session
-			ExactModelCoordinate cur_pos = curloc.getMapCoordinates();
-			ExactModelCoordinate fac_pos = target.getMapCoordinates();
-			fac_pos.x = fac_pos.x + (fac_pos.x - cur_pos.x);
-			fac_pos.y = fac_pos.y + (fac_pos.y - cur_pos.y);
-			facingLocation = target;
-			facingLocation.setMapCoordinates(fac_pos);
-			m_session2face[cur_session_id] = facingLocation;
-			FL_DBG(_log, LMsg("storing new facing loc ") <<  facingLocation);
-		} else {
-			FL_DBG(_log, LMsg("getting old facing loc ") <<  facingLocation);
-			facingLocation = m_session2face[cur_session_id];
-		}
-		FL_DBG(_log, LMsg("curloc ") <<  curloc << ", target " << target << ", dist2travel " << distance_to_travel);
-		ExactModelCoordinate cur_pos = curloc.getMapCoordinates();
-		ExactModelCoordinate target_pos = target.getMapCoordinates();
-		double dx = (target_pos.x - cur_pos.x) * cg->getXScale();
-		double dy = (target_pos.y - cur_pos.y) * cg->getYScale();
-		double dist = sqrt(dx*dx + dy*dy);
-		FL_DBG(_log, LMsg("distance from cur to target = ") << dist);
-		
-		// calculate where current position evolves with movement
-		if (distance_to_travel > dist) {
-			distance_to_travel = dist;
-		}
-		cur_pos.x += dx * (distance_to_travel / dist);
-		cur_pos.y += dy * (distance_to_travel / dist);
-		nextLocation.setMapCoordinates(cur_pos);
-		FL_DBG(_log, LMsg("in case not blocking, could move to ") << nextLocation);
-		
-		// check if we have collisions and if we do, keep instance on current location
-		ModelCoordinate nextCellcoord = nextLocation.getLayerCoordinates();
-		const std::vector<Instance*>& instances = target.getLayer()->getInstances();
-		std::vector<Instance*>::const_iterator instance_it = instances.begin();
-		for (;instance_it != instances.end(); ++instance_it) {
-			Instance* i = (*instance_it);
-			if ((i == instance) || (!i->getObject()->isBlocking())) {
-				continue;
-			}
-			ModelCoordinate c = i->getLocationRef().getLayerCoordinates();
-			if ((c.x == nextCellcoord.x) && (c.y == nextCellcoord.y)) {
-				FL_DBG(_log, LMsg("Found blocking instance from planned cell ") << nextLocation);
-				nextLocation = curloc;
-				break;
-			}
-		}
-		//We're there
-		if((ABS(cur_pos.x - target_pos.x) < 0.1) && (ABS(cur_pos.y - target_pos.y) < 0.1)) {
-			return -1;
-		}
-		return cur_session_id;
-	}
-}
--- a/engine/core/pathfinder/linearpather/linearpather.h	Wed Jun 24 13:47:32 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2005-2008 by the FIFE team                              *
- *   http://www.fifengine.de                                               *
- *   This file is part of FIFE.                                            *
- *                                                                         *
- *   FIFE is free software; you can redistribute it and/or                 *
- *   modify it under the terms of the GNU Lesser General Public            *
- *   License as published by the Free Software Foundation; either          *
- *   version 2.1 of the License, or (at your option) any later version.    *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the                 *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
- ***************************************************************************/
-
-#ifndef FIFE_PATHFINDER_LINEAR_H
-#define FIFE_PATHFINDER_LINEAR_H
-
-// Standard C++ library includes
-#include <map>
-
-// 3rd party library includes
-
-// FIFE includes
-// These includes are split up in two parts, separated by one empty line
-// First block: files included from the FIFE root src directory
-// Second block: files included from the same folder
-#include "model/structures/location.h"
-#include "model/structures/map.h"
-#include "model/metamodel/abstractpather.h"
-
-namespace FIFE {
-
-	/** Naive pathfinder implementation
-	*/
-	class LinearPather: public AbstractPather {
-	public:
-		LinearPather(): m_session_counter(0), m_map(NULL) {}
-
-		virtual ~LinearPather() {}
-
-		int getNextLocation(const Instance* instance, const Location& target, 
-		                    double speed, Location& nextLocation,
-							Location& facingLocation, int session_id=-1, 
-							int priority = MEDIUM_PRIORITY);
-
-		void update() { }
-		
-		bool cancelSession(const int session_id) { 
-			m_session2face.erase(session_id);
-			return true; 
-		}
-
-		std::string getName() const { return "LinearPather"; }
-	
-	private:
-		std::map< int, Location > m_session2face;
-		unsigned int m_session_counter;
-		Map* m_map;
-	};
-}
-
-#endif
-
--- a/engine/core/pathfinder/linearpather/linearpather.i	Wed Jun 24 13:47:32 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2005-2008 by the FIFE team                              *
- *   http://www.fifengine.de                                               *
- *   This file is part of FIFE.                                            *
- *                                                                         *
- *   FIFE is free software; you can redistribute it and/or                 *
- *   modify it under the terms of the GNU Lesser General Public            *
- *   License as published by the Free Software Foundation; either          *
- *   version 2.1 of the License, or (at your option) any later version.    *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the                 *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
- ***************************************************************************/        
-%module fife
-%{
-#include "pathfinder/linearpather/linearpather.h"
-%}
-%include "model/metamodel/abstractpather.i"
-
-namespace FIFE {
-	%feature("notabstract") LinearPather;
-	class LinearPather: public AbstractPather {
-	public:
-		LinearPather();
-		virtual ~LinearPather();
-		std::string getName() const;
-	};
-}