From 2bfbdbb905afea243cdeaecc74d08364ef3e5e87 Mon Sep 17 00:00:00 2001 From: Alexander Bock Date: Tue, 13 May 2014 22:05:34 +0200 Subject: [PATCH] Added copy constructor to PowercaledCoordinate class --- include/openspace/util/powerscaledcoordinate.h | 1 + src/util/powerscaledcoordinate.cpp | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/include/openspace/util/powerscaledcoordinate.h b/include/openspace/util/powerscaledcoordinate.h index e6396941a5..2feeda11ef 100644 --- a/include/openspace/util/powerscaledcoordinate.h +++ b/include/openspace/util/powerscaledcoordinate.h @@ -44,6 +44,7 @@ public: PowerScaledCoordinate(); PowerScaledCoordinate(PowerScaledCoordinate&& rhs); + PowerScaledCoordinate(const PowerScaledCoordinate& rhs); // Sets the power scaled coordinates directly PowerScaledCoordinate(glm::vec4 v); diff --git a/src/util/powerscaledcoordinate.cpp b/src/util/powerscaledcoordinate.cpp index 4f0f4d4749..cd7cff9c4f 100644 --- a/src/util/powerscaledcoordinate.cpp +++ b/src/util/powerscaledcoordinate.cpp @@ -63,6 +63,11 @@ PowerScaledCoordinate::PowerScaledCoordinate(float f1, float f2, float f3, float _vec = glm::vec4(f1, f2, f3, f4); } +PowerScaledCoordinate::PowerScaledCoordinate(const PowerScaledCoordinate& rhs) { + _vec = rhs._vec; + +} + PowerScaledCoordinate PowerScaledCoordinate::CreatePowerScaledCoordinate(double d1, double d2, double d3) {