summaryrefslogtreecommitdiffstats
path: root/draw.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'draw.cpp')
-rw-r--r--draw.cpp100
1 files changed, 50 insertions, 50 deletions
diff --git a/draw.cpp b/draw.cpp
index be67364..5df69e0 100644
--- a/draw.cpp
+++ b/draw.cpp
@@ -7,31 +7,31 @@
#include <GL/gl.h>
-static double scale = 100.0;
-static double xTranslate = 0.0, yTranslate = 0.0;
+static float scale = 100.0;
+static float xTranslate = 0.0, yTranslate = 0.0;
static void drawGrid(const Rectangle &rect) {
- double depth = log10(scale)-0.75;
- double depth2 = floor(depth);
- double step = pow(0.1, depth2);
- double d;
+ float depth = log10f(scale)-0.75f;
+ float depth2 = floorf(depth);
+ float step = powf(0.1f, depth2);
+ float f;
int i;
//gchar *string;
- double x1 = rect.getVertex1().getX(), y1 = rect.getVertex1().getY();
- double x2 = rect.getVertex2().getX(), y2 = rect.getVertex2().getY();
+ float x1 = rect.getVertex1().getX(), y1 = rect.getVertex1().getY();
+ float x2 = rect.getVertex2().getX(), y2 = rect.getVertex2().getY();
glBegin(GL_LINES);
//cairo_set_font_size(cr, 10.0/scale);
- for(i = 0; 0.4*(depth-depth2+i-1) < 0.5; i++) {
- d = MIN(0.4*(depth-depth2+i), 0.5);
- glColor3d(d, d, d);
+ for(i = 0; 0.4f*(depth-depth2+i-1) < 0.5f; i++) {
+ f = fminf(0.4f*(depth-depth2+i), 0.5f);
+ glColor3f(f, f, f);
- for(d = x1 - fmod(x1, step) - step; d <= x2; d+=step) {
- glVertex2d(d, y1);
- glVertex2d(d, y2);
+ for(f = x1 - fmodf(x1, step) - step; f <= x2; f+=step) {
+ glVertex2f(f, y1);
+ glVertex2f(f, y2);
/*if(step > 0.005) {
if(step > 0.5)
@@ -46,9 +46,9 @@ static void drawGrid(const Rectangle &rect) {
}*/
}
- for(d = y1 - fmod(y1, step) - step; d <= y2; d+=step) {
- glVertex2d(x1, d);
- glVertex2d(x2, d);
+ for(f = y1 - fmodf(y1, step) - step; f <= y2; f+=step) {
+ glVertex2f(x1, f);
+ glVertex2f(x2, f);
/*if(step > 0.005) {
if(step > 0.5)
@@ -77,9 +77,9 @@ static void fillPolygon(const Polygon &polygon) {
glBegin(GL_TRIANGLES);
for(std::vector<Triangle>::iterator t = triangles.begin(); t != triangles.end(); t++) {
- glVertex2d(t->getVertexA().getX(), t->getVertexA().getY());
- glVertex2d(t->getVertexB().getX(), t->getVertexB().getY());
- glVertex2d(t->getVertexC().getX(), t->getVertexC().getY());
+ glVertex2f(t->getVertexA().getX(), t->getVertexA().getY());
+ glVertex2f(t->getVertexB().getX(), t->getVertexB().getY());
+ glVertex2f(t->getVertexC().getX(), t->getVertexC().getY());
}
glEnd();
@@ -120,10 +120,10 @@ gboolean drawTopView(GtkWidget *widget, GdkEventExpose *event, gpointer data) {
glMatrixMode(GL_MODELVIEW);
glPushMatrix();
- glLineWidth(1.0);
+ glLineWidth(1.0f);
- glTranslated(getImageWidth()/2-xTranslate, getImageHeight()/2-yTranslate, 0);
- glScaled(scale, scale, 1);
+ glTranslatef(getImageWidth()/2-xTranslate, getImageHeight()/2-yTranslate, 0);
+ glScalef(scale, scale, 1);
drawGrid(rect);
@@ -131,23 +131,23 @@ gboolean drawTopView(GtkWidget *widget, GdkEventExpose *event, gpointer data) {
if(&*room == getActiveRoom() && getEditMode() == EDIT_MODE_ADD) continue;
if(&*room == getActiveRoom())
- glColor4d(0.0, 0.7, 1.0, 0.2);
+ glColor4f(0.0f, 0.7f, 1.0f, 0.2f);
else
- glColor4d(0.0, 0.7, 1.0, 0.3);
+ glColor4f(0.0f, 0.7f, 1.0f, 0.3f);
fillPolygon(*room);
if(&*room == getActiveRoom()) {
- glColor4d(1.0, 1.0, 1.0, 0.9);
- glLineWidth(2.0);
+ glColor4f(1.0f, 1.0f, 1.0f, 0.9f);
+ glLineWidth(2.0f);
}
else if(&*room == getHoveredRoom() && getEditMode() != EDIT_MODE_ADD) {
- glColor4d(0.0, 0.7, 1.0, 0.7);
- glLineWidth(2.0);
+ glColor4f(0.0f, 0.7f, 1.0f, 0.7f);
+ glLineWidth(2.0f);
}
else {
- glColor4d(0.0, 0.7, 1.0, 0.7);
- glLineWidth(1.0);
+ glColor4f(0.0f, 0.7f, 1.0f, 0.7f);
+ glLineWidth(1.0f);
}
drawPolygon(*room, true);
@@ -155,19 +155,19 @@ gboolean drawTopView(GtkWidget *widget, GdkEventExpose *event, gpointer data) {
if(getEditMode() == EDIT_MODE_ADD) {
if(isPolygonOk(getActiveRoom()))
- glColor4d(0.0, 0.7, 1.0, 0.2);
+ glColor4f(0.0f, 0.7f, 1.0f, 0.2f);
else
- glColor4d(1.0, 0.3, 0.3, 0.2);
+ glColor4f(1.0f, 0.3f, 0.3f, 0.2f);
fillPolygon(*getActiveRoom());
- glLineWidth(2.0);
- glColor4d(0.0, 0.7, 1.0, 0.7);
+ glLineWidth(2.0f);
+ glColor4f(0.0f, 0.7f, 1.0f, 0.7f);
drawPolygon(*getActiveRoom(), false);
if(!getActiveRoom()->empty() && getHoveredVertex()) {
if(!isVertexOk(getHoveredVertex()))
- glColor4d(1.0, 0.3, 0.3, 0.7);
+ glColor4f(1.0f, 0.3f, 0.3f, 0.7f);
glBegin(GL_LINES);
@@ -188,11 +188,11 @@ gboolean drawTopView(GtkWidget *widget, GdkEventExpose *event, gpointer data) {
}
-double getScale() {
+float getScale() {
return scale;
}
-void setScale(double s) {
+void setScale(float s) {
scale = MAX(0.005, MIN(s, 10000));
}
@@ -206,15 +206,15 @@ void viewToImage(Vertex *v) {
v->setY((v->getY()-getImageHeight()/2+yTranslate)/scale);
}
-double getImageWidth() {
- double min = 0.0, max = 0.0;
+float getImageWidth() {
+ float min = 0.0, max = 0.0;
if(getLevel()) {
for(Level::iterator room = getLevel()->begin(); room != getLevel()->end(); room++) {
for(Room::iterator v = room->begin(); v != room->end(); v++) {
- min = MIN(min, v->getX());
- max = MAX(max, v->getX());
+ min = fminf(min, v->getX());
+ max = fmaxf(max, v->getX());
}
}
}
@@ -222,15 +222,15 @@ double getImageWidth() {
return (max-min+10)*scale;
}
-double getImageHeight() {
- double min = 0.0, max = 0.0;
+float getImageHeight() {
+ float min = 0.0, max = 0.0;
if(getLevel()) {
for(Level::iterator room = getLevel()->begin(); room != getLevel()->end(); room++) {
for(Room::iterator v = room->begin(); v != room->end(); v++) {
- min = MIN(min, v->getY());
- max = MAX(max, v->getY());
+ min = fminf(min, v->getY());
+ max = fmaxf(max, v->getY());
}
}
}
@@ -238,18 +238,18 @@ double getImageHeight() {
return (max-min+10)*scale;
}
-double getXTranslate() {
+float getXTranslate() {
return xTranslate;
}
-void setXTranslate(double x) {
+void setXTranslate(float x) {
xTranslate = x;
}
-double getYTranslate() {
+float getYTranslate() {
return yTranslate;
}
-void setYTranslate(double y) {
+void setYTranslate(float y) {
yTranslate = y;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-16 14:14:35 +0200