Browse Source

No more need for DGL::Rectangle (had conflicts with win32 api)

pull/1/head
falkTX 11 years ago
parent
commit
c4bd72acce
4 changed files with 8 additions and 8 deletions
  1. +1
    -1
      dpf
  2. +3
    -3
      examples/color.cpp
  3. +2
    -2
      examples/demo.cpp
  4. +2
    -2
      examples/rectangles.cpp

+ 1
- 1
dpf

@@ -1 +1 @@
Subproject commit e88ad4166548d774e96e7a1322c98f64ba08f2f8
Subproject commit 4c0161dab66c05d20d4629222c89e5a662fc09bd

+ 3
- 3
examples/color.cpp View File

@@ -110,10 +110,10 @@ private:
void onReshape(int width, int height) override void onReshape(int width, int height) override
{ {
// full bg // full bg
bgFull = DGL::Rectangle<int>(0, 0, width, height);
bgFull = Rectangle<int>(0, 0, width, height);


// small bg, centered 2/3 size // small bg, centered 2/3 size
bgSmall = DGL::Rectangle<int>(width/6, height/6, width*2/3, height*2/3);
bgSmall = Rectangle<int>(width/6, height/6, width*2/3, height*2/3);


// make widget same size as window // make widget same size as window
setSize(width, height); setSize(width, height);
@@ -126,7 +126,7 @@ private:
bool reverse; bool reverse;
int r, g, b; int r, g, b;


DGL::Rectangle<int> bgFull, bgSmall;
Rectangle<int> bgFull, bgSmall;
}; };


// ------------------------------------------------------ // ------------------------------------------------------


+ 2
- 2
examples/demo.cpp View File

@@ -106,10 +106,10 @@ protected:
void onReshape(int width, int height) override void onReshape(int width, int height) override
{ {
// full bg // full bg
bgFull = DGL::Rectangle<int>(0, 0, width, height);
bgFull = Rectangle<int>(0, 0, width, height);


// small bg // small bg
bgSmall = DGL::Rectangle<int>(20, 10, width-40, height-20);
bgSmall = Rectangle<int>(20, 10, width-40, height-20);


// center triangle // center triangle
tri = Triangle<int>(width*0.5, height*0.1, width*0.1, height*0.9, width*0.9, height*0.9); tri = Triangle<int>(width*0.5, height*0.1, width*0.1, height*0.9, width*0.9, height*0.9);


+ 2
- 2
examples/rectangles.cpp View File

@@ -45,7 +45,7 @@ protected:
const int width = getWidth(); const int width = getWidth();
const int height = getHeight(); const int height = getHeight();


DGL::Rectangle<int> r;
Rectangle<int> r;


r.setWidth(width/3 - 6); r.setWidth(width/3 - 6);
r.setHeight(height/3 - 6); r.setHeight(height/3 - 6);
@@ -104,7 +104,7 @@ protected:
const int width = getWidth(); const int width = getWidth();
const int height = getHeight(); const int height = getHeight();


DGL::Rectangle<int> r;
Rectangle<int> r;


r.setWidth(width/3 - 6); r.setWidth(width/3 - 6);
r.setHeight(height/3 - 6); r.setHeight(height/3 - 6);


Loading…
Cancel
Save