Removed uLib::Vector

This commit is contained in:
Paolo Andreetto
2019-07-31 09:16:53 +00:00
parent 52d574e317
commit 38c61a4e9b
20 changed files with 79 additions and 81 deletions

View File

@@ -29,8 +29,8 @@
#define VOXRAYTRACER_H
#include <math.h>
#include <vector>
#include "Core/Vector.h"
#include "Math/StructuredGrid.h"
namespace uLib {
@@ -51,14 +51,14 @@ public:
void AppendRay ( const RayData &in);
uLibConstRefMacro(Data,Vector<Element>)
uLibConstRefMacro(Data,std::vector<Element>)
uLibConstRefMacro(TotalLength,Scalarf)
void PrintSelf(std::ostream &o);
private:
Vector<Element> m_Data;
Scalarf m_TotalLength;
std::vector<Element> m_Data;
Scalarf m_TotalLength;
};
@@ -78,11 +78,11 @@ public:
RayData TraceLine(const HLine3f &line) const;
uLibGetMacro(Image,StructuredGrid *)
inline StructuredGrid* GetImage() const { return this->m_Image; }
private:
StructuredGrid *m_Image;
Vector3f m_scale;
Vector3f m_scale;
};
}