3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-21 07:41:09 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Removed the x(), y(), z() Point/Pointf/Point3/Pointf3 accessors.

Browse source
This commit is contained in:
bubnikv 2018-08-17 15:53:43 +02:00
parent 1ba64da3fe
commit 65011f9382
60 changed files with 1083 additions and 1111 deletions
Download patch file Download diff file Expand all files Collapse all files

50
xs/xsp/BoundingBox.xsp
View file

@ -25,15 +25,15 @@
double radius();
Clone<Point> min_point() %code{% RETVAL = THIS->min; %};
Clone<Point> max_point() %code{% RETVAL = THIS->max; %};
int x_min() %code{% RETVAL = THIS->min.x(); %};
int x_max() %code{% RETVAL = THIS->max.x(); %};
int y_min() %code{% RETVAL = THIS->min.y(); %};
int y_max() %code{% RETVAL = THIS->max.y(); %};
void set_x_min(double val) %code{% THIS->min.x() = val; %};
void set_x_max(double val) %code{% THIS->max.x() = val; %};
void set_y_min(double val) %code{% THIS->min.y() = val; %};
void set_y_max(double val) %code{% THIS->max.y() = val; %};
std::string serialize() %code{% char buf[2048]; sprintf(buf, "%ld,%ld;%ld,%ld", THIS->min.x(), THIS->min.y(), THIS->max.x(), THIS->max.y()); RETVAL = buf; %};
int x_min() %code{% RETVAL = THIS->min(0); %};
int x_max() %code{% RETVAL = THIS->max(0); %};
int y_min() %code{% RETVAL = THIS->min(1); %};
int y_max() %code{% RETVAL = THIS->max(1); %};
void set_x_min(double val) %code{% THIS->min(0) = val; %};
void set_x_max(double val) %code{% THIS->max(0) = val; %};
void set_y_min(double val) %code{% THIS->min(1) = val; %};
void set_y_max(double val) %code{% THIS->max(1) = val; %};
std::string serialize() %code{% char buf[2048]; sprintf(buf, "%ld,%ld;%ld,%ld", THIS->min(0), THIS->min(1), THIS->max(0), THIS->max(1)); RETVAL = buf; %};
bool defined() %code{% RETVAL = THIS->defined; %};
%{
@ -65,15 +65,15 @@ new_from_points(CLASS, points)
bool empty() %code{% RETVAL = empty(*THIS); %};
Clone<Pointf> min_point() %code{% RETVAL = THIS->min; %};
Clone<Pointf> max_point() %code{% RETVAL = THIS->max; %};
double x_min() %code{% RETVAL = THIS->min.x(); %};
double x_max() %code{% RETVAL = THIS->max.x(); %};
double y_min() %code{% RETVAL = THIS->min.y(); %};
double y_max() %code{% RETVAL = THIS->max.y(); %};
void set_x_min(double val) %code{% THIS->min.x() = val; %};
void set_x_max(double val) %code{% THIS->max.x() = val; %};
void set_y_min(double val) %code{% THIS->min.y() = val; %};
void set_y_max(double val) %code{% THIS->max.y() = val; %};
std::string serialize() %code{% char buf[2048]; sprintf(buf, "%lf,%lf;%lf,%lf", THIS->min.x(), THIS->min.y(), THIS->max.x(), THIS->max.y()); RETVAL = buf; %};
double x_min() %code{% RETVAL = THIS->min(0); %};
double x_max() %code{% RETVAL = THIS->max(0); %};
double y_min() %code{% RETVAL = THIS->min(1); %};
double y_max() %code{% RETVAL = THIS->max(1); %};
void set_x_min(double val) %code{% THIS->min(0) = val; %};
void set_x_max(double val) %code{% THIS->max(0) = val; %};
void set_y_min(double val) %code{% THIS->min(1) = val; %};
void set_y_max(double val) %code{% THIS->max(1) = val; %};
std::string serialize() %code{% char buf[2048]; sprintf(buf, "%lf,%lf;%lf,%lf", THIS->min(0), THIS->min(1), THIS->max(0), THIS->max(1)); RETVAL = buf; %};
bool defined() %code{% RETVAL = THIS->defined; %};
%{
@ -107,12 +107,12 @@ new_from_points(CLASS, points)
bool empty() %code{% RETVAL = empty(*THIS); %};
Clone<Pointf3> min_point() %code{% RETVAL = THIS->min; %};
Clone<Pointf3> max_point() %code{% RETVAL = THIS->max; %};
double x_min() %code{% RETVAL = THIS->min.x(); %};
double x_max() %code{% RETVAL = THIS->max.x(); %};
double y_min() %code{% RETVAL = THIS->min.y(); %};
double y_max() %code{% RETVAL = THIS->max.y(); %};
double z_min() %code{% RETVAL = THIS->min.z(); %};
double z_max() %code{% RETVAL = THIS->max.z(); %};
std::string serialize() %code{% char buf[2048]; sprintf(buf, "%lf,%lf,%lf;%lf,%lf,%lf", THIS->min.x(), THIS->min.y(), THIS->min.z(), THIS->max.x(), THIS->max.y(), THIS->max.z()); RETVAL = buf; %};
double x_min() %code{% RETVAL = THIS->min(0); %};
double x_max() %code{% RETVAL = THIS->max(0); %};
double y_min() %code{% RETVAL = THIS->min(1); %};
double y_max() %code{% RETVAL = THIS->max(1); %};
double z_min() %code{% RETVAL = THIS->min(2); %};
double z_max() %code{% RETVAL = THIS->max(2); %};
std::string serialize() %code{% char buf[2048]; sprintf(buf, "%lf,%lf,%lf;%lf,%lf,%lf", THIS->min(0), THIS->min(1), THIS->min(2), THIS->max(0), THIS->max(1), THIS->max(2)); RETVAL = buf; %};
bool defined() %code{% RETVAL = THIS->defined; %};
};

42
xs/xsp/Point.xsp
View file

@ -22,13 +22,13 @@
SV* pp()
%code{% RETVAL = to_SV_pureperl(THIS); %};
int x()
%code{% RETVAL = THIS->x(); %};
%code{% RETVAL = (*THIS)(0); %};
int y()
%code{% RETVAL = THIS->y(); %};
%code{% RETVAL = (*THIS)(1); %};
void set_x(int val)
%code{% THIS->x() = val; %};
%code{% (*THIS)(0) = val; %};
void set_y(int val)
%code{% THIS->y() = val; %};
%code{% (*THIS)(1) = val; %};
int nearest_point_index(Points points);
Clone<Point> nearest_point(Points points)
%code{% Point p; THIS->nearest_point(points, &p); RETVAL = p; %};
@ -52,7 +52,7 @@
%code{% RETVAL = new Point(- *THIS); %};
bool coincides_with_epsilon(Point* point)
%code{% RETVAL = (*THIS) == *point; %};
std::string serialize() %code{% char buf[2048]; sprintf(buf, "%ld,%ld", THIS->x(), THIS->y()); RETVAL = buf; %};
std::string serialize() %code{% char buf[2048]; sprintf(buf, "%ld,%ld", (*THIS)(0), (*THIS)(1)); RETVAL = buf; %};
%{
@ -85,12 +85,12 @@ Point::coincides_with(point_sv)
Clone<Point3> clone()
%code{% RETVAL = THIS; %};
int x()
%code{% RETVAL = THIS->x(); %};
%code{% RETVAL = (*THIS)(0); %};
int y()
%code{% RETVAL = THIS->y(); %};
%code{% RETVAL = (*THIS)(1); %};
int z()
%code{% RETVAL = THIS->z(); %};
std::string serialize() %code{% char buf[2048]; sprintf(buf, "%ld,%ld,%ld", THIS->x(), THIS->y(), THIS->z()); RETVAL = buf; %};
%code{% RETVAL = (*THIS)(2); %};
std::string serialize() %code{% char buf[2048]; sprintf(buf, "%ld,%ld,%ld", (*THIS)(0), (*THIS)(1), (*THIS)(2)); RETVAL = buf; %};
};
%name{Slic3r::Pointf} class Pointf {
@ -103,13 +103,13 @@ Point::coincides_with(point_sv)
SV* pp()
%code{% RETVAL = to_SV_pureperl(THIS); %};
double x()
%code{% RETVAL = THIS->x(); %};
%code{% RETVAL = (*THIS)(0); %};
double y()
%code{% RETVAL = THIS->y(); %};
%code{% RETVAL = (*THIS)(1); %};
void set_x(double val)
%code{% THIS->x() = val; %};
%code{% (*THIS)(0) = val; %};
void set_y(double val)
%code{% THIS->y() = val; %};
%code{% (*THIS)(1) = val; %};
void translate(double x, double y)
%code{% *THIS += Pointf(x, y); %};
void scale(double factor)
@ -120,7 +120,7 @@ Point::coincides_with(point_sv)
%code{% RETVAL = new Pointf(- *THIS); %};
Pointf* vector_to(Pointf* point)
%code{% RETVAL = new Pointf(*point - *THIS); %};
std::string serialize() %code{% char buf[2048]; sprintf(buf, "%lf,%lf", THIS->x(), THIS->y()); RETVAL = buf; %};
std::string serialize() %code{% char buf[2048]; sprintf(buf, "%lf,%lf", (*THIS)(0), (*THIS)(1)); RETVAL = buf; %};
};
%name{Slic3r::Pointf3} class Pointf3 {
@ -129,17 +129,17 @@ Point::coincides_with(point_sv)
Clone<Pointf3> clone()
%code{% RETVAL = THIS; %};
double x()
%code{% RETVAL = THIS->x(); %};
%code{% RETVAL = (*THIS)(0); %};
double y()
%code{% RETVAL = THIS->y(); %};
%code{% RETVAL = (*THIS)(1); %};
double z()
%code{% RETVAL = THIS->z(); %};
%code{% RETVAL = (*THIS)(2); %};
void set_x(double val)
%code{% THIS->x() = val; %};
%code{% (*THIS)(0) = val; %};
void set_y(double val)
%code{% THIS->y() = val; %};
%code{% (*THIS)(1) = val; %};
void set_z(double val)
%code{% THIS->z() = val; %};
%code{% (*THIS)(2) = val; %};
void translate(double x, double y, double z)
%code{% *THIS += Pointf3(x, y, z); %};
void scale(double factor)
@ -150,5 +150,5 @@ Point::coincides_with(point_sv)
%code{% RETVAL = new Pointf3(- *THIS); %};
Pointf3* vector_to(Pointf3* point)
%code{% RETVAL = new Pointf3(*point - *THIS); %};
std::string serialize() %code{% char buf[2048]; sprintf(buf, "%lf,%lf,%lf", THIS->x(), THIS->y(), THIS->z()); RETVAL = buf; %};
std::string serialize() %code{% char buf[2048]; sprintf(buf, "%lf,%lf,%lf", (*THIS)(0), (*THIS)(1), (*THIS)(2)); RETVAL = buf; %};
};