From 899b185ce7f9dc302ffa3760ba2c72c92dda8c29 Mon Sep 17 00:00:00 2001 From: falkTX Date: Tue, 13 May 2014 23:19:38 +0100 Subject: [PATCH] Experiment with lines --- dpf | 2 +- examples/color.cpp | 2 +- examples/demo.cpp | 42 +++++++++++++++++++++++++++++++++++++---- examples/rectangles.cpp | 2 +- 4 files changed, 41 insertions(+), 7 deletions(-) diff --git a/dpf b/dpf index 5c4b72d..6051bb2 160000 --- a/dpf +++ b/dpf @@ -1 +1 @@ -Subproject commit 5c4b72d8d88fbbe30cab1bd117001d3432dfbfe3 +Subproject commit 6051bb2c1dc4368389f18e13b1a4275435460280 diff --git a/examples/color.cpp b/examples/color.cpp index aaa6843..ca48ece 100644 --- a/examples/color.cpp +++ b/examples/color.cpp @@ -27,7 +27,7 @@ using namespace DGL; // ------------------------------------------------------ -// Single color widget +// our widget class ColorWidget : public Widget, public IdleCallback diff --git a/examples/demo.cpp b/examples/demo.cpp index 95e27df..fca890f 100644 --- a/examples/demo.cpp +++ b/examples/demo.cpp @@ -26,6 +26,40 @@ using namespace DGL; +// ------------------------------------------------------ +// our widget + +class DummyWidget : public Widget +{ +public: + DummyWidget(Window& win) + : Widget(win) + { + l1.setStartPos(5, 5); + l2.setStartPos(5, 5+50); + l3.setStartPos(5, 5+100); + + l1.setEndPos(300-5, 5); + l2.setEndPos(300-5, 5+50); + l3.setEndPos(300-5, 5+100); + } + +protected: + void onDisplay() override + { + glColor3f(0.3f, 0.5f, 0.8f); + l1.draw(); + + glColor3f(0.5f, 0.8f, 0.3f); + l2.draw(); + + glColor3f(0.8f, 0.3f, 0.5f); + l3.draw(); + } + + Line l1, l2, l3; +}; + // ------------------------------------------------------ // Our Demo Window @@ -33,15 +67,15 @@ class DemoWindow : public Window { public: DemoWindow(App& app) - : Window(app)//, - //w1(*this) + : Window(app), + w1(*this) { setSize(300, 300); setTitle("DGL Demo"); } -//private: - //Widget_Geometry w1; +private: + DummyWidget w1; }; // ------------------------------------------------------ diff --git a/examples/rectangles.cpp b/examples/rectangles.cpp index 1c7c8b2..35dec6b 100644 --- a/examples/rectangles.cpp +++ b/examples/rectangles.cpp @@ -27,7 +27,7 @@ using namespace DGL; // ------------------------------------------------------ -// Geometry +// our widget class RectanglesWidget : public Widget {