Merge branch 'GarageGames/master' into ueberengine-dev

Conflicts:
	Engine/source/T3D/fps/guiCrossHairHud.cpp

Engine/source/platformSDL/menus/guiPlatformGenericMenuBar.h

@@ -0,0 +1,51 @@
+//-----------------------------------------------------------------------------
+// Copyright (c) 2012 GarageGames, LLC
+//
+// 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 OR COPYRIGHT HOLDERS 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.
+//-----------------------------------------------------------------------------
+
+#pragma once
+
+#include "gui/editor/guiMenuBar.h"
+#include "platformSDL/menus/PlatformSDLPopupMenuData.h"
+#include "platform/menus/popupMenu.h"
+
+class GuiPlatformGenericMenuBar : public GuiMenuBar
+{
+   typedef GuiMenuBar Parent;
+public:
+   DECLARE_CONOBJECT(GuiPlatformGenericMenuBar);
+
+   virtual void menuItemSelected(Menu *menu, MenuItem *item)
+   {
+      AssertFatal(menu && item, "");
+
+      PopupMenu *popupMenu = PlatformPopupMenuData::mMenuMap[menu];
+      AssertFatal(popupMenu, "");
+
+      popupMenu->handleSelect(item->id);
+
+      Parent::menuItemSelected(menu, item);
+   }
+
+protected:
+   /// menu id / item id
+   Map<CompoundKey<U32, U32>, String> mCmds;
+
+};

Engine/source/platformSDL/menus/menuBarSDL.cpp

@@ -31,6 +31,8 @@
 
 #include "platformSDL/menus/PlatformSDLPopupMenuData.h"
 
+#include "platformSDL/menus/guiPlatformGenericMenuBar.h"
+
 #ifdef TORQUE_SDL
 
 //-----------------------------------------------------------------------------
@@ -44,30 +46,6 @@
 
 Map<GuiMenuBar::Menu*, PopupMenu*> PlatformPopupMenuData::mMenuMap;
 
-class GuiPlatformGenericMenuBar : public GuiMenuBar
-{
-   typedef GuiMenuBar Parent;
-public:
-   DECLARE_CONOBJECT(GuiPlatformGenericMenuBar);
-
-   virtual void menuItemSelected(Menu *menu, MenuItem *item)
-   {
-      AssertFatal(menu && item, "");
-
-      PopupMenu *popupMenu = PlatformPopupMenuData::mMenuMap[ menu ];
-      AssertFatal(popupMenu, "");
-
-      popupMenu->handleSelect( item->id );
-
-      Parent::menuItemSelected(menu, item);
-   }
-
-protected:
-   /// menu id / item id
-   Map<CompoundKey<U32, U32>, String> mCmds;
-
-};
-
 IMPLEMENT_CONOBJECT(GuiPlatformGenericMenuBar);
 
 //-----------------------------------------------------------------------------

Engine/source/platformSDL/menus/popupMenuSDL.cpp

@@ -23,7 +23,7 @@
 #ifdef TORQUE_SDL
 
 #include "platform/menus/popupMenu.h"
-#include "platform/menus//menuBar.h"
+#include "platform/menus/menuBar.h"
 #include "console/consoleTypes.h"
 #include "gui/core/guiCanvas.h"
 #include "core/util/safeDelete.h"
@@ -37,10 +37,25 @@
 #include "platformSDL/menus/PlatformSDLPopupMenuData.h"
 #include "console/engineAPI.h"
 
+#include "platformSDL/menus/guiPlatformGenericMenuBar.h"
+#include "gui/editor/guiPopupMenuCtrl.h"
+
 //////////////////////////////////////////////////////////////////////////
 // Platform Menu Data
 //////////////////////////////////////////////////////////////////////////
+GuiPlatformGenericMenuBar* findMenuBarCtrl()
+{
+   GuiControl* control;
+   Sim::findObject("PlatformGenericMenubar", control);
+   AssertFatal(control, "");
+   if (!control)
+      return NULL;
 
+   GuiPlatformGenericMenuBar* menuBar;
+   menuBar = dynamic_cast<GuiPlatformGenericMenuBar*>(control->findObjectByInternalName(StringTable->insert("menubar"), true));
+   AssertFatal(menuBar, "");
+   return menuBar;
+}
 
 //////////////////////////////////////////////////////////////////////////
 
