Home / Browse / Crazy Eddies GUI System / Mail / Archive

Donate

Crazy Eddies GUI System

Email Archive: crayzedsgui-cvsmk2 (read-only)

[Crayzedsgui-cvsmk2] SF.net SVN: crayzedsgui: [1710] cegui_mk2/branches/v0-6

From: <ice-drezday@us...> - 2008-05-21 18:23

Revision: 1710
          http://crayzedsgui.svn.sourceforge.net/crayzedsgui/?rev=1710&view=rev
Author:   ice-drezday
Date:     2008-05-21 11:23:27 -0700 (Wed, 21 May 2008)

Log Message:
-----------
FIX: When injecting mouse position change information using the System::injectMousePosition member, the resulting MouseEventArgs structure passed to event handlers always had the positional change delta information set to 0.  See: http://www.cegui.org.uk/mantis/view.php?id=194

Modified Paths:
--------------
    cegui_mk2/branches/v0-6/RendererModules/IrrlichtRenderer/IrrlichtEventPusher.h
    cegui_mk2/branches/v0-6/include/CEGUISystem.h
    cegui_mk2/branches/v0-6/src/CEGUISystem.cpp

Modified: cegui_mk2/branches/v0-6/RendererModules/IrrlichtRenderer/IrrlichtEventPusher.h
===================================================================
--- cegui_mk2/branches/v0-6/RendererModules/IrrlichtRenderer/IrrlichtEventPusher.h	2008-05-21 10:07:42 UTC (rev 1709)
+++ cegui_mk2/branches/v0-6/RendererModules/IrrlichtRenderer/IrrlichtEventPusher.h	2008-05-21 18:23:27 UTC (rev 1710)
@@ -127,17 +127,11 @@
 				break;
 				//! The mouse cursor changed its position.
 			case EMIE_MOUSE_MOVED:
-				dpos.X=x-pos.X;
-				dpos.Y=y-pos.Y;
-				pos.X=x;
-				pos.Y=y;
-				CEGUI::MouseCursor::getSingleton().setPosition(CEGUI::Point(float(pos.X),float(pos.Y)));
-				handled=CEGUI::System::getSingleton().injectMouseMove(0.0f, 0.0f);			
-				//handled=CEGUI::System::getSingleton().injectMouseMove(float(dpos.X), float(dpos.Y));
+                handled=CEGUI::System::getSingleton().injectMousePosition(x, y);
 				break;
-				//! The mouse wheel was moved. Use Wheel value in event data to find out 
+				//! The mouse wheel was moved. Use Wheel value in event data to find out
 				//! in what direction and how fast.
-			case EMIE_MOUSE_WHEEL: 
+			case EMIE_MOUSE_WHEEL:
 				handled=CEGUI::System::getSingleton().injectMouseWheelChange(w);
 				break;
 			default:
@@ -157,156 +151,156 @@
 				using namespace irr;
 				memset(irr2ceCODE,0,KEY_KEY_CODES_COUNT);
 
-				irr2ceCODE[KEY_LBUTTON          ] = 0;  // Left mouse button  
-				irr2ceCODE[KEY_RBUTTON          ] = 0;  // Right mouse button  
-				irr2ceCODE[KEY_CANCEL           ] = 0;  // Control-break processing  
-				irr2ceCODE[KEY_MBUTTON          ] = 0;  // Middle mouse button (three-button mouse)  
-				irr2ceCODE[KEY_XBUTTON1         ] = 0;  // Windows 2000/XP: X1 mouse button 
-				irr2ceCODE[KEY_XBUTTON2         ] = 0;  // Windows 2000/XP: X2 mouse button 
-				irr2ceCODE[KEY_BACK             ] = Key::Backspace; //0x08;  // BACKSPACE key  
-				irr2ceCODE[KEY_TAB              ] = Key::Tab; //0x09;  // TAB key  
-				irr2ceCODE[KEY_CLEAR            ] = 0;  // CLEAR key  
-				irr2ceCODE[KEY_RETURN           ] = Key::Return; //0x0D;  // ENTER key  
-				irr2ceCODE[KEY_SHIFT            ] = Key::LeftShift;  // SHIFT key  
-				irr2ceCODE[KEY_CONTROL          ] = Key::LeftControl;   // CTRL key  
-				irr2ceCODE[KEY_MENU             ] = Key::LeftAlt;  // ALT key  
-				irr2ceCODE[KEY_PAUSE            ] = Key::Pause;   // PAUSE key  
-				irr2ceCODE[KEY_CAPITAL          ] = Key::Capital;  // CAPS LOCK key  
-				irr2ceCODE[KEY_KANA             ] = Key::Kana;  // IME Kana mode 
-				irr2ceCODE[KEY_HANGUEL          ] = KEY_HANGUEL;  // IME Hanguel mode 
-				irr2ceCODE[KEY_HANGUL           ] = KEY_HANGUL;  // IME Hangul mode 
-				irr2ceCODE[KEY_JUNJA            ] = 0;  // IME Junja mode 
-				irr2ceCODE[KEY_FINAL            ] = 0;  // IME final mode 
-				irr2ceCODE[KEY_HANJA            ] = 0;  // IME Hanja mode 
-				irr2ceCODE[KEY_KANJI            ] = 0;  // IME Kanji mode 
-				irr2ceCODE[KEY_ESCAPE           ] = Key::Escape;  // ESC key  
-				irr2ceCODE[KEY_CONVERT          ] = Key::Convert;  // IME convert 
-				irr2ceCODE[KEY_NONCONVERT       ] = Key::NoConvert;  // IME nonconvert 
-				irr2ceCODE[KEY_ACCEPT           ] = 0;  // IME accept 
-				irr2ceCODE[KEY_MODECHANGE       ] = 0;  // IME mode change request 
-				irr2ceCODE[KEY_SPACE            ] = Key::Space;  // SPACEBAR  
-				irr2ceCODE[KEY_PRIOR            ] = Key::PageUp;  // PAGE UP key  
-				irr2ceCODE[KEY_NEXT             ] = Key::PageDown;  // PAGE DOWN key  
-				irr2ceCODE[KEY_END              ] = Key::End;  // END key  
-				irr2ceCODE[KEY_HOME             ] = Key::Home;  // HOME key  
-				irr2ceCODE[KEY_LEFT             ] = Key::ArrowLeft;  // LEFT ARROW key  
-				irr2ceCODE[KEY_UP               ] = Key::ArrowUp;  // UP ARROW key  
-				irr2ceCODE[KEY_RIGHT            ] = Key::ArrowRight;  // RIGHT ARROW key  
-				irr2ceCODE[KEY_DOWN             ] = Key::ArrowDown;  // DOWN ARROW key  
-				irr2ceCODE[KEY_SELECT           ] = 0;  // SELECT key  
+				irr2ceCODE[KEY_LBUTTON          ] = 0;  // Left mouse button
+				irr2ceCODE[KEY_RBUTTON          ] = 0;  // Right mouse button
+				irr2ceCODE[KEY_CANCEL           ] = 0;  // Control-break processing
+				irr2ceCODE[KEY_MBUTTON          ] = 0;  // Middle mouse button (three-button mouse)
+				irr2ceCODE[KEY_XBUTTON1         ] = 0;  // Windows 2000/XP: X1 mouse button
+				irr2ceCODE[KEY_XBUTTON2         ] = 0;  // Windows 2000/XP: X2 mouse button
+				irr2ceCODE[KEY_BACK             ] = Key::Backspace; //0x08;  // BACKSPACE key
+				irr2ceCODE[KEY_TAB              ] = Key::Tab; //0x09;  // TAB key
+				irr2ceCODE[KEY_CLEAR            ] = 0;  // CLEAR key
+				irr2ceCODE[KEY_RETURN           ] = Key::Return; //0x0D;  // ENTER key
+				irr2ceCODE[KEY_SHIFT            ] = Key::LeftShift;  // SHIFT key
+				irr2ceCODE[KEY_CONTROL          ] = Key::LeftControl;   // CTRL key
+				irr2ceCODE[KEY_MENU             ] = Key::LeftAlt;  // ALT key
+				irr2ceCODE[KEY_PAUSE            ] = Key::Pause;   // PAUSE key
+				irr2ceCODE[KEY_CAPITAL          ] = Key::Capital;  // CAPS LOCK key
+				irr2ceCODE[KEY_KANA             ] = Key::Kana;  // IME Kana mode
+				irr2ceCODE[KEY_HANGUEL          ] = KEY_HANGUEL;  // IME Hanguel mode
+				irr2ceCODE[KEY_HANGUL           ] = KEY_HANGUL;  // IME Hangul mode
+				irr2ceCODE[KEY_JUNJA            ] = 0;  // IME Junja mode
+				irr2ceCODE[KEY_FINAL            ] = 0;  // IME final mode
+				irr2ceCODE[KEY_HANJA            ] = 0;  // IME Hanja mode
+				irr2ceCODE[KEY_KANJI            ] = 0;  // IME Kanji mode
+				irr2ceCODE[KEY_ESCAPE           ] = Key::Escape;  // ESC key
+				irr2ceCODE[KEY_CONVERT          ] = Key::Convert;  // IME convert
+				irr2ceCODE[KEY_NONCONVERT       ] = Key::NoConvert;  // IME nonconvert
+				irr2ceCODE[KEY_ACCEPT           ] = 0;  // IME accept
+				irr2ceCODE[KEY_MODECHANGE       ] = 0;  // IME mode change request
+				irr2ceCODE[KEY_SPACE            ] = Key::Space;  // SPACEBAR
+				irr2ceCODE[KEY_PRIOR            ] = Key::PageUp;  // PAGE UP key
+				irr2ceCODE[KEY_NEXT             ] = Key::PageDown;  // PAGE DOWN key
+				irr2ceCODE[KEY_END              ] = Key::End;  // END key
+				irr2ceCODE[KEY_HOME             ] = Key::Home;  // HOME key
+				irr2ceCODE[KEY_LEFT             ] = Key::ArrowLeft;  // LEFT ARROW key
+				irr2ceCODE[KEY_UP               ] = Key::ArrowUp;  // UP ARROW key
+				irr2ceCODE[KEY_RIGHT            ] = Key::ArrowRight;  // RIGHT ARROW key
+				irr2ceCODE[KEY_DOWN             ] = Key::ArrowDown;  // DOWN ARROW key
+				irr2ceCODE[KEY_SELECT           ] = 0;  // SELECT key
 				irr2ceCODE[KEY_PRINT            ] = Key::SysRq;  // PRINT key
-				irr2ceCODE[KEY_EXECUT           ] = 0;  // EXECUTE key  
-				irr2ceCODE[KEY_SNAPSHOT         ] = 0;  // PRINT SCREEN key  
-				irr2ceCODE[KEY_INSERT           ] = Key::Insert;//0x2D;  // INS key  
-				irr2ceCODE[KEY_DELETE           ] = Key::Delete;//0x2E;  // DEL key  
-				irr2ceCODE[KEY_HELP             ] = 0;  // HELP key  
-				irr2ceCODE[KEY_KEY_0            ] = Key::Zero;   // 0 key  
-				irr2ceCODE[KEY_KEY_1            ] = Key::One;    // 1 key  
-				irr2ceCODE[KEY_KEY_2            ] = Key::Two;    // 2 key  
-				irr2ceCODE[KEY_KEY_3            ] = Key::Three;  // 3 key  
-				irr2ceCODE[KEY_KEY_4            ] = Key::Four;   // 4 key  
-				irr2ceCODE[KEY_KEY_5            ] = Key::Five;   // 5 key  
-				irr2ceCODE[KEY_KEY_6            ] = Key::Six;    // 6 key  
-				irr2ceCODE[KEY_KEY_7            ] = Key::Seven;  // 7 key  
-				irr2ceCODE[KEY_KEY_8            ] = Key::Eight;  // 8 key  
-				irr2ceCODE[KEY_KEY_9            ] = Key::Nine;   // 9 key  
-				irr2ceCODE[KEY_KEY_A            ] = Key::A;  // A key  
-				irr2ceCODE[KEY_KEY_B            ] = Key::B;  // B key  
-				irr2ceCODE[KEY_KEY_C            ] = Key::C;  // C key  
-				irr2ceCODE[KEY_KEY_D            ] = Key::D;  // D key  
-				irr2ceCODE[KEY_KEY_E            ] = Key::E;  // E key  
-				irr2ceCODE[KEY_KEY_F            ] = Key::F;  // F key  
-				irr2ceCODE[KEY_KEY_G            ] = Key::G;  // G key  
-				irr2ceCODE[KEY_KEY_H            ] = Key::H;  // H key  
-				irr2ceCODE[KEY_KEY_I            ] = Key::I;  // I key  
-				irr2ceCODE[KEY_KEY_J            ] = Key::J;  // J key  
-				irr2ceCODE[KEY_KEY_K            ] = Key::K;  // K key  
-				irr2ceCODE[KEY_KEY_L            ] = Key::L;  // L key  
-				irr2ceCODE[KEY_KEY_M            ] = Key::M;  // M key  
-				irr2ceCODE[KEY_KEY_N            ] = Key::N;  // N key  
-				irr2ceCODE[KEY_KEY_O            ] = Key::O;  // O key  
-				irr2ceCODE[KEY_KEY_P            ] = Key::P;  // P key  
-				irr2ceCODE[KEY_KEY_Q            ] = Key::Q;  // Q key  
-				irr2ceCODE[KEY_KEY_R            ] = Key::R;  // R key  
-				irr2ceCODE[KEY_KEY_S            ] = Key::S;  // S key  
-				irr2ceCODE[KEY_KEY_T            ] = Key::T;  // T key  
-				irr2ceCODE[KEY_KEY_U            ] = Key::U;  // U key  
-				irr2ceCODE[KEY_KEY_V            ] = Key::V;  // V key  
-				irr2ceCODE[KEY_KEY_W            ] = Key::W;  // W key  
-				irr2ceCODE[KEY_KEY_X            ] = Key::X;  // X key  
-				irr2ceCODE[KEY_KEY_Y            ] = Key::Y;  // Y key  
-				irr2ceCODE[KEY_KEY_Z            ] = Key::Z;  // Z key 
-				irr2ceCODE[KEY_LWIN             ] = Key::LeftWindows;  // Left Windows key (Microsoft\xAE Natural\xAE keyboard)  
-				irr2ceCODE[KEY_RWIN             ] = Key::RightWindow;  // Right Windows key (Natural keyboard)  
-				irr2ceCODE[KEY_APPS             ] = Key::AppMenu;  //Applications key (Natural keyboard)  
-				irr2ceCODE[KEY_SLEEP            ] = Key::Sleep;  // Computer Sleep key 
-				irr2ceCODE[KEY_NUMPAD0          ] = Key::Numpad0;  // Numeric keypad 0 key  
-				irr2ceCODE[KEY_NUMPAD1          ] = Key::Numpad1;  // Numeric keypad 1 key  
-				irr2ceCODE[KEY_NUMPAD2          ] = Key::Numpad2;  // Numeric keypad 2 key  
-				irr2ceCODE[KEY_NUMPAD3          ] = Key::Numpad3;  // Numeric keypad 3 key  
-				irr2ceCODE[KEY_NUMPAD4          ] = Key::Numpad4;  // Numeric keypad 4 key  
-				irr2ceCODE[KEY_NUMPAD5          ] = Key::Numpad5;  // Numeric keypad 5 key  
-				irr2ceCODE[KEY_NUMPAD6          ] = Key::Numpad6;  // Numeric keypad 6 key  
-				irr2ceCODE[KEY_NUMPAD7          ] = Key::Numpad7;  // Numeric keypad 7 key  
-				irr2ceCODE[KEY_NUMPAD8          ] = Key::Numpad8;  // Numeric keypad 8 key  
-				irr2ceCODE[KEY_NUMPAD9          ] = Key::Numpad9;  // Numeric keypad 9 key  
-				irr2ceCODE[KEY_MULTIPLY         ] = Key::Multiply;  // Multiply key  
-				irr2ceCODE[KEY_ADD              ] = Key::Add;  // Add key  
-				irr2ceCODE[KEY_SEPARATOR        ] = 0;  // Separator key  
-				irr2ceCODE[KEY_SUBTRACT         ] = Key::Subtract;  // Subtract key  
-				irr2ceCODE[KEY_DECIMAL          ] = Key::Decimal;  // Decimal key  
-				irr2ceCODE[KEY_DIVIDE           ] = Key::Divide;  // Divide key  
-				irr2ceCODE[KEY_F1               ] = Key::F1;   // F1 key  
-				irr2ceCODE[KEY_F2               ] = Key::F2;   // F2 key  
-				irr2ceCODE[KEY_F3               ] = Key::F3;   // F3 key  
-				irr2ceCODE[KEY_F4               ] = Key::F4;   // F4 key  
-				irr2ceCODE[KEY_F5               ] = Key::F5;   // F5 key  
-				irr2ceCODE[KEY_F6               ] = Key::F6;   // F6 key  
-				irr2ceCODE[KEY_F7               ] = Key::F7;   // F7 key  
-				irr2ceCODE[KEY_F8               ] = Key::F8;   // F8 key  
-				irr2ceCODE[KEY_F9               ] = Key::F9;   // F9 key  
-				irr2ceCODE[KEY_F10              ] = Key::F10;  // F10 key  
-				irr2ceCODE[KEY_F11              ] = Key::F11;  // F11 key  
-				irr2ceCODE[KEY_F12              ] = Key::F12;  // F12 key  
-				irr2ceCODE[KEY_F13              ] = Key::F13;  // F13 key  
-				irr2ceCODE[KEY_F14              ] = Key::F14;  // F14 key  
-				irr2ceCODE[KEY_F15              ] = Key::F15;  // F15 key  
-				irr2ceCODE[KEY_F16              ] = 0;  // F16 key  
-				irr2ceCODE[KEY_F17              ] = 0;  // F17 key  
-				irr2ceCODE[KEY_F18              ] = 0;  // F18 key  
-				irr2ceCODE[KEY_F19              ] = 0;  // F19 key  
-				irr2ceCODE[KEY_F20              ] = 0;  // F20 key  
-				irr2ceCODE[KEY_F21              ] = 0;  // F21 key  
-				irr2ceCODE[KEY_F22              ] = 0;  // F22 key  
-				irr2ceCODE[KEY_F23              ] = 0;  // F23 key  
-				irr2ceCODE[KEY_F24              ] = 0;  // F24 key  
-				irr2ceCODE[KEY_NUMLOCK          ] = Key::NumLock;  // NUM LOCK key  
-				irr2ceCODE[KEY_SCROLL           ] = Key::ScrollLock;  // SCROLL LOCK key  
-				irr2ceCODE[KEY_LSHIFT           ] = Key::LeftShift;  // Left SHIFT key 
-				irr2ceCODE[KEY_RSHIFT           ] = Key::RightShift;  // Right SHIFT key 
-				irr2ceCODE[KEY_LCONTROL         ] = Key::LeftControl;  // Left CONTROL key 
-				irr2ceCODE[KEY_RCONTROL         ] = Key::RightControl;  // Right CONTROL key 
-				irr2ceCODE[KEY_LMENU            ] = Key::LeftAlt;  // Left MENU key 
-				irr2ceCODE[KEY_RMENU            ] = Key::RightAlt;  // Right MENU key 
+				irr2ceCODE[KEY_EXECUT           ] = 0;  // EXECUTE key
+				irr2ceCODE[KEY_SNAPSHOT         ] = 0;  // PRINT SCREEN key
+				irr2ceCODE[KEY_INSERT           ] = Key::Insert;//0x2D;  // INS key
+				irr2ceCODE[KEY_DELETE           ] = Key::Delete;//0x2E;  // DEL key
+				irr2ceCODE[KEY_HELP             ] = 0;  // HELP key
+				irr2ceCODE[KEY_KEY_0            ] = Key::Zero;   // 0 key
+				irr2ceCODE[KEY_KEY_1            ] = Key::One;    // 1 key
+				irr2ceCODE[KEY_KEY_2            ] = Key::Two;    // 2 key
+				irr2ceCODE[KEY_KEY_3            ] = Key::Three;  // 3 key
+				irr2ceCODE[KEY_KEY_4            ] = Key::Four;   // 4 key
+				irr2ceCODE[KEY_KEY_5            ] = Key::Five;   // 5 key
+				irr2ceCODE[KEY_KEY_6            ] = Key::Six;    // 6 key
+				irr2ceCODE[KEY_KEY_7            ] = Key::Seven;  // 7 key
+				irr2ceCODE[KEY_KEY_8            ] = Key::Eight;  // 8 key
+				irr2ceCODE[KEY_KEY_9            ] = Key::Nine;   // 9 key
+				irr2ceCODE[KEY_KEY_A            ] = Key::A;  // A key
+				irr2ceCODE[KEY_KEY_B            ] = Key::B;  // B key
+				irr2ceCODE[KEY_KEY_C            ] = Key::C;  // C key
+				irr2ceCODE[KEY_KEY_D            ] = Key::D;  // D key
+				irr2ceCODE[KEY_KEY_E            ] = Key::E;  // E key
+				irr2ceCODE[KEY_KEY_F            ] = Key::F;  // F key
+				irr2ceCODE[KEY_KEY_G            ] = Key::G;  // G key
+				irr2ceCODE[KEY_KEY_H            ] = Key::H;  // H key
+				irr2ceCODE[KEY_KEY_I            ] = Key::I;  // I key
+				irr2ceCODE[KEY_KEY_J            ] = Key::J;  // J key
+				irr2ceCODE[KEY_KEY_K            ] = Key::K;  // K key
+				irr2ceCODE[KEY_KEY_L            ] = Key::L;  // L key
+				irr2ceCODE[KEY_KEY_M            ] = Key::M;  // M key
+				irr2ceCODE[KEY_KEY_N            ] = Key::N;  // N key
+				irr2ceCODE[KEY_KEY_O            ] = Key::O;  // O key
+				irr2ceCODE[KEY_KEY_P            ] = Key::P;  // P key
+				irr2ceCODE[KEY_KEY_Q            ] = Key::Q;  // Q key
+				irr2ceCODE[KEY_KEY_R            ] = Key::R;  // R key
+				irr2ceCODE[KEY_KEY_S            ] = Key::S;  // S key
+				irr2ceCODE[KEY_KEY_T            ] = Key::T;  // T key
+				irr2ceCODE[KEY_KEY_U            ] = Key::U;  // U key
+				irr2ceCODE[KEY_KEY_V            ] = Key::V;  // V key
+				irr2ceCODE[KEY_KEY_W            ] = Key::W;  // W key
+				irr2ceCODE[KEY_KEY_X            ] = Key::X;  // X key
+				irr2ceCODE[KEY_KEY_Y            ] = Key::Y;  // Y key
+				irr2ceCODE[KEY_KEY_Z            ] = Key::Z;  // Z key
+				irr2ceCODE[KEY_LWIN             ] = Key::LeftWindows;  // Left Windows key (Microsoft� Natural� keyboard)
+				irr2ceCODE[KEY_RWIN             ] = Key::RightWindow;  // Right Windows key (Natural keyboard)
+				irr2ceCODE[KEY_APPS             ] = Key::AppMenu;  //Applications key (Natural keyboard)
+				irr2ceCODE[KEY_SLEEP            ] = Key::Sleep;  // Computer Sleep key
+				irr2ceCODE[KEY_NUMPAD0          ] = Key::Numpad0;  // Numeric keypad 0 key
+				irr2ceCODE[KEY_NUMPAD1          ] = Key::Numpad1;  // Numeric keypad 1 key
+				irr2ceCODE[KEY_NUMPAD2          ] = Key::Numpad2;  // Numeric keypad 2 key
+				irr2ceCODE[KEY_NUMPAD3          ] = Key::Numpad3;  // Numeric keypad 3 key
+				irr2ceCODE[KEY_NUMPAD4          ] = Key::Numpad4;  // Numeric keypad 4 key
+				irr2ceCODE[KEY_NUMPAD5          ] = Key::Numpad5;  // Numeric keypad 5 key
+				irr2ceCODE[KEY_NUMPAD6          ] = Key::Numpad6;  // Numeric keypad 6 key
+				irr2ceCODE[KEY_NUMPAD7          ] = Key::Numpad7;  // Numeric keypad 7 key
+				irr2ceCODE[KEY_NUMPAD8          ] = Key::Numpad8;  // Numeric keypad 8 key
+				irr2ceCODE[KEY_NUMPAD9          ] = Key::Numpad9;  // Numeric keypad 9 key
+				irr2ceCODE[KEY_MULTIPLY         ] = Key::Multiply;  // Multiply key
+				irr2ceCODE[KEY_ADD              ] = Key::Add;  // Add key
+				irr2ceCODE[KEY_SEPARATOR        ] = 0;  // Separator key
+				irr2ceCODE[KEY_SUBTRACT         ] = Key::Subtract;  // Subtract key
+				irr2ceCODE[KEY_DECIMAL          ] = Key::Decimal;  // Decimal key
+				irr2ceCODE[KEY_DIVIDE           ] = Key::Divide;  // Divide key
+				irr2ceCODE[KEY_F1               ] = Key::F1;   // F1 key
+				irr2ceCODE[KEY_F2               ] = Key::F2;   // F2 key
+				irr2ceCODE[KEY_F3               ] = Key::F3;   // F3 key
+				irr2ceCODE[KEY_F4               ] = Key::F4;   // F4 key
+				irr2ceCODE[KEY_F5               ] = Key::F5;   // F5 key
+				irr2ceCODE[KEY_F6               ] = Key::F6;   // F6 key
+				irr2ceCODE[KEY_F7               ] = Key::F7;   // F7 key
+				irr2ceCODE[KEY_F8               ] = Key::F8;   // F8 key
+				irr2ceCODE[KEY_F9               ] = Key::F9;   // F9 key
+				irr2ceCODE[KEY_F10              ] = Key::F10;  // F10 key
+				irr2ceCODE[KEY_F11              ] = Key::F11;  // F11 key
+				irr2ceCODE[KEY_F12              ] = Key::F12;  // F12 key
+				irr2ceCODE[KEY_F13              ] = Key::F13;  // F13 key
+				irr2ceCODE[KEY_F14              ] = Key::F14;  // F14 key
+				irr2ceCODE[KEY_F15              ] = Key::F15;  // F15 key
+				irr2ceCODE[KEY_F16              ] = 0;  // F16 key
+				irr2ceCODE[KEY_F17              ] = 0;  // F17 key
+				irr2ceCODE[KEY_F18              ] = 0;  // F18 key
+				irr2ceCODE[KEY_F19              ] = 0;  // F19 key
+				irr2ceCODE[KEY_F20              ] = 0;  // F20 key
+				irr2ceCODE[KEY_F21              ] = 0;  // F21 key
+				irr2ceCODE[KEY_F22              ] = 0;  // F22 key
+				irr2ceCODE[KEY_F23              ] = 0;  // F23 key
+				irr2ceCODE[KEY_F24              ] = 0;  // F24 key
+				irr2ceCODE[KEY_NUMLOCK          ] = Key::NumLock;  // NUM LOCK key
+				irr2ceCODE[KEY_SCROLL           ] = Key::ScrollLock;  // SCROLL LOCK key
+				irr2ceCODE[KEY_LSHIFT           ] = Key::LeftShift;  // Left SHIFT key
+				irr2ceCODE[KEY_RSHIFT           ] = Key::RightShift;  // Right SHIFT key
+				irr2ceCODE[KEY_LCONTROL         ] = Key::LeftControl;  // Left CONTROL key
+				irr2ceCODE[KEY_RCONTROL         ] = Key::RightControl;  // Right CONTROL key
+				irr2ceCODE[KEY_LMENU            ] = Key::LeftAlt;  // Left MENU key
+				irr2ceCODE[KEY_RMENU            ] = Key::RightAlt;  // Right MENU key
 				irr2ceCODE[KEY_COMMA            ] = Key::Comma;//0xBC;  // Comma Key  (;)
 				irr2ceCODE[KEY_PLUS             ] = Key::Add;  // Plus Key   (+)
 				irr2ceCODE[KEY_MINUS            ] = Key::Minus;  // Minus Key  (-)
 				irr2ceCODE[KEY_PERIOD           ] = Key::Period;//0xBE;  // Period Key (.)
-				irr2ceCODE[KEY_ATTN             ] = 0;  // Attn key 
-				irr2ceCODE[KEY_CRSEL            ] = 0;  // CrSel key 
-				irr2ceCODE[KEY_EXSEL            ] = 0;  // ExSel key 
+				irr2ceCODE[KEY_ATTN             ] = 0;  // Attn key
+				irr2ceCODE[KEY_CRSEL            ] = 0;  // CrSel key
+				irr2ceCODE[KEY_EXSEL            ] = 0;  // ExSel key
 				irr2ceCODE[KEY_EREOF            ] = 0;  // Erase EOF key
-				irr2ceCODE[KEY_PLAY             ] = 0;  // Play key 
-				irr2ceCODE[KEY_ZOOM             ] = 0;  // Zoom key 
-				irr2ceCODE[KEY_PA1              ] = 0;  // PA1 key 
-				irr2ceCODE[KEY_OEM_CLEAR        ] = 0;  // Clear key 
+				irr2ceCODE[KEY_PLAY             ] = 0;  // Play key
+				irr2ceCODE[KEY_ZOOM             ] = 0;  // Zoom key
+				irr2ceCODE[KEY_PA1              ] = 0;  // PA1 key
+				irr2ceCODE[KEY_OEM_CLEAR        ] = 0;  // Clear key
 			}
 
-			/*! translate the irrlicht keycode to cegui keycode 
+			/*! translate the irrlicht keycode to cegui keycode
 			\param kc
 			the irrlicht keycode
 
-			\return 
+			\return
 			the cegui keycode
 			*/
 			uchar getKeyCode(irr::EKEY_CODE kc)

Modified: cegui_mk2/branches/v0-6/include/CEGUISystem.h
===================================================================
--- cegui_mk2/branches/v0-6/include/CEGUISystem.h	2008-05-21 10:07:42 UTC (rev 1709)
+++ cegui_mk2/branches/v0-6/include/CEGUISystem.h	2008-05-21 18:23:27 UTC (rev 1710)
@@ -430,7 +430,7 @@
 
 	\param filename
 		String object holding the filename of the script file that is to be executed
-		
+
 	\param resourceGroup
 		Resource group identifier to be passed to the ResourceProvider when loading the script file.
 	*/
@@ -883,6 +883,9 @@
     //! handle cleanup of the XML parser
     void cleanupXMLParser();
 
+    //! common function used for injection of mouse positions and movements
+    bool mouseMoveInjection_impl(MouseEventArgs& ma);
+
 	/*************************************************************************
 		Handlers for System events
 	*************************************************************************/

Modified: cegui_mk2/branches/v0-6/src/CEGUISystem.cpp
===================================================================
--- cegui_mk2/branches/v0-6/src/CEGUISystem.cpp	2008-05-21 10:07:42 UTC (rev 1709)
+++ cegui_mk2/branches/v0-6/src/CEGUISystem.cpp	2008-05-21 18:23:27 UTC (rev 1710)
@@ -679,65 +679,23 @@
 *************************************************************************/
 bool System::injectMouseMove(float delta_x, float delta_y)
 {
-	MouseEventArgs ma(0);
-	MouseCursor& mouse = MouseCursor::getSingleton();
+    MouseEventArgs ma(0);
+    MouseCursor& mouse = MouseCursor::getSingleton();
 
-	ma.moveDelta.d_x = delta_x * d_mouseScalingFactor;
-	ma.moveDelta.d_y = delta_y * d_mouseScalingFactor;
-	ma.sysKeys = d_sysKeys;
-	ma.wheelChange = 0;
-	ma.clickCount = 0;
-	ma.button = NoButton;
+    ma.moveDelta.d_x = delta_x * d_mouseScalingFactor;
+    ma.moveDelta.d_y = delta_y * d_mouseScalingFactor;
+    ma.sysKeys = d_sysKeys;
+    ma.wheelChange = 0;
+    ma.clickCount = 0;
+    ma.button = NoButton;
 
-	// move the mouse cursor & update position in args.
-	mouse.offsetPosition(ma.moveDelta);
-	ma.position = mouse.getPosition();
+    // move the mouse cursor & update position in args.
+    mouse.offsetPosition(ma.moveDelta);
+    ma.position = mouse.getPosition();
 
-	Window* dest_window = getTargetWindow(ma.position);
-
-    // has window containing mouse changed?
-    if (dest_window != d_wndWithMouse)
-    {
-        // store previous window that contained mouse
-        Window* oldWindow = d_wndWithMouse;
-        // set the new window that contains the mouse.
-        d_wndWithMouse = dest_window;
-
-        // inform previous window the mouse has left it
-        if (oldWindow)
-        {
-            ma.window = oldWindow;
-            oldWindow->onMouseLeaves(ma);
-        }
-
-        // inform window containing mouse that mouse has entered it
-        if (d_wndWithMouse)
-        {
-            ma.window = d_wndWithMouse;
-            ma.handled = false;
-            d_wndWithMouse->onMouseEnters(ma);
-        }
-    }
-
-    // inform appropriate window of the mouse movement event
-    if (dest_window)
-    {
-        // ensure event starts as 'not handled'
-        ma.handled = false;
-
-        // loop backwards until event is handled or we run out of windows.
-        while ((!ma.handled) && (dest_window != 0))
-        {
-            ma.window = dest_window;
-            dest_window->onMouseMove(ma);
-            dest_window = getNextTargetWindow(dest_window);
-        }
-    }
-
-	return ma.handled;
+    return mouseMoveInjection_impl(ma);
 }
 
-
 /*************************************************************************
 	Method that injects that the mouse is leaves the application window
 *************************************************************************/
@@ -1027,11 +985,23 @@
 *************************************************************************/
 bool System::injectMousePosition(float x_pos, float y_pos)
 {
-	// set new mouse position
-	MouseCursor::getSingleton().setPosition(Point(x_pos, y_pos));
+    Point new_position(x_pos, y_pos);
+    MouseCursor& mouse = MouseCursor::getSingleton();
 
-	// do the real work
-	return injectMouseMove(0, 0);
+    // setup mouse movement event args object.
+    MouseEventArgs ma(0);
+    ma.moveDelta = new_position - mouse.getPosition();
+    ma.sysKeys = d_sysKeys;
+    ma.wheelChange = 0;
+    ma.clickCount = 0;
+    ma.button = NoButton;
+
+    // move mouse cursor to new position
+    mouse.setPosition(new_position);
+    // update position in args (since actual position may be constrained)
+    ma.position = mouse.getPosition();
+
+    return mouseMoveInjection_impl(ma);
 }
 
 
@@ -1615,5 +1585,54 @@
     return d_defaultXMLParserName;
 }
 
+//----------------------------------------------------------------------------//
+bool System::mouseMoveInjection_impl(MouseEventArgs& ma)
+{
+    Window* dest_window = getTargetWindow(ma.position);
 
+    // has window containing mouse changed?
+    if (dest_window != d_wndWithMouse)
+    {
+        // store previous window that contained mouse
+        Window* oldWindow = d_wndWithMouse;
+        // set the new window that contains the mouse.
+        d_wndWithMouse = dest_window;
+
+        // inform previous window the mouse has left it
+        if (oldWindow)
+        {
+            ma.window = oldWindow;
+            oldWindow->onMouseLeaves(ma);
+        }
+
+        // inform window containing mouse that mouse has entered it
+        if (d_wndWithMouse)
+        {
+            ma.window = d_wndWithMouse;
+            ma.handled = false;
+            d_wndWithMouse->onMouseEnters(ma);
+        }
+    }
+
+    // inform appropriate window of the mouse movement event
+    if (dest_window)
+    {
+        // ensure event starts as 'not handled'
+        ma.handled = false;
+
+        // loop backwards until event is handled or we run out of windows.
+        while ((!ma.handled) && (dest_window != 0))
+        {
+            ma.window = dest_window;
+            dest_window->onMouseMove(ma);
+            dest_window = getNextTargetWindow(dest_window);
+        }
+    }
+
+    return ma.handled;
+}
+
+//----------------------------------------------------------------------------//
+
+
 } // End of  CEGUI namespace section


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Thread View

Thread	Author	Date
[Crayzedsgui-cvsmk2] SF.net SVN: crayzedsgui: [1610] cegui_mk2/branches/v0-6	<ice-drezday@us...>

[Crayzedsgui-cvsmk2] SF.net SVN: crayzedsgui: [1611] cegui_mk2/branches/v0-6

From: <ice-drezday@us...> - 2008-03-15 15:05

Revision: 1611
          http://crayzedsgui.svn.sourceforge.net/crayzedsgui/?rev=1611&view=rev
Author:   ice-drezday
Date:     2008-03-15 08:05:05 -0700 (Sat, 15 Mar 2008)

Log Message:
-----------
FIX: InstancedWindows sample was missing from autotools build.

Modified Paths:
--------------
    cegui_mk2/branches/v0-6/Samples/InstancedWindows/src/Instanced.cpp
    cegui_mk2/branches/v0-6/Samples/Makefile.am
    cegui_mk2/branches/v0-6/configure.ac

Added Paths:
-----------
    cegui_mk2/branches/v0-6/Samples/InstancedWindows/Makefile.am
    cegui_mk2/branches/v0-6/Samples/InstancedWindows/include/Makefile.am
    cegui_mk2/branches/v0-6/Samples/InstancedWindows/src/Makefile.am

Copied: cegui_mk2/branches/v0-6/Samples/InstancedWindows/Makefile.am (from rev 1610, cegui_mk2/branches/v0-6/Samples/TreeDemo/Makefile.am)
===================================================================
--- cegui_mk2/branches/v0-6/Samples/InstancedWindows/Makefile.am	                        (rev 0)
+++ cegui_mk2/branches/v0-6/Samples/InstancedWindows/Makefile.am	2008-03-15 15:05:05 UTC (rev 1611)
@@ -0,0 +1 @@
+SUBDIRS = src include 

Copied: cegui_mk2/branches/v0-6/Samples/InstancedWindows/include/Makefile.am (from rev 1610, cegui_mk2/branches/v0-6/Samples/TreeDemo/include/Makefile.am)
===================================================================
--- cegui_mk2/branches/v0-6/Samples/InstancedWindows/include/Makefile.am	                        (rev 0)
+++ cegui_mk2/branches/v0-6/Samples/InstancedWindows/include/Makefile.am	2008-03-15 15:05:05 UTC (rev 1611)
@@ -0,0 +1 @@
+noinst_HEADERS = Instanced.h

Modified: cegui_mk2/branches/v0-6/Samples/InstancedWindows/src/Instanced.cpp
===================================================================
--- cegui_mk2/branches/v0-6/Samples/InstancedWindows/src/Instanced.cpp	2008-03-15 09:30:22 UTC (rev 1610)
+++ cegui_mk2/branches/v0-6/Samples/InstancedWindows/src/Instanced.cpp	2008-03-15 15:05:05 UTC (rev 1611)
@@ -67,4 +67,4 @@
 void DemoInstanced::cleanupSample()
 {
 	delete System::getSingleton().getScriptingModule();
-}
\ No newline at end of file
+}

Copied: cegui_mk2/branches/v0-6/Samples/InstancedWindows/src/Makefile.am (from rev 1610, cegui_mk2/branches/v0-6/Samples/TreeDemo/src/Makefile.am)
===================================================================
--- cegui_mk2/branches/v0-6/Samples/InstancedWindows/src/Makefile.am	                        (rev 0)
+++ cegui_mk2/branches/v0-6/Samples/InstancedWindows/src/Makefile.am	2008-03-15 15:05:05 UTC (rev 1611)
@@ -0,0 +1,14 @@
+INCLUDES = -I$(top_srcdir)/Samples/Instanced/include \
+           -I$(top_srcdir)/include \
+           -I$(top_srcdir)/Samples/common/include \
+           -I$(top_srcdir)/ScriptingModules/CEGUILua/LuaScriptModule/include \
+           -I$(top_srcdir)/ScriptingModules/CEGUILua/tolua++
+
+noinst_PROGRAMS = InstancedWindows
+
+InstancedWindows_SOURCES = Instanced.cpp
+InstancedWindows_LDFLAGS = -L$(top_builddir)/src -L$(top_builddir)/Samples/common/src -L$(top_builddir)/ScriptingModules/CEGUILua/LuaScriptModule/src -L$(top_builddir)/ScriptingModules/CEGUILua/tolua++
+InstancedWindows_LDADD = -lCEGUIBase -lCEGUISampleHelper -lCEGUILuaScriptModule -lCEGUItoluapp
+
+install-exec-local:
+	$(LN_S) -f `pwd`/.libs/InstancedWindows$(EXEEXT) $(top_builddir)/Samples/bin/InstancedWindows$(EXEEXT)

Modified: cegui_mk2/branches/v0-6/Samples/Makefile.am
===================================================================
--- cegui_mk2/branches/v0-6/Samples/Makefile.am	2008-03-15 09:30:22 UTC (rev 1610)
+++ cegui_mk2/branches/v0-6/Samples/Makefile.am	2008-03-15 15:05:05 UTC (rev 1611)
@@ -11,6 +11,7 @@
           FirstWindow \
           FalagardDemo1 \
           FontDemo \
+          InstancedWindows \
           Minesweeper \
           ScrollablePaneDemo \
           TabControlDemo \

Modified: cegui_mk2/branches/v0-6/configure.ac
===================================================================
--- cegui_mk2/branches/v0-6/configure.ac	2008-03-15 09:30:22 UTC (rev 1610)
+++ cegui_mk2/branches/v0-6/configure.ac	2008-03-15 15:05:05 UTC (rev 1611)
@@ -140,6 +140,9 @@
                  Samples/FirstWindow/src/Makefile
                  Samples/FontDemo/Makefile
                  Samples/FontDemo/src/Makefile
+                 Samples/InstancedWindows/Makefile
+                 Samples/InstancedWindows/include/Makefile
+                 Samples/InstancedWindows/src/Makefile
                  Samples/Minesweeper/Makefile
                  Samples/Minesweeper/src/Makefile
                  Samples/ScrollablePaneDemo/Makefile


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Crayzedsgui-cvsmk2] SF.net SVN: crayzedsgui: [1617] cegui_mk2/branches/v0-6

From: <ice-drezday@us...> - 2008-03-15 16:51

Revision: 1617
          http://crayzedsgui.svn.sourceforge.net/crayzedsgui/?rev=1617&view=rev
Author:   ice-drezday
Date:     2008-03-15 09:51:39 -0700 (Sat, 15 Mar 2008)

Log Message:
-----------
FIX: autotools 'make install' fixed so that installation works when build is done out of tree.
FIX: autotools 'make dist' fixed so that it includes all files (for all systems).

Modified Paths:
--------------
    cegui_mk2/branches/v0-6/Makefile.am
    cegui_mk2/branches/v0-6/RendererModules/IrrlichtRenderer/Makefile.am
    cegui_mk2/branches/v0-6/Samples/Makefile.am
    cegui_mk2/branches/v0-6/Samples/datafiles/Makefile.am
    cegui_mk2/branches/v0-6/ScriptingModules/CEGUILua/LuaScriptModule/package/Makefile.am
    cegui_mk2/branches/v0-6/ScriptingModules/CEGUILua/tolua++/Makefile.am
    cegui_mk2/branches/v0-6/include/Makefile.am
    cegui_mk2/branches/v0-6/makefiles/Makefile.am

Modified: cegui_mk2/branches/v0-6/Makefile.am
===================================================================
--- cegui_mk2/branches/v0-6/Makefile.am	2008-03-15 16:42:04 UTC (rev 1616)
+++ cegui_mk2/branches/v0-6/Makefile.am	2008-03-15 16:51:39 UTC (rev 1617)
@@ -12,5 +12,11 @@
                       XMLRefSchema/Imageset.xsd \
                       XMLRefSchema/Readme.txt
 
-EXTRA_DIST=doxyfile \
-           TinyXML-License
\ No newline at end of file
+EXTRA_DIST=bootstrap \
+           doxyfile \
+           BuildDocs.bat \
+           ReadMe.html \
+           TinyXML-License \
+           bin \
+           documentation \
+           lib

Modified: cegui_mk2/branches/v0-6/RendererModules/IrrlichtRenderer/Makefile.am
===================================================================
--- cegui_mk2/branches/v0-6/RendererModules/IrrlichtRenderer/Makefile.am	2008-03-15 16:42:04 UTC (rev 1616)
+++ cegui_mk2/branches/v0-6/RendererModules/IrrlichtRenderer/Makefile.am	2008-03-15 16:51:39 UTC (rev 1617)
@@ -26,3 +26,5 @@
                                       IrrlichtResourceProvider.cpp \
                                       irrlichttexture.cpp \
                                       IrrlichtMemoryFile.cpp
+
+EXTRA_DIST = Readme.txt

Modified: cegui_mk2/branches/v0-6/Samples/Makefile.am
===================================================================
--- cegui_mk2/branches/v0-6/Samples/Makefile.am	2008-03-15 16:42:04 UTC (rev 1616)
+++ cegui_mk2/branches/v0-6/Samples/Makefile.am	2008-03-15 16:51:39 UTC (rev 1617)
@@ -4,7 +4,8 @@
 CEGUILUA_DEMOS=Demo8 InstancedWindows
 endif
 
-SUBDIRS = common \
+SUBDIRS = . \
+          common \
           datafiles \
           Demo6 \
           Demo7 \
@@ -21,3 +22,8 @@
 
 EXTRA_DIST = ReadMe.txt \
              bin/keepme
+
+install-exec-local:
+	if test ! -d $(top_builddir)/Samples/bin ; then \
+		mkdir $(top_builddir)/Samples/bin ; \
+	fi

Modified: cegui_mk2/branches/v0-6/Samples/datafiles/Makefile.am
===================================================================
--- cegui_mk2/branches/v0-6/Samples/datafiles/Makefile.am	2008-03-15 16:42:04 UTC (rev 1616)
+++ cegui_mk2/branches/v0-6/Samples/datafiles/Makefile.am	2008-03-15 16:51:39 UTC (rev 1617)
@@ -35,6 +35,7 @@
              layouts/TabPage.layout \
              layouts/TabPage1.layout \
              layouts/TabPage2.layout \
+             layouts/TextDemo.layout \
              layouts/TreeDemoTaharez.layout \
              layouts/VanillaConsole.layout \
              layouts/VanillaWindows.layout \

Modified: cegui_mk2/branches/v0-6/ScriptingModules/CEGUILua/LuaScriptModule/package/Makefile.am
===================================================================
--- cegui_mk2/branches/v0-6/ScriptingModules/CEGUILua/LuaScriptModule/package/Makefile.am	2008-03-15 16:42:04 UTC (rev 1616)
+++ cegui_mk2/branches/v0-6/ScriptingModules/CEGUILua/LuaScriptModule/package/Makefile.am	2008-03-15 16:51:39 UTC (rev 1617)
@@ -19,6 +19,7 @@
              Renderer.pkg \
              Scheme.pkg \
              SchemeManager.pkg \
+             ScriptWindowHelper.pkg \
              System.pkg \
              Texture.pkg \
              UnifiedCoordSystem.pkg \
@@ -33,6 +34,7 @@
              elements/DragContainer.pkg \
              elements/Editbox.pkg \
              elements/FrameWindow.pkg \
+             elements/GroupBox.pkg \
              elements/GUISheet.pkg \
              elements/ItemEntry.pkg \
              elements/ItemListBase.pkg \
@@ -62,6 +64,8 @@
              elements/Thumb.pkg \
              elements/Titlebar.pkg \
              elements/Tooltip.pkg \
+             elements/Tree.pkg \
+             elements/TreeItem.pkg \
              falagard/Dimension.pkg \
              falagard/Enums.pkg \
              falagard/FalagardComponentBase.pkg \

Modified: cegui_mk2/branches/v0-6/ScriptingModules/CEGUILua/tolua++/Makefile.am
===================================================================
--- cegui_mk2/branches/v0-6/ScriptingModules/CEGUILua/tolua++/Makefile.am	2008-03-15 16:42:04 UTC (rev 1616)
+++ cegui_mk2/branches/v0-6/ScriptingModules/CEGUILua/tolua++/Makefile.am	2008-03-15 16:51:39 UTC (rev 1617)
@@ -21,3 +21,5 @@
 
 noinst_HEADERS = tolua_event.h
 pkginclude_HEADERS = tolua++.h
+
+EXTRA_DIST = INFO

Modified: cegui_mk2/branches/v0-6/include/Makefile.am
===================================================================
--- cegui_mk2/branches/v0-6/include/Makefile.am	2008-03-15 16:42:04 UTC (rev 1616)
+++ cegui_mk2/branches/v0-6/include/Makefile.am	2008-03-15 16:51:39 UTC (rev 1617)
@@ -57,6 +57,7 @@
                  CEGUIString.h \
                  CEGUISubscriberSlot.h \
                  CEGUISystem.h \
+                 CEGUITask.h \
                  CEGUITextUtils.h \
                  CEGUITexture.h \
                  CEGUIUDim.h \
@@ -75,7 +76,7 @@
                  CEGUIXMLHandler.h \
                  CEGUIXMLParser.h \
                  CEGUIXMLSerializer.h \
-                 CEGUIcolour.h 
+                 CEGUIcolour.h
 
 noinst_HEADERS = CEGUIFreeTypeFont.h \
                  CEGUIPixmapFont.h

Modified: cegui_mk2/branches/v0-6/makefiles/Makefile.am
===================================================================
--- cegui_mk2/branches/v0-6/makefiles/Makefile.am	2008-03-15 16:42:04 UTC (rev 1616)
+++ cegui_mk2/branches/v0-6/makefiles/Makefile.am	2008-03-15 16:51:39 UTC (rev 1617)
@@ -13,6 +13,9 @@
              mac/Xcode2/CrazyEddiesGUI/CEGUIWindowsLook-Info.plist \
              mac/Xcode2/CrazyEddiesGUI/CEGUIXercesParser-Info.plist \
              mac/Xcode2/CrazyEddiesGUI/CrazyEddiesGUI_Prefix.pch \
+             mac/Xcode2/CrazyEddiesGUI/FalagardDemo1-Info.plist \
+             mac/Xcode2/CrazyEddiesGUI/FirstWindow-Info.plist \
+             mac/Xcode2/CrazyEddiesGUI/FontDemo-Info.plist \
              mac/Xcode2/CrazyEddiesGUI/Info.plist \
              mac/Xcode2/CrazyEddiesGUI/LuaScriptModule-Info.plist \
              mac/Xcode2/CrazyEddiesGUI/Minesweeper-Info.plist \
@@ -51,10 +54,12 @@
              premake/Samples/FalagardDemo1/premake.lua \
              premake/Samples/FirstWindow/premake.lua \
              premake/Samples/FontDemo/premake.lua \
+             premake/Samples/InstancedWindows/premake.lua \
              premake/Samples/Medieval/premake.lua \
              premake/Samples/Minesweeper/premake.lua \
              premake/Samples/ScrollablePaneDemo/premake.lua \
              premake/Samples/TabControlDemo/premake.lua \
+             premake/Samples/TreeDemo/premake.lua \
              premake/Samples/common/premake.lua \
              premake/ScriptingModules/CEGUILua/LuaScriptModule/premake.lua \
              premake/ScriptingModules/CEGUILua/tolua++/premake.lua \


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Crayzedsgui-cvsmk2] SF.net SVN: crayzedsgui: [1689] cegui_mk2/branches/v0-6

From: <ice-drezday@us...> - 2008-04-06 15:06

Revision: 1689
          http://crayzedsgui.svn.sourceforge.net/crayzedsgui/?rev=1689&view=rev
Author:   ice-drezday
Date:     2008-04-06 08:05:50 -0700 (Sun, 06 Apr 2008)

Log Message:
-----------
MOD: Bump version of this branch.
FIX: tolua++cegui generator missing Lua_CFLAGS in autotools build.

Modified Paths:
--------------
    cegui_mk2/branches/v0-6/ScriptingModules/CEGUILua/tolua++bin/Makefile.am
    cegui_mk2/branches/v0-6/configure.ac
    cegui_mk2/branches/v0-6/include/CEGUIVersion.h

Modified: cegui_mk2/branches/v0-6/ScriptingModules/CEGUILua/tolua++bin/Makefile.am
===================================================================
--- cegui_mk2/branches/v0-6/ScriptingModules/CEGUILua/tolua++bin/Makefile.am	2008-03-30 15:35:45 UTC (rev 1688)
+++ cegui_mk2/branches/v0-6/ScriptingModules/CEGUILua/tolua++bin/Makefile.am	2008-04-06 15:05:50 UTC (rev 1689)
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/ScriptingModules/CEGUILua/tolua++
+INCLUDES = $(Lua_CFLAGS) -I$(top_srcdir)/ScriptingModules/CEGUILua/tolua++
 
 bin_PROGRAMS = tolua++cegui
 tolua__cegui_SOURCES = tolua.c toluabind.c toluabind.h

Modified: cegui_mk2/branches/v0-6/configure.ac
===================================================================
--- cegui_mk2/branches/v0-6/configure.ac	2008-03-30 15:35:45 UTC (rev 1688)
+++ cegui_mk2/branches/v0-6/configure.ac	2008-04-06 15:05:50 UTC (rev 1689)
@@ -7,7 +7,7 @@
 dnl though this leaves nobody in any doubt about where this is being defined).
 m4_define([CEGUI_MAJ_VER], 0)
 m4_define([CEGUI_MIN_VER], 6)
-m4_define([CEGUI_REL_VER], 0)
+m4_define([CEGUI_REL_VER], 1)
 
 dnl Construct the final version number out of the sub-version values specified above
 m4_define([CEGUI_RELEASE_VERSION], [CEGUI_MAJ_VER.CEGUI_MIN_VER.CEGUI_REL_VER])

Modified: cegui_mk2/branches/v0-6/include/CEGUIVersion.h
===================================================================
--- cegui_mk2/branches/v0-6/include/CEGUIVersion.h	2008-03-30 15:35:45 UTC (rev 1688)
+++ cegui_mk2/branches/v0-6/include/CEGUIVersion.h	2008-04-06 15:05:50 UTC (rev 1689)
@@ -39,6 +39,6 @@
 //////////////////////////////////////////////////////////////////////////
 #define CEGUI_VERSION_MAJOR 0
 #define CEGUI_VERSION_MINOR 6
-#define CEGUI_VERSION_PATCH 0
+#define CEGUI_VERSION_PATCH 1
 
 #endif	// end of guard _CEGUIVersion_h_


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Crayzedsgui-cvsmk2] SF.net SVN: crayzedsgui: [1703] cegui_mk2/branches/v0-6

From: <ice-drezday@us...> - 2008-05-20 09:23

Revision: 1703
          http://crayzedsgui.svn.sourceforge.net/crayzedsgui/?rev=1703&view=rev
Author:   ice-drezday
Date:     2008-05-20 02:21:23 -0700 (Tue, 20 May 2008)

Log Message:
-----------
FIX: Hiding the active window would leave the hidden window active and receiving inputs; it was also possible to activate a hidden window which is not logical.  See: http://www.cegui.org.uk/mantis/view.php?id=188

Modified Paths:
--------------
    cegui_mk2/branches/v0-6/include/CEGUIWindow.h
    cegui_mk2/branches/v0-6/src/CEGUIWindow.cpp

Modified: cegui_mk2/branches/v0-6/include/CEGUIWindow.h
===================================================================
--- cegui_mk2/branches/v0-6/include/CEGUIWindow.h	2008-05-19 19:35:45 UTC (rev 1702)
+++ cegui_mk2/branches/v0-6/include/CEGUIWindow.h	2008-05-20 09:21:23 UTC (rev 1703)
@@ -1340,6 +1340,12 @@
         - true to make the Window visible.
         - false to make the Window hidden.
 
+    \note
+        Hiding the active window will cause that window to become deactivated.
+        Showing a window does not, however, automatically cause that window to
+        become the active window (call Window::activate after making the window
+        visible to activate it).
+
     \return
         Nothing
     */
@@ -1347,8 +1353,13 @@
 
     /*!
     \brief
-        show the Window
+        show the Window.
 
+    \note
+        Showing a window does not automatically activate the window.  If you
+        want the window to also become active you will need to call the
+        Window::activate member also.
+
     \return
         Nothing
     */
@@ -1357,6 +1368,9 @@
     /*!
     \brief
         hide the Window.
+    \note
+        If the window is the active window, it will become deactivated as a
+        result of being hidden.
 
     \return
         Nothing

Modified: cegui_mk2/branches/v0-6/src/CEGUIWindow.cpp
===================================================================
--- cegui_mk2/branches/v0-6/src/CEGUIWindow.cpp	2008-05-19 19:35:45 UTC (rev 1702)
+++ cegui_mk2/branches/v0-6/src/CEGUIWindow.cpp	2008-05-20 09:21:23 UTC (rev 1703)
@@ -882,6 +882,11 @@
 *************************************************************************/
 void Window::activate(void)
 {
+    // exit if the window is not visible, since a hidden window may not be the
+    // active window.
+    if (!isVisible())
+        return;
+
 	// force complete release of input capture.
 	// NB: This is not done via releaseCapture() because that has
 	// different behaviour depending on the restoreOldCapture setting.
@@ -2686,6 +2691,10 @@
 
 void Window::onHidden(WindowEventArgs& e)
 {
+    // first deactivate window if it is the active window.
+    if (isActive())
+        deactivate();
+
 	requestRedraw();
 	fireEvent(EventHidden, e, EventNamespace);
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Crayzedsgui-cvsmk2] SF.net SVN: crayzedsgui: [1704] cegui_mk2/branches/v0-6

From: <ice-drezday@us...> - 2008-05-20 10:30

Revision: 1704
          http://crayzedsgui.svn.sourceforge.net/crayzedsgui/?rev=1704&view=rev
Author:   ice-drezday
Date:     2008-05-20 03:29:38 -0700 (Tue, 20 May 2008)

Log Message:
-----------
FIX: Missing winmm library dependency for MinGW32 autotool based builds.  See: http://www.cegui.org.uk/mantis/view.php?id=183

Modified Paths:
--------------
    cegui_mk2/branches/v0-6/CEGUI-OPENGL.pc.in
    cegui_mk2/branches/v0-6/CEGUI.pc.in
    cegui_mk2/branches/v0-6/configure.ac
    cegui_mk2/branches/v0-6/src/Makefile.am

Modified: cegui_mk2/branches/v0-6/CEGUI-OPENGL.pc.in
===================================================================
--- cegui_mk2/branches/v0-6/CEGUI-OPENGL.pc.in	2008-05-20 09:21:23 UTC (rev 1703)
+++ cegui_mk2/branches/v0-6/CEGUI-OPENGL.pc.in	2008-05-20 10:29:38 UTC (rev 1704)
@@ -7,5 +7,5 @@
 Name: CEGUI
 Description: The free GUI library for games and multi-media development.
 Version: @VERSION@
-Libs: -L${libdir} -lCEGUIBase -lCEGUIOpenGLRenderer
+Libs: -L${libdir} -lCEGUIBase -lCEGUIOpenGLRenderer @cegui_pc_platform_libs@
 Cflags: -I${includedir}/@PACKAGE@

Modified: cegui_mk2/branches/v0-6/CEGUI.pc.in
===================================================================
--- cegui_mk2/branches/v0-6/CEGUI.pc.in	2008-05-20 09:21:23 UTC (rev 1703)
+++ cegui_mk2/branches/v0-6/CEGUI.pc.in	2008-05-20 10:29:38 UTC (rev 1704)
@@ -7,5 +7,5 @@
 Name: CEGUI
 Description: The free GUI library for games and multi-media development.
 Version: @VERSION@
-Libs: -L${libdir} -lCEGUIBase
+Libs: -L${libdir} -lCEGUIBase @cegui_pc_platform_libs@
 Cflags: -I${includedir} -I${includedir}/@PACKAGE@

Modified: cegui_mk2/branches/v0-6/configure.ac
===================================================================
--- cegui_mk2/branches/v0-6/configure.ac	2008-05-20 09:21:23 UTC (rev 1703)
+++ cegui_mk2/branches/v0-6/configure.ac	2008-05-20 10:29:38 UTC (rev 1704)
@@ -32,10 +32,16 @@
 
 # Setup some stuff depending on the system we're running on
 case $host_os in
-    *mingw32* ) MINGW32=yes;;
-            * ) MINGW32=no;;
+    *mingw32* ) MINGW32=yes
+                cegui_pc_platform_libs=-lwinmm
+                ;;
+            * ) MINGW32=no
+                cegui_pc_platform_libs=
+                ;;
 esac
 
+AC_SUBST(cegui_pc_platform_libs)
+
 AM_CONDITIONAL([MINGW32_BUILD], [test x$MINGW32 = xyes])
 
 # Checks for libraries (skip on mingw32).

Modified: cegui_mk2/branches/v0-6/src/Makefile.am
===================================================================
--- cegui_mk2/branches/v0-6/src/Makefile.am	2008-05-20 09:21:23 UTC (rev 1703)
+++ cegui_mk2/branches/v0-6/src/Makefile.am	2008-05-20 10:29:38 UTC (rev 1704)
@@ -1,14 +1,16 @@
 INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir) $(freetype2_CFLAGS) $(pcre_CFLAGS)
 
 libCEGUIBase_la_LDFLAGS =
+libCEGUIBase_la_LIBADD =
 
 if MINGW32_BUILD
 libCEGUIBase_la_CPPFLAGS = -DCEGUIBASE_EXPORTS
 libCEGUIBase_la_LDFLAGS += -shared -no-undefined
+libCEGUIBase_la_LIBADD += -lwinmm
 endif
 
 libCEGUIBase_la_LDFLAGS += -version-info @CEGUI_VERSION_INFO@
-libCEGUIBase_la_LIBADD = $(freetype2_LIBS) $(pcre_LIBS)
+libCEGUIBase_la_LIBADD += $(freetype2_LIBS) $(pcre_LIBS)
 
 lib_LTLIBRARIES=libCEGUIBase.la
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Crayzedsgui-cvsmk2] SF.net SVN: crayzedsgui: [1706] cegui_mk2/branches/v0-6

From: <ice-drezday@us...> - 2008-05-20 11:59

Revision: 1706
          http://crayzedsgui.svn.sourceforge.net/crayzedsgui/?rev=1706&view=rev
Author:   ice-drezday
Date:     2008-05-20 04:59:22 -0700 (Tue, 20 May 2008)

Log Message:
-----------
FIX: Issue with detection and usage of glut library under Msys/MinGW.  See: http://www.cegui.org.uk/mantis/view.php?id=184

Modified Paths:
--------------
    cegui_mk2/branches/v0-6/Samples/common/src/CEGuiOpenGLBaseApplication.cpp
    cegui_mk2/branches/v0-6/acinclude.m4

Modified: cegui_mk2/branches/v0-6/Samples/common/src/CEGuiOpenGLBaseApplication.cpp
===================================================================
--- cegui_mk2/branches/v0-6/Samples/common/src/CEGuiOpenGLBaseApplication.cpp	2008-05-20 11:03:43 UTC (rev 1705)
+++ cegui_mk2/branches/v0-6/Samples/common/src/CEGuiOpenGLBaseApplication.cpp	2008-05-20 11:59:22 UTC (rev 1706)
@@ -48,6 +48,9 @@
 #include <OpenGL/gl.h>
 #include <OpenGL/glu.h>
 #else
+#ifdef __MINGW32__
+#define GLUT_DISABLE_ATEXIT_HACK
+#endif
 #include <GL/glut.h>
 #ifdef __FREEGLUT_STD_H__
 #   include <GL/freeglut_ext.h>

Modified: cegui_mk2/branches/v0-6/acinclude.m4
===================================================================
--- cegui_mk2/branches/v0-6/acinclude.m4	2008-05-20 11:03:43 UTC (rev 1705)
+++ cegui_mk2/branches/v0-6/acinclude.m4	2008-05-20 11:59:22 UTC (rev 1706)
@@ -361,13 +361,21 @@
         AC_CHECK_LIB([opengl32], [main], [cegui_found_lib_GL=yes; LIBS="-lopengl32 $LIBS"], [cegui_found_lib_GL=no])
         AC_CHECK_LIB([glu32], [main], [cegui_found_lib_GLU=yes; LIBS="-lglu32 $LIBS"], [cegui_found_lib_GLU=no])
 
-        dnl Check for some glut variants.  Done like this because AC_SEARCH_LIBS did not work at all here
-        AC_CHECK_LIB([freeglut], [main], [cegui_found_lib_glut=yes; LIBS="-lfreeglut $LIBS"], [cegui_found_lib_glut=no])
-        if test x$cegui_found_lib_glut = xno; then
-            AC_CHECK_LIB([glut32], [main], [cegui_found_lib_glut=yes; LIBS="-lglut32 $LIBS"], [cegui_found_lib_glut=no])
+        dnl Check for glut header
+        AC_CHECK_HEADER([glut.h], [cegui_found_glut_h=yes],
+            [AC_CHECK_HEADER([GL/glut.h], [cegui_found_glut_h=yes], [cegui_found_glut_h=no])])
+
+        if test x$cegui_found_glut_h = xyes; then
+            dnl Check for some glut variants.  Done like this because AC_SEARCH_LIBS did not work at all here
+            AC_CHECK_LIB([freeglut], [main], [cegui_found_lib_glut=yes; LIBS="-lfreeglut $LIBS"], [cegui_found_lib_glut=no])
             if test x$cegui_found_lib_glut = xno; then
-                AC_CHECK_LIB([glut], [main], [cegui_found_lib_glut=yes; LIBS="-lglut $LIBS"], [cegui_found_lib_glut=no])
+                AC_CHECK_LIB([glut32], [main], [cegui_found_lib_glut=yes; LIBS="-lglut32 $LIBS"], [cegui_found_lib_glut=no])
+                if test x$cegui_found_lib_glut = xno; then
+                    AC_CHECK_LIB([glut], [main], [cegui_found_lib_glut=yes; LIBS="-lglut $LIBS"], [cegui_found_lib_glut=no])
+                fi
             fi
+        else
+            cegui_found_lib_glut=no
         fi
 
         OpenGL_CFLAGS=""


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Crayzedsgui-cvsmk2] SF.net SVN: crayzedsgui: [1707] cegui_mk2/branches/v0-6

From: <ice-drezday@us...> - 2008-05-20 20:09

Revision: 1707
          http://crayzedsgui.svn.sourceforge.net/crayzedsgui/?rev=1707&view=rev
Author:   ice-drezday
Date:     2008-05-20 13:09:17 -0700 (Tue, 20 May 2008)

Log Message:
-----------
ADD: New drag and drop demo.  Originally written to aid in debugging of an issue, but is otherwise useful as an example :)

Modified Paths:
--------------
    cegui_mk2/branches/v0-6/Samples/Makefile.am
    cegui_mk2/branches/v0-6/Samples/datafiles/Makefile.am
    cegui_mk2/branches/v0-6/configure.ac
    cegui_mk2/branches/v0-6/makefiles/Makefile.am
    cegui_mk2/branches/v0-6/makefiles/premake/samples.lua

Added Paths:
-----------
    cegui_mk2/branches/v0-6/Samples/DragDropDemo/
    cegui_mk2/branches/v0-6/Samples/DragDropDemo/Makefile.am
    cegui_mk2/branches/v0-6/Samples/DragDropDemo/Sample_DragDropDemo.cpp
    cegui_mk2/branches/v0-6/Samples/DragDropDemo/Sample_DragDropDemo.h
    cegui_mk2/branches/v0-6/Samples/datafiles/layouts/DragDropDemo.layout
    cegui_mk2/branches/v0-6/makefiles/premake/Samples/DragDropDemo/

Added: cegui_mk2/branches/v0-6/Samples/DragDropDemo/Makefile.am
===================================================================
--- cegui_mk2/branches/v0-6/Samples/DragDropDemo/Makefile.am	                        (rev 0)
+++ cegui_mk2/branches/v0-6/Samples/DragDropDemo/Makefile.am	2008-05-20 20:09:17 UTC (rev 1707)
@@ -0,0 +1,13 @@
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/Samples/common/include
+
+noinst_PROGRAMS = DragDropDemo
+
+noinst_HEADERS =  Sample_DragDropDemo.h
+
+DragDropDemo_SOURCES = Sample_DragDropDemo.cpp
+DragDropDemo_LDFLAGS = -L$(top_builddir)/src -L$(top_builddir)/Samples/common/src
+DragDropDemo_LDADD = -lCEGUIBase -lCEGUISampleHelper
+
+
+install-exec-local:
+	$(LN_S) -f `pwd`/.libs/DragDropDemo$(EXEEXT) $(top_builddir)/Samples/bin/DragDropDemo$(EXEEXT)


Property changes on: cegui_mk2/branches/v0-6/Samples/DragDropDemo/Makefile.am
___________________________________________________________________
Name: svn:eol-style
   + native

Added: cegui_mk2/branches/v0-6/Samples/DragDropDemo/Sample_DragDropDemo.cpp
===================================================================
--- cegui_mk2/branches/v0-6/Samples/DragDropDemo/Sample_DragDropDemo.cpp	                        (rev 0)
+++ cegui_mk2/branches/v0-6/Samples/DragDropDemo/Sample_DragDropDemo.cpp	2008-05-20 20:09:17 UTC (rev 1707)
@@ -0,0 +1,154 @@
+/***********************************************************************
+    filename:   Sample_DragDopDemo.cpp
+    created:    20/5/2008
+    author:     Cegui Team
+*************************************************************************/
+/***************************************************************************
+ *   Copyright (C) 2004 - 2008 Paul D Turner & The CEGUI Development Team
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining
+ *   a copy of this software and associated documentation files (the
+ *   "Software"), to deal in the Software without restriction, including
+ *   without limitation the rights to use, copy, modify, merge, publish,
+ *   distribute, sublicense, and/or sell copies of the Software, and to
+ *   permit persons to whom the Software is furnished to do so, subject to
+ *   the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be
+ *   included in all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ *   IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ *   OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ *   ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *   OTHER DEALINGS IN THE SOFTWARE.
+ ***************************************************************************/
+#include "Sample_DragDropDemo.h"
+#include "CEGUI.h"
+#include "CEGuiBaseApplication.h"
+
+//----------------------------------------------------------------------------//
+int main(int argc, char *argv[])
+{
+    // This is a basic start-up for the sample application which is
+    // object orientated in nature, so we just need an instance of
+    // the CEGuiSample based object and then tell that sample application
+    // to run.  All of the samples will use code similar to this in the
+    // main/WinMain function.
+    DragDropDemo app;
+    return app.run();
+}
+
+//----------------------------------------------------------------------------//
+bool DragDropDemo::initialiseSample()
+{
+    using namespace CEGUI;
+
+    // load windows look
+    SchemeManager::getSingleton().loadScheme("WindowsLook.scheme");
+
+    // load font and setup default if not loaded via scheme
+    if (!FontManager::getSingleton().isFontPresent("DejaVuSans-10"))
+        FontManager::getSingleton().createFont("DejaVuSans-10.font");
+
+    // set up defaults
+    System::getSingleton().setDefaultMouseCursor("WindowsLook", "MouseArrow");
+    System::getSingleton().setDefaultFont("DejaVuSans-10");
+
+    // load the drive icons imageset
+    ImagesetManager::getSingleton().createImageset("DriveIcons.imageset");
+
+    // load the initial layout
+    System::getSingleton().setGUISheet(
+        WindowManager::getSingleton().loadWindowLayout("DragDropDemo.layout"));
+
+    // setup events
+    subscribeEvents();
+
+    // success!
+    return true;
+}
+
+//----------------------------------------------------------------------------//
+void DragDropDemo::cleanupSample()
+{
+    // nothing doing in here!
+}
+
+//----------------------------------------------------------------------------//
+void DragDropDemo::subscribeEvents()
+{
+    using namespace CEGUI;
+
+    WindowManager& wmgr = WindowManager::getSingleton();
+
+    /*
+     * Subscribe handler to deal with user closing the frame window
+     */
+    try
+    {
+        Window* main_wnd = wmgr.getWindow("Root/MainWindow");
+        main_wnd->subscribeEvent(
+            FrameWindow::EventCloseClicked,
+            Event::Subscriber(&DragDropDemo::handle_CloseButton, this));
+    }
+    // if something goes wrong, log the issue but do not bomb!
+    catch(CEGUI::Exception& e)
+    {}
+
+    /*
+     * Subscribe the same handler to each of the twelve slots
+     */
+    String base_name = "Root/MainWindow/Slot";
+
+    for (int i = 1; i <= 12; ++i)
+    {
+        try
+        {
+            // get the window pointer for this slot
+            Window* wnd =
+                wmgr.getWindow(base_name + PropertyHelper::intToString(i));
+
+            // subscribe the handler.
+            wnd->subscribeEvent(
+                Window::EventDragDropItemDropped,
+                Event::Subscriber(&DragDropDemo::handle_ItemDropped, this));
+        }
+        // if something goes wrong, log the issue but do not bomb!
+        catch(CEGUI::Exception& e)
+        {}
+    }
+}
+
+//----------------------------------------------------------------------------//
+bool DragDropDemo::handle_ItemDropped(const CEGUI::EventArgs& args)
+{
+    using namespace CEGUI;
+
+    // cast the args to the 'real' type so we can get access to extra fields
+    const DragDropEventArgs& dd_args =
+        static_cast<const DragDropEventArgs&>(args);
+
+    if (!dd_args.window->getChildCount())
+    {
+        // add dragdrop item as child of target if target has no item already
+        dd_args.window->addChildWindow(dd_args.dragDropItem);
+        // Now we must reset the item position from it's 'dropped' location,
+        // since we're now a child of an entirely different window
+        dd_args.dragDropItem->setPosition(
+            UVector2(UDim(0.05f, 0),UDim(0.05f, 0)));
+    }
+
+    return true;
+}
+
+//----------------------------------------------------------------------------//
+bool DragDropDemo::handle_CloseButton(const CEGUI::EventArgs& args)
+{
+    d_sampleApp->setQuitting();
+    return true;
+}
+
+//----------------------------------------------------------------------------//


Property changes on: cegui_mk2/branches/v0-6/Samples/DragDropDemo/Sample_DragDropDemo.cpp
___________________________________________________________________
Name: svn:eol-style
   + native

Added: cegui_mk2/branches/v0-6/Samples/DragDropDemo/Sample_DragDropDemo.h
===================================================================
--- cegui_mk2/branches/v0-6/Samples/DragDropDemo/Sample_DragDropDemo.h	                        (rev 0)
+++ cegui_mk2/branches/v0-6/Samples/DragDropDemo/Sample_DragDropDemo.h	2008-05-20 20:09:17 UTC (rev 1707)
@@ -0,0 +1,53 @@
+/***********************************************************************
+    filename:   Sample_DragDopDemo.h
+    created:    20/5/2008
+    author:     Cegui Team
+*************************************************************************/
+/***************************************************************************
+ *   Copyright (C) 2004 - 2008 Paul D Turner & The CEGUI Development Team
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining
+ *   a copy of this software and associated documentation files (the
+ *   "Software"), to deal in the Software without restriction, including
+ *   without limitation the rights to use, copy, modify, merge, publish,
+ *   distribute, sublicense, and/or sell copies of the Software, and to
+ *   permit persons to whom the Software is furnished to do so, subject to
+ *   the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be
+ *   included in all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ *   IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ *   OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ *   ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *   OTHER DEALINGS IN THE SOFTWARE.
+ ***************************************************************************/
+#ifndef _Sample_DragDropDemo_h_
+#define _Sample_DragDropDemo_h_
+
+#include "CEGuiSample.h"
+#include "CEGUI.h"
+
+// Sample class
+class DragDropDemo : public CEGuiSample
+{
+public:
+    // override member to initialse the sample.
+    bool initialiseSample();
+    // override member to perform cleanup.
+    void cleanupSample(void);
+
+private:
+    /// member to subscribe handler to each 'slot' in the layout.
+    void subscribeEvents();
+    /// member that handles what happens when an item is dropped in a slot.
+    bool handle_ItemDropped(const CEGUI::EventArgs& args);
+    /// member that handles the frame window close button and quits
+    bool handle_CloseButton(const CEGUI::EventArgs& args);
+};
+
+#endif  // end of guard _Sample_DragDropDemo_h_
+


Property changes on: cegui_mk2/branches/v0-6/Samples/DragDropDemo/Sample_DragDropDemo.h
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: cegui_mk2/branches/v0-6/Samples/Makefile.am
===================================================================
--- cegui_mk2/branches/v0-6/Samples/Makefile.am	2008-05-20 11:59:22 UTC (rev 1706)
+++ cegui_mk2/branches/v0-6/Samples/Makefile.am	2008-05-20 20:09:17 UTC (rev 1707)
@@ -9,8 +9,9 @@
           datafiles \
           Demo6 \
           Demo7 \
+          DragDropDemo \
+          FalagardDemo1 \
           FirstWindow \
-          FalagardDemo1 \
           FontDemo \
           Minesweeper \
           ScrollablePaneDemo \

Modified: cegui_mk2/branches/v0-6/Samples/datafiles/Makefile.am
===================================================================
--- cegui_mk2/branches/v0-6/Samples/datafiles/Makefile.am	2008-05-20 11:59:22 UTC (rev 1706)
+++ cegui_mk2/branches/v0-6/Samples/datafiles/Makefile.am	2008-05-20 20:09:17 UTC (rev 1707)
@@ -29,6 +29,7 @@
              layouts/Console.wnd \
              layouts/Demo7Windows.layout \
              layouts/Demo8.layout \
+             layouts/DragDropDemo.layout \
              layouts/FontDemo.layout \
              layouts/GUILayout.xsd \
              layouts/TabControlDemo.layout \

Added: cegui_mk2/branches/v0-6/Samples/datafiles/layouts/DragDropDemo.layout
===================================================================
--- cegui_mk2/branches/v0-6/Samples/datafiles/layouts/DragDropDemo.layout	                        (rev 0)
+++ cegui_mk2/branches/v0-6/Samples/datafiles/layouts/DragDropDemo.layout	2008-05-20 20:09:17 UTC (rev 1707)
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<GUILayout >
+    <Window Type="DefaultWindow" Name="Root" >
+
+        <Window Type="WindowsLook/FrameWindow" Name="Root/MainWindow" >
+            <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.25,0},{0.75,0},{0.75,0}" />
+            <Property Name="Text" Value="Drag and Drop Demo" />
+            <Property Name="RollUpEnabled" Value="False" />
+            <Property Name="SizingEnabled" Value="False" />
+
+            <Window Type="WindowsLook/Static" Name="Root/MainWindow/Slot1" >
+                <Property Name="UnifiedPosition" Value="{{0.05,0},{0.13,0}}" />
+                <Property Name="UnifiedSize" Value="{{0.2,0},{0.2,0}}" />
+
+                <Window Type="DragContainer" Name="DragContainer1" >
+                    <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.05,0},{0.95,0},{0.95,0}" />
+
+                    <Window Type="WindowsLook/StaticImage" Name="DragContainer1/Image" >
+                        <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}" />
+                        <Property Name="Image" Value="set:DriveIcons image:Lime" />
+                    </Window>
+
+                </Window>
+
+            </Window>
+
+            <Window Type="WindowsLook/Static" Name="Root/MainWindow/Slot2" >
+                <Property Name="UnifiedPosition" Value="{{0.28,0},{0.13,0}}" />
+                <Property Name="UnifiedSize" Value="{{0.2,0},{0.2,0}}" />
+            </Window>
+
+            <Window Type="WindowsLook/Static" Name="Root/MainWindow/Slot3" >
+                <Property Name="UnifiedPosition" Value="{{0.51,0},{0.13,0}}" />
+                <Property Name="UnifiedSize" Value="{{0.2,0},{0.2,0}}" />
+            </Window>
+
+            <Window Type="WindowsLook/Static" Name="Root/MainWindow/Slot4" >
+                <Property Name="UnifiedPosition" Value="{{0.74,0},{0.13,0}}" />
+                <Property Name="UnifiedSize" Value="{{0.2,0},{0.2,0}}" />
+            </Window>
+
+            <Window Type="WindowsLook/Static" Name="Root/MainWindow/Slot5" >
+                <Property Name="UnifiedPosition" Value="{{0.05,0},{0.36,0}}" />
+                <Property Name="UnifiedSize" Value="{{0.2,0},{0.2,0}}" />
+            </Window>
+
+            <Window Type="WindowsLook/Static" Name="Root/MainWindow/Slot6" >
+                <Property Name="UnifiedPosition" Value="{{0.28,0},{0.36,0}}" />
+                <Property Name="UnifiedSize" Value="{{0.2,0},{0.2,0}}" />
+
+                <Window Type="DragContainer" Name="DragContainer2" >
+                    <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.05,0},{0.95,0},{0.95,0}" />
+
+                    <Window Type="WindowsLook/StaticImage" Name="DragContainer2/Image" >
+                        <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}" />
+                        <Property Name="Image" Value="set:DriveIcons image:GlobalDrive" />
+                    </Window>
+
+                </Window>
+
+            </Window>
+
+            <Window Type="WindowsLook/Static" Name="Root/MainWindow/Slot7" >
+                <Property Name="UnifiedPosition" Value="{{0.51,0},{0.36,0}}" />
+                <Property Name="UnifiedSize" Value="{{0.2,0},{0.2,0}}" />
+            </Window>
+
+            <Window Type="WindowsLook/Static" Name="Root/MainWindow/Slot8" >
+                <Property Name="UnifiedPosition" Value="{{0.74,0},{0.36,0}}" />
+                <Property Name="UnifiedSize" Value="{{0.2,0},{0.2,0}}" />
+            </Window>
+
+            <Window Type="WindowsLook/Static" Name="Root/MainWindow/Slot9" >
+                <Property Name="UnifiedPosition" Value="{{0.05,0},{0.59,0}}" />
+                <Property Name="UnifiedSize" Value="{{0.2,0},{0.2,0}}" />
+            </Window>
+
+            <Window Type="WindowsLook/Static" Name="Root/MainWindow/Slot10" >
+                <Property Name="UnifiedPosition" Value="{{0.28,0},{0.59,0}}" />
+                <Property Name="UnifiedSize" Value="{{0.2,0},{0.2,0}}" />
+            </Window>
+
+            <Window Type="WindowsLook/Static" Name="Root/MainWindow/Slot11" >
+                <Property Name="UnifiedPosition" Value="{{0.51,0},{0.59,0}}" />
+                <Property Name="UnifiedSize" Value="{{0.2,0},{0.2,0}}" />
+            </Window>
+
+            <Window Type="WindowsLook/Static" Name="Root/MainWindow/Slot12" >
+                <Property Name="UnifiedPosition" Value="{{0.74,0},{0.59,0}}" />
+                <Property Name="UnifiedSize" Value="{{0.2,0},{0.2,0}}" />
+            </Window>
+
+        </Window>
+
+    </Window>
+</GUILayout>
+

Modified: cegui_mk2/branches/v0-6/configure.ac
===================================================================
--- cegui_mk2/branches/v0-6/configure.ac	2008-05-20 11:59:22 UTC (rev 1706)
+++ cegui_mk2/branches/v0-6/configure.ac	2008-05-20 20:09:17 UTC (rev 1707)
@@ -138,6 +138,7 @@
                  Samples/Demo7/src/Makefile
                  Samples/Demo8/Makefile
                  Samples/Demo8/src/Makefile
+                 Samples/DragDropDemo/Makefile
                  Samples/FalagardDemo1/Makefile
                  Samples/FalagardDemo1/include/Makefile
                  Samples/FalagardDemo1/src/Makefile

Modified: cegui_mk2/branches/v0-6/makefiles/Makefile.am
===================================================================
--- cegui_mk2/branches/v0-6/makefiles/Makefile.am	2008-05-20 11:59:22 UTC (rev 1706)
+++ cegui_mk2/branches/v0-6/makefiles/Makefile.am	2008-05-20 20:09:17 UTC (rev 1707)
@@ -51,6 +51,7 @@
              premake/Samples/Demo6/premake.lua \
              premake/Samples/Demo7/premake.lua \
              premake/Samples/Demo8/premake.lua \
+             premake/Samples/DragDropDemo/premake.lua \
              premake/Samples/FalagardDemo1/premake.lua \
              premake/Samples/FirstWindow/premake.lua \
              premake/Samples/FontDemo/premake.lua \

Modified: cegui_mk2/branches/v0-6/makefiles/premake/samples.lua
===================================================================
--- cegui_mk2/branches/v0-6/makefiles/premake/samples.lua	2008-05-20 11:59:22 UTC (rev 1706)
+++ cegui_mk2/branches/v0-6/makefiles/premake/samples.lua	2008-05-20 20:09:17 UTC (rev 1707)
@@ -33,6 +33,7 @@
         "TextDemo",
         "Demo6",
         "Demo7",
+        "DragDropDemo",
         "FalagardDemo1",
         "FontDemo",
         "Minesweeper",


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Crayzedsgui-cvsmk2] SF.net SVN: crayzedsgui: [1710] cegui_mk2/branches/v0-6

From: <ice-drezday@us...> - 2008-05-21 18:23

Revision: 1710
          http://crayzedsgui.svn.sourceforge.net/crayzedsgui/?rev=1710&view=rev
Author:   ice-drezday
Date:     2008-05-21 11:23:27 -0700 (Wed, 21 May 2008)

Log Message:
-----------
FIX: When injecting mouse position change information using the System::injectMousePosition member, the resulting MouseEventArgs structure passed to event handlers always had the positional change delta information set to 0.  See: http://www.cegui.org.uk/mantis/view.php?id=194

Modified Paths:
--------------
    cegui_mk2/branches/v0-6/RendererModules/IrrlichtRenderer/IrrlichtEventPusher.h
    cegui_mk2/branches/v0-6/include/CEGUISystem.h
    cegui_mk2/branches/v0-6/src/CEGUISystem.cpp

Modified: cegui_mk2/branches/v0-6/RendererModules/IrrlichtRenderer/IrrlichtEventPusher.h
===================================================================
--- cegui_mk2/branches/v0-6/RendererModules/IrrlichtRenderer/IrrlichtEventPusher.h	2008-05-21 10:07:42 UTC (rev 1709)
+++ cegui_mk2/branches/v0-6/RendererModules/IrrlichtRenderer/IrrlichtEventPusher.h	2008-05-21 18:23:27 UTC (rev 1710)
@@ -127,17 +127,11 @@
 				break;
 				//! The mouse cursor changed its position.
 			case EMIE_MOUSE_MOVED:
-				dpos.X=x-pos.X;
-				dpos.Y=y-pos.Y;
-				pos.X=x;
-				pos.Y=y;
-				CEGUI::MouseCursor::getSingleton().setPosition(CEGUI::Point(float(pos.X),float(pos.Y)));
-				handled=CEGUI::System::getSingleton().injectMouseMove(0.0f, 0.0f);			
-				//handled=CEGUI::System::getSingleton().injectMouseMove(float(dpos.X), float(dpos.Y));
+                handled=CEGUI::System::getSingleton().injectMousePosition(x, y);
 				break;
-				//! The mouse wheel was moved. Use Wheel value in event data to find out 
+				//! The mouse wheel was moved. Use Wheel value in event data to find out
 				//! in what direction and how fast.
-			case EMIE_MOUSE_WHEEL: 
+			case EMIE_MOUSE_WHEEL:
 				handled=CEGUI::System::getSingleton().injectMouseWheelChange(w);
 				break;
 			default:
@@ -157,156 +151,156 @@
 				using namespace irr;
 				memset(irr2ceCODE,0,KEY_KEY_CODES_COUNT);
 
-				irr2ceCODE[KEY_LBUTTON          ] = 0;  // Left mouse button  
-				irr2ceCODE[KEY_RBUTTON          ] = 0;  // Right mouse button  
-				irr2ceCODE[KEY_CANCEL           ] = 0;  // Control-break processing  
-				irr2ceCODE[KEY_MBUTTON          ] = 0;  // Middle mouse button (three-button mouse)  
-				irr2ceCODE[KEY_XBUTTON1         ] = 0;  // Windows 2000/XP: X1 mouse button 
-				irr2ceCODE[KEY_XBUTTON2         ] = 0;  // Windows 2000/XP: X2 mouse button 
-				irr2ceCODE[KEY_BACK             ] = Key::Backspace; //0x08;  // BACKSPACE key  
-				irr2ceCODE[KEY_TAB              ] = Key::Tab; //0x09;  // TAB key  
-				irr2ceCODE[KEY_CLEAR            ] = 0;  // CLEAR key  
-				irr2ceCODE[KEY_RETURN           ] = Key::Return; //0x0D;  // ENTER key  
-				irr2ceCODE[KEY_SHIFT            ] = Key::LeftShift;  // SHIFT key  
-				irr2ceCODE[KEY_CONTROL          ] = Key::LeftControl;   // CTRL key  
-				irr2ceCODE[KEY_MENU             ] = Key::LeftAlt;  // ALT key  
-				irr2ceCODE[KEY_PAUSE            ] = Key::Pause;   // PAUSE key  
-				irr2ceCODE[KEY_CAPITAL          ] = Key::Capital;  // CAPS LOCK key  
-				irr2ceCODE[KEY_KANA             ] = Key::Kana;  // IME Kana mode 
-				irr2ceCODE[KEY_HANGUEL          ] = KEY_HANGUEL;  // IME Hanguel mode 
-				irr2ceCODE[KEY_HANGUL           ] = KEY_HANGUL;  // IME Hangul mode 
-				irr2ceCODE[KEY_JUNJA            ] = 0;  // IME Junja mode 
-				irr2ceCODE[KEY_FINAL            ] = 0;  // IME final mode 
-				irr2ceCODE[KEY_HANJA            ] = 0;  // IME Hanja mode 
-				irr2ceCODE[KEY_KANJI            ] = 0;  // IME Kanji mode 
-				irr2ceCODE[KEY_ESCAPE           ] = Key::Escape;  // ESC key  
-				irr2ceCODE[KEY_CONVERT          ] = Key::Convert;  // IME convert 
-				irr2ceCODE[KEY_NONCONVERT       ] = Key::NoConvert;  // IME nonconvert 
-				irr2ceCODE[KEY_ACCEPT           ] = 0;  // IME accept 
-				irr2ceCODE[KEY_MODECHANGE       ] = 0;  // IME mode change request 
-				irr2ceCODE[KEY_SPACE            ] = Key::Space;  // SPACEBAR  
-				irr2ceCODE[KEY_PRIOR            ] = Key::PageUp;  // PAGE UP key  
-				irr2ceCODE[KEY_NEXT             ] = Key::PageDown;  // PAGE DOWN key  
-				irr2ceCODE[KEY_END              ] = Key::End;  // END key  
-				irr2ceCODE[KEY_HOME             ] = Key::Home;  // HOME key  
-				irr2ceCODE[KEY_LEFT             ] = Key::ArrowLeft;  // LEFT ARROW key  
-				irr2ceCODE[KEY_UP               ] = Key::ArrowUp;  // UP ARROW key  
-				irr2ceCODE[KEY_RIGHT            ] = Key::ArrowRight;  // RIGHT ARROW key  
-				irr2ceCODE[KEY_DOWN             ] = Key::ArrowDown;  // DOWN ARROW key  
-				irr2ceCODE[KEY_SELECT           ] = 0;  // SELECT key  
+				irr2ceCODE[KEY_LBUTTON          ] = 0;  // Left mouse button
+				irr2ceCODE[KEY_RBUTTON          ] = 0;  // Right mouse button
+				irr2ceCODE[KEY_CANCEL           ] = 0;  // Control-break processing
+				irr2ceCODE[KEY_MBUTTON          ] = 0;  // Middle mouse button (three-button mouse)
+				irr2ceCODE[KEY_XBUTTON1         ] = 0;  // Windows 2000/XP: X1 mouse button
+				irr2ceCODE[KEY_XBUTTON2         ] = 0;  // Windows 2000/XP: X2 mouse button
+				irr2ceCODE[KEY_BACK             ] = Key::Backspace; //0x08;  // BACKSPACE key
+				irr2ceCODE[KEY_TAB              ] = Key::Tab; //0x09;  // TAB key
+				irr2ceCODE[KEY_CLEAR            ] = 0;  // CLEAR key
+				irr2ceCODE[KEY_RETURN           ] = Key::Return; //0x0D;  // ENTER key
+				irr2ceCODE[KEY_SHIFT            ] = Key::LeftShift;  // SHIFT key
+				irr2ceCODE[KEY_CONTROL          ] = Key::LeftControl;   // CTRL key
+				irr2ceCODE[KEY_MENU             ] = Key::LeftAlt;  // ALT key
+				irr2ceCODE[KEY_PAUSE            ] = Key::Pause;   // PAUSE key
+				irr2ceCODE[KEY_CAPITAL          ] = Key::Capital;  // CAPS LOCK key
+				irr2ceCODE[KEY_KANA             ] = Key::Kana;  // IME Kana mode
+				irr2ceCODE[KEY_HANGUEL          ] = KEY_HANGUEL;  // IME Hanguel mode
+				irr2ceCODE[KEY_HANGUL           ] = KEY_HANGUL;  // IME Hangul mode
+				irr2ceCODE[KEY_JUNJA            ] = 0;  // IME Junja mode
+				irr2ceCODE[KEY_FINAL            ] = 0;  // IME final mode
+				irr2ceCODE[KEY_HANJA            ] = 0;  // IME Hanja mode
+				irr2ceCODE[KEY_KANJI            ] = 0;  // IME Kanji mode
+				irr2ceCODE[KEY_ESCAPE           ] = Key::Escape;  // ESC key
+				irr2ceCODE[KEY_CONVERT          ] = Key::Convert;  // IME convert
+				irr2ceCODE[KEY_NONCONVERT       ] = Key::NoConvert;  // IME nonconvert
+				irr2ceCODE[KEY_ACCEPT           ] = 0;  // IME accept
+				irr2ceCODE[KEY_MODECHANGE       ] = 0;  // IME mode change request
+				irr2ceCODE[KEY_SPACE            ] = Key::Space;  // SPACEBAR
+				irr2ceCODE[KEY_PRIOR            ] = Key::PageUp;  // PAGE UP key
+				irr2ceCODE[KEY_NEXT             ] = Key::PageDown;  // PAGE DOWN key
+				irr2ceCODE[KEY_END              ] = Key::End;  // END key
+				irr2ceCODE[KEY_HOME             ] = Key::Home;  // HOME key
+				irr2ceCODE[KEY_LEFT             ] = Key::ArrowLeft;  // LEFT ARROW key
+				irr2ceCODE[KEY_UP               ] = Key::ArrowUp;  // UP ARROW key
+				irr2ceCODE[KEY_RIGHT            ] = Key::ArrowRight;  // RIGHT ARROW key
+				irr2ceCODE[KEY_DOWN             ] = Key::ArrowDown;  // DOWN ARROW key
+				irr2ceCODE[KEY_SELECT           ] = 0;  // SELECT key
 				irr2ceCODE[KEY_PRINT            ] = Key::SysRq;  // PRINT key
-				irr2ceCODE[KEY_EXECUT           ] = 0;  // EXECUTE key  
-				irr2ceCODE[KEY_SNAPSHOT         ] = 0;  // PRINT SCREEN key  
-				irr2ceCODE[KEY_INSERT           ] = Key::Insert;//0x2D;  // INS key  
-				irr2ceCODE[KEY_DELETE           ] = Key::Delete;//0x2E;  // DEL key  
-				irr2ceCODE[KEY_HELP             ] = 0;  // HELP key  
-				irr2ceCODE[KEY_KEY_0            ] = Key::Zero;   // 0 key  
-				irr2ceCODE[KEY_KEY_1            ] = Key::One;    // 1 key  
-				irr2ceCODE[KEY_KEY_2            ] = Key::Two;    // 2 key  
-				irr2ceCODE[KEY_KEY_3            ] = Key::Three;  // 3 key  
-				irr2ceCODE[KEY_KEY_4            ] = Key::Four;   // 4 key  
-				irr2ceCODE[KEY_KEY_5            ] = Key::Five;   // 5 key  
-				irr2ceCODE[KEY_KEY_6            ] = Key::Six;    // 6 key  
-				irr2ceCODE[KEY_KEY_7            ] = Key::Seven;  // 7 key  
-				irr2ceCODE[KEY_KEY_8            ] = Key::Eight;  // 8 key  
-				irr2ceCODE[KEY_KEY_9            ] = Key::Nine;   // 9 key  
-				irr2ceCODE[KEY_KEY_A            ] = Key::A;  // A key  
-				irr2ceCODE[KEY_KEY_B            ] = Key::B;  // B key  
-				irr2ceCODE[KEY_KEY_C            ] = Key::C;  // C key  
-				irr2ceCODE[KEY_KEY_D            ] = Key::D;  // D key  
-				irr2ceCODE[KEY_KEY_E            ] = Key::E;  // E key  
-				irr2ceCODE[KEY_KEY_F            ] = Key::F;  // F key  
-				irr2ceCODE[KEY_KEY_G            ] = Key::G;  // G key  
-				irr2ceCODE[KEY_KEY_H            ] = Key::H;  // H key  
-				irr2ceCODE[KEY_KEY_I            ] = Key::I;  // I key  
-				irr2ceCODE[KEY_KEY_J            ] = Key::J;  // J key  
-				irr2ceCODE[KEY_KEY_K            ] = Key::K;  // K key  
-				irr2ceCODE[KEY_KEY_L            ] = Key::L;  // L key  
-				irr2ceCODE[KEY_KEY_M            ] = Key::M;  // M key  
-				irr2ceCODE[KEY_KEY_N            ] = Key::N;  // N key  
-				irr2ceCODE[KEY_KEY_O            ] = Key::O;  // O key  
-				irr2ceCODE[KEY_KEY_P            ] = Key::P;  // P key  
-				irr2ceCODE[KEY_KEY_Q            ] = Key::Q;  // Q key  
-				irr2ceCODE[KEY_KEY_R            ] = Key::R;  // R key  
-				irr2ceCODE[KEY_KEY_S            ] = Key::S;  // S key  
-				irr2ceCODE[KEY_KEY_T            ] = Key::T;  // T key  
-				irr2ceCODE[KEY_KEY_U            ] = Key::U;  // U key  
-				irr2ceCODE[KEY_KEY_V            ] = Key::V;  // V key  
-				irr2ceCODE[KEY_KEY_W            ] = Key::W;  // W key  
-				irr2ceCODE[KEY_KEY_X            ] = Key::X;  // X key  
-				irr2ceCODE[KEY_KEY_Y            ] = Key::Y;  // Y key  
-				irr2ceCODE[KEY_KEY_Z            ] = Key::Z;  // Z key 
-				irr2ceCODE[KEY_LWIN             ] = Key::LeftWindows;  // Left Windows key (Microsoft\xAE Natural\xAE keyboard)  
-				irr2ceCODE[KEY_RWIN             ] = Key::RightWindow;  // Right Windows key (Natural keyboard)  
-				irr2ceCODE[KEY_APPS             ] = Key::AppMenu;  //Applications key (Natural keyboard)  
-				irr2ceCODE[KEY_SLEEP            ] = Key::Sleep;  // Computer Sleep key 
-				irr2ceCODE[KEY_NUMPAD0          ] = Key::Numpad0;  // Numeric keypad 0 key  
-				irr2ceCODE[KEY_NUMPAD1          ] = Key::Numpad1;  // Numeric keypad 1 key  
-				irr2ceCODE[KEY_NUMPAD2          ] = Key::Numpad2;  // Numeric keypad 2 key  
-				irr2ceCODE[KEY_NUMPAD3          ] = Key::Numpad3;  // Numeric keypad 3 key  
-				irr2ceCODE[KEY_NUMPAD4          ] = Key::Numpad4;  // Numeric keypad 4 key  
-				irr2ceCODE[KEY_NUMPAD5          ] = Key::Numpad5;  // Numeric keypad 5 key  
-				irr2ceCODE[KEY_NUMPAD6          ] = Key::Numpad6;  // Numeric keypad 6 key  
-				irr2ceCODE[KEY_NUMPAD7          ] = Key::Numpad7;  // Numeric keypad 7 key  
-				irr2ceCODE[KEY_NUMPAD8          ] = Key::Numpad8;  // Numeric keypad 8 key  
-				irr2ceCODE[KEY_NUMPAD9          ] = Key::Numpad9;  // Numeric keypad 9 key  
-				irr2ceCODE[KEY_MULTIPLY         ] = Key::Multiply;  // Multiply key  
-				irr2ceCODE[KEY_ADD              ] = Key::Add;  // Add key  
-				irr2ceCODE[KEY_SEPARATOR        ] = 0;  // Separator key  
-				irr2ceCODE[KEY_SUBTRACT         ] = Key::Subtract;  // Subtract key  
-				irr2ceCODE[KEY_DECIMAL          ] = Key::Decimal;  // Decimal key  
-				irr2ceCODE[KEY_DIVIDE           ] = Key::Divide;  // Divide key  
-				irr2ceCODE[KEY_F1               ] = Key::F1;   // F1 key  
-				irr2ceCODE[KEY_F2               ] = Key::F2;   // F2 key  
-				irr2ceCODE[KEY_F3               ] = Key::F3;   // F3 key  
-				irr2ceCODE[KEY_F4               ] = Key::F4;   // F4 key  
-				irr2ceCODE[KEY_F5               ] = Key::F5;   // F5 key  
-				irr2ceCODE[KEY_F6               ] = Key::F6;   // F6 key  
-				irr2ceCODE[KEY_F7               ] = Key::F7;   // F7 key  
-				irr2ceCODE[KEY_F8               ] = Key::F8;   // F8 key  
-				irr2ceCODE[KEY_F9               ] = Key::F9;   // F9 key  
-				irr2ceCODE[KEY_F10              ] = Key::F10;  // F10 key  
-				irr2ceCODE[KEY_F11              ] = Key::F11;  // F11 key  
-				irr2ceCODE[KEY_F12              ] = Key::F12;  // F12 key  
-				irr2ceCODE[KEY_F13              ] = Key::F13;  // F13 key  
-				irr2ceCODE[KEY_F14              ] = Key::F14;  // F14 key  
-				irr2ceCODE[KEY_F15              ] = Key::F15;  // F15 key  
-				irr2ceCODE[KEY_F16              ] = 0;  // F16 key  
-				irr2ceCODE[KEY_F17              ] = 0;  // F17 key  
-				irr2ceCODE[KEY_F18              ] = 0;  // F18 key  
-				irr2ceCODE[KEY_F19              ] = 0;  // F19 key  
-				irr2ceCODE[KEY_F20              ] = 0;  // F20 key  
-				irr2ceCODE[KEY_F21              ] = 0;  // F21 key  
-				irr2ceCODE[KEY_F22              ] = 0;  // F22 key  
-				irr2ceCODE[KEY_F23              ] = 0;  // F23 key  
-				irr2ceCODE[KEY_F24              ] = 0;  // F24 key  
-				irr2ceCODE[KEY_NUMLOCK          ] = Key::NumLock;  // NUM LOCK key  
-				irr2ceCODE[KEY_SCROLL           ] = Key::ScrollLock;  // SCROLL LOCK key  
-				irr2ceCODE[KEY_LSHIFT           ] = Key::LeftShift;  // Left SHIFT key 
-				irr2ceCODE[KEY_RSHIFT           ] = Key::RightShift;  // Right SHIFT key 
-				irr2ceCODE[KEY_LCONTROL         ] = Key::LeftControl;  // Left CONTROL key 
-				irr2ceCODE[KEY_RCONTROL         ] = Key::RightControl;  // Right CONTROL key 
-				irr2ceCODE[KEY_LMENU            ] = Key::LeftAlt;  // Left MENU key 
-				irr2ceCODE[KEY_RMENU            ] = Key::RightAlt;  // Right MENU key 
+				irr2ceCODE[KEY_EXECUT           ] = 0;  // EXECUTE key
+				irr2ceCODE[KEY_SNAPSHOT         ] = 0;  // PRINT SCREEN key
+				irr2ceCODE[KEY_INSERT           ] = Key::Insert;//0x2D;  // INS key
+				irr2ceCODE[KEY_DELETE           ] = Key::Delete;//0x2E;  // DEL key
+				irr2ceCODE[KEY_HELP             ] = 0;  // HELP key
+				irr2ceCODE[KEY_KEY_0            ] = Key::Zero;   // 0 key
+				irr2ceCODE[KEY_KEY_1            ] = Key::One;    // 1 key
+				irr2ceCODE[KEY_KEY_2            ] = Key::Two;    // 2 key
+				irr2ceCODE[KEY_KEY_3            ] = Key::Three;  // 3 key
+				irr2ceCODE[KEY_KEY_4            ] = Key::Four;   // 4 key
+				irr2ceCODE[KEY_KEY_5            ] = Key::Five;   // 5 key
+				irr2ceCODE[KEY_KEY_6            ] = Key::Six;    // 6 key
+				irr2ceCODE[KEY_KEY_7            ] = Key::Seven;  // 7 key
+				irr2ceCODE[KEY_KEY_8            ] = Key::Eight;  // 8 key
+				irr2ceCODE[KEY_KEY_9            ] = Key::Nine;   // 9 key
+				irr2ceCODE[KEY_KEY_A            ] = Key::A;  // A key
+				irr2ceCODE[KEY_KEY_B            ] = Key::B;  // B key
+				irr2ceCODE[KEY_KEY_C            ] = Key::C;  // C key
+				irr2ceCODE[KEY_KEY_D            ] = Key::D;  // D key
+				irr2ceCODE[KEY_KEY_E            ] = Key::E;  // E key
+				irr2ceCODE[KEY_KEY_F            ] = Key::F;  // F key
+				irr2ceCODE[KEY_KEY_G            ] = Key::G;  // G key
+				irr2ceCODE[KEY_KEY_H            ] = Key::H;  // H key
+				irr2ceCODE[KEY_KEY_I            ] = Key::I;  // I key
+				irr2ceCODE[KEY_KEY_J            ] = Key::J;  // J key
+				irr2ceCODE[KEY_KEY_K            ] = Key::K;  // K key
+				irr2ceCODE[KEY_KEY_L            ] = Key::L;  // L key
+				irr2ceCODE[KEY_KEY_M            ] = Key::M;  // M key
+				irr2ceCODE[KEY_KEY_N            ] = Key::N;  // N key
+				irr2ceCODE[KEY_KEY_O            ] = Key::O;  // O key
+				irr2ceCODE[KEY_KEY_P            ] = Key::P;  // P key
+				irr2ceCODE[KEY_KEY_Q            ] = Key::Q;  // Q key
+				irr2ceCODE[KEY_KEY_R            ] = Key::R;  // R key
+				irr2ceCODE[KEY_KEY_S            ] = Key::S;  // S key
+				irr2ceCODE[KEY_KEY_T            ] = Key::T;  // T key
+				irr2ceCODE[KEY_KEY_U            ] = Key::U;  // U key
+				irr2ceCODE[KEY_KEY_V            ] = Key::V;  // V key
+				irr2ceCODE[KEY_KEY_W            ] = Key::W;  // W key
+				irr2ceCODE[KEY_KEY_X            ] = Key::X;  // X key
+				irr2ceCODE[KEY_KEY_Y            ] = Key::Y;  // Y key
+				irr2ceCODE[KEY_KEY_Z            ] = Key::Z;  // Z key
+				irr2ceCODE[KEY_LWIN             ] = Key::LeftWindows;  // Left Windows key (Microsoft� Natural� keyboard)
+				irr2ceCODE[KEY_RWIN             ] = Key::RightWindow;  // Right Windows key (Natural keyboard)
+				irr2ceCODE[KEY_APPS             ] = Key::AppMenu;  //Applications key (Natural keyboard)
+				irr2ceCODE[KEY_SLEEP            ] = Key::Sleep;  // Computer Sleep key
+				irr2ceCODE[KEY_NUMPAD0          ] = Key::Numpad0;  // Numeric keypad 0 key
+				irr2ceCODE[KEY_NUMPAD1          ] = Key::Numpad1;  // Numeric keypad 1 key
+				irr2ceCODE[KEY_NUMPAD2          ] = Key::Numpad2;  // Numeric keypad 2 key
+				irr2ceCODE[KEY_NUMPAD3          ] = Key::Numpad3;  // Numeric keypad 3 key
+				irr2ceCODE[KEY_NUMPAD4          ] = Key::Numpad4;  // Numeric keypad 4 key
+				irr2ceCODE[KEY_NUMPAD5          ] = Key::Numpad5;  // Numeric keypad 5 key
+				irr2ceCODE[KEY_NUMPAD6          ] = Key::Numpad6;  // Numeric keypad 6 key
+				irr2ceCODE[KEY_NUMPAD7          ] = Key::Numpad7;  // Numeric keypad 7 key
+				irr2ceCODE[KEY_NUMPAD8          ] = Key::Numpad8;  // Numeric keypad 8 key
+				irr2ceCODE[KEY_NUMPAD9          ] = Key::Numpad9;  // Numeric keypad 9 key
+				irr2ceCODE[KEY_MULTIPLY         ] = Key::Multiply;  // Multiply key
+				irr2ceCODE[KEY_ADD              ] = Key::Add;  // Add key
+				irr2ceCODE[KEY_SEPARATOR        ] = 0;  // Separator key
+				irr2ceCODE[KEY_SUBTRACT         ] = Key::Subtract;  // Subtract key
+				irr2ceCODE[KEY_DECIMAL          ] = Key::Decimal;  // Decimal key
+				irr2ceCODE[KEY_DIVIDE           ] = Key::Divide;  // Divide key
+				irr2ceCODE[KEY_F1               ] = Key::F1;   // F1 key
+				irr2ceCODE[KEY_F2               ] = Key::F2;   // F2 key
+				irr2ceCODE[KEY_F3               ] = Key::F3;   // F3 key
+				irr2ceCODE[KEY_F4               ] = Key::F4;   // F4 key
+				irr2ceCODE[KEY_F5               ] = Key::F5;   // F5 key
+				irr2ceCODE[KEY_F6               ] = Key::F6;   // F6 key
+				irr2ceCODE[KEY_F7               ] = Key::F7;   // F7 key
+				irr2ceCODE[KEY_F8               ] = Key::F8;   // F8 key
+				irr2ceCODE[KEY_F9               ] = Key::F9;   // F9 key
+				irr2ceCODE[KEY_F10              ] = Key::F10;  // F10 key
+				irr2ceCODE[KEY_F11              ] = Key::F11;  // F11 key
+				irr2ceCODE[KEY_F12              ] = Key::F12;  // F12 key
+				irr2ceCODE[KEY_F13              ] = Key::F13;  // F13 key
+				irr2ceCODE[KEY_F14              ] = Key::F14;  // F14 key
+				irr2ceCODE[KEY_F15              ] = Key::F15;  // F15 key
+				irr2ceCODE[KEY_F16              ] = 0;  // F16 key
+				irr2ceCODE[KEY_F17              ] = 0;  // F17 key
+				irr2ceCODE[KEY_F18              ] = 0;  // F18 key
+				irr2ceCODE[KEY_F19              ] = 0;  // F19 key
+				irr2ceCODE[KEY_F20              ] = 0;  // F20 key
+				irr2ceCODE[KEY_F21              ] = 0;  // F21 key
+				irr2ceCODE[KEY_F22              ] = 0;  // F22 key
+				irr2ceCODE[KEY_F23              ] = 0;  // F23 key
+				irr2ceCODE[KEY_F24              ] = 0;  // F24 key
+				irr2ceCODE[KEY_NUMLOCK          ] = Key::NumLock;  // NUM LOCK key
+				irr2ceCODE[KEY_SCROLL           ] = Key::ScrollLock;  // SCROLL LOCK key
+				irr2ceCODE[KEY_LSHIFT           ] = Key::LeftShift;  // Left SHIFT key
+				irr2ceCODE[KEY_RSHIFT           ] = Key::RightShift;  // Right SHIFT key
+				irr2ceCODE[KEY_LCONTROL         ] = Key::LeftControl;  // Left CONTROL key
+				irr2ceCODE[KEY_RCONTROL         ] = Key::RightControl;  // Right CONTROL key
+				irr2ceCODE[KEY_LMENU            ] = Key::LeftAlt;  // Left MENU key
+				irr2ceCODE[KEY_RMENU            ] = Key::RightAlt;  // Right MENU key
 				irr2ceCODE[KEY_COMMA            ] = Key::Comma;//0xBC;  // Comma Key  (;)
 				irr2ceCODE[KEY_PLUS             ] = Key::Add;  // Plus Key   (+)
 				irr2ceCODE[KEY_MINUS            ] = Key::Minus;  // Minus Key  (-)
 				irr2ceCODE[KEY_PERIOD           ] = Key::Period;//0xBE;  // Period Key (.)
-				irr2ceCODE[KEY_ATTN             ] = 0;  // Attn key 
-				irr2ceCODE[KEY_CRSEL            ] = 0;  // CrSel key 
-				irr2ceCODE[KEY_EXSEL            ] = 0;  // ExSel key 
+				irr2ceCODE[KEY_ATTN             ] = 0;  // Attn key
+				irr2ceCODE[KEY_CRSEL            ] = 0;  // CrSel key
+				irr2ceCODE[KEY_EXSEL            ] = 0;  // ExSel key
 				irr2ceCODE[KEY_EREOF            ] = 0;  // Erase EOF key
-				irr2ceCODE[KEY_PLAY             ] = 0;  // Play key 
-				irr2ceCODE[KEY_ZOOM             ] = 0;  // Zoom key 
-				irr2ceCODE[KEY_PA1              ] = 0;  // PA1 key 
-				irr2ceCODE[KEY_OEM_CLEAR        ] = 0;  // Clear key 
+				irr2ceCODE[KEY_PLAY             ] = 0;  // Play key
+				irr2ceCODE[KEY_ZOOM             ] = 0;  // Zoom key
+				irr2ceCODE[KEY_PA1              ] = 0;  // PA1 key
+				irr2ceCODE[KEY_OEM_CLEAR        ] = 0;  // Clear key
 			}
 
-			/*! translate the irrlicht keycode to cegui keycode 
+			/*! translate the irrlicht keycode to cegui keycode
 			\param kc
 			the irrlicht keycode
 
-			\return 
+			\return
 			the cegui keycode
 			*/
 			uchar getKeyCode(irr::EKEY_CODE kc)

Modified: cegui_mk2/branches/v0-6/include/CEGUISystem.h
===================================================================
--- cegui_mk2/branches/v0-6/include/CEGUISystem.h	2008-05-21 10:07:42 UTC (rev 1709)
+++ cegui_mk2/branches/v0-6/include/CEGUISystem.h	2008-05-21 18:23:27 UTC (rev 1710)
@@ -430,7 +430,7 @@
 
 	\param filename
 		String object holding the filename of the script file that is to be executed
-		
+
 	\param resourceGroup
 		Resource group identifier to be passed to the ResourceProvider when loading the script file.
 	*/
@@ -883,6 +883,9 @@
     //! handle cleanup of the XML parser
     void cleanupXMLParser();
 
+    //! common function used for injection of mouse positions and movements
+    bool mouseMoveInjection_impl(MouseEventArgs& ma);
+
 	/*************************************************************************
 		Handlers for System events
 	*************************************************************************/

Modified: cegui_mk2/branches/v0-6/src/CEGUISystem.cpp
===================================================================
--- cegui_mk2/branches/v0-6/src/CEGUISystem.cpp	2008-05-21 10:07:42 UTC (rev 1709)
+++ cegui_mk2/branches/v0-6/src/CEGUISystem.cpp	2008-05-21 18:23:27 UTC (rev 1710)
@@ -679,65 +679,23 @@
 *************************************************************************/
 bool System::injectMouseMove(float delta_x, float delta_y)
 {
-	MouseEventArgs ma(0);
-	MouseCursor& mouse = MouseCursor::getSingleton();
+    MouseEventArgs ma(0);
+    MouseCursor& mouse = MouseCursor::getSingleton();
 
-	ma.moveDelta.d_x = delta_x * d_mouseScalingFactor;
-	ma.moveDelta.d_y = delta_y * d_mouseScalingFactor;
-	ma.sysKeys = d_sysKeys;
-	ma.wheelChange = 0;
-	ma.clickCount = 0;
-	ma.button = NoButton;
+    ma.moveDelta.d_x = delta_x * d_mouseScalingFactor;
+    ma.moveDelta.d_y = delta_y * d_mouseScalingFactor;
+    ma.sysKeys = d_sysKeys;
+    ma.wheelChange = 0;
+    ma.clickCount = 0;
+    ma.button = NoButton;
 
-	// move the mouse cursor & update position in args.
-	mouse.offsetPosition(ma.moveDelta);
-	ma.position = mouse.getPosition();
+    // move the mouse cursor & update position in args.
+    mouse.offsetPosition(ma.moveDelta);
+    ma.position = mouse.getPosition();
 
-	Window* dest_window = getTargetWindow(ma.position);
-
-    // has window containing mouse changed?
-    if (dest_window != d_wndWithMouse)
-    {
-        // store previous window that contained mouse
-        Window* oldWindow = d_wndWithMouse;
-        // set the new window that contains the mouse.
-        d_wndWithMouse = dest_window;
-
-        // inform previous window the mouse has left it
-        if (oldWindow)
-        {
-            ma.window = oldWindow;
-            oldWindow->onMouseLeaves(ma);
-        }
-
-        // inform window containing mouse that mouse has entered it
-        if (d_wndWithMouse)
-        {
-            ma.window = d_wndWithMouse;
-            ma.handled = false;
-            d_wndWithMouse->onMouseEnters(ma);
-        }
-    }
-
-    // inform appropriate window of the mouse movement event
-    if (dest_window)
-    {
-        // ensure event starts as 'not handled'
-        ma.handled = false;
-
-        // loop backwards until event is handled or we run out of windows.
-        while ((!ma.handled) && (dest_window != 0))
-        {
-            ma.window = dest_window;
-            dest_window->onMouseMove(ma);
-            dest_window = getNextTargetWindow(dest_window);
-        }
-    }
-
-	return ma.handled;
+    return mouseMoveInjection_impl(ma);
 }
 
-
 /*************************************************************************
 	Method that injects that the mouse is leaves the application window
 *************************************************************************/
@@ -1027,11 +985,23 @@
 *************************************************************************/
 bool System::injectMousePosition(float x_pos, float y_pos)
 {
-	// set new mouse position
-	MouseCursor::getSingleton().setPosition(Point(x_pos, y_pos));
+    Point new_position(x_pos, y_pos);
+    MouseCursor& mouse = MouseCursor::getSingleton();
 
-	// do the real work
-	return injectMouseMove(0, 0);
+    // setup mouse movement event args object.
+    MouseEventArgs ma(0);
+    ma.moveDelta = new_position - mouse.getPosition();
+    ma.sysKeys = d_sysKeys;
+    ma.wheelChange = 0;
+    ma.clickCount = 0;
+    ma.button = NoButton;
+
+    // move mouse cursor to new position
+    mouse.setPosition(new_position);
+    // update position in args (since actual position may be constrained)
+    ma.position = mouse.getPosition();
+
+    return mouseMoveInjection_impl(ma);
 }
 
 
@@ -1615,5 +1585,54 @@
     return d_defaultXMLParserName;
 }
 
+//----------------------------------------------------------------------------//
+bool System::mouseMoveInjection_impl(MouseEventArgs& ma)
+{
+    Window* dest_window = getTargetWindow(ma.position);
 
+    // has window containing mouse changed?
+    if (dest_window != d_wndWithMouse)
+    {
+        // store previous window that contained mouse
+        Window* oldWindow = d_wndWithMouse;
+        // set the new window that contains the mouse.
+        d_wndWithMouse = dest_window;
+
+        // inform previous window the mouse has left it
+        if (oldWindow)
+        {
+            ma.window = oldWindow;
+            oldWindow->onMouseLeaves(ma);
+        }
+
+        // inform window containing mouse that mouse has entered it
+        if (d_wndWithMouse)
+        {
+            ma.window = d_wndWithMouse;
+            ma.handled = false;
+            d_wndWithMouse->onMouseEnters(ma);
+        }
+    }
+
+    // inform appropriate window of the mouse movement event
+    if (dest_window)
+    {
+        // ensure event starts as 'not handled'
+        ma.handled = false;
+
+        // loop backwards until event is handled or we run out of windows.
+        while ((!ma.handled) && (dest_window != 0))
+        {
+            ma.window = dest_window;
+            dest_window->onMouseMove(ma);
+            dest_window = getNextTargetWindow(dest_window);
+        }
+    }
+
+    return ma.handled;
+}
+
+//----------------------------------------------------------------------------//
+
+
 } // End of  CEGUI namespace section


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Crayzedsgui-cvsmk2] SF.net SVN: crayzedsgui: [1715] cegui_mk2/branches/v0-6

From: <ice-drezday@us...> - 2008-05-24 14:08

Revision: 1715
          http://crayzedsgui.svn.sourceforge.net/crayzedsgui/?rev=1715&view=rev
Author:   ice-drezday
Date:     2008-05-24 07:08:39 -0700 (Sat, 24 May 2008)

Log Message:
-----------
ADD: Initial code for the D3D 10 GUI Renderer, originally contributed by Rajko Stojadinovic.  See: http://www.cegui.org.uk/phpBB2/viewtopic.php?t=2919
NB: Still some things to sort out for this, such as the samples framework and what to do about TGA loading support.

Modified Paths:
--------------
    cegui_mk2/branches/v0-6/RendererModules/Makefile.am
    cegui_mk2/branches/v0-6/configure.ac
    cegui_mk2/branches/v0-6/makefiles/premake/cegui.lua
    cegui_mk2/branches/v0-6/makefiles/premake/config.lua

Added Paths:
-----------
    cegui_mk2/branches/v0-6/RendererModules/directx10GUIRenderer/
    cegui_mk2/branches/v0-6/RendererModules/directx10GUIRenderer/Makefile.am
    cegui_mk2/branches/v0-6/RendererModules/directx10GUIRenderer/d3d10renderer.cpp
    cegui_mk2/branches/v0-6/RendererModules/directx10GUIRenderer/d3d10renderer.h
    cegui_mk2/branches/v0-6/RendererModules/directx10GUIRenderer/d3d10texture.cpp
    cegui_mk2/branches/v0-6/RendererModules/directx10GUIRenderer/d3d10texture.h
    cegui_mk2/branches/v0-6/makefiles/premake/RendererModules/DirectX10GUIRenderer/
    cegui_mk2/branches/v0-6/makefiles/premake/RendererModules/DirectX10GUIRenderer/premake.lua

Modified: cegui_mk2/branches/v0-6/RendererModules/Makefile.am
===================================================================
--- cegui_mk2/branches/v0-6/RendererModules/Makefile.am	2008-05-24 10:58:42 UTC (rev 1714)
+++ cegui_mk2/branches/v0-6/RendererModules/Makefile.am	2008-05-24 14:08:39 UTC (rev 1715)
@@ -4,4 +4,9 @@
 if BUILD_IRRLICHT_RENDERER
 IRRLICHT=IrrlichtRenderer
 endif
-SUBDIRS = . $(OPENGL) $(IRRLICHT) directx81GUIRenderer directx9GUIRenderer
+SUBDIRS = . \
+          $(OPENGL) \
+          $(IRRLICHT) \
+          directx81GUIRenderer \
+          directx9GUIRenderer \
+          directx10GUIRenderer

Added: cegui_mk2/branches/v0-6/RendererModules/directx10GUIRenderer/Makefile.am
===================================================================
--- cegui_mk2/branches/v0-6/RendererModules/directx10GUIRenderer/Makefile.am	                        (rev 0)
+++ cegui_mk2/branches/v0-6/RendererModules/directx10GUIRenderer/Makefile.am	2008-05-24 14:08:39 UTC (rev 1715)
@@ -0,0 +1,4 @@
+EXTRA_DIST= d3d10renderer.cpp \
+            d3d10renderer.h \
+            d3d10texture.cpp \
+            d3d10texture.h


Property changes on: cegui_mk2/branches/v0-6/RendererModules/directx10GUIRenderer/Makefile.am
___________________________________________________________________
Name: svn:eol-style
   + native

Added: cegui_mk2/branches/v0-6/RendererModules/directx10GUIRenderer/d3d10renderer.cpp
===================================================================
--- cegui_mk2/branches/v0-6/RendererModules/directx10GUIRenderer/d3d10renderer.cpp	                        (rev 0)
+++ cegui_mk2/branches/v0-6/RendererModules/directx10GUIRenderer/d3d10renderer.cpp	2008-05-24 14:08:39 UTC (rev 1715)
@@ -0,0 +1,640 @@
+/***********************************************************************
+	filename: 	d3d10renderer.cpp
+	created:	17/7/2004
+	author:		Paul D Turner with D3D 9 Updates by Magnus \xD6sterlind
+				D3D10 Port by Rajko Stojadinovic
+	
+	purpose:	Main source file for Renderer class using DirectX 10.0
+*************************************************************************/
+/***************************************************************************
+ *   Copyright (C) 2004 - 2008 Paul D Turner & The CEGUI Development Team
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining
+ *   a copy of this software and associated documentation files (the
+ *   "Software"), to deal in the Software without restriction, including
+ *   without limitation the rights to use, copy, modify, merge, publish,
+ *   distribute, sublicense, and/or sell copies of the Software, and to
+ *   permit persons to whom the Software is furnished to do so, subject to
+ *   the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be
+ *   included in all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ *   IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ *   OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ *   ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *   OTHER DEALINGS IN THE SOFTWARE.
+ ***************************************************************************/
+#include "d3d10renderer.h"
+#include "d3d10texture.h"
+#include "CEGUIExceptions.h"
+#include "CEGUISystem.h"
+
+#include <d3dx10.h>
+#include <dxerr.h>
+#include <algorithm>
+#undef min
+
+// Start of CEGUI namespace section
+namespace CEGUI
+{
+//----------------------------------------------------------------------------//
+const int DirectX10Renderer::VERTEX_PER_QUAD       = 6;
+const int DirectX10Renderer::VERTEX_PER_TRIANGLE   = 3;
+const int DirectX10Renderer::VERTEXBUFFER_CAPACITY = 4096;
+
+//----------------------------------------------------------------------------//
+const char Shader[] =
+"struct VSSceneIn\n\
+{    float3 pos          : POSITION;\n\
+float4 color        : COLOR;\n\
+float2 tex          : TEX0;\n\
+};\n\
+//viewport params\n\
+float    g_viewportHeight;\n\
+float    g_viewportWidth;\n\
+struct PSSceneIn \n\
+{    float4 pos : SV_Position;               //position\n\
+float4 color : COLOR0;                  //color\n\
+float2 tex : TEXTURE0;                  //texture coordinate\n\
+};\n\
+DepthStencilState DisableDepth\n\
+{    DepthEnable = FALSE;\n\
+DepthWriteMask = ZERO;\n\
+DepthFunc = ALWAYS;\n\
+};\n\
+BlendState EnableBlending\n\
+{    AlphaToCoverageEnable = FALSE;\n\
+BlendEnable[0] = TRUE;\n\
+SrcBlend = SRC_ALPHA;\n\
+DestBlend = INV_SRC_ALPHA;\n\
+};\n\
+//// VS for rendering in screen space//\n\
+PSSceneIn VSMain(VSSceneIn input)\n\
+{    PSSceneIn output = (PSSceneIn)0.0;\n\
+//output our final position\n\
+output.pos.x = (input.pos.x / (g_viewportWidth/2.0)) -1;\n\
+output.pos.y = -(input.pos.y / (g_viewportHeight/2.0)) +1;\n\
+output.pos.z = input.pos.z;\n\
+output.pos.w = 1;\n\
+//propogate texture coordinate\n\
+output.tex = input.tex;\n\
+output.color.rgba = input.color.bgra;\n\
+return output;\n\
+}\n\
+Texture2D DiffuseTex;\n\
+SamplerState LinearSampler\n\
+{    Filter = MIN_MAG_MIP_LINEAR;\n\
+AddressU = Clamp;\n\
+AddressV = Clamp;\n\
+};\n\
+//// PS for rendering//\n\
+float4 PSMain(PSSceneIn input) : SV_Target\n\
+{\n\
+	float4 color =  DiffuseTex.Sample( LinearSampler, input.tex ) * input.color;\n\
+	return color;\n\
+}\n\
+RasterizerState rasterstate\n\
+{DepthClipEnable = false;\n\
+FillMode = Solid;};\n\
+//// Technique//\n\
+technique10 Render{    \n\
+	pass P0    {        \n\
+		SetVertexShader( CompileShader( vs_4_0, VSMain() ) );\n\
+		SetGeometryShader( NULL );\n\
+		SetPixelShader( CompileShader( ps_4_0, PSMain() ) );\n\
+		SetDepthStencilState(DisableDepth, 0 );\n\
+		SetBlendState( EnableBlending, float4( 0.0f, 0.0f, 0.0f, 0.0f ), 0xFFFFFFFF );\n\
+		SetRasterizerState(rasterstate);    \n\
+	}\n\
+}\n";
+
+//----------------------------------------------------------------------------//
+DirectX10Renderer::DirectX10Renderer(LPDIRECT3DDEVICE device, uint max_quads)
+{
+	d_device = device;
+	Size size(getViewportSize());
+
+	constructor_impl(device, size);
+}
+
+//----------------------------------------------------------------------------//
+void DirectX10Renderer::constructor_impl(LPDIRECT3DDEVICE device,
+    const Size& display_size)
+{
+	d_device        = device;
+	d_queueing      = true;
+	d_currTexture   = 0;
+	d_currSRView    = 0;
+	d_buffer        = 0;
+	d_bufferPos     = 0;
+
+	// initialise renderer display area
+	d_display_area.d_left	= 0;
+	d_display_area.d_top	= 0;
+	d_display_area.setSize(display_size);
+
+	if (FAILED(CreateVertexBuffer()))
+	{
+		// Ideally, this would have been a RendererException, but we can't use
+        // that until the System object is created and that requires a Renderer
+        // passed to the constructor, so we throw this instead.
+		throw std::exception("Creation of VertexBuffer for Renderer object failed");
+	}
+
+
+	// set max texture size the the smaller of max width and max height.
+	d_maxTextureSize = 4096;
+
+	d_device->AddRef();
+
+    // set ID string
+    d_identifierString = "CEGUI::DirectX10Renderer - Official Direct3D 10 "
+                         "based renderer module for CEGUI";
+
+	ID3D10Blob* Errors = 0;
+	HRESULT hrz = D3DX10CreateEffectFromMemory(Shader, sizeof(Shader), 0, 0, 0,
+                                               "fx_4_0", 0, 0, d_device, 0, 0,
+                                               &d_Effect, &Errors, 0);
+	std::string error;
+
+    if (FAILED(hrz))
+	{
+		error = std::string((char*)Errors->GetBufferPointer(),Errors->GetBufferSize());
+		throw std::exception(error.c_str());
+	}
+
+	d_Technique = d_Effect->GetTechniqueByName("Render");
+	d_DiffuseTexVariable = d_Effect->GetVariableByName("DiffuseTex")->AsShaderResource();
+	d_WindowHeight = d_Effect->GetVariableByName("g_viewportHeight")->AsScalar();
+	d_WindowWidth = d_Effect->GetVariableByName("g_viewportWidth")->AsScalar();
+
+	const D3D10_INPUT_ELEMENT_DESC VertexLayout[] =
+	{
+		{ "POSITION", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0,  0, D3D10_INPUT_PER_VERTEX_DATA, 0 }, 
+		{ "COLOR",    0, DXGI_FORMAT_R8G8B8A8_UNORM,  0, 12, D3D10_INPUT_PER_VERTEX_DATA, 0 },
+		{ "TEX",	  0, DXGI_FORMAT_R32G32_FLOAT,	  0, 16, D3D10_INPUT_PER_VERTEX_DATA, 0 },		
+	};
+
+	UINT numElements = sizeof(VertexLayout)/sizeof(VertexLayout[0]);
+
+	// Create the input layout
+	D3D10_PASS_DESC PassDesc;
+	d_Technique->GetPassByIndex( 0 )->GetDesc( &PassDesc );
+	hrz = d_device->CreateInputLayout(VertexLayout, numElements,
+                                      PassDesc.pIAInputSignature,
+                                      PassDesc.IAInputSignatureSize,
+                                      &d_InputLayout );
+	if (FAILED( hrz ))
+	{
+		throw std::exception("Failed to create Input Layout");
+	}
+
+	d_device->IASetInputLayout( d_InputLayout );
+}
+
+//----------------------------------------------------------------------------//
+DirectX10Renderer::~DirectX10Renderer(void)
+{
+	if (d_buffer)
+		d_buffer->Release();
+
+    if (d_Effect)
+		d_Effect->Release();
+
+    if (d_InputLayout)
+		d_InputLayout->Release();
+
+    destroyAllTextures();
+
+	if (d_device)
+		d_device->Release();
+}
+
+//----------------------------------------------------------------------------//
+void DirectX10Renderer::addQuad(const Rect& dest_rect, float z,
+    const Texture* tex, const Rect& texture_rect, const ColourRect& colours,
+    QuadSplitMode quad_split_mode)
+{
+	// if not queueing, render directly (as in, right now!)
+	if (!d_queueing)
+	{
+		renderQuadDirect(dest_rect, z, tex, texture_rect, colours, quad_split_mode);
+	}
+	else
+	{
+		QuadInfo quad;
+
+		quad.position		= dest_rect;
+		quad.z				= z;
+		quad.texture		= ((DirectX10Texture*)tex)->getD3DTexture();
+		quad.resview		= ((DirectX10Texture*)tex)->getD3DResourceView();
+		quad.texPosition	= texture_rect;
+		quad.topLeftCol		= colours.d_top_left.getARGB();
+		quad.topRightCol	= colours.d_top_right.getARGB();
+		quad.bottomLeftCol	= colours.d_bottom_left.getARGB();
+		quad.bottomRightCol	= colours.d_bottom_right.getARGB();
+
+        // set quad split mode
+        quad.splitMode = quad_split_mode;
+
+		d_quadlist.insert(quad);
+	}
+}
+
+//----------------------------------------------------------------------------//
+void DirectX10Renderer::doRender(void)
+{
+	d_currTexture = 0;
+	d_currSRView = 0;
+
+	bool locked = false;
+	QuadVertex*	buffmem;
+
+	// iterate over each quad in the list
+	for (QuadList::iterator i = d_quadlist.begin(); i != d_quadlist.end(); ++i)
+	{
+		const QuadInfo& quad = (*i);
+
+		// flush & set texture if needed
+		if (d_currTexture != quad.texture)
+		{
+			if (locked)
+			{
+				d_buffer->Unmap();
+				locked = false;
+			}
+
+			// render any remaining quads for current texture
+			renderVBuffer(d_currSRView);
+
+			d_currTexture = quad.texture;
+			d_currSRView = quad.resview;
+		}
+
+		if (!locked)
+		{
+			if (FAILED(d_buffer->Map(D3D10_MAP_WRITE_DISCARD, 0, (void**)&buffmem)))
+				return;
+
+			locked = true;
+		}
+
+		// setup Vertex 1...
+		buffmem->x = quad.position.d_left;
+		buffmem->y = quad.position.d_top;
+		buffmem->z = quad.z;
+		buffmem->diffuse = quad.topLeftCol;
+		buffmem->tu1 = quad.texPosition.d_left;
+		buffmem->tv1 = quad.texPosition.d_top;
+		++buffmem;
+
+		// setup Vertex 2...
+
+        // top-left to bottom-right diagonal
+        if (quad.splitMode == TopLeftToBottomRight)
+        {
+            buffmem->x = quad.position.d_right;
+            buffmem->y = quad.position.d_bottom;
+            buffmem->z = quad.z;
+            buffmem->diffuse = quad.bottomRightCol;
+            buffmem->tu1 = quad.texPosition.d_right;
+            buffmem->tv1 = quad.texPosition.d_bottom;
+        }
+        // bottom-left to top-right diagonal
+        else
+        {
+            buffmem->x = quad.position.d_right;
+            buffmem->y = quad.position.d_top;
+            buffmem->z = quad.z;
+            buffmem->diffuse = quad.topRightCol;
+            buffmem->tu1 = quad.texPosition.d_right;
+            buffmem->tv1 = quad.texPosition.d_top;
+        }
+        ++buffmem;
+
+		// setup Vertex 3...
+		buffmem->x = quad.position.d_left;
+		buffmem->y = quad.position.d_bottom;
+		buffmem->z = quad.z;
+		buffmem->diffuse = quad.bottomLeftCol;
+		buffmem->tu1 = quad.texPosition.d_left;
+		buffmem->tv1 = quad.texPosition.d_bottom;
+		++buffmem;
+
+		// setup Vertex 4...
+		buffmem->x = quad.position.d_right;
+		buffmem->y = quad.position.d_top;
+		buffmem->z = quad.z;
+		buffmem->diffuse = quad.topRightCol;
+		buffmem->tu1 = quad.texPosition.d_right;
+		buffmem->tv1 = quad.texPosition.d_top;
+		++buffmem;
+
+		// setup Vertex 5...
+		buffmem->x = quad.position.d_right;
+		buffmem->y = quad.position.d_bottom;
+		buffmem->z = quad.z;
+		buffmem->diffuse = quad.bottomRightCol;
+		buffmem->tu1 = quad.texPosition.d_right;
+		buffmem->tv1 = quad.texPosition.d_bottom;
+		++buffmem;
+
+		// setup Vertex 6...
+
+        // top-left to bottom-right diagonal
+        if (quad.splitMode == TopLeftToBottomRight)
+        {
+            buffmem->x = quad.position.d_left;
+            buffmem->y = quad.position.d_top;
+            buffmem->z = quad.z;
+            buffmem->diffuse = quad.topLeftCol;
+            buffmem->tu1 = quad.texPosition.d_left;
+            buffmem->tv1 = quad.texPosition.d_top;
+        }
+        // bottom-left to top-right diagonal
+        else
+        {
+            buffmem->x = quad.position.d_left;
+            buffmem->y = quad.position.d_bottom;
+            buffmem->z = quad.z;
+            buffmem->diffuse = quad.bottomLeftCol;
+            buffmem->tu1 = quad.texPosition.d_left;
+            buffmem->tv1 = quad.texPosition.d_bottom;
+        }
+        ++buffmem;
+
+		// update buffer level
+		d_bufferPos += VERTEX_PER_QUAD;
+
+		// if there is not enough room in the buffer for another sprite,
+        // render what we have so far.
+		if (d_bufferPos >= (VERTEXBUFFER_CAPACITY - VERTEX_PER_QUAD))
+		{
+			if (locked)
+			{
+				d_buffer->Unmap();
+				locked = false;
+			}
+
+			renderVBuffer(d_currSRView);
+		}
+	}
+
+	if (locked)
+	{
+		d_buffer->Unmap();
+		locked = false;
+	}
+
+	renderVBuffer(d_currSRView);
+}
+
+//----------------------------------------------------------------------------//
+void DirectX10Renderer::clearRenderList(void)
+{
+	d_quadlist.clear();
+}
+
+//----------------------------------------------------------------------------//
+Texture* DirectX10Renderer::createTexture(void)
+{
+	DirectX10Texture* tex = new DirectX10Texture(this);
+	d_texturelist.push_back(tex);
+	return tex;
+}
+
+//----------------------------------------------------------------------------//
+Texture* DirectX10Renderer::createTexture(const String& filename,
+    const String& resourceGroup)
+{
+	DirectX10Texture* tex = new DirectX10Texture(this);
+	try
+	{
+	    tex->loadFromFile(filename, resourceGroup);
+	}
+	catch (RendererException&)
+	{
+	    delete tex;
+	    throw;
+	}
+	d_texturelist.push_back(tex);
+	return tex;
+}
+
+//----------------------------------------------------------------------------//
+Texture* DirectX10Renderer::createTexture(float size)
+{
+	DirectX10Texture* tex = new DirectX10Texture(this);
+	try
+	{
+	    tex->setD3DTextureSize((uint)size);
+	}
+	catch (RendererException&)
+	{
+	    delete tex;
+	    throw;
+	}
+
+	d_texturelist.push_back(tex);
+	return tex;
+}
+
+//----------------------------------------------------------------------------//
+void DirectX10Renderer::destroyTexture(Texture* texture)
+{
+	if (texture)
+	{
+		DirectX10Texture* tex = (DirectX10Texture*)texture;
+		d_texturelist.remove(tex);
+		delete tex;
+	}
+}
+
+//----------------------------------------------------------------------------//
+void DirectX10Renderer::destroyAllTextures(void)
+{
+	while (!d_texturelist.empty())
+		destroyTexture(*(d_texturelist.begin()));
+}
+
+//----------------------------------------------------------------------------//
+void DirectX10Renderer::renderVBuffer(ID3D10ShaderResourceView *tex)
+{
+	// if bufferPos is 0 there is no data in the buffer and nothing to render
+	if (d_bufferPos == 0)
+		return;
+
+	d_device->IASetInputLayout(d_InputLayout);
+
+	// Set IA parameters
+	UINT strides[1] = { sizeof( QuadVertex ) };
+	UINT offsets[1] = {0};
+	ID3D10Buffer* pBuffers[1] = { d_buffer };
+
+	d_device->IASetVertexBuffers( 0, 1, pBuffers, strides, offsets );
+	d_device->IASetPrimitiveTopology( D3D10_PRIMITIVE_TOPOLOGY_TRIANGLELIST );
+
+	d_WindowHeight->SetFloat(getHeight());
+	d_WindowWidth->SetFloat(getWidth());
+
+	D3D10_TECHNIQUE_DESC techDesc;
+	d_Technique->GetDesc( &techDesc );
+
+	for( UINT p = 0; p < techDesc.Passes; ++p )
+	{
+		d_DiffuseTexVariable->SetResource( tex );
+
+		d_Technique->GetPassByIndex( p )->Apply(0);
+		d_device->Draw(d_bufferPos,0);
+	}
+
+	// reset buffer position to 0...
+	d_bufferPos = 0;
+}
+
+//----------------------------------------------------------------------------//
+void DirectX10Renderer::renderQuadDirect(const Rect& dest_rect, float z,
+    const Texture* tex, const Rect& texture_rect, const ColourRect& colours,
+    QuadSplitMode quad_split_mode)
+{
+	// ensure offset destination to ensure proper texel to pixel mapping from D3D.
+	Rect final_rect(dest_rect);
+
+	QuadVertex*	buffmem;
+
+	if (SUCCEEDED(d_buffer->Map(D3D10_MAP_WRITE_DISCARD,0, (void**)&buffmem)))
+	{
+		// setup Vertex 1...
+		buffmem->x = final_rect.d_left;
+		buffmem->y = final_rect.d_top;
+		buffmem->z = z;
+		buffmem->diffuse = colours.d_top_left.getARGB();
+		buffmem->tu1 = texture_rect.d_left;
+		buffmem->tv1 = texture_rect.d_top;
+		++buffmem;
+
+        // setup Vertex 2...
+        // top-left to bottom-right diagonal
+        if (quad_split_mode == TopLeftToBottomRight)
+        {
+            buffmem->x = final_rect.d_right;
+            buffmem->y = final_rect.d_bottom;
+            buffmem->z = z;
+            buffmem->diffuse = colours.d_bottom_right.getARGB();
+            buffmem->tu1 = texture_rect.d_right;
+            buffmem->tv1 = texture_rect.d_bottom;
+        }
+        // bottom-left to top-right diagonal
+        else
+        {
+            buffmem->x = final_rect.d_right;
+            buffmem->y = final_rect.d_top;
+            buffmem->z = z;
+            buffmem->diffuse = colours.d_top_right.getARGB();
+            buffmem->tu1 = texture_rect.d_right;
+            buffmem->tv1 = texture_rect.d_top;
+        }
+        ++buffmem;
+
+		// setup Vertex 3...
+		buffmem->x = final_rect.d_left;
+		buffmem->y = final_rect.d_bottom;
+		buffmem->z = z;
+		buffmem->diffuse = colours.d_bottom_left.getARGB();
+		buffmem->tu1 = texture_rect.d_left;
+		buffmem->tv1 = texture_rect.d_bottom;
+		++buffmem;
+
+		// setup Vertex 4...
+		buffmem->x = final_rect.d_right;
+		buffmem->y = final_rect.d_top;
+		buffmem->z = z;
+		buffmem->diffuse = colours.d_top_right.getARGB();
+		buffmem->tu1 = texture_rect.d_right;
+		buffmem->tv1 = texture_rect.d_top;
+		++buffmem;
+
+		// setup Vertex 5...
+		buffmem->x = final_rect.d_right;
+		buffmem->y = final_rect.d_bottom;
+		buffmem->z = z;
+		buffmem->diffuse = colours.d_bottom_right.getARGB();
+		buffmem->tu1 = texture_rect.d_right;
+		buffmem->tv1 = texture_rect.d_bottom;
+		++buffmem;
+
+		// setup Vertex 6...
+        // top-left to bottom-right diagonal
+        if (quad_split_mode == TopLeftToBottomRight)
+        {
+            buffmem->x = final_rect.d_left;
+            buffmem->y = final_rect.d_top;
+            buffmem->z = z;
+            buffmem->diffuse = colours.d_top_left.getARGB();
+            buffmem->tu1 = texture_rect.d_left;
+            buffmem->tv1 = texture_rect.d_top;
+        }
+        // bottom-left to top-right diagonal
+        else
+        {
+            buffmem->x = final_rect.d_left;
+            buffmem->y = final_rect.d_bottom;
+            buffmem->z = z;
+            buffmem->diffuse = colours.d_bottom_left.getARGB();
+            buffmem->tu1 = texture_rect.d_left;
+            buffmem->tv1 = texture_rect.d_bottom;
+        }
+
+		d_buffer->Unmap();
+		d_bufferPos = VERTEX_PER_QUAD;
+
+		renderVBuffer(((DirectX10Texture*)tex)->getD3DResourceView());
+	}
+
+}
+
+//----------------------------------------------------------------------------//
+Size DirectX10Renderer::getViewportSize(void)
+{
+	// initialise renderer size
+	D3D10_VIEWPORT viewports[1];
+	UINT numviewports = 1;
+
+	d_device->RSGetViewports(&numviewports,viewports);
+	return Size((float)viewports[0].Width, (float)viewports[0].Height);
+}
+
+//----------------------------------------------------------------------------//
+void DirectX10Renderer::setDisplaySize(const Size& sz)
+{
+	if (d_display_area.getSize() != sz)
+	{
+		d_display_area.setSize(sz);
+
+		EventArgs args;
+		fireEvent(EventDisplaySizeChanged, args, EventNamespace);
+	}
+}
+
+//----------------------------------------------------------------------------//
+HRESULT DirectX10Renderer::CreateVertexBuffer()
+{
+    D3D10_BUFFER_DESC BufferDescription;
+
+    BufferDescription.Usage          = D3D10_USAGE_DYNAMIC;
+    BufferDescription.ByteWidth      = (VERTEXBUFFER_CAPACITY * sizeof(QuadVertex));
+    BufferDescription.BindFlags      = D3D10_BIND_VERTEX_BUFFER;
+    BufferDescription.CPUAccessFlags = D3D10_CPU_ACCESS_WRITE;
+    BufferDescription.MiscFlags      = 0;	 
+
+    return d_device->CreateBuffer(&BufferDescription,0,&d_buffer);
+}
+
+//----------------------------------------------------------------------------//
+
+} // End of  CEGUI namespace section
+


Property changes on: cegui_mk2/branches/v0-6/RendererModules/directx10GUIRenderer/d3d10renderer.cpp
___________________________________________________________________
Name: svn:eol-style
   + native

Added: cegui_mk2/branches/v0-6/RendererModules/directx10GUIRenderer/d3d10renderer.h
===================================================================
--- cegui_mk2/branches/v0-6/RendererModules/directx10GUIRenderer/d3d10renderer.h	                        (rev 0)
+++ cegui_mk2/branches/v0-6/RendererModules/directx10GUIRenderer/d3d10renderer.h	2008-05-24 14:08:39 UTC (rev 1715)
@@ -0,0 +1,363 @@
+/***********************************************************************
+    filename:   d3d10renderer.h
+    created:    17/7/2004
+    author:     Paul D Turner with D3D 9 Updates by Magnus \xD6sterlind
+    D3D10 Port by Rajko Stojadinovic
+
+    purpose:    Interface for DirectX 10.0 Renderer class
+*************************************************************************/
+/***************************************************************************
+ *   Copyright (C) 2004 - 2008 Paul D Turner & The CEGUI Development Team
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining
+ *   a copy of this software and associated documentation files (the
+ *   "Software"), to deal in the Software without restriction, including
+ *   without limitation the rights to use, copy, modify, merge, publish,
+ *   distribute, sublicense, and/or sell copies of the Software, and to
+ *   permit persons to whom the Software is furnished to do so, subject to
+ *   the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be
+ *   included in all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ *   IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ *   OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ *   ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *   OTHER DEALINGS IN THE SOFTWARE.
+ ***************************************************************************/
+/*************************************************************************
+    This file contains code that is specific to Win32 and DirectX
+*************************************************************************/
+#ifndef _d3d10renderer_h_
+#define _d3d10renderer_h_
+
+#include "CEGUIBase.h"
+#include "CEGUIRenderer.h"
+#include "CEGUITexture.h"
+#include <d3d10.h>
+#include <list>
+#include <set>
+
+typedef ID3D10Buffer        IDirect3DIndexBuffer;
+typedef ID3D10Buffer        IDirect3DVertexBuffer;
+typedef D3D10_VIEWPORT      D3DVIEWPORT;
+typedef ID3D10VertexShader 	IDirect3DVertexShader;
+typedef ID3D10PixelShader 	IDirect3DPixelShader;
+typedef ID3D10Device*       LPDIRECT3DDEVICE;
+typedef ID3D10Texture2D*    LPDIRECT3DTEXTURE2D;
+typedef ID3D10Buffer*       LPDIRECT3DBUFFER;
+
+#if !defined(CEGUI_STATIC)
+	#ifdef DIRECTX10_GUIRENDERER_EXPORTS
+	#define DIRECTX10_GUIRENDERER_API __declspec(dllexport)
+	#else
+	#define DIRECTX10_GUIRENDERER_API __declspec(dllimport)
+	#endif
+#else
+	#define DIRECTX10_GUIRENDERER_API
+#endif
+
+#if defined(_MSC_VER)
+#	pragma warning(push)
+#	pragma warning(disable : 4251)
+#endif
+
+
+// Start of CEGUI namespace section
+namespace CEGUI
+{
+/*************************************************************************
+    Forward refs
+*************************************************************************/
+class DirectX10Texture;
+
+/*!
+\brief
+    Renderer class to interface with Microsoft DirectX 10.0
+*/
+class DIRECTX10_GUIRENDERER_API DirectX10Renderer : public Renderer
+{
+public:
+    /*!
+    \brief
+        Constructor for Direct3D 10.0 Renderer object
+
+    \param device
+        Pointer to the IDirect3DDevice10 interface object that will be used for
+        all rendering
+
+    \param max_quads
+        Obsolete.  Set to 0.
+    */
+    DirectX10Renderer(LPDIRECT3DDEVICE device, uint max_quads);
+
+    /*!
+    \brief
+        Destructor for DirectX10Renderer objects
+    */
+    virtual ~DirectX10Renderer(void);
+
+    // add a quad to the list to be rendered
+    virtual void addQuad(const Rect& dest_rect, float z, const Texture* tex,
+                         const Rect& texture_rect, const ColourRect& colours,
+                         QuadSplitMode quad_split_mode);
+
+    // perform final rendering for all queued renderable quads.
+    virtual void doRender(void);
+
+    // clear the queue
+    virtual void clearRenderList(void);
+
+    /*!
+    \brief
+        Enable or disable the queueing of quads from this point on.
+
+        This only affects queueing.  If queueing is turned off, any calls to
+        addQuad will cause the quad to be rendered directly.  Note that
+        disabling queueing will not cause currently queued quads to be rendered,
+        nor is the queue cleared - at any time the queue can still be drawn by
+        calling doRender, and the list can be cleared by calling
+        clearRenderList.  Re-enabling the queue causes subsequent quads to be
+        added as if queueing had never been disabled.
+
+    \param setting
+        - true to enable queueing
+        - false to disable queueing (see notes above).
+
+    \return
+        Nothing
+    */
+    virtual void setQueueingEnabled(bool setting)
+        { d_queueing = setting; }
+
+    // create an empty texture
+    virtual Texture* createTexture(void);
+
+    // create a texture and load it with the specified file.
+    virtual Texture* createTexture(const String& filename,
+                                   const String& resourceGroup);
+
+    // create a texture and set it to the specified size
+    virtual Texture* createTexture(float size);
+
+    // destroy the given texture
+    virtual void destroyTexture(Texture* texture);
+
+    // destroy all textures still active
+    virtual void destroyAllTextures(void);
+
+    //! return a pointer to the D3D device.
+    LPDIRECT3DDEVICE getDevice(void) const
+        { return d_device; }
+
+    /*!
+    \brief
+        Return whether queueing is enabled.
+
+    \return
+        - true if queueing is enabled.
+        - false if queueing is disabled.
+    */
+    virtual bool isQueueingEnabled(void) const
+        { return d_queueing; }
+
+    /*!
+    \brief
+        Return the current width of the display in pixels.
+
+    \return
+        float value equal to the current width of the display in pixels.
+    */
+    virtual float getWidth(void) const
+        { return d_display_area.getWidth(); }
+
+    /*!
+    \brief
+        Return the current height of the display in pixels.
+
+    \return
+        float value equal to the current height of the display in pixels.
+    */
+    virtual float getHeight(void) const
+        { return d_display_area.getHeight(); }
+
+    /*!
+    \brief
+        Return the size of the display in pixels.
+
+    \return
+        Size object describing the dimensions of the current display.
+    */
+    virtual Size getSize(void) const
+        { return d_display_area.getSize(); }
+
+
+    /*!
+    \brief
+        Return a Rect describing the screen.
+
+    \return
+        A Rect object that describes the screen area.  Typically, the top-left
+        values are always 0, and the size of the area described is equal to the
+        screen resolution.
+    */
+    virtual Rect getRect(void) const
+        { return d_display_area; }
+
+    /*!
+    \brief
+        Return the maximum texture size available
+
+    \return
+        Size of the maximum supported texture in pixels
+        (textures are always assumed to be square)
+    */
+    virtual uint getMaxTextureSize(void) const
+        { return d_maxTextureSize; }
+
+    /*!
+    \brief
+        Return the horizontal display resolution dpi.
+
+    \return
+        horizontal resolution of the display in dpi.
+    */
+    virtual uint getHorzScreenDPI(void) const
+        { return 96; }
+
+    /*!
+    \brief
+        Return the vertical display resolution dpi.
+
+    \return
+        vertical resolution of the display in dpi.
+    */
+    virtual uint getVertScreenDPI(void) const
+        { return 96; }
+
+    /*!
+    \brief
+        Set the size of the display in pixels.
+
+        You do not have to call this method under normal operation as the system
+        will automatically extract the size from the current view port.
+
+    \note
+        This method will cause the EventDisplaySizeChanged event to fire if the
+        display size has changed.
+
+    \param sz
+        Size object describing the size of the display.
+
+    \return
+        Nothing.
+    */
+    void setDisplaySize(const Size& sz);
+
+private:
+    /************************************************************************
+        Implementation Constants
+    ************************************************************************/
+    //! number of vertices per quad.
+    static const int VERTEX_PER_QUAD;
+    //! number of vertices for a triangle.
+    static const int VERTEX_PER_TRIANGLE;
+    //! capacity of the allocated vertex buffer.
+    static const int VERTEXBUFFER_CAPACITY;
+
+    /*************************************************************************
+        Implementation Structs & classes
+    *************************************************************************/
+    //! FVF structure used for all vertices.
+    struct QuadVertex {
+        //! The pre-transformed position for the vertex.
+        FLOAT x, y, z;
+        //! colour of the vertex.
+        DWORD diffuse;
+        //! texture coordinates.
+        float tu1, tv1;
+    };
+
+    //! structure holding details about a quad to be drawn.
+    struct QuadInfo
+    {
+        LPDIRECT3DTEXTURE2D texture;
+        ID3D10ShaderResourceView* resview;
+        Rect position;
+        float z;
+        Rect texPosition;
+        ulong topLeftCol;
+        ulong topRightCol;
+        ulong bottomLeftCol;
+        ulong bottomRightCol;
+        QuadSplitMode splitMode;
+
+        bool operator<(const QuadInfo& other) const
+        {
+            // this is intentionally reversed.
+            return z > other.z;
+        }
+    };
+
+    /*************************************************************************
+        Implementation Methods
+    *************************************************************************/
+    //! renders whatever is in the vertex buffer
+    void renderVBuffer(ID3D10ShaderResourceView *tex);
+
+    //! render a quad directly to the display
+    void renderQuadDirect(const Rect& dest_rect, float z, const Texture* tex,
+                          const Rect& texture_rect, const ColourRect& colours,
+                          QuadSplitMode quad_split_mode);
+
+    //! return size of device view port (if possible)
+    Size getViewportSize(void);
+
+    //! method to do work of constructor
+    void constructor_impl(LPDIRECT3DDEVICE device, const Size& display_size);
+
+    HRESULT CreateVertexBuffer();
+
+    /*************************************************************************
+        Implementation Data
+    *************************************************************************/
+    //! Rect describing the current display area used by the renderer.
+    Rect d_display_area;
+    //! Typedef for the container where queued quads are kept.
+    typedef std::multiset<QuadInfo> QuadList;
+    //! Container to hold the queued quads.
+    QuadList d_quadlist;
+    //! setting for queueing control.
+    bool d_queueing;
+    //! Base Direct3DDevice10 interface that we use for rendering.
+    LPDIRECT3DDEVICE d_device;
+    //! currently set texture.
+    LPDIRECT3DTEXTURE2D d_currTexture;
+    ID3D10ShaderResourceView* d_currSRView;
+    //! vertex buffer to queue sprite rendering.
+    LPDIRECT3DBUFFER d_buffer;
+    //! index into buffer where next vertex should be put.
+    int d_bufferPos;
+    ID3D10InputLayout* d_InputLayout;
+    // D3DX effect interface.
+    ID3D10Effect* d_Effect;
+    ID3D10EffectTechnique* d_Technique;
+    ID3D10EffectShaderResourceVariable* d_DiffuseTexVariable;
+    ID3D10EffectScalarVariable* d_WindowHeight;
+    ID3D10EffectScalarVariable* d_WindowWidth;
+    //! List used to track textures.
+    std::list<DirectX10Texture*> d_texturelist;
+    //! Holds maximum supported texture size (in pixels).
+    uint d_maxTextureSize;
+};
+
+} // End of  CEGUI namespace section
+
+#if defined(_MSC_VER)
+#	pragma warning(pop)
+#endif
+
+#endif	// end of guard _d3d10renderer_h_


Property changes on: cegui_mk2/branches/v0-6/RendererModules/directx10GUIRenderer/d3d10renderer.h
___________________________________________________________________
Name: svn:eol-style
   + native

Added: cegui_mk2/branches/v0-6/RendererModules/directx10GUIRenderer/d3d10texture.cpp
===================================================================
--- cegui_mk2/branches/v0-6/RendererModules/directx10GUIRenderer/d3d10texture.cpp	                        (rev 0)
+++ cegui_mk2/branches/v0-6/RendererModules/directx10GUIRenderer/d3d10texture.cpp	2008-05-24 14:08:39 UTC (rev 1715)
@@ -0,0 +1,345 @@
+/***********************************************************************
+    filename:   d3d10texture.cpp
+    created:    17/7/2004
+    author:     Paul D Turner with D3D 9 Updates by Magnus \xD6sterlind
+                D3D10 Port by Rajko Stojadinovic
+
+    purpose:    Implements texture class for D3D10.0 system
+*************************************************************************/
+/***************************************************************************
+ *   Copyright (C) 2004 - 2008 Paul D Turner & The CEGUI Development Team
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining
+ *   a copy of this software and associated documentation files (the
+ *   "Software"), to deal in the Software without restriction, including
+ *   without limitation the rights to use, copy, modify, merge, publish,
+ *   distribute, sublicense, and/or sell copies of the Software, and to
+ *   permit persons to whom the Software is furnished to do so, subject to
+ *   the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be
+ *   included in all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ *   IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ *   OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ *   ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *   OTHER DEALINGS IN THE SOFTWARE.
+ ***************************************************************************/
+#include "d3d10texture.h"
+#include "d3d10renderer.h"
+#include "CEGUIExceptions.h"
+#include "CEGUISystem.h"
+
+#include <d3dx10.h>
+#include <dxerr.h>
+#undef max
+
+#define D3DCOLOR_ARGB(a,r,g,b) \
+	((ulong)((((a)&0xff)<<24)|(((r)&0xff)<<16)|(((g)&0xff)<<8)|((b)&0xff)))
+#define D3DCOLOR_RGBA(r,g,b,a) D3DCOLOR_ARGB(a,r,g,b)
+
+
+// Start of CEGUI namespace section
+namespace CEGUI
+{
+//----------------------------------------------------------------------------//
+DirectX10Texture::DirectX10Texture(Renderer* owner) :
+    Texture(owner),
+    d_d3dtexture(0),
+    d_srview(0),
+    d_isMemoryTexture(true),
+    d_width(0),
+    d_height(0),
+    d_orgWidth(0),
+    d_orgHeight(0)
+{
+}
+
+//----------------------------------------------------------------------------//
+DirectX10Texture::~DirectX10Texture(void)
+{
+    freeD3DTexture();
+}
+
+//----------------------------------------------------------------------------//
+void DirectX10Texture::loadFromFile(const String& filename,
+    const String& resourceGroup)
+{
+    freeD3DTexture();
+
+    // load the file via the resource provider
+    RawDataContainer texFile;
+    System::getSingleton().getResourceProvider()->
+        loadRawDataContainer(filename, texFile, resourceGroup);
+
+    ID3D10Resource* pRes = 0;
+
+    D3DX10_IMAGE_LOAD_INFO loadInfo;
+    ZeroMemory(&loadInfo,sizeof(loadInfo));
+    loadInfo.Width = D3DX10_DEFAULT;
+    loadInfo.Height = D3DX10_DEFAULT;
+    loadInfo.Depth = D3DX10_DEFAULT;
+    loadInfo.MipLevels = 1;
+    loadInfo.Usage = D3D10_USAGE_IMMUTABLE;
+    loadInfo.BindFlags = D3D10_BIND_SHADER_RESOURCE;
+    loadInfo.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
+    loadInfo.Filter = D3DX10_FILTER_NONE;
+    loadInfo.MipFilter = D3DX10_FILTER_NONE;
+
+    D3DX10_IMAGE_INFO imageInfo;
+
+    HRESULT hr =
+        D3DX10GetImageInfoFromMemory(texFile.getDataPtr(),
+                                     static_cast<UINT>(texFile.getSize()), 0,
+                                     &imageInfo, 0);
+
+    if (SUCCEEDED(hr))
+    {
+        d_orgHeight = imageInfo.Height;
+        d_orgWidth = imageInfo.Width;
+
+        loadInfo.pSrcInfo = &imageInfo;
+
+        hr = D3DX10CreateTextureFromMemory(
+                ((DirectX10Renderer*)getRenderer())->getDevice(),
+                texFile.getDataPtr(), static_cast<UINT>(texFile.getSize()), 
+                &loadInfo, 0, &pRes, 0);
+
+        if (SUCCEEDED(hr))
+        {
+            pRes->QueryInterface(__uuidof( ID3D10Texture2D ), (LPVOID*)&d_d3dtexture);
+
+            // now obtain details of the size of the texture
+            D3D10_TEXTURE2D_DESC surfDesc;
+            d_d3dtexture->GetDesc(&surfDesc);
+
+            d_width = static_cast<ushort>(surfDesc.Width);
+            d_height = static_cast<ushort>(surfDesc.Height);
+
+            d_filename = filename;
+            d_resourceGroup = resourceGroup;
+            d_isMemoryTexture = false;
+
+            D3D10_SHADER_RESOURCE_VIEW_DESC srvDesc;
+            srvDesc.Format = surfDesc.Format;
+            srvDesc.ViewDimension = D3D10_SRV_DIMENSION_TEXTURE2D;
+            srvDesc.Texture2D.MostDetailedMip = 0;
+            srvDesc.Texture2D.MipLevels = surfDesc.MipLevels;
+            ((DirectX10Renderer*)getRenderer())->getDevice()->
+                CreateShaderResourceView(pRes, &srvDesc, &d_srview);
+            pRes->Release();
+        }
+    }
+    else
+    {
+        throw RendererException("Failed to create Texture object from file '" +
+                                filename + "'.  Additional Info: " +
+                                DXGetErrorString(hr));
+    }
+
+    System::getSingleton().getResourceProvider()->
+        unloadRawDataContainer(texFile);
+}
+
+//----------------------------------------------------------------------------//
+void DirectX10Texture::loadFromMemory(const void* buffPtr, uint buffWidth,
+    uint buffHeight, Texture::PixelFormat pixFormat)
+{
+    using namespace std;
+
+    // release old texture
+    freeD3DTexture();
+
+    // calculate square size big enough for whole memory buffer
+    uint tex_size = ceguimax(buffWidth, buffHeight);
+
+    // create a texture
+    // TODO: Check resulting pixel format and react appropriately.
+    DXGI_FORMAT pixfmt;
+    switch (pixFormat)
+    {
+    case PF_RGB:
+        pixfmt = DXGI_FORMAT_R8G8B8A8_UNORM;
+        break;
+    case PF_RGBA:
+        pixfmt = DXGI_FORMAT_R8G8B8A8_UNORM;
+        break;
+    default:
+        throw RendererException("Failed to load texture from memory: "
+                                "Invalid pixelformat.");
+    }
+
+    // copy data from buffer into texture
+    ulong* dst = (ulong*)new char[tex_size * tex_size * 4];
+    ZeroMemory(dst, tex_size * tex_size * 4);
+    ulong* goods = dst;
+    ulong* src = (ulong*)buffPtr;
+
+    // RGBA
+    if (pixFormat == PF_RGBA)
+    {
+        for (uint i = 0; i < buffHeight; ++i)
+        {
+            for (uint j = 0; j < buffWidth; ++j)
+            {
+                // we don't need endian safety on Microsoft
+                uchar r = (uchar)(src[j] & 0xFF);
+                uchar g = (uchar)((src[j] >> 8) & 0xFF);
+                uchar b = (uchar)((src[j] >> 16) & 0xFF);
+                uchar a = (uchar)((src[j] >> 24) & 0xFF);
+
+                dst[j] = D3DCOLOR_ARGB(a, r, g, b);
+            }
+
+            dst += tex_size;
+            src += buffWidth;
+        }
+    }
+    // RGB
+    else
+    {
+        for (uint i = 0; i < buffHeight; ++i)
+        {
+            for (uint j = 0; j < buffWidth; ++j)
+            {
+                uchar r = (uchar)(src[j] & 0xFF);
+                uchar g = (uchar)((src[j] >> 8) & 0xFF);
+                uchar b = (uchar)((src[j] >> 16)  & 0xFF);
+                uchar a = 255;
+
+                dst[j] = D3DCOLOR_ARGB(a, r, g, b);
+            }
+
+            dst += tex_size;
+            src += buffWidth;
+        }
+    }
+
+    D3D10_TEXTURE2D_DESC descTex;
+    ZeroMemory(&descTex, sizeof(descTex));
+    descTex.Width = tex_size;
+    descTex.Height = tex_size;
+    descTex.ArraySize = 1;
+    descTex.SampleDesc.Count = 1;
+    descTex.SampleDesc.Quality = 0;
+    descTex.Format = pixfmt;
+    descTex.Usage = D3D10_USAGE_DEFAULT;
+    descTex.BindFlags = D3D10_BIND_SHADER_RESOURCE;
+    descTex.CPUAccessFlags = 0;
+    descTex.MiscFlags = 0;
+    descTex.MipLevels = 1;
+
+    D3D10_SUBRESOURCE_DATA data[1];
+    ZeroMemory(&data, sizeof(D3D10_SUBRESOURCE_DATA));
+    data[0].pSysMem = goods;
+    data[0].SysMemPitch = 4 * tex_size;
+
+    HRESULT hr = ((DirectX10Renderer*)getRenderer())->getDevice()->
+        CreateTexture2D(&descTex, data, &d_d3dtexture);
+
+    if (FAILED(hr))
+    {
+        throw RendererException("Failed to load texture from memory: "
+                                "D3D Texture creation failed.");
+    }
+    else
+    {
+        d_orgWidth = buffWidth;
+        d_orgHeight = buffHeight;
+        obtainActualTextureSize();
+    }
+
+    ID3D10Resource*  pRes = 0;
+    d_d3dtexture->QueryInterface(__uuidof( ID3D10Resource ), (LPVOID*)&pRes);
+
+    D3D10_SHADER_RESOURCE_VIEW_DESC srvDesc;
+    srvDesc.Format = descTex.Format;
+    srvDesc.ViewDimension = D3D10_SRV_DIMENSION_TEXTURE2D;
+    srvDesc.Texture2D.MostDetailedMip = 0;
+    srvDesc.Texture2D.MipLevels = descTex.MipLevels;
+    ((DirectX10Renderer*)getRenderer())->getDevice()->
+        CreateShaderResourceView(pRes, &srvDesc, &d_srview);
+    pRes->Release();
+}
+
+//----------------------------------------------------------------------------//
+void DirectX10Texture::freeD3DTexture(void)
+{
+    if (d_d3dtexture)
+    {
+        d_d3dtexture->Release();
+        d_d3dtexture = 0;
+    }
+
+    if (d_srview)
+    {
+        d_srview->Release();
+        d_srview = 0;
+    }
+
+    d_filename.clear();
+    d_isMemoryTexture = true;
+}
+
+//----------------------------------------------------------------------------//
+void DirectX10Texture::setD3DTextureSize(uint size)
+{
+    freeD3DTexture();
+
+    D3D10_TEXTURE2D_DESC descTex;
+    descTex.Width = size;
+    descTex.Height = size;
+    descTex.ArraySize = 1;
+    descTex.SampleDesc.Count = 1;
+    descTex.SampleDesc.Quality = 0;
+    descTex.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
+    descTex.Usage = D3D10_USAGE_DEFAULT;
+    descTex.BindFlags = D3D10_BIND_SHADER_RESOURCE;
+    descTex.CPUAccessFlags = D3D10_CPU_ACCESS_WRITE | D3D10_CPU_ACCESS_READ;
+    descTex.MiscFlags = 0;
+    descTex.MipLevels = 1;
+
+    HRESULT hr = ((DirectX10Renderer*)getRenderer())->getDevice()->
+        CreateTexture2D(&descTex, 0, &d_d3dtexture);
+
+    if (FAILED(hr))
+    {
+        throw RendererException("Failed to create texture of specified size: "
+                                "D3D Texture creation failed.");
+    }
+    else
+    {
+        d_orgWidth = d_orgHeight = size;
+        obtainActualTextureSize();
+
+        ID3D10Resource*  pRes    = 0;
+        d_d3dtexture->QueryInterface(__uuidof( ID3D10Resource ), (LPVOID*)&pRes);
+
+        D3D10_SHADER_RESOURCE_VIEW_DESC srvDesc;
+        srvDesc.Format = descTex.Format;
+        srvDesc.ViewDimension = D3D10_SRV_DIMENSION_TEXTURE2D;
+        srvDesc.Texture2D.MostDetailedMip = 0;
+        srvDesc.Texture2D.MipLevels = descTex.MipLevels;
+        ((DirectX10Renderer*)getRenderer())->getDevice()->
+            CreateShaderResourceView(pRes, &srvDesc, &d_srview);
+        pRes->Release();
+    }
+}
+
+//----------------------------------------------------------------------------//
+void DirectX10Texture::obtainActualTextureSize(void)
+{
+    // now obtain details of the size of the texture
+    D3D10_TEXTURE2D_DESC surfDesc;
+    d_d3dtexture->GetDesc(&surfDesc);
+
+    d_width = static_cast<ushort>(surfDesc.Width);
+    d_height = static_cast<ushort>(surfDesc.Height);
+}
+
+//----------------------------------------------------------------------------//
+
+} // End of  CEGUI namespace section


Property changes on: cegui_mk2/branches/v0-6/RendererModules/directx10GUIRenderer/d3d10texture.cpp
___________________________________________________________________
Name: svn:eol-style
   + native

Added: cegui_mk2/branches/v0-6/RendererModules/directx10GUIRenderer/d3d10texture.h
===================================================================
--- cegui_mk2/branches/v0-6/RendererModules/directx10GUIRenderer/d3d10texture.h	                        (rev 0)
+++ cegui_mk2/branches/v0-6/RendererModules/directx10GUIRenderer/d3d10texture.h	2008-05-24 14:08:39 UTC (rev 1715)
@@ -0,0 +1,194 @@
+/***********************************************************************
+    filename:   d3d10texture.h
+    created:    17/7/2004
+    author:     Paul D Turner with D3D 9 Updates by Magnus \xD6sterlind
+                D3D10 Port by Rajko Stojadinovic
+
+    purpose:    Defines concrete texture class for D3D10.0
+*************************************************************************/
+/***************************************************************************
+ *   Copyright (C) 2004 - 2008 Paul D Turner & The CEGUI Development Team
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining
+ *   a copy of this software and associated documentation files (the
+ *   "Software"), to deal in the Software without restriction, including
+ *   without limitation the rights to use, copy, modify, merge, publish,
+ *   distribute, sublicense, and/or sell copies of the Software, and to
+ *   permit persons to whom the Software is furnished to do so, subject to
+ *   the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be
+ *   included in all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ *   IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ *   OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ *   ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *   OTHER DEALINGS IN THE SOFTWARE.
+ ***************************************************************************/
+#ifndef _d3d10texture_h_
+#define _d3d10texture_h_
+
+#include "CEGUIBase.h"
+#include "CEGUIRenderer.h"
+#include "CEGUITexture.h"
+#include "d3d10renderer.h"
+#include <d3d10.h>
+#include <list>
+
+// Start of CEGUI namespace section
+namespace CEGUI
+{
+/*!
+\brief
+    Texture class that is created by DirectX10Renderer objects
+*/
+class DIRECTX10_GUIRENDERER_API DirectX10Texture : public Texture
+{
+private:
+    /*************************************************************************
+        Friends (to allow construction and destruction)
+    *************************************************************************/
+    friend Texture* DirectX10Renderer::createTexture(void);
+    friend Texture* DirectX10Renderer::createTexture(const String& filename, 
+        const String& resourceGroup);
+    friend Texture* DirectX10Renderer::createTexture(float size);
+    friend void	DirectX10Renderer::destroyTexture(Texture* texture);
+
+    /*************************************************************************
+        Construction & Destruction (by Renderer object only)
+    *************************************************************************/
+    DirectX10Texture(Renderer* owner);
+    virtual ~DirectX10Texture(void);
+
+public:
+    /*!
+    \brief
+        Returns the current pixel width of the texture
+
+    \return
+        ushort value that is the current width of the texture in pixels
+    */
+    virtual ushort getWidth(void) const
+        { return d_width; }
+
+    /*!
+    \brief
+        Returns the current pixel height of the texture
+
+    \return
+        ushort value that is the current height of the texture in pixels
+    */
+    virtual ushort getHeight(void) const
+        { return d_height; }
+
+    virtual ushort getOriginalWidth(void) const
+        { return d_orgWidth; }
+    virtual ushort getOriginalHeight(void) const
+        { return d_orgHeight; }
+
+	/*!
+	\brief
+		Loads the specified image file into the texture.  The texture is resized
+        as required to hold the image.
+
+	\param filename
+		The filename of the image file that is to be loaded into the texture
+
+    \param resourceGroup
+        Resource group identifier passed to the resource provider.
+
+	\return
+		Nothing.
+	*/
+    virtual void loadFromFile(const String& filename,
+                              const String& resourceGroup);
+
+    /*!
+    \brief
+        Loads (copies) an image in memory into the texture.  The texture is
+        resized as required to hold the image.
+
+    \param buffPtr
+        Pointer to the buffer containing the image data
+
+    \param buffWidth
+        Width of the buffer (in pixels as specified by \a pixelFormat )
+
+    \param buffHeight
+        Height of the buffer (in pixels as specified by \a pixelFormat )
+
+    \param pixelFormat
+        PixelFormat value describing the format contained in \a buffPtr
+
+    \return
+        Nothing.
+    */
+    virtual void loadFromMemory(const void* buffPtr, uint buffWidth,
+                                uint buffHeight, PixelFormat pixelFormat);
+
+    /*!
+    \brief
+        Return a pointer to the internal Direct3DTexture9 object
+
+    \return
+        Pointer to the IDirect3DTexture9 interface currently being used by this
+        Texture object
+    */
+    LPDIRECT3DTEXTURE2D	getD3DTexture(void) const {return d_d3dtexture;}
+    ID3D10ShaderResourceView* getD3DResourceView(void) const {return d_srview;}
+
+    /*!
+    \brief
+        set the size of the internal D3D texture.  Previous D3D texture is lost.
+
+    \param size
+        pixel size of the new internal texture.  This will be rounded up to a
+        power of 2.
+
+    \return
+        Nothing.
+    */
+    void setD3DTextureSize(uint size);
+
+private:
+	/*************************************************************************
+		Implementation Functions
+	*************************************************************************/
+	//! safely free D3D texture (can be called multiple times with no ill effect)
+	void freeD3DTexture(void);
+
+    /*!
+     * obtain and fill-in the real texture dimensions.
+     * d_orgWidth and d_orgHeight should be set before calling this, since
+     * they are used as fall-back values if the query fails.
+     */
+    void obtainActualTextureSize(void);
+
+    /*************************************************************************
+        Implementation Data
+    *************************************************************************/
+    //! The underlying Direct3D texture.
+    LPDIRECT3DTEXTURE2D d_d3dtexture;
+	ID3D10ShaderResourceView* d_srview;
+    //! name of file used to create the texture, if any.
+	String d_filename;
+    //! Resource group from which the file 'd_filename' was loaded.
+    String d_resourceGroup;
+    //! true if the texture was created from memory (and not a file).
+	bool d_isMemoryTexture;
+    //! cached width of the texture.
+	ushort d_width;
+    //! cached height of the texture.
+    ushort d_height;
+    //! width of the source material for the texture.
+    ushort d_orgWidth;
+    //! height of the source material for the texture.
+    ushort d_orgHeight;
+};
+
+} // End of  CEGUI namespace section
+
+#endif	// end of guard _d3d10texture_h_


Property changes on: cegui_mk2/branches/v0-6/RendererModules/directx10GUIRenderer/d3d10texture.h
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: cegui_mk2/branches/v0-6/configure.ac
===================================================================
--- cegui_mk2/branches/v0-6/configure.ac	2008-05-24 10:58:42 UTC (rev 1714)
+++ cegui_mk2/branches/v0-6/configure.ac	2008-05-24 14:08:39 UTC (rev 1715)
@@ -129,6 +129,7 @@
                  ImageCodecModules/TGAImageCodec/Makefile
                  RendererModules/directx81GUIRenderer/Makefile
                  RendererModules/directx9GUIRenderer/Makefile
+                 RendererModules/directx10GUIRenderer/Makefile
                  RendererModules/IrrlichtRenderer/Makefile
                  RendererModules/Makefile
                  RendererModules/OpenGLGUIRenderer/Makefile

Added: cegui_mk2/branches/v0-6/makefiles/premake/RendererModules/DirectX10GUIRenderer/premake.lua
===================================================================
--- cegui_mk2/branches/v0-6/makefiles/premake/RendererModules/DirectX10GUIRenderer/premake.lua	                        (rev 0)
+++ cegui_mk2/branches/v0-6/makefiles/premake/RendererModules/DirectX10GUIRenderer/premake.lua	2008-05-24 14:08:39 UTC (rev 1715)
@@ -0,0 +1,21 @@
+--
+-- DirectX9GUIRenderer premake script
+--
+
+cegui_dynamic("DirectX10GUIRenderer")
+
+package.files =
+{
+    matchfiles(pkgdir.."*.cpp"),
+    matchfiles(pkgdir.."*.h"),
+}
+
+include(pkgdir)
+
+library("d3d10")
+library("dxerr")
+library("d3dx10", "d")
+
+dependency("CEGUIBase")
+
+define("DIRECTX10_GUIRENDERER_EXPORTS")


Property changes on: cegui_mk2/branches/v0-6/makefiles/premake/RendererModules/DirectX10GUIRenderer/premake.lua
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: cegui_mk2/branches/v0-6/makefiles/premake/cegui.lua
===================================================================
--- cegui_mk2/branches/v0-6/makefiles/premake/cegui.lua	2008-05-24 10:58:42 UTC (rev 1714)
+++ cegui_mk2/branches/v0-6/makefiles/premake/cegui.lua	2008-05-24 14:08:39 UTC (rev 1715)
@@ -70,6 +70,10 @@
     tinsert(pkg_table.RendererModules, "OpenGLGUIRenderer")
 end
 
+if DIRECTX10_RENDERER then
+    tinsert(pkg_table.RendererModules, "DirectX10GUIRenderer")
+end
+
 if DIRECTX9_RENDERER then
     tinsert(pkg_table.RendererModules, "DirectX9GUIRenderer")
 end
@@ -161,6 +165,9 @@
     if DIRECTX9_RENDERER and SAMPLES_DX9 then
         config_h.CEGUI_SAMPLES_USE_DIRECTX_9 = ""
     end
+    if DIRECTX10_RENDERER and SAMPLES_DX10 then
+        config_h.CEGUI_SAMPLES_USE_DIRECTX_10 = ""
+    end
     --if SAMPLES_OGRE then
     --    config_h.CEGUI_SAMPLES_USE_OGRE = ""
     --end

Modified: cegui_mk2/branches/v0-6/makefiles/premake/config.lua
===================================================================
--- cegui_mk2/branches/v0-6/makefiles/premake/config.lua	2008-05-24 10:58:42 UTC (rev 1714)
+++ cegui_mk2/branches/v0-6/makefiles/premake/config.lua	2008-05-24 14:08:39 UTC (rev 1715)
@@ -26,6 +26,7 @@
 OPENGL_RENDERER = true
 DIRECTX81_RENDERER = false
 DIRECTX9_RENDERER = true
+DIRECTX10_RENDERER = false
 IRRLICHT_RENDERER = false
 
 ----------------
@@ -88,6 +89,7 @@
 SAMPLES_GL = true
 SAMPLES_DX81 = false
 SAMPLES_DX9 = true
+SAMPLES_DX10 = false
 SAMPLES_IRRLICHT = false
 
 -- this setting controls if the samples should be included in the same


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Crayzedsgui-cvsmk2] SF.net SVN: crayzedsgui: [1717] cegui_mk2/branches/v0-6

From: <ice-drezday@us...> - 2008-05-25 08:25

Revision: 1717
          http://crayzedsgui.svn.sourceforge.net/crayzedsgui/?rev=1717&view=rev
Author:   ice-drezday
Date:     2008-05-25 01:25:55 -0700 (Sun, 25 May 2008)

Log Message:
-----------
FIX: Under gcc/autotools the various libraries and modules were not linking against CEGUIBase (except on MinGW32).  See: http://www.cegui.org.uk/mantis/view.php?id=196

Modified Paths:
--------------
    cegui_mk2/branches/v0-6/ImageCodecModules/CoronaImageCodec/Makefile.am
    cegui_mk2/branches/v0-6/ImageCodecModules/DevILImageCodec/Makefile.am
    cegui_mk2/branches/v0-6/ImageCodecModules/FreeImageImageCodec/Makefile.am
    cegui_mk2/branches/v0-6/ImageCodecModules/SILLYImageCodec/Makefile.am
    cegui_mk2/branches/v0-6/ImageCodecModules/TGAImageCodec/Makefile.am
    cegui_mk2/branches/v0-6/RendererModules/IrrlichtRenderer/Makefile.am
    cegui_mk2/branches/v0-6/RendererModules/OpenGLGUIRenderer/Makefile.am
    cegui_mk2/branches/v0-6/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.am
    cegui_mk2/branches/v0-6/WindowRendererSets/Falagard/src/Makefile.am
    cegui_mk2/branches/v0-6/XMLParserModules/TinyXMLParser/Makefile.am
    cegui_mk2/branches/v0-6/XMLParserModules/XercesParser/Makefile.am
    cegui_mk2/branches/v0-6/XMLParserModules/expatParser/Makefile.am
    cegui_mk2/branches/v0-6/XMLParserModules/libxmlParser/Makefile.am

Modified: cegui_mk2/branches/v0-6/ImageCodecModules/CoronaImageCodec/Makefile.am
===================================================================
--- cegui_mk2/branches/v0-6/ImageCodecModules/CoronaImageCodec/Makefile.am	2008-05-25 07:47:46 UTC (rev 1716)
+++ cegui_mk2/branches/v0-6/ImageCodecModules/CoronaImageCodec/Makefile.am	2008-05-25 08:25:55 UTC (rev 1717)
@@ -1,15 +1,12 @@
 INCLUDES=-I$(top_srcdir)/include $(Corona_CFLAGS)
 pkgincludedir=$(prefix)/include/CEGUI/ImageCodecModules/CoronaImageCodec
 
-libCEGUICoronaImageCodec_la_LIBADD =
-
 if MINGW32_BUILD
 libCEGUICoronaImageCodec_la_CPPFLAGS = -DCEGUICORONAIMAGECODEC_EXPORTS
 libCEGUICoronaImageCodec_la_LDFLAGS = -no-undefined -avoid-version
-libCEGUICoronaImageCodec_la_LIBADD += -L$(top_builddir)/src -lCEGUIBase
 endif
 
-libCEGUICoronaImageCodec_la_LIBADD += $(Corona_LIBS)
+libCEGUICoronaImageCodec_la_LIBADD = $(Corona_LIBS) $(top_builddir)/src/libCEGUIBase.la
 
 lib_LTLIBRARIES=libCEGUICoronaImageCodec.la
 

Modified: cegui_mk2/branches/v0-6/ImageCodecModules/DevILImageCodec/Makefile.am
===================================================================
--- cegui_mk2/branches/v0-6/ImageCodecModules/DevILImageCodec/Makefile.am	2008-05-25 07:47:46 UTC (rev 1716)
+++ cegui_mk2/branches/v0-6/ImageCodecModules/DevILImageCodec/Makefile.am	2008-05-25 08:25:55 UTC (rev 1717)
@@ -2,15 +2,12 @@
 
 pkgincludedir=$(prefix)/include/CEGUI/ImageCodecModules/DevILImageCodec
 
-libCEGUIDevILImageCodec_la_LIBADD =
-
 if MINGW32_BUILD
 libCEGUIDevILImageCodec_la_CPPFLAGS = -DCEGUIDEVILIMAGECODEC_EXPORTS
 libCEGUIDevILImageCodec_la_LDFLAGS = -no-undefined -avoid-version
-libCEGUIDevILImageCodec_la_LIBADD += -L$(top_builddir)/src -lCEGUIBase
 endif
 
-libCEGUIDevILImageCodec_la_LIBADD += $(DevIL_LIBS) 
+libCEGUIDevILImageCodec_la_LIBADD = $(DevIL_LIBS) $(top_builddir)/src/libCEGUIBase.la
 
 lib_LTLIBRARIES=libCEGUIDevILImageCodec.la
 

Modified: cegui_mk2/branches/v0-6/ImageCodecModules/FreeImageImageCodec/Makefile.am
===================================================================
--- cegui_mk2/branches/v0-6/ImageCodecModules/FreeImageImageCodec/Makefile.am	2008-05-25 07:47:46 UTC (rev 1716)
+++ cegui_mk2/branches/v0-6/ImageCodecModules/FreeImageImageCodec/Makefile.am	2008-05-25 08:25:55 UTC (rev 1717)
@@ -1,15 +1,12 @@
 INCLUDES=-I$(top_srcdir)/include $(FreeImage_CFLAGS)
 pkgincludedir=$(prefix)/include/CEGUI/ImageCodecModules/FreeImageImageCodec
 
-libCEGUIFreeImageImageCodec_la_LIBADD =
-
 if MINGW32_BUILD
 libCEGUIFreeImageImageCodec_la_CPPFLAGS = -DCEGUIFREEIMAGEIMAGECODEC_EXPORTS
 libCEGUIFreeImageImageCodec_la_LDFLAGS = -no-undefined -avoid-version
-libCEGUIFreeImageImageCodec_la_LIBADD += -L$(top_builddir)/src -lCEGUIBase
 endif
 
-libCEGUIFreeImageImageCodec_la_LIBADD += $(FreeImage_LIBS)
+libCEGUIFreeImageImageCodec_la_LIBADD = $(FreeImage_LIBS) $(top_builddir)/src/libCEGUIBase.la
 
 lib_LTLIBRARIES=libCEGUIFreeImageImageCodec.la
 

Modified: cegui_mk2/branches/v0-6/ImageCodecModules/SILLYImageCodec/Makefile.am
===================================================================
--- cegui_mk2/branches/v0-6/ImageCodecModules/SILLYImageCodec/Makefile.am	2008-05-25 07:47:46 UTC (rev 1716)
+++ cegui_mk2/branches/v0-6/ImageCodecModules/SILLYImageCodec/Makefile.am	2008-05-25 08:25:55 UTC (rev 1717)
@@ -1,15 +1,12 @@
 INCLUDES=-I$(top_srcdir)/include $(SILLY_CFLAGS)
 pkgincludedir=$(prefix)/include/CEGUI/ImageCodecModules/SILLYImageCodec
 
-libCEGUISILLYImageCodec_la_LIBADD =
-
 if MINGW32_BUILD
 libCEGUISILLYImageCodec_la_CPPFLAGS = -DCEGUISILLYIMAGECODEC_EXPORTS
 libCEGUISILLYImageCodec_la_LDFLAGS = -no-undefined -avoid-version
-libCEGUISILLYImageCodec_la_LIBADD += -L$(top_builddir)/src -lCEGUIBase
 endif
 
-libCEGUISILLYImageCodec_la_LIBADD += $(SILLY_LIBS)
+libCEGUISILLYImageCodec_la_LIBADD = $(SILLY_LIBS) $(top_builddir)/src/libCEGUIBase.la
 
 lib_LTLIBRARIES=libCEGUISILLYImageCodec.la
 

Modified: cegui_mk2/branches/v0-6/ImageCodecModules/TGAImageCodec/Makefile.am
===================================================================
--- cegui_mk2/branches/v0-6/ImageCodecModules/TGAImageCodec/Makefile.am	2008-05-25 07:47:46 UTC (rev 1716)
+++ cegui_mk2/branches/v0-6/ImageCodecModules/TGAImageCodec/Makefile.am	2008-05-25 08:25:55 UTC (rev 1717)
@@ -4,11 +4,11 @@
 if MINGW32_BUILD
 libCEGUITGAImageCodec_la_CPPFLAGS = -DCEGUITGAIMAGECODEC_EXPORTS
 libCEGUITGAImageCodec_la_LDFLAGS = -no-undefined -avoid-version
-libCEGUITGAImageCodec_la_LIBADD = -L$(top_builddir)/src -lCEGUIBase
 endif
 
 lib_LTLIBRARIES=libCEGUITGAImageCodec.la
 libCEGUITGAImageCodec_la_SOURCES = CEGUITGAImageCodec.cpp CEGUITGAImageCodecModule.cpp
+libCEGUITGAImageCodec_la_LIBADD = $(top_builddir)/src/libCEGUIBase.la
 pkginclude_HEADERS = CEGUITGAImageCodec.h CEGUITGAImageCodecModule.h 
 
 

Modified: cegui_mk2/branches/v0-6/RendererModules/IrrlichtRenderer/Makefile.am
===================================================================
--- cegui_mk2/branches/v0-6/RendererModules/IrrlichtRenderer/Makefile.am	2008-05-25 07:47:46 UTC (rev 1716)
+++ cegui_mk2/branches/v0-6/RendererModules/IrrlichtRenderer/Makefile.am	2008-05-25 08:25:55 UTC (rev 1717)
@@ -9,16 +9,14 @@
 					 IrrlichtMemoryFile.h
 
 libCEGUIIrrlichtRenderer_la_LDFLAGS =
-libCEGUIIrrlichtRenderer_la_LIBADD =
 
 if MINGW32_BUILD
 libCEGUIIrrlichtRenderer_la_CPPFLAGS = -DIRRRENDERER_EXPORTS
 libCEGUIIrrlichtRenderer_la_LDFLAGS += -no-undefined
-libCEGUIIrrlichtRenderer_la_LIBADD += -L$(top_builddir)/src -lCEGUIBase
 endif
 
 libCEGUIIrrlichtRenderer_la_LDFLAGS += -version-info @CEGUI_IRRLICHT_VERSION_INFO@
-libCEGUIIrrlichtRenderer_la_LIBADD += $(Irrlicht_LIBS)
+libCEGUIIrrlichtRenderer_la_LIBADD = $(Irrlicht_LIBS) $(top_builddir)/src/libCEGUIBase.la
 
 lib_LTLIBRARIES=libCEGUIIrrlichtRenderer.la
 

Modified: cegui_mk2/branches/v0-6/RendererModules/OpenGLGUIRenderer/Makefile.am
===================================================================
--- cegui_mk2/branches/v0-6/RendererModules/OpenGLGUIRenderer/Makefile.am	2008-05-25 07:47:46 UTC (rev 1716)
+++ cegui_mk2/branches/v0-6/RendererModules/OpenGLGUIRenderer/Makefile.am	2008-05-25 08:25:55 UTC (rev 1717)
@@ -3,15 +3,13 @@
 pkginclude_HEADERS = openglrenderer.h opengltexture.h
 
 libCEGUIOpenGLRenderer_la_LDFLAGS =
-libCEGUIOpenGLRenderer_la_LIBADD =
 
 if MINGW32_BUILD
 libCEGUIOpenGLRenderer_la_CPPFLAGS = -DOPENGL_GUIRENDERER_EXPORTS
 libCEGUIOpenGLRenderer_la_LDFLAGS += -no-undefined
-libCEGUIOpenGLRenderer_la_LIBADD += -L$(top_builddir)/src -lCEGUIBase
 endif
 
-libCEGUIOpenGLRenderer_la_LIBADD += $(OpenGL_LIBS)
+libCEGUIOpenGLRenderer_la_LIBADD = $(OpenGL_LIBS) $(top_builddir)/src/libCEGUIBase.la
 
 libCEGUIOpenGLRenderer_la_LDFLAGS += -version-info @CEGUI_OPENGL_VERSION_INFO@
 

Modified: cegui_mk2/branches/v0-6/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.am
===================================================================
--- cegui_mk2/branches/v0-6/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.am	2008-05-25 07:47:46 UTC (rev 1716)
+++ cegui_mk2/branches/v0-6/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.am	2008-05-25 08:25:55 UTC (rev 1717)
@@ -8,9 +8,6 @@
 if MINGW32_BUILD
 libCEGUILuaScriptModule_la_CPPFLAGS += -DCEGUILUA_EXPORTS
 libCEGUILuaScriptModule_la_LDFLAGS += -no-undefined -avoid-version
-libCEGUILuaScriptModule_la_LIBADD = -L$(top_builddir)/src/ \
-                                    -L$(top_builddir)/ScriptingModules/CEGUILua/tolua++ \
-                                    -lCEGUIBase -lCEGUItoluapp $(Lua_LIBS)
 endif
 
 libCEGUILuaScriptModule_la_LDFLAGS += -version-info @CEGUI_VERSION_INFO@
@@ -22,5 +19,8 @@
                                      CEGUILua.cpp \
                                      CEGUILuaFunctor.cpp \
                                      required.cpp
+libCEGUILuaScriptModule_la_LIBADD = $(top_builddir)/src/libCEGUIBase.la \
+                                    ../../tolua++/libCEGUItoluapp.la \
+                                    $(Lua_LIBS)
 
 noinst_HEADERS = required.h

Modified: cegui_mk2/branches/v0-6/WindowRendererSets/Falagard/src/Makefile.am
===================================================================
--- cegui_mk2/branches/v0-6/WindowRendererSets/Falagard/src/Makefile.am	2008-05-25 07:47:46 UTC (rev 1716)
+++ cegui_mk2/branches/v0-6/WindowRendererSets/Falagard/src/Makefile.am	2008-05-25 08:25:55 UTC (rev 1717)
@@ -6,11 +6,12 @@
 if MINGW32_BUILD
 libCEGUIFalagardWRBase_la_CPPFLAGS = -DFALAGARDWRBASE_EXPORTS -DCEGUIWRMODULE_EXPORTS
 libCEGUIFalagardWRBase_la_LDFLAGS += -no-undefined -avoid-version
-libCEGUIFalagardWRBase_la_LIBADD = -L$(top_builddir)/src/ -lCEGUIBase
 endif
 
 libCEGUIFalagardWRBase_la_LDFLAGS += -version-info @CEGUI_VERSION_INFO@
 
+libCEGUIFalagardWRBase_la_LIBADD = $(top_builddir)/src/libCEGUIBase.la
+
 lib_LTLIBRARIES=libCEGUIFalagardWRBase.la
 
 libCEGUIFalagardWRBase_la_SOURCES = FalButton.cpp \

Modified: cegui_mk2/branches/v0-6/XMLParserModules/TinyXMLParser/Makefile.am
===================================================================
--- cegui_mk2/branches/v0-6/XMLParserModules/TinyXMLParser/Makefile.am	2008-05-25 07:47:46 UTC (rev 1716)
+++ cegui_mk2/branches/v0-6/XMLParserModules/TinyXMLParser/Makefile.am	2008-05-25 08:25:55 UTC (rev 1717)
@@ -3,7 +3,6 @@
 if MINGW32_BUILD
 libCEGUITinyXMLParser_la_CPPFLAGS = -DCEGUITINYXMLPARSER_EXPORTS
 libCEGUITinyXMLParser_la_LDFLAGS = -no-undefined -avoid-version
-libCEGUITinyXMLParser_la_LIBADD = -L$(top_builddir)/src -lCEGUIBase
 endif
 
 lib_LTLIBRARIES=libCEGUITinyXMLParser.la
@@ -14,6 +13,7 @@
                                    ceguitinyxml/tinyxml.cpp \
                                    ceguitinyxml/tinyxmlerror.cpp \
                                    ceguitinyxml/tinyxmlparser.cpp
+libCEGUITinyXMLParser_la_LIBADD = $(top_builddir)/src/libCEGUIBase.la
 
 pkgincludedir=$(prefix)/include/CEGUI/XMLParserModules/TinyXMLParser
 pkginclude_HEADERS = CEGUITinyXMLParser.h CEGUITinyXMLParserModule.h

Modified: cegui_mk2/branches/v0-6/XMLParserModules/XercesParser/Makefile.am
===================================================================
--- cegui_mk2/branches/v0-6/XMLParserModules/XercesParser/Makefile.am	2008-05-25 07:47:46 UTC (rev 1716)
+++ cegui_mk2/branches/v0-6/XMLParserModules/XercesParser/Makefile.am	2008-05-25 08:25:55 UTC (rev 1717)
@@ -1,14 +1,11 @@
 INCLUDES = -I$(top_srcdir)/include $(xerces_CFLAGS)
 
-libCEGUIXercesParser_la_LIBADD =
-
 if MINGW32_BUILD
 libCEGUIXercesParser_la_CPPFLAGS = -DCEGUIXERCESPARSER_EXPORTS
 libCEGUIXercesParser_la_LDFLAGS = -no-undefined -avoid-version
-libCEGUIXercesParser_la_LIBADD += -L$(top_builddir)/src -lCEGUIBase
 endif
 
-libCEGUIXercesParser_la_LIBADD += $(xerces_LIBS)
+libCEGUIXercesParser_la_LIBADD = $(xerces_LIBS) $(top_builddir)/src/libCEGUIBase.la
 
 lib_LTLIBRARIES=libCEGUIXercesParser.la
 

Modified: cegui_mk2/branches/v0-6/XMLParserModules/expatParser/Makefile.am
===================================================================
--- cegui_mk2/branches/v0-6/XMLParserModules/expatParser/Makefile.am	2008-05-25 07:47:46 UTC (rev 1716)
+++ cegui_mk2/branches/v0-6/XMLParserModules/expatParser/Makefile.am	2008-05-25 08:25:55 UTC (rev 1717)
@@ -1,14 +1,11 @@
 INCLUDES = -I$(top_srcdir)/include $(expat_CFLAGS)
 
-libCEGUIExpatParser_la_LIBADD =
-
 if MINGW32_BUILD
 libCEGUIExpatParser_la_CPPFLAGS = -DCEGUIEXPATPARSER_EXPORTS
 libCEGUIExpatParser_la_LDFLAGS = -no-undefined -avoid-version
-libCEGUIExpatParser_la_LIBADD += -L$(top_builddir)/src -lCEGUIBase
 endif
 
-libCEGUIExpatParser_la_LIBADD += $(expat_LIBS)
+libCEGUIExpatParser_la_LIBADD = $(expat_LIBS) $(top_builddir)/src/libCEGUIBase.la
 
 
 lib_LTLIBRARIES=libCEGUIExpatParser.la

Modified: cegui_mk2/branches/v0-6/XMLParserModules/libxmlParser/Makefile.am
===================================================================
--- cegui_mk2/branches/v0-6/XMLParserModules/libxmlParser/Makefile.am	2008-05-25 07:47:46 UTC (rev 1716)
+++ cegui_mk2/branches/v0-6/XMLParserModules/libxmlParser/Makefile.am	2008-05-25 08:25:55 UTC (rev 1717)
@@ -1,14 +1,11 @@
 INCLUDES = -I$(top_srcdir)/include $(libxml_CFLAGS)
 
-libCEGUILibxmlParser_la_LIBADD =
-
 if MINGW32_BUILD
 libCEGUILibxmlParser_la_CPPFLAGS = -DCEGUILIBXMLPARSER_EXPORTS
 libCEGUILibxmlParser_la_LDFLAGS = -no-undefined -avoid-version
-libCEGUILibxmlParser_la_LIBADD += -L$(top_builddir)/src -lCEGUIBase
 endif
 
-libCEGUILibxmlParser_la_LIBADD += $(libxml_LIBS)
+libCEGUILibxmlParser_la_LIBADD = $(libxml_LIBS) $(top_builddir)/src/libCEGUIBase.la
 
 lib_LTLIBRARIES=libCEGUILibxmlParser.la
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Crayzedsgui-cvsmk2] SF.net SVN: crayzedsgui: [1720] cegui_mk2/branches/v0-6

From: <ice-drezday@us...> - 2008-05-25 19:43

Revision: 1720
          http://crayzedsgui.svn.sourceforge.net/crayzedsgui/?rev=1720&view=rev
Author:   ice-drezday
Date:     2008-05-25 12:43:38 -0700 (Sun, 25 May 2008)

Log Message:
-----------
ADD: Initial version of a sample base application using Direct3D 10.

Modified Paths:
--------------
    cegui_mk2/branches/v0-6/Samples/common/include/CEGuiRendererSelector.h
    cegui_mk2/branches/v0-6/Samples/common/src/CEGuiSample.cpp
    cegui_mk2/branches/v0-6/Samples/common/src/Win32AppHelper.cpp
    cegui_mk2/branches/v0-6/Samples/common/src/Win32CEGuiRendererSelector.cpp
    cegui_mk2/branches/v0-6/makefiles/premake/Samples/common/premake.lua

Added Paths:
-----------
    cegui_mk2/branches/v0-6/Samples/common/include/CEGuiD3D10BaseApplication.h
    cegui_mk2/branches/v0-6/Samples/common/src/CEGuiD3D10BaseApplication.cpp

Added: cegui_mk2/branches/v0-6/Samples/common/include/CEGuiD3D10BaseApplication.h
===================================================================
--- cegui_mk2/branches/v0-6/Samples/common/include/CEGuiD3D10BaseApplication.h	                        (rev 0)
+++ cegui_mk2/branches/v0-6/Samples/common/include/CEGuiD3D10BaseApplication.h	2008-05-25 19:43:38 UTC (rev 1720)
@@ -0,0 +1,99 @@
+/***********************************************************************
+    filename:   CEGuiD3D10BaseApplication.h
+    created:    Sun May 25 2008
+    author:     Paul D Turner
+*************************************************************************/
+/***************************************************************************
+ *   Copyright (C) 2004 - 2008 Paul D Turner & The CEGUI Development Team
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining
+ *   a copy of this software and associated documentation files (the
+ *   "Software"), to deal in the Software without restriction, including
+ *   without limitation the rights to use, copy, modify, merge, publish,
+ *   distribute, sublicense, and/or sell copies of the Software, and to
+ *   permit persons to whom the Software is furnished to do so, subject to
+ *   the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be
+ *   included in all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ *   IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ *   OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ *   ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *   OTHER DEALINGS IN THE SOFTWARE.
+ ***************************************************************************/
+#ifndef _CEGuiD3D10BaseApplication_h_
+#define _CEGuiD3D10BaseApplication_h_
+
+#include "CEGuiBaseApplication.h"
+
+#if defined( __WIN32__ ) || defined( _WIN32 )
+#   define WIN32_LEAN_AND_MEAN
+#   define NOMINMAX
+#   include <windows.h>
+#endif
+
+// MSVC auto-linking
+#if defined(_MSC_VER)
+#   pragma comment(lib, "d3d10.lib")
+#   if defined(_DEBUG)
+#       if defined(CEGUI_STATIC)
+#           pragma comment(lib, "DirectX10GUIRenderer_Static_d.lib")
+#       else
+#           pragma comment(lib, "DirectX10GUIRenderer_d.lib")
+#       endif
+#   else
+#       if defined(CEGUI_STATIC)
+#           pragma comment(lib, "DirectX10GUIRenderer_Static.lib")
+#       else
+#           pragma comment(lib, "DirectX10GUIRenderer.lib")
+#       endif
+#   endif
+#endif
+
+// forward declare struct that will hold D3D10 specifics
+struct CEGuiBaseApplicationImpl;
+
+//! CEGuiBaseApplication implementation for Microsoft Direct3D 10
+class CEGuiD3D10BaseApplication : public CEGuiBaseApplication
+{
+public:
+    //!Constructor.
+    CEGuiD3D10BaseApplication();
+
+    //! Destructor.
+    ~CEGuiD3D10BaseApplication();
+
+    // Implementation of base class abstract methods.
+    bool execute(CEGuiSample* sampleApp);
+    void cleanup();
+
+protected:
+    /*************************************************************************
+        Implementation Methods
+    *************************************************************************/
+    //! Initialises Direct3D system.
+    bool initialiseDirect3D(unsigned int width, unsigned int height,
+                            bool windowed);
+
+    //! Perform update on the FPS counter fields.
+    void updateFPS(void);
+
+    /*************************************************************************
+        Data fields
+    *************************************************************************/
+    //! Pointer to the struct holding D3D specific fields.
+    CEGuiBaseApplicationImpl* pimpl;;
+
+    // FPS stuff
+    DWORD   d_lastTime;
+    int d_frames;
+    int d_FPS;
+    // counter used to track elapsed time (for time pulse injection)
+    DWORD d_lastFrameTime;
+};
+
+#endif  // end of guard _CEGuiD3D10BaseApplication_h_


Property changes on: cegui_mk2/branches/v0-6/Samples/common/include/CEGuiD3D10BaseApplication.h
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: cegui_mk2/branches/v0-6/Samples/common/include/CEGuiRendererSelector.h
===================================================================
--- cegui_mk2/branches/v0-6/Samples/common/include/CEGuiRendererSelector.h	2008-05-25 14:36:01 UTC (rev 1719)
+++ cegui_mk2/branches/v0-6/Samples/common/include/CEGuiRendererSelector.h	2008-05-25 19:43:38 UTC (rev 1720)
@@ -4,7 +4,7 @@
     author:     Paul D Turner
 *************************************************************************/
 /***************************************************************************
- *   Copyright (C) 2004 - 2006 Paul D Turner & The CEGUI Development Team
+ *   Copyright (C) 2004 - 2008 Paul D Turner & The CEGUI Development Team
  *
  *   Permission is hereby granted, free of charge, to any person obtaining
  *   a copy of this software and associated documentation files (the
@@ -37,6 +37,7 @@
     OgreGuiRendererType,            //!< Renderer that uses the Ogre engine.
     Direct3D81GuiRendererType,      //!< Renderer that uses the Direct3D 8.1 API.
     Direct3D9GuiRendererType,       //!< Renderer that uses the Direct3D 9 API.
+    Direct3D10GuiRendererType,      //!< Renderer that uses the Direct3D 10 API.
     OpenGLGuiRendererType,          //!< Renderer that uses the OpenGL API.
     IrrlichtGuiRendererType,        //!< Renderer that uses the Irrlicht engine.
     RendererTypeCount,              //!< Special value that equals the number of renderer types.

Added: cegui_mk2/branches/v0-6/Samples/common/src/CEGuiD3D10BaseApplication.cpp
===================================================================
--- cegui_mk2/branches/v0-6/Samples/common/src/CEGuiD3D10BaseApplication.cpp	                        (rev 0)
+++ cegui_mk2/branches/v0-6/Samples/common/src/CEGuiD3D10BaseApplication.cpp	2008-05-25 19:43:38 UTC (rev 1720)
@@ -0,0 +1,308 @@
+/***********************************************************************
+    filename:   CEGuiD3D10BaseApplication.cpp
+    created:    Sun May 25 2008
+    author:     Paul D Turner
+*************************************************************************/
+/***************************************************************************
+ *   Copyright (C) 2004 - 2008 Paul D Turner & The CEGUI Development Team
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining
+ *   a copy of this software and associated documentation files (the
+ *   "Software"), to deal in the Software without restriction, including
+ *   without limitation the rights to use, copy, modify, merge, publish,
+ *   distribute, sublicense, and/or sell copies of the Software, and to
+ *   permit persons to whom the Software is furnished to do so, subject to
+ *   the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be
+ *   included in all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ *   IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ *   OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ *   ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *   OTHER DEALINGS IN THE SOFTWARE.
+ ***************************************************************************/
+#ifdef HAVE_CONFIG_H
+#   include "config.h"
+#endif
+
+#ifdef CEGUI_SAMPLES_USE_DIRECTX_10
+
+#include "CEGuiD3D10BaseApplication.h"
+#include "RendererModules/directx10GUIRenderer/d3d10renderer.h"
+#include "CEGuiSample.h"
+#include "Win32AppHelper.h"
+#include "CEGUI.h"
+#include "CEGUIDefaultResourceProvider.h"
+
+#include <stdexcept>
+#include <d3d10.h>
+#include <dinput.h>
+
+//----------------------------------------------------------------------------//
+struct CEGuiBaseApplicationImpl
+{
+    HWND d_window;
+    IDXGISwapChain* d_swapChain;
+    ID3D10Device* d_device;
+    ID3D10RenderTargetView* d_renderTargetView;
+    CEGUI::DirectX10Renderer* d_renderer;
+    Win32AppHelper::DirectInputState d_directInput;
+};
+
+//----------------------------------------------------------------------------//
+CEGuiD3D10BaseApplication::CEGuiD3D10BaseApplication() :
+    pimpl(new CEGuiBaseApplicationImpl),
+    d_lastTime(GetTickCount()),
+    d_frames(0),
+    d_FPS(0)
+{
+    if (pimpl->d_window = Win32AppHelper::createApplicationWindow(800, 600))
+    {
+        if (initialiseDirect3D(800, 600, true))
+        {
+            if (Win32AppHelper::initialiseDirectInput(pimpl->d_window,
+                                                      pimpl->d_directInput))
+            {
+                pimpl->d_renderer =
+                    new CEGUI::DirectX10Renderer(pimpl->d_device, 0);
+
+                // initialise the gui system
+                new CEGUI::System(pimpl->d_renderer);
+
+                // initialise the required dirs for the DefaultResourceProvider
+                CEGUI::DefaultResourceProvider* rp =
+                    static_cast<CEGUI::DefaultResourceProvider*>
+                        (CEGUI::System::getSingleton().getResourceProvider());
+
+                const char* dataPathPrefix = getDataPathPrefix();
+                char resourcePath[PATH_MAX];
+
+                // for each resource type, set a resource group directory
+                sprintf(resourcePath, "%s/%s", dataPathPrefix, "schemes/");
+                rp->setResourceGroupDirectory("schemes", resourcePath);
+                sprintf(resourcePath, "%s/%s", dataPathPrefix, "imagesets/");
+                rp->setResourceGroupDirectory("imagesets", resourcePath);
+                sprintf(resourcePath, "%s/%s", dataPathPrefix, "fonts/");
+                rp->setResourceGroupDirectory("fonts", resourcePath);
+                sprintf(resourcePath, "%s/%s", dataPathPrefix, "layouts/");
+                rp->setResourceGroupDirectory("layouts", resourcePath);
+                sprintf(resourcePath, "%s/%s", dataPathPrefix, "looknfeel/");
+                rp->setResourceGroupDirectory("looknfeels", resourcePath);
+                sprintf(resourcePath, "%s/%s", dataPathPrefix, "lua_scripts/");
+                rp->setResourceGroupDirectory("lua_scripts", resourcePath);
+                #if defined(CEGUI_WITH_XERCES) && (CEGUI_DEFAULT_XMLPARSER == XercesParser)
+                    sprintf(resourcePath, "%s/%s", dataPathPrefix, "XMLRefSchema/");
+                    rp->setResourceGroupDirectory("schemas", resourcePath);
+                #endif
+
+                CEGUI::Logger::getSingleton().setLoggingLevel(CEGUI::Informative);
+
+                return;
+            }
+
+            // cleanup direct 3d systems
+            pimpl->d_renderTargetView->Release();
+            pimpl->d_swapChain->Release();
+            pimpl->d_device->Release();
+        }
+
+        DestroyWindow(pimpl->d_window);
+    }
+    else
+    {
+        MessageBox(0, Win32AppHelper::CREATE_WINDOW_ERROR,
+                   Win32AppHelper::APPLICATION_NAME, MB_ICONERROR|MB_OK);
+    }
+
+    throw std::runtime_error("Windows Direct3D 10 application failed to "
+                             "initialise.");
+}
+
+//----------------------------------------------------------------------------//
+CEGuiD3D10BaseApplication::~CEGuiD3D10BaseApplication()
+{
+    Win32AppHelper::mouseLeaves();
+
+    // cleanup gui system
+    delete CEGUI::System::getSingletonPtr();
+    delete pimpl->d_renderer;
+
+    Win32AppHelper::cleanupDirectInput(pimpl->d_directInput);
+
+    // cleanup direct 3d systems
+    pimpl->d_renderTargetView->Release();
+    pimpl->d_swapChain->Release();
+    pimpl->d_device->Release();
+
+    DestroyWindow(pimpl->d_window);
+
+    delete pimpl;
+}
+
+//----------------------------------------------------------------------------//
+bool CEGuiD3D10BaseApplication::execute(CEGuiSample* sampleApp)
+{
+    sampleApp->initialiseSample();
+
+    float clear_colour[4] = { 0.0f, 0.0f, 0.0f, 1.0f };
+
+    //
+    //  This is basically a modified Win32 message pump
+    //
+    bool idle;
+
+    while (Win32AppHelper::doWin32Events(idle))
+    {
+        if (idle)
+        {
+            CEGUI::System& guiSystem = CEGUI::System::getSingleton();
+
+            // do time based updates
+            DWORD thisTime = GetTickCount();
+            float elapsed = static_cast<float>(thisTime - d_lastFrameTime);
+            d_lastFrameTime = thisTime;
+            // inject the time pulse
+            guiSystem.injectTimePulse(elapsed / 1000.0f);
+
+            updateFPS();
+            char fpsbuff[16];
+            sprintf(fpsbuff, "FPS: %d", d_FPS);
+
+            Win32AppHelper::doDirectInputEvents(pimpl->d_directInput);
+
+            // clear display
+            pimpl->d_device->
+                ClearRenderTargetView(pimpl->d_renderTargetView, clear_colour);
+
+            // main CEGUI rendering call
+            guiSystem.renderGUI();
+
+            // render FPS:
+            CEGUI::Font* fnt = guiSystem.getDefaultFont();
+            if (fnt)
+            {
+                guiSystem.getRenderer()->setQueueingEnabled(false);
+                fnt->drawText(fpsbuff, CEGUI::Vector3(0, 0, 0),
+                              guiSystem.getRenderer()->getRect());
+            }
+
+            pimpl->d_swapChain->Present(0, 0);
+        }
+
+        // check if the application is quitting, and break the loop next time
+        // around if so.
+        if (isQuitting())
+            PostQuitMessage(0);
+    }
+
+    return true;
+}
+
+//----------------------------------------------------------------------------//
+void CEGuiD3D10BaseApplication::cleanup()
+{
+    // nothing to do here.
+}
+
+//----------------------------------------------------------------------------//
+bool CEGuiD3D10BaseApplication::initialiseDirect3D(unsigned int width,
+    unsigned int height, bool windowed)
+{
+    HRESULT res;
+
+    // init sqap chain descriptor structure
+    DXGI_SWAP_CHAIN_DESC scd;
+    ZeroMemory(&scd, sizeof(scd));
+    scd.BufferCount = 1;
+    scd.BufferDesc.Width = width;
+    scd.BufferDesc.Height = height;
+    scd.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
+    scd.BufferDesc.RefreshRate.Numerator = 60;
+    scd.BufferDesc.RefreshRate.Denominator = 1;
+    scd.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT;
+    scd.OutputWindow = pimpl->d_window;
+    scd.SampleDesc.Count = 1;
+    scd.SampleDesc.Quality = 0;
+    scd.Windowed = windowed;
+
+    // initialise main parts of D3D
+    res = D3D10CreateDeviceAndSwapChain(0, D3D10_DRIVER_TYPE_HARDWARE,
+                                        0, 0, D3D10_SDK_VERSION,
+                                        &scd, &pimpl->d_swapChain,
+                                        &pimpl->d_device);
+    if (SUCCEEDED(res))
+    {
+
+        // obtain handle to thr back buffer of the swap chain
+        ID3D10Texture2D* back_buffer;
+        res = pimpl->d_swapChain->GetBuffer(0, __uuidof(ID3D10Texture2D),
+                                            (LPVOID*)&back_buffer);
+
+        if (SUCCEEDED(res))
+        {
+            // create render target view using the back buffer
+            res = pimpl->d_device->
+                CreateRenderTargetView(back_buffer, 0,
+                                       &pimpl->d_renderTargetView);
+
+            // release handle to buffer - we have done all we needed to with it.
+            back_buffer->Release();
+
+            if (SUCCEEDED(res))
+            {
+                // bind the back-buffer render target to get the output.
+                pimpl->d_device->
+                    OMSetRenderTargets(1, &pimpl->d_renderTargetView, 0);
+
+                // set a basic viewport.
+                D3D10_VIEWPORT view_port;
+                view_port.Width    = width;
+                view_port.Height   = height;
+                view_port.MinDepth = 0.0f;
+                view_port.MaxDepth = 1.0f;
+                view_port.TopLeftX = 0;
+                view_port.TopLeftY = 0;
+                pimpl->d_device->RSSetViewports(1, &view_port);
+
+                // complete window initialisation
+                ShowWindow(pimpl->d_window, SW_NORMAL);
+                UpdateWindow(pimpl->d_window);
+
+                return true;
+            }
+
+        }
+
+        pimpl->d_renderTargetView->Release();
+        pimpl->d_swapChain->Release();
+        pimpl->d_renderTargetView = 0;
+        pimpl->d_swapChain = 0;
+    }
+
+    MessageBox(0, "Failed to correctly initialise Direct3D 10",
+               Win32AppHelper::APPLICATION_NAME, MB_ICONERROR|MB_OK);
+
+    return false;
+}
+
+//----------------------------------------------------------------------------//
+void CEGuiD3D10BaseApplication::updateFPS(void)
+{
+    ++d_frames;
+
+    DWORD thisTime = GetTickCount();
+
+    if (thisTime - d_lastTime >= 1000)
+    {
+        d_FPS = d_frames;
+        d_frames = 0;
+        d_lastTime = thisTime;
+    }
+}
+
+//----------------------------------------------------------------------------//
+#endif


Property changes on: cegui_mk2/branches/v0-6/Samples/common/src/CEGuiD3D10BaseApplication.cpp
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: cegui_mk2/branches/v0-6/Samples/common/src/CEGuiSample.cpp
===================================================================
--- cegui_mk2/branches/v0-6/Samples/common/src/CEGuiSample.cpp	2008-05-25 14:36:01 UTC (rev 1719)
+++ cegui_mk2/branches/v0-6/Samples/common/src/CEGuiSample.cpp	2008-05-25 19:43:38 UTC (rev 1720)
@@ -4,7 +4,7 @@
     author:     Paul D Turner
 *************************************************************************/
 /***************************************************************************
- *   Copyright (C) 2004 - 2006 Paul D Turner & The CEGUI Development Team
+ *   Copyright (C) 2004 - 2008 Paul D Turner & The CEGUI Development Team
  *
  *   Permission is hereby granted, free of charge, to any person obtaining
  *   a copy of this software and associated documentation files (the
@@ -62,6 +62,9 @@
 #   ifdef CEGUI_SAMPLES_USE_DIRECTX_9
 #       include "CEGuiD3D9BaseApplication.h"
 #   endif
+#   ifdef CEGUI_SAMPLES_USE_DIRECTX_10
+#       include "CEGuiD3D10BaseApplication.h"
+#   endif
 #endif
 // now we include the base CEGuiBaseApplication just in case someone has managed to
 // get this far without any of the renderers.  This ensures the framework will build,
@@ -152,6 +155,9 @@
 #ifdef CEGUI_SAMPLES_USE_DIRECTX_9
     d_rendererSelector->setRendererAvailability(Direct3D9GuiRendererType);
 #endif
+#ifdef CEGUI_SAMPLES_USE_DIRECTX_10
+    d_rendererSelector->setRendererAvailability(Direct3D10GuiRendererType);
+#endif
 
 #elif defined(__linux__)
     // decide which method to use for renderer selection
@@ -198,6 +204,11 @@
             d_sampleApp = new CEGuiD3D9BaseApplication();
             break;
 #endif // DX9
+#ifdef CEGUI_SAMPLES_USE_DIRECTX_10
+        case Direct3D10GuiRendererType:
+            d_sampleApp = new CEGuiD3D10BaseApplication();
+            break;
+#endif // DX10
 #endif // Win32
 #ifdef CEGUI_SAMPLES_USE_OPENGL
         case OpenGLGuiRendererType:

Modified: cegui_mk2/branches/v0-6/Samples/common/src/Win32AppHelper.cpp
===================================================================
--- cegui_mk2/branches/v0-6/Samples/common/src/Win32AppHelper.cpp	2008-05-25 14:36:01 UTC (rev 1719)
+++ cegui_mk2/branches/v0-6/Samples/common/src/Win32AppHelper.cpp	2008-05-25 19:43:38 UTC (rev 1720)
@@ -4,7 +4,7 @@
     author:     Paul D Turner
 *************************************************************************/
 /***************************************************************************
- *   Copyright (C) 2004 - 2006 Paul D Turner & The CEGUI Development Team
+ *   Copyright (C) 2004 - 2008 Paul D Turner & The CEGUI Development Team
  *
  *   Permission is hereby granted, free of charge, to any person obtaining
  *   a copy of this software and associated documentation files (the
@@ -29,7 +29,7 @@
 #   include "config.h"
 #endif
 
-#if defined(CEGUI_SAMPLES_USE_DIRECTX_8) || defined(CEGUI_SAMPLES_USE_DIRECTX_9)
+#if defined(CEGUI_SAMPLES_USE_DIRECTX_8) || defined(CEGUI_SAMPLES_USE_DIRECTX_9) || defined(CEGUI_SAMPLES_USE_DIRECTX_10)
 
 #include "Win32AppHelper.h"
 #include "CEGUI.h"

Modified: cegui_mk2/branches/v0-6/Samples/common/src/Win32CEGuiRendererSelector.cpp
===================================================================
--- cegui_mk2/branches/v0-6/Samples/common/src/Win32CEGuiRendererSelector.cpp	2008-05-25 14:36:01 UTC (rev 1719)
+++ cegui_mk2/branches/v0-6/Samples/common/src/Win32CEGuiRendererSelector.cpp	2008-05-25 19:43:38 UTC (rev 1720)
@@ -4,7 +4,7 @@
     author:     Paul D Turner
 *************************************************************************/
 /***************************************************************************
- *   Copyright (C) 2004 - 2006 Paul D Turner & The CEGUI Development Team
+ *   Copyright (C) 2004 - 2008 Paul D Turner & The CEGUI Development Team
  *
  *   Permission is hereby granted, free of charge, to any person obtaining
  *   a copy of this software and associated documentation files (the
@@ -394,6 +394,7 @@
                 obj->addComboboxOption(combo, "Ogre Engine Renderer", OgreGuiRendererType);
                 obj->addComboboxOption(combo, "Microsoft Direct3D 8.1 Renderer", Direct3D81GuiRendererType);
                 obj->addComboboxOption(combo, "Microsoft Direct3D 9 Renderer", Direct3D9GuiRendererType);
+                obj->addComboboxOption(combo, "Microsoft Direct3D 10 Renderer", Direct3D10GuiRendererType);
                 obj->addComboboxOption(combo, "OpenGL Renderer", OpenGLGuiRendererType);
                 obj->addComboboxOption(combo, "Irrlicht Engine Renderer", IrrlichtGuiRendererType);
             }

Modified: cegui_mk2/branches/v0-6/makefiles/premake/Samples/common/premake.lua
===================================================================
--- cegui_mk2/branches/v0-6/makefiles/premake/Samples/common/premake.lua	2008-05-25 14:36:01 UTC (rev 1719)
+++ cegui_mk2/branches/v0-6/makefiles/premake/Samples/common/premake.lua	2008-05-25 19:43:38 UTC (rev 1720)
@@ -59,6 +59,14 @@
     end
 end
 
+if DIRECTX10_RENDERER and SAMPLES_DX10 then
+    if CEGUI_CORE_LIBRARY_SOLUTION then
+        dependency("DirectX10GUIRenderer")
+    else
+        library("DirectX81GUIRenderer", DEBUG_DLL_SUFFIX or "")
+    end
+end
+
 if IRRLICHT_RENDERER and SAMPLES_IRRLICHT then
     if CEGUI_CORE_LIBRARY_SOLUTION then
         dependency("IrrlichtRenderer")


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Crayzedsgui-cvsmk2] SF.net SVN: crayzedsgui: [1721] cegui_mk2/branches/v0-6

From: <ice-drezday@us...> - 2008-05-25 19:52

Revision: 1721
          http://crayzedsgui.svn.sourceforge.net/crayzedsgui/?rev=1721&view=rev
Author:   ice-drezday
Date:     2008-05-25 12:52:48 -0700 (Sun, 25 May 2008)

Log Message:
-----------
ADD: new D3D 10 files to Makefile.am files so make dist will include them.
FIX: Oopsie in premake.lua

Modified Paths:
--------------
    cegui_mk2/branches/v0-6/Samples/common/include/Makefile.am
    cegui_mk2/branches/v0-6/Samples/common/src/Makefile.am
    cegui_mk2/branches/v0-6/makefiles/premake/Samples/common/premake.lua

Modified: cegui_mk2/branches/v0-6/Samples/common/include/Makefile.am
===================================================================
--- cegui_mk2/branches/v0-6/Samples/common/include/Makefile.am	2008-05-25 19:43:38 UTC (rev 1720)
+++ cegui_mk2/branches/v0-6/Samples/common/include/Makefile.am	2008-05-25 19:52:48 UTC (rev 1721)
@@ -1,5 +1,6 @@
 noinst_HEADERS = CEGUISamplesConfig.h \
                  CEGuiBaseApplication.h \
+                 CEGuiD3D10BaseApplication.h \
                  CEGuiD3D81BaseApplication.h \
                  CEGuiD3D9BaseApplication.h \
                  CEGuiIrrlichtBaseApplication.h \

Modified: cegui_mk2/branches/v0-6/Samples/common/src/Makefile.am
===================================================================
--- cegui_mk2/branches/v0-6/Samples/common/src/Makefile.am	2008-05-25 19:43:38 UTC (rev 1720)
+++ cegui_mk2/branches/v0-6/Samples/common/src/Makefile.am	2008-05-25 19:52:48 UTC (rev 1721)
@@ -39,8 +39,12 @@
     libCEGUISampleHelper_la_LIBADD += -lCEGUIIrrlichtRenderer $(Irrlicht_LIBS)
 endif
 
-EXTRA_DIST = CEGuiD3D81BaseApplication.cpp \
+EXTRA_DIST = CEGuiD3D10BaseApplication.cpp \
+             CEGuiD3D81BaseApplication.cpp \
              CEGuiD3D9BaseApplication.cpp \
+             DeviceReset_Direct3D10.cpp \
+             DeviceReset_Direct3D819.cpp \
+             DeviceReset_Direct3D9.cpp \
              MacCEGuiRendererSelector.cpp \
              Win32AppHelper.cpp \
              Win32CEGuiRendererSelector.cpp

Modified: cegui_mk2/branches/v0-6/makefiles/premake/Samples/common/premake.lua
===================================================================
--- cegui_mk2/branches/v0-6/makefiles/premake/Samples/common/premake.lua	2008-05-25 19:43:38 UTC (rev 1720)
+++ cegui_mk2/branches/v0-6/makefiles/premake/Samples/common/premake.lua	2008-05-25 19:52:48 UTC (rev 1721)
@@ -63,7 +63,7 @@
     if CEGUI_CORE_LIBRARY_SOLUTION then
         dependency("DirectX10GUIRenderer")
     else
-        library("DirectX81GUIRenderer", DEBUG_DLL_SUFFIX or "")
+        library("DirectX10GUIRenderer", DEBUG_DLL_SUFFIX or "")
     end
 end
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Crayzedsgui-cvsmk2] SF.net SVN: crayzedsgui: [1723] cegui_mk2/branches/v0-6

From: <ice-drezday@us...> - 2008-05-26 11:46

Revision: 1723
          http://crayzedsgui.svn.sourceforge.net/crayzedsgui/?rev=1723&view=rev
Author:   ice-drezday
Date:     2008-05-26 04:46:37 -0700 (Mon, 26 May 2008)

Log Message:
-----------
FIX: Updated Ogre base application to correctly respond to window resize events and inform the CEGUI renderer of the change.  Part of fixes for: http://www.cegui.org.uk/mantis/view.php?id=187

Modified Paths:
--------------
    cegui_mk2/branches/v0-6/Samples/common/include/CEGuiOgreBaseApplication.h
    cegui_mk2/branches/v0-6/Samples/common/src/CEGuiOgreBaseApplication.cpp
    cegui_mk2/branches/v0-6/acinclude.m4

Modified: cegui_mk2/branches/v0-6/Samples/common/include/CEGuiOgreBaseApplication.h
===================================================================
--- cegui_mk2/branches/v0-6/Samples/common/include/CEGuiOgreBaseApplication.h	2008-05-26 09:13:31 UTC (rev 1722)
+++ cegui_mk2/branches/v0-6/Samples/common/include/CEGuiOgreBaseApplication.h	2008-05-26 11:46:37 UTC (rev 1723)
@@ -47,8 +47,9 @@
 
 // Frame listener forward ref (see class below)
 class CEGuiDemoFrameListener;
+// Window event listener forward ref (see class below)
+class WndEvtListener;
 
-
 class CEGuiOgreBaseApplication : public CEGuiBaseApplication
 {
 public:
@@ -83,6 +84,7 @@
     bool d_initialised;
 
     CEGuiDemoFrameListener* d_frameListener;
+    WndEvtListener* d_windowEventListener;
 };
 
 
@@ -125,4 +127,16 @@
     CEGuiBaseApplication* d_baseApp;
 };
 
+//! window event listener class we use to hear abour window resizing
+class WndEvtListener : public Ogre::WindowEventListener
+{
+    CEGUI::OgreCEGUIRenderer* d_renderer;
+
+public:
+    WndEvtListener(CEGUI::OgreCEGUIRenderer* renderer);
+
+    void windowResized(Ogre::RenderWindow* rw);
+};
+
+
 #endif  // end of guard _CEGuiOgreBaseApplication_h_

Modified: cegui_mk2/branches/v0-6/Samples/common/src/CEGuiOgreBaseApplication.cpp
===================================================================
--- cegui_mk2/branches/v0-6/Samples/common/src/CEGuiOgreBaseApplication.cpp	2008-05-26 09:13:31 UTC (rev 1722)
+++ cegui_mk2/branches/v0-6/Samples/common/src/CEGuiOgreBaseApplication.cpp	2008-05-26 11:46:37 UTC (rev 1723)
@@ -37,6 +37,7 @@
 #include "CEGUISamplesConfig.h"
 #ifdef CEGUI_SAMPLES_USE_OGRE
 
+#include <OgreWindowEventUtilities.h>
 #include "CEGuiOgreBaseApplication.h"
 #include "CEGuiSample.h"
 
@@ -44,7 +45,8 @@
         d_ogreRoot(0),
         d_renderer(0),
         d_initialised(false),
-        d_frameListener(0)
+        d_frameListener(0),
+        d_windowEventListener(0)
 {
     using namespace Ogre;
 
@@ -84,6 +86,11 @@
         d_frameListener= new CEGuiDemoFrameListener(this, d_window, d_camera);
         d_ogreRoot->addFrameListener(d_frameListener);
 
+        // add a listener for OS framework window events (for resizing)
+        d_windowEventListener = new WndEvtListener(d_renderer);
+        WindowEventUtilities::addWindowEventListener(d_window,
+                                                     d_windowEventListener);
+
         d_initialised = true;
     }
     else
@@ -100,6 +107,7 @@
     delete CEGUI::System::getSingletonPtr();
     delete d_renderer;
     delete d_ogreRoot;
+    delete d_windowEventListener;
 }
 
 bool CEGuiOgreBaseApplication::execute(CEGuiSample* sampleApp)
@@ -206,7 +214,7 @@
 
     // get window handle
     window->getCustomAttribute("WINDOW", &windowHnd);
-    
+
     // fill param list
     windowHndStr << (unsigned int)windowHnd;
     paramList.insert(std::make_pair(std::string("WINDOW"), windowHndStr.str()));
@@ -215,6 +223,7 @@
     d_inputManager = OIS::InputManager::createInputSystem(paramList);
 
     // create buffered keyboard
+    //if (d_inputManager->getNumberOfDevices(OIS::OISKeyboard) > 0)
     if (d_inputManager->numKeyBoards() > 0)
     {
         d_keyboard = static_cast<OIS::Keyboard*>(d_inputManager->createInputObject(OIS::OISKeyboard, true));
@@ -222,11 +231,12 @@
     }
 
     // create buffered mouse
+    //if (d_inputManager->getNumberOfDevices(OIS::OISMouse) > 0)
     if (d_inputManager->numMice() > 0)
     {
         d_mouse = static_cast<OIS::Mouse*>(d_inputManager->createInputObject(OIS::OISMouse, true));
         d_mouse->setEventCallback(this);
-        
+
         unsigned int width, height, depth;
         int left, top;
 
@@ -277,7 +287,7 @@
 
         return true;
     }
-    
+
 }
 
 bool CEGuiDemoFrameListener::frameEnded(const Ogre::FrameEvent& evt)
@@ -346,7 +356,7 @@
 
 CEGUI::MouseButton CEGuiDemoFrameListener::convertOISButtonToCegui(int buttonID)
 {
-   using namespace OIS; 
+   using namespace OIS;
 
    switch (buttonID)
     {
@@ -361,6 +371,22 @@
     }
 }
 
+////////////////////////////////////////////////////////////////////////////////
+/*******************************************************************************
+    Start of WndEvtListener member functions
+*******************************************************************************/
+////////////////////////////////////////////////////////////////////////////////
+
+WndEvtListener::WndEvtListener(CEGUI::OgreCEGUIRenderer* renderer) :
+    d_renderer(renderer)
+{}
+
+void WndEvtListener::windowResized(Ogre::RenderWindow* rw)
+{
+    d_renderer->setDisplaySize(CEGUI::Size(static_cast<float>(rw->getWidth()),
+                                           static_cast<float>(rw->getHeight())));
+}
+
 #endif
 
 

Modified: cegui_mk2/branches/v0-6/acinclude.m4
===================================================================
--- cegui_mk2/branches/v0-6/acinclude.m4	2008-05-26 09:13:31 UTC (rev 1722)
+++ cegui_mk2/branches/v0-6/acinclude.m4	2008-05-26 11:46:37 UTC (rev 1723)
@@ -1,8 +1,8 @@
 AC_DEFUN([CEGUI_CODE_OPTIONS], [
-    AC_ARG_ENABLE([debug], AC_HELP_STRING([--enable-debug], [Enable building CEGUI in debugging mode.]), 
+    AC_ARG_ENABLE([debug], AC_HELP_STRING([--enable-debug], [Enable building CEGUI in debugging mode.]),
         [cegui_enable_debug=$enableval], [cegui_enable_debug=no])
     dnl Code options debug
-    if test x$cegui_enable_debug = xyes ; then 
+    if test x$cegui_enable_debug = xyes ; then
         CPPFLAGS="$CPPFLAGS -DDEBUG"
     fi
 ])
@@ -148,8 +148,8 @@
 ])
 
 AC_DEFUN([CEGUI_ENABLE_OGRE_RENDERER], [
-    PKG_CHECK_MODULES(CEGUIOGRE, CEGUI-OGRE >= 1.0.0, [cegui_found_ogre_renderer=yes], [cegui_found_ogre_renderer=no])
-    PKG_CHECK_MODULES(CEGUI_NULL, CEGUI, [cegui_found_cegui=yes], [cegui_found_cegui=no])    
+    PKG_CHECK_MODULES(CEGUIOGRE, CEGUI-OGRE >= 1.4.0, [cegui_found_ogre_renderer=yes], [cegui_found_ogre_renderer=no])
+    PKG_CHECK_MODULES(CEGUI_NULL, CEGUI, [cegui_found_cegui=yes], [cegui_found_cegui=no])
 	PKG_CHECK_MODULES(OIS, OIS >= 1.0.0, [ois_found=yes],[ois_found=no])
 
     AC_ARG_WITH([ogre-renderer], AC_HELP_STRING([--without-ogre-renderer], [Disables the use of the Ogre3D renderer, when available, in samples]),
@@ -172,7 +172,7 @@
         cegui_samples_use_ogre=yes
         AC_DEFINE(CEGUI_SAMPLES_USE_OGRE, [], [Define to have the Ogre3D CEGUI renderer available in the samples])
         AC_MSG_NOTICE([Use of Ogre3D in Samples is enabled])
-    else        
+    else
         cegui_samples_use_ogre=no
         AC_MSG_NOTICE([Use of Ogre3D in Samples is disabled])
     fi
@@ -213,7 +213,7 @@
         cegui_samples_use_irrlicht=no
         AC_MSG_NOTICE([Irrlicht renderer disabled])
     fi
-    
+
     AM_CONDITIONAL([BUILD_IRRLICHT_RENDERER], [test x$cegui_enable_irrlicht = xyes])
     AM_CONDITIONAL([CEGUI_SAMPLES_USE_IRRLICHT], [test x$cegui_samples_use_irrlicht = xyes])
     AC_SUBST(Irrlicht_CFLAGS)
@@ -230,13 +230,13 @@
         [cegui_irr_libdir=$withval],[cegui_irr_libdir=[.]])
     cegui_lib_paths="$cegui_irr_libdir"
     cegui_inc_paths="$cegui_irr_incdir /usr/local/include/irrlicht /usr/include/irrlicht /usr/local/include /usr/include"
-    
+
     $1_CFLAGS=
     $1_LIBS=
-    
+
     cegui_saved_CFLAGS="$CPPFLAGS"
     cegui_saved_LIBS="$LIBS"
-    
+
     for cegui_path in $cegui_inc_paths; do
         ifelse($cegui_path, [.], CPPFLAGS="$cegui_saved_CFLAGS", CPPFLAGS="-I$cegui_path $cegui_saved_CFLAGS")
         AC_PREPROC_IFELSE([#include <irrlicht.h>], [cegui_irr_h_found=yes; cegui_irr_flags="$cegui_path"; break],[cegui_irr_h_found=no])
@@ -269,7 +269,7 @@
         ],
         [AC_DEFINE([CEGUI_IRR_SDK_VERSION],[12],[Defines irrlicht SDK version.  12 is 1.2 or below. 13 is 1.3.x and 14 is 1.4 or later.])
         gotirrsdkver=yes])
-    
+
         if test $gotirrsdkver = no; then
         AC_COMPILE_IFELSE(
         [
@@ -288,7 +288,7 @@
         [AC_DEFINE([CEGUI_IRR_SDK_VERSION],[13],[Defines irrlicht SDK version.  12 is 1.2 or below. 13 is 1.3.x and 14 is 1.4 or later.])
         gotirrsdkver=yes])
         fi
-    
+
         if test $gotirrsdkver = no; then
         AC_COMPILE_IFELSE(
         [
@@ -327,28 +327,28 @@
         ifelse([$2], [], :, [$2])
     else
         ifelse([$3], [], :, [$3])
-    fi    
+    fi
     AC_LANG_POP([C++])
 ])
 
 AC_DEFUN([CEGUI_ENABLE_OPENGL_RENDERER], [
     AC_ARG_ENABLE([opengl-renderer], AC_HELP_STRING([--disable-opengl-renderer], [Disable the OpenGL renderer]),
         [cegui_enable_opengl=$enableval], [cegui_enable_opengl=yes])
-    AC_ARG_ENABLE([corona], AC_HELP_STRING([--enable-corona], [Enable image loading via Corona image codec by OpenGL renderer (auto)]), 
+    AC_ARG_ENABLE([corona], AC_HELP_STRING([--enable-corona], [Enable image loading via Corona image codec by OpenGL renderer (auto)]),
         [cegui_with_corona=$enableval], [cegui_with_corona=yes])
-    AC_ARG_WITH(corona-prefix, AC_HELP_STRING([--with-corona-prefix], [Prefix where corona is installed (optional)]), 
+    AC_ARG_WITH(corona-prefix, AC_HELP_STRING([--with-corona-prefix], [Prefix where corona is installed (optional)]),
         [cegui_corona_prefix="$withval"], [cegui_corona_prefix=""])
     AC_ARG_ENABLE([devil], AC_HELP_STRING([--enable-devil], [Enable image loading via DevIL image codec by OpenGL renderer (auto)]),
         [cegui_with_devil=$enableval], [cegui_with_devil=yes])
-    AC_ARG_ENABLE([freeimage], AC_HELP_STRING([--enable-freeimage], [Disabled image loading via FreeImage image codec by OpenGL renderer (auto)]), 
+    AC_ARG_ENABLE([freeimage], AC_HELP_STRING([--enable-freeimage], [Disabled image loading via FreeImage image codec by OpenGL renderer (auto)]),
         [cegui_with_freeimage=$enableval], [cegui_with_freeimage=yes])
-    AC_ARG_ENABLE([silly], AC_HELP_STRING([--enable-silly], [Enable image loading via SILLY image codec by OpenGL renderer (auto)]), 
+    AC_ARG_ENABLE([silly], AC_HELP_STRING([--enable-silly], [Enable image loading via SILLY image codec by OpenGL renderer (auto)]),
         [cegui_with_silly=$enableval], [cegui_with_silly=yes])
-    AC_ARG_ENABLE([tga], AC_HELP_STRING([--enable-tga], [Enable image loading via TGA image codec by OpenGL renderer (auto)]), 
+    AC_ARG_ENABLE([tga], AC_HELP_STRING([--enable-tga], [Enable image loading via TGA image codec by OpenGL renderer (auto)]),
         [cegui_with_tga=$enableval], [cegui_with_tga=yes])
-    AC_ARG_WITH([default-image-codec], AC_HELP_STRING([--with-default-image-codec[=CODEC]], [Sets the default image codec used by the OpenGL renderer. 
-Typically this will be one of TGAImageCodec, SILLYImageCodec, CoronaImageCodec, FreeImageImageCodec, DevILImageCodec, though you can set it to anything 
-to load a custom made image codec module as the default.]), 
+    AC_ARG_WITH([default-image-codec], AC_HELP_STRING([--with-default-image-codec[=CODEC]], [Sets the default image codec used by the OpenGL renderer.
+Typically this will be one of TGAImageCodec, SILLYImageCodec, CoronaImageCodec, FreeImageImageCodec, DevILImageCodec, though you can set it to anything
+to load a custom made image codec module as the default.]),
     [cegui_default_image_codec=$withval], [cegui_default_image_codec=none])
 
     cegui_saved_LIBS="$LIBS"
@@ -407,11 +407,11 @@
     if test x$cegui_enable_opengl = xyes; then
         AC_MSG_NOTICE([OpenGL renderer enabled])
 
-        dnl DevIL 
+        dnl DevIL
         if test x$cegui_with_devil = xyes; then
             AC_CHECK_LIB(IL, ilLoadL, [cegui_with_il_lib=yes], [cegui_with_il_lib=no], [])
             AC_CHECK_LIB(ILU, iluFlipImage, [cegui_with_ilu_lib=yes],[cegui_with_ilu_lib=no], [-lIL])
-            if test x$cegui_with_il_lib = xyes -a x$cegui_with_ilu_lib = xyes ; then 
+            if test x$cegui_with_il_lib = xyes -a x$cegui_with_ilu_lib = xyes ; then
                 AC_MSG_NOTICE([Image loading via DevIL by OpenGL renderer enabled])
                 DevIL_CFLAGS="-DUSE_DEVIL_LIBRARY"
                 DevIL_LIBS="-lIL -lILU"
@@ -422,13 +422,13 @@
                 AC_MSG_NOTICE([Image loading via DevIL by OpenGL renderer disabled])
                 cegui_with_devil=no
             fi
-        else            
+        else
             AC_MSG_NOTICE([Image loading via DevIL by OpenGL renderer disabled])
             cegui_with_devil=no
         fi
 
-        dnl FreeImage 
-        if test x$cegui_with_freeimage = xyes ; then 
+        dnl FreeImage
+        if test x$cegui_with_freeimage = xyes ; then
             AC_LANG_PUSH(C++)
             AC_SEARCH_LIBS(FreeImage_GetVersion, freeimage, [cegui_with_freeimage_lib=yes], [cegui_with_freeimage_lib=no])
             AC_LANG_POP(C++)
@@ -436,38 +436,38 @@
             if test x$cegui_with_freeimage_lib = xyes -a x$cegui_with_freeimage_header = xyes ; then
                 AC_MSG_NOTICE([Image loading via FreeImage by OpenGL renderer enabled])
                 FreeImage_CFLAGS="-DUSE_FREEIMAGE_LIBRARY"
-                FreeImage_LIBS="-lfreeimage" 
+                FreeImage_LIBS="-lfreeimage"
                 AC_SUBST(FreeImage_CFLAGS)
                 AC_SUBST(FreeImage_LIBS)
                 cegui_with_freeimage=yes
-             else 
+             else
                 AC_MSG_NOTICE([Image loading via FreeImage by OpenGL renderer disabled])
                 cegui_with_freeimage=no
              fi
-        else 
+        else
             AC_MSG_NOTICE([Image loading via FreeImage by OpenGL renderer disabled])
-        fi 
-        dnl Silly 
-        if test x$cegui_with_silly = xyes ; then 
+        fi
+        dnl Silly
+        if test x$cegui_with_silly = xyes ; then
             PKG_CHECK_MODULES([SILLY], [SILLY >= 0.1.0], [cegui_with_silly=yes], [cegui_with_silly=no])
             if test x$cegui_with_silly = xyes ; then
                SILLY_CFLAGS="-DUSE_SILLY_LIBRARY $SILLY_CFLAGS"
                AC_SUBST(SILLY_CFLAGS)
                AC_SUBST(SILLY_LIBS)
                AC_MSG_NOTICE([Image loading via SILLY by OpenGL renderer enabled])
-            else 
+            else
                AC_MSG_NOTICE([Image loading via SILLY by OpenGL renderer disabled])
             fi
-        else 
+        else
             AC_MSG_NOTICE([Image loading via SILLY by OpenGL renderer disabled])
-        fi 
+        fi
 
         dnl Corona
         if test x$cegui_with_corona = xyes; then
             if test "x$cegui_corona_prefix" != "x" ; then
                 cegui_corona_config=$cegui_corona_prefix/bin/corona-config
-            fi 
-            if test "x$prefix" != xNONE ; then 
+            fi
+            if test "x$prefix" != xNONE ; then
                 PATH="$prefix/bin:$prefix/usr/bin:$PATH"
             fi
             AC_PATH_PROG(cegui_corona_config, corona-config, no, [PATH])
@@ -476,27 +476,27 @@
             if test "$cegui_corona_config" = "no" ; then
                 cegui_with_corona=no
                 AC_MSG_RESULT([no])
-            else 
+            else
                 CORONA_CFLAGS="`$cegui_corona_config --cflags`"
                 CORONA_LIBS="`$cegui_corona_config --libs`"
                 CORONA_VERSION="`$cegui_corona_config --version`"
-                dnl if test "$CORONA_VERSION" >= "1.2.0" ; then 
+                dnl if test "$CORONA_VERSION" >= "1.2.0" ; then
                     AC_MSG_RESULT([yes])
                     cegui_with_corona=yes
                     Corona_CFLAGS="$CORONA_CFLAGS -DUSE_CORONA_LIBRARY"
-                    Corona_LIBS="$CORONA_LIBS" 
+                    Corona_LIBS="$CORONA_LIBS"
                     AC_SUBST(Corona_CFLAGS)
                     AC_SUBST(Corona_LIBS)
                     AC_MSG_NOTICE([Image loading via Corona by OpenGL renderer enabled])
-                dnl else 
+                dnl else
                 dnl    AC_MSG_RESULT([no])
                 dnl     cegui_with_corona=no
                 dnl     AC_MSG_NOTICE([Image loading via Corona by OpenGL renderer disabled])
                 dnl fi
             fi
-        else 
+        else
             AC_MSG_NOTICE([Image loading via Corona by OpenGL renderer disabled])
-        fi 
+        fi
 
         if test x$cegui_found_lib_glut = xyes; then
             cegui_samples_use_opengl=yes
@@ -517,24 +517,24 @@
     fi
 
     if test x$cegui_enable_opengl = xyes; then
-        if test x$cegui_default_image_codec = xnone ; then 
+        if test x$cegui_default_image_codec = xnone ; then
             if test x$cegui_with_devil = xyes ; then
                 cegui_default_image_codec=DevILImageCodec
-            else 
-                if test x$cegui_with_freeimage = xyes ; then 
+            else
+                if test x$cegui_with_freeimage = xyes ; then
                     cegui_default_image_codec=FreeImageImageCodec
-                else 
-                    if test x$cegui_with_silly = xyes ; then 
+                else
+                    if test x$cegui_with_silly = xyes ; then
                         cegui_default_image_codec=SILLYImageCodec
-                    else 
+                    else
                         if test x$cegui_with_corona = xyes ; then
                             cegui_default_image_codec=CoronaImageCodec
-                        else 
-                            if test x$cegui_with_tga = xyes ; then 
+                        else
+                            if test x$cegui_with_tga = xyes ; then
                                 cegui_default_image_codec=TGAImageCodec
-                            else 
+                            else
                                 AC_MSG_ERROR([None of the ImageCodec are going to be build - unable to continue. Either enable an image codec or set a custom default.])
-                            fi 
+                            fi
                         fi
                     fi
                 fi
@@ -544,8 +544,8 @@
     dnl define macro for the class of the default image codec  to be used
     AC_DEFINE_UNQUOTED(CEGUI_DEFAULT_IMAGE_CODEC, $cegui_default_image_codec, [Set this to the default ImageCodec to be used (CoronaImageCodec, DevILImageCodec FreeImageImageCode, SILLYImageCodec, TGAImageCodec).])
     AC_MSG_NOTICE([Default ImageCodec will be: $cegui_default_image_codec])
-        
 
+
     AM_CONDITIONAL([BUILD_OPENGL_RENDERER], [test x$cegui_enable_opengl = xyes])
     AM_CONDITIONAL([CEGUI_SAMPLES_USE_OPENGL], [test x$cegui_samples_use_opengl = xyes])
     AM_CONDITIONAL([CEGUI_BUILD_DEVIL_IMAGE_CODEC], [test x$cegui_with_devil = xyes])


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Crayzedsgui-cvsmk2] SF.net SVN: crayzedsgui: [1725] cegui_mk2/branches/v0-6

From: <ice-drezday@us...> - 2008-05-26 18:56

Revision: 1725
          http://crayzedsgui.svn.sourceforge.net/crayzedsgui/?rev=1725&view=rev
Author:   ice-drezday
Date:     2008-05-26 11:56:07 -0700 (Mon, 26 May 2008)

Log Message:
-----------
MOD: On linux, use installed system versions of tolua++ and TinyXML libraries if available (can be disabled to force continued use of internal versions).  See: http://www.cegui.org.uk/mantis/view.php?id=198

Modified Paths:
--------------
    cegui_mk2/branches/v0-6/Samples/Demo8/src/Makefile.am
    cegui_mk2/branches/v0-6/Samples/InstancedWindows/src/Makefile.am
    cegui_mk2/branches/v0-6/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.am
    cegui_mk2/branches/v0-6/ScriptingModules/CEGUILua/Makefile.am
    cegui_mk2/branches/v0-6/ScriptingModules/CEGUILua/tolua++bin/Makefile.am
    cegui_mk2/branches/v0-6/XMLParserModules/TinyXMLParser/CEGUITinyXMLParser.cpp
    cegui_mk2/branches/v0-6/XMLParserModules/TinyXMLParser/Makefile.am
    cegui_mk2/branches/v0-6/acinclude.m4
    cegui_mk2/branches/v0-6/configure.ac
    cegui_mk2/branches/v0-6/makefiles/premake/cegui.lua

Modified: cegui_mk2/branches/v0-6/Samples/Demo8/src/Makefile.am
===================================================================
--- cegui_mk2/branches/v0-6/Samples/Demo8/src/Makefile.am	2008-05-26 13:36:26 UTC (rev 1724)
+++ cegui_mk2/branches/v0-6/Samples/Demo8/src/Makefile.am	2008-05-26 18:56:07 UTC (rev 1725)
@@ -1,16 +1,22 @@
 INCLUDES = -I$(top_srcdir)/include \
            -I$(top_srcdir)/Samples/common/include \
-           -I$(top_srcdir)/ScriptingModules/CEGUILua/LuaScriptModule/include \
-           -I$(top_srcdir)/ScriptingModules/CEGUILua/tolua++
+           -I$(top_srcdir)/ScriptingModules/CEGUILua/LuaScriptModule/include
 
 noinst_PROGRAMS = Demo8
 
 noinst_HEADERS =  Sample_Demo8.h
 
 Demo8_SOURCES = Sample_Demo8.cpp
-Demo8_LDFLAGS = -L$(top_builddir)/src -L$(top_builddir)/Samples/common/src -L$(top_builddir)/ScriptingModules/CEGUILua/LuaScriptModule/src -L$(top_builddir)/ScriptingModules/CEGUILua/tolua++
-Demo8_LDADD = -lCEGUIBase -lCEGUISampleHelper -lCEGUILuaScriptModule -lCEGUItoluapp
 
+Demo8_LDADD = $(top_builddir)/src/libCEGUIBase.la \
+              $(top_builddir)/Samples/common/src/libCEGUISampleHelper.la \
+              $(top_builddir)/ScriptingModules/CEGUILua/LuaScriptModule/src/libCEGUILuaScriptModule.la
 
+if CEGUI_BUILD_TOLUAPPLIB
+Demo8_LDADD += $(top_builddir)/ScriptingModules/CEGUILua/tolua++/libCEGUItoluapp.la
+else
+Demo8_LDADD += $(toluapp_LIBS)
+endif
+
 install-exec-local:
 	$(LN_S) -f `pwd`/.libs/Demo8$(EXEEXT) $(top_builddir)/Samples/bin/Demo8$(EXEEXT)

Modified: cegui_mk2/branches/v0-6/Samples/InstancedWindows/src/Makefile.am
===================================================================
--- cegui_mk2/branches/v0-6/Samples/InstancedWindows/src/Makefile.am	2008-05-26 13:36:26 UTC (rev 1724)
+++ cegui_mk2/branches/v0-6/Samples/InstancedWindows/src/Makefile.am	2008-05-26 18:56:07 UTC (rev 1725)
@@ -1,14 +1,22 @@
 INCLUDES = -I$(top_srcdir)/Samples/Instanced/include \
            -I$(top_srcdir)/include \
            -I$(top_srcdir)/Samples/common/include \
-           -I$(top_srcdir)/ScriptingModules/CEGUILua/LuaScriptModule/include \
-           -I$(top_srcdir)/ScriptingModules/CEGUILua/tolua++
+           -I$(top_srcdir)/ScriptingModules/CEGUILua/LuaScriptModule/include
 
 noinst_PROGRAMS = InstancedWindows
 
 InstancedWindows_SOURCES = Instanced.cpp
-InstancedWindows_LDFLAGS = -L$(top_builddir)/src -L$(top_builddir)/Samples/common/src -L$(top_builddir)/ScriptingModules/CEGUILua/LuaScriptModule/src -L$(top_builddir)/ScriptingModules/CEGUILua/tolua++
-InstancedWindows_LDADD = -lCEGUIBase -lCEGUISampleHelper -lCEGUILuaScriptModule -lCEGUItoluapp
 
+InstancedWindows_LDADD = $(top_builddir)/src/libCEGUIBase.la \
+                         $(top_builddir)/Samples/common/src/libCEGUISampleHelper.la \
+                         $(top_builddir)/ScriptingModules/CEGUILua/LuaScriptModule/src/libCEGUILuaScriptModule.la
+
+
+if CEGUI_BUILD_TOLUAPPLIB
+InstancedWindows_LDADD += $(top_builddir)/ScriptingModules/CEGUILua/tolua++/libCEGUItoluapp.la
+else
+InstancedWindows_LDADD += $(toluapp_LIBS)
+endif
+
 install-exec-local:
 	$(LN_S) -f `pwd`/.libs/InstancedWindows$(EXEEXT) $(top_builddir)/Samples/bin/InstancedWindows$(EXEEXT)

Modified: cegui_mk2/branches/v0-6/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.am
===================================================================
--- cegui_mk2/branches/v0-6/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.am	2008-05-26 13:36:26 UTC (rev 1724)
+++ cegui_mk2/branches/v0-6/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.am	2008-05-26 18:56:07 UTC (rev 1725)
@@ -1,5 +1,4 @@
 INCLUDES = -I$(top_srcdir)/include \
-           -I$(top_srcdir)/ScriptingModules/CEGUILua/tolua++ \
            -I$(top_srcdir)/ScriptingModules/CEGUILua/LuaScriptModule/include
 
 libCEGUILuaScriptModule_la_LDFLAGS =
@@ -20,7 +19,13 @@
                                      CEGUILuaFunctor.cpp \
                                      required.cpp
 libCEGUILuaScriptModule_la_LIBADD = $(top_builddir)/src/libCEGUIBase.la \
-                                    ../../tolua++/libCEGUItoluapp.la \
                                     $(Lua_LIBS)
+if CEGUI_BUILD_TOLUAPPLIB
+INCLUDES += -I$(top_srcdir)/ScriptingModules/CEGUILua/tolua++
+libCEGUILuaScriptModule_la_LIBADD += ../../tolua++/libCEGUItoluapp.la
+else
+INCLUDES += $(toluapp_CFLAGS)
+libCEGUILuaScriptModule_la_LIBADD += $(toluapp_LIBS)
+endif
 
 noinst_HEADERS = required.h

Modified: cegui_mk2/branches/v0-6/ScriptingModules/CEGUILua/Makefile.am
===================================================================
--- cegui_mk2/branches/v0-6/ScriptingModules/CEGUILua/Makefile.am	2008-05-26 13:36:26 UTC (rev 1724)
+++ cegui_mk2/branches/v0-6/ScriptingModules/CEGUILua/Makefile.am	2008-05-26 18:56:07 UTC (rev 1725)
@@ -1,4 +1,7 @@
 if CEGUI_BUILD_TOLUACEGUI
 TOLUACEGUI_DIR=tolua++bin
 endif
-SUBDIRS =  tolua++ $(TOLUACEGUI_DIR) LuaScriptModule
+if CEGUI_BUILD_TOLUAPPLIB
+TOLUAPPLIB_DIR=tolua++
+endif
+SUBDIRS =  $(TOLUAPPLIB_DIR) $(TOLUACEGUI_DIR) LuaScriptModule

Modified: cegui_mk2/branches/v0-6/ScriptingModules/CEGUILua/tolua++bin/Makefile.am
===================================================================
--- cegui_mk2/branches/v0-6/ScriptingModules/CEGUILua/tolua++bin/Makefile.am	2008-05-26 13:36:26 UTC (rev 1724)
+++ cegui_mk2/branches/v0-6/ScriptingModules/CEGUILua/tolua++bin/Makefile.am	2008-05-26 18:56:07 UTC (rev 1725)
@@ -1,4 +1,4 @@
-INCLUDES = $(Lua_CFLAGS) -I$(top_srcdir)/ScriptingModules/CEGUILua/tolua++
+INCLUDES = $(Lua_CFLAGS)
 
 bin_PROGRAMS = tolua++cegui
 tolua__cegui_SOURCES = tolua.c toluabind.c toluabind.h
@@ -29,5 +29,10 @@
              lua/variable.lua \
              lua/verbatim.lua
 
-tolua__cegui_LDFLAGS = -L$(top_builddir)/ScriptingModules/CEGUILua/tolua++/.libs
-tolua__cegui_LDADD = -lCEGUItoluapp
+if CEGUI_BUILD_TOLUAPPLIB
+INCLUDES += -I$(top_srcdir)/ScriptingModules/CEGUILua/tolua++
+tolua__cegui_LDADD = $(top_builddir)/ScriptingModules/CEGUILua/tolua++/libCEGUItoluapp.la
+else
+INCLUDES += $(toluapp_CFLAGS)
+tolua__cegui_LDADD = $(toluapp_LIBS)
+endif
\ No newline at end of file

Modified: cegui_mk2/branches/v0-6/XMLParserModules/TinyXMLParser/CEGUITinyXMLParser.cpp
===================================================================
--- cegui_mk2/branches/v0-6/XMLParserModules/TinyXMLParser/CEGUITinyXMLParser.cpp	2008-05-26 13:36:26 UTC (rev 1724)
+++ cegui_mk2/branches/v0-6/XMLParserModules/TinyXMLParser/CEGUITinyXMLParser.cpp	2008-05-26 18:56:07 UTC (rev 1725)
@@ -25,25 +25,29 @@
  *   ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  *   OTHER DEALINGS IN THE SOFTWARE.
  ***************************************************************************/
+#ifdef HAVE_CONFIG_H
+#   include "config.h"
+#endif
+
 #include "CEGUITinyXMLParser.h"
 #include "CEGUIResourceProvider.h"
 #include "CEGUISystem.h"
 #include "CEGUIXMLHandler.h"
 #include "CEGUIXMLAttributes.h"
 #include "CEGUILogger.h"
-#include "ceguitinyxml/tinyxml.h"
+#include CEGUI_TINYXML_H
 
 // Start of CEGUI namespace section
 namespace CEGUI
 {
-    class TinyXMLDocument : public CEGUITinyXML::TiXmlDocument
+    class TinyXMLDocument : public CEGUI_TINYXML_NAMESPACE::TiXmlDocument
     {
     public:
         TinyXMLDocument(XMLHandler& handler, const String& filename, const String& schemaName, const String& resourceGroup);
         ~TinyXMLDocument()
         {}
     protected:
-        void processElement(const CEGUITinyXML::TiXmlElement* element);
+        void processElement(const CEGUI_TINYXML_NAMESPACE::TiXmlElement* element);
 
     private:
         XMLHandler* d_handler;
@@ -58,19 +62,19 @@
         // cegui_mk2-0.4.1-fixtinyxml.patch
         RawDataContainer rawXMLData;
         System::getSingleton().getResourceProvider()->loadRawDataContainer(filename, rawXMLData, resourceGroup);
-        
-        // Create a buffer with the missing extra byte 
+
+        // Create a buffer with the missing extra byte
         size_t size = rawXMLData.getSize();
         char* buf = new char[size + 1];
         memcpy(buf, rawXMLData.getDataPtr(), size);
-        buf[size] = 0; 
+        buf[size] = 0;
 
-		try 
+		try
 		{
-			// Parse the document 
-			CEGUITinyXML::TiXmlDocument doc;
+			// Parse the document
+			CEGUI_TINYXML_NAMESPACE::TiXmlDocument doc;
 			doc.Parse((const char*)buf);
-			const CEGUITinyXML::TiXmlElement* currElement = doc.RootElement();
+			const CEGUI_TINYXML_NAMESPACE::TiXmlElement* currElement = doc.RootElement();
 			if (currElement)
 			{
 				// function called recursively to parse xml data
@@ -83,42 +87,42 @@
 			System::getSingleton().getResourceProvider()->unloadRawDataContainer(rawXMLData);
 			throw;
 		}
-		// Free memory 
+		// Free memory
         delete [] buf;
         System::getSingleton().getResourceProvider()->unloadRawDataContainer(rawXMLData);
     }
-    
 
-    void TinyXMLDocument::processElement(const CEGUITinyXML::TiXmlElement* element)
+
+    void TinyXMLDocument::processElement(const CEGUI_TINYXML_NAMESPACE::TiXmlElement* element)
     {
         // build attributes block for the element
         XMLAttributes attrs;
-        
-        const CEGUITinyXML::TiXmlAttribute *currAttr = element->FirstAttribute();
+
+        const CEGUI_TINYXML_NAMESPACE::TiXmlAttribute *currAttr = element->FirstAttribute();
         while (currAttr)
         {
             attrs.add((utf8*)currAttr->Name(), (utf8*)currAttr->Value());
             currAttr = currAttr->Next();
         }
-        
+
         // start element
         d_handler->elementStart((utf8*)element->Value(), attrs);
 
         // do children
-        const CEGUITinyXML::TiXmlNode* childNode = element->FirstChild();
+        const CEGUI_TINYXML_NAMESPACE::TiXmlNode* childNode = element->FirstChild();
         while (childNode)
         {
             switch(childNode->Type())
             {
-            case CEGUITinyXML::TiXmlNode::ELEMENT:
+            case CEGUI_TINYXML_NAMESPACE::TiXmlNode::ELEMENT:
                 processElement(childNode->ToElement());
                 break;
-            case CEGUITinyXML::TiXmlNode::TEXT:
+            case CEGUI_TINYXML_NAMESPACE::TiXmlNode::TEXT:
                 if (childNode->ToText()->Value() != '\0')
                     d_handler->text((utf8*)childNode->ToText()->Value());
                 break;
-                
-                // Silently ignore unhandled node type 
+
+                // Silently ignore unhandled node type
             };
             childNode = childNode->NextSibling();
         }
@@ -144,9 +148,9 @@
 
     bool TinyXMLParser::initialiseImpl(void)
     {
-        // This used to prevent deletion of line ending in the middle of a text. 
-        // WhiteSpace cleaning will be available throught the use of String methods directly 
-        //CEGUITinyXML::TiXmlDocument::SetCondenseWhiteSpace(false);
+        // This used to prevent deletion of line ending in the middle of a text.
+        // WhiteSpace cleaning will be available throught the use of String methods directly
+        //CEGUI_TINYXML_NAMESPACE::TiXmlDocument::SetCondenseWhiteSpace(false);
         return true;
     }
 

Modified: cegui_mk2/branches/v0-6/XMLParserModules/TinyXMLParser/Makefile.am
===================================================================
--- cegui_mk2/branches/v0-6/XMLParserModules/TinyXMLParser/Makefile.am	2008-05-26 13:36:26 UTC (rev 1724)
+++ cegui_mk2/branches/v0-6/XMLParserModules/TinyXMLParser/Makefile.am	2008-05-26 18:56:07 UTC (rev 1725)
@@ -6,14 +6,19 @@
 endif
 
 lib_LTLIBRARIES=libCEGUITinyXMLParser.la
+libCEGUITinyXMLParser_la_LIBADD = $(top_builddir)/src/libCEGUIBase.la
 
 libCEGUITinyXMLParser_la_SOURCES = CEGUITinyXMLParser.cpp \
-                                   CEGUITinyXMLParserModule.cpp \
-                                   ceguitinyxml/tinystr.cpp \
-                                   ceguitinyxml/tinyxml.cpp \
-                                   ceguitinyxml/tinyxmlerror.cpp \
-                                   ceguitinyxml/tinyxmlparser.cpp
-libCEGUITinyXMLParser_la_LIBADD = $(top_builddir)/src/libCEGUIBase.la
+                                   CEGUITinyXMLParserModule.cpp
+if BUILD_USING_INTERNAL_TINYXML
+libCEGUITinyXMLParser_la_SOURCES += ceguitinyxml/tinystr.cpp \
+                                    ceguitinyxml/tinyxml.cpp \
+                                    ceguitinyxml/tinyxmlerror.cpp \
+                                    ceguitinyxml/tinyxmlparser.cpp
+else
+INCLUDES += $(tinyxml_CFLAGS)
+libCEGUITinyXMLParser_la_LIBADD += $(tinyxml_LIBS)
+endif
 
 pkgincludedir=$(prefix)/include/CEGUI/XMLParserModules/TinyXMLParser
 pkginclude_HEADERS = CEGUITinyXMLParser.h CEGUITinyXMLParserModule.h

Modified: cegui_mk2/branches/v0-6/acinclude.m4
===================================================================
--- cegui_mk2/branches/v0-6/acinclude.m4	2008-05-26 13:36:26 UTC (rev 1724)
+++ cegui_mk2/branches/v0-6/acinclude.m4	2008-05-26 18:56:07 UTC (rev 1725)
@@ -57,6 +57,16 @@
     CEGUI_CHECK_XERCES(xerces, [cegui_found_xerces=yes], [cegui_found_xerces=no])
     CEGUI_CHECK_EXPAT(expat, [cegui_found_expat=yes], [cegui_found_expat=no])
 
+    dnl Make some decisions about how to go about using TinyXML
+    AC_ARG_ENABLE([external-tinyxml], AC_HELP_STRING([--disable-external-tinyxml], [Disables the use of any external tinyxml library, forcing the use of the version that accompanies CEGUI.]),
+            [cegui_use_external_tinyxml=$enableval], [cegui_use_external_tinyxml=yes])
+
+    if test x$cegui_use_external_tinyxml = xyes; then
+        CEGUI_CHECK_TINYXML([tinyxml], [cegui_found_tinyxml=yes], [cegui_found_tinyxml=no])
+    else
+        cegui_found_tinyxml=no
+    fi
+
     dnl save lots of linker aggro ;)
     LIBS="$xerces_LIBS $LIBS"
 
@@ -140,11 +150,23 @@
     AM_CONDITIONAL([BUILD_LIBXML_PARSER], [test x$cegui_with_libxml = xyes])
     AM_CONDITIONAL([BUILD_EXPAT_PARSER], [test x$cegui_with_expat = xyes])
     AM_CONDITIONAL([BUILD_TINYXML_PARSER], [test x$cegui_with_tinyxml = xyes])
+    AM_CONDITIONAL([BUILD_USING_INTERNAL_TINYXML], [test x$cegui_with_tinyxml = xyes && test x$cegui_found_tinyxml = xno])
 
+    dnl create a define for the main tinyxml header file
+    if test x$cegui_with_tinyxml = xyes && test x$cegui_found_tinyxml = xno; then
+        AC_DEFINE(CEGUI_TINYXML_H, ["ceguitinyxml/tinyxml.h"], [Set this to the name of the tinyxml.h file])
+        AC_DEFINE(CEGUI_TINYXML_NAMESPACE, [CEGUITinyXML], [Set this to the name of the tinyxml namespace])
+    else
+        AC_DEFINE(CEGUI_TINYXML_H, [<tinyxml.h>], [Set this to the name of the tinyxml.h file])
+        AC_DEFINE(CEGUI_TINYXML_NAMESPACE, [], [Set this to the name of the tinyxml namespace])
+    fi
+
     AC_SUBST(xerces_CFLAGS)
     AC_SUBST(xerces_LIBS)
     AC_SUBST(expat_CFLAGS)
     AC_SUBST(expat_LIBS)
+    AC_SUBST(tinyxml_CFLAGS)
+    AC_SUBST(tinyxml_LIBS)
 ])
 
 AC_DEFUN([CEGUI_ENABLE_OGRE_RENDERER], [
@@ -682,6 +704,17 @@
 
     if test x$cegui_found_lua = xyes && test x$cegui_with_lua = xyes; then
         cegui_with_lua=yes
+
+        dnl Decide which tolua++ library to use
+        AC_ARG_ENABLE([external-toluapp], AC_HELP_STRING([--disable-external-toluapp], [Disables the use of any external tolua++ library, forcing the use of the version that accompanies CEGUI.]),
+                [cegui_use_external_tolua=$enableval], [cegui_use_external_tolua=yes])
+
+        if test x$cegui_use_external_tolua = xyes; then
+            CEGUI_CHECK_TOLUAPP([toluapp],[cegui_found_toluapp=yes],[cegui_found_toluapp=no])
+        else
+            cegui_found_toluapp=no
+        fi
+
     else
         cegui_with_lua=no
     fi
@@ -699,7 +732,116 @@
     fi
 
     AM_CONDITIONAL([CEGUI_BUILD_LUA_MODULE], [test x$cegui_with_lua = xyes])
+    AM_CONDITIONAL([CEGUI_BUILD_TOLUAPPLIB], [test x$cegui_found_toluapp = xno])
     AM_CONDITIONAL([CEGUI_BUILD_TOLUACEGUI], [test x$cegui_build_toluatool = xyes])
     AC_SUBST(Lua_CFLAGS)
     AC_SUBST(Lua_LIBS)
+    AC_SUBST(toluapp_CFLAGS)
+    AC_SUBST(toluapp_LIBS)
 ])
+
+# CEGUI_CHECK_TOLUAPP(variable, [action-if-found], [action-if-not-found])
+# Checks for an installed copy of the tolua++ library
+AC_DEFUN([CEGUI_CHECK_TOLUAPP],[
+    AC_ARG_WITH([tolua++-incdir], AC_HELP_STRING([--with-tolua++-incdir=DIR], [Optionally specifies location of the tolua++ includes]),
+        [cegui_tolua_incdir=$withval],[cegui_tolua_incdir=[.]])
+    AC_ARG_WITH([tolua++-libdir], AC_HELP_STRING([--with-tolua++-libdir=DIR], [Optionally specifies location of the tolua++ library]),
+        [cegui_tolua_libdir=$withval],[cegui_tolua_libdir=[.]])
+
+    cegui_lib_paths="$cegui_tolua_libdir"
+    cegui_inc_paths="$cegui_tolua_incdir /usr/local/include/tolua++ /usr/include/tolua++ /usr/local/include /usr/include"
+
+    $1_CFLAGS=
+    $1_LIBS=
+
+    cegui_saved_CFLAGS="$CPPFLAGS"
+    cegui_saved_LIBS="$LIBS"
+
+    for cegui_path in $cegui_inc_paths; do
+        ifelse($cegui_path, [.], CPPFLAGS="$cegui_saved_CFLAGS", CPPFLAGS="-I$cegui_path $cegui_saved_CFLAGS")
+        AC_PREPROC_IFELSE(
+            [#include <tolua++.h>],
+            [cegui_tolua_h_found=yes; cegui_tolua_flags="$cegui_path"; break],
+            [cegui_tolua_h_found=no])
+    done
+
+    for cegui_path in $cegui_lib_paths; do
+        ifelse($cegui_path, [.], LIBS="$cegui_saved_LIBS", LIBS="-L$cegui_path $cegui_saved_LIBS")
+        AC_CHECK_LIB([tolua++], [tolua_endmodule],
+            [cegui_tolua_l_found=yes; cegui_tolua_libs="$cegui_path"; break],
+            [cegui_tolua_l_found=no])
+    done
+
+    CPPFLAGS="$cegui_saved_CFLAGS"
+    LIBS="$cegui_saved_LIBS"
+
+    if test x$cegui_tolua_h_found = xyes && test x$cegui_tolua_l_found = xyes; then
+        if test x$cegui_tolua_flags != x.; then
+            $1_CFLAGS="-I$cegui_tolua_flags"
+        fi
+        if test x$cegui_tolua_libs = x.; then
+            $1_LIBS="-ltolua++"
+        else
+            $1_LIBS="-L$cegui_tolua_libs -ltolua++"
+        fi
+
+        ifelse([$2], [], :, [$2])
+    else
+        ifelse([$3], [], :, [$3])
+    fi
+])
+
+# CEGUI_CHECK_TINYXML(variable, [action-if-found], [action-if-not-found])
+# Checks for an installed copy of the TinyXML
+AC_DEFUN([CEGUI_CHECK_TINYXML],[
+    AC_ARG_WITH([tinyxml-incdir], AC_HELP_STRING([--with-tinyxml-incdir=DIR], [Optionally specifies location of the tinyxml includes]),
+        [cegui_tinyxml_incdir=$withval],[cegui_tinyxml_incdir=[.]])
+    AC_ARG_WITH([tinyxml-libdir], AC_HELP_STRING([--with-tinyxml-libdir=DIR], [Optionally specifies location of the tinyxml library]),
+        [cegui_tinyxml_libdir=$withval],[cegui_tinyxml_libdir=[.]])
+
+    AC_LANG_PUSH([C++])
+
+    cegui_lib_paths="$cegui_tinyxml_libdir"
+    cegui_inc_paths="$cegui_tinyxml_incdir /usr/local/include/tinyxml /usr/include/tinyxml /usr/local/include /usr/include"
+
+    $1_CFLAGS=
+    $1_LIBS=
+
+    cegui_saved_CFLAGS="$CPPFLAGS"
+    cegui_saved_LIBS="$LIBS"
+
+    for cegui_path in $cegui_inc_paths; do
+        ifelse($cegui_path, [.], CPPFLAGS="$cegui_saved_CFLAGS", CPPFLAGS="-I$cegui_path $cegui_saved_CFLAGS")
+        AC_PREPROC_IFELSE(
+            [#include <tinyxml.h>],
+            [cegui_tinyxml_h_found=yes; cegui_tinyxml_flags="$cegui_path"; break],
+            [cegui_tinyxml_h_found=no])
+    done
+
+    for cegui_path in $cegui_lib_paths; do
+        ifelse($cegui_path, [.], LIBS="$cegui_saved_LIBS", LIBS="-L$cegui_path $cegui_saved_LIBS")
+        AC_CHECK_LIB([tinyxml], [main],
+            [cegui_tinyxml_l_found=yes; cegui_tinyxml_libs="$cegui_path"; break],
+            [cegui_tinyxml_l_found=no])
+    done
+
+    CPPFLAGS="$cegui_saved_CFLAGS"
+    LIBS="$cegui_saved_LIBS"
+
+    if test x$cegui_tinyxml_h_found = xyes && test x$cegui_tinyxml_l_found = xyes; then
+        if test x$cegui_tinyxml_flags != x.; then
+            $1_CFLAGS="-I$cegui_tinyxml_flags"
+        fi
+        if test x$cegui_tinyxml_libs = x.; then
+            $1_LIBS="-ltinyxml"
+        else
+            $1_LIBS="-L$cegui_tinyxml_libs -ltinyxml"
+        fi
+
+        ifelse([$2], [], :, [$2])
+    else
+        ifelse([$3], [], :, [$3])
+    fi
+
+    AC_LANG_POP([C++])
+])

Modified: cegui_mk2/branches/v0-6/configure.ac
===================================================================
--- cegui_mk2/branches/v0-6/configure.ac	2008-05-26 13:36:26 UTC (rev 1724)
+++ cegui_mk2/branches/v0-6/configure.ac	2008-05-26 18:56:07 UTC (rev 1725)
@@ -221,6 +221,9 @@
 fi
 echo "* XML Parser Modules:"
 echo "*         Building TinyXMLParser:                       ${cegui_with_tinyxml-no}"
+if test x$cegui_with_tinyxml = xyes; then
+echo "*             Using external TinyXML library:           ${cegui_found_tinyxml-no}"
+fi
 echo "*         Building ExpatParser:                         ${cegui_with_expat-no}"
 echo "*         Building LibXMLParser:                        ${cegui_with_libxml-no}"
 echo "*         Building XercesParser:                        ${cegui_with_xerces-no}"
@@ -243,6 +246,9 @@
 echo "* Scripting:"
 echo "*         Building Lua scripting module:                ${cegui_with_lua-no}"
 echo "*         Building tolua++cegui generator:              ${cegui_build_toluatool-no}"
+if test x$cegui_with_lua = xyes; then
+echo "*             Using external tolua++ library:           ${cegui_found_toluapp-no}"
+fi
 echo "*"
 echo "* Samples Framework:"
 echo "*         Building Samples:                             ${cegui_build_samples-no}"

Modified: cegui_mk2/branches/v0-6/makefiles/premake/cegui.lua
===================================================================
--- cegui_mk2/branches/v0-6/makefiles/premake/cegui.lua	2008-05-26 13:36:26 UTC (rev 1724)
+++ cegui_mk2/branches/v0-6/makefiles/premake/cegui.lua	2008-05-26 18:56:07 UTC (rev 1725)
@@ -182,15 +182,15 @@
     if DEFAULT_XML_PARSER == "xerces" then
         config_h.CEGUI_WITH_XERCES = "1"
     end
-    
+
     if DEFAULT_XML_PARSER == "expat" then
         config_h.CEGUI_WITH_EXPAT = "1"
 	end
-	
+
 	if DEFAULT_XML_PARSER == "tinyxml" then
 	    config_h.CEGUI_WITH_TINYXML = "1"
 	end
-	
+
 	if DEFAULT_IMAGE_CODEC == "silly" then
 		config_h.CEGUI_CODEC_SILLY = "1"
 	elseif DEFAULT_IMAGE_CODEC == "tga" then
@@ -202,16 +202,20 @@
 	elseif DEFAULT_IMAGE_CODEC == "freeimage" then
 		config_h.CEGUI_CODEC_FREEIMAGE = "1"
 	end
-	
+
 	-- Lua library version
 	config_h.CEGUI_LUA_VER = CEGUI_LUA_VER
-	
+
 	-- It is important that if this changes you re run premake inorder to
 	-- get the correct window renderer with a static build.
 	if DEFAULT_WINDOW_RENDERER == "falagard" then
 	    config_h.CEGUI_FALAGARD_RENDERER = ""
 	end
 
+	-- Add a couple of values needed for the TinyXML parser to build.
+	config_h.CEGUI_TINYXML_H = '"ceguitinyxml/tinyxml.h"'
+	config_h.CEGUI_TINYXML_NAMESPACE = "CEGUITinyXML"
+
     local filename = "../../include/config.h"
     local f,err = io.open(filename, "w+")
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Crayzedsgui-cvsmk2] SF.net SVN: crayzedsgui: [1727] cegui_mk2/branches/v0-6

From: <ice-drezday@us...> - 2008-05-27 13:43

Revision: 1727
          http://crayzedsgui.svn.sourceforge.net/crayzedsgui/?rev=1727&view=rev
Author:   ice-drezday
Date:     2008-05-27 06:43:51 -0700 (Tue, 27 May 2008)

Log Message:
-----------
MOD: Refactored tab removal code to eliminate repetition.

Modified Paths:
--------------
    cegui_mk2/branches/v0-6/include/elements/CEGUITabControl.h
    cegui_mk2/branches/v0-6/src/elements/CEGUITabControl.cpp

Modified: cegui_mk2/branches/v0-6/include/elements/CEGUITabControl.h
===================================================================
--- cegui_mk2/branches/v0-6/include/elements/CEGUITabControl.h	2008-05-26 19:37:16 UTC (rev 1726)
+++ cegui_mk2/branches/v0-6/include/elements/CEGUITabControl.h	2008-05-27 13:43:51 UTC (rev 1727)
@@ -2,7 +2,7 @@
 	filename: 	CEGUITabControl.h
 	created:	08/08/2004
 	author:		Steve Streeting
-	
+
 	purpose:	Interface to base class for TabControl widget
 *************************************************************************/
 /***************************************************************************
@@ -110,7 +110,7 @@
 	*************************************************************************/
 	/*!
 	\brief
-		Return number of tabs 
+		Return number of tabs
 
 	\return
 		the number of tabs currently present.
@@ -243,7 +243,7 @@
 		index of the currently selected tab.
 	*/
     size_t	getSelectedTabIndex() const;
-	
+
     /*!
     \brief
         Return the height of the tabs
@@ -285,26 +285,26 @@
     void setTabTextPadding(const UDim& padding);
 
     /*!
-    \brief 
-        Add a new tab to the tab control. 
-    \par 
+    \brief
+        Add a new tab to the tab control.
+    \par
         The new tab will be added with the same text as the window passed in.
     \param wnd
         The Window which will be placed in the content area of this new tab.
     */
     void addTab(Window* wnd);
     /*!
-    \brief 
-        Remove the named tab from the tab control. 
-    \par 
-        The tab content will be destroyed. 
+    \brief
+        Remove the named tab from the tab control.
+    \par
+        The tab content will be destroyed.
     */
     void removeTab(const String& name);
     /*!
-    \brief 
-    Remove the tab with the given ID from the tab control. 
-    \par 
-    The tab content will be destroyed. 
+    \brief
+    Remove the tab with the given ID from the tab control.
+    \par
+    The tab content will be destroyed.
     */
     void removeTab(uint ID);
 
@@ -333,7 +333,7 @@
 	*************************************************************************/
     /*!
     \brief
-        Perform the actual rendering for this Window. 
+        Perform the actual rendering for this Window.
 
     \param z
         float value specifying the base Z co-ordinate that should be used when rendering
@@ -364,7 +364,7 @@
         Construct a button name to handle a window.
     */
     String makeButtonName(Window* wnd);
-    
+
     /*!
     \brief
         Internal implementation of select tab.
@@ -444,6 +444,9 @@
     */
     TabButton*  createTabButton(const String& name) const;
 
+    //! Implementation function to do main work of removing a tab.
+    void removeTab_impl(Window* window);
+
 	/*************************************************************************
 		New event handlers
 	*************************************************************************/

Modified: cegui_mk2/branches/v0-6/src/elements/CEGUITabControl.cpp
===================================================================
--- cegui_mk2/branches/v0-6/src/elements/CEGUITabControl.cpp	2008-05-26 19:37:16 UTC (rev 1726)
+++ cegui_mk2/branches/v0-6/src/elements/CEGUITabControl.cpp	2008-05-27 13:43:51 UTC (rev 1727)
@@ -2,7 +2,7 @@
 	filename: 	CEGUITabControl.cpp
 	created:	08/08/2004
 	author:		Steve Streeting
-	
+
 	purpose:	Implementation of Tab Control widget base class
 *************************************************************************/
 /***************************************************************************
@@ -125,7 +125,7 @@
 Get the number of tabs
 *************************************************************************/
 size_t TabControl::getTabCount(void) const
-{   
+{
     return getTabPane()->getChildCount();
 }
 /*************************************************************************
@@ -261,7 +261,7 @@
     performChildWindowLayout();
     requestRedraw();
     // Subscribe to text changed event so that we can resize as needed
-    wnd->subscribeEvent(Window::EventTextChanged, 
+    wnd->subscribeEvent(Window::EventTextChanged,
         Event::Subscriber(&TabControl::handleContentWindowTextChanged, this));
 
 }
@@ -271,26 +271,8 @@
 void TabControl::removeTab(const String& name)
 {
     // do nothing if given window is not attached as a tab.
-    if (!getTabPane()->isChild(name))
-        return;
-
-    Window* wnd = getTabPane()->getChild(name);
-
-    // Was this selected?
-    bool reselect = wnd->isVisible();
-    // Tab buttons are the 2nd onward children
-    getTabPane()->removeChildWindow(name);
-
-    // remove button too
-    removeButtonForTabContent(wnd);
-
-    if (reselect && (getTabCount() > 0))
-        // Select another tab
-        setSelectedTab(getTabPane()->getChildAtIdx(0)->getName());
-
-    performChildWindowLayout();
-
-    requestRedraw();
+    if (getTabPane()->isChild(name))
+        removeTab_impl(getTabPane()->getChild(name));
 }
 /*************************************************************************
 Remove a tab by ID
@@ -298,32 +280,8 @@
 void TabControl::removeTab(uint ID)
 {
     // do nothing if given window is not attached as a tab.
-    if (!getTabPane()->isChild(ID))
-        return;
-
-    Window* wnd = getTabPane()->getChild(ID);
-
-    // Was this selected?
-    bool reselect = wnd->isVisible();
-    // Tab buttons are the 2nd onward children
-    getTabPane()->removeChildWindow(ID);
-
-    // remove button too
-    removeButtonForTabContent(wnd);
-
-    if (reselect)
-    {
-        // Select another tab
-        if (getTabCount() > 0)
-        {
-            setSelectedTab(getTabPane()->getChildAtIdx(0)->getName());
-        }
-    }
-
-    performChildWindowLayout();
-
-    requestRedraw();
-
+    if (getTabPane()->isChild(ID))
+        removeTab_impl(getTabPane()->getChild(ID));
 }
 /*************************************************************************
 Add tab button
@@ -341,7 +299,7 @@
     // add the button
     getTabButtonPane()->addChildWindow(tb);
     // Subscribe to clicked event so that we can change tab
-    tb->subscribeEvent(TabButton::EventClicked, 
+    tb->subscribeEvent(TabButton::EventClicked,
         Event::Subscriber(&TabControl::handleTabButtonClicked, this));
     tb->subscribeEvent(TabButton::EventDragged,
         Event::Subscriber(&TabControl::handleDraggedPane, this));
@@ -801,11 +759,30 @@
 
     Window *but_pane = getTabButtonPane();
     float delta = but_pane->getPixelRect ().getWidth () / 20;
-    
+
     d_firstTabOffset -= me.wheelChange * delta;
     performChildWindowLayout();
 
     return true;
 }
 
+void TabControl::removeTab_impl(Window* window)
+{
+    // Was this selected?
+    bool reselect = window->isVisible();
+    // Tab buttons are the 2nd onward children
+    getTabPane()->removeChildWindow(window);
+
+    // remove button too
+    removeButtonForTabContent(window);
+
+    if (reselect && (getTabCount() > 0))
+        // Select another tab
+        setSelectedTab(getTabPane()->getChildAtIdx(0)->getName());
+
+    performChildWindowLayout();
+
+    requestRedraw();
+}
+
 } // End of  CEGUI namespace section


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Crayzedsgui-cvsmk2] SF.net SVN: crayzedsgui: [1728] cegui_mk2/branches/v0-6

From: <ice-drezday@us...> - 2008-05-27 14:20

Revision: 1728
          http://crayzedsgui.svn.sourceforge.net/crayzedsgui/?rev=1728&view=rev
Author:   ice-drezday
Date:     2008-05-27 07:20:34 -0700 (Tue, 27 May 2008)

Log Message:
-----------
FIX: TabControl was subscribing to EventTextChanged on added content windows, but not releasing the connection when the content window was removed - causing UnknownObject exceptions and possible crashes when attempting to change the text on a window after it had been added to and then removed from a TabControl.  See: http://www.cegui.org.uk/mantis/view.php?id=192

Modified Paths:
--------------
    cegui_mk2/branches/v0-6/include/elements/CEGUITabControl.h
    cegui_mk2/branches/v0-6/src/elements/CEGUITabControl.cpp

Modified: cegui_mk2/branches/v0-6/include/elements/CEGUITabControl.h
===================================================================
--- cegui_mk2/branches/v0-6/include/elements/CEGUITabControl.h	2008-05-27 13:43:51 UTC (rev 1727)
+++ cegui_mk2/branches/v0-6/include/elements/CEGUITabControl.h	2008-05-27 14:20:34 UTC (rev 1728)
@@ -477,6 +477,8 @@
     float       d_firstTabOffset;   //!< The offset in pixels of the first tab
     TabPanePosition d_tabPanePos;   //!< The position of the tab pane
     float       d_btGrabPos;        //!< The position on the button tab where user grabbed
+    //! Container used to track event subscriptions to added tab windows.
+    std::map<Window*, Event::ScopedConnection> d_eventConnections;
     /*************************************************************************
     Abstract Implementation Functions (must be provided by derived class)
     *************************************************************************/

Modified: cegui_mk2/branches/v0-6/src/elements/CEGUITabControl.cpp
===================================================================
--- cegui_mk2/branches/v0-6/src/elements/CEGUITabControl.cpp	2008-05-27 13:43:51 UTC (rev 1727)
+++ cegui_mk2/branches/v0-6/src/elements/CEGUITabControl.cpp	2008-05-27 14:20:34 UTC (rev 1728)
@@ -261,9 +261,10 @@
     performChildWindowLayout();
     requestRedraw();
     // Subscribe to text changed event so that we can resize as needed
-    wnd->subscribeEvent(Window::EventTextChanged,
-        Event::Subscriber(&TabControl::handleContentWindowTextChanged, this));
-
+    d_eventConnections[wnd] =
+        wnd->subscribeEvent(Window::EventTextChanged,
+            Event::Subscriber(&TabControl::handleContentWindowTextChanged,
+                              this));
 }
 /*************************************************************************
 Remove a tab
@@ -768,6 +769,8 @@
 
 void TabControl::removeTab_impl(Window* window)
 {
+    // delete connection to event we subscribed earlier
+    d_eventConnections.erase(window);
     // Was this selected?
     bool reselect = window->isVisible();
     // Tab buttons are the 2nd onward children


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Crayzedsgui-cvsmk2] SF.net SVN: crayzedsgui: [1734] cegui_mk2/branches/v0-6

From: <ice-drezday@us...> - 2008-06-05 12:03

Revision: 1734
          http://crayzedsgui.svn.sourceforge.net/crayzedsgui/?rev=1734&view=rev
Author:   ice-drezday
Date:     2008-06-05 05:02:57 -0700 (Thu, 05 Jun 2008)

Log Message:
-----------
FIX: uncomment part of cegui.lua configuration script that allows use of option to have Ogre in samples.
FIX: pragmas for link libs in Ogre base app were incorrectly dependant on _WIN32 macro instead of _MSC_VER macro.
FIX: Added extra pragma lines to bring in required OIS lib for the Ogre base app.
FIX: Ogre base app now uses numKeyboards (was numKeyBoards) from OIS; this is what the OIS from the Ogre deps expects.

Modified Paths:
--------------
    cegui_mk2/branches/v0-6/Samples/common/include/CEGuiOgreBaseApplication.h
    cegui_mk2/branches/v0-6/Samples/common/src/CEGuiOgreBaseApplication.cpp
    cegui_mk2/branches/v0-6/makefiles/premake/cegui.lua

Modified: cegui_mk2/branches/v0-6/Samples/common/include/CEGuiOgreBaseApplication.h
===================================================================
--- cegui_mk2/branches/v0-6/Samples/common/include/CEGuiOgreBaseApplication.h	2008-06-01 19:52:21 UTC (rev 1733)
+++ cegui_mk2/branches/v0-6/Samples/common/include/CEGuiOgreBaseApplication.h	2008-06-05 12:02:57 UTC (rev 1734)
@@ -35,13 +35,15 @@
 #include <Ogre.h>
 #include <OIS.h>
 
-#if defined(_WIN32)
+#if defined(_MSC_VER)
 #  if defined(_DEBUG)
 #      pragma comment(lib, "OgreGUIRenderer_d.lib")
 #      pragma comment(lib, "OgreMain_d.lib")
+#      pragma comment(lib, "OIS_d.lib")
 #  else
 #      pragma comment(lib, "OgreGUIRenderer.lib")
 #      pragma comment(lib, "OgreMain.lib")
+#      pragma comment(lib, "OIS.lib")
 #  endif
 #endif
 

Modified: cegui_mk2/branches/v0-6/Samples/common/src/CEGuiOgreBaseApplication.cpp
===================================================================
--- cegui_mk2/branches/v0-6/Samples/common/src/CEGuiOgreBaseApplication.cpp	2008-06-01 19:52:21 UTC (rev 1733)
+++ cegui_mk2/branches/v0-6/Samples/common/src/CEGuiOgreBaseApplication.cpp	2008-06-05 12:02:57 UTC (rev 1734)
@@ -224,7 +224,7 @@
 
     // create buffered keyboard
     //if (d_inputManager->getNumberOfDevices(OIS::OISKeyboard) > 0)
-    if (d_inputManager->numKeyBoards() > 0)
+    if (d_inputManager->numKeyboards() > 0)
     {
         d_keyboard = static_cast<OIS::Keyboard*>(d_inputManager->createInputObject(OIS::OISKeyboard, true));
         d_keyboard->setEventCallback(this);

Modified: cegui_mk2/branches/v0-6/makefiles/premake/cegui.lua
===================================================================
--- cegui_mk2/branches/v0-6/makefiles/premake/cegui.lua	2008-06-01 19:52:21 UTC (rev 1733)
+++ cegui_mk2/branches/v0-6/makefiles/premake/cegui.lua	2008-06-05 12:02:57 UTC (rev 1734)
@@ -168,9 +168,9 @@
     if DIRECTX10_RENDERER and SAMPLES_DX10 then
         config_h.CEGUI_SAMPLES_USE_DIRECTX_10 = ""
     end
-    --if SAMPLES_OGRE then
-    --    config_h.CEGUI_SAMPLES_USE_OGRE = ""
-    --end
+    if SAMPLES_OGRE then
+        config_h.CEGUI_SAMPLES_USE_OGRE = ""
+    end
     if IRRLICHT_RENDERER then
           -- This only used to happen when samples were to build as well
           config_h.CEGUI_IRR_SDK_VERSION = CEGUI_IRR_SDK_VERSION


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Crayzedsgui-cvsmk2] SF.net SVN: crayzedsgui: [1735] cegui_mk2/branches/v0-6

From: <ice-drezday@us...> - 2008-06-07 16:04

Revision: 1735
          http://crayzedsgui.svn.sourceforge.net/crayzedsgui/?rev=1735&view=rev
Author:   ice-drezday
Date:     2008-06-07 09:04:08 -0700 (Sat, 07 Jun 2008)

Log Message:
-----------
FIX: Fix issue of missing OpenGL render state initialisation when multitexture support is available.  See: http://www.cegui.org.uk/mantis/view.php?id=201.  NB: This also adds use of GLEW library (external (autotools) or embedded (all platforms)).

Modified Paths:
--------------
    cegui_mk2/branches/v0-6/README
    cegui_mk2/branches/v0-6/RendererModules/OpenGLGUIRenderer/Makefile.am
    cegui_mk2/branches/v0-6/RendererModules/OpenGLGUIRenderer/openglrenderer.cpp
    cegui_mk2/branches/v0-6/acinclude.m4
    cegui_mk2/branches/v0-6/configure.ac
    cegui_mk2/branches/v0-6/makefiles/premake/RendererModules/OpenGLGUIRenderer/premake.lua

Added Paths:
-----------
    cegui_mk2/branches/v0-6/RendererModules/OpenGLGUIRenderer/GLEW/
    cegui_mk2/branches/v0-6/RendererModules/OpenGLGUIRenderer/GLEW/GL/
    cegui_mk2/branches/v0-6/RendererModules/OpenGLGUIRenderer/GLEW/GL/glew.h
    cegui_mk2/branches/v0-6/RendererModules/OpenGLGUIRenderer/GLEW/GL/glxew.h
    cegui_mk2/branches/v0-6/RendererModules/OpenGLGUIRenderer/GLEW/GL/wglew.h
    cegui_mk2/branches/v0-6/RendererModules/OpenGLGUIRenderer/GLEW/GLEW-LICENSE
    cegui_mk2/branches/v0-6/RendererModules/OpenGLGUIRenderer/GLEW/src/
    cegui_mk2/branches/v0-6/RendererModules/OpenGLGUIRenderer/GLEW/src/glew.c

Modified: cegui_mk2/branches/v0-6/README
===================================================================
--- cegui_mk2/branches/v0-6/README	2008-06-05 12:02:57 UTC (rev 1734)
+++ cegui_mk2/branches/v0-6/README	2008-06-07 16:04:08 UTC (rev 1735)
@@ -1,7 +1,7 @@
 Crazy Eddie's GUI System Mk-2
 http://www.cegui.org.uk
 
-Copyright \xA92004 - 2005 CEGUI Team & Contributing Authors
+Copyright �2004 - 2008 CEGUI Team & Contributing Authors
 
 This sofware uses the PCRE library by Philip Hazel.
 PCRE is Copyright (c) 1997-2004 University of Cambridge, All rights reserved.
@@ -15,11 +15,17 @@
 rendering support.  Freetype2 is a free, high-quality, and portable font engine;
 see http://www.freetype.org for more information.
 
-This software can be compiled to optionally contain embedded copies of Lua and
-tolua++.  Please see the files luaCOPYRIGHT and tolua++README in the directory
+This software can be compiled to optionally contain an embedded copy of tolua++.
+Please see the file tolua++README in the directory
 ./ScriptingModules/CEGUILua/lua_and_tolua++/ for additional licensing that may
-apply to the use of these libraries.
+apply to the use of this library.
 
+This software can be compiled in such a way that certain components contain an
+embedded copy of the OpenGL Extension Wrangler (GLEW) library.  Please see the
+file GLEW-LICENSE in the directory RendererModules/OpenGLGUIRenderer/GLEW for
+additional licensing that may apply to the use of this library.
+
+
 This is Crazy Eddie's GUI System Mk-2; a free library providing windowing and
 widgets for graphics APIs and engines where such functionality is not natively
 available or is severely lacking. The library is written in C++, is object
@@ -50,7 +56,8 @@
 following systems:
 
 *Various flavors of Linux using gcc.
-*Microsoft Windows running VC++7.0 up and until VC++9, both 'express' and 'professional' versions.
+*Microsoft Windows running VC++7.0 up and until VC++9, both 'express' and
+ 'professional' versions.
 *Apple Mac OS X running Xcode. (out of sync - we need a maintainer)
 
 It is very possible that the system will compile and run on other systems and

Added: cegui_mk2/branches/v0-6/RendererModules/OpenGLGUIRenderer/GLEW/GL/glew.h
===================================================================
--- cegui_mk2/branches/v0-6/RendererModules/OpenGLGUIRenderer/GLEW/GL/glew.h	                        (rev 0)
+++ cegui_mk2/branches/v0-6/RendererModules/OpenGLGUIRenderer/GLEW/GL/glew.h	2008-06-07 16:04:08 UTC (rev 1735)
@@ -0,0 +1,10716 @@
+/*
+** The OpenGL Extension Wrangler Library
+** Copyright (C) 2002-2007, Milan Ikits <milan ikits[]ieee org>
+** Copyright (C) 2002-2007, Marcelo E. Magallon <mmagallo[]debian org>
+** Copyright (C) 2002, Lev Povalahev
+** All rights reserved.
+**
+** Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are met:
+**
+** * Redistributions of source code must retain the above copyright notice,
+**   this list of conditions and the following disclaimer.
+** * Redistributions in binary form must reproduce the above copyright notice,
+**   this list of conditions and the following disclaimer in the documentation
+**   and/or other materials provided with the distribution.
+** * The name of the author may be used to endorse or promote products
+**   derived from this software without specific prior written permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+** ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+** LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+** CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+** SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+** INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+** CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+** ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+** THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+/*
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 1.1 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+**
+** http://oss.sgi.com/projects/FreeB
+**
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+**
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+**
+** Additional Notice Provisions: This software was created using the
+** OpenGL(R) version 1.2.1 Sample Implementation published by SGI, but has
+** not been independently verified as being compliant with the OpenGL(R)
+** version 1.2.1 Specification.
+*/
+
+#ifndef __glew_h__
+#define __glew_h__
+#define __GLEW_H__
+
+#if defined(__gl_h_) || defined(__GL_H__)
+#error gl.h included before glew.h
+#endif
+#if defined(__glext_h_) || defined(__GLEXT_H_)
+#error glext.h included before glew.h
+#endif
+#if defined(__gl_ATI_h_)
+#error glATI.h included before glew.h
+#endif
+
+#define __gl_h_
+#define __GL_H__
+#define __glext_h_
+#define __GLEXT_H_
+#define __gl_ATI_h_
+
+#if defined(_WIN32)
+
+/*
+ * GLEW does not include <windows.h> to avoid name space pollution.
+ * GL needs GLAPI and GLAPIENTRY, GLU needs APIENTRY, CALLBACK, and wchar_t
+ * defined properly.
+ */
+/* <windef.h> */
+#ifndef APIENTRY
+#define GLEW_APIENTRY_DEFINED
+#  if defined(__MINGW32__)
+#    define APIENTRY __stdcall
+#  elif (_MSC_VER >= 800) || defined(_STDCALL_SUPPORTED) || defined(__BORLANDC__)
+#    define APIENTRY __stdcall
+#  else
+#    define APIENTRY
+#  endif
+#endif
+#ifndef GLAPI
+#  if defined(__MINGW32__)
+#    define GLAPI extern
+#  endif
+#endif
+/* <winnt.h> */
+#ifndef CALLBACK
+#define GLEW_CALLBACK_DEFINED
+#  if defined(__MINGW32__)
+#    define CALLBACK __attribute__ ((__stdcall__))
+#  elif (defined(_M_MRX000) || defined(_M_IX86) || defined(_M_ALPHA) || defined(_M_PPC)) && !defined(MIDL_PASS)
+#    define CALLBACK __stdcall
+#  else
+#    define CALLBACK
+#  endif
+#endif
+/* <wingdi.h> and <winnt.h> */
+#ifndef WINGDIAPI
+#define GLEW_WINGDIAPI_DEFINED
+#define WINGDIAPI __declspec(dllimport)
+#endif
+/* <ctype.h> */
+#if (defined(_MSC_VER) || defined(__BORLANDC__)) && !defined(_WCHAR_T_DEFINED)
+typedef unsigned short wchar_t;
+#  define _WCHAR_T_DEFINED
+#endif
+/* <stddef.h> */
+#if !defined(_W64)
+#  if !defined(__midl) && (defined(_X86_) || defined(_M_IX86)) && _MSC_VER >= 1300
+#    define _W64 __w64
+#  else
+#    define _W64
+#  endif
+#endif
+#if !defined(_PTRDIFF_T_DEFINED) && !defined(_PTRDIFF_T_)
+#  ifdef _WIN64
+typedef __int64 ptrdiff_t;
+#  else
+typedef _W64 int ptrdiff_t;
+#  endif
+#  define _PTRDIFF_T_DEFINED
+#  define _PTRDIFF_T_
+#endif
+
+#ifndef GLAPI
+#  if defined(__MINGW32__)
+#    define GLAPI extern
+#  else
+#    define GLAPI WINGDIAPI
+#  endif
+#endif
+
+#ifndef GLAPIENTRY
+#define GLAPIENTRY APIENTRY
+#endif
+
+/*
+ * GLEW_STATIC needs to be set when using the static version.
+ * GLEW_BUILD is set when building the DLL version.
+ */
+#ifdef GLEW_STATIC
+#  define GLEWAPI extern
+#else
+#  ifdef GLEW_BUILD
+#    define GLEWAPI extern __declspec(dllexport)
+#  else
+#    define GLEWAPI extern __declspec(dllimport)
+#  endif
+#endif
+
+#else /* _UNIX */
+
+/*
+ * Needed for ptrdiff_t in turn needed by VBO.  This is defined by ISO
+ * C.  On my system, this amounts to _3 lines_ of included code, all of
+ * them pretty much harmless.  If you know of a way of detecting 32 vs
+ * 64 _targets_ at compile time you are free to replace this with
+ * something that's portable.  For now, _this_ is the portable solution.
+ * (mem, 2004-01-04)
+ */
+
+#include <stddef.h>
+
+#define GLEW_APIENTRY_DEFINED
+#define APIENTRY
+#define GLEWAPI extern
+
+/* <glu.h> */
+#ifndef GLAPI
+#define GLAPI extern
+#endif
+#ifndef GLAPIENTRY
+#define GLAPIENTRY
+#endif
+
+#endif /* _WIN32 */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* ----------------------------- GL_VERSION_1_1 ---------------------------- */
+
+#ifndef GL_VERSION_1_1
+#define GL_VERSION_1_1 1
+
+#if defined(__APPLE__)
+typedef unsigned long GLenum;
+typedef unsigned long GLbitfield;
+typedef unsigned long GLuint;
+typedef long GLint;
+typedef long GLsizei;
+#else
+typedef unsigned int GLenum;
+typedef unsigned int GLbitfield;
+typedef unsigned int GLuint;
+typedef int GLint;
+typedef int GLsizei;
+#endif
+typedef unsigned char GLboolean;
+typedef signed char GLbyte;
+typedef short GLshort;
+typedef unsigned char GLubyte;
+typedef unsigned short GLushort;
+typedef float GLfloat;
+typedef float GLclampf;
+typedef double GLdouble;
+typedef double GLclampd;
+typedef void GLvoid;
+#if defined(_MSC_VER) && _MSC_VER < 1310
+#  ifdef _WIN64
+typedef __int64 GLint64EXT;
+typedef unsigned __int64 GLuint64EXT;
+#  else
+typedef _W64 int GLint64EXT;
+typedef _W64 unsigned int GLuint64EXT;
+#  endif
+#else
+typedef signed long long GLint64EXT;
+typedef unsigned long long GLuint64EXT;
+#endif
+
+#define GL_ACCUM 0x0100
+#define GL_LOAD 0x0101
+#define GL_RETURN 0x0102
+#define GL_MULT 0x0103
+#define GL_ADD 0x0104
+#define GL_NEVER 0x0200
+#define GL_LESS 0x0201
+#define GL_EQUAL 0x0202
+#define GL_LEQUAL 0x0203
+#define GL_GREATER 0x0204
+#define GL_NOTEQUAL 0x0205
+#define GL_GEQUAL 0x0206
+#define GL_ALWAYS 0x0207
+#define GL_CURRENT_BIT 0x00000001
+#define GL_POINT_BIT 0x00000002
+#define GL_LINE_BIT 0x00000004
+#define GL_POLYGON_BIT 0x00000008
+#define GL_POLYGON_STIPPLE_BIT 0x00000010
+#define GL_PIXEL_MODE_BIT 0x00000020
+#define GL_LIGHTING_BIT 0x00000040
+#define GL_FOG_BIT 0x00000080
+#define GL_DEPTH_BUFFER_BIT 0x00000100
+#define GL_ACCUM_BUFFER_BIT 0x00000200
+#define GL_STENCIL_BUFFER_BIT 0x00000400
+#define GL_VIEWPORT_BIT 0x00000800
+#define GL_TRANSFORM_BIT 0x00001000
+#define GL_ENABLE_BIT 0x00002000
+#define GL_COLOR_BUFFER_BIT 0x00004000
+#define GL_HINT_BIT 0x00008000
+#define GL_EVAL_BIT 0x00010000
+#define GL_LIST_BIT 0x00020000
+#define GL_TEXTURE_BIT 0x00040000
+#define GL_SCISSOR_BIT 0x00080000
+#define GL_ALL_ATTRIB_BITS 0x000fffff
+#define GL_POINTS 0x0000
+#define GL_LINES 0x0001
+#define GL_LINE_LOOP 0x0002
+#define GL_LINE_STRIP 0x0003
+#define GL_TRIANGLES 0x0004
+#define GL_TRIANGLE_STRIP 0x0005
+#define GL_TRIANGLE_FAN 0x0006
+#define GL_QUADS 0x0007
+#define GL_QUAD_STRIP 0x0008
+#define GL_POLYGON 0x0009
+#define GL_ZERO 0
+#define GL_ONE 1
+#define GL_SRC_COLOR 0x0300
+#define GL_ONE_MINUS_SRC_COLOR 0x0301
+#define GL_SRC_ALPHA 0x0302
+#define GL_ONE_MINUS_SRC_ALPHA 0x0303
+#define GL_DST_ALPHA 0x0304
+#define GL_ONE_MINUS_DST_ALPHA 0x0305
+#define GL_DST_COLOR 0x0306
+#define GL_ONE_MINUS_DST_COLOR 0x0307
+#define GL_SRC_ALPHA_SATURATE 0x0308
+#define GL_TRUE 1
+#define GL_FALSE 0
+#define GL_CLIP_PLANE0 0x3000
+#define GL_CLIP_PLANE1 0x3001
+#define GL_CLIP_PLANE2 0x3002
+#define GL_CLIP_PLANE3 0x3003
+#define GL_CLIP_PLANE4 0x3004
+#define GL_CLIP_PLANE5 0x3005
+#define GL_BYTE 0x1400
+#define GL_UNSIGNED_BYTE 0x1401
+#define GL_SHORT 0x1402
+#define GL_UNSIGNED_SHORT 0x1403
+#define GL_INT 0x1404
+#define GL_UNSIGNED_INT 0x1405
+#define GL_FLOAT 0x1406
+#define GL_2_BYTES 0x1407
+#define GL_3_BYTES 0x1408
+#define GL_4_BYTES 0x1409
+#define GL_DOUBLE 0x140A
+#define GL_NONE 0
+#define GL_FRONT_LEFT 0x0400
+#define GL_FRONT_RIGHT 0x0401
+#define GL_BACK_LEFT 0x0402
+#define GL_BACK_RIGHT 0x0403
+#define GL_FRONT 0x0404
+#define GL_BACK 0x0405
+#define GL_LEFT 0x0406
+#define GL_RIGHT 0x0407
+#define GL_FRONT_AND_BACK 0x0408
+#define GL_AUX0 0x0409
+#define GL_AUX1 0x040A
+#define GL_AUX2 0x040B
+#define GL_AUX3 0x040C
+#define GL_NO_ERROR 0
+#define GL_INVALID_ENUM 0x0500
+#define GL_INVALID_VALUE 0x0501
+#define GL_INVALID_OPERATION 0x0502
+#define GL_STACK_OVERFLOW 0x0503
+#define GL_STACK_UNDERFLOW 0x0504
+#define GL_OUT_OF_MEMORY 0x0505
+#define GL_2D 0x0600
+#define GL_3D 0x0601
+#define GL_3D_COLOR 0x0602
+#define GL_3D_COLOR_TEXTURE 0x0603
+#define GL_4D_COLOR_TEXTURE 0x0604
+#define GL_PASS_THROUGH_TOKEN 0x0700
+#define GL_POINT_TOKEN 0x0701
+#define GL_LINE_TOKEN 0x0702
+#define GL_POLYGON_TOKEN 0x0703
+#define GL_BITMAP_TOKEN 0x0704
+#define GL_DRAW_PIXEL_TOKEN 0x0705
+#define GL_COPY_PIXEL_TOKEN 0x0706
+#define GL_LINE_RESET_TOKEN 0x0707
+#define GL_EXP 0x0800
+#define GL_EXP2 0x0801
+#define GL_CW 0x0900
+#define GL_CCW 0x0901
+#define GL_COEFF 0x0A00
+#define GL_ORDER 0x0A01
+#define GL_DOMAIN 0x0A02
+#define GL_CURRENT_COLOR 0x0B00
+#define GL_CURRENT_INDEX 0x0B01
+#define GL_CURRENT_NORMAL 0x0B02
+#define GL_CURRENT_TEXTURE_COORDS 0x0B03
+#define GL_CURRENT_RASTER_COLOR 0x0B04
+#define GL_CURRENT_RASTER_INDEX 0x0B05
+#define GL_CURRENT_RASTER_TEXTURE_COORDS 0x0B06
+#define GL_CURRENT_RASTER_POSITION 0x0B07
+#define GL_CURRENT_RASTER_POSITION_VALID 0x0B08
+#define GL_CURRENT_RASTER_DISTANCE 0x0B09
+#define GL_POINT_SMOOTH 0x0B10
+#define GL_POINT_SIZE 0x0B11
+#define GL_POINT_SIZE_RANGE 0x0B12
+#define GL_POINT_SIZE_GRANULARITY 0x0B13
+#define GL_LINE_SMOOTH 0x0B20
+#define GL_LINE_WIDTH 0x0B21
+#define GL_LINE_WIDTH_RANGE 0x0B22
+#define GL_LINE_WIDTH_GRANULARITY 0x0B23
+#define GL_LINE_STIPPLE 0x0B24
+#define GL_LINE_STIPPLE_PATTERN 0x0B25
+#define GL_LINE_STIPPLE_REPEAT 0x0B26
+#define GL_LIST_MODE 0x0B30
+#define GL_MAX_LIST_NESTING 0x0B31
+#define GL_LIST_BASE 0x0B32
+#define GL_LIST_INDEX 0x0B33
+#define GL_POLYGON_MODE 0x0B40
+#define GL_POLYGON_SMOOTH 0x0B41
+#define GL_POLYGON_STIPPLE 0x0B42
+#define GL_EDGE_FLAG 0x0B43
+#define GL_CULL_FACE 0x0B44
+#define GL_CULL_FACE_MODE 0x0B45
+#define GL_FRONT_FACE 0x0B46
+#define GL_LIGHTING 0x0B50
+#define GL_LIGHT_MODEL_LOCAL_VIEWER 0x0B51
+#define GL_LIGHT_MODEL_TWO_SIDE 0x0B52
+#define GL_LIGHT_MODEL_AMBIENT 0x0B53
+#define GL_SHADE_MODEL 0x0B54
+#define GL_COLOR_MATERIAL_FACE 0x0B55
+#define GL_COLOR_MATERIAL_PARAMETER 0x0B56
+#define GL_COLOR_MATERIAL 0x0B57
+#define GL_FOG 0x0B60
+#define GL_FOG_INDEX 0x0B61
+#define GL_FOG_DENSITY 0x0B62
+#define GL_FOG_START 0x0B63
+#define GL_FOG_END 0x0B64
+#define GL_FOG_MODE 0x0B65
+#define GL_FOG_COLOR 0x0B66
+#define GL_DEPTH_RANGE 0x0B70
+#define GL_DEPTH_TEST 0x0B71
+#define GL_DEPTH_WRITEMASK 0x0B72
+#define GL_DEPTH_CLEAR_VALUE 0x0B73
+#define GL_DEPTH_FUNC 0x0B74
+#define GL_ACCUM_CLEAR_VALUE 0x0B80
+#define GL_STENCIL_TEST 0x0B90
+#define GL_STENCIL_CLEAR_VALUE 0x0B91
+#define GL_STENCIL_FUNC 0x0B92
+#define GL_STENCIL_VALUE_MASK 0x0B93
+#define GL_STENCIL_FAIL 0x0B94
+#define GL_STENCIL_PASS_DEPTH_FAIL 0x0B95
+#define GL_STENCIL_PASS_DEPTH_PASS 0x0B96
+#define GL_STENCIL_REF 0x0B97
+#define GL_STENCIL_WRITEMASK 0x0B98
+#define GL_MATRIX_MODE 0x0BA0
+#define GL_NORMALIZE 0x0BA1
+#define GL_VIEWPORT 0x0BA2
+#define GL_MODELVIEW_STACK_DEPTH 0x0BA3
+#define GL_PROJECTION_STACK_DEPTH 0x0BA4
+#define GL_TEXTURE_STACK_DEPTH 0x0BA5
+#define GL_MODELVIEW_MATRIX 0x0BA6
+#define GL_PROJECTION_MATRIX 0x0BA7
+#define GL_TEXTURE_MATRIX 0x0BA8
+#define GL_ATTRIB_STACK_DEPTH 0x0BB0
+#define GL_CLIENT_ATTRIB_STACK_DEPTH 0x0BB1
+#define GL_ALPHA_TEST 0x0BC0
+#define GL_ALPHA_TEST_FUNC 0x0BC1
+#define GL_ALPHA_TEST_REF 0x0BC2
+#define GL_DITHER 0x0BD0
+#define GL_BLEND_DST 0x0BE0
+#define GL_BLEND_SRC 0x0BE1
+#define GL_BLEND 0x0BE2
+#define GL_LOGIC_OP_MODE 0x0BF0
+#define GL_INDEX_LOGIC_OP 0x0BF1
+#define GL_COLOR_LOGIC_OP 0x0BF2
+#define GL_AUX_BUFFERS 0x0C00
+#define GL_DRAW_BUFFER 0x0C01
+#define GL_READ_BUFFER 0x0C02
+#define GL_SCISSOR_BOX 0x0C10
+#define GL_SCISSOR_TEST 0x0C11
+#define GL_INDEX_CLEAR_VALUE 0x0C20
+#define GL_INDEX_WRITEMASK 0x0C21
+#define GL_COLOR_CLEAR_VALUE 0x0C22
+#define GL_COLOR_WRITEMASK 0x0C23
+#define GL_INDEX_MODE 0x0C30
+#define GL_RGBA_MODE 0x0C31
+#define GL_DOUBLEBUFFER 0x0C32
+#define GL_STEREO 0x0C33
+#define GL_RENDER_MODE 0x0C40
+#define GL_PERSPECTIVE_CORRECTION_HINT 0x0C50
+#define GL_POINT_SMOOTH_HINT 0x0C51
+#define GL_LINE_SMOOTH_HINT 0x0C52
+#define GL_POLYGON_SMOOTH_HINT 0x0C53
+#define GL_FOG_HINT 0x0C54
+#define GL_TEXTURE_GEN_S 0x0C60
+#define GL_TEXTURE_GEN_T 0x0C61
+#define GL_TEXTURE_GEN_R 0x0C62
+#define GL_TEXTURE_GEN_Q 0x0C63
+#define GL_PIXEL_MAP_I_TO_I 0x0C70
+#define GL_PIXEL_MAP_S_TO_S 0x0C71
+#define GL_PIXEL_MAP_I_TO_R 0x0C72
+#define GL_PIXEL_MAP_I_TO_G 0x0C73
+#define GL_PIXEL_MAP_I_TO_B 0x0C74
+#define GL_PIXEL_MAP_I_TO_A 0x0C75
+#define GL_PIXEL_MAP_R_TO_R 0x0C76
+#define GL_PIXEL_MAP_G_TO_G 0x0C77
+#define GL_PIXEL_MAP_B_TO_B 0x0C78
+#define GL_PIXEL_MAP_A_TO_A 0x0C79
+#define GL_PIXEL_MAP_I_TO_I_SIZE 0x0CB0
+#define GL_PIXEL_MAP_S_TO_S_SIZE 0x0CB1
+#define GL_PIXEL_MAP_I_TO_R_SIZE 0x0CB2
+#define GL_PIXEL_MAP_I_TO_G_SIZE 0x0CB3
+#define GL_PIXEL_MAP_I_TO_B_SIZE 0x0CB4
+#define GL_PIXEL_MAP_I_TO_A_SIZE 0x0CB5
+#define GL_PIXEL_MAP_R_TO_R_SIZE 0x0CB6
+#define GL_PIXEL_MAP_G_TO_G_SIZE 0x0CB7
+#define GL_PIXEL_MAP_B_TO_B_SIZE 0x0CB8
+#define GL_PIXEL_MAP_A_TO_A_SIZE 0x0CB9
+#define GL_UNPACK_SWAP_BYTES 0x0CF0
+#define GL_UNPACK_LSB_FIRST 0x0CF1
+#define GL_UNPACK_ROW_LENGTH 0x0CF2
+#define GL_UNPACK_SKIP_ROWS 0x0CF3
+#define GL_UNPACK_SKIP_PIXELS 0x0CF4
+#define GL_UNPACK_ALIGNMENT 0x0CF5
+#define GL_PACK_SWAP_BYTES 0x0D00
+#define GL_PACK_LSB_FIRST 0x0D01
+#define GL_PACK_ROW_LENGTH 0x0D02
+#define GL_PACK_SKIP_ROWS 0x0D03
+#define GL_PACK_SKIP_PIXELS 0x0D04
+#define GL_PACK_ALIGNMENT 0x0D05
+#define GL_MAP_COLOR 0x0D10
+#define GL_MAP_STENCIL 0x0D11
+#define GL_INDEX_SHIFT 0x0D12
+#define GL_INDEX_OFFSET 0x0D13
+#define GL_RED_SCALE 0x0D14
+#define GL_RED_BIAS 0x0D15
+#define GL_ZOOM_X 0x0D16
+#define GL_ZOOM_Y 0x0D17
+#define GL_GREEN_SCALE 0x0D18
+#define GL_GREEN_BIAS 0x0D19
+#define GL_BLUE_SCALE 0x0D1A
+#define GL_BLUE_BIAS 0x0D1B
+#define GL_ALPHA_SCALE 0x0D1C
+#define GL_ALPHA_BIAS 0x0D1D
+#define GL_DEPTH_SCALE 0x0D1E
+#define GL_DEPTH_BIAS 0x0D1F
+#define GL_MAX_EVAL_ORDER 0x0D30
+#define GL_MAX_LIGHTS 0x0D31
+#define GL_MAX_CLIP_PLANES 0x0D32
+#define GL_MAX_TEXTURE_SIZE 0x0D33
+#define GL_MAX_PIXEL_MAP_TABLE 0x0D34
+#define GL_MAX_ATTRIB_STACK_DEPTH 0x0D35
+#define GL_MAX_MODELVIEW_STACK_DEPTH 0x0D36
+#define GL_MAX_NAME_STACK_DEPTH 0x0D37
+#define GL_MAX_PROJECTION_STACK_DEPTH 0x0D38
+#define GL_MAX_TEXTURE_STACK_DEPTH 0x0D39
+#define GL_MAX_VIEWPORT_DIMS 0x0D3A
+#define GL_MAX_CLIENT_ATTRIB_STACK_DEPTH 0x0D3B
+#define GL_SUBPIXEL_BITS 0x0D50
+#define GL_INDEX_BITS 0x0D51
+#define GL_RED_BITS 0x0D52
+#define GL_GREEN_BITS 0x0D53
+#define GL_BLUE_BITS 0x0D54
+#define GL_ALPHA_BITS 0x0D55
+#define GL_DEPTH_BITS 0x0D56
+#define GL_STENCIL_BITS 0x0D57
+#define GL_ACCUM_RED_BITS 0x0D58
+#define GL_ACCUM_GREEN_BITS 0x0D59
+#define GL_ACCUM_BLUE_BITS 0x0D5A
+#define GL_ACCUM_ALPHA_BITS 0x0D5B
+#define GL_NAME_STACK_DEPTH 0x0D70
+#define GL_AUTO_NORMAL 0x0D80
+#define GL_MAP1_COLOR_4 0x0D90
+#define GL_MAP1_INDEX 0x0D91
+#define GL_MAP1_NORMAL 0x0D92
+#define GL_MAP1_TEXTURE_COORD_1 0x0D93
+#define GL_MAP1_TEXTURE_COORD_2 0x0D94
+#define GL_MAP1_TEXTURE_COORD_3 0x0D95
+#define GL_MAP1_TEXTURE_COORD_4 0x0D96
+#define GL_MAP1_VERTEX_3 0x0D97
+#define GL_MAP1_VERTEX_4 0x0D98
+#define GL_MAP2_COLOR_4 0x0DB0
+#define GL_MAP2_INDEX 0x0DB1
+#define GL_MAP2_NORMAL 0x0DB2
+#define GL_MAP2_TEXTURE_COORD_1 0x0DB3
+#define GL_MAP2_TEXTURE_COORD_2 0x0DB4
+#define GL_MAP2_TEXTURE_COORD_3 0x0DB5
+#define GL_MAP2_TEXTURE_COORD_4 0x0DB6
+#define GL_MAP2_VERTEX_3 0x0DB7
+#define GL_MAP2_VERTEX_4 0x0DB8
+#define GL_MAP1_GRID_DOMAIN 0x0DD0
+#define GL_MAP1_GRID_SEGMENTS 0x0DD1
+#define GL_MAP2_GRID_DOMAIN 0x0DD2
+#define GL_MAP2_GRID_SEGMENTS 0x0DD3
+#define GL_TEXTURE_1D 0x0DE0
+#define GL_TEXTURE_2D 0x0DE1
+#define GL_FEEDBACK_BUFFER_POINTER 0x0DF0
+#define GL_FEEDBACK_BUFFER_SIZE 0x0DF1
+#define GL_FEEDBACK_BUFFER_TYPE 0x0DF2
+#define GL_SELECTION_BUFFER_POINTER 0x0DF3
+#define GL_SELECTION_BUFFER_SIZE 0x0DF4
+#define GL_TEXTURE_WIDTH 0x1000
+#define GL_TEXTURE_HEIGHT 0x1001
+#define GL_TEXTURE_INTERNAL_FORMAT 0x1003
+#define GL_TEXTURE_BORDER_COLOR 0x1004
+#define GL_TEXTURE_BORDER 0x1005
+#define GL_DONT_CARE 0x1100
+#define GL_FASTEST 0x1101
+#define GL_NICEST 0x1102
+#define GL_LIGHT0 0x4000
+#define GL_LIGHT1 0x4001
+#define GL_LIGHT2 0x4002
+#define GL_LIGHT3 0x4003
+#define GL_LIGHT4 0x4004
+#define GL_LIGHT5 0x4005
+#define GL_LIGHT6 0x4006
+#define GL_LIGHT7 0x4007
+#define GL_AMBIENT 0x1200
+#define GL_DIFFUSE 0x1201
+#define GL_SPECULAR 0x1202
+#define GL_POSITION 0x1203
+#define GL_SPOT_DIRECTION 0x1204
+#define GL_SPOT_EXPONENT 0x1205
+#define GL_SPOT_CUTOFF 0x1206
+#define GL_CONSTANT_ATTENUATION 0x1207
+#define GL_LINEAR_ATTENUATION 0x1208
+#define GL_QUADRATIC_ATTENUATION 0x1209
+#define GL_COMPILE 0x1300
+#define GL_COMPILE_AND_EXECUTE 0x1301
+#define GL_CLEAR 0x1500
+#define GL_AND 0x1501
+#define GL_AND_REVERSE 0x1502
+#define GL_COPY 0x1503
+#define GL_AND_INVERTED 0x1504
+#define GL_NOOP 0x1505
+#define GL_XOR 0x1506
+#define GL_OR 0x1507
+#define GL_NOR 0x1508
+#define GL_EQUIV 0x1509
+#define GL_INVERT 0x150A
+#define GL_OR_REVERSE 0x150B
+#define GL_COPY_INVERTED 0x150C
+#define GL_OR_INVERTED 0x150D
+#define GL_NAND 0x150E
+#define GL_SET 0x150F
+#define GL_EMISSION 0x1600
+#define GL_SHININESS 0x1601
+#define GL_AMBIENT_AND_DIFFUSE 0x1602
+#define GL_COLOR_INDEXES 0x1603
+#define GL_MODELVIEW 0x1700
+#define GL_PROJECTION 0x1701
+#define GL_TEXTURE 0x1702
+#define GL_COLOR 0x1800
+#define GL_DEPTH 0x1801
+#define GL_STENCIL 0x1802
+#define GL_COLOR_INDEX 0x1900
+#define GL_STENCIL_INDEX 0x1901
+#define GL_DEPTH_COMPONENT 0x1902
+#define GL_RED 0x1903
+#define GL_GREEN 0x1904
+#define GL_BLUE 0x1905
+#define GL_ALPHA 0x1906
+#define GL_RGB 0x1907
+#define GL_RGBA 0x1908
+#define GL_LUMINANCE 0x1909
+#define GL_LUMINANCE_ALPHA 0x190A
+#define GL_BITMAP 0x1A00
+#define GL_POINT 0x1B00
+#define GL_LINE 0x1B01
+#define GL_FILL 0x1B02
+#define GL_RENDER 0x1C00
+#define GL_FEEDBACK 0x1C01
+#define GL_SELECT 0x1C02
+#define GL_FLAT 0x1D00
+#define GL_SMOOTH 0x1D01
+#define GL_KEEP 0x1E00
+#define GL_REPLACE 0x1E01
+#define GL_INCR 0x1E02
+#define GL_DECR 0x1E03
+#define GL_VENDOR 0x1F00
+#define GL_RENDERER 0x1F01
+#define GL_VERSION 0x1F02
+#define GL_EXTENSIONS 0x1F03
+#define GL_S 0x2000
+#define GL_T 0x2001
+#define GL_R 0x2002
+#define GL_Q 0x2003
+#define GL_MODULATE 0x2100
+#define GL_DECAL 0x2101
+#define GL_TEXTURE_ENV_MODE 0x2200
+#define GL_TEXTURE_ENV_COLOR 0x2201
+#define GL_TEXTURE_ENV 0x2300
+#define GL_EYE_LINEAR 0x2400
+#define GL_OBJECT_LINEAR 0x2401
+#define GL_SPHERE_MAP 0x2402
+#define GL_TEXTURE_GEN_MODE 0x2500
+#define GL_OBJECT_PLANE 0x2501
+#define GL_EYE_PLANE 0x2502
+#define GL_NEAREST 0x2600
+#define GL_LINEAR 0x2601
+#define GL_NEAREST_MIPMAP_NEAREST 0x2700
+#define GL_LINEAR_MIPMAP_NEAREST 0x2701
+#define GL_NEAREST_MIPMAP_LINEAR 0x2702
+#define GL_LINEAR_MIPMAP_LINEAR 0x2703
+#define GL_TEXTURE_MAG_FILTER 0x2800
+#define GL_TEXTURE_MIN_FILTER 0x2801
+#define GL_TEXTURE_WRAP_S 0x2802
+#define GL_TEXTURE_WRAP_T 0x2803
+#define GL_CLAMP 0x2900
+#define GL_REPEAT 0x2901
+#define GL_CLIENT_PIXEL_STORE_BIT 0x00000001
+#define GL_CLIENT_VERTEX_ARRAY_BIT 0x00000002
+#define GL_CLIENT_ALL_ATTRIB_BITS 0xffffffff
+#define GL_POLYGON_OFFSET_FACTOR 0x8038
+#define GL_POLYGON_OFFSET_UNITS 0x2A00
+#define GL_POLYGON_OFFSET_POINT 0x2A01
+#define GL_POLYGON_OFFSET_LINE 0x2A02
+#define GL_POLYGON_OFFSET_FILL 0x8037
+#define GL_ALPHA4 0x803B
+#define GL_ALPHA8 0x803C
+#define GL_ALPHA12 0x803D
+#define GL_ALPHA16 0x803E
+#define GL_LUMINANCE4 0x803F
+#define GL_LUMINANCE8 0x8040
+#define GL_LUMINANCE12 0x8041
+#define GL_LUMINANCE16 0x8042
+#define GL_LUMINANCE4_ALPHA4 0x8043
+#define GL_LUMINANCE6_ALPHA2 0x8044
+#define GL_LUMINANCE8_ALPHA8 0x8045
+#define GL_LUMINANCE12_ALPHA4 0x8046
+#define GL_LUMINANCE12_ALPHA12 0x8047
+#define GL_LUMINANCE16_ALPHA16 0x8048
+#define GL_INTENSITY 0x8049
+#define GL_INTENSITY4 0x804A
+#define GL_INTENSITY8 0x804B
+#define GL_INTENSITY12 0x804C
+#define GL_INTENSITY16 0x804D
+#define GL_R3_G3_B2 0x2A10
+#define GL_RGB4 0x804F
+#define GL_RGB5 0x8050
+#define GL_RGB8 0x8051
+#define GL_RGB10 0x8052
+#define GL_RGB12 0x8053
+#define GL_RGB16 0x8054
+#define GL_RGBA2 0x8055
+#define GL_RGBA4 0x8056
+#define GL_RGB5_A1 0x8057
+#define GL_RGBA8 0x8058
+#define GL_RGB10_A2 0x8059
+#define GL_RGBA12 0x805A
+#define GL_RGBA16 0x805B
+#define GL_TEXTURE_RED_SIZE 0x805C
+#define GL_TEXTURE_GREEN_SIZE 0x805D
+#define GL_TEXTURE_BLUE_SIZE 0x805E
+#define GL_TEXTURE_ALPHA_SIZE 0x805F
+#define GL_TEXTURE_LUMINANCE_SIZE 0x8060
+#define GL_TEXTURE_INTENSITY_SIZE 0x8061
+#define GL_PROXY_TEXTURE_1D 0x8063
+#define GL_PROXY_TEXTURE_2D 0x8064
+#define GL_TEXTURE_PRIORITY 0x8066
+#define GL_TEXTURE_RESIDENT 0x8067
+#define GL_TEXTURE_BINDING_1D 0x8068
+#define GL_TEXTURE_BINDING_2D 0x8069
+#define GL_VERTEX_ARRAY 0x8074
+#define GL_NORMAL_ARRAY 0x8075
+#define GL_COLOR_ARRAY 0x8076
+#define GL_INDEX_ARRAY 0x8077
+#define GL_TEXTURE_COORD_ARRAY 0x8078
+#define GL_EDGE_FLAG_ARRAY 0x8079
+#define GL_VERTEX_ARRAY_SIZE 0x807A
+#define GL_VERTEX_ARRAY_TYPE 0x807B
+#define GL_VERTEX_ARRAY_STRIDE 0x807C
+#define GL_NORMAL_ARRAY_TYPE 0x807E
+#define GL_NORMAL_ARRAY_STRIDE 0x807F
+#define GL_COLOR_ARRAY_SIZE 0x8081
+#define GL_COLOR_ARRAY_TYPE 0x8082
+#define GL_COLOR_ARRAY_STRIDE 0x8083
+#define GL_INDEX_ARRAY_TYPE 0x8085
+#define GL_INDEX_ARRAY_STRIDE 0x8086
+#define GL_TEXTURE_COORD_ARRAY_SIZE 0x8088
+#define GL_TEXTURE_COORD_ARRAY_TYPE 0x8089
+#define GL_TEXTURE_COORD_ARRAY_STRIDE 0x808A
+#define GL_EDGE_FLAG_ARRAY_STRIDE 0x808C
+#define GL_VERTEX_ARRAY_POINTER 0x808E
+#define GL_NORMAL_ARRAY_POINTER 0x808F
+#define GL_COLOR_ARRAY_POINTER 0x8090
+#define GL_INDEX_ARRAY_POINTER 0x8091
+#define GL_TEXTURE_COORD_ARRAY_POINTER 0x8092
+#define GL_EDGE_FLAG_ARRAY_POINTER 0x8093
+#define GL_V2F 0x2A20
+#define GL_V3F 0x2A21
+#define GL_C4UB_V2F 0x2A22
+#define GL_C4UB_V3F 0x2A23
+#define GL_C3F_V3F 0x2A24
+#define GL_N3F_V3F 0x2A25
+#define GL_C4F_N3F_V3F 0x2A26
+#define GL_T2F_V3F 0x2A27
+#define GL_T4F_V4F 0x2A28
+#define GL_T2F_C4UB_V3F 0x2A29
+#define GL_T2F_C3F_V3F 0x2A2A
+#define GL_T2F_N3F_V3F 0x2A2B
+#define GL_T2F_C4F_N3F_V3F 0x2A2C
+#define GL_T4F_C4F_N3F_V4F 0x2A2D
+#define GL_LOGIC_OP GL_INDEX_LOGIC_OP
+#define GL_TEXTURE_COMPONENTS GL_TEXTURE_INTERNAL_FORMAT
+#define GL_COLOR_INDEX1_EXT 0x80E2
+#define GL_COLOR_INDEX2_EXT 0x80E3
+#define GL_COLOR_INDEX4_EXT 0x80E4
+#define GL_COLOR_INDEX8_EXT 0x80E5
+#define GL_COLOR_INDEX12_EXT 0x80E6
+#define GL_COLOR_INDEX16_EXT 0x80E7
+
+GLAPI void GLAPIENTRY glAccum (GLenum op, GLfloat value);
+GLAPI void GLAPIENTRY glAlphaFunc (GLenum func, GLclampf ref);
+GLAPI GLboolean GLAPIENTRY glAreTexturesResident (GLsizei n, const GLuint *textures, GLboolean *residences);
+GLAPI void GLAPIENTRY glArrayElement (GLint i);
+GLAPI void GLAPIENTRY glBegin (GLenum mode);
+GLAPI void GLAPIENTRY glBindTexture (GLenum target, GLuint texture);
+GLAPI void GLAPIENTRY glBitmap (GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove, const GLubyte *bitmap);
+GLAPI void GLAPIENTRY glBlendFunc (GLenum sfactor, GLenum dfactor);
+GLAPI void GLAPIENTRY glCallList (GLuint list);
+GLAPI void GLAPIENTRY glCallLists (GLsizei n, GLenum type, const GLvoid *lists);
+GLAPI void GLAPIENTRY glClear (GLbitfield mask);
+GLAPI void GLAPIENTRY glClearAccum (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
+GLAPI void GLAPIENTRY glClearColor (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
+GLAPI void GLAPIENTRY glClearDepth (GLclampd depth);
+GLAPI void GLAPIENTRY glClearIndex (GLfloat c);
+GLAPI void GLAPIENTRY glClearStencil (GLint s);
+GLAPI void GLAPIENTRY glClipPlane (GLenum plane, const GLdouble *equation);
+GLAPI void GLAPIENTRY glColor3b (GLbyte red, GLbyte green, GLbyte blue);
+GLAPI void GLAPIENTRY glColor3bv (const GLbyte *v);
+GLAPI void GLAPIENTRY glColor3d (GLdouble red, GLdouble green, GLdouble blue);
+GLAPI void GLAPIENTRY glColor3dv (const GLdouble *v);
+GLAPI void GLAPIENTRY glColor3f (GLfloat red, GLfloat green, GLfloat blue);
+GLAPI void GLAPIENTRY glColor3fv (const GLfloat *v);
+GLAPI void GLAPIENTRY glColor3i (GLint red, GLint green, GLint blue);
+GLAPI void GLAPIENTRY glColor3iv (const GLint *v);
+GLAPI void GLAPIENTRY glColor3s (GLshort red, GLshort green, GLshort blue);
+GLAPI void GLAPIENTRY glColor3sv (const GLshort *v);
+GLAPI void GLAPIENTRY glColor3ub (GLubyte red, GLubyte green, GLubyte blue);
+GLAPI void GLAPIENTRY glColor3ubv (const GLubyte *v);
+GLAPI void GLAPIENTRY glColor3ui (GLuint red, GLuint green, GLuint blue);
+GLAPI void GLAPIENTRY glColor3uiv (const GLuint *v);
+GLAPI void GLAPIENTRY glColor3us (GLushort red, GLushort green, GLushort blue);
+GLAPI void GLAPIENTRY glColor3usv (const GLushort *v);
+GLAPI void GLAPIENTRY glColor4b (GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha);
+GLAPI void GLAPIENTRY glColor4bv (const GLbyte *v);
+GLAPI void GLAPIENTRY glColor4d (GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha);
+GLAPI void GLAPIENTRY glColor4dv (const GLdouble *v);
+GLAPI void GLAPIENTRY glColor4f (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
+GLAPI void GLAPIENTRY glColor4fv (const GLfloat *v);
+GLAPI void GLAPIENTRY glColor4i (GLint red, GLint green, GLint blue, GLint alpha);
+GLAPI void GLAPIENTRY glColor4iv (const GLint *v);
+GLAPI void GLAPIENTRY glColor4s (GLshort red, GLshort green, GLshort blue, GLshort alpha);
+GLAPI void GLAPIENTRY glColor4sv (const GLshort *v);
+GLAPI void GLAPIENTRY glColor4ub (GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha);
+GLAPI void GLAPIENTRY glColor4ubv (const GLubyte *v);
+GLAPI void GLAPIENTRY glColor4ui (GLuint red, GLuint green, GLuint blue, GLuint alpha);
+GLAPI void GLAPIENTRY glColor4uiv (const GLuint *v);
+GLAPI void GLAPIENTRY glColor4us (GLushort red, GLushort green, GLushort blue, GLushort alpha);
+GLAPI void GLAPIENTRY glColor4usv (const GLushort *v);
+GLAPI void GLAPIENTRY glColorMask (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
+GLAPI void GLAPIENTRY glColorMaterial (GLenum face, GLenum mode);
+GLAPI void GLAPIENTRY glColorPointer (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+GLAPI void GLAPIENTRY glCopyPixels (GLint x, GLint y, GLsizei width, GLsizei height, GLenum type);
+GLAPI void GLAPIENTRY glCopyTexImage1D (GLenum target, GLint level, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLint border);
+GLAPI void GLAPIENTRY glCopyTexImage2D (GLenum target, GLint level, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+GLAPI void GLAPIENTRY glCopyTexSubImage1D (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+GLAPI void GLAPIENTRY glCopyTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+GLAPI void GLAPIENTRY glCullFace (GLenum mode);
+GLAPI void GLAPIENTRY glDeleteLists (GLuint list, GLsizei range);
+GLAPI void GLAPIENTRY glDeleteTextures (GLsizei n, const GLuint *textures);
+GLAPI void GLAPIENTRY glDepthFunc (GLenum func);
+GLAPI void GLAPIENTRY glDepthMask (GLboolean flag);
+GLAPI void GLAPIENTRY glDepthRange (GLclampd zNear, GLclampd zFar);
+GLAPI void GLAPIENTRY glDisable (GLenum cap);
+GLAPI void GLAPIENTRY glDisableClientState (GLenum array);
+GLAPI void GLAPIENTRY glDrawArrays (GLenum mode, GLint first, GLsizei count);
+GLAPI void GLAPIENTRY glDrawBuffer (GLenum mode);
+GLAPI void GLAPIENTRY glDrawElements (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices);
+GLAPI void GLAPIENTRY glDrawPixels (GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
+GLAPI void GLAPIENTRY glEdgeFlag (GLboolean flag);
+GLAPI void GLAPIENTRY glEdgeFlagPointer (GLsizei stride, const GLvoid *pointer);
+GLAPI void GLAPIENTRY glEdgeFlagv (const GLboolean *flag);
+GLAPI void GLAPIENTRY glEnable (GLenum cap);
+GLAPI void GLAPIENTRY glEnableClientState (GLenum array);
+GLAPI void GLAPIENTRY glEnd (void);
+GLAPI void GLAPIENTRY glEndList (void);
+GLAPI void GLAPIENTRY glEvalCoord1d (GLdouble u);
+GLAPI void GLAPIENTRY glEvalCoord1dv (const GLdouble *u);
+GLAPI void GLAPIENTRY glEvalCoord1f (GLfloat u);
+GLAPI void GLAPIENTRY glEvalCoord1fv (const GLfloat *u);
+GLAPI void GLAPIENTRY glEvalCoord2d (GLdouble u, GLdouble v);
+GLAPI void GLAPIENTRY glEvalCoord2dv (const GLdouble *u);
+GLAPI void GLAPIENTRY glEvalCoord2f (GLfloat u, GLfloat v);
+GLAPI void GLAPIENTRY glEvalCoord2fv (const GLfloat *u);
+GLAPI void GLAPIENTRY glEvalMesh1 (GLenum mode, GLint i1, GLint i2);
+GLAPI void GLAPIENTRY glEvalMesh2 (GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2);
+GLAPI void GLAPIENTRY glEvalPoint1 (GLint i);
+GLAPI void GLAPIENTRY glEvalPoint2 (GLint i, GLint j);
+GLAPI void GLAPIENTRY glFeedbackBuffer (GLsizei size, GLenum type, GLfloat *buffer);
+GLAPI void GLAPIENTRY glFinish (void);
+GLAPI void GLAPIENTRY glFlush (void);
+GLAPI void GLAPIENTRY glFogf (GLenum pname, GLfloat param);
+GLAPI void GLAPIENTRY glFogfv (GLenum pname, const GLfloat *params);
+GLAPI void GLAPIENTRY glFogi (GLenum pname, GLint param);
+GLAPI void GLAPIENTRY glFogiv (GLenum pname, const GLint *params);
+GLAPI void GLAPIENTRY glFrontFace (GLenum mode);
+GLAPI void GLAPIENTRY glFrustum (GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
+GLAPI GLuint GLAPIENTRY glGenLists (GLsizei range);
+GLAPI void GLAPIENTRY glGenTextures (GLsizei n, GLuint *textures);
+GLAPI void GLAPIENTRY glGetBooleanv (GLenum pname, GLboolean *params);
+GLAPI void GLAPIENTRY glGetClipPlane (GLenum plane, GLdouble *equation);
+GLAPI void GLAPIENTRY glGetDoublev (GLenum pname, GLdouble *params);
+GLAPI GLenum GLAPIENTRY glGetError (void);
+GLAPI void GLAPIENTRY glGetFloatv (GLenum pname, GLfloat *params);
+GLAPI void GLAPIENTRY glGetIntegerv (GLenum pname, GLint *params);
+GLAPI void GLAPIENTRY glGetLightfv (GLenum light, GLenum pname, GLfloat *params);
+GLAPI void GLAPIENTRY glGetLightiv (GLenum light, GLenum pname, GLint *params);
+GLAPI void GLAPIENTRY glGetMapdv (GLenum target, GLenum query, GLdouble *v);
+GLAPI void GLAPIENTRY glGetMapfv (GLenum target, GLenum query, GLfloat *v);
+GLAPI void GLAPIENTRY glGetMapiv (GLenum target, GLenum query, GLint *v);
+GLAPI void GLAPIENTRY glGetMaterialfv (GLenum face, GLenum pname, GLfloat *params);
+GLAPI void GLAPIENTRY glGetMaterialiv (GLenum face, GLenum pname, GLint *params);
+GLAPI void GLAPIENTRY glGetPixelMapfv (GLenum map, GLfloat *values);
+GLAPI void GLAPIENTRY glGetPixelMapuiv (GLenum map, GLuint *values);
+GLAPI void GLAPIENTRY glGetPixelMapusv (GLenum map, GLushort *values);
+GLAPI void GLAPIENTRY glGetPointerv (GLenum pname, GLvoid* *params);
+GLAPI void GLAPIENTRY glGetPolygonStipple (GLubyte *mask);
+GLAPI const GLubyte * GLAPIENTRY glGetString (GLenum name);
+GLAPI void GLAPIENTRY glGetTexEnvfv (GLenum target, GLenum pname, GLfloat *params);
+GLAPI void GLAPIENTRY glGetTexEnviv (GLenum target, GLenum pname, GLint *params);
+GLAPI void GLAPIENTRY glGetTexGendv (GLenum coord, GLenum pname, GLdouble *params);
+GLAPI void GLAPIENTRY glGetTexGenfv (GLenum coord, GLenum pname, GLfloat *params);
+GLAPI void GLAPIENTRY glGetTexGeniv (GLenum coord, GLenum pname, GLint *params);
+GLAPI void GLAPIENTRY glGetTexImage (GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels);
+GLAPI void GLAPIENTRY glGetTexLevelParameterfv (GLenum target, GLint level, GLenum pname, GLfloat *params);
+GLAPI void GLAPIENTRY glGetTexLevelParameteriv (GLenum target, GLint level, GLenum pname, GLint *params);
+GLAPI void GLAPIENTRY glGetTexParameterfv (GLenum target, GLenum pname, GLfloat *params);
+GLAPI void GLAPIENTRY glGetTexParameteriv (GLenum target, GLenum pname, GLint *params);
+GLAPI void GLAPIENTRY glHint (GLenum target, GLenum mode);
+GLAPI void GLAPIENTRY glIndexMask (GLuint mask);
+GLAPI void GLAPIENTRY glIndexPointer (GLenum type, GLsizei stride, const GLvoid *pointer);
+GLAPI void GLAPIENTRY glIndexd (GLdouble c);
+GLAPI void GLAPIENTRY glIndexdv (const GLdouble *c);
+GLAPI void GLAPIENTRY glIndexf (GLfloat c);
+GLAPI void GLAPIENTRY glIndexfv (const GLfloat *c);
+GLAPI void GLAPIENTRY glIndexi (GLint c);
+GLAPI void GLAPIENTRY glIndexiv (const GLint *c);
+GLAPI void GLAPIENTRY glIndexs (GLshort c);
+GLAPI void GLAPIENTRY glIndexsv (const GLshort *c);
+GLAPI void GLAPIENTRY glIndexub (GLubyte c);
+GLAPI void GLAPIENTRY glIndexubv (const GLubyte *c);
+GLAPI void GLAPIENTRY glInitNames (void);
+GLAPI void GLAPIENTRY glInterleavedArrays (GLenum format, GLsizei stride, const GLvoid *pointer);
+GLAPI GLboolean GLAPIENTRY glIsEnabled (GLenum cap);
+GLAPI GLboolean GLAPIENTRY glIsList (GLuint list);
+GLAPI GLboolean GLAPIENTRY glIsTexture (GLuint texture);
+GLAPI void GLAPIENTRY glLightModelf (GLenum pname, GLfloat param);
+GLAPI void GLAPIENTRY glLightModelfv (GLenum pname, const GLfloat *params);
+GLAPI void GLAPIENTRY glLightModeli (GLenum pname, GLint param);
+GLAPI void GLAPIENTRY glLightModeliv (GLenum pname, const GLint *params);
+GLAPI void GLAPIENTRY glLightf (GLenum light, GLenum pname, GLfloat param);
+GLAPI void GLAPIENTRY glLightfv (GLenum light, GLenum pname, const GLfloat *params);
+GLAPI void GLAPIENTRY glLighti (GLenum light, GLenum pname, GLint param);
+GLAPI void GLAPIENTRY glLightiv (GLenum light, GLenum pname, const GLint *params);
+GLAPI void GLAPIENTRY glLineStipple (GLint factor, GLushort pattern);
+GLAPI void GLAPIENTRY glLineWidth (GLfloat width);
+GLAPI void GLAPIENTRY glListBase (GLuint base);
+GLAPI void GLAPIENTRY glLoadIdentity (void);
+GLAPI void GLAPIENTRY glLoadMatrixd (const GLdouble *m);
+GLAPI void GLAPIENTRY glLoadMatrixf (const GLfloat *m);
+GLAPI void GLAPIENTRY glLoadName (GLuint name);
+GLAPI void GLAPIENTRY glLogicOp (GLenum opcode);
+GLAPI void GLAPIENTRY glMap1d (GLenum target, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble *points);
+GLAPI void GLAPIENTRY glMap1f (GLenum target, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat *points);
+GLAPI void GLAPIENTRY glMap2d (GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble *points);
+GLAPI void GLAPIENTRY glMap2f (GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat *points);
+GLAPI void GLAPIENTRY glMapGrid1d (GLint un, GLdouble u1, GLdouble u2);
+GLAPI void GLAPIENTRY glMapGrid1f (GLint un, GLfloat u1, GLfloat u2);
+GLAPI void GLAPIENTRY glMapGrid2d (GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1, GLdouble v2);
+GLAPI void GLAPIENTRY glMapGrid2f (GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1, GLfloat v2);
+GLAPI void GLAPIENTRY glMaterialf (GLenum face, GLenum pname, GLfloat param);
+GLAPI void GLAPIENTRY glMaterialfv (GLenum face, GLenum pname, const GLfloat *params);
+GLAPI void GLAPIENTRY glMateriali (GLenum face, GLenum pname, GLint param);
+GLAPI void GLAPIENTRY glMaterialiv (GLenum face, GLenum pname, const GLint *params);
+GLAPI void GLAPIENTRY glMatrixMode (GLenum mode);
+GLAPI void GLAPIENTRY glMultMatrixd (const GLdouble *m);
+GLAPI void GLAPIENTRY glMultMatrixf (const GLfloat *m);
+GLAPI void GLAPIENTRY glNewList (GLuint list, GLenum mode);
+GLAPI void GLAPIENTRY glNormal3b (GLbyte nx, GLbyte ny, GLbyte nz);
+GLAPI void GLAPIENTRY glNormal3bv (const GLbyte *v);
+GLAPI void GLAPIENTRY glNormal3d (GLdouble nx, GLdouble ny, GLdouble nz);
+GLAPI void GLAPIENTRY glNormal3dv (const GLdouble *v);
+GLAPI void GLAPIENTRY glNormal3f (GLfloat nx, GLfloat ny, GLfloat nz);
+GLAPI void GLAPIENTRY glNormal3fv (const GLfloat *v);
+GLAPI void GLAPIENTRY glNormal3i (GLint nx, GLint ny, GLint nz);
+GLAPI void GLAPIENTRY glNormal3iv (const GLint *v);
+GLAPI void GLAPIENTRY glNormal3s (GLshort nx, GLshort ny, GLshort nz);
+GLAPI void GLAPIENTRY glNormal3sv (const GLshort *v);
+GLAPI void GLAPIENTRY glNormalPointer (GLenum type, GLsizei stride, const GLvoid *pointer);
+GLAPI void GLAPIENTRY glOrtho (GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
+GLAPI void GLAPIENTRY glPassThrough (GLfloat token);
+GLAPI void GLAPIENTRY glPixelMapfv (GLenum map, GLsizei mapsize, const GLfloat *values);
+GLAPI void GLAPIENTRY glPixelMapuiv (GLenum map, GLsizei mapsize, const GLuint *values);
+GLAPI void GLAPIENTRY glPixelMapusv (GLenum map, GLsizei mapsize, const GLushort *values);
+GLAPI void GLAPIENTRY glPixelStoref (GLenum pname, GLfloat param);
+GLAPI void GLAPIENTRY glPixelStorei (GLenum pname, GLint param);
+GLAPI void GLAPIENTRY glPixelTransferf (GLenum pname, GLfloat param);
+GLAPI void GLAPIENTRY glPixelTransferi (GLenum pname, GLint param);
+GLAPI void GLAPIENTRY glPixelZoom (GLfloat xfactor, GLfloat yfactor);
+GLAPI void GLAPIENTRY glPointSize (GLfloat size);
+GLAPI void GLAPIENTRY glPolygonMode (GLenum face, GLenum mode);
+GLAPI void GLAPIENTRY glPolygonOffset (GLfloat factor, GLfloat units);
+GLAPI void GLAPIENTRY glPolygonStipple (const GLubyte *mask);
+GLAPI void GLAPIENTRY glPopAttrib (void);
+GLAPI void GLAPIENTRY glPopClientAttrib (void);
+GLAPI void GLAPIENTRY glPopMatrix (void);
+GLAPI void GLAPIENTRY glPopName (void);
+GLAPI void GLAPIENTRY glPrioritizeTextures (GLsizei n, const GLuint *textures, const GLclampf *priorities);
+GLAPI void GLAPIENTRY glPushAttrib (GLbitfield mask);
+GLAPI void GLAPIENTRY glPushClientAttrib (GLbitfield mask);
+GLAPI void GLAPIENTRY glPushMatrix (void);
+GLAPI void GLAPIENTRY glPushName (GLuint name);
+GLAPI void GLAPIENTRY glRasterPos2d (GLdouble x, GLdouble y);
+GLAPI void GLAPIENTRY glRasterPos2dv (const GLdouble *v);
+GLAPI void GLAPIENTRY glRasterPos2f (GLfloat x, GLfloat y);
+GLAPI void GLAPIENTRY glRasterPos2fv (const GLfloat *v);
+GLAPI void GLAPIENTRY glRasterPos2i (GLint x, GLint y);
+GLAPI void GLAPIENTRY glRasterPos2iv (const GLint *v);
+GLAPI void GLAPIENTRY glRasterPos2s (GLshort x, GLshort y);
+GLAPI void GLAPIENTRY glRasterPos2sv (const GLshort *v);
+GLAPI void GLAPIENTRY glRasterPos3d (GLdouble x, GLdouble y, GLdouble z);
+GLAPI void GLAPIENTRY glRasterPos3dv (const GLdouble *v);
+GLAPI void GLAPIENTRY glRasterPos3f (GLfloat x, GLfloat y, GLfloat z);
+GLAPI void GLAPIENTRY glRasterPos3fv (const GLfloat *v);
+GLAPI void GLAPIENTRY glRasterPos3i (GLint x, GLint y, GLint z);
+GLAPI void GLAPIENTRY glRasterPos3iv (const GLint *v);
+GLAPI void GLAPIENTRY glRasterPos3s (GLshort x, GLshort y, GLshort z);
+GLAPI void GLAPIENTRY glRasterPos3sv (const GLshort *v);
+GLAPI void GLAPIENTRY glRasterPos4d (GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void GLAPIENTRY glRasterPos4dv (const GLdouble *v);
+GLAPI void GLAPIENTRY glRasterPos4f (GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void GLAPIENTRY glRasterPos4fv (const GLfloat *v);
+GLAPI void GLAPIENTRY glRasterPos4i (GLint x, GLint y, GLint z, GLint w);
+GLAPI void GLAPIENTRY glRasterPos4iv (const GLint *v);
+GLAPI void GLAPIENTRY glRasterPos4s (GLshort x, GLshort y, GLshort z, GLshort w);
+GLAPI void GLAPIENTRY glRasterPos4sv (const GLshort *v);
+GLAPI void GLAPIENTRY glReadBuffer (GLenum mode);
+GLAPI void GLAPIENTRY glReadPixels (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels);
+GLAPI void GLAPIENTRY glRectd (GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2);
+GLAPI void GLAPIENTRY glRectdv (const GLdouble *v1, const GLdouble *v2);
+GLAPI void GLAPIENTRY glRectf (GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2);
+GLAPI void GLAPIENTRY glRectfv (const GLfloat *v1, const GLfloat *v2);
+GLAPI void GLAPIENTRY glRecti (GLint x1, GLint y1, GLint x2, GLint y2);
+GLAPI void GLAPIENTRY glRectiv (const GLint *v1, const GLint *v2);
+GLAPI void GLAPIENTRY glRects (GLshort x1, GLshort y1, GLshort x2, GLshort y2);
+GLAPI void GLAPIENTRY glRectsv (const GLshort *v1, const GLshort *v2);
+GLAPI GLint GLAPIENTRY glRenderMode (GLenum mode);
+GLAPI void GLAPIENTRY glRotated (GLdouble angle, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void GLAPIENTRY glRotatef (GLfloat angle, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void GLAPIENTRY glScaled (GLdouble x, GLdouble y, GLdouble z);
+GLAPI void GLAPIENTRY glScalef (GLfloat x, GLfloat y, GLfloat z);
+GLAPI void GLAPIENTRY glScissor (GLint x, GLint y, GLsizei width, GLsizei height);
+GLAPI void GLAPIENTRY glSelectBuffer (GLsizei size, GLuint *buffer);
+GLAPI void GLAPIENTRY glShadeModel (GLenum mode);
+GLAPI void GLAPIENTRY glStencilFunc (GLenum func, GLint ref, GLuint mask);
+GLAPI void GLAPIENTRY glStencilMask (GLuint mask);
+GLAPI void GLAPIENTRY glStencilOp (GLenum fail, GLenum zfail, GLenum zpass);
+GLAPI void GLAPIENTRY glTexCoord1d (GLdouble s);
+GLAPI void GLAPIENTRY glTexCoord1dv (const GLdouble *v);
+GLAPI void GLAPIENTRY glTexCoord1f (GLfloat s);
+GLAPI void GLAPIENTRY glTexCoord1fv (const GLfloat *v);
+GLAPI void GLAPIENTRY glTexCoord1i (GLint s);
+GLAPI void GLAPIENTRY glTexCoord1iv (const GLint *v);
+GLAPI void GLAPIENTRY glTexCoord1s (GLshort s);
+GLAPI void GLAPIENTRY glTexCoord1sv (const GLshort *v);
+GLAPI void GLAPIENTRY glTexCoord2d (GLdouble s, GLdouble t);
+GLAPI void GLAPIENTRY glTexCoord2dv (const GLdouble *v);
+GLAPI void GLAPIENTRY glTexCoord2f (GLfloat s, GLfloat t);
+GLAPI void GLAPIENTRY glTexCoord2fv (const GLfloat *v);
+GLAPI void GLAPIENTRY glTexCoord2i (GLint s, GLint t);
+GLAPI void GLAPIENTRY glTexCoord2iv (const GLint *v);
+GLAPI void GLAPIENTRY glTexCoord2s (GLshort s, GLshort t);
+GLAPI void GLAPIENTRY glTexCoord2sv (const GLshort *v);
+GLAPI void GLAPIENTRY glTexCoord3d (GLdouble s, GLdouble t, GLdouble r);
+GLAPI void GLAPIENTRY glTexCoord3dv (const GLdouble *v);
+GLAPI void GLAPIENTRY glTexCoord3f (GLfloat s, GLfloat t, GLfloat r);
+GLAPI void GLAPIENTRY glTexCoord3fv (const GLfloat *v);
+GLAPI void GLAPIENTRY glTexCoord3i (GLint s, GLint t, GLint r);
+GLAPI void GLAPIENTRY glTexCoord3iv (const GLint *v);
+GLAPI void GLAPIENTRY glTexCoord3s (GLshort s, GLshort t, GLshort r);
+GLAPI void GLAPIENTRY glTexCoord3sv (const GLshort *v);
+GLAPI void GLAPIENTRY glTexCoord4d (GLdouble s, GLdouble t, GLdouble r, GLdouble q);
+GLAPI void GLAPIENTRY glTexCoord4dv (const GLdouble *v);
+GLAPI void GLAPIENTRY glTexCoord4f (GLfloat s, GLfloat t, GLfloat r, GLfloat q);
+GLAPI void GLAPIENTRY glTexCoord4fv (const GLfloat *v);
+GLAPI void GLAPIENTRY glTexCoord4i (GLint s, GLint t, GLint r, GLint q);
+GLAPI void GLAPIENTRY glTexCoord4iv (const GLint *v);
+GLAPI void GLAPIENTRY glTexCoord4s (GLshort s, GLshort t, GLshort r, GLshort q);
+GLAPI void GLAPIENTRY glTexCoord4sv (const GLshort *v);
+GLAPI void GLAPIENTRY glTexCoordPointer (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+GLAPI void GLAPIENTRY glTexEnvf (GLenum target, GLenum pname, GLfloat param);
+GLAPI void GLAPIENTRY glTexEnvfv (GLenum target, GLenum pname, const GLfloat *params);
+GLAPI void GLAPIENTRY glTexEnvi (GLenum target, GLenum pname, GLint param);
+GLAPI void GLAPIENTRY glTexEnviv (GLenum target, GLenum pname, const GLint *params);
+GLAPI void GLAPIENTRY glTexGend (GLenum coord, GLenum pname, GLdouble param);
+GLAPI void GLAPIENTRY glTexGendv (GLenum coord, GLenum pname, const GLdouble *params);
+GLAPI void GLAPIENTRY glTexGenf (GLenum coord, GLenum pname, GLfloat param);
+GLAPI void GLAPIENTRY glTexGenfv (GLenum coord, GLenum pname, const GLfloat *params);
+GLAPI void GLAPIENTRY glTexGeni (GLenum coord, GLenum pname, GLint param);
+GLAPI void GLAPIENTRY glTexGeniv (GLenum coord, GLenum pname, const GLint *params);
+GLAPI void GLAPIENTRY glTexImage1D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+GLAPI void GLAPIENTRY glTexImage2D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+GLAPI void GLAPIENTRY glTexParameterf (GLenum target, GLenum pname, GLfloat param);
+GLAPI void GLAPIENTRY glTexParameterfv (GLenum target, GLenum pname, const GLfloat *params);
+GLAPI void GLAPIENTRY glTexParameteri (GLenum target, GLenum pname, GLint param);
+GLAPI void GLAPIENTRY glTexParameteriv (GLenum target, GLenum pname, const GLint *params);
+GLAPI void GLAPIENTRY glTexSubImage1D (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
+GLAPI void GLAPIENTRY glTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
+GLAPI void GLAPIENTRY glTranslated (GLdouble x, GLdouble y, GLdouble z);
+GLAPI void GLAPIENTRY glTranslatef (GLfloat x, GLfloat y, GLfloat z);
+GLAPI void GLAPIENTRY glVertex2d (GLdouble x, GLdouble y);
+GLAPI void GLAPIENTRY glVertex2dv (const GLdouble *v);
+GLAPI void GLAPIENTRY glVertex2f (GLfloat x, GLfloat y);
+GLAPI void GLAPIENTRY glVertex2fv (const GLfloat *v);
+GLAPI void GLAPIENTRY glVertex2i (GLint x, GLint y);
+GLAPI void GLAPIENTRY glVertex2iv (const GLint *v);
+GLAPI void GLAPIENTRY glVertex2s (GLshort x, GLshort y);
+GLAPI void GLAPIENTRY glVertex2sv (const GLshort *v);
+GLAPI void GLAPIENTRY glVertex3d (GLdouble x, GLdouble y, GLdouble z);
+GLAPI void GLAPIENTRY glVertex3dv (const GLdouble *v);
+GLAPI void GLAPIENTRY glVertex3f (GLfloat x, GLfloat y, GLfloat z);
+GLAPI void GLAPIENTRY glVertex3fv (const GLfloat *v);
+GLAPI void GLAPIENTRY glVertex3i (GLint x, GLint y, GLint z);
+GLAPI void GLAPIENTRY glVertex3iv (const GLint *v);
+GLAPI void GLAPIENTRY glVertex3s (GLshort x, GLshort y, GLshort z);
+GLAPI void GLAPIENTRY glVertex3sv (const GLshort *v);
+GLAPI void GLAPIENTRY glVertex4d (GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void GLAPIENTRY glVertex4dv (const GLdouble *v);
+GLAPI void GLAPIENTRY glVertex4f (GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void GLAPIENTRY glVertex4fv (const GLfloat *v);
+GLAPI void GLAPIENTRY glVertex4i (GLint x, GLint y, GLint z, GLint w);
+GLAPI void GLAPIENTRY glVertex4iv (const GLint *v);
+GLAPI void GLAPIENTRY glVertex4s (GLshort x, GLshort y, GLshort z, GLshort w);
+GLAPI void GLAPIENTRY glVertex4sv (const GLshort *v);
+GLAPI void GLAPIENTRY glVertexPointer (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+GLAPI void GLAPIENTRY glViewport (GLint x, GLint y, GLsizei width, GLsizei height);
+
+#define GLEW_VERSION_1_1 GLEW_GET_VAR(__GLEW_VERSION_1_1)
+
+#endif /* GL_VERSION_1_1 */
+
+/* ---------------------------------- GLU ---------------------------------- */
+
+/* this is where we can safely include GLU */
+#if defined(__APPLE__) && defined(__MACH__)
+#include <OpenGL/glu.h>
+#else
+#include <GL/glu.h>
+#endif
+
+/* ----------------------------- GL_VERSION_1_2 ---------------------------- */
+
+#ifndef GL_VERSION_1_2
+#define GL_VERSION_1_2 1
+
+#define GL_SMOOTH_POINT_SIZE_RANGE 0x0B12
+#define GL_SMOOTH_POINT_SIZE_GRANULARITY 0x0B13
+#define GL_SMOOTH_LINE_WIDTH_RANGE 0x0B22
+#define GL_SMOOTH_LINE_WIDTH_GRANULARITY 0x0B23
+#define GL_UNSIGNED_BYTE_3_3_2 0x8032
+#define GL_UNSIGNED_SHORT_4_4_4_4 0x8033
+#define GL_UNSIGNED_SHORT_5_5_5_1 0x8034
+#define GL_UNSIGNED_INT_8_8_8_8 0x8035
+#define GL_UNSIGNED_INT_10_10_10_2 0x8036
+#define GL_RESCALE_NORMAL 0x803A
+#define GL_TEXTURE_BINDING_3D 0x806A
+#define GL_PACK_SKIP_IMAGES 0x806B
+#define GL_PACK_IMAGE_HEIGHT 0x806C
+#define GL_UNPACK_SKIP_IMAGES 0x806D
+#define GL_UNPACK_IMAGE_HEIGHT 0x806E
+#define GL_TEXTURE_3D 0x806F
+#define GL_PROXY_TEXTURE_3D 0x8070
+#define GL_TEXTURE_DEPTH 0x8071
+#define GL_TEXTURE_WRAP_R 0x8072
+#define GL_MAX_3D_TEXTURE_SIZE 0x8073
+#define GL_BGR 0x80E0
+#define GL_BGRA 0x80E1
+#define GL_MAX_ELEMENTS_VERTICES 0x80E8
+#define GL_MAX_ELEMENTS_INDICES 0x80E9
+#define GL_CLAMP_TO_EDGE 0x812F
+#define GL_TEXTURE_MIN_LOD 0x813A
+#define GL_TEXTURE_MAX_LOD 0x813B
+#define GL_TEXTURE_BASE_LEVEL 0x813C
+#define GL_TEXTURE_MAX_LEVEL 0x813D
+#define GL_LIGHT_MODEL_COLOR_CONTROL 0x81F8
+#define GL_SINGLE_COLOR 0x81F9
+#define GL_SEPARATE_SPECULAR_COLOR 0x81FA
+#define GL_UNSIGNED_BYTE_2_3_3_REV 0x8362
+#define GL_UNSIGNED_SHORT_5_6_5 0x8363
+#define GL_UNSIGNED_SHORT_5_6_5_REV 0x8364
+#define GL_UNSIGNED_SHORT_4_4_4_4_REV 0x8365
+#define GL_UNSIGNED_SHORT_1_5_5_5_REV 0x8366
+#define GL_UNSIGNED_INT_8_8_8_8_REV 0x8367
+#define GL_UNSIGNED_INT_2_10_10_10_REV 0x8368
+#define GL_ALIASED_POINT_SIZE_RANGE 0x846D
+#define GL_ALIASED_LINE_WIDTH_RANGE 0x846E
+
+typedef void (GLAPIENTRY * PFNGLCOPYTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (GLAPIENTRY * PFNGLDRAWRANGEELEMENTSPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
+typedef void (GLAPIENTRY * PFNGLTEXIMAGE3DPROC) (GLenum target, GLint level, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (GLAPIENTRY * PFNGLTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+
+#define glCopyTexSubImage3D GLEW_GET_FUN(__glewCopyTexSubImage3D)
+#define glDrawRangeElements GLEW_GET_FUN(__glewDrawRangeElements)
+#define glTexImage3D GLEW_GET_FUN(__glewTexImage3D)
+#define glTexSubImage3D GLEW_GET_FUN(__glewTexSubImage3D)
+
+#define GLEW_VERSION_1_2 GLEW_GET_VAR(__GLEW_VERSION_1_2)
+
+#endif /* GL_VERSION_1_2 */
+
+/* ----------------------------- GL_VERSION_1_3 ---------------------------- */
+
+#ifndef GL_VERSION_1_3
+#define GL_VERSION_1_3 1
+
+#define GL_MULTISAMPLE 0x809D
+#define GL_SAMPLE_ALPHA_TO_COVERAGE 0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE 0x809F
+#define GL_SAMPLE_COVERAGE 0x80A0
+#define GL_SAMPLE_BUFFERS 0x80A8
+#define GL_SAMPLES 0x80A9
+#define GL_SAMPLE_COVERAGE_VALUE 0x80AA
+#define GL_SAMPLE_COVERAGE_INVERT 0x80AB
+#define GL_CLAMP_TO_BORDER 0x812D
+#define GL_TEXTURE0 0x84C0
+#define GL_TEXTURE1 0x84C1
+#define GL_TEXTURE2 0x84C2
+#define GL_TEXTURE3 0x84C3
+#define GL_TEXTURE4 0x84C4
+#define GL_TEXTURE5 0x84C5
+#define GL_TEXTURE6 0x84C6
+#define GL_TEXTURE7 0x84C7
+#define GL_TEXTURE8 0x84C8
+#define GL_TEXTURE9 0x84C9
+#define GL_TEXTURE10 0x84CA
+#define GL_TEXTURE11 0x84CB
+#define GL_TEXTURE12 0x84CC
+#define GL_TEXTURE13 0x84CD
+#define GL_TEXTURE14 0x84CE
+#define GL_TEXTURE15 0x84CF
+#define GL_TEXTURE16 0x84D0
+#define GL_TEXTURE17 0x84D1
+#define GL_TEXTURE18 0x84D2
+#define GL_TEXTURE19 0x84D3
+#define GL_TEXTURE20 0x84D4
+#define GL_TEXTURE21 0x84D5
+#define GL_TEXTURE22 0x84D6
+#define GL_TEXTURE23 0x84D7
+#define GL_TEXTURE24 0x84D8
+#define GL_TEXTURE25 0x84D9
+#define GL_TEXTURE26 0x84DA
+#define GL_TEXTURE27 0x84DB
+#define GL_TEXTURE28 0x84DC
+#define GL_TEXTURE29 0x84DD
+#define GL_TEXTURE30 0x84DE
+#define GL_TEXTURE31 0x84DF
+#define GL_ACTIVE_TEXTURE 0x84E0
+#define GL_CLIENT_ACTIVE_TEXTURE 0x84E1
+#define GL_MAX_TEXTURE_UNITS 0x84E2
+#define GL_TRANSPOSE_MODELVIEW_MATRIX 0x84E3
+#define GL_TRANSPOSE_PROJECTION_MATRIX 0x84E4
+#define GL_TRANSPOSE_TEXTURE_MATRIX 0x84E5
+#define GL_TRANSPOSE_COLOR_MATRIX 0x84E6
+#define GL_SUBTRACT 0x84E7
+#define GL_COMPRESSED_ALPHA 0x84E9
+#define GL_COMPRESSED_LUMINANCE 0x84EA
+#define GL_COMPRESSED_LUMINANCE_ALPHA 0x84EB
+#define GL_COMPRESSED_INTENSITY 0x84EC
+#define GL_COMPRESSED_RGB 0x84ED
+#define GL_COMPRESSED_RGBA 0x84EE
+#define GL_TEXTURE_COMPRESSION_HINT 0x84EF
+#define GL_NORMAL_MAP 0x8511
+#define GL_REFLECTION_MAP 0x8512
+#define GL_TEXTURE_CUBE_MAP 0x8513
+#define GL_TEXTURE_BINDING_CUBE_MAP 0x8514
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_X 0x8515
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X 0x8516
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y 0x8517
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y 0x8518
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z 0x8519
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z 0x851A
+#define GL_PROXY_TEXTURE_CUBE_MAP 0x851B
+#define GL_MAX_CUBE_MAP_TEXTURE_SIZE 0x851C
+#define GL_COMBINE 0x8570
+#define GL_COMBINE_RGB 0x8571
+#define GL_COMBINE_ALPHA 0x8572
+#define GL_RGB_SCALE 0x8573
+#define GL_ADD_SIGNED 0x8574
+#define GL_INTERPOLATE 0x8575
+#define GL_CONSTANT 0x8576
+#define GL_PRIMARY_COLOR 0x8577
+#define GL_PREVIOUS 0x8578
+#define GL_SOURCE0_RGB 0x8580
+#define GL_SOURCE1_RGB 0x8581
+#define GL_SOURCE2_RGB 0x8582
+#define GL_SOURCE0_ALPHA 0x8588
+#define GL_SOURCE1_ALPHA 0x8589
+#define GL_SOURCE2_ALPHA 0x858A
+#define GL_OPERAND0_RGB 0x8590
+#define GL_OPERAND1_RGB 0x8591
+#define GL_OPERAND2_RGB 0x8592
+#define GL_OPERAND0_ALPHA 0x8598
+#define GL_OPERAND1_ALPHA 0x8599
+#define GL_OPERAND2_ALPHA 0x859A
+#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE 0x86A0
+#define GL_TEXTURE_COMPRESSED 0x86A1
+#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2
+#define GL_COMPRESSED_TEXTURE_FORMATS 0x86A3
+#define GL_DOT3_RGB 0x86AE
+#define GL_DOT3_RGBA 0x86AF
+#define GL_MULTISAMPLE_BIT 0x20000000
+
+typedef void (GLAPIENTRY * PFNGLACTIVETEXTUREPROC) (GLenum texture);
+typedef void (GLAPIENTRY * PFNGLCLIENTACTIVETEXTUREPROC) (GLenum texture);
+typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXIMAGE1DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data);
+typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXIMAGE2DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
+typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXIMAGE3DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data);
+typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data);
+typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data);
+typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data);
+typedef void (GLAPIENTRY * PFNGLGETCOMPRESSEDTEXIMAGEPROC) (GLenum target, GLint lod, GLvoid *img);
+typedef void (GLAPIENTRY * PFNGLLOADTRANSPOSEMATRIXDPROC) (const GLdouble m[16]);
+typedef void (GLAPIENTRY * PFNGLLOADTRANSPOSEMATRIXFPROC) (const GLfloat m[16]);
+typedef void (GLAPIENTRY * PFNGLMULTTRANSPOSEMATRIXDPROC) (const GLdouble m[16]);
+typedef void (GLAPIENTRY * PFNGLMULTTRANSPOSEMATRIXFPROC) (const GLfloat m[16]);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1DPROC) (GLenum target, GLdouble s);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1DVPROC) (GLenum target, const GLdouble *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1FPROC) (GLenum target, GLfloat s);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1FVPROC) (GLenum target, const GLfloat *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1IPROC) (GLenum target, GLint s);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1IVPROC) (GLenum target, const GLint *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1SPROC) (GLenum target, GLshort s);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1SVPROC) (GLenum target, const GLshort *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2DPROC) (GLenum target, GLdouble s, GLdouble t);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2DVPROC) (GLenum target, const GLdouble *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2FVPROC) (GLenum target, const GLfloat *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2IPROC) (GLenum target, GLint s, GLint t);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2IVPROC) (GLenum target, const GLint *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2SPROC) (GLenum target, GLshort s, GLshort t);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2SVPROC) (GLenum target, const GLshort *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3DVPROC) (GLenum target, const GLdouble *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3FVPROC) (GLenum target, const GLfloat *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3IPROC) (GLenum target, GLint s, GLint t, GLint r);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3IVPROC) (GLenum target, const GLint *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3SPROC) (GLenum target, GLshort s, GLshort t, GLshort r);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3SVPROC) (GLenum target, const GLshort *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4DVPROC) (GLenum target, const GLdouble *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4FVPROC) (GLenum target, const GLfloat *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4IPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4IVPROC) (GLenum target, const GLint *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4SPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4SVPROC) (GLenum target, const GLshort *v);
+typedef void (GLAPIENTRY * PFNGLSAMPLECOVERAGEPROC) (GLclampf value, GLboolean invert);
+
+#define glActiveTexture GLEW_GET_FUN(__glewActiveTexture)
+#define glClientActiveTexture GLEW_GET_FUN(__glewClientActiveTexture)
+#define glCompressedTexImage1D GLEW_GET_FUN(__glewCompressedTexImage1D)
+#define glCompressedTexImage2D GLEW_GET_FUN(__glewCompressedTexImage2D)
+#define glCompressedTexImage3D GLEW_GET_FUN(__glewCompressedTexImage3D)
+#define glCompressedTexSubImage1D GLEW_GET_FUN(__glewCompressedTexSubImage1D)
+#define glCompressedTexSubImage2D GLEW_GET_FUN(__glewCompressedTexSubImage2D)
+#define glCompressedTexSubImage3D GLEW_GET_FUN(__glewCompressedTexSubImage3D)
+#define glGetCompressedTexImage GLEW_GET_FUN(__glewGetCompressedTexImage)
+#define glLoadTransposeMatrixd GLEW_GET_FUN(__glewLoadTransposeMatrixd)
+#define glLoadTransposeMatrixf GLEW_GET_FUN(__glewLoadTransposeMatrixf)
+#define glMultTransposeMatrixd GLEW_GET_FUN(__glewMultTransposeMatrixd)
+#define glMultTransposeMatrixf GLEW_GET_FUN(__glewMultTransposeMatrixf)
+#define glMultiTexCoord1d GLEW_GET_FUN(__glewMultiTexCoord1d)
+#define glMultiTexCoord1dv GLEW_GET_FUN(__glewMultiTexCoord1dv)
+#define glMultiTexCoord1f GLEW_GET_FUN(__glewMultiTexCoord1f)
+#define glMultiTexCoord1fv GLEW_GET_FUN(__glewMultiTexCoord1fv)
+#define glMultiTexCoord1i GLEW_GET_FUN(__glewMultiTexCoord1i)
+#define glMultiTexCoord1iv GLEW_GET_FUN(__glewMultiTexCoord1iv)
+#define glMultiTexCoord1s GLEW_GET_FUN(__glewMultiTexCoord1s)
+#define glMultiTexCoord1sv GLEW_GET_FUN(__glewMultiTexCoord1sv)
+#define glMultiTexCoord2d GLEW_GET_FUN(__glewMultiTexCoord2d)
+#define glMultiTexCoord2dv GLEW_GET_FUN(__glewMultiTexCoord2dv)
+#define glMultiTexCoord2f GLEW_GET_FUN(__glewMultiTexCoord2f)
+#define glMultiTexCoord2fv GLEW_GET_FUN(__glewMultiTexCoord2fv)
+#define glMultiTexCoord2i GLEW_GET_FUN(__glewMultiTexCoord2i)
+#define glMultiTexCoord2iv GLEW_GET_FUN(__glewMultiTexCoord2iv)
+#define glMultiTexCoord2s GLEW_GET_FUN(__glewMultiTexCoord2s)
+#define glMultiTexCoord2sv GLEW_GET_FUN(__glewMultiTexCoord2sv)
+#define glMultiTexCoord3d GLEW_GET_FUN(__glewMultiTexCoord3d)
+#define glMultiTexCoord3dv GLEW_GET_FUN(__glewMultiTexCoord3dv)
+#define glMultiTexCoord3f GLEW_GET_FUN(__glewMultiTexCoord3f)
+#define glMultiTexCoord3fv GLEW_GET_FUN(__glewMultiTexCoord3fv)
+#define glMultiTexCoord3i GLEW_GET_FUN(__glewMultiTexCoord3i)
+#define glMultiTexCoord3iv GLEW_GET_FUN(__glewMultiTexCoord3iv)
+#define glMultiTexCoord3s GLEW_GET_FUN(__glewMultiTexCoord3s)
+#define glMultiTexCoord3sv GLEW_GET_FUN(__glewMultiTexCoord3sv)
+#define glMultiTexCoord4d GLEW_GET_FUN(__glewMultiTexCoord4d)
+#define glMultiTexCoord4dv GLEW_GET_FUN(__glewMultiTexCoord4dv)
+#define glMultiTexCoord4f GLEW_GET_FUN(__glewMultiTexCoord4f)
+#define glMultiTexCoord4fv GLEW_GET_FUN(__glewMultiTexCoord4fv)
+#define glMultiTexCoord4i GLEW_GET_FUN(__glewMultiTexCoord4i)
+#define glMultiTexCoord4iv GLEW_GET_FUN(__glewMultiTexCoord4iv)
+#define glMultiTexCoord4s GLEW_GET_FUN(__glewMultiTexCoord4s)
+#define glMultiTexCoord4sv GLEW_GET_FUN(__glewMultiTexCoord4sv)
+#define glSampleCoverage GLEW_GET_FUN(__glewSampleCoverage)
+
+#define GLEW_VERSION_1_3 GLEW_GET_VAR(__GLEW_VERSION_1_3)
+
+#endif /* GL_VERSION_1_3 */
+
+/* ----------------------------- GL_VERSION_1_4 ---------------------------- */
+
+#ifndef GL_VERSION_1_4
+#define GL_VERSION_1_4 1
+
+#define GL_BLEND_DST_RGB 0x80C8
+#define GL_BLEND_SRC_RGB 0x80C9
+#define GL_BLEND_DST_ALPHA 0x80CA
+#define GL_BLEND_SRC_ALPHA 0x80CB
+#define GL_POINT_SIZE_MIN 0x8126
+#define GL_POINT_SIZE_MAX 0x8127
+#define GL_POINT_FADE_THRESHOLD_SIZE 0x8128
+#define GL_POINT_DISTANCE_ATTENUATION 0x8129
+#define GL_GENERATE_MIPMAP 0x8191
+#define GL_GENERATE_MIPMAP_HINT 0x8192
+#define GL_DEPTH_COMPONENT16 0x81A5
+#define GL_DEPTH_COMPONENT24 0x81A6
+#define GL_DEPTH_COMPONENT32 0x81A7
+#define GL_MIRRORED_REPEAT 0x8370
+#define GL_FOG_COORDINATE_SOURCE 0x8450
+#define GL_FOG_COORDINATE 0x8451
+#define GL_FRAGMENT_DEPTH 0x8452
+#define GL_CURRENT_FOG_COORDINATE 0x8453
+#define GL_FOG_COORDINATE_ARRAY_TYPE 0x8454
+#define GL_FOG_COORDINATE_ARRAY_STRIDE 0x8455
+#define GL_FOG_COORDINATE_ARRAY_POINTER 0x8456
+#define GL_FOG_COORDINATE_ARRAY 0x8457
+#define GL_COLOR_SUM 0x8458
+#define GL_CURRENT_SECONDARY_COLOR 0x8459
+#define GL_SECONDARY_COLOR_ARRAY_SIZE 0x845A
+#define GL_SECONDARY_COLOR_ARRAY_TYPE 0x845B
+#define GL_SECONDARY_COLOR_ARRAY_STRIDE 0x845C
+#define GL_SECONDARY_COLOR_ARRAY_POINTER 0x845D
+#define GL_SECONDARY_COLOR_ARRAY 0x845E
+#define GL_MAX_TEXTURE_LOD_BIAS 0x84FD
+#define GL_TEXTURE_FILTER_CONTROL 0x8500
+#define GL_TEXTURE_LOD_BIAS 0x8501
+#define GL_INCR_WRAP 0x8507
+#define GL_DECR_WRAP 0x8508
+#define GL_TEXTURE_DEPTH_SIZE 0x884A
+#define GL_DEPTH_TEXTURE_MODE 0x884B
+#define GL_TEXTURE_COMPARE_MODE 0x884C
+#define GL_TEXTURE_COMPARE_FUNC 0x884D
+#define GL_COMPARE_R_TO_TEXTURE 0x884E
+
+typedef void (GLAPIENTRY * PFNGLBLENDCOLORPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
+typedef void (GLAPIENTRY * PFNGLBLENDEQUATIONPROC) (GLenum mode);
+typedef void (GLAPIENTRY * PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+typedef void (GLAPIENTRY * PFNGLFOGCOORDPOINTERPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
+typedef void (GLAPIENTRY * PFNGLFOGCOORDDPROC) (GLdouble coord);
+typedef void (GLAPIENTRY * PFNGLFOGCOORDDVPROC) (const GLdouble *coord);
+typedef void (GLAPIENTRY * PFNGLFOGCOORDFPROC) (GLfloat coord);
+typedef void (GLAPIENTRY * PFNGLFOGCOORDFVPROC) (const GLfloat *coord);
+typedef void (GLAPIENTRY * PFNGLMULTIDRAWARRAYSPROC) (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount);
+typedef void (GLAPIENTRY * PFNGLMULTIDRAWELEMENTSPROC) (GLenum mode, GLsizei *count, GLenum type, const GLvoid **indices, GLsizei primcount);
+typedef void (GLAPIENTRY * PFNGLPOINTPARAMETERFPROC) (GLenum pname, GLfloat param);
+typedef void (GLAPIENTRY * PFNGLPOINTPARAMETERFVPROC) (GLenum pname, GLfloat *params);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3BPROC) (GLbyte red, GLbyte green, GLbyte blue);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3BVPROC) (const GLbyte *v);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3DPROC) (GLdouble red, GLdouble green, GLdouble blue);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3DVPROC) (const GLdouble *v);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3FPROC) (GLfloat red, GLfloat green, GLfloat blue);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3FVPROC) (const GLfloat *v);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3IPROC) (GLint red, GLint green, GLint blue);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3IVPROC) (const GLint *v);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3SPROC) (GLshort red, GLshort green, GLshort blue);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3SVPROC) (const GLshort *v);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3UBPROC) (GLubyte red, GLubyte green, GLubyte blue);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3UBVPROC) (const GLubyte *v);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3UIPROC) (GLuint red, GLuint green, GLuint blue);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3UIVPROC) (const GLuint *v);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3USPROC) (GLushort red, GLushort green, GLushort blue);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3USVPROC) (const GLushort *v);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLORPOINTERPROC) (GLint size, GLenum type, GLsizei stride, GLvoid *pointer);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS2DPROC) (GLdouble x, GLdouble y);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS2DVPROC) (const GLdouble *p);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS2FPROC) (GLfloat x, GLfloat y);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS2FVPROC) (const GLfloat *p);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS2IPROC) (GLint x, GLint y);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS2IVPROC) (const GLint *p);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS2SPROC) (GLshort x, GLshort y);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS2SVPROC) (const GLshort *p);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS3DPROC) (GLdouble x, GLdouble y, GLdouble z);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS3DVPROC) (const GLdouble *p);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS3FPROC) (GLfloat x, GLfloat y, GLfloat z);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS3FVPROC) (const GLfloat *p);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS3IPROC) (GLint x, GLint y, GLint z);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS3IVPROC) (const GLint *p);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS3SPROC) (GLshort x, GLshort y, GLshort z);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS3SVPROC) (const GLshort *p);
+
+#define glBlendColor GLEW_GET_FUN(__glewBlendColor)
+#define glBlendEquation GLEW_GET_FUN(__glewBlendEquation)
+#define glBlendFuncSeparate GLEW_GET_FUN(__glewBlendFuncSeparate)
+#define glFogCoordPointer GLEW_GET_FUN(__glewFogCoordPointer)
+#define glFogCoordd GLEW_GET_FUN(__glewFogCoordd)
+#define glFogCoorddv GLEW_GET_FUN(__glewFogCoorddv)
+#define glFogCoordf GLEW_GET_FUN(__glewFogCoordf)
+#define glFogCoordfv GLEW_GET_FUN(__glewFogCoordfv)
+#define glMultiDrawArrays GLEW_GET_FUN(__glewMultiDrawArrays)
+#define glMultiDrawElements GLEW_GET_FUN(__glewMultiDrawElements)
+#define glPointParameterf GLEW_GET_FUN(__glewPointParameterf)
+#define glPointParameterfv GLEW_GET_FUN(__glewPointParameterfv)
+#define glSecondaryColor3b GLEW_GET_FUN(__glewSecondaryColor3b)
+#define glSecondaryColor3bv GLEW_GET_FUN(__glewSecondaryColor3bv)
+#define glSecondaryColor3d GLEW_GET_FUN(__glewSecondaryColor3d)
+#define glSecondaryColor3dv GLEW_GET_FUN(__glewSecondaryColor3dv)
+#define glSecondaryColor3f GLEW_GET_FUN(__glewSecondaryColor3f)
+#define glSecondaryColor3fv GLEW_GET_FUN(__glewSecondaryColor3fv)
+#define glSecondaryColor3i GLEW_GET_FUN(__glewSecondaryColor3i)
+#define glSecondaryColor3iv GLEW_GET_FUN(__glewSecondaryColor3iv)
+#define glSecondaryColor3s GLEW_GET_FUN(__glewSecondaryColor3s)
+#define glSecondaryColor3sv GLEW_GET_FUN(__glewSecondaryColor3sv)
+#define glSecondaryColor3ub GLEW_GET_FUN(__glewSecondaryColor3ub)
+#define glSecondaryColor3ubv GLEW_GET_FUN(__glewSecondaryColor3ubv)
+#define glSecondaryColor3ui GLEW_GET_FUN(__glewSecondaryColor3ui)
+#define glSecondaryColor3uiv GLEW_GET_FUN(__glewSecondaryColor3uiv)
+#define glSecondaryColor3us GLEW_GET_FUN(__glewSecondaryColor3us)
+#define glSecondaryColor3usv GLEW_GET_FUN(__glewSecondaryColor3usv)
+#define glSecondaryColorPointer GLEW_GET_FUN(__glewSecondaryColorPointer)
+#define glWindowPos2d GLEW_GET_FUN(__glewWindowPos2d)
+#define glWindowPos2dv GLEW_GET_FUN(__glewWindowPos2dv)
+#define glWindowPos2f GLEW_GET_FUN(__glewWindowPos2f)
+#define glWindowPos2fv GLEW_GET_FUN(__glewWindowPos2fv)
+#define glWindowPos2i GLEW_GET_FUN(__glewWindowPos2i)
+#define glWindowPos2iv GLEW_GET_FUN(__glewWindowPos2iv)
+#define glWindowPos2s GLEW_GET_FUN(__glewWindowPos2s)
+#define glWindowPos2sv GLEW_GET_FUN(__glewWindowPos2sv)
+#define glWindowPos3d GLEW_GET_FUN(__glewWindowPos3d)
+#define glWindowPos3dv GLEW_GET_FUN(__glewWindowPos3dv)
+#define glWindowPos3f GLEW_GET_FUN(__glewWindowPos3f)
+#define glWindowPos3fv GLEW_GET_FUN(__glewWindowPos3fv)
+#define glWindowPos3i GLEW_GET_FUN(__glewWindowPos3i)
+#define glWindowPos3iv GLEW_GET_FUN(__glewWindowPos3iv)
+#define glWindowPos3s GLEW_GET_FUN(__glewWindowPos3s)
+#define glWindowPos3sv GLEW_GET_FUN(__glewWindowPos3sv)
+
+#define GLEW_VERSION_1_4 GLEW_GET_VAR(__GLEW_VERSION_1_4)
+
+#endif /* GL_VERSION_1_4 */
+
+/* ----------------------------- GL_VERSION_1_5 ---------------------------- */
+
+#ifndef GL_VERSION_1_5
+#define GL_VERSION_1_5 1
+
+#define GL_FOG_COORD_SRC GL_FOG_COORDINATE_SOURCE
+#define GL_FOG_COORD GL_FOG_COORDINATE
+#define GL_FOG_COORD_ARRAY GL_FOG_COORDINATE_ARRAY
+#define GL_SRC0_RGB GL_SOURCE0_RGB
+#define GL_FOG_COORD_ARRAY_POINTER GL_FOG_COORDINATE_ARRAY_POINTER
+#define GL_FOG_COORD_ARRAY_TYPE GL_FOG_COORDINATE_ARRAY_TYPE
+#define GL_SRC1_ALPHA GL_SOURCE1_ALPHA
+#define GL_CURRENT_FOG_COORD GL_CURRENT_FOG_COORDINATE
+#define GL_FOG_COORD_ARRAY_STRIDE GL_FOG_COORDINATE_ARRAY_STRIDE
+#define GL_SRC0_ALPHA GL_SOURCE0_ALPHA
+#define GL_SRC1_RGB GL_SOURCE1_RGB
+#define GL_FOG_COORD_ARRAY_BUFFER_BINDING GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING
+#define GL_SRC2_ALPHA GL_SOURCE2_ALPHA
+#define GL_SRC2_RGB GL_SOURCE2_RGB
+#define GL_BUFFER_SIZE 0x8764
+#define GL_BUFFER_USAGE 0x8765
+#define GL_QUERY_COUNTER_BITS 0x8864
+#define GL_CURRENT_QUERY 0x8865
+#define GL_QUERY_RESULT 0x8866
+#define GL_QUERY_RESULT_AVAILABLE 0x8867
+#define GL_ARRAY_BUFFER 0x8892
+#define GL_ELEMENT_ARRAY_BUFFER 0x8893
+#define GL_ARRAY_BUFFER_BINDING 0x8894
+#define GL_ELEMENT_ARRAY_BUFFER_BINDING 0x8895
+#define GL_VERTEX_ARRAY_BUFFER_BINDING 0x8896
+#define GL_NORMAL_ARRAY_BUFFER_BINDING 0x8897
+#define GL_COLOR_ARRAY_BUFFER_BINDING 0x8898
+#define GL_INDEX_ARRAY_BUFFER_BINDING 0x8899
+#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING 0x889A
+#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING 0x889B
+#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING 0x889C
+#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING 0x889D
+#define GL_WEIGHT_ARRAY_BUFFER_BINDING 0x889E
+#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING 0x889F
+#define GL_READ_ONLY 0x88B8
+#define GL_WRITE_ONLY 0x88B9
+#define GL_READ_WRITE 0x88BA
+#define GL_BUFFER_ACCESS 0x88BB
+#define GL_BUFFER_MAPPED 0x88BC
+#define GL_BUFFER_MAP_POINTER 0x88BD
+#define GL_STREAM_DRAW 0x88E0
+#define GL_STREAM_READ 0x88E1
+#define GL_STREAM_COPY 0x88E2
+#define GL_STATIC_DRAW 0x88E4
+#define GL_STATIC_READ 0x88E5
+#define GL_STATIC_COPY 0x88E6
+#define GL_DYNAMIC_DRAW 0x88E8
+#define GL_DYNAMIC_READ 0x88E9
+#define GL_DYNAMIC_COPY 0x88EA
+#define GL_SAMPLES_PASSED 0x8914
+
+typedef ptrdiff_t GLsizeiptr;
+typedef ptrdiff_t GLintptr;
+
+typedef void (GLAPIENTRY * PFNGLBEGINQUERYPROC) (GLenum target, GLuint id);
+typedef void (GLAPIENTRY * PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer);
+typedef void (GLAPIENTRY * PFNGLBUFFERDATAPROC) (GLenum target, GLsizeiptr size, const GLvoid* data, GLenum usage);
+typedef void (GLAPIENTRY * PFNGLBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid* data);
+typedef void (GLAPIENTRY * PFNGLDELETEBUFFERSPROC) (GLsizei n, const GLuint* buffers);
+typedef void (GLAPIENTRY * PFNGLDELETEQUERIESPROC) (GLsizei n, const GLuint* ids);
+typedef void (GLAPIENTRY * PFNGLENDQUERYPROC) (GLenum target);
+typedef void (GLAPIENTRY * PFNGLGENBUFFERSPROC) (GLsizei n, GLuint* buffers);
+typedef void (GLAPIENTRY * PFNGLGENQUERIESPROC) (GLsizei n, GLuint* ids);
+typedef void (GLAPIENTRY * PFNGLGETBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETBUFFERPOINTERVPROC) (GLenum target, GLenum pname, GLvoid** params);
+typedef void (GLAPIENTRY * PFNGLGETBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, GLvoid* data);
+typedef void (GLAPIENTRY * PFNGLGETQUERYOBJECTIVPROC) (GLuint id, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETQUERYOBJECTUIVPROC) (GLuint id, GLenum pname, GLuint* params);
+typedef void (GLAPIENTRY * PFNGLGETQUERYIVPROC) (GLenum target, GLenum pname, GLint* params);
+typedef GLboolean (GLAPIENTRY * PFNGLISBUFFERPROC) (GLuint buffer);
+typedef GLboolean (GLAPIENTRY * PFNGLISQUERYPROC) (GLuint id);
+typedef GLvoid* (GLAPIENTRY * PFNGLMAPBUFFERPROC) (GLenum target, GLenum access);
+typedef GLboolean (GLAPIENTRY * PFNGLUNMAPBUFFERPROC) (GLenum target);
+
+#define glBeginQuery GLEW_GET_FUN(__glewBeginQuery)
+#define glBindBuffer GLEW_GET_FUN(__glewBindBuffer)
+#define glBufferData GLEW_GET_FUN(__glewBufferData)
+#define glBufferSubData GLEW_GET_FUN(__glewBufferSubData)
+#define glDeleteBuffers GLEW_GET_FUN(__glewDeleteBuffers)
+#define glDeleteQueries GLEW_GET_FUN(__glewDeleteQueries)
+#define glEndQuery GLEW_GET_FUN(__glewEndQuery)
+#define glGenBuffers GLEW_GET_FUN(__glewGenBuffers)
+#define glGenQueries GLEW_GET_FUN(__glewGenQueries)
+#define glGetBufferParameteriv GLEW_GET_FUN(__glewGetBufferParameteriv)
+#define glGetBufferPointerv GLEW_GET_FUN(__glewGetBufferPointerv)
+#define glGetBufferSubData GLEW_GET_FUN(__glewGetBufferSubData)
+#define glGetQueryObjectiv GLEW_GET_FUN(__glewGetQueryObjectiv)
+#define glGetQueryObjectuiv GLEW_GET_FUN(__glewGetQueryObjectuiv)
+#define glGetQueryiv GLEW_GET_FUN(__glewGetQueryiv)
+#define glIsBuffer GLEW_GET_FUN(__glewIsBuffer)
+#define glIsQuery GLEW_GET_FUN(__glewIsQuery)
+#define glMapBuffer GLEW_GET_FUN(__glewMapBuffer)
+#define glUnmapBuffer GLEW_GET_FUN(__glewUnmapBuffer)
+
+#define GLEW_VERSION_1_5 GLEW_GET_VAR(__GLEW_VERSION_1_5)
+
+#endif /* GL_VERSION_1_5 */
+
+/* ----------------------------- GL_VERSION_2_0 ---------------------------- */
+
+#ifndef GL_VERSION_2_0
+#define GL_VERSION_2_0 1
+
+#define GL_BLEND_EQUATION_RGB GL_BLEND_EQUATION
+#define GL_VERTEX_ATTRIB_ARRAY_ENABLED 0x8622
+#define GL_VERTEX_ATTRIB_ARRAY_SIZE 0x8623
+#define GL_VERTEX_ATTRIB_ARRAY_STRIDE 0x8624
+#define GL_VERTEX_ATTRIB_ARRAY_TYPE 0x8625
+#define GL_CURRENT_VERTEX_ATTRIB 0x8626
+#define GL_VERTEX_PROGRAM_POINT_SIZE 0x8642
+#define GL_VERTEX_PROGRAM_TWO_SIDE 0x8643
+#define GL_VERTEX_ATTRIB_ARRAY_POINTER 0x8645
+#define GL_STENCIL_BACK_FUNC 0x8800
+#define GL_STENCIL_BACK_FAIL 0x8801
+#define GL_STENCIL_BACK_PASS_DEPTH_FAIL 0x8802
+#define GL_STENCIL_BACK_PASS_DEPTH_PASS 0x8803
+#define GL_MAX_DRAW_BUFFERS 0x8824
+#define GL_DRAW_BUFFER0 0x8825
+#define GL_DRAW_BUFFER1 0x8826
+#define GL_DRAW_BUFFER2 0x8827
+#define GL_DRAW_BUFFER3 0x8828
+#define GL_DRAW_BUFFER4 0x8829
+#define GL_DRAW_BUFFER5 0x882A
+#define GL_DRAW_BUFFER6 0x882B
+#define GL_DRAW_BUFFER7 0x882C
+#define GL_DRAW_BUFFER8 0x882D
+#define GL_DRAW_BUFFER9 0x882E
+#define GL_DRAW_BUFFER10 0x882F
+#define GL_DRAW_BUFFER11 0x8830
+#define GL_DRAW_BUFFER12 0x8831
+#define GL_DRAW_BUFFER13 0x8832
+#define GL_DRAW_BUFFER14 0x8833
+#define GL_DRAW_BUFFER15 0x8834
+#define GL_BLEND_EQUATION_ALPHA 0x883D
+#define GL_POINT_SPRITE 0x8861
+#define GL_COORD_REPLACE 0x8862
+#define GL_MAX_VERTEX_ATTRIBS 0x8869
+#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED 0x886A
+#define GL_MAX_TEXTURE_COORDS 0x8871
+#define GL_MAX_TEXTURE_IMAGE_UNITS 0x8872
+#define GL_FRAGMENT_SHADER 0x8B30
+#define GL_VERTEX_SHADER 0x8B31
+#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS 0x8B49
+#define GL_MAX_VERTEX_UNIFORM_COMPONENTS 0x8B4A
+#define GL_MAX_VARYING_FLOATS 0x8B4B
+#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS 0x8B4C
+#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS 0x8B4D
+#define GL_SHADER_TYPE 0x8B4F
+#define GL_FLOAT_VEC2 0x8B50
+#define GL_FLOAT_VEC3 0x8B51
+#define GL_FLOAT_VEC4 0x8B52
+#define GL_INT_VEC2 0x8B53
+#define GL_INT_VEC3 0x8B54
+#define GL_INT_VEC4 0x8B55
+#define GL_BOOL 0x8B56
+#define GL_BOOL_VEC2 0x8B57
+#define GL_BOOL_VEC3 0x8B58
+#define GL_BOOL_VEC4 0x8B59
+#define GL_FLOAT_MAT2 0x8B5A
+#define GL_FLOAT_MAT3 0x8B5B
+#define GL_FLOAT_MAT4 0x8B5C
+#define GL_SAMPLER_1D 0x8B5D
+#define GL_SAMPLER_2D 0x8B5E
+#define GL_SAMPLER_3D 0x8B5F
+#define GL_SAMPLER_CUBE 0x8B60
+#define GL_SAMPLER_1D_SHADOW 0x8B61
+#define GL_SAMPLER_2D_SHADOW 0x8B62
+#define GL_DELETE_STATUS 0x8B80
+#define GL_COMPILE_STATUS 0x8B81
+#define GL_LINK_STATUS 0x8B82
+#define GL_VALIDATE_STATUS 0x8B83
+#define GL_INFO_LOG_LENGTH 0x8B84
+#define GL_ATTACHED_SHADERS 0x8B85
+#define GL_ACTIVE_UNIFORMS 0x8B86
+#define GL_ACTIVE_UNIFORM_MAX_LENGTH 0x8B87
+#define GL_SHADER_SOURCE_LENGTH 0x8B88
+#define GL_ACTIVE_ATTRIBUTES 0x8B89
+#define GL_ACTIVE_ATTRIBUTE_MAX_LENGTH 0x8B8A
+#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT 0x8B8B
+#define GL_SHADING_LANGUAGE_VERSION 0x8B8C
+#define GL_CURRENT_PROGRAM 0x8B8D
+#define GL_POINT_SPRITE_COORD_ORIGIN 0x8CA0
+#define GL_LOWER_LEFT 0x8CA1
+#define GL_UPPER_LEFT 0x8CA2
+#define GL_STENCIL_BACK_REF 0x8CA3
+#define GL_STENCIL_BACK_VALUE_MASK 0x8CA4
+#define GL_STENCIL_BACK_WRITEMASK 0x8CA5
+
+typedef char GLchar;
+
+typedef void (GLAPIENTRY * PFNGLATTACHSHADERPROC) (GLuint program, GLuint shader);
+typedef void (GLAPIENTRY * PFNGLBINDATTRIBLOCATIONPROC) (GLuint program, GLuint index, const GLchar* name);
+typedef void (GLAPIENTRY * PFNGLBLENDEQUATIONSEPARATEPROC) (GLenum, GLenum);
+typedef void (GLAPIENTRY * PFNGLCOMPILESHADERPROC) (GLuint shader);
+typedef GLuint (GLAPIENTRY * PFNGLCREATEPROGRAMPROC) (void);
+typedef GLuint (GLAPIENTRY * PFNGLCREATESHADERPROC) (GLenum type);
+typedef void (GLAPIENTRY * PFNGLDELETEPROGRAMPROC) (GLuint program);
+typedef void (GLAPIENTRY * PFNGLDELETESHADERPROC) (GLuint shader);
+typedef void (GLAPIENTRY * PFNGLDETACHSHADERPROC) (GLuint program, GLuint shader);
+typedef void (GLAPIENTRY * PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint);
+typedef void (GLAPIENTRY * PFNGLDRAWBUFFERSPROC) (GLsizei n, const GLenum* bufs);
+typedef void (GLAPIENTRY * PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint);
+typedef void (GLAPIENTRY * PFNGLGETACTIVEATTRIBPROC) (GLuint program, GLuint index, GLsizei maxLength, GLsizei* length, GLint* size, GLenum* type, GLchar* name);
+typedef void (GLAPIENTRY * PFNGLGETACTIVEUNIFORMPROC) (GLuint program, GLuint index, GLsizei maxLength, GLsizei* length, GLint* size, GLenum* type, GLchar* name);
+typedef void (GLAPIENTRY * PFNGLGETATTACHEDSHADERSPROC) (GLuint program, GLsizei maxCount, GLsizei* count, GLuint* shaders);
+typedef GLint (GLAPIENTRY * PFNGLGETATTRIBLOCATIONPROC) (GLuint program, const GLchar* name);
+typedef void (GLAPIENTRY * PFNGLGETPROGRAMINFOLOGPROC) (GLuint program, GLsizei bufSize, GLsizei* length, GLchar* infoLog);
+typedef void (GLAPIENTRY * PFNGLGETPROGRAMIVPROC) (GLuint program, GLenum pname, GLint* param);
+typedef void (GLAPIENTRY * PFNGLGETSHADERINFOLOGPROC) (GLuint shader, GLsizei bufSize, GLsizei* length, GLchar* infoLog);
+typedef void (GLAPIENTRY * PFNGLGETSHADERSOURCEPROC) (GLint obj, GLsizei maxLength, GLsizei* length, GLchar* source);
+typedef void (GLAPIENTRY * PFNGLGETSHADERIVPROC) (GLuint shader, GLenum pname, GLint* param);
+typedef GLint (GLAPIENTRY * PFNGLGETUNIFORMLOCATIONPROC) (GLint programObj, const GLchar* name);
+typedef void (GLAPIENTRY * PFNGLGETUNIFORMFVPROC) (GLuint program, GLint location, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETUNIFORMIVPROC) (GLuint program, GLint location, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBPOINTERVPROC) (GLuint, GLenum, GLvoid*);
+typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBDVPROC) (GLuint, GLenum, GLdouble*);
+typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBFVPROC) (GLuint, GLenum, GLfloat*);
+typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBIVPROC) (GLuint, GLenum, GLint*);
+typedef GLboolean (GLAPIENTRY * PFNGLISPROGRAMPROC) (GLuint program);
+typedef GLboolean (GLAPIENTRY * PFNGLISSHADERPROC) (GLuint shader);
+typedef void (GLAPIENTRY * PFNGLLINKPROGRAMPROC) (GLuint program);
+typedef void (GLAPIENTRY * PFNGLSHADERSOURCEPROC) (GLuint shader, GLsizei count, const GLchar** strings, const GLint* lengths);
+typedef void (GLAPIENTRY * PFNGLSTENCILFUNCSEPARATEPROC) (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+typedef void (GLAPIENTRY * PFNGLSTENCILMASKSEPARATEPROC) (GLenum, GLuint);
+typedef void (GLAPIENTRY * PFNGLSTENCILOPSEPARATEPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
+typedef void (GLAPIENTRY * PFNGLUNIFORM1FPROC) (GLint location, GLfloat v0);
+typedef void (GLAPIENTRY * PFNGLUNIFORM1FVPROC) (GLint location, GLsizei count, const GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORM1IPROC) (GLint location, GLint v0);
+typedef void (GLAPIENTRY * PFNGLUNIFORM1IVPROC) (GLint location, GLsizei count, const GLint* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORM2FPROC) (GLint location, GLfloat v0, GLfloat v1);
+typedef void (GLAPIENTRY * PFNGLUNIFORM2FVPROC) (GLint location, GLsizei count, const GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORM2IPROC) (GLint location, GLint v0, GLint v1);
+typedef void (GLAPIENTRY * PFNGLUNIFORM2IVPROC) (GLint location, GLsizei count, const GLint* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORM3FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+typedef void (GLAPIENTRY * PFNGLUNIFORM3FVPROC) (GLint location, GLsizei count, const GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORM3IPROC) (GLint location, GLint v0, GLint v1, GLint v2);
+typedef void (GLAPIENTRY * PFNGLUNIFORM3IVPROC) (GLint location, GLsizei count, const GLint* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORM4FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+typedef void (GLAPIENTRY * PFNGLUNIFORM4FVPROC) (GLint location, GLsizei count, const GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORM4IPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+typedef void (GLAPIENTRY * PFNGLUNIFORM4IVPROC) (GLint location, GLsizei count, const GLint* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLUSEPROGRAMPROC) (GLuint program);
+typedef void (GLAPIENTRY * PFNGLVALIDATEPROGRAMPROC) (GLuint program);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1DPROC) (GLuint index, GLdouble x);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1DVPROC) (GLuint index, const GLdouble* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1FPROC) (GLuint index, GLfloat x);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1FVPROC) (GLuint index, const GLfloat* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1SPROC) (GLuint index, GLshort x);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1SVPROC) (GLuint index, const GLshort* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2DPROC) (GLuint index, GLdouble x, GLdouble y);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2DVPROC) (GLuint index, const GLdouble* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2FPROC) (GLuint index, GLfloat x, GLfloat y);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2FVPROC) (GLuint index, const GLfloat* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2SPROC) (GLuint index, GLshort x, GLshort y);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2SVPROC) (GLuint index, const GLshort* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3DVPROC) (GLuint index, const GLdouble* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3FVPROC) (GLuint index, const GLfloat* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3SPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3SVPROC) (GLuint index, const GLshort* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NBVPROC) (GLuint index, const GLbyte* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NIVPROC) (GLuint index, const GLint* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NSVPROC) (GLuint index, const GLshort* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NUBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NUBVPROC) (GLuint index, const GLubyte* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NUIVPROC) (GLuint index, const GLuint* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NUSVPROC) (GLuint index, const GLushort* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4BVPROC) (GLuint index, const GLbyte* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4DVPROC) (GLuint index, const GLdouble* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4FVPROC) (GLuint index, const GLfloat* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4IVPROC) (GLuint index, const GLint* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4SPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4SVPROC) (GLuint index, const GLshort* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4UBVPROC) (GLuint index, const GLubyte* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4UIVPROC) (GLuint index, const GLuint* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4USVPROC) (GLuint index, const GLushort* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid* pointer);
+
+#define glAttachShader GLEW_GET_FUN(__glewAttachShader)
+#define glBindAttribLocation GLEW_GET_FUN(__glewBindAttribLocation)
+#define glBlendEquationSeparate GLEW_GET_FUN(__glewBlendEquationSeparate)
+#define glCompileShader GLEW_GET_FUN(__glewCompileShader)
+#define glCreateProgram GLEW_GET_FUN(__glewCreateProgram)
+#define glCreateShader GLEW_GET_FUN(__glewCreateShader)
+#define glDeleteProgram GLEW_GET_FUN(__glewDeleteProgram)
+#define glDeleteShader GLEW_GET_FUN(__glewDeleteShader)
+#define glDetachShader GLEW_GET_FUN(__glewDetachShader)
+#define glDisableVertexAttribArray GLEW_GET_FUN(__glewDisableVertexAttribArray)
+#define glDrawBuffers GLEW_GET_FUN(__glewDrawBuffers)
+#define glEnableVertexAttribArray GLEW_GET_FUN(__glewEnableVertexAttribArray)
+#define glGetActiveAttrib GLEW_GET_FUN(__glewGetActiveAttrib)
+#define glGetActiveUniform GLEW_GET_FUN(__glewGetActiveUniform)
+#define glGetAttachedShaders GLEW_GET_FUN(__glewGetAttachedShaders)
+#define glGetAttribLocation GLEW_GET_FUN(__glewGetAttribLocation)
+#define glGetProgramInfoLog GLEW_GET_FUN(__glewGetProgramInfoLog)
+#define glGetProgramiv GLEW_GET_FUN(__glewGetProgramiv)
+#define glGetShaderInfoLog GLEW_GET_FUN(__glewGetShaderInfoLog)
+#define glGetShaderSource GLEW_GET_FUN(__glewGetShaderSource)
+#define glGetShaderiv GLEW_GET_FUN(__glewGetShaderiv)
+#define glGetUniformLocation GLEW_GET_FUN(__glewGetUniformLocation)
+#define glGetUniformfv GLEW_GET_FUN(__glewGetUniformfv)
+#define glGetUniformiv GLEW_GET_FUN(__glewGetUniformiv)
+#define glGetVertexAttribPointerv GLEW_GET_FUN(__glewGetVertexAttribPointerv)
+#define glGetVertexAttribdv GLEW_GET_FUN(__glewGetVertexAttribdv)
+#define glGetVertexAttribfv GLEW_GET_FUN(__glewGetVertexAttribfv)
+#define glGetVertexAttribiv GLEW_GET_FUN(__glewGetVertexAttribiv)
+#define glIsProgram GLEW_GET_FUN(__glewIsProgram)
+#define glIsShader GLEW_GET_FUN(__glewIsShader)
+#define glLinkProgram GLEW_GET_FUN(__glewLinkProgram)
+#define glShaderSource GLEW_GET_FUN(__glewShaderSource)
+#define glStencilFuncSeparate GLEW_GET_FUN(__glewStencilFuncSeparate)
+#define glStencilMaskSeparate GLEW_GET_FUN(__glewStencilMaskSeparate)
+#define glStencilOpSeparate GLEW_GET_FUN(__glewStencilOpSeparate)
+#define glUniform1f GLEW_GET_FUN(__glewUniform1f)
+#define glUniform1fv GLEW_GET_FUN(__glewUniform1fv)
+#define glUniform1i GLEW_GET_FUN(__glewUniform1i)
+#define glUniform1iv GLEW_GET_FUN(__glewUniform1iv)
+#define glUniform2f GLEW_GET_FUN(__glewUniform2f)
+#define glUniform2fv GLEW_GET_FUN(__glewUniform2fv)
+#define glUniform2i GLEW_GET_FUN(__glewUniform2i)
+#define glUniform2iv GLEW_GET_FUN(__glewUniform2iv)
+#define glUniform3f GLEW_GET_FUN(__glewUniform3f)
+#define glUniform3fv GLEW_GET_FUN(__glewUniform3fv)
+#define glUniform3i GLEW_GET_FUN(__glewUniform3i)
+#define glUniform3iv GLEW_GET_FUN(__glewUniform3iv)
+#define glUniform4f GLEW_GET_FUN(__glewUniform4f)
+#define glUniform4fv GLEW_GET_FUN(__glewUniform4fv)
+#define glUniform4i GLEW_GET_FUN(__glewUniform4i)
+#define glUniform4iv GLEW_GET_FUN(__glewUniform4iv)
+#define glUniformMatrix2fv GLEW_GET_FUN(__glewUniformMatrix2fv)
+#define glUniformMatrix3fv GLEW_GET_FUN(__glewUniformMatrix3fv)
+#define glUniformMatrix4fv GLEW_GET_FUN(__glewUniformMatrix4fv)
+#define glUseProgram GLEW_GET_FUN(__glewUseProgram)
+#define glValidateProgram GLEW_GET_FUN(__glewValidateProgram)
+#define glVertexAttrib1d GLEW_GET_FUN(__glewVertexAttrib1d)
+#define glVertexAttrib1dv GLEW_GET_FUN(__glewVertexAttrib1dv)
+#define glVertexAttrib1f GLEW_GET_FUN(__glewVertexAttrib1f)
+#define glVertexAttrib1fv GLEW_GET_FUN(__glewVertexAttrib1fv)
+#define glVertexAttrib1s GLEW_GET_FUN(__glewVertexAttrib1s)
+#define glVertexAttrib1sv GLEW_GET_FUN(__glewVertexAttrib1sv)
+#define glVertexAttrib2d GLEW_GET_FUN(__glewVertexAttrib2d)
+#define glVertexAttrib2dv GLEW_GET_FUN(__glewVertexAttrib2dv)
+#define glVertexAttrib2f GLEW_GET_FUN(__glewVertexAttrib2f)
+#define glVertexAttrib2fv GLEW_GET_FUN(__glewVertexAttrib2fv)
+#define glVertexAttrib2s GLEW_GET_FUN(__glewVertexAttrib2s)
+#define glVertexAttrib2sv GLEW_GET_FUN(__glewVertexAttrib2sv)
+#define glVertexAttrib3d GLEW_GET_FUN(__glewVertexAttrib3d)
+#define glVertexAttrib3dv GLEW_GET_FUN(__glewVertexAttrib3dv)
+#define glVertexAttrib3f GLEW_GET_FUN(__glewVertexAttrib3f)
+#define glVertexAttrib3fv GLEW_GET_FUN(__glewVertexAttrib3fv)
+#define glVertexAttrib3s GLEW_GET_FUN(__glewVertexAttrib3s)
+#define glVertexAttrib3sv GLEW_GET_FUN(__glewVertexAttrib3sv)
+#define glVertexAttrib4Nbv GLEW_GET_FUN(__glewVertexAttrib4Nbv)
+#define glVertexAttrib4Niv GLEW_GET_FUN(__glewVertexAttrib4Niv)
+#define glVertexAttrib4Nsv GLEW_GET_FUN(__glewVertexAttrib4Nsv)
+#define glVertexAttrib4Nub GLEW_GET_FUN(__glewVertexAttrib4Nub)
+#define glVertexAttrib4Nubv GLEW_GET_FUN(__glewVertexAttrib4Nubv)
+#define glVertexAttrib4Nuiv GLEW_GET_FUN(__glewVertexAttrib4Nuiv)
+#define glVertexAttrib4Nusv GLEW_GET_FUN(__glewVertexAttrib4Nusv)
+#define glVertexAttrib4bv GLEW_GET_FUN(__glewVertexAttrib4bv)
+#define glVertexAttrib4d GLEW_GET_FUN(__glewVertexAttrib4d)
+#define glVertexAttrib4dv GLEW_GET_FUN(__glewVertexAttrib4dv)
+#define glVertexAttrib4f GLEW_GET_FUN(__glewVertexAttrib4f)
+#define glVertexAttrib4fv GLEW_GET_FUN(__glewVertexAttrib4fv)
+#define glVertexAttrib4iv GLEW_GET_FUN(__glewVertexAttrib4iv)
+#define glVertexAttrib4s GLEW_GET_FUN(__glewVertexAttrib4s)
+#define glVertexAttrib4sv GLEW_GET_FUN(__glewVertexAttrib4sv)
+#define glVertexAttrib4ubv GLEW_GET_FUN(__glewVertexAttrib4ubv)
+#define glVertexAttrib4uiv GLEW_GET_FUN(__glewVertexAttrib4uiv)
+#define glVertexAttrib4usv GLEW_GET_FUN(__glewVertexAttrib4usv)
+#define glVertexAttribPointer GLEW_GET_FUN(__glewVertexAttribPointer)
+
+#define GLEW_VERSION_2_0 GLEW_GET_VAR(__GLEW_VERSION_2_0)
+
+#endif /* GL_VERSION_2_0 */
+
+/* ----------------------------- GL_VERSION_2_1 ---------------------------- */
+
+#ifndef GL_VERSION_2_1
+#define GL_VERSION_2_1 1
+
+#define GL_CURRENT_RASTER_SECONDARY_COLOR 0x845F
+#define GL_PIXEL_PACK_BUFFER 0x88EB
+#define GL_PIXEL_UNPACK_BUFFER 0x88EC
+#define GL_PIXEL_PACK_BUFFER_BINDING 0x88ED
+#define GL_PIXEL_UNPACK_BUFFER_BINDING 0x88EF
+#define GL_SRGB 0x8C40
+#define GL_SRGB8 0x8C41
+#define GL_SRGB_ALPHA 0x8C42
+#define GL_SRGB8_ALPHA8 0x8C43
+#define GL_SLUMINANCE_ALPHA 0x8C44
+#define GL_SLUMINANCE8_ALPHA8 0x8C45
+#define GL_SLUMINANCE 0x8C46
+#define GL_SLUMINANCE8 0x8C47
+#define GL_COMPRESSED_SRGB 0x8C48
+#define GL_COMPRESSED_SRGB_ALPHA 0x8C49
+#define GL_COMPRESSED_SLUMINANCE 0x8C4A
+#define GL_COMPRESSED_SLUMINANCE_ALPHA 0x8C4B
+
+typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX2X3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX2X4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX3X2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX3X4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX4X2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX4X3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+
+#define glUniformMatrix2x3fv GLEW_GET_FUN(__glewUniformMatrix2x3fv)
+#define glUniformMatrix2x4fv GLEW_GET_FUN(__glewUniformMatrix2x4fv)
+#define glUniformMatrix3x2fv GLEW_GET_FUN(__glewUniformMatrix3x2fv)
+#define glUniformMatrix3x4fv GLEW_GET_FUN(__glewUniformMatrix3x4fv)
+#define glUniformMatrix4x2fv GLEW_GET_FUN(__glewUniformMatrix4x2fv)
+#define glUniformMatrix4x3fv GLEW_GET_FUN(__glewUniformMatrix4x3fv)
+
+#define GLEW_VERSION_2_1 GLEW_GET_VAR(__GLEW_VERSION_2_1)
+
+#endif /* GL_VERSION_2_1 */
+
+/* -------------------------- GL_3DFX_multisample -------------------------- */
+
+#ifndef GL_3DFX_multisample
+#define GL_3DFX_multisample 1
+
+#define GL_MULTISAMPLE_3DFX 0x86B2
+#define GL_SAMPLE_BUFFERS_3DFX 0x86B3
+#define GL_SAMPLES_3DFX 0x86B4
+#define GL_MULTISAMPLE_BIT_3DFX 0x20000000
+
+#define GLEW_3DFX_multisample GLEW_GET_VAR(__GLEW_3DFX_multisample)
+
+#endif /* GL_3DFX_multisample */
+
+/* ---------------------------- GL_3DFX_tbuffer ---------------------------- */
+
+#ifndef GL_3DFX_tbuffer
+#define GL_3DFX_tbuffer 1
+
+typedef void (GLAPIENTRY * PFNGLTBUFFERMASK3DFXPROC) (GLuint mask);
+
+#define glTbufferMask3DFX GLEW_GET_FUN(__glewTbufferMask3DFX)
+
+#define GLEW_3DFX_tbuffer GLEW_GET_VAR(__GLEW_3DFX_tbuffer)
+
+#endif /* GL_3DFX_tbuffer */
+
+/* -------------------- GL_3DFX_texture_compression_FXT1 ------------------- */
+
+#ifndef GL_3DFX_texture_compression_FXT1
+#define GL_3DFX_texture_compression_FXT1 1
+
+#define GL_COMPRESSED_RGB_FXT1_3DFX 0x86B0
+#define GL_COMPRESSED_RGBA_FXT1_3DFX 0x86B1
+
+#define GLEW_3DFX_texture_compression_FXT1 GLEW_GET_VAR(__GLEW_3DFX_texture_compression_FXT1)
+
+#endif /* GL_3DFX_texture_compression_FXT1 */
+
+/* ------------------------ GL_APPLE_client_storage ------------------------ */
+
+#ifndef GL_APPLE_client_storage
+#define GL_APPLE_client_storage 1
+
+#define GL_UNPACK_CLIENT_STORAGE_APPLE 0x85B2
+
+#define GLEW_APPLE_client_storage GLEW_GET_VAR(__GLEW_APPLE_client_storage)
+
+#endif /* GL_APPLE_client_storage */
+
+/* ------------------------- GL_APPLE_element_array ------------------------ */
+
+#ifndef GL_APPLE_element_array
+#define GL_APPLE_element_array 1
+
+#define GL_ELEMENT_ARRAY_APPLE 0x8768
+#define GL_ELEMENT_ARRAY_TYPE_APPLE 0x8769
+#define GL_ELEMENT_ARRAY_POINTER_APPLE 0x876A
+
+typedef void (GLAPIENTRY * PFNGLDRAWELEMENTARRAYAPPLEPROC) (GLenum mode, GLint first, GLsizei count);
+typedef void (GLAPIENTRY * PFNGLDRAWRANGEELEMENTARRAYAPPLEPROC) (GLenum mode, GLuint start, GLuint end, GLint first, GLsizei count);
+typedef void (GLAPIENTRY * PFNGLELEMENTPOINTERAPPLEPROC) (GLenum type, const void* pointer);
+typedef void (GLAPIENTRY * PFNGLMULTIDRAWELEMENTARRAYAPPLEPROC) (GLenum mode, const GLint* first, const GLsizei *count, GLsizei primcount);
+typedef void (GLAPIENTRY * PFNGLMULTIDRAWRANGEELEMENTARRAYAPPLEPROC) (GLenum mode, GLuint start, GLuint end, const GLint* first, const GLsizei *count, GLsizei primcount);
+
+#define glDrawElementArrayAPPLE GLEW_GET_FUN(__glewDrawElementArrayAPPLE)

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Crayzedsgui-cvsmk2] SF.net SVN: crayzedsgui: [1736] cegui_mk2/branches/v0-6

From: <ice-drezday@us...> - 2008-06-07 16:36

Revision: 1736
          http://crayzedsgui.svn.sourceforge.net/crayzedsgui/?rev=1736&view=rev
Author:   ice-drezday
Date:     2008-06-07 09:36:38 -0700 (Sat, 07 Jun 2008)

Log Message:
-----------
FIX: Minor issues with integrated GLEW build on premake/msvc++ builds.

Modified Paths:
--------------
    cegui_mk2/branches/v0-6/RendererModules/OpenGLGUIRenderer/openglrenderer.cpp
    cegui_mk2/branches/v0-6/makefiles/premake/RendererModules/OpenGLGUIRenderer/premake.lua

Modified: cegui_mk2/branches/v0-6/RendererModules/OpenGLGUIRenderer/openglrenderer.cpp
===================================================================
--- cegui_mk2/branches/v0-6/RendererModules/OpenGLGUIRenderer/openglrenderer.cpp	2008-06-07 16:04:08 UTC (rev 1735)
+++ cegui_mk2/branches/v0-6/RendererModules/OpenGLGUIRenderer/openglrenderer.cpp	2008-06-07 16:36:38 UTC (rev 1736)
@@ -73,6 +73,12 @@
 // This is all done totally internally here; no need for external interface
 // to show any of this.
 //----------------------------------------------------------------------------//
+// we only really need this with MSVC / Windows(?) and by now it should already
+// be defined on that platform, so we just define it as empty macro so the
+// compile does not break on other systems.
+#ifndef APIENTRY
+#   define APIENTRY
+#endif
 //! Function to perform extentsions initialisation.
 void initialiseGLExtensions();
 //! Pointer to a function to use as glActiveTexture
@@ -80,7 +86,7 @@
 //! Pointer to a function to use as glClientActiveTexture
 PFNGLCLIENTACTIVETEXTUREPROC CEGUI_clientActiveTexture;
 //! Dummy function for if real ones are not present (saves testing each render)
-void activeTextureDummy(GLenum) {}
+void APIENTRY activeTextureDummy(GLenum) {}
 //----------------------------------------------------------------------------//
 
 /*************************************************************************

Modified: cegui_mk2/branches/v0-6/makefiles/premake/RendererModules/OpenGLGUIRenderer/premake.lua
===================================================================
--- cegui_mk2/branches/v0-6/makefiles/premake/RendererModules/OpenGLGUIRenderer/premake.lua	2008-06-07 16:04:08 UTC (rev 1735)
+++ cegui_mk2/branches/v0-6/makefiles/premake/RendererModules/OpenGLGUIRenderer/premake.lua	2008-06-07 16:36:38 UTC (rev 1736)
@@ -13,6 +13,7 @@
 }
 
 include(pkgdir)
+include(pkgdir.."GLEW")
 include(rootdir)
 
 if windows then
@@ -24,3 +25,4 @@
 dependency("CEGUIBase")
 
 define("OPENGL_GUIRENDERER_EXPORTS")
+define("GLEW_STATIC")


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Crayzedsgui-cvsmk2] SF.net SVN: crayzedsgui: [1737] cegui_mk2/branches/v0-6

From: <ice-drezday@us...> - 2008-06-08 14:47

Revision: 1737
          http://crayzedsgui.svn.sourceforge.net/crayzedsgui/?rev=1737&view=rev
Author:   ice-drezday
Date:     2008-06-08 07:47:19 -0700 (Sun, 08 Jun 2008)

Log Message:
-----------
FIX: Between the 0.5.0 and 0.6.0 releases the System::setDefaultXMLParserName function was bastardised to perform a function other than its intended purpose.  This fix restores the intended behaviour of setDefaultXMLParserName and adds functions for setting the XML parser after System instantiation correctly.  See: http://www.cegui.org.uk/mantis/view.php?id=186

Modified Paths:
--------------
    cegui_mk2/branches/v0-6/include/CEGUISystem.h
    cegui_mk2/branches/v0-6/src/CEGUISystem.cpp

Modified: cegui_mk2/branches/v0-6/include/CEGUISystem.h
===================================================================
--- cegui_mk2/branches/v0-6/include/CEGUISystem.h	2008-06-07 16:36:38 UTC (rev 1736)
+++ cegui_mk2/branches/v0-6/include/CEGUISystem.h	2008-06-08 14:47:19 UTC (rev 1737)
@@ -509,6 +509,39 @@
 
     /*!
     \brief
+        Set a new XML parser module to be used.
+
+        The current XMLParser will be cleaned up and, if owned by the system,
+        also deleted, as will any dynamically loaded module associated with the
+        XMLParser object.  The newly created XMLParser object, and the
+        associated module will be owned by the system.
+
+    \param parserName
+        String object describing the name of the XML parser module to be used.
+    */
+    void setXMLParser(const String& parserName);
+
+    /*!
+    \brief
+        Sets the XMLParser object to be used by the system.
+
+        The current XMLParser will be cleaned up and, if owned by the system,
+        also deleted, as will any dynamically loaded module associated with the
+        XMLParser object.
+
+        If the argument passed in the \a parser parameter is 0, the system will
+        cleanup any existing parser as described above, and revert to using
+        the parser provided by the default module (see getDefaultXMLParserName
+        and setDefaultXMLParserName).
+
+    \param parser
+        Pointer to the XMLParser object to be used by the system, or 0 to cause
+        the system to initialise a default parser.
+    */
+    void setXMLParser(XMLParser* parser);
+
+    /*!
+    \brief
         Return the XMLParser object.
      */
     XMLParser* getXMLParser(void) const     { return d_xmlParser; }

Modified: cegui_mk2/branches/v0-6/src/CEGUISystem.cpp
===================================================================
--- cegui_mk2/branches/v0-6/src/CEGUISystem.cpp	2008-06-07 16:36:38 UTC (rev 1736)
+++ cegui_mk2/branches/v0-6/src/CEGUISystem.cpp	2008-06-08 14:47:19 UTC (rev 1737)
@@ -1518,73 +1518,98 @@
     delete  GlobalEventSet::getSingletonPtr();
 }
 
+//----------------------------------------------------------------------------//
 void System::setupXMLParser()
 {
     // handle creation / initialisation of XMLParser
     if (!d_xmlParser)
     {
-
-#if !defined(CEGUI_STATIC)
-        // load the dynamic module
-        d_parserModule = new DynamicModule(String("CEGUI") + d_defaultXMLParserName);
-        // get pointer to parser creation function
-        XMLParser* (*createFunc)(void) =
-            (XMLParser* (*)(void))d_parserModule->getSymbolAddress("createParser");
-        // create the parser object
-        d_xmlParser = createFunc();
+#ifndef CEGUI_STATIC
+        setXMLParser(d_defaultXMLParserName);
 #else
-		//Static Linking Call
-		d_xmlParser = createParser();
-#endif
+        //Static Linking Call
+        d_xmlParser = createParser();
         // make sure we know to cleanup afterwards.
         d_ourXmlParser = true;
+#endif
     }
-
-    // perform initialisation of XML parser.
-    d_xmlParser->initialise();
+    // parser object already set, just initialise it.
+    else
+        d_xmlParser->initialise();
 }
 
+//----------------------------------------------------------------------------//
 void System::cleanupXMLParser()
 {
-    if (d_xmlParser)
+    // bail out if no parser
+    if (!d_xmlParser)
+        return;
+
+    // get parser object to do whatever cleanup it needs to
+    d_xmlParser->cleanup();
+
+    // exit if we did not create this parser object
+    if (!d_ourXmlParser)
+        return;
+
+    // if parser module loaded, destroy the parser object & cleanup module
+    if (d_parserModule)
     {
-        d_xmlParser->cleanup();
+        // get pointer to parser deletion function
+        void(*deleteFunc)(XMLParser*) = (void(*)(XMLParser*))d_parserModule->
+            getSymbolAddress("destroyParser");
+        // cleanup the xml parser object
+        deleteFunc(d_xmlParser);
 
-        if (d_ourXmlParser && d_parserModule)
-        {
-#if !defined(CEGUI_STATIC)
-            // get pointer to parser deletion function
-            void(*deleteFunc)(XMLParser*) =
-                (void(*)(XMLParser*))d_parserModule->getSymbolAddress("destroyParser");
-            // cleanup the xml parser object
-            deleteFunc(d_xmlParser);
+        // delete the dynamic module for the xml parser
+        delete d_parserModule;
+        d_parserModule = 0;
+    }
+#ifdef CEGUI_STATIC
+    else
+        //Static Linking Call
+        destroyParser(d_xmlParser);
+#endif
+
+    d_xmlParser = 0;
+}
+
+//----------------------------------------------------------------------------//
+void System::setXMLParser(const String& parserName)
+{
+#ifndef CEGUI_STATIC
+    cleanupXMLParser();
+    // load dynamic module
+    d_parserModule = new DynamicModule(String("CEGUI") + parserName);
+    // get pointer to parser creation function
+    XMLParser* (*createFunc)(void) =
+        (XMLParser* (*)(void))d_parserModule->getSymbolAddress("createParser");
+    // create the parser object
+    d_xmlParser = createFunc();
+    // make sure we know to cleanup afterwards.
+    d_ourXmlParser = true;
+    // perform initialisation of XML parser.
+    d_xmlParser->initialise();
 #else
-			//Static Linking Call
-			destroyParser(d_xmlParser);
+    Logger::getSingleton().logEvent(
+        "System::setXMLParser(const String& parserName) called from statically "
+        "linked CEGUI library - unable to load dynamic module!", Errors);
 #endif
-            d_xmlParser = 0;
-            // delete the dynamic module for the xml parser
-            delete d_parserModule;
-            d_parserModule = 0;
-        }
-    }
 }
 
+//----------------------------------------------------------------------------//
+void System::setXMLParser(XMLParser* parser)
+{
+    cleanupXMLParser();
+    d_xmlParser = parser;
+    d_ourXmlParser = false;
+    setupXMLParser();
+}
+
+//----------------------------------------------------------------------------//
 void System::setDefaultXMLParserName(const String& parserName)
 {
-#if !defined(CEGUI_STATIC)
-	if(d_defaultXMLParserName == parserName)
-		return;
-
-	//We do this becuase cleanup and setup aren't static functions
-	if(getSingletonPtr())
-	{
-		System* sys = getSingletonPtr();
-		sys->cleanupXMLParser();
-		d_defaultXMLParserName = parserName;
-		sys->setupXMLParser();
-	} // if(getSingletonPtr())
-#endif
+    d_defaultXMLParserName = parserName;
 }
 
 const String System::getDefaultXMLParserName()


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Crayzedsgui-cvsmk2] SF.net SVN: crayzedsgui: [1756] cegui_mk2/branches/v0-6

From: <ice-drezday@us...> - 2008-06-17 19:48

Revision: 1756
          http://crayzedsgui.svn.sourceforge.net/crayzedsgui/?rev=1756&view=rev
Author:   ice-drezday
Date:     2008-06-17 12:47:27 -0700 (Tue, 17 Jun 2008)

Log Message:
-----------
FIX: ItemListbox::removeItem() does was not checking if removed item was the one referenced in d_lastSelected, so was leaving a dangling pointer.  See: http://www.cegui.org.uk/mantis/view.php?id=206

Modified Paths:
--------------
    cegui_mk2/branches/v0-6/include/elements/CEGUIItemListbox.h
    cegui_mk2/branches/v0-6/src/elements/CEGUIItemListbox.cpp

Modified: cegui_mk2/branches/v0-6/include/elements/CEGUIItemListbox.h
===================================================================
--- cegui_mk2/branches/v0-6/include/elements/CEGUIItemListbox.h	2008-06-17 13:50:57 UTC (rev 1755)
+++ cegui_mk2/branches/v0-6/include/elements/CEGUIItemListbox.h	2008-06-17 19:47:27 UTC (rev 1756)
@@ -140,6 +140,9 @@
     /************************************************************************
         Manipulators
     *************************************************************************/
+    // Overridden from base class
+    virtual void initialiseComponents(void);
+
     /*!
     \brief
         Set whether or not multiple selections should be allowed.
@@ -284,6 +287,8 @@
 private:
     void addItemListboxProperties(void);
     void addItemListboxEvents(void);
+    //! Handler called when window is removed from the content pane
+    bool handle_PaneChildRemoved(const EventArgs& e);
 };
 
 } // end CEGUI namespace

Modified: cegui_mk2/branches/v0-6/src/elements/CEGUIItemListbox.cpp
===================================================================
--- cegui_mk2/branches/v0-6/src/elements/CEGUIItemListbox.cpp	2008-06-17 13:50:57 UTC (rev 1755)
+++ cegui_mk2/branches/v0-6/src/elements/CEGUIItemListbox.cpp	2008-06-17 19:47:27 UTC (rev 1756)
@@ -431,4 +431,27 @@
     }
 }
 
+//----------------------------------------------------------------------------//
+void ItemListbox::initialiseComponents(void)
+{
+    // call base implementation
+    ScrolledItemListBase::initialiseComponents();
+    
+    d_pane->subscribeEvent(Window::EventChildRemoved,
+        Event::Subscriber(&ItemListbox::handle_PaneChildRemoved, this));
+}
+
+//----------------------------------------------------------------------------//
+bool ItemListbox::handle_PaneChildRemoved(const EventArgs& e)
+{
+    // get the window that's being removed
+    const Window* w = static_cast<const WindowEventArgs&>(e).window;
+    // Clear last selected pointer if that item was just removed.
+    if (w == d_lastSelected)
+        d_lastSelected = 0;
+
+    return true;
+}
+//----------------------------------------------------------------------------//
+
 } // end CEGUI namespace


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Crayzedsgui-cvsmk2] SF.net SVN: crayzedsgui: [1757] cegui_mk2/branches/v0-6

From: <ice-drezday@us...> - 2008-06-18 09:46

Revision: 1757
          http://crayzedsgui.svn.sourceforge.net/crayzedsgui/?rev=1757&view=rev
Author:   ice-drezday
Date:     2008-06-18 02:45:41 -0700 (Wed, 18 Jun 2008)

Log Message:
-----------
ADD: Added Window::appendText and Window::insertText member functions.  See: http://www.cegui.org.uk/mantis/view.php?id=195

Modified Paths:
--------------
    cegui_mk2/branches/v0-6/include/CEGUIWindow.h
    cegui_mk2/branches/v0-6/src/CEGUIWindow.cpp

Modified: cegui_mk2/branches/v0-6/include/CEGUIWindow.h
===================================================================
--- cegui_mk2/branches/v0-6/include/CEGUIWindow.h	2008-06-17 19:47:27 UTC (rev 1756)
+++ cegui_mk2/branches/v0-6/include/CEGUIWindow.h	2008-06-18 09:45:41 UTC (rev 1757)
@@ -1445,6 +1445,32 @@
 
     /*!
     \brief
+        Insert the text string \a text into the current text string for the
+        Window object at the position specified by \a position.
+     
+    \param text
+        String object holding the text that is to be inserted into the Window
+        object's current text string.
+     
+    \param position
+        The characted index position where the string \a text should be
+        inserted.
+    */
+    void insertText(const String& text, const String::size_type position);
+    
+    /*!
+    \brief
+        Append the string \a text to the currect text string for the Window
+        object.
+     
+    \param text
+        String object holding the text that is to be appended to the Window
+        object's current text string.
+    */
+    void appendText(const String& text);
+    
+    /*!
+    \brief
         Set the font used by this Window.
 
     \param font

Modified: cegui_mk2/branches/v0-6/src/CEGUIWindow.cpp
===================================================================
--- cegui_mk2/branches/v0-6/src/CEGUIWindow.cpp	2008-06-17 19:47:27 UTC (rev 1756)
+++ cegui_mk2/branches/v0-6/src/CEGUIWindow.cpp	2008-06-18 09:45:41 UTC (rev 1757)
@@ -3283,4 +3283,24 @@
     return *pos == this;
 }
 
+//----------------------------------------------------------------------------//
+void Window::insertText(const String& text, const String::size_type position)
+{
+    d_text.insert(position, text);
+
+    WindowEventArgs args(this);
+    onTextChanged(args);
+}
+    
+//----------------------------------------------------------------------------//
+void Window::appendText(const String& text)
+{
+    d_text.append(text);
+
+    WindowEventArgs args(this);
+    onTextChanged(args);
+}
+
+//----------------------------------------------------------------------------//
+
 } // End of  CEGUI namespace section


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Crayzedsgui-cvsmk2] SF.net SVN: crayzedsgui: [1759] cegui_mk2/branches/v0-6

From: <ice-drezday@us...> - 2008-06-18 11:17

Revision: 1759
          http://crayzedsgui.svn.sourceforge.net/crayzedsgui/?rev=1759&view=rev
Author:   ice-drezday
Date:     2008-06-18 04:16:53 -0700 (Wed, 18 Jun 2008)

Log Message:
-----------
ADD: Added a supported value to represent infinity to enable the click generation timouts to be set to "no timeout".  See: http://www.cegui.org.uk/mantis/view.php?id=208

Modified Paths:
--------------
    cegui_mk2/branches/v0-6/include/CEGUISystem.h
    cegui_mk2/branches/v0-6/src/CEGUISystem.cpp

Modified: cegui_mk2/branches/v0-6/include/CEGUISystem.h
===================================================================
--- cegui_mk2/branches/v0-6/include/CEGUISystem.h	2008-06-18 10:03:15 UTC (rev 1758)
+++ cegui_mk2/branches/v0-6/include/CEGUISystem.h	2008-06-18 11:16:53 UTC (rev 1759)
@@ -284,11 +284,18 @@
 	\brief
 		Set the timeout used for generation of single-click events.
 
-		A single-click is defined here as a button being pressed and then released.
+		A single-click is defined here as a button being pressed and then
+        released.
 
 	\param timeout
-		double value equal to the single-click timeout value to be used from now onwards.
+		double value equal to the single-click timeout value to be used from now
+        onwards.
 
+    \note
+        A timeout value of 0 indicates infinity and so no timeout occurrs; as
+        long as the mouse is in the prescribed area, a mouse button 'clicked'
+        event will therefore always be raised.
+
 	\return
 		Nothing.
 	*/
@@ -299,13 +306,19 @@
 	\brief
 		Set the timeout to be used for the generation of multi-click events.
 
-		A multi-click event is a double-click, or a triple-click.  The value returned
-		here is the maximum allowable time between mouse button down events for which
-		a multi-click event will be generated.
+		A multi-click event is a double-click, or a triple-click.  The value
+        returned here is the maximum allowable time between mouse button down
+        events for which a multi-click event will be generated.
 
 	\param timeout
-		double value equal to the multi-click timeout value to be used from now onwards.
+		double value equal to the multi-click timeout value to be used from now
+        onwards.
 
+    \note
+        A timeout value of 0 indicates infinity and so no timeout occurrs; as
+        long as the mouse is in the prescribed area, an appropriate mouse button
+        event will therefore always be raised.
+
 	\return
 		Nothing.
 	*/

Modified: cegui_mk2/branches/v0-6/src/CEGUISystem.cpp
===================================================================
--- cegui_mk2/branches/v0-6/src/CEGUISystem.cpp	2008-06-18 10:03:15 UTC (rev 1758)
+++ cegui_mk2/branches/v0-6/src/CEGUISystem.cpp	2008-06-18 11:16:53 UTC (rev 1759)
@@ -758,7 +758,7 @@
 	tkr.d_click_count++;
 
     // if multi-click requirements are not met
-    if ((tkr.d_timer.elapsed() > d_dblclick_timeout) ||
+    if (((d_dblclick_timeout > 0) && (tkr.d_timer.elapsed() > d_dblclick_timeout)) ||
         (!tkr.d_click_area.isPointInRect(ma.position)) ||
         (tkr.d_target_window != dest_window) ||
         (tkr.d_click_count > 3))
@@ -851,7 +851,7 @@
 	bool wasUpHandled = ma.handled;
 
     // if requirements for click events are met
-    if ((tkr.d_timer.elapsed() <= d_click_timeout) &&
+    if (((d_click_timeout == 0) || (tkr.d_timer.elapsed() <= d_click_timeout)) &&
         (tkr.d_click_area.isPointInRect(ma.position)) &&
         (tkr.d_target_window == initial_dest_window))
     {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Crayzedsgui-cvsmk2] SF.net SVN: crayzedsgui: [1760] cegui_mk2/branches/v0-6

From: <ice-drezday@us...> - 2008-06-18 12:21

Revision: 1760
          http://crayzedsgui.svn.sourceforge.net/crayzedsgui/?rev=1760&view=rev
Author:   ice-drezday
Date:     2008-06-18 05:21:42 -0700 (Wed, 18 Jun 2008)

Log Message:
-----------
Fix some compile warnings.
Fix line endings and set missing svn:eol-style on all Tree related code files.

Modified Paths:
--------------
    cegui_mk2/branches/v0-6/Samples/TreeDemo/include/Sample_TreeDemo.h
    cegui_mk2/branches/v0-6/Samples/TreeDemo/src/Sample_TreeDemo.cpp
    cegui_mk2/branches/v0-6/WindowRendererSets/Falagard/include/FalTree.h
    cegui_mk2/branches/v0-6/WindowRendererSets/Falagard/src/FalTree.cpp
    cegui_mk2/branches/v0-6/include/elements/CEGUITree.h
    cegui_mk2/branches/v0-6/include/elements/CEGUITreeItem.h
    cegui_mk2/branches/v0-6/include/elements/CEGUITreeProperties.h
    cegui_mk2/branches/v0-6/src/CEGUIExceptions.cpp
    cegui_mk2/branches/v0-6/src/elements/CEGUIScrolledItemListBase.cpp
    cegui_mk2/branches/v0-6/src/elements/CEGUITree.cpp
    cegui_mk2/branches/v0-6/src/elements/CEGUITreeItem.cpp
    cegui_mk2/branches/v0-6/src/elements/CEGUITreeProperties.cpp

Property Changed:
----------------
    cegui_mk2/branches/v0-6/Samples/TreeDemo/include/Sample_TreeDemo.h
    cegui_mk2/branches/v0-6/Samples/TreeDemo/src/Sample_TreeDemo.cpp
    cegui_mk2/branches/v0-6/WindowRendererSets/Falagard/include/FalTree.h
    cegui_mk2/branches/v0-6/WindowRendererSets/Falagard/src/FalTree.cpp
    cegui_mk2/branches/v0-6/include/elements/CEGUITree.h
    cegui_mk2/branches/v0-6/include/elements/CEGUITreeItem.h
    cegui_mk2/branches/v0-6/include/elements/CEGUITreeProperties.h
    cegui_mk2/branches/v0-6/src/elements/CEGUITree.cpp
    cegui_mk2/branches/v0-6/src/elements/CEGUITreeItem.cpp
    cegui_mk2/branches/v0-6/src/elements/CEGUITreeProperties.cpp

Modified: cegui_mk2/branches/v0-6/Samples/TreeDemo/include/Sample_TreeDemo.h
===================================================================
--- cegui_mk2/branches/v0-6/Samples/TreeDemo/include/Sample_TreeDemo.h	2008-06-18 11:16:53 UTC (rev 1759)
+++ cegui_mk2/branches/v0-6/Samples/TreeDemo/include/Sample_TreeDemo.h	2008-06-18 12:21:42 UTC (rev 1760)
@@ -1,52 +1,52 @@
-/************************************************************************
-    filename:   Sample_TreeDemo.h
-    created:	 10/17/2004
-    author:		 David Durant (based on code by Paul D Turner)
-*************************************************************************/
-/*************************************************************************
-    Crazy Eddie's GUI System (http://www.cegui.org.uk)
-    Copyright (C)2004 - 2005 Paul D Turner (paul@...)
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*************************************************************************/
-#ifndef _Sample_TreeDemo_h_
-#define _Sample_TreeDemo_h_
-
-#include "CEGuiSample.h"
-#include "CEGUI.h"
-
-
-class TreeDemoSample : public CEGuiSample
-   {
-public:
-   // method to initialse the samples windows and events.
-   bool initialiseSample();
-
-   // method to perform any required cleanup operations.
-   void cleanupSample(void);
-
-protected:
-   CEGUI::Window* TreeDemoWindow;
-   static const unsigned int TreeID;
-   static const unsigned int EditBoxID;
-
-   bool handleRootKeyDown(const CEGUI::EventArgs& args);
-   bool handleEventSelectionChanged(const CEGUI::EventArgs& args);
-   bool handleEventBranchOpened(const CEGUI::EventArgs& args);
-   bool handleEventBranchClosed(const CEGUI::EventArgs& args);
-   };
-
-
-#endif  // end of guard _Sample_TreeDemo_h_
+/************************************************************************
+    filename:   Sample_TreeDemo.h
+    created:	 10/17/2004
+    author:		 David Durant (based on code by Paul D Turner)
+*************************************************************************/
+/*************************************************************************
+    Crazy Eddie's GUI System (http://www.cegui.org.uk)
+    Copyright (C)2004 - 2005 Paul D Turner (paul@...)
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*************************************************************************/
+#ifndef _Sample_TreeDemo_h_
+#define _Sample_TreeDemo_h_
+
+#include "CEGuiSample.h"
+#include "CEGUI.h"
+
+
+class TreeDemoSample : public CEGuiSample
+   {
+public:
+   // method to initialse the samples windows and events.
+   bool initialiseSample();
+
+   // method to perform any required cleanup operations.
+   void cleanupSample(void);
+
+protected:
+   CEGUI::Window* TreeDemoWindow;
+   static const unsigned int TreeID;
+   static const unsigned int EditBoxID;
+
+   bool handleRootKeyDown(const CEGUI::EventArgs& args);
+   bool handleEventSelectionChanged(const CEGUI::EventArgs& args);
+   bool handleEventBranchOpened(const CEGUI::EventArgs& args);
+   bool handleEventBranchClosed(const CEGUI::EventArgs& args);
+   };
+
+
+#endif  // end of guard _Sample_TreeDemo_h_


Property changes on: cegui_mk2/branches/v0-6/Samples/TreeDemo/include/Sample_TreeDemo.h
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: cegui_mk2/branches/v0-6/Samples/TreeDemo/src/Sample_TreeDemo.cpp
===================================================================
--- cegui_mk2/branches/v0-6/Samples/TreeDemo/src/Sample_TreeDemo.cpp	2008-06-18 11:16:53 UTC (rev 1759)
+++ cegui_mk2/branches/v0-6/Samples/TreeDemo/src/Sample_TreeDemo.cpp	2008-06-18 12:21:42 UTC (rev 1760)
@@ -1,373 +1,373 @@
-#include "../include/Sample_TreeDemo.h"
-#include "CEGUI.h"
-#include "CEGUIPropertyHelper.h"    // for string conversions
-#include "elements/CEGUITree.h"
-#include "elements/CEGUIEditbox.h"
-#include "falagard/CEGUIFalWidgetLookManager.h"
-
-#if defined( __WIN32__ ) || defined( _WIN32 )
-#define WIN32_LEAN_AND_MEAN
-#define NOMINMAX
-#include "windows.h"
-#include <mmsystem.h>
-#endif
-
-#include <ctime>
-#include <cstdlib>
-
-
-const unsigned int TreeDemoSample::TreeID    = 1;
-const unsigned int TreeDemoSample::EditBoxID = 2;
-
-#define USE_VANILLA  0
-
-
-#if USE_VANILLA
-#define SCHEME_FILE_NAME   "VanillaSkin.scheme"
-#define IMAGES_FILE_NAME   "Vanilla-Images"
-#define STATICIMAGE_NAME   "Vanilla/StaticImage"
-#define TOOLTIP_NAME       "Vanilla/Tooltip"
-#define LAYOUT_FILE_NAME   "TreeDemo.layout"
-#define BRUSH_NAME         "GenericBrush"
-#else
-#define SCHEME_FILE_NAME   "TaharezLook.scheme"
-#define IMAGES_FILE_NAME   "TaharezLook"
-#define STATICIMAGE_NAME   "TaharezLook/StaticImage"
-#define TOOLTIP_NAME       "TaharezLook/Tooltip"
-#define LAYOUT_FILE_NAME   "TreeDemoTaharez.layout"
-#define BRUSH_NAME         "TextSelectionBrush"
-#endif
-
-
-//
-// int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine,int nCmdShow)
-// #else
-int main(int argc, char *argv[])
-   {
-   // This is a basic start-up for the sample application which is
-   // object orientated in nature, so we just need an instance of
-   // the CEGuiSample based object and then tell that sample application
-   // to run.  All of the samples will use code similar to this in the
-   // main/WinMain function.
-   TreeDemoSample app;
-   return app.run();
-   }
-
-int randInt(int low, int high)
-   {
-   int   num;
-   CEGUI::uint32 range;
-
-   range = high - low + 1;
-   if (range > RAND_MAX)
-      num = (int)(((CEGUI::uint32)rand() * (CEGUI::uint32)rand()) % range);
-   else
-      num = (rand()) % range;
-
-   return(num + low);
-   }
-
-
-//////////////////////////////////////////////////////////////////////////
-/*************************************************************************
-
-    TreeDemoSample class
-
-*************************************************************************/
-//////////////////////////////////////////////////////////////////////////
-
-
-/*************************************************************************
-    Sample specific initialisation goes here.
-*************************************************************************/
-bool TreeDemoSample::initialiseSample()
-   {
-   using namespace CEGUI;
-   Tree *      theTree;
-   TreeItem *  newTreeCtrlEntryLvl1;  // Level 1 TreeCtrlEntry (branch)
-   TreeItem *  newTreeCtrlEntryLvl2;  // Level 2 TreeCtrlEntry (branch)
-   TreeItem *  newTreeCtrlEntryLvl3;  // Level 3 TreeCtrlEntry (branch)
-   TreeItem *  newTreeCtrlEntryParent;
-   Image *     iconArray[9];
-
-#if defined( __WIN32__ ) || defined( _WIN32 )
-   // Windows specific code.
-   srand(time(NULL));
-#endif
-
-   // Get window manager which we will use for a few jobs here.
-   WindowManager& winMgr = WindowManager::getSingleton();
-
-//   CEGUI::Logger::getSingleton().setLoggingLevel(CEGUI::Standard);
-//   CEGUI::Logger::getSingleton().setLoggingLevel(CEGUI::Informative);
-   CEGUI::Logger::getSingleton().setLoggingLevel(CEGUI::Insane);
-
-   // Load the scheme to initialise the skin which we use in this sample
-   SchemeManager::getSingleton().loadScheme(SCHEME_FILE_NAME);
-
-   // set default mouse image
-   System::getSingleton().setDefaultMouseCursor(IMAGES_FILE_NAME, "MouseArrow");
-
-   // load an image to use as a background
-   ImagesetManager::getSingleton().createImagesetFromImageFile("BackgroundImage", "GPN-2000-001437.tga");
-
-   // Load some icon images for our test tree
-  // Imageset *iconImages = ImagesetManager::getSingleton().createImageset("TreeIcons.imageset");
-   Imageset *drives = ImagesetManager::getSingleton().createImageset("DriveIcons.imageset");
-
-   // here we will use a StaticImage as the root, then we can use it to place a background image
-   Window* background = winMgr.createWindow(STATICIMAGE_NAME);
-
-   // set area rectangle
-   background->setArea(URect(cegui_reldim(0), cegui_reldim(0), cegui_reldim(1), cegui_reldim(1)));
-   // disable frame and standard background
-   background->setProperty("FrameEnabled", "false");
-   background->setProperty("BackgroundEnabled", "false");
-   // set the background image
-   background->setProperty("Image", "set:BackgroundImage image:full_image");
-   // install this as the root GUI sheet
-   System::getSingleton().setGUISheet(background);
-
-//   CEGUI::System::getSingleton().setTooltip(TOOLTIP_NAME);
-
-	if(!FontManager::getSingleton().isFontPresent("Iconified-12"))
-		FontManager::getSingleton().createFont("Iconified-12.font");
-//	if(!FontManager::getSingleton().isFontPresent("Commonwealth-10"))
-//		FontManager::getSingleton().createFont("Commonwealth-10.font");
-
-
-   TreeDemoWindow = winMgr.loadWindowLayout(LAYOUT_FILE_NAME);
-
-   background->addChildWindow(TreeDemoWindow);
-
-   // listen for key presses on the root window.
-   background->subscribeEvent(Window::EventKeyDown, Event::Subscriber(&TreeDemoSample::handleRootKeyDown, this));
-
-   theTree = (Tree *)TreeDemoWindow->getChild(TreeID);
-   theTree->initialise();
-   theTree->subscribeEvent(Tree::EventSelectionChanged, Event::Subscriber(&TreeDemoSample::handleEventSelectionChanged, this));
-   theTree->subscribeEvent(Tree::EventBranchOpened, Event::Subscriber(&TreeDemoSample::handleEventBranchOpened, this));
-   theTree->subscribeEvent(Tree::EventBranchClosed, Event::Subscriber(&TreeDemoSample::handleEventBranchClosed, this));
-
-   // activate the background window
-   background->activate();
-
-   Imageset* iconImages = drives;
-   iconArray[0] = (Image *)&iconImages->getImage("Artic");
-   iconArray[1] = (Image *)&iconImages->getImage("Black");
-   iconArray[2] = (Image *)&iconImages->getImage("Sunset");
-   iconArray[3] = (Image *)&iconImages->getImage("DriveStack");
-   iconArray[4] = (Image *)&iconImages->getImage("GlobalDrive");
-   iconArray[5] = (Image *)&iconImages->getImage("Blue");
-   iconArray[6] = (Image *)&iconImages->getImage("Lime");
-   iconArray[7] = (Image *)&iconImages->getImage("Silver");
-   iconArray[8] = (Image *)&iconImages->getImage("GreenCandy");
-
-   // Create a top-most TreeCtrlEntry
-   newTreeCtrlEntryLvl1 = new TreeItem("Tree Item Level 1a");
-   newTreeCtrlEntryLvl1->setIcon(drives->getImage("Black"));
-   newTreeCtrlEntryLvl1->setSelectionBrushImage(IMAGES_FILE_NAME, BRUSH_NAME);
-//   newTreeCtrlEntryLvl1->setUserData((void *)someData);
-   theTree->addItem(newTreeCtrlEntryLvl1);
-   // Create a second-level TreeCtrlEntry and attach it to the top-most TreeCtrlEntry
-   newTreeCtrlEntryLvl2 = new TreeItem("Tree Item Level 2a (1a)");
-   newTreeCtrlEntryLvl2->setIcon(drives->getImage("Artic"));
-   newTreeCtrlEntryLvl2->setSelectionBrushImage(IMAGES_FILE_NAME, BRUSH_NAME);
-   newTreeCtrlEntryLvl1->addItem(newTreeCtrlEntryLvl2);
-   // Create a third-level TreeCtrlEntry and attach it to the above TreeCtrlEntry
-   newTreeCtrlEntryLvl3 = new TreeItem("Tree Item Level 3a (2a)");
-   newTreeCtrlEntryLvl3->setIcon(drives->getImage("Blue"));
-   newTreeCtrlEntryLvl3->setSelectionBrushImage(IMAGES_FILE_NAME, BRUSH_NAME);
-   newTreeCtrlEntryLvl2->addItem(newTreeCtrlEntryLvl3);
-   // Create another third-level TreeCtrlEntry and attach it to the above TreeCtrlEntry
-   newTreeCtrlEntryLvl3 = new TreeItem("Tree Item Level 3b (2a)");
-   newTreeCtrlEntryLvl3->setIcon(drives->getImage("Lime"));
-   newTreeCtrlEntryLvl3->setSelectionBrushImage(IMAGES_FILE_NAME, BRUSH_NAME);
-   newTreeCtrlEntryLvl2->addItem(newTreeCtrlEntryLvl3);
-   // Create another second-level TreeCtrlEntry and attach it to the top-most TreeCtrlEntry
-   newTreeCtrlEntryLvl2 = new TreeItem("Tree Item Level 2b (1a)");
-   newTreeCtrlEntryLvl2->setIcon(drives->getImage("Sunset"));
-   newTreeCtrlEntryLvl2->setSelectionBrushImage(IMAGES_FILE_NAME, BRUSH_NAME);
-   newTreeCtrlEntryLvl1->addItem(newTreeCtrlEntryLvl2);
-   // Create another second-level TreeCtrlEntry and attach it to the top-most TreeCtrlEntry
-   newTreeCtrlEntryLvl2 = new TreeItem("Tree Item Level 2c (1a)");
-   newTreeCtrlEntryLvl2->setIcon(drives->getImage("Silver"));
-   newTreeCtrlEntryLvl2->setSelectionBrushImage(IMAGES_FILE_NAME, BRUSH_NAME);
-   newTreeCtrlEntryLvl1->addItem(newTreeCtrlEntryLvl2);
-
-   // Create another top-most TreeCtrlEntry
-   newTreeCtrlEntryLvl1 = new TreeItem("Tree Item Level 1b");
-   newTreeCtrlEntryLvl1->setSelectionBrushImage(IMAGES_FILE_NAME, BRUSH_NAME);
-   newTreeCtrlEntryLvl1->setIcon(drives->getImage("DriveStack"));
-   newTreeCtrlEntryLvl1->setDisabled(true); // Let's disable this one just to be sure it works
-   theTree->addItem(newTreeCtrlEntryLvl1);
-   // Create a second-level TreeCtrlEntry and attach it to the top-most TreeCtrlEntry
-   newTreeCtrlEntryLvl2 = new TreeItem("Tree Item Level 2a (1b)");
-   newTreeCtrlEntryLvl2->setSelectionBrushImage(IMAGES_FILE_NAME, BRUSH_NAME);
-   newTreeCtrlEntryLvl1->addItem(newTreeCtrlEntryLvl2);
-   // Create another second-level TreeCtrlEntry and attach it to the top-most TreeCtrlEntry
-   newTreeCtrlEntryLvl2 = new TreeItem("Tree Item Level 2b (1b)");
-   newTreeCtrlEntryLvl2->setSelectionBrushImage(IMAGES_FILE_NAME, BRUSH_NAME);
-   newTreeCtrlEntryLvl1->addItem(newTreeCtrlEntryLvl2);
-
-   newTreeCtrlEntryLvl1 = new TreeItem("Tree Item Level 1c");
-   newTreeCtrlEntryLvl1->setSelectionBrushImage(IMAGES_FILE_NAME, BRUSH_NAME);
-   theTree->addItem(newTreeCtrlEntryLvl1);
-
-   // Now let's create a whole bunch of items automatically
-   int levelIndex = 3;
-   int idepthIndex;
-   int childIndex;
-   int childCount;
-   int iconIndex;
-   String itemText;
-   while (levelIndex < 10)
-      {
-      idepthIndex = 0;
-      itemText = "Tree Item Level " + PropertyHelper::intToString(levelIndex) + " Depth " + PropertyHelper::intToString(idepthIndex);
-      newTreeCtrlEntryLvl1 = new TreeItem(itemText);
-      // Set a random icon for the item.  Sometimes blank (on purpose).
-      iconIndex = randInt(0, (sizeof(iconArray) / sizeof(iconArray[0])) + 2);
-      if (iconIndex < sizeof(iconArray) / sizeof(iconArray[0]))
-         newTreeCtrlEntryLvl1->setIcon(*iconArray[iconIndex]);
-      newTreeCtrlEntryLvl1->setSelectionBrushImage(IMAGES_FILE_NAME, BRUSH_NAME);
-      theTree->addItem(newTreeCtrlEntryLvl1);
-      newTreeCtrlEntryParent = newTreeCtrlEntryLvl1;
-
-#if 1
-      childIndex = 0;
-      childCount = randInt(0, 3);
-      while (childIndex < childCount)
-         {
-         itemText = "Tree Item Level " + PropertyHelper::intToString(levelIndex) + " Depth " + PropertyHelper::intToString(idepthIndex + 1) + " Child " + PropertyHelper::intToString(childIndex + 1);
-         newTreeCtrlEntryLvl2 = new TreeItem(itemText);
-         // Set a random icon for the item.  Sometimes blank (on purpose).
-         iconIndex = randInt(0, (sizeof(iconArray) / sizeof(iconArray[0]) + 2));
-         if (iconIndex < sizeof(iconArray) / sizeof(iconArray[0]))
-            newTreeCtrlEntryLvl2->setIcon(*iconArray[iconIndex]);
-         newTreeCtrlEntryLvl2->setSelectionBrushImage(IMAGES_FILE_NAME, BRUSH_NAME);
-         newTreeCtrlEntryParent->addItem(newTreeCtrlEntryLvl2);
-         ++childIndex;
-         }
-#endif
-
-      while (idepthIndex < 15)
-         {
-         itemText = "Tree Item Level " + PropertyHelper::intToString(levelIndex) + " Depth " + PropertyHelper::intToString(idepthIndex + 1);
-         newTreeCtrlEntryLvl2 = new TreeItem(itemText);
-         // Set a random icon for the item.  Sometimes blank (on purpose).
-         iconIndex = randInt(0, (sizeof(iconArray) / sizeof(iconArray[0]) + 2));
-         if (iconIndex < sizeof(iconArray) / sizeof(iconArray[0]))
-            newTreeCtrlEntryLvl2->setIcon(*iconArray[iconIndex]);
-         newTreeCtrlEntryLvl2->setSelectionBrushImage(IMAGES_FILE_NAME, BRUSH_NAME);
-         newTreeCtrlEntryParent->addItem(newTreeCtrlEntryLvl2);
-         newTreeCtrlEntryParent = newTreeCtrlEntryLvl2;
-
-#if 1
-         childIndex = 0;
-         childCount = randInt(0, 3);
-         while (childIndex < childCount)
-            {
-            itemText = "Tree Item Level " + PropertyHelper::intToString(levelIndex) + " Depth " + PropertyHelper::intToString(idepthIndex + 1) + " Child " + PropertyHelper::intToString(childIndex + 1);
-            newTreeCtrlEntryLvl2 = new TreeItem(itemText);
-            // Set a random icon for the item.  Sometimes blank (on purpose).
-            iconIndex = randInt(0, (sizeof(iconArray) / sizeof(iconArray[0]) + 2));
-            if (iconIndex < sizeof(iconArray) / sizeof(iconArray[0]))
-               newTreeCtrlEntryLvl2->setIcon(*iconArray[iconIndex]);
-            newTreeCtrlEntryLvl2->setSelectionBrushImage(IMAGES_FILE_NAME, BRUSH_NAME);
-            newTreeCtrlEntryParent->addItem(newTreeCtrlEntryLvl2);
-            ++childIndex;
-            }
-#endif
-         ++idepthIndex;
-         }
-      ++levelIndex;
-      }
-
-   return true;
-   }
-
-
-/*************************************************************************
-    Cleans up resources allocated in the initialiseSample call.
-*************************************************************************/
-void TreeDemoSample::cleanupSample()
-   {
-   }
-
-
-bool TreeDemoSample::handleEventSelectionChanged(const CEGUI::EventArgs& args)
-   {
-   using namespace CEGUI;
-
-   const TreeEventArgs& treeArgs = static_cast<const TreeEventArgs&>(args);
-   Tree *theTree = (Tree *)TreeDemoWindow->getChild(TreeID);
-   Editbox *editBox = (Editbox *)TreeDemoWindow->getChild(EditBoxID);
-
-   // Three different ways to get the item selected.
-//   TreeCtrlEntry *selectedItem = theTree->getFirstSelectedItem();      // the first selection in the list (may be more)
-//   TreeCtrlEntry *selectedItem = theTree->getLastSelectedItem();       // the last (time-wise) selected by the user
-   TreeItem *selectedItem = treeArgs.treeItem;                    // the actual item that caused this event
-
-   if (selectedItem)
-      {
-#if 0
-      // A convoluted way to get the item text.
-      // Just here to test findFirstItemWithText.
-      selectedItem = theTree->findFirstItemWithText(selectedItem->getText());
-      if (selectedItem)
-         editBox->setText("Selected: " + selectedItem->getText());
-      else
-         editBox->setText("findItemWithText failed!");
-#else
-      // The simple way to do it.
-      editBox->setText("Selected: " + selectedItem->getText());
-#endif
-      }
-   else
-      editBox->setText("None Selected");
-
-   return true;
-   }
-
-
-
-bool TreeDemoSample::handleRootKeyDown(const CEGUI::EventArgs& args)
-   {
-   using namespace CEGUI;
-
-   const KeyEventArgs& keyArgs = static_cast<const KeyEventArgs&>(args);
-
-   switch (keyArgs.scancode)
-      {
-      case Key::F12:
-         break;
-
-      default:
-         return false;
-      }
-
-   return true;
-   }
-
-
-bool TreeDemoSample::handleEventBranchOpened(const CEGUI::EventArgs& args)
-   {
-   using namespace CEGUI;
-
-   const TreeEventArgs& treeArgs = static_cast<const TreeEventArgs&>(args);
-   Editbox *editBox = (Editbox *)TreeDemoWindow->getChild(EditBoxID);
-   editBox->setText("Opened: " + treeArgs.treeItem->getText());
-   return true;
-   }
-
-
-bool TreeDemoSample::handleEventBranchClosed(const CEGUI::EventArgs& args)
-   {
-   using namespace CEGUI;
-
-   const TreeEventArgs& treeArgs = static_cast<const TreeEventArgs&>(args);
-   Editbox *editBox = (Editbox *)TreeDemoWindow->getChild(EditBoxID);
-   editBox->setText("Closed: " + treeArgs.treeItem->getText());
-   return true;
-   }
+#include "../include/Sample_TreeDemo.h"
+#include "CEGUI.h"
+#include "CEGUIPropertyHelper.h"    // for string conversions
+#include "elements/CEGUITree.h"
+#include "elements/CEGUIEditbox.h"
+#include "falagard/CEGUIFalWidgetLookManager.h"
+
+#if defined( __WIN32__ ) || defined( _WIN32 )
+#define WIN32_LEAN_AND_MEAN
+#define NOMINMAX
+#include "windows.h"
+#include <mmsystem.h>
+#endif
+
+#include <ctime>
+#include <cstdlib>
+
+
+const unsigned int TreeDemoSample::TreeID    = 1;
+const unsigned int TreeDemoSample::EditBoxID = 2;
+
+#define USE_VANILLA  0
+
+
+#if USE_VANILLA
+#define SCHEME_FILE_NAME   "VanillaSkin.scheme"
+#define IMAGES_FILE_NAME   "Vanilla-Images"
+#define STATICIMAGE_NAME   "Vanilla/StaticImage"
+#define TOOLTIP_NAME       "Vanilla/Tooltip"
+#define LAYOUT_FILE_NAME   "TreeDemo.layout"
+#define BRUSH_NAME         "GenericBrush"
+#else
+#define SCHEME_FILE_NAME   "TaharezLook.scheme"
+#define IMAGES_FILE_NAME   "TaharezLook"
+#define STATICIMAGE_NAME   "TaharezLook/StaticImage"
+#define TOOLTIP_NAME       "TaharezLook/Tooltip"
+#define LAYOUT_FILE_NAME   "TreeDemoTaharez.layout"
+#define BRUSH_NAME         "TextSelectionBrush"
+#endif
+
+
+//
+// int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine,int nCmdShow)
+// #else
+int main(int argc, char *argv[])
+   {
+   // This is a basic start-up for the sample application which is
+   // object orientated in nature, so we just need an instance of
+   // the CEGuiSample based object and then tell that sample application
+   // to run.  All of the samples will use code similar to this in the
+   // main/WinMain function.
+   TreeDemoSample app;
+   return app.run();
+   }
+
+int randInt(int low, int high)
+   {
+   int   num;
+   CEGUI::uint32 range;
+
+   range = high - low + 1;
+   if (range > RAND_MAX)
+      num = (int)(((CEGUI::uint32)rand() * (CEGUI::uint32)rand()) % range);
+   else
+      num = (rand()) % range;
+
+   return(num + low);
+   }
+
+
+//////////////////////////////////////////////////////////////////////////
+/*************************************************************************
+
+    TreeDemoSample class
+
+*************************************************************************/
+//////////////////////////////////////////////////////////////////////////
+
+
+/*************************************************************************
+    Sample specific initialisation goes here.
+*************************************************************************/
+bool TreeDemoSample::initialiseSample()
+   {
+   using namespace CEGUI;
+   Tree *      theTree;
+   TreeItem *  newTreeCtrlEntryLvl1;  // Level 1 TreeCtrlEntry (branch)
+   TreeItem *  newTreeCtrlEntryLvl2;  // Level 2 TreeCtrlEntry (branch)
+   TreeItem *  newTreeCtrlEntryLvl3;  // Level 3 TreeCtrlEntry (branch)
+   TreeItem *  newTreeCtrlEntryParent;
+   Image *     iconArray[9];
+
+#if defined( __WIN32__ ) || defined( _WIN32 )
+   // Windows specific code.
+   srand(time(NULL));
+#endif
+
+   // Get window manager which we will use for a few jobs here.
+   WindowManager& winMgr = WindowManager::getSingleton();
+
+//   CEGUI::Logger::getSingleton().setLoggingLevel(CEGUI::Standard);
+//   CEGUI::Logger::getSingleton().setLoggingLevel(CEGUI::Informative);
+   CEGUI::Logger::getSingleton().setLoggingLevel(CEGUI::Insane);
+
+   // Load the scheme to initialise the skin which we use in this sample
+   SchemeManager::getSingleton().loadScheme(SCHEME_FILE_NAME);
+
+   // set default mouse image
+   System::getSingleton().setDefaultMouseCursor(IMAGES_FILE_NAME, "MouseArrow");
+
+   // load an image to use as a background
+   ImagesetManager::getSingleton().createImagesetFromImageFile("BackgroundImage", "GPN-2000-001437.tga");
+
+   // Load some icon images for our test tree
+  // Imageset *iconImages = ImagesetManager::getSingleton().createImageset("TreeIcons.imageset");
+   Imageset *drives = ImagesetManager::getSingleton().createImageset("DriveIcons.imageset");
+
+   // here we will use a StaticImage as the root, then we can use it to place a background image
+   Window* background = winMgr.createWindow(STATICIMAGE_NAME);
+
+   // set area rectangle
+   background->setArea(URect(cegui_reldim(0), cegui_reldim(0), cegui_reldim(1), cegui_reldim(1)));
+   // disable frame and standard background
+   background->setProperty("FrameEnabled", "false");
+   background->setProperty("BackgroundEnabled", "false");
+   // set the background image
+   background->setProperty("Image", "set:BackgroundImage image:full_image");
+   // install this as the root GUI sheet
+   System::getSingleton().setGUISheet(background);
+
+//   CEGUI::System::getSingleton().setTooltip(TOOLTIP_NAME);
+
+	if(!FontManager::getSingleton().isFontPresent("Iconified-12"))
+		FontManager::getSingleton().createFont("Iconified-12.font");
+//	if(!FontManager::getSingleton().isFontPresent("Commonwealth-10"))
+//		FontManager::getSingleton().createFont("Commonwealth-10.font");
+
+
+   TreeDemoWindow = winMgr.loadWindowLayout(LAYOUT_FILE_NAME);
+
+   background->addChildWindow(TreeDemoWindow);
+
+   // listen for key presses on the root window.
+   background->subscribeEvent(Window::EventKeyDown, Event::Subscriber(&TreeDemoSample::handleRootKeyDown, this));
+
+   theTree = (Tree *)TreeDemoWindow->getChild(TreeID);
+   theTree->initialise();
+   theTree->subscribeEvent(Tree::EventSelectionChanged, Event::Subscriber(&TreeDemoSample::handleEventSelectionChanged, this));
+   theTree->subscribeEvent(Tree::EventBranchOpened, Event::Subscriber(&TreeDemoSample::handleEventBranchOpened, this));
+   theTree->subscribeEvent(Tree::EventBranchClosed, Event::Subscriber(&TreeDemoSample::handleEventBranchClosed, this));
+
+   // activate the background window
+   background->activate();
+
+   Imageset* iconImages = drives;
+   iconArray[0] = (Image *)&iconImages->getImage("Artic");
+   iconArray[1] = (Image *)&iconImages->getImage("Black");
+   iconArray[2] = (Image *)&iconImages->getImage("Sunset");
+   iconArray[3] = (Image *)&iconImages->getImage("DriveStack");
+   iconArray[4] = (Image *)&iconImages->getImage("GlobalDrive");
+   iconArray[5] = (Image *)&iconImages->getImage("Blue");
+   iconArray[6] = (Image *)&iconImages->getImage("Lime");
+   iconArray[7] = (Image *)&iconImages->getImage("Silver");
+   iconArray[8] = (Image *)&iconImages->getImage("GreenCandy");
+
+   // Create a top-most TreeCtrlEntry
+   newTreeCtrlEntryLvl1 = new TreeItem("Tree Item Level 1a");
+   newTreeCtrlEntryLvl1->setIcon(drives->getImage("Black"));
+   newTreeCtrlEntryLvl1->setSelectionBrushImage(IMAGES_FILE_NAME, BRUSH_NAME);
+//   newTreeCtrlEntryLvl1->setUserData((void *)someData);
+   theTree->addItem(newTreeCtrlEntryLvl1);
+   // Create a second-level TreeCtrlEntry and attach it to the top-most TreeCtrlEntry
+   newTreeCtrlEntryLvl2 = new TreeItem("Tree Item Level 2a (1a)");
+   newTreeCtrlEntryLvl2->setIcon(drives->getImage("Artic"));
+   newTreeCtrlEntryLvl2->setSelectionBrushImage(IMAGES_FILE_NAME, BRUSH_NAME);
+   newTreeCtrlEntryLvl1->addItem(newTreeCtrlEntryLvl2);
+   // Create a third-level TreeCtrlEntry and attach it to the above TreeCtrlEntry
+   newTreeCtrlEntryLvl3 = new TreeItem("Tree Item Level 3a (2a)");
+   newTreeCtrlEntryLvl3->setIcon(drives->getImage("Blue"));
+   newTreeCtrlEntryLvl3->setSelectionBrushImage(IMAGES_FILE_NAME, BRUSH_NAME);
+   newTreeCtrlEntryLvl2->addItem(newTreeCtrlEntryLvl3);
+   // Create another third-level TreeCtrlEntry and attach it to the above TreeCtrlEntry
+   newTreeCtrlEntryLvl3 = new TreeItem("Tree Item Level 3b (2a)");
+   newTreeCtrlEntryLvl3->setIcon(drives->getImage("Lime"));
+   newTreeCtrlEntryLvl3->setSelectionBrushImage(IMAGES_FILE_NAME, BRUSH_NAME);
+   newTreeCtrlEntryLvl2->addItem(newTreeCtrlEntryLvl3);
+   // Create another second-level TreeCtrlEntry and attach it to the top-most TreeCtrlEntry
+   newTreeCtrlEntryLvl2 = new TreeItem("Tree Item Level 2b (1a)");
+   newTreeCtrlEntryLvl2->setIcon(drives->getImage("Sunset"));
+   newTreeCtrlEntryLvl2->setSelectionBrushImage(IMAGES_FILE_NAME, BRUSH_NAME);
+   newTreeCtrlEntryLvl1->addItem(newTreeCtrlEntryLvl2);
+   // Create another second-level TreeCtrlEntry and attach it to the top-most TreeCtrlEntry
+   newTreeCtrlEntryLvl2 = new TreeItem("Tree Item Level 2c (1a)");
+   newTreeCtrlEntryLvl2->setIcon(drives->getImage("Silver"));
+   newTreeCtrlEntryLvl2->setSelectionBrushImage(IMAGES_FILE_NAME, BRUSH_NAME);
+   newTreeCtrlEntryLvl1->addItem(newTreeCtrlEntryLvl2);
+
+   // Create another top-most TreeCtrlEntry
+   newTreeCtrlEntryLvl1 = new TreeItem("Tree Item Level 1b");
+   newTreeCtrlEntryLvl1->setSelectionBrushImage(IMAGES_FILE_NAME, BRUSH_NAME);
+   newTreeCtrlEntryLvl1->setIcon(drives->getImage("DriveStack"));
+   newTreeCtrlEntryLvl1->setDisabled(true); // Let's disable this one just to be sure it works
+   theTree->addItem(newTreeCtrlEntryLvl1);
+   // Create a second-level TreeCtrlEntry and attach it to the top-most TreeCtrlEntry
+   newTreeCtrlEntryLvl2 = new TreeItem("Tree Item Level 2a (1b)");
+   newTreeCtrlEntryLvl2->setSelectionBrushImage(IMAGES_FILE_NAME, BRUSH_NAME);
+   newTreeCtrlEntryLvl1->addItem(newTreeCtrlEntryLvl2);
+   // Create another second-level TreeCtrlEntry and attach it to the top-most TreeCtrlEntry
+   newTreeCtrlEntryLvl2 = new TreeItem("Tree Item Level 2b (1b)");
+   newTreeCtrlEntryLvl2->setSelectionBrushImage(IMAGES_FILE_NAME, BRUSH_NAME);
+   newTreeCtrlEntryLvl1->addItem(newTreeCtrlEntryLvl2);
+
+   newTreeCtrlEntryLvl1 = new TreeItem("Tree Item Level 1c");
+   newTreeCtrlEntryLvl1->setSelectionBrushImage(IMAGES_FILE_NAME, BRUSH_NAME);
+   theTree->addItem(newTreeCtrlEntryLvl1);
+
+   // Now let's create a whole bunch of items automatically
+   int levelIndex = 3;
+   int idepthIndex;
+   int childIndex;
+   int childCount;
+   int iconIndex;
+   String itemText;
+   while (levelIndex < 10)
+      {
+      idepthIndex = 0;
+      itemText = "Tree Item Level " + PropertyHelper::intToString(levelIndex) + " Depth " + PropertyHelper::intToString(idepthIndex);
+      newTreeCtrlEntryLvl1 = new TreeItem(itemText);
+      // Set a random icon for the item.  Sometimes blank (on purpose).
+      iconIndex = randInt(0, (sizeof(iconArray) / sizeof(iconArray[0])) + 2);
+      if (iconIndex < sizeof(iconArray) / sizeof(iconArray[0]))
+         newTreeCtrlEntryLvl1->setIcon(*iconArray[iconIndex]);
+      newTreeCtrlEntryLvl1->setSelectionBrushImage(IMAGES_FILE_NAME, BRUSH_NAME);
+      theTree->addItem(newTreeCtrlEntryLvl1);
+      newTreeCtrlEntryParent = newTreeCtrlEntryLvl1;
+
+#if 1
+      childIndex = 0;
+      childCount = randInt(0, 3);
+      while (childIndex < childCount)
+         {
+         itemText = "Tree Item Level " + PropertyHelper::intToString(levelIndex) + " Depth " + PropertyHelper::intToString(idepthIndex + 1) + " Child " + PropertyHelper::intToString(childIndex + 1);
+         newTreeCtrlEntryLvl2 = new TreeItem(itemText);
+         // Set a random icon for the item.  Sometimes blank (on purpose).
+         iconIndex = randInt(0, (sizeof(iconArray) / sizeof(iconArray[0]) + 2));
+         if (iconIndex < sizeof(iconArray) / sizeof(iconArray[0]))
+            newTreeCtrlEntryLvl2->setIcon(*iconArray[iconIndex]);
+         newTreeCtrlEntryLvl2->setSelectionBrushImage(IMAGES_FILE_NAME, BRUSH_NAME);
+         newTreeCtrlEntryParent->addItem(newTreeCtrlEntryLvl2);
+         ++childIndex;
+         }
+#endif
+
+      while (idepthIndex < 15)
+         {
+         itemText = "Tree Item Level " + PropertyHelper::intToString(levelIndex) + " Depth " + PropertyHelper::intToString(idepthIndex + 1);
+         newTreeCtrlEntryLvl2 = new TreeItem(itemText);
+         // Set a random icon for the item.  Sometimes blank (on purpose).
+         iconIndex = randInt(0, (sizeof(iconArray) / sizeof(iconArray[0]) + 2));
+         if (iconIndex < sizeof(iconArray) / sizeof(iconArray[0]))
+            newTreeCtrlEntryLvl2->setIcon(*iconArray[iconIndex]);
+         newTreeCtrlEntryLvl2->setSelectionBrushImage(IMAGES_FILE_NAME, BRUSH_NAME);
+         newTreeCtrlEntryParent->addItem(newTreeCtrlEntryLvl2);
+         newTreeCtrlEntryParent = newTreeCtrlEntryLvl2;
+
+#if 1
+         childIndex = 0;
+         childCount = randInt(0, 3);
+         while (childIndex < childCount)
+            {
+            itemText = "Tree Item Level " + PropertyHelper::intToString(levelIndex) + " Depth " + PropertyHelper::intToString(idepthIndex + 1) + " Child " + PropertyHelper::intToString(childIndex + 1);
+            newTreeCtrlEntryLvl2 = new TreeItem(itemText);
+            // Set a random icon for the item.  Sometimes blank (on purpose).
+            iconIndex = randInt(0, (sizeof(iconArray) / sizeof(iconArray[0]) + 2));
+            if (iconIndex < sizeof(iconArray) / sizeof(iconArray[0]))
+               newTreeCtrlEntryLvl2->setIcon(*iconArray[iconIndex]);
+            newTreeCtrlEntryLvl2->setSelectionBrushImage(IMAGES_FILE_NAME, BRUSH_NAME);
+            newTreeCtrlEntryParent->addItem(newTreeCtrlEntryLvl2);
+            ++childIndex;
+            }
+#endif
+         ++idepthIndex;
+         }
+      ++levelIndex;
+      }
+
+   return true;
+   }
+
+
+/*************************************************************************
+    Cleans up resources allocated in the initialiseSample call.
+*************************************************************************/
+void TreeDemoSample::cleanupSample()
+   {
+   }
+
+
+bool TreeDemoSample::handleEventSelectionChanged(const CEGUI::EventArgs& args)
+   {
+   using namespace CEGUI;
+
+   const TreeEventArgs& treeArgs = static_cast<const TreeEventArgs&>(args);
+   Tree *theTree = (Tree *)TreeDemoWindow->getChild(TreeID);
+   Editbox *editBox = (Editbox *)TreeDemoWindow->getChild(EditBoxID);
+
+   // Three different ways to get the item selected.
+//   TreeCtrlEntry *selectedItem = theTree->getFirstSelectedItem();      // the first selection in the list (may be more)
+//   TreeCtrlEntry *selectedItem = theTree->getLastSelectedItem();       // the last (time-wise) selected by the user
+   TreeItem *selectedItem = treeArgs.treeItem;                    // the actual item that caused this event
+
+   if (selectedItem)
+      {
+#if 0
+      // A convoluted way to get the item text.
+      // Just here to test findFirstItemWithText.
+      selectedItem = theTree->findFirstItemWithText(selectedItem->getText());
+      if (selectedItem)
+         editBox->setText("Selected: " + selectedItem->getText());
+      else
+         editBox->setText("findItemWithText failed!");
+#else
+      // The simple way to do it.
+      editBox->setText("Selected: " + selectedItem->getText());
+#endif
+      }
+   else
+      editBox->setText("None Selected");
+
+   return true;
+   }
+
+
+
+bool TreeDemoSample::handleRootKeyDown(const CEGUI::EventArgs& args)
+   {
+   using namespace CEGUI;
+
+   const KeyEventArgs& keyArgs = static_cast<const KeyEventArgs&>(args);
+
+   switch (keyArgs.scancode)
+      {
+      case Key::F12:
+         break;
+
+      default:
+         return false;
+      }
+
+   return true;
+   }
+
+
+bool TreeDemoSample::handleEventBranchOpened(const CEGUI::EventArgs& args)
+   {
+   using namespace CEGUI;
+
+   const TreeEventArgs& treeArgs = static_cast<const TreeEventArgs&>(args);
+   Editbox *editBox = (Editbox *)TreeDemoWindow->getChild(EditBoxID);
+   editBox->setText("Opened: " + treeArgs.treeItem->getText());
+   return true;
+   }
+
+
+bool TreeDemoSample::handleEventBranchClosed(const CEGUI::EventArgs& args)
+   {
+   using namespace CEGUI;
+
+   const TreeEventArgs& treeArgs = static_cast<const TreeEventArgs&>(args);
+   Editbox *editBox = (Editbox *)TreeDemoWindow->getChild(EditBoxID);
+   editBox->setText("Closed: " + treeArgs.treeItem->getText());
+   return true;
+   }


Property changes on: cegui_mk2/branches/v0-6/Samples/TreeDemo/src/Sample_TreeDemo.cpp
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: cegui_mk2/branches/v0-6/WindowRendererSets/Falagard/include/FalTree.h
===================================================================
--- cegui_mk2/branches/v0-6/WindowRendererSets/Falagard/include/FalTree.h	2008-06-18 11:16:53 UTC (rev 1759)
+++ cegui_mk2/branches/v0-6/WindowRendererSets/Falagard/include/FalTree.h	2008-06-18 12:21:42 UTC (rev 1760)
@@ -1,83 +1,83 @@
-/***********************************************************************
-filename:   FalTree.h
-created:	5-13-07
-author:		Jonathan Welch (Based on Code by David Durant)
-*************************************************************************/
-/***************************************************************************
-*   Copyright (C) 2004 - 2006 Paul D Turner & The CEGUI Development Team
-*
-*   Permission is hereby granted, free of charge, to any person obtaining
-*   a copy of this software and associated documentation files (the
-*   "Software"), to deal in the Software without restriction, including
-*   without limitation the rights to use, copy, modify, merge, publish,
-*   distribute, sublicense, and/or sell copies of the Software, and to
-*   permit persons to whom the Software is furnished to do so, subject to
-*   the following conditions:
-*
-*   The above copyright notice and this permission notice shall be
-*   included in all copies or substantial portions of the Software.
-*
-*   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-*   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-*   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-*   IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-*   OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-*   ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-*   OTHER DEALINGS IN THE SOFTWARE.
-***************************************************************************/
-#ifndef _FalTree_h_
-#define _FalTree_h_
-
-#include "FalModule.h"
-#include "CEGUIWindowFactory.h"
-#include "elements/CEGUITree.h"
-
-// Start of CEGUI namespace section
-namespace CEGUI
-{
-    /*!
-    \brief
-        Tree class for the FalagardBase module.
-
-        This class requires LookNFeel to be assigned.  The LookNFeel should provide the following:
-
-        States:
-            - Enabled
-            - Disabled
-
-        Named Areas:
-            - ItemRenderingArea
-            - ItemRenderingAreaHScroll
-            - ItemRenderingAreaVScroll
-            - ItemRenderingAreaHVScroll
-
-        Child Widgets:
-            Scrollbar based widget with name suffix "__auto_vscrollbar__"
-            Scrollbar based widget with name suffix "__auto_hscrollbar__"
-    */
-    class FALAGARDBASE_API FalagardTree : public WindowRenderer
-    {
-    public:
-        static const utf8   TypeName[];       //!< type name for this widget.
-
-        /*!
-        \brief
-            Constructor
-        */
-        FalagardTree(const String& type, const String& name);
-		FalagardTree(const String& type);
-
-        /*!
-        \brief
-            Destructor
-        */
-        ~FalagardTree();
-    protected:
-        Rect getTreeRenderArea(void) const;
-		void render();
-    };
-
-} // End of  CEGUI namespace section
-
-
-#endif  // end of guard _FalTree_h_
+/***********************************************************************
+filename:   FalTree.h
+created:	5-13-07
+author:		Jonathan Welch (Based on Code by David Durant)
+*************************************************************************/
+/***************************************************************************
+*   Copyright (C) 2004 - 2006 Paul D Turner & The CEGUI Development Team
+*
+*   Permission is hereby granted, free of charge, to any person obtaining
+*   a copy of this software and associated documentation files (the
+*   "Software"), to deal in the Software without restriction, including
+*   without limitation the rights to use, copy, modify, merge, publish,
+*   distribute, sublicense, and/or sell copies of the Software, and to
+*   permit persons to whom the Software is furnished to do so, subject to
+*   the following conditions:
+*
+*   The above copyright notice and this permission notice shall be
+*   included in all copies or substantial portions of the Software.
+*
+*   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+*   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+*   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+*   IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+*   OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+*   ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+*   OTHER DEALINGS IN THE SOFTWARE.
+***************************************************************************/
+#ifndef _FalTree_h_
+#define _FalTree_h_
+
+#include "FalModule.h"
+#include "CEGUIWindowFactory.h"
+#include "elements/CEGUITree.h"
+
+// Start of CEGUI namespace section
+namespace CEGUI
+{
+    /*!
+    \brief
+        Tree class for the FalagardBase module.
+
+        This class requires LookNFeel to be assigned.  The LookNFeel should provide the following:
+
+        States:
+            - Enabled
+            - Disabled
+
+        Named Areas:
+            - ItemRenderingArea
+            - ItemRenderingAreaHScroll
+            - ItemRenderingAreaVScroll
+            - ItemRenderingAreaHVScroll
+
+        Child Widgets:
+            Scrollbar based widget with name suffix "__auto_vscrollbar__"
+            Scrollbar based widget with name suffix "__auto_hscrollbar__"
+    */
+    class FALAGARDBASE_API FalagardTree : public WindowRenderer
+    {
+    public:
+        static const utf8   TypeName[];       //!< type name for this widget.
+
+        /*!
+        \brief
+            Constructor
+        */
+        FalagardTree(const String& type, const String& name);
+		FalagardTree(const String& type);
+
+        /*!
+        \brief
+            Destructor
+        */
+        ~FalagardTree();
+    protected:
+        Rect getTreeRenderArea(void) const;
+		void render();
+    };
+
+} // End of  CEGUI namespace section
+
+
+#endif  // end of guard _FalTree_h_


Property changes on: cegui_mk2/branches/v0-6/WindowRendererSets/Falagard/include/FalTree.h
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: cegui_mk2/branches/v0-6/WindowRendererSets/Falagard/src/FalTree.cpp
===================================================================
--- cegui_mk2/branches/v0-6/WindowRendererSets/Falagard/src/FalTree.cpp	2008-06-18 11:16:53 UTC (rev 1759)
+++ cegui_mk2/branches/v0-6/WindowRendererSets/Falagard/src/FalTree.cpp	2008-06-18 12:21:42 UTC (rev 1760)
@@ -1,106 +1,105 @@
-/***********************************************************************
-filename:   FalTree.cpp
-created:	5-13-07
-author:		Jonathan Welch (Based on Code by David Durant)
-*************************************************************************/
-/***************************************************************************
-*   Copyright (C) 2004 - 2006 Paul D Turner & The CEGUI Development Team
-*
-*   Permission is hereby granted, free of charge, to any person obtaining
-*   a copy of this software and associated documentation files (the
-*   "Software"), to deal in the Software without restriction, including
-*   without limitation the rights to use, copy, modify, merge, publish,
-*   distribute, sublicense, and/or sell copies of the Software, and to
-*   permit persons to whom the Software is furnished to do so, subject to
-*   the following conditions:
-*
-*   The above copyright notice and this permission notice shall be
-*   included in all copies or substantial portions of the Software.
-*
-*   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-*   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-*   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-*   IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-*   OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-*   ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-*   OTHER DEALINGS IN THE SOFTWARE.
-***************************************************************************/
-#include "FalTree.h"
-#include "falagard/CEGUIFalWidgetLookManager.h"
-#include "falagard/CEGUIFalWidgetLookFeel.h"
-#include "CEGUIWindowManager.h"
-#include "elements/CEGUIScrollbar.h"
-
-// Start of CEGUI namespace section
-namespace CEGUI
-{
-    const utf8 FalagardTree::TypeName[] = "Falagard/Tree";
-
-
-    FalagardTree::FalagardTree(const String& type, const String& name) :
-		WindowRenderer(type)
-    {
-    }
-		FalagardTree::FalagardTree(const String& type) :
-		WindowRenderer(type)
-	{
-		Tree* tree = (Tree*)d_window;
-	}
-
-    FalagardTree::~FalagardTree()
-    {
-    }
-
-    Rect FalagardTree::getTreeRenderArea(void) const
-    {
-        // get WidgetLookFeel for the assigned look.
-        const WidgetLookFeel& wlf = getLookNFeel();
-		Tree* tree = (Tree*)d_window;
-		
-        bool v_visible = tree->getVertScrollbar()->isVisible(true);
-        bool h_visible = tree->getHorzScrollbar()->isVisible(true);
-
-        // if either of the scrollbars are visible, we might want to use another text rendering area
-        if (v_visible || h_visible)
-        {
-            String area_name("ItemRenderingArea");
-
-            if (h_visible)
-            {
-                area_name += "H";
-            }
-            if (v_visible)
-            {
-                area_name += "V";
-            }
-            area_name += "Scroll";
-
-            if (wlf.isNamedAreaDefined(area_name))
-            {
-                return wlf.getNamedArea(area_name).getArea().getPixelRect(*tree);
-            }
-        }
-
-        // default to plain ItemRenderingArea
-        return wlf.getNamedArea("ItemRenderingArea").getArea().getPixelRect(*tree);
-    }
-
-	void FalagardTree::render()
-	{
-		Tree* tree = (Tree*)d_window;
-		//Set the render area for this.
-        Rect rect = getTreeRenderArea();
-        tree->setItemRenderArea(rect);
-		const WidgetLookFeel& wlf = getLookNFeel();
-
-		const StateImagery* imagery;
-		//Get the Falagard imagery to render
-		imagery = &wlf.getStateImagery(tree->isDisabled()? "Disabled" : "Enabled");
-		//Render the window
-		imagery->render(*tree);
-		//Fix Scrollbars
-		tree->doScrollbars();
-		//Render the tree.
-		tree->doTreeRender();
-	}
-} // End of  CEGUI namespace section
+/***********************************************************************
+filename:   FalTree.cpp
+created:	5-13-07
+author:		Jonathan Welch (Based on Code by David Durant)
+*************************************************************************/
+/***************************************************************************
+*   Copyright (C) 2004 - 2006 Paul D Turner & The CEGUI Development Team
+*
+*   Permission is hereby granted, free of charge, to any person obtaining
+*   a copy of this software and associated documentation files (the
+*   "Software"), to deal in the Software without restriction, including
+*   without limitation the rights to use, copy, modify, merge, publish,
+*   distribute, sublicense, and/or sell copies of the Software, and to
+*   permit persons to whom the Software is furnished to do so, subject to
+*   the following conditions:
+*
+*   The above copyright notice and this permission notice shall be
+*   included in all copies or substantial portions of the Software.
+*
+*   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+*   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+*   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+*   IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+*   OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+*   ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+*   OTHER DEALINGS IN THE SOFTWARE.
+***************************************************************************/
+#include "FalTree.h"
+#include "falagard/CEGUIFalWidgetLookManager.h"
+#include "falagard/CEGUIFalWidgetLookFeel.h"
+#include "CEGUIWindowManager.h"
+#include "elements/CEGUIScrollbar.h"
+
+// Start of CEGUI namespace section
+namespace CEGUI
+{
+    const utf8 FalagardTree::TypeName[] = "Falagard/Tree";
+
+
+    FalagardTree::FalagardTree(const String& type, const String& name) :
+		WindowRenderer(type)
+    {
+    }
+	FalagardTree::FalagardTree(const String& type) :
+		WindowRenderer(type)
+	{
+	}
+
+    FalagardTree::~FalagardTree()
+    {
+    }
+
+    Rect FalagardTree::getTreeRenderArea(void) const
+    {
+        // get WidgetLookFeel for the assigned look.
+        const WidgetLookFeel& wlf = getLookNFeel();
+		Tree* tree = (Tree*)d_window;
+		
+        bool v_visible = tree->getVertScrollbar()->isVisible(true);
+        bool h_visible = tree->getHorzScrollbar()->isVisible(true);
+
+        // if either of the scrollbars are visible, we might want to use another text rendering area
+        if (v_visible || h_visible)
+        {
+            String area_name("ItemRenderingArea");
+
+            if (h_visible)
+            {
+                area_name += "H";
+            }
+            if (v_visible)
+            {
+                area_name += "V";
+            }
+            area_name += "Scroll";
+
+            if (wlf.isNamedAreaDefined(area_name))
+            {
+                return wlf.getNamedArea(area_name).getArea().getPixelRect(*tree);
+            }
+        }
+
+        // default to plain ItemRenderingArea
+        return wlf.getNamedArea("ItemRenderingArea").getArea().getPixelRect(*tree);
+    }
+
+	void FalagardTree::render()
+	{
+		Tree* tree = (Tree*)d_window;
+		//Set the render area for this.
+        Rect rect = getTreeRenderArea();
+        tree->setItemRenderArea(rect);
+		const WidgetLookFeel& wlf = getLookNFeel();
+
+		const StateImagery* imagery;
+		//Get the Falagard imagery to render
+		imagery = &wlf.getStateImagery(tree->isDisabled()? "Disabled" : "Enabled");
+		//Render the window
+		imagery->render(*tree);
+		//Fix Scrollbars
+		tree->doScrollbars();
+		//Render the tree.
+		tree->doTreeRender();
+	}
+} // End of  CEGUI namespace section


Property changes on: cegui_mk2/branches/v0-6/WindowRendererSets/Falagard/src/FalTree.cpp
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: cegui_mk2/branches/v0-6/include/elements/CEGUITree.h
===================================================================
--- cegui_mk2/branches/v0-6/include/elements/CEGUITree.h	2008-06-18 11:16:53 UTC (rev 1759)
+++ cegui_mk2/branches/v0-6/include/elements/CEGUITree.h	2008-06-18 12:21:42 UTC (rev 1760)
@@ -1,814 +1,814 @@
-/***********************************************************************
-filename:   CEGUITree.h
-created:	5-13-07
-author:		Jonathan Welch (Based on Code by David Durant)
-*************************************************************************/
-/***************************************************************************
-*   Copyright (C) 2004 - 2006 Paul D Turner & The CEGUI Development Team
-*
-*   Permission is hereby granted, free of charge, to any person obtaining
-*   a copy of this software and associated documentation files (the
-*   "Software"), to deal in the Software without restriction, including
-*   without limitation the rights to use, copy, modify, merge, publish,
-*   distribute, sublicense, and/or sell copies of the Software, and to
-*   permit persons to whom the Software is furnished to do so, subject to
-*   the following conditions:
-*
-*   The above copyright notice and this permission notice shall be
-*   included in all copies or substantial portions of the Software.
-*
-*   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-*   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-*   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-*   IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-*   OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-*   ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-*   OTHER DEALINGS IN THE SOFTWARE.
-***************************************************************************/
-#ifndef _CEGUITree_h_
-#define _CEGUITree_h_
-
-#include "CEGUIBase.h"
-#include "CEGUIWindow.h"
-#include "CEGUIWindowManager.h"
-#include "elements/CEGUITreeItem.h"
-#include "elements/CEGUITreeProperties.h"
-#include <vector>
-
-
-#if defined(_MSC_VER)
-#	pragma warning(push)
-#	pragma warning(disable : 4251)
-#endif
-
-
-// Start of CEGUI namespace section
-namespace CEGUI
-{
-class ImagerySection;   // forward declaration
-
-/*!
-\brief
-	EventArgs based class that is used for objects passed to input event handlers
-	concerning Tree events.
-*/
-class CEGUIEXPORT TreeEventArgs : public WindowEventArgs
-   {
-public:
-	TreeEventArgs(Window* wnd) : WindowEventArgs(wnd) { treeItem = 0; }
-   TreeItem *treeItem;
-   };
-
-
-/*!
-\brief
-	Base class for standard Tree widget.
-*/
-class CEGUIEXPORT Tree : public Window
-{
-friend class TreeItem;
-typedef	std::vector<TreeItem*>	LBItemList;
-
-public:
-	static const String EventNamespace;				//!< Namespace for global events
-	static const String WidgetTypeName;
-
-	/*************************************************************************
-		Constants
-	*************************************************************************/
-	// event names
-	static const String EventListContentsChanged;		//!< Event triggered when the contents of the list is changed.
-	static const String EventSelectionChanged;			//!< Event triggered when there is a change to the currently selected item(s).
-	static const String EventSortModeChanged;				//!< Event triggered when the sort mode setting changes.
-	static const String EventMultiselectModeChanged;	//!< Event triggered when the multi-select mode setting changes.
-	static const String EventVertScrollbarModeChanged;	//!< Event triggered when the vertical scroll bar 'force' setting changes.
-	static const String EventHorzScrollbarModeChanged;	//!< Event triggered when the horizontal scroll bar 'force' setting changes.
-   static const String EventBranchOpened;             //!< Event triggered when a branch of the tree is opened by the user.
-   static const String EventBranchClosed;             //!< Event triggered when a branch of the tree is closed by the user.
-
-   //Render the actual tree
-   void doTreeRender() { populateRenderCache(); }
-   //UpdateScrollbars
-   void doScrollbars() { configureScrollbars(); }
-	/*************************************************************************
-		Accessor Methods
-	*************************************************************************/
-	/*!
-	\brief
-		Return number of items attached to the list box
-
-	\return
-		the number of items currently attached to this list box.
-	*/
-	size_t	getItemCount(void) const		{return d_listItems.size();}
-
-
-	/*!
-	\brief
-		Return the number of selected items in the list box.
-
-	\return
-		Total number of attached items that are in the selected state.
-	*/
-	size_t	getSelectedCount(void) const;
-
-
-	/*!
-	\brief
-		Return a pointer to the first selected item.
-
-	\return
-		Pointer to a TreeItem based object that is the first selected item in the list.  will return NULL if
-		no item is selected.
-	*/
-	TreeItem*	getFirstSelectedItem(void) const;
-
-
-	/*!
-	\brief
-		Return a pointer to the first selected item.
-
-	\return
-		Pointer to a TreeItem based object that is the last item selected by the user, not necessarily the
-      last selected in the list.  Will return NULL if no item is selected.
-	*/
-   TreeItem*	getLastSelectedItem(void) const { return d_lastSelected; }
-
-
-	/*!
-	\brief
-		Return a pointer to the next selected item after item \a start_item
-
-	\param start_item
-		Pointer to the TreeItem where the search for the next selected item is to begin.  If this
-		parameter is NULL, the search will begin with the first item in the list box.
-
-	\return
-		Pointer to a TreeItem based object that is the next selected item in the list after
-		the item specified by \a start_item.  Will return NULL if no further items were selected.
-
-	\exception	InvalidRequestException	thrown if \a start_item is not attached to this list box.
-	*/
-	TreeItem*	getNextSelected(const TreeItem* start_item) const;
-
-
-   TreeItem*   getNextSelectedItemFromList(const LBItemList &itemList, const TreeItem* start_item, bool foundStartItem) const;
-
-	/*!
-	\brief
-		return whether list sorting is enabled
-
-	\return
-		true if the list is sorted, false if the list is not sorted
-	*/
-	bool	isSortEnabled(void) const		{return d_sorted;}
-
-	void setItemRenderArea(Rect& r)
-	{
-		d_itemArea = r;
-	}
-
-	Scrollbar* getVertScrollbar() { return d_vertScrollbar; }
-	Scrollbar* getHorzScrollbar() { return d_horzScrollbar; }
-
-	/*!
-	\brief
-		return whether multi-select is enabled
-
-	\return
-		true if multi-select is enabled, false if multi-select is not enabled.
-	*/
-	bool	isMultiselectEnabled(void) const	{return d_multiselect;}
-
-	bool	isItemTooltipsEnabled(void) const	{return d_itemTooltips;}
-
-
-	/*!
-	\brief
-		Search the list for an item with the specified text
-
-	\param text
-		String object containing the text to be searched for.
-
-	\param start_item
-		TreeItem where the search is to begin, the search will not include \a item.  If \a item is
-		NULL, the search will begin from the first item in the list.
-
-	\return
-		Pointer to the first TreeItem in the list after \a item that has text matching \a text.  If
-		no item matches the criteria NULL is returned.
-
-	\exception	InvalidRequestException	thrown if \a item is not attached to this list box.
-	*/
-   TreeItem*	findFirstItemWithText(const String& text);
-	TreeItem*	findNextItemWithText(const String& text, const TreeItem* start_item);
-   TreeItem*   findItemWithTextFromList(const LBItemList &itemList, const String& text, const TreeItem* start_item, bool foundStartItem);
-
-
-	/*!
-	\brief
-		Search the list for an item with the specified text
-
-	\param text
-		String object containing the text to be searched for.
-
-	\param start_item
-		TreeItem where the search is to begin, the search will not include \a item.  If \a item is
-		NULL, the search will begin from the first item in the list.
-
-	\return
-		Pointer to the first TreeItem in the list after \a item that has text matching \a text.  If
-		no item matches the criteria NULL is returned.
-
-	\exception	InvalidRequestException	thrown if \a item is not attached to this list box.
-	*/
-   TreeItem*	findFirstItemWithID(uint searchID);
-	TreeItem*	findNextItemWithID(uint searchID, const TreeItem* start_item);
-   TreeItem*   findItemWithIDFromList(const LBItemList &itemList, uint searchID, const TreeItem* start_item, bool foundStartItem);
-
-
-	/*!
-	\brief
-		Return whether the specified TreeItem is in the List
-
-	\return
-		true if TreeItem \a item is in the list, false if TreeItem \a item is not in the list.
-	*/
-	bool	isTreeItemInList(const TreeItem* item) const;
-
-
-	/*!
-	\brief
-		Return whether the vertical scroll bar is always shown.
-
-	\return
-		- true if the scroll bar will always be shown even if it is not required.
-		- false if the scroll bar will only be shown when it is required.
-	*/
-	bool	isVertScrollbarAlwaysShown(void) const;
-
-
-	/*!
-	\brief
-		Return whether the horizontal scroll bar is always shown.
-
-	\return
-		- true if the scroll bar will always be shown even if it is not required.
-		- false if the scroll bar will only be shown when it is required.
-	*/
-	bool	isHorzScrollbarAlwaysShown(void) const;
-
-
-	/*************************************************************************
-		Manipulator Methods
-	*************************************************************************/
-	/*!
-	\brief
-		Initialise the Window based object ready for use.
-
-	\note
-		This must be called for every window created.  Normally this is handled automatically by the WindowFactory for each Window type.
-
-	\return
-		Nothing
-	*/
-	virtual void	initialise(void);
-
-
-	/*!
-	\brief
-		Remove all items from the list.
-
-		Note that this will cause 'AutoDelete' items to be deleted.
-	*/
-	void	resetList(void);
-
-
-	/*!
-	\brief
-		Add the given TreeItem to the list.
-
-	\param item
-		Pointer to the TreeItem to be added to the list.  Note that it is the passed object that is added to the
-		list, a copy is not made.  If this parameter is NULL, nothing happens.
-
-	\return
-		Nothing.
-	*/
-	void	addItem(TreeItem* item);
-
-
-	/*!
-	\brief
-		Insert an item into the list box after a specified item already in the list.
-
-		Note that if the list is sorted, the item may not end up in the requested position.
-
-	\param item
-		Pointer to the TreeItem to be inserted.  Note that it is the passed object that is added to the
-		list, a copy is not made.  If this parameter is NULL, nothing happens.
-
-	\param position
-		Pointer to a TreeItem that \a item is to be inserted after.  If this parameter is NULL, the item is
-		inserted at the start of the list.
-
-	\return
-		Nothing.
-
-	\exception InvalidRequestException	thrown if no TreeItem \a position is attached to this list box.
-	*/
-	void	insertItem(TreeItem* item, const TreeItem* position);
-
-
-	/*!
-	\brief
-		Removes the given item from the list box.  If the item is has the auto delete state set, the item will be deleted.
-
-	\param item
-		Pointer to the TreeItem that is to be removed.  If \a item is not attached to this list box then nothing
-		will happen.
-
-	\return
-		Nothing.
-	*/
-	void	removeItem(const TreeItem* item);
-
-
-	/*!
-	\brief
-		Clear the selected state for all items.
-
-	\return
-		Nothing.
-	*/
-	void	clearAllSelections(void);
-   bool  clearAllSelectionsFromList(const LBItemList &itemList);
-
-
-	/*!
-	\brief
-		Set whether the list should be sorted.
-
-	\param setting
-		true if the list should be sorted, false if the list should not be sorted.
-
-	\return
-		Nothing.
-	*/
-	void	setSortingEnabled(bool setting);
-
-
-	/*!
-	\brief
-		Set whether the list should allow multiple selections or just a single selection
-
-	\param  setting
-		true if the widget should allow multiple items to be selected, false if the widget should only allow
-		a single selection.
-
-	\return
-		Nothing.
-	*/
-	void	setMultiselectEnabled(bool setting);
-
-
-	/*!
-	\brief
-		Set whether the vertical scroll bar should always be shown.
-
-	\param setting
-		true if the vertical scroll bar should be shown even when it is not required.  false if the vertical
-		scroll bar should only be shown when it is required.
-
-	\return
-		Nothing.
-	*/
-	void	setShowVertScrollbar(bool setting);
-
-
-	/*!
-	\brief
-		Set whether the horizontal scroll bar should always be shown.
-
-	\param setting
-		true if the horizontal scroll bar should be shown even when it is not required.  false if the horizontal
-		scroll bar should only be shown when it is required.
-
-	\return
-		Nothing.
-	*/
-	void	setShowHorzScrollbar(bool setting);
-
-	void	setItemTooltipsEnabled(bool setting);
-	/*!
-	\brief
-		Set the select state of an attached TreeItem.
-
-		This is the recommended way of selecting and deselecting items attached to a list box as it respects the
-		multi-select mode setting.  It is possible to modify the setting on TreeItems directly, but that approach
-		does not respect the settings of the list box.
-
-	\param item
-		The TreeItem to be affected.  This item must be attached to the list box.
-
-	\param state
-		true to select the item, false to de-select the item.
-
-	\return
-		Nothing.
-
-	\exception	InvalidRequestException	thrown if \a item is not attached to this list box.
-	*/
-	void	setItemSelectState(TreeItem* item, bool state);
-
-
-	/*!
-	\brief
-		Set the select state of an attached TreeItem.
-
-		This is the recommended way of selecting and deselecting items attached to a list box as it respects the
-		multi-select mode setting.  It is possible to modify the setting on TreeItems directly, but that approach
-		does not respect the settings of the list box.
-
-	\param item_index
-		The zero based index of the TreeItem to be affected.  This must be a valid index (0 <= index < getItemCount())
-
-	\param state
-		true to select the item, false to de-select the item.
-
-	\return
-		Nothing.
-
-	\exception	InvalidRequestException	thrown if \a item_index is out of range for the list box
-	*/
-	void	setItemSelectState(size_t item_index, bool state);
-
-    /*!
-    \brief
-        Set the LookNFeel that shoule be used for this window.
-
-    \param look
-        String object holding the name of the look to be assigned to the window.
-
-    \return
-        Nothing.
-
-    \exception UnknownObjectException
-        thrown if the look'n'feel specified by \a look does not exist.
-
-    \note
-        Once a look'n'feel has been assigned it is locked - as in cannot be changed.
-    */
-    virtual void setLookNFeel(const String& look);
-
-	/*!
-	\brief
-		Causes the list box to update it's internal state after changes have been made to one or more
-		attached TreeItem objects.
-
-		Client code must call this whenever it has made any changes to TreeItem objects already attached to the
-		list box.  If you are just adding items, or removed items to update them prior to re-adding them, there is
-		no need to call this method.
-
-	\return
-		Nothing.
-	*/
-	void	handleUpdatedItemData(void);
-
-
-	/*!
-	\brief
-		Ensure the item at the specified index is visible within the list box.
-
-	\param item
-		Pointer to the TreeItem to be made visible in the list box.
-
-	\return
-		Nothing.
-
-	\exception	InvalidRequestException	thrown if \a item is not attached to this list box.
-	*/
-	void	ensureItemIsVisible(const TreeItem* item);
-
-
-	/*************************************************************************
-		Construction and Destruction
-	*************************************************************************/
-	/*!
-	\brief
-		Constructor for Tree base class.
-	*/
-	Tree(const String& type, const String& name);
-
-
-	/*!
-	\brief
-		Destructor for Tree base class.
-	*/
-	virtual ~Tree(void);
-
-
-protected:
-	/*************************************************************************
-		Abstract Implementation Functions (must be provided by derived class)
-	*************************************************************************/
-	/*!
-	\brief
-		Return a Rect object describing, in un-clipped pixels, the window relative area
-		that is to be used for rendering list items.
-
-	\return
-		Rect object describing the area of the Window to be used for rendering
-		list box items.
-	*/
-	virtual	Rect getTreeRenderArea(void) const
-	{
-		return d_itemArea;
-	}
-
-	/*!
-	\brief
-		create and return a pointer to a Scrollbar widget for use as vertical scroll bar
-
-	\param name
-	   String holding the name to be given to the created widget component.
-
-	\return
-		Pointer to a Scrollbar to be used for scrolling the list vertically.
-	*/
-	virtual Scrollbar*	createVertScrollbar(const String& name) const
-	{
-		return (Scrollbar*)(WindowManager::getSingleton().getWindow(name));
-	}
-
-	/*!
-	\brief
-		create and return a pointer to a Scrollbar widget for use as horizontal scroll bar
-
-	\param name
-	   String holding the name to be given to the created widget component.
-
-	\return
-		Pointer to a Scrollbar to be used for scrolling the list horizontally.
-	*/
-	virtual Scrollbar*	createHorzScrollbar(const String& name) const
-	{
-		return (Scrollbar*)(WindowManager::getSingleton().getWindow(name));
-	}
-
-
-	/*!
-	\brief
-		Perform caching of the widget control frame and other 'static' areas.  This
-		method should not render the actual items.  Note that the items are typically
-		rendered to layer 3, other layers can be used for rendering imagery behind and
-		infront of the items.
-
-	\return
-		Nothing.
-	*/
-	virtual	void cacheTreeBaseImagery()
-	{
-
-	}
-
-
-
-
-	/*************************************************************************
-		Implementation Functions
-	*************************************************************************/
-	/*!
-	\brief
-		Add list box specific events
-	*/
-	void	addTreeEvents(void);
-
-
-	/*!
-	\brief
-		display required integrated scroll bars according to current state of the list box and update their values.
-	*/
-	void	configureScrollbars(void);
-
-	/*!
-	\brief
-		select all strings between positions \a start and \a end.  (inclusive)
-		including \a end.
-	*/
-	void	selectRange(size_t start, size_t end);
-
-
-	/*!
-	\brief
-		Return the sum of all item heights
-	*/
-	float	getTotalItemsHeight(void) const;
-   void  getTotalItemsInListHeight(const LBItemList &itemList, float *heightSum) const;
-
-
-	/*!
-	\brief
-		Return the width of the widest item
-	*/
-	float	getWidestItemWidth(void) const;
-   void  getWidestItemWidthInList(const LBItemList &itemList, int itemDepth, float *widest) const;
-
-	/*!
-	\brief
-		Clear the selected state for all items (implementation)
-
-	\return
-		true if treeItem was found in the search, false if it was not.
-	*/
-   bool getHeightToItemInList(const LBItemList &itemList, const TreeItem *treeItem, int itemDepth, float *height) const;
-
-
-	/*!
-	\brief
-		Clear the selected state for all items (implementation)
-
-	\return
-		true if some selections were cleared, false nothing was changed.
-	*/
-	bool	clearAllSelections_impl(void);
-
-
-	/*!
-	\brief
-		Return the TreeItem under the given window local pixel co-ordinate.
-
-	\return
-		TreeItem that is under window pixel co-ordinate \a pt, or NULL if no
-		item is under that position.
-	*/
-	TreeItem*	getItemAtPoint(const Point& pt) const;
-   TreeItem*   getItemFromListAtPoint(const LBItemList &itemList, float *bottomY, const Point& pt) const;
-
-
-	/*!
-	\brief
-		Remove all items from the list.
-
-	\note
-		Note that this will cause 'AutoDelete' items to be deleted.
-
-	\return
-		- true if the list contents were changed.
-		- false if the list contents were not changed (list already empty).
-	*/
-	bool	resetList_impl(void);
-
-
-	/*!
-	\brief
-		Return whether this window was inherited from the given class name at some point in the inheritance heirarchy.
-
-	\param class_name
-		The class name that is to be checked.
-
-	\return
-		true if this window was inherited from \a class_name. false if not.
-	*/
-	virtual bool	testClassName_impl(const String& class_name) const
-	{
-		if (class_name==(const utf8*)"Tree")	return true;
-		return Window::testClassName_impl(class_name);
-	}
-
-	/*!
-	\brief
-	   Internal handler that is triggered when the user interacts with the scrollbars.
-    */
-    bool handle_scrollChange(const EventArgs& args);
-
-    // overridden from Window base class.
-    virtual void populateRenderCache();
-
-    void drawItemList(LBItemList &itemList, Rect &itemsArea, float widest, Vector3 &itemPos, RenderCache& cache, float alpha);
-
-
-	/*************************************************************************
-		New event handlers
-	*************************************************************************/
-	/*!
-	\brief
-		Handler called internally when the list contents are changed
-	*/
-	virtual	void	onListContentsChanged(WindowEventArgs& e);
-
-
-	/*!
-	\brief
-		Handler called internally when the currently selected item or items changes.
-	*/
-	virtual	void	onSelectionChanged(TreeEventArgs& e);
-
-
-	/*!
-	\brief
-		Handler called internally when the sort mode setting changes.
-	*/
-	virtual	void	onSortModeChanged(WindowEventArgs& e);
-
-
-	/*!
-	\brief
-		Handler called internally when the multi-select mode setting changes.
-	*/
-	virtual	void	onMultiselectModeChanged(WindowEventArgs& e);
-
-
-	/*!
-	\brief
-		Handler called internally when the forced display of the vertical scroll bar setting changes.
-	*/
-	virtual	void	onVertScrollbarModeChanged(WindowEventArgs& e);
-
-
-	/*!
-	\brief
-		Handler called internally when the forced display of the horizontal scroll bar setting changes.
-	*/
-	virtual	void	onHorzScrollbarModeChanged(WindowEventArgs& e);
-
-	/*!
-	\brief
-		Handler called internally when the user opens a branch of the tree.
-	*/
-	virtual	void	onBranchOpened(TreeEventArgs& e);
-
-	/*!
-	\brief
-		Handler called internally when the user closes a branch of the tree.
-	*/
-	virtual	void	onBranchClosed(TreeEventArgs& e);
-
-
-
-	/*************************************************************************
-		Overridden Event handlers
-	*************************************************************************/
-	virtual void	onSized(WindowEventArgs& e);
-	virtual void	onMouseButtonDown(MouseEventArgs& e);
-	virtual	void	onMouseWheel(MouseEventArgs& e);
-	virtual void	onMouseMove(MouseEventArgs& e);
-
-
-	/*************************************************************************
-		Implementation Data
-	*************************************************************************/
-	bool	d_sorted;				   //!< true if list is sorted
-	bool	d_multiselect;			   //!< true if multi-select is enabled
-	bool	d_forceVertScroll;		//!< true if vertical scrollbar should always be displayed
-	bool	d_forceHorzScroll;		//!< true if horizontal scrollbar should always be displayed
-	bool	d_itemTooltips;			//!< true if each item should have an individual tooltip
-	Scrollbar*	d_vertScrollbar;	//!< vertical scroll-bar widget
-	Scrollbar*	d_horzScrollbar;	//!< horizontal scroll-bar widget
-	LBItemList	d_listItems;		//!< list of items in the list box.
-	TreeItem*	d_lastSelected;	//!< holds pointer to the last selected item (used in range selections)
-   ImagerySection *openButtonImagery;
-   ImagerySection *closeButtonImagery;
-
-
-private:
-	/*************************************************************************
-		Static Properties for this class
-	*************************************************************************/
-	static TreeProperties::Sort					d_sortProperty;
-	static TreeProperties::MultiSelect			d_multiSelectProperty;
-	static TreeProperties::ForceVertScrollbar	d_forceVertProperty;
-	static TreeProperties::ForceHorzScrollbar	d_forceHorzProperty;
-	static TreeProperties::ItemTooltips			d_itemTooltipsProperty;
-
-	/*************************************************************************
-		Private methods
-	*************************************************************************/
-	void	addTreeProperties(void);
-	Rect d_itemArea;
-};
-
-
-/*!
-\brief
-	Helper function used in sorting to compare two list box item text strings
-	via the TreeItem pointers and return if \a a is less than \a b.
-*/
-bool lbi_less(const TreeItem* a, const TreeItem* b);
-
-
-/*!
-\brief
-	Helper function used in sorting to compare two list box item text strings
-	via the TreeItem pointers and return if \a a is greater than \a b.
-*/
-bool lbi_greater(const TreeItem* a, const TreeItem* b);
-
-} // End of  CEGUI namespace section
-
-
-#if defined(_MSC_VER)
-#	pragma warning(pop)
-#endif
-
-#endif	// end of guard _CEGUITree_h_
+/***********************************************************************
+filename:   CEGUITree.h
+created:	5-13-07
+author:		Jonathan Welch (Based on Code by David Durant)
+*************************************************************************/
+/***************************************************************************
+*   Copyright (C) 2004 - 2006 Paul D Turner & The CEGUI Development Team
+*
+*   Permission is hereby granted, free of charge, to any person obtaining
+*   a copy of this software and associated documentation files (the
+*   "Software"), to deal in the Software without restriction, including
+*   without limitation the rights to use, copy, modify, merge, publish,
+*   distribute, sublicense, and/or sell copies of the Software, and to
+*   permit persons to whom the Software is furnished to do so, subject to
+*   the following conditions:
+*
+*   The above copyright notice and this permission notice shall be
+*   included in all copies or substantial portions of the Software.
+*
+*   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+*   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+*   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+*   IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+*   OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+*   ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+*   OTHER DEALINGS IN THE SOFTWARE.
+***************************************************************************/
+#ifndef _CEGUITree_h_
+#define _CEGUITree_h_
+
+#include "CEGUIBase.h"
+#include "CEGUIWindow.h"
+#include "CEGUIWindowManager.h"
+#include "elements/CEGUITreeItem.h"
+#include "elements/CEGUITreeProperties.h"
+#include <vector>
+
+
+#if defined(_MSC_VER)
+#	pragma warning(push)
+#	pragma warning(disable : 4251)
+#endif
+
+
+// Start of CEGUI namespace section
+namespace CEGUI
+{
+class ImagerySection;   // forward declaration
+
+/*!
+\brief
+	EventArgs based class that is used for objects passed to input event handlers
+	concerning Tree events.
+*/
+class CEGUIEXPORT TreeEventArgs : public WindowEventArgs
+   {
+public:
+	TreeEventArgs(Window* wnd) : WindowEventArgs(wnd) { treeItem = 0; }
+   TreeItem *treeItem;
+   };
+
+
+/*!
+\brief
+	Base class for standard Tree widget.
+*/
+class CEGUIEXPORT Tree : public Window
+{
+friend class TreeItem;
+typedef	std::vector<TreeItem*>	LBItemList;
+
+public:
+	static const String EventNamespace;				//!< Namespace for global events
+	static const String WidgetTypeName;
+
+	/*************************************************************************
+		Constants
+	*************************************************************************/
+	// event names
+	static const String EventListContentsChanged;		//!< Event triggered when the contents of the list is changed.
+	static const String EventSelectionChanged;			//!< Event triggered when there is a change to the currently selected item(s).
+	static const String EventSortModeChanged;				//!< Event triggered when the sort mode setting changes.
+	static const String EventMultiselectModeChanged;	//!< Event triggered when the multi-select mode setting changes.
+	static const String EventVertScrollbarModeChanged;	//!< Event triggered when the vertical scroll bar 'force' setting changes.
+	static const String EventHorzScrollbarModeChanged;	//!< Event triggered when the horizontal scroll bar 'force' setting changes.
+   static const String EventBranchOpened;             //!< Event triggered when a branch of the tree is opened by the user.
+   static const String EventBranchClosed;             //!< Event triggered when a branch of the tree is closed by the user.
+
+   //Render the actual tree
+   void doTreeRender() { populateRenderCache(); }
+   //UpdateScrollbars
+   void doScrollbars() { configureScrollbars(); }
+	/*************************************************************************
+		Accessor Methods
+	*************************************************************************/
+	/*!
+	\brief
+		Return number of items attached to the list box
+
+	\return
+		the number of items currently attached to this list box.
+	*/
+	size_t	getItemCount(void) const		{return d_listItems.size();}
+
+
+	/*!
+	\brief
+		Return the number of selected items in the list box.
+
+	\return
+		Total number of attached items that are in the selected state.
+	*/
+	size_t	getSelectedCount(void) const;
+
+
+	/*!
+	\brief
+		Return a pointer to the first selected item.
+
+	\return
+		Pointer to a TreeItem based object that is the first selected item in the list.  will return NULL if
+		no item is selected.
+	*/
+	TreeItem*	getFirstSelectedItem(void) const;
+
+
+	/*!
+	\brief
+		Return a pointer to the first selected item.
+
+	\return
+		Pointer to a TreeItem based object that is the last item selected by the user, not necessarily the
+      last selected in the list.  Will return NULL if no item is selected.
+	*/
+   TreeItem*	getLastSelectedItem(void) const { return d_lastSelected; }
+
+
+	/*!
+	\brief
+		Return a pointer to the next selected item after item \a start_item
+
+	\param start_item
+		Pointer to the TreeItem where the search for the next selected item is to begin.  If this
+		parameter is NULL, the search will begin with the first item in the list box.
+
+	\return
+		Pointer to a TreeItem based object that is the next selected item in the list after
+		the item specified by \a start_item.  Will return NULL if no further items were selected.
+
+	\exception	InvalidRequestException	thrown if \a start_item is not attached to this list box.
+	*/
+	TreeItem*	getNextSelected(const TreeItem* start_item) const;
+
+
+   TreeItem*   getNextSelectedItemFromList(const LBItemList &itemList, const TreeItem* start_item, bool foundStartItem) const;
+
+	/*!
+	\brief
+		return whether list sorting is enabled
+
+	\return
+		true if the list is sorted, false if the list is not sorted
+	*/
+	bool	isSortEnabled(void) const		{return d_sorted;}
+
+	void setItemRenderArea(Rect& r)
+	{
+		d_itemArea = r;
+	}
+
+	Scrollbar* getVertScrollbar() { return d_vertScrollbar; }
+	Scrollbar* getHorzScrollbar() { return d_horzScrollbar; }
+
+	/*!
+	\brief
+		return whether multi-select is enabled
+
+	\return
+		true if multi-select is enabled, false if multi-select is not enabled.
+	*/
+	bool	isMultiselectEnabled(void) const	{return d_multiselect;}
+
+	bool	isItemTooltipsEnabled(void) const	{return d_itemTooltips;}
+
+
+	/*!
+	\brief
+		Search the list for an item with the specified text
+
+	\param text
+		String object containing the text to be searched for.
+
+	\param start_item
+		TreeItem where the search is to begin, the search will not include \a item.  If \a item is
+		NULL, the search will begin from the first item in the list.
+
+	\return
+		Pointer to the first TreeItem in the list after \a item that has text matching \a text.  If
+		no item matches the criteria NULL is returned.
+
+	\exception	InvalidRequestException	thrown if \a item is not attached to this list box.
+	*/
+   TreeItem*	findFirstItemWithText(const String& text);
+	TreeItem*	findNextItemWithText(const String& text, const TreeItem* start_item);
+   TreeItem*   findItemWithTextFromList(const LBItemList &itemList, const String& text, const TreeItem* start_item, bool foundStartItem);
+
+
+	/*!
+	\brief
+		Search the list for an item with the specified text
+
+	\param text
+		String object containing the text to be searched for.
+
+	\param start_item
+		TreeItem where the search is to begin, the search will not include \a item.  If \a item is
+		NULL, the search will begin from the first item in the list.
+
+	\return
+		Pointer to the first TreeItem in the list after \a item that has text matching \a text.  If
+		no item matches the criteria NULL is returned.
+
+	\exception	InvalidRequestException	thrown if \a item is not attached to this list box.
+	*/
+   TreeItem*	findFirstItemWithID(uint searchID);
+	TreeItem*	findNextItemWithID(uint searchID, const TreeItem* start_item);
+   TreeItem*   findItemWithIDFromList(const LBItemList &itemList, uint searchID, const TreeItem* start_item, bool foundStartItem);
+
+
+	/*!
+	\brief
+		Return whether the specified TreeItem is in the List
+
+	\return
+		true if TreeItem \a item is in the list, false if TreeItem \a item is not in the list.
+	*/
+	bool	isTreeItemInList(const TreeItem* item) const;
+
+
+	/*!
+	\brief
+		Return whether the vertical scroll bar is always shown.
+
+	\return
+		- true if the scroll bar will always be shown even if it is not required.
+		- false if the scroll bar will only be shown when it is required.
+	*/
+	bool	isVertScrollbarAlwaysShown(void) const;
+
+
+	/*!
+	\brief
+		Return whether the horizontal scroll bar is always shown.
+
+	\return
+		- true if the scroll bar will always be shown even if it is not required.
+		- false if the scroll bar will only be shown when it is required.
+	*/
+	bool	isHorzScrollbarAlwaysShown(void) const;
+
+
+	/*************************************************************************
+		Manipulator Methods
+	*************************************************************************/
+	/*!
+	\brief
+		Initialise the Window based object ready for use.
+
+	\note
+		This must be called for every window created.  Normally this is handled automatically by the WindowFactory for each Window type.
+
+	\return
+		Nothing
+	*/
+	virtual void	initialise(void);
+
+
+	/*!
+	\brief
+		Remove all items from the list.
+
+		Note that this will cause 'AutoDelete' items to be deleted.
+	*/
+	void	resetList(void);
+
+
+	/*!
+	\brief
+		Add the given TreeItem to the list.
+
+	\param item
+		Pointer to the TreeItem to be added to the list.  Note that it is the passed object that is added to the
+		list, a copy is not made.  If this parameter is NULL, nothing happens.
+
+	\return
+		Nothing.
+	*/
+	void	addItem(TreeItem* item);
+
+
+	/*!
+	\brief
+		Insert an item into the list box after a specified item already in the list.
+
+		Note that if the list is sorted, the item may not end up in the requested position.
+
+	\param item
+		Pointer to the TreeItem to be inserted.  Note that it is the passed object that is added to the
+		list, a copy is not made.  If this parameter is NULL, nothing happens.
+
+	\param position
+		Pointer to a TreeItem that \a item is to be inserted after.  If this parameter is NULL, the item is
+		inserted at the start of the list.
+
+	\return
+		Nothing.
+
+	\exception InvalidRequestException	thrown if no TreeItem \a position is attached to this list box.
+	*/
+	void	insertItem(TreeItem* item, const TreeItem* position);
+
+
+	/*!
+	\brief
+		Removes the given item from the list box.  If the item is has the auto delete state set, the item will be deleted.
+
+	\param item
+		Pointer to the TreeItem that is to be removed.  If \a item is not attached to this list box then nothing
+		will happen.
+
+	\return
+		Nothing.
+	*/
+	void	removeItem(const TreeItem* item);
+
+
+	/*!
+	\brief
+		Clear the selected state for all items.
+
+	\return
+		Nothing.
+	*/
+	void	clearAllSelections(void);
+   bool  clearAllSelectionsFromList(const LBItemList &itemList);
+
+
+	/*!
+	\brief
+		Set whether the list should be sorted.
+
+	\param setting
+		true if the list should be sorted, false if the list should not be sorted.
+
+	\return
+		Nothing.
+	*/
+	void	setSortingEnabled(bool setting);
+
+
+	/*!
+	\brief
+		Set whether the list should allow multiple selections or just a single selection
+
+	\param  setting
+		true if the widget should allow multiple items to be selected, false if the widget should only allow
+		a single selection.
+
+	\return
+		Nothing.
+	*/
+	void	setMultiselectEnabled(bool setting);
+
+
+	/*!
+	\brief
+		Set whether the vertical scroll bar should always be shown.
+
+	\param setting
+		true if the vertical scroll bar should be shown even when it is not required.  false if the vertical
+		scroll bar should only be shown when it is required.
+
+	\return
+		Nothing.
+	*/
+	void	setShowVertScrollbar(bool setting);
+
+
+	/*!
+	\brief
+		Set whether the horizontal scroll bar should always be shown.
+
+	\param setting
+		true if the horizontal scroll bar should be shown even when it is not required.  false if the horizontal
+		scroll bar should only be shown when it is required.
+
+	\return
+		Nothing.
+	*/
+	void	setShowHorzScrollbar(bool setting);
+
+	void	setItemTooltipsEnabled(bool setting);
+	/*!
+	\brief
+		Set the select state of an attached TreeItem.
+
+		This is the recommended way of selecting and deselecting items attached to a list box as it respects the
+		multi-select mode setting.  It is possible to modify the setting on TreeItems directly, but that approach
+		does not respect the settings of the list box.
+
+	\param item
+		The TreeItem to be affected.  This item must be attached to the list box.
+
+	\param state
+		true to select the item, false to de-select the item.
+
+	\return
+		Nothing.
+
+	\exception	InvalidRequestException	thrown if \a item is not attached to this list box.
+	*/
+	void	setItemSelectState(TreeItem* item, bool state);
+
+
+	/*!
+	\brief
+		Set the select state of an attached TreeItem.
+
+		This is the recommended way of selecting and deselecting items attached to a list box as it respects the
+		multi-select mode setting.  It is possible to modify the setting on TreeItems directly, but that approach
+		does not respect the settings of the list box.
+
+	\param item_index
+		The zero based index of the TreeItem to be affected.  This must be a valid index (0 <= index < getItemCount())
+
+	\param state
+		true to select the item, false to de-select the item.
+
+	\return
+		Nothing.
+
+	\exception	InvalidRequestException	thrown if \a item_index is out of range for the list box
+	*/
+	void	setItemSelectState(size_t item_index, bool state);
+
+    /*!
+    \brief
+        Set the LookNFeel that shoule be used for this window.
+
+    \param look
+        String object holding the name of the look to be assigned to the window.
+
+    \return
+        Nothing.
+
+    \exception UnknownObjectException
+        thrown if the look'n'feel specified by \a look does not exist.
+
+    \note
+        Once a look'n'feel has been assigned it is locked - as in cannot be changed.
+    */
+    virtual void setLookNFeel(const String& look);
+
+	/*!
+	\brief
+		Causes the list box to update it's internal state after changes have been made to one or more
+		attached TreeItem objects.
+
+		Client code must call this whenever it has made any changes to TreeItem objects already attached to the
+		list box.  If you are just adding items, or removed items to update them prior to re-adding them, there is
+		no need to call this method.
+
+	\return
+		Nothing.
+	*/
+	void	handleUpdatedItemData(void);
+
+
+	/*!
+	\brief
+		Ensure the item at the specified index is visible within the list box.
+
+	\param item
+		Pointer to the TreeItem to be made visible in the list box.
+
+	\return
+		Nothing.
+
+	\exception	InvalidRequestException	thrown if \a item is not attached to this list box.
+	*/
+	void	ensureItemIsVisible(const TreeItem* item);
+
+
+	/*************************************************************************
+		Construction and Destruction
+	*************************************************************************/
+	/*!
+	\brief
+		Constructor for Tree base class.
+	*/
+	Tree(const String& type, const String& name);
+
+
+	/*!
+	\brief
+		Destructor for Tree base class.
+	*/
+	virtual ~Tree(void);
+
+
+protected:
+	/*************************************************************************
+		Abstract Implementation Functions (must be provided by derived class)
+	*************************************************************************/
+	/*!
+	\brief
+		Return a Rect object describing, in un-clipped pixels, the window relative area
+		that is to be used for rendering list items.
+
+	\return
+		Rect object describing the area of the Window to be used for rendering
+		list box items.
+	*/
+	virtual	Rect getTreeRenderArea(void) const
+	{
+		return d_itemArea;
+	}
+
+	/*!
+	\brief
+		create and return a pointer to a Scrollbar widget for use as vertical scroll bar
+
+	\param name
+	   String holding the name to be given to the created widget component.
+
+	\return
+		Pointer to a Scrollbar to be used for scrolling the list vertically.
+	*/
+	virtual Scrollbar*	createVertScrollbar(const String& name) const
+	{
+		return (Scrollbar*)(WindowManager::getSingleton().getWindow(name));
+	}
+
+	/*!
+	\brief
+		create and return a pointer to a Scrollbar widget for use as horizontal scroll bar
+
+	\param name
+	   String holding the name to be given to the created widget component.
+
+	\return
+		Pointer to a Scrollbar to be used for scrolling the list horizontally.
+	*/
+	virtual Scrollbar*	createHorzScrollbar(const String& name) const
+	{
+		return (Scrollbar*)(WindowManager::getSingleton().getWindow(name));
+	}
+
+
+	/*!
+	\brief
+		Perform caching of the widget control frame and other 'static' areas.  This
+		method should not render the actual items.  Note that the items are typically
+		rendered to layer 3, other layers can be used for rendering imagery behind and
+		infront of the items.
+
+	\return
+		Nothing.
+	*/
+	virtual	void cacheTreeBaseImagery()
+	{
+
+	}
+
+
+
+
+	/*************************************************************************
+		Implementation Functions
+	*************************************************************************/
+	/*!
+	\brief
+		Add list box specific events
+	*/
+	void	addTreeEvents(void);
+
+
+	/*!
+	\brief
+		display required integrated scroll bars according to current state of the list box and update their values.
+	*/
+	void	configureScrollbars(void);
+
+	/*!
+	\brief
+		select all strings between positions \a start and \a end.  (inclusive)
+		including \a end.
+	*/
+	void	selectRange(size_t start, size_t end);
+
+
+	/*!
+	\brief
+		Return the sum of all item heights
+	*/
+	float	getTotalItemsHeight(void) const;
+   void  getTotalItemsInListHeight(const LBItemList &itemList, float *heightSum) const;
+
+
+	/*!
+	\brief
+		Return the width of the widest item
+	*/
+	float	getWidestItemWidth(void) const;
+   void  getWidestItemWidthInList(const LBItemList &itemList, int itemDepth, float *widest) const;
+
+	/*!
+	\brief
+		Clear the selected state for all items (implementation)
+
+	\return
+		true if treeItem was found in the search, false if it was not.
+	*/
+   bool getHeightToItemInList(const LBItemList &itemList, const TreeItem *treeItem, int itemDepth, float *height) const;
+
+
+	/*!
+	\brief
+		Clear the selected state for all items (implementation)
+
+	\return
+		true if some selections were cleared, false nothing was changed.
+	*/
+	bool	clearAllSelections_impl(void);
+
+
+	/*!
+	\brief
+		Return the TreeItem under the given window local pixel co-ordinate.
+
+	\return
+		TreeItem that is under window pixel co-ordinate \a pt, or NULL if no
+		item is under that position.
+	*/
+	TreeItem*	getItemAtPoint(const Point& pt) const;
+   TreeItem*   getItemFromListAtPoint(const LBItemList &itemList, float *bottomY, const Point& pt) const;
+
+
+	/*!
+	\brief
+		Remove all items from the list.
+
+	\note
+		Note that this will cause 'AutoDelete' items to be deleted.
+
+	\return
+		- true if the list contents were changed.
+		- false if the list contents were not changed (list already empty).
+	*/
+	bool	resetList_impl(void);
+
+
+	/*!
+	\brief
+		Return whether this window was inherited from the given class name at some point in the inheritance heirarchy.
+
+	\param class_name
+		The class name that is to be checked.
+
+	\return
+		true if this window was inherited from \a class_name. false if not.
+	*/
+	virtual bool	testClassName_impl(const String& class_name) const
+	{
+		if (class_name==(const utf8*)"Tree")	return true;
+		return Window::testClassName_impl(class_name);
+	}
+
+	/*!
+	\brief
+	   Internal handler that is triggered when the user interacts with the scrollbars.
+    */
+    bool handle_scrollChange(const EventArgs& args);
+
+    // overridden from Window base class.
+    virtual void populateRenderCache();
+
+    void drawItemList(LBItemList &itemList, Rect &itemsArea, float widest, Vector3 &itemPos, RenderCache& cache, float alpha);
+
+
+	/*************************************************************************
+		New event handlers
+	*************************************************************************/
+	/*!
+	\brief
+		Handler called internally when the list contents are changed
+	*/
+	virtual	void	onListContentsChanged(WindowEventArgs& e);
+
+
+	/*!
+	\brief
+		Handler called internally when the currently selected item or items changes.
+	*/
+	virtual	void	onSelectionChanged(TreeEventArgs& e);
+
+
+	/*!
+	\brief
+		Handler called internally when the sort mode setting changes.
+	*/
+	virtual	void	onSortModeChanged(WindowEventArgs& e);
+
+
+	/*!
+	\brief
+		Handler called internally when the multi-select mode setting changes.
+	*/
+	virtual	void	onMultiselectModeChanged(WindowEventArgs& e);
+
+
+	/*!
+	\brief
+		Handler called internally when the forced display of the vertical scroll bar setting changes.
+	*/
+	virtual	void	onVertScrollbarModeChanged(WindowEventArgs& e);
+
+
+	/*!
+	\brief
+		Handler called internally when the forced display of the horizontal scroll bar setting changes.
+	*/
+	virtual	void	onHorzScrollbarModeChanged(WindowEventArgs& e);
+
+	/*!
+	\brief
+		Handler called internally when the user opens a branch of the tree.
+	*/
+	virtual	void	onBranchOpened(TreeEventArgs& e);
+
+	/*!
+	\brief
+		Handler called internally when the user closes a branch of the tree.
+	*/
+	virtual	void	onBranchClosed(TreeEventArgs& e);
+
+
+
+	/*************************************************************************
+		Overridden Event handlers
+	*************************************************************************/
+	virtual void	onSized(WindowEventArgs& e);
+	virtual void	onMouseButtonDown(MouseEventArgs& e);
+	virtual	void	onMouseWheel(MouseEventArgs& e);
+	virtual void	onMouseMove(MouseEventArgs& e);
+
+
+	/*************************************************************************
+		Implementation Data
+	*************************************************************************/
+	bool	d_sorted;				   //!< true if list is sorted
+	bool	d_multiselect;			   //!< true if multi-select is enabled
+	bool	d_forceVertScroll;		//!< true if vertical scrollbar should always be displayed
+	bool	d_forceHorzScroll;		//!< true if horizontal scrollbar should always be displayed
+	bool	d_itemTooltips;			//!< true if each item should have an individual tooltip
+	Scrollbar*	d_vertScrollbar;	//!< vertical scroll-bar widget
+	Scrollbar*	d_horzScrollbar;	//!< horizontal scroll-bar widget
+	LBItemList	d_listItems;		//!< list of items in the list box.
+	TreeItem*	d_lastSelected;	//!< holds pointer to the last selected item (used in range selections)
+   ImagerySection *openButtonImagery;
+   ImagerySection *closeButtonImagery;
+
+
+private:
+	/*************************************************************************
+		Static Properties for this class
+	*************************************************************************/
+	static TreeProperties::Sort					d_sortProperty;
+	static TreeProperties::MultiSelect			d_multiSelectProperty;
+	static TreeProperties::ForceVertScrollbar	d_forceVertProperty;
+	static TreeProperties::ForceHorzScrollbar	d_forceHorzProperty;
+	static TreeProperties::ItemTooltips			d_itemTooltipsProperty;
+
+	/*************************************************************************
+		Private methods
+	*************************************************************************/
+	void	addTreeProperties(void);
+	Rect d_itemArea;
+};
+
+
+/*!
+\brief
+	Helper function used in sorting to compare two list box item text strings
+	via the TreeItem pointers and return if \a a is less than \a b.
+*/
+bool lbi_less(const TreeItem* a, const TreeItem* b);
+
+
+/*!
+\brief
+	Helper function used in sorting to compare two list box item text strings
+	via the TreeItem pointers and return if \a a is greater than \a b.
+*/
+bool lbi_greater(const TreeItem* a, const TreeItem* b);
+
+} // End of  CEGUI namespace section
+
+
+#if defined(_MSC_VER)
+#	pragma warning(pop)
+#endif
+
+#endif	// end of guard _CEGUITree_h_


Property changes on: cegui_mk2/branches/v0-6/include/elements/CEGUITree.h
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: cegui_mk2/branches/v0-6/include/elements/CEGUITreeItem.h
===================================================================
--- cegui_mk2/branches/v0-6/include/elements/CEGUITreeItem.h	2008-06-18 11:16:53 UTC (rev 1759)
+++ cegui_mk2/branches/v0-6/include/elements/CEGUITreeItem.h	2008-06-18 12:21:42 UTC (rev 1760)
@@ -1,577 +1,577 @@
-/***********************************************************************
-filename:   CEGUITreeItem.h
-created:	5-13-07
-author:		Jonathan Welch (Based on Code by David Durant)
-*************************************************************************/
-/***************************************************************************
-*   Copyright (C) 2004 - 2006 Paul D Turner & The CEGUI Development Team
-*
-*   Permission is hereby granted, free of charge, to any person obtaining
-*   a copy of this software and associated documentation files (the
-*   "Software"), to deal in the Software without restriction, including
-*   without limitation the rights to use, copy, modify, merge, publish,
-*   distribute, sublicense, and/or sell copies of the Software, and to
-*   permit persons to whom the Software is furnished to do so, subject to
-*   the following conditions:
-*
-*   The above copyright notice and this permission notice shall be
-*   included in all copies or substantial portions of the Software.
-*
-*   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-*   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-*   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-*   IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-*   OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-*   ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-*   OTHER DEALINGS IN THE SOFTWARE.
-***************************************************************************/
-#ifndef _CEGUITreeItem_h_
-#define _CEGUITreeItem_h_
-
-#include "CEGUIBase.h"
-#include "CEGUIString.h"

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Crayzedsgui-cvsmk2] SF.net SVN: crayzedsgui: [1775] cegui_mk2/branches/v0-6

From: <ice-drezday@us...> - 2008-06-24 10:38

Revision: 1775
          http://crayzedsgui.svn.sourceforge.net/crayzedsgui/?rev=1775&view=rev
Author:   ice-drezday
Date:     2008-06-24 03:18:56 -0700 (Tue, 24 Jun 2008)

Log Message:
-----------
FIX: Deleting/removing a menu item from a menu when the item had an active popup would result in a dangling pointer to the deleted/removed item.

Modified Paths:
--------------
    cegui_mk2/branches/v0-6/include/elements/CEGUIMenuBase.h
    cegui_mk2/branches/v0-6/src/elements/CEGUIMenuBase.cpp

Modified: cegui_mk2/branches/v0-6/include/elements/CEGUIMenuBase.h
===================================================================
--- cegui_mk2/branches/v0-6/include/elements/CEGUIMenuBase.h	2008-06-23 13:45:09 UTC (rev 1774)
+++ cegui_mk2/branches/v0-6/include/elements/CEGUIMenuBase.h	2008-06-24 10:18:56 UTC (rev 1775)
@@ -158,6 +158,8 @@
 	*/
 	virtual void	onPopupClosed(WindowEventArgs& e);
 
+    // overridden from base
+    virtual void onChildRemoved(WindowEventArgs& e);
 
 	/*************************************************************************
 		Implementation Functions

Modified: cegui_mk2/branches/v0-6/src/elements/CEGUIMenuBase.cpp
===================================================================
--- cegui_mk2/branches/v0-6/src/elements/CEGUIMenuBase.cpp	2008-06-23 13:45:09 UTC (rev 1774)
+++ cegui_mk2/branches/v0-6/src/elements/CEGUIMenuBase.cpp	2008-06-24 10:18:56 UTC (rev 1775)
@@ -142,4 +142,17 @@
     }
 }
 
+//----------------------------------------------------------------------------//
+void MenuBase::onChildRemoved(WindowEventArgs& e)
+{
+    // if the removed window was our tracked popup item, zero ptr to it.
+    if (e.window == d_popupItem)
+        d_popupItem = 0;
+        
+    // base class version
+    ItemListBase::onChildRemoved(e);
+}
+
+//----------------------------------------------------------------------------//
+
 } // End of  CEGUI namespace section


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Crayzedsgui-cvsmk2] SF.net SVN: crayzedsgui: [1776] cegui_mk2/branches/v0-6

From: <ice-drezday@us...> - 2008-06-24 19:02

Revision: 1776
          http://crayzedsgui.svn.sourceforge.net/crayzedsgui/?rev=1776&view=rev
Author:   ice-drezday
Date:     2008-06-24 12:01:53 -0700 (Tue, 24 Jun 2008)

Log Message:
-----------
Couple of updates to autotools build to compile the mac specific files for that platform (not really tested, and not really the way we want to support compilation on Mac).

Modified Paths:
--------------
    cegui_mk2/branches/v0-6/configure.ac
    cegui_mk2/branches/v0-6/src/Makefile.am

Modified: cegui_mk2/branches/v0-6/configure.ac
===================================================================
--- cegui_mk2/branches/v0-6/configure.ac	2008-06-24 10:18:56 UTC (rev 1775)
+++ cegui_mk2/branches/v0-6/configure.ac	2008-06-24 19:01:53 UTC (rev 1776)
@@ -35,6 +35,9 @@
     *mingw32* ) MINGW32=yes
                 cegui_pc_platform_libs=-lwinmm
                 ;;
+     *darwin* ) MACOSX=yes
+                cegui_pc_platform_libs=
+                ;;
             * ) MINGW32=no
                 cegui_pc_platform_libs=
                 ;;
@@ -43,6 +46,7 @@
 AC_SUBST(cegui_pc_platform_libs)
 
 AM_CONDITIONAL([MINGW32_BUILD], [test x$MINGW32 = xyes])
+AM_CONDITIONAL([MACOSX_BUILD], [test x$MACOSX = xyes])
 
 # Checks for libraries (skip on mingw32).
 if test x$MINGW32 != xyes; then

Modified: cegui_mk2/branches/v0-6/src/Makefile.am
===================================================================
--- cegui_mk2/branches/v0-6/src/Makefile.am	2008-06-24 10:18:56 UTC (rev 1775)
+++ cegui_mk2/branches/v0-6/src/Makefile.am	2008-06-24 19:01:53 UTC (rev 1776)
@@ -163,5 +163,9 @@
                       falagard/CEGUIFalXMLEnumHelper.cpp \
                       falagard/CEGUIFalagard_xmlHandler.cpp
 
-EXTRA_DIST = implementations/mac/macPlugins.cpp \
-             implementations/mac/macPlugins.h
+if MACOSX_BUILD
+INCLUDES += -I$(top_srcdir)/src/implementations/mac
+libCEGUIBase_la_SOURCES += implementations/mac/macPlugins.cpp
+endif
+
+EXTRA_DIST = implementations/mac/macPlugins.h


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Crayzedsgui-cvsmk2] SF.net SVN: crayzedsgui: [1777] cegui_mk2/branches/v0-6

From: <ice-drezday@us...> - 2008-06-25 18:58

Revision: 1777
          http://crayzedsgui.svn.sourceforge.net/crayzedsgui/?rev=1777&view=rev
Author:   ice-drezday
Date:     2008-06-25 11:57:21 -0700 (Wed, 25 Jun 2008)

Log Message:
-----------
Fixes to 'make dist' ready for 0.6.1 release

Modified Paths:
--------------
    cegui_mk2/branches/v0-6/RendererModules/OpenGLGUIRenderer/Makefile.am
    cegui_mk2/branches/v0-6/Samples/common/src/Makefile.am
    cegui_mk2/branches/v0-6/makefiles/Makefile.am

Modified: cegui_mk2/branches/v0-6/RendererModules/OpenGLGUIRenderer/Makefile.am
===================================================================
--- cegui_mk2/branches/v0-6/RendererModules/OpenGLGUIRenderer/Makefile.am	2008-06-24 19:01:53 UTC (rev 1776)
+++ cegui_mk2/branches/v0-6/RendererModules/OpenGLGUIRenderer/Makefile.am	2008-06-25 18:57:21 UTC (rev 1777)
@@ -30,3 +30,5 @@
 noinst_HEADERS= GLEW/GL/glew.h \
                 GLEW/GL/glxew.h \
                 GLEW/GL/wglew.h
+
+EXTRA_DIST = GLEW/GLEW-LICENSE

Modified: cegui_mk2/branches/v0-6/Samples/common/src/Makefile.am
===================================================================
--- cegui_mk2/branches/v0-6/Samples/common/src/Makefile.am	2008-06-24 19:01:53 UTC (rev 1776)
+++ cegui_mk2/branches/v0-6/Samples/common/src/Makefile.am	2008-06-25 18:57:21 UTC (rev 1777)
@@ -42,7 +42,7 @@
              CEGuiD3D81BaseApplication.cpp \
              CEGuiD3D9BaseApplication.cpp \
              DeviceReset_Direct3D10.cpp \
-             DeviceReset_Direct3D819.cpp \
+             DeviceReset_Direct3D81.cpp \
              DeviceReset_Direct3D9.cpp \
              MacCEGuiRendererSelector.cpp \
              Win32AppHelper.cpp \

Modified: cegui_mk2/branches/v0-6/makefiles/Makefile.am
===================================================================
--- cegui_mk2/branches/v0-6/makefiles/Makefile.am	2008-06-24 19:01:53 UTC (rev 1776)
+++ cegui_mk2/branches/v0-6/makefiles/Makefile.am	2008-06-25 18:57:21 UTC (rev 1777)
@@ -1,37 +1,37 @@
-EXTRA_DIST = mac/Xcode2/CrazyEddiesGUI/English.lproj/CEGUICoronaImageCodec-Info.plist \
-             mac/Xcode2/CrazyEddiesGUI/English.lproj/CEGUIDevILImageCodec-Info.plist \
-             mac/Xcode2/CrazyEddiesGUI/English.lproj/CEGUIExpatParser-Info.plist \
-             mac/Xcode2/CrazyEddiesGUI/English.lproj/CEGUIFalagard-Info.plist \
-             mac/Xcode2/CrazyEddiesGUI/English.lproj/CEGUIFreeImageImageCodec-Info.plist \
-             mac/Xcode2/CrazyEddiesGUI/English.lproj/CEGUI-Info.plist \
-             mac/Xcode2/CrazyEddiesGUI/English.lproj/CEGUIIrrlichtRenderer-Info.plist \
-             mac/Xcode2/CrazyEddiesGUI/English.lproj/CEGUILibxmlParser-Info.plist \
-             mac/Xcode2/CrazyEddiesGUI/English.lproj/CEGUISILLYImageCodec-Info.plist \
-             mac/Xcode2/CrazyEddiesGUI/English.lproj/CEGUITaharezLook-Info.plist \
-             mac/Xcode2/CrazyEddiesGUI/English.lproj/CEGUITGAImageCodec-Info.plist \
-             mac/Xcode2/CrazyEddiesGUI/English.lproj/CEGUITinyXMLParser-Info.plist \
-             mac/Xcode2/CrazyEddiesGUI/English.lproj/ceguitolua++-Info.plist \
-             mac/Xcode2/CrazyEddiesGUI/English.lproj/CEGUIWindowsLook-Info.plist \
-             mac/Xcode2/CrazyEddiesGUI/English.lproj/CEGUIXercesParser-Info.plist \
-             mac/Xcode2/CrazyEddiesGUI/English.lproj/CrazyEddiesGUI_Prefix.pch \
-             mac/Xcode2/CrazyEddiesGUI/English.lproj/CrazyEddiesGUI.xcodeproj \
-             mac/Xcode2/CrazyEddiesGUI/English.lproj/Demo6-Info.plist \
-             mac/Xcode2/CrazyEddiesGUI/English.lproj/Demo7-Info.plist \
-             mac/Xcode2/CrazyEddiesGUI/English.lproj/Demo8-Info.plist \
-             mac/Xcode2/CrazyEddiesGUI/English.lproj/DragDropDemo-Info.plist \
-             mac/Xcode2/CrazyEddiesGUI/English.lproj/English.lproj \
-             mac/Xcode2/CrazyEddiesGUI/English.lproj/FalagardDemo1-Info.plist \
-             mac/Xcode2/CrazyEddiesGUI/English.lproj/FirstWindow-Info.plist \
-             mac/Xcode2/CrazyEddiesGUI/English.lproj/FontDemo-Info.plist \
-             mac/Xcode2/CrazyEddiesGUI/English.lproj/Info.plist \
-             mac/Xcode2/CrazyEddiesGUI/English.lproj/InstancedWindows-Info.plist \
-             mac/Xcode2/CrazyEddiesGUI/English.lproj/LuaScriptModule-Info.plist \
-             mac/Xcode2/CrazyEddiesGUI/English.lproj/Minesweeper-Info.plist \
-             mac/Xcode2/CrazyEddiesGUI/English.lproj/OpenGLRenderer-Info.plist \
-             mac/Xcode2/CrazyEddiesGUI/English.lproj/ScrollablePaneDemo-Info.plist \
-             mac/Xcode2/CrazyEddiesGUI/English.lproj/TabControlDemo-Info.plist \
-             mac/Xcode2/CrazyEddiesGUI/English.lproj/TextDemo-Info.plist \
-             mac/Xcode2/CrazyEddiesGUI/English.lproj/TreeDemo-Info.plist \
+EXTRA_DIST = mac/Xcode2/CrazyEddiesGUI/CEGUICoronaImageCodec-Info.plist \
+             mac/Xcode2/CrazyEddiesGUI/CEGUIDevILImageCodec-Info.plist \
+             mac/Xcode2/CrazyEddiesGUI/CEGUIExpatParser-Info.plist \
+             mac/Xcode2/CrazyEddiesGUI/CEGUIFalagard-Info.plist \
+             mac/Xcode2/CrazyEddiesGUI/CEGUIFreeImageImageCodec-Info.plist \
+             mac/Xcode2/CrazyEddiesGUI/CEGUI-Info.plist \
+             mac/Xcode2/CrazyEddiesGUI/CEGUIIrrlichtRenderer-Info.plist \
+             mac/Xcode2/CrazyEddiesGUI/CEGUILibxmlParser-Info.plist \
+             mac/Xcode2/CrazyEddiesGUI/CEGUISILLYImageCodec-Info.plist \
+             mac/Xcode2/CrazyEddiesGUI/CEGUITaharezLook-Info.plist \
+             mac/Xcode2/CrazyEddiesGUI/CEGUITGAImageCodec-Info.plist \
+             mac/Xcode2/CrazyEddiesGUI/CEGUITinyXMLParser-Info.plist \
+             mac/Xcode2/CrazyEddiesGUI/ceguitolua++-Info.plist \
+             mac/Xcode2/CrazyEddiesGUI/CEGUIWindowsLook-Info.plist \
+             mac/Xcode2/CrazyEddiesGUI/CEGUIXercesParser-Info.plist \
+             mac/Xcode2/CrazyEddiesGUI/CrazyEddiesGUI_Prefix.pch \
+             mac/Xcode2/CrazyEddiesGUI/Demo6-Info.plist \
+             mac/Xcode2/CrazyEddiesGUI/Demo7-Info.plist \
+             mac/Xcode2/CrazyEddiesGUI/Demo8-Info.plist \
+             mac/Xcode2/CrazyEddiesGUI/DragDropDemo-Info.plist \
+             mac/Xcode2/CrazyEddiesGUI/FalagardDemo1-Info.plist \
+             mac/Xcode2/CrazyEddiesGUI/FirstWindow-Info.plist \
+             mac/Xcode2/CrazyEddiesGUI/FontDemo-Info.plist \
+             mac/Xcode2/CrazyEddiesGUI/Info.plist \
+             mac/Xcode2/CrazyEddiesGUI/InstancedWindows-Info.plist \
+             mac/Xcode2/CrazyEddiesGUI/LuaScriptModule-Info.plist \
+             mac/Xcode2/CrazyEddiesGUI/Minesweeper-Info.plist \
+             mac/Xcode2/CrazyEddiesGUI/OpenGLRenderer-Info.plist \
+             mac/Xcode2/CrazyEddiesGUI/ScrollablePaneDemo-Info.plist \
+             mac/Xcode2/CrazyEddiesGUI/TabControlDemo-Info.plist \
+             mac/Xcode2/CrazyEddiesGUI/TextDemo-Info.plist \
+             mac/Xcode2/CrazyEddiesGUI/TreeDemo-Info.plist \
+             mac/Xcode2/CrazyEddiesGUI/CrazyEddiesGUI.xcodeproj/project.pbxproj \
+             mac/Xcode2/CrazyEddiesGUI/English.lproj/InfoPlist.strings \
              premake/README \
              premake/build_samples_vs2002.bat \
              premake/build_samples_vs2003.bat \
@@ -53,6 +53,7 @@
              premake/ImageCodecModules/FreeImageImageCodec/premake.lua \
              premake/ImageCodecModules/SILLYImageCodec/premake.lua \
              premake/ImageCodecModules/TGAImageCodec/premake.lua \
+             premake/RendererModules/DirectX10GUIRenderer/premake.lua \
              premake/RendererModules/DirectX81GUIRenderer/premake.lua \
              premake/RendererModules/DirectX9GUIRenderer/premake.lua \
              premake/RendererModules/IrrlichtRenderer/premake.lua \


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Crayzedsgui-cvsmk2] SF.net SVN: crayzedsgui: [1800] cegui_mk2/branches/v0-6

From: <ice-drezday@us...> - 2008-06-30 08:39

Revision: 1800
          http://crayzedsgui.svn.sourceforge.net/crayzedsgui/?rev=1800&view=rev
Author:   ice-drezday
Date:     2008-06-30 01:39:30 -0700 (Mon, 30 Jun 2008)

Log Message:
-----------
Merge changes made on tagged version of code (all subsequent changes to be done on v0-6 branch again!)

Modified Paths:
--------------
    cegui_mk2/branches/v0-6/RendererModules/directx10GUIRenderer/d3d10renderer.h
    cegui_mk2/branches/v0-6/Samples/common/src/Win32AppHelper.cpp
    cegui_mk2/branches/v0-6/makefiles/premake/helpers.lua

Modified: cegui_mk2/branches/v0-6/RendererModules/directx10GUIRenderer/d3d10renderer.h
===================================================================
--- cegui_mk2/branches/v0-6/RendererModules/directx10GUIRenderer/d3d10renderer.h	2008-06-29 14:35:50 UTC (rev 1799)
+++ cegui_mk2/branches/v0-6/RendererModules/directx10GUIRenderer/d3d10renderer.h	2008-06-30 08:39:30 UTC (rev 1800)
@@ -37,6 +37,39 @@
 #include "CEGUIBase.h"
 #include "CEGUIRenderer.h"
 #include "CEGUITexture.h"
+
+// Little hack to allow D3D10 to compile on a non-Vista. Of course, actually using this
+// renderer on XP is out of the question. These fixes are not needed in VC9 anymore.
+#if _MSC_VER <= 1400 // VC8 and lower
+	
+	// One fix for VC8
+	#define WINAPI_INLINE WINAPI
+
+	#if _MSC_VER < 1400 // VC7.1 and lower
+
+		#define __out /**/
+		#define __in /**/
+		#define __inout /**/
+
+		#define __in_opt /**/
+		#define __out_opt /**/
+		#define __inout_opt /**/
+
+		#define __in_ecount(THING) /**/
+		#define __in_ecount_opt(THING) /**/
+		#define __out_ecount(THING) /**/
+		#define __out_ecount_opt(THING) /**/
+		#define __inout_ecount(THING) /**/
+		#define __inout_ecount_opt(THING) /**/
+
+		#define __in_bcount_opt(THING) /**/
+		#define __out_bcount_opt(THING) /**/
+		#define __inout_bcount_opt(THING) /**/
+	
+	#endif // < 1400
+
+#endif // <= 1400
+
 #include <d3d10.h>
 #include <list>
 #include <set>

Modified: cegui_mk2/branches/v0-6/Samples/common/src/Win32AppHelper.cpp
===================================================================
--- cegui_mk2/branches/v0-6/Samples/common/src/Win32AppHelper.cpp	2008-06-29 14:35:50 UTC (rev 1799)
+++ cegui_mk2/branches/v0-6/Samples/common/src/Win32AppHelper.cpp	2008-06-30 08:39:30 UTC (rev 1800)
@@ -175,14 +175,14 @@
                 if (id.find("Official Direct3D 9") != id.npos)
                     DeviceReset_Direct3D9(hWnd, renderer);
 #endif
+#ifdef CEGUI_SAMPLES_USE_DIRECTX_10
+                else if (id.find("Official Direct3D 10") != id.npos)
+                    DeviceReset_Direct3D10(hWnd, renderer);
+#endif
 #ifdef CEGUI_SAMPLES_USE_DIRECTX_8
                 else if (id.find("Official Direct3D 8.1") != id.npos)
                     DeviceReset_Direct3D81(hWnd, renderer);
 #endif
-#ifdef CEGUI_SAMPLES_USE_DIRECTX_10
-                else if (id.find("Official Direct3D 10") != id.npos)
-                    DeviceReset_Direct3D10(hWnd, renderer);
-#endif
             }
         }
         break;

Modified: cegui_mk2/branches/v0-6/makefiles/premake/helpers.lua
===================================================================
--- cegui_mk2/branches/v0-6/makefiles/premake/helpers.lua	2008-06-29 14:35:50 UTC (rev 1799)
+++ cegui_mk2/branches/v0-6/makefiles/premake/helpers.lua	2008-06-30 08:39:30 UTC (rev 1800)
@@ -265,6 +265,12 @@
 		library_static("d3dx9")
 		library_static("dxerr9")
 	end
+
+	if DIRECTX10_RENDERER then
+		library_static("d3d10")
+		library_static("dxerr")
+		library_static("d3dx10")
+	end
 	
 
 	if CEGUI_CORE_LIBRARY_SOLUTION then
@@ -309,6 +315,10 @@
 		if DIRECTX9_RENDERER then
 		    dependency("DirectX9GUIRenderer")
 		end
+		if DIRECTX10_RENDERER then
+		    dependency("DirectX10GUIRenderer")
+		end
+
 		if IRRLICHT_RENDERER then
 		    dependency("IrrlichtRenderer")
 		end
@@ -365,6 +375,9 @@
 		if DIRECTX9_RENDERER then
 		    library_static("DirectX9GUIRenderer", "_Static", DEBUG_DLL_SUFFIX or "")
 		end
+		if DIRECTX10_RENDERER then
+		    library_static("DirectX10GUIRenderer", "_Static", DEBUG_DLL_SUFFIX or "")
+		end
 		if IRRLICHT_RENDERER then
 		    library_static("IrrlichtRenderer", "_Static", DEBUG_DLL_SUFFIX or "")
                 if IRRLICHT_PATHS then


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.