変数名の変更

Author: mimaraka

curve_editor/control_point.cpp

@@ -4,39 +4,39 @@
 
 
 namespace cved {
-	bool ControlPoint::is_hovered(const mkaul::Point<double>& point, const GraphView& view) const noexcept {
+	bool ControlPoint::is_hovered(const mkaul::Point<double>& pt, const GraphView& view) const noexcept {
 		constexpr float BOX_WIDTH = 20.f;
 
 		bool in_range_x = mkaul::in_range(
-			point.x, point_.x - BOX_WIDTH / view.scale_x() * 0.5,
-			point_.x + BOX_WIDTH / view.scale_x() * 0.5, true
+			pt.x, pt_.x - BOX_WIDTH / view.scale_x() * 0.5,
+			pt_.x + BOX_WIDTH / view.scale_x() * 0.5, true
 		);
 		bool in_range_y = mkaul::in_range(
-			point.y, point_.y - BOX_WIDTH / view.scale_y() * 0.5,
-			point_.y + BOX_WIDTH / view.scale_y() * 0.5, true
+			pt.y, pt_.y - BOX_WIDTH / view.scale_y() * 0.5,
+			pt_.y + BOX_WIDTH / view.scale_y() * 0.5, true
 		);
 		return in_range_x and in_range_y;
 	}
 
-	bool ControlPoint::check_hover(const mkaul::Point<double>& point, const GraphView& view) noexcept {
-		if (is_hovered(point, view)) {
+	bool ControlPoint::check_hover(const mkaul::Point<double>& pt, const GraphView& view) noexcept {
+		if (is_hovered(pt, view)) {
 			controlled_ = true;
 			return true;
 		}
 		else return false;
 	}
 
-	bool ControlPoint::update(const mkaul::Point<double>& point) noexcept {
+	bool ControlPoint::update(const mkaul::Point<double>& pt) noexcept {
 		if (controlled_) {
-			move(point);
+			move(pt);
 			return true;
 		}
 		else return false;
 	}
 
-	void ControlPoint::move(const mkaul::Point<double>& point) noexcept {
+	void ControlPoint::move(const mkaul::Point<double>& pt) noexcept {
 		if (!fixed_) {
-			point_ = point;
+			pt_ = pt;
 		}
 	}
 }

curve_editor/control_point.hpp

@@ -9,34 +9,34 @@ namespace cved {
 	// 操作可能なポイント
 	class ControlPoint {
 	private:
-		mkaul::Point<double> point_;
+		mkaul::Point<double> pt_;
 		bool controlled_;
 		bool fixed_;
 
 	public:
-		constexpr ControlPoint(const mkaul::Point<double>& point = mkaul::Point<double>{}, bool fixed = false) :
-			point_{point},
+		constexpr ControlPoint(const mkaul::Point<double>& pt = mkaul::Point<double>{}, bool fixed = false) :
+			pt_{pt},
 			controlled_{false},
 			fixed_{fixed}
 		{}
 
-		auto operator = (const mkaul::Point<double>& point) noexcept {
-			this->point_ = point;
+		auto operator = (const mkaul::Point<double>& pt) noexcept {
+			this->pt_ = pt;
 			return *this;
 		}
 
 		// アクセッサ
-		const auto& point() const noexcept { return point_; }
-		auto x() const noexcept { return point_.x; }
-		auto y() const noexcept { return point_.y; }
+		const auto& pt() const noexcept { return pt_; }
+		auto x() const noexcept { return pt_.x; }
+		auto y() const noexcept { return pt_.y; }
 
 		// 引数のポイントがコントロールポイント付近にあるかどうか
-		bool is_hovered(const mkaul::Point<double>& point, const GraphView& view) const noexcept;
+		bool is_hovered(const mkaul::Point<double>& pt, const GraphView& view) const noexcept;
 		bool is_controlled() const noexcept { return controlled_; }
-		bool check_hover(const mkaul::Point<double>& point, const GraphView& view) noexcept;
+		bool check_hover(const mkaul::Point<double>& pt, const GraphView& view) noexcept;
 
-		bool update(const mkaul::Point<double>& point) noexcept;
-		void move(const mkaul::Point<double>& point) noexcept;
+		bool update(const mkaul::Point<double>& pt) noexcept;
+		void move(const mkaul::Point<double>& pt) noexcept;
 
 		void end_control() noexcept { controlled_ = false; }
 	};