Browse Source

use fps in calculation

Michael 2 years ago
parent
commit
9f51f42128
2 changed files with 5 additions and 2 deletions
  1. 3 0
      client/mapView/MapView.cpp
  2. 2 2
      client/mapView/MapView.h

+ 3 - 0
client/mapView/MapView.cpp

@@ -103,6 +103,9 @@ MapView::MapView(const Point & offset, const Point & dimensions)
 	OBJ_CONSTRUCTION_CAPTURING_ALL_NO_DISPOSE;
 	OBJ_CONSTRUCTION_CAPTURING_ALL_NO_DISPOSE;
 	actions = std::make_shared<MapViewActions>(*this, model);
 	actions = std::make_shared<MapViewActions>(*this, model);
 	actions->setContext(controller->getContext());
 	actions->setContext(controller->getContext());
+
+	// catch min 10 frames
+	postSwipeCatchIntervalMs = static_cast<int>(10.0 * 1000.0 * (1.0 / settings["video"]["targetfps"].Float()));
 }
 }
 
 
 void MapView::onMapLevelSwitched()
 void MapView::onMapLevelSwitched()

+ 2 - 2
client/mapView/MapView.h

@@ -52,8 +52,8 @@ class MapView : public BasicMapView
 	std::vector<std::pair<uint32_t, Point>> swipeHistory;
 	std::vector<std::pair<uint32_t, Point>> swipeHistory;
 	double postSwipeAngle = 0.0;
 	double postSwipeAngle = 0.0;
 	double postSwipeSpeed = 0.0;
 	double postSwipeSpeed = 0.0;
-	
-	const int postSwipeCatchIntervalMs = 150;
+
+	int postSwipeCatchIntervalMs;
 	const double postSwipeSlowdownSpeed = 0.006;
 	const double postSwipeSlowdownSpeed = 0.006;
 	const double postSwipeMinimalSpeed = 0.1;
 	const double postSwipeMinimalSpeed = 0.1;