@@ -84,7 +99,9 @@ void PopupMenu::createPlatformMenu()
 S32 PopupMenu::insertItem(S32 pos, const char *title, const char* accelerator, const char* cmd)
 {   
    GuiMenuBar::MenuItem *item = GuiMenuBar::findMenuItem( mData->mMenuGui, title );
-   if(item)
+   
+   //We'll make a special exception for the spacer items
+   if(item && dStrcmp(title, ""))
    {
       setItem( pos, title, accelerator, cmd);
       return pos;
@@ -215,8 +232,133 @@ bool PopupMenu::handleSelect(U32 command, const char *text /* = NULL */)
 
 void PopupMenu::showPopup(GuiCanvas *owner, S32 x /* = -1 */, S32 y /* = -1 */)
 {
-    if(owner == NULL || isAttachedToMenuBar())
+    if(owner == NULL)
       return;
+
+    GuiControl* editorGui;
+    Sim::findObject("EditorGui", editorGui);
+
+    if (editorGui)
+    {
+       GuiPopupMenuTextListCtrl* textList;
+       GuiPopupMenuBackgroundCtrl* backgroundCtrl;
+       Sim::findObject("PopUpMenuControl", backgroundCtrl);
+
+       GuiControlProfile* profile;
+       Sim::findObject("GuiMenubarProfile", profile);
+
+       if (!profile)
+          return;
+
+       if (!backgroundCtrl)
+       {
+          textList = new GuiPopupMenuTextListCtrl();
+
+          textList->registerObject();
+
+          backgroundCtrl = new GuiPopupMenuBackgroundCtrl(textList);
+
+          backgroundCtrl->registerObject("PopUpMenuControl");
+
+          textList->setControlProfile(profile);
+
+          backgroundCtrl->addObject(textList);
+       }
+       else
+       {
+          textList = dynamic_cast<GuiPopupMenuTextListCtrl*>(backgroundCtrl->first());
+       }
+
+       if (!backgroundCtrl || !textList)
+          return;
+
+       owner->pushDialogControl(backgroundCtrl, 10);
+
+       backgroundCtrl->setExtent(editorGui->getExtent());
+
+       textList->clear();
+       textList->mMenu = mData->mMenuGui;
+       textList->mMenuBar = findMenuBarCtrl();
+       textList->mPopup = this;
+
+       S32 textWidth = 0, width = 0;
+       S32 acceleratorWidth = 0;
+       GFont *font = profile->mFont;
+
+       Point2I maxBitmapSize = Point2I(0, 0);
+
+       S32 numBitmaps = profile->mBitmapArrayRects.size();
+       if (numBitmaps)
+       {
+          RectI *bitmapBounds = profile->mBitmapArrayRects.address();
+          for (S32 i = 0; i < numBitmaps; i++)
+          {
+             if (bitmapBounds[i].extent.x > maxBitmapSize.x)
+                maxBitmapSize.x = bitmapBounds[i].extent.x;
+             if (bitmapBounds[i].extent.y > maxBitmapSize.y)
+                maxBitmapSize.y = bitmapBounds[i].extent.y;
+          }
+       }
+
+       for (GuiMenuBar::MenuItem *walk = mData->mMenuGui->firstMenuItem; walk; walk = walk->nextMenuItem)
+       {
+          if (!walk->visible)
+             continue;
+
+          S32 iTextWidth = font->getStrWidth(walk->text);
+          S32 iAcceleratorWidth = walk->accelerator ? font->getStrWidth(walk->accelerator) : 0;
+
+          if (iTextWidth > textWidth)
+             textWidth = iTextWidth;
+          if (iAcceleratorWidth > acceleratorWidth)
+             acceleratorWidth = iAcceleratorWidth;
+       }
+       width = textWidth + acceleratorWidth + maxBitmapSize.x * 2 + 2 + 4;
+
+       textList->setCellSize(Point2I(width, font->getHeight() + 2));
+       textList->clearColumnOffsets();
+       textList->addColumnOffset(-1); // add an empty column in for the bitmap index.
+       textList->addColumnOffset(maxBitmapSize.x + 1);
+       textList->addColumnOffset(maxBitmapSize.x + 1 + textWidth + 4);
+
+       U32 entryCount = 0;
+
+       for (GuiMenuBar::MenuItem *walk = mData->mMenuGui->firstMenuItem; walk; walk = walk->nextMenuItem)
+       {
+          if (!walk->visible)
+             continue;
+
+          char buf[512];
+
+          //  If this menu item is a submenu, then set the isSubmenu to 2 to indicate
+          // an arrow should be drawn.  Otherwise set the isSubmenu normally.
+          char isSubmenu = 1;
+          if (walk->isSubmenu)
+             isSubmenu = 2;
+
+          char bitmapIndex = 1;
+          if (walk->bitmapIndex >= 0 && (walk->bitmapIndex * 3 <= profile->mBitmapArrayRects.size()))
+             bitmapIndex = walk->bitmapIndex + 2;
+          dSprintf(buf, sizeof(buf), "%c%c\t%s\t%s", bitmapIndex, isSubmenu, walk->text, walk->accelerator ? walk->accelerator : "");
+          textList->addEntry(entryCount, buf);
+
+          if (!walk->enabled)
+             textList->setEntryActive(entryCount, false);
+
+          entryCount++;
+       }
+
+       Point2I pos = owner->getCursorPos();
+       textList->setPosition(pos);
+
+       //nudge in if we'd overshoot the screen
+       S32 widthDiff = (textList->getPosition().x + textList->getExtent().x) - backgroundCtrl->getWidth();
+       if (widthDiff > 0)
+       {
+          Point2I popupPos = textList->getPosition();
+          textList->setPosition(popupPos.x - widthDiff, popupPos.y);
+       }
+    }
 }
 
 //////////////////////////////////////////////////////////////////////////

Engine/source/platformSDL/sdlPlatformGL.cpp

@@ -2,6 +2,10 @@
 #include "windowManager/sdl/sdlWindow.h"
 #include "console/console.h"
 
+#ifdef TORQUE_OS_WIN
+#include "gfx/gl/tGL/tWGL.h"
+#endif
+
 namespace PlatformGL
 {
 
@@ -13,18 +17,16 @@ namespace PlatformGL
            return;
 
        inited = true;
-       const U32 majorOGL = 4;
+       const U32 majorOGL = 3;
        const U32 minorOGL = 2;
        U32 debugFlag = 0;
 #ifdef TORQUE_DEBUG
        debugFlag |= SDL_GL_CONTEXT_DEBUG_FLAG;
 #endif
 
-#if 0  // cause problem with glew, no extension load
        SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, majorOGL);
        SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, minorOGL);
        SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE);
-#endif
        SDL_GL_SetAttribute(SDL_GL_CONTEXT_FLAGS, debugFlag);
 
        SDL_ClearError();
@@ -66,6 +68,11 @@ namespace PlatformGL
            Con::printf( err );
            AssertFatal(0, err );
        }
+
+       #ifdef TORQUE_OS_WIN
+		    // JTH: Update the internals of epoxy on windows.
+		    epoxy_handle_external_wglMakeCurrent();
+       #endif
    }
 
    void setVSync(const int i)