diff --git a/dpf b/dpf index e88ad41..4c0161d 160000 --- a/dpf +++ b/dpf @@ -1 +1 @@ -Subproject commit e88ad4166548d774e96e7a1322c98f64ba08f2f8 +Subproject commit 4c0161dab66c05d20d4629222c89e5a662fc09bd diff --git a/examples/color.cpp b/examples/color.cpp index ca48ece..bfdc6fd 100644 --- a/examples/color.cpp +++ b/examples/color.cpp @@ -110,10 +110,10 @@ private: void onReshape(int width, int height) override { // full bg - bgFull = DGL::Rectangle(0, 0, width, height); + bgFull = Rectangle(0, 0, width, height); // small bg, centered 2/3 size - bgSmall = DGL::Rectangle(width/6, height/6, width*2/3, height*2/3); + bgSmall = Rectangle(width/6, height/6, width*2/3, height*2/3); // make widget same size as window setSize(width, height); @@ -126,7 +126,7 @@ private: bool reverse; int r, g, b; - DGL::Rectangle bgFull, bgSmall; + Rectangle bgFull, bgSmall; }; // ------------------------------------------------------ diff --git a/examples/demo.cpp b/examples/demo.cpp index dec37f7..7dff95b 100644 --- a/examples/demo.cpp +++ b/examples/demo.cpp @@ -106,10 +106,10 @@ protected: void onReshape(int width, int height) override { // full bg - bgFull = DGL::Rectangle(0, 0, width, height); + bgFull = Rectangle(0, 0, width, height); // small bg - bgSmall = DGL::Rectangle(20, 10, width-40, height-20); + bgSmall = Rectangle(20, 10, width-40, height-20); // center triangle tri = Triangle(width*0.5, height*0.1, width*0.1, height*0.9, width*0.9, height*0.9); diff --git a/examples/rectangles.cpp b/examples/rectangles.cpp index 35dec6b..1b47bd3 100644 --- a/examples/rectangles.cpp +++ b/examples/rectangles.cpp @@ -45,7 +45,7 @@ protected: const int width = getWidth(); const int height = getHeight(); - DGL::Rectangle r; + Rectangle r; r.setWidth(width/3 - 6); r.setHeight(height/3 - 6); @@ -104,7 +104,7 @@ protected: const int width = getWidth(); const int height = getHeight(); - DGL::Rectangle r; + Rectangle r; r.setWidth(width/3 - 6); r.setHeight(height/3 - 6);