mirror of
https://github.com/beefytech/Beef.git
synced 2025-06-10 12:32:20 +02:00
SDL/OGL platform improvements
This commit is contained in:
Brian Fiete
parent
213aea8c82
commit
258a6653f9
16 changed files with 711 additions and 1141 deletions
|
|
@ -1,6 +1,7 @@
|
|||
#include "SdlBFApp.h"
|
||||
#include "GLRenderDevice.h"
|
||||
#include "SDL.h"
|
||||
#include "platform/PlatformHelper.h"
|
||||
#include <SDL2/SDL.h>
|
||||
|
||||
USING_NS_BF;
|
||||
|
||||
|
|
@ -9,6 +10,7 @@ USING_NS_BF;
|
|||
#pragma comment(lib, "imm32.lib")
|
||||
#pragma comment(lib, "version.lib")
|
||||
|
||||
|
||||
SdlBFWindow::SdlBFWindow(BFWindow* parent, const StringImpl& title, int x, int y, int width, int height, int windowFlags)
|
||||
{
|
||||
int sdlWindowFlags = 0;
|
||||
|
|
@ -19,362 +21,55 @@ SdlBFWindow::SdlBFWindow(BFWindow* parent, const StringImpl& title, int x, int y
|
|||
#ifdef BF_PLATFORM_FULLSCREEN
|
||||
sdlWindowFlags |= SDL_WINDOW_FULLSCREEN;
|
||||
#endif
|
||||
|
||||
|
||||
mSDLWindow = SDL_CreateWindow(title.c_str(), x, y, width, height, sdlWindowFlags);
|
||||
|
||||
if (!SDL_GL_CreateContext(mSDLWindow))
|
||||
|
||||
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3);
|
||||
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 2);
|
||||
SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE);
|
||||
|
||||
if (!SDL_GL_CreateContext(mSDLWindow))
|
||||
{
|
||||
BF_FATAL(StrFormat("Unable to create OpenGL context: %s", SDL_GetError()).c_str());
|
||||
BF_FATAL(StrFormat("Unable to create OpenGL context: %s", SDL_GetError()).c_str());
|
||||
SDL_Quit();
|
||||
exit(2);
|
||||
}
|
||||
|
||||
glEnable(GL_DEBUG_OUTPUT);
|
||||
glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS);
|
||||
|
||||
glEnable(GL_BLEND);
|
||||
//glBlendFunc(GL_SRC_ALPHA, GL_ONE);
|
||||
glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
|
||||
//glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
|
||||
|
||||
#ifndef BF_PLATFORM_OPENGL_ES2
|
||||
glEnableClientState(GL_INDEX_ARRAY);
|
||||
//glEnableClientState(GL_INDEX_ARRAY);
|
||||
#endif
|
||||
|
||||
//glEnableClientState(GL_VERTEX_ARRAY);
|
||||
//glEnableClientState(GL_TEXTURE_COORD_ARRAY);
|
||||
//glEnableClientState(GL_COLOR_ARRAY);
|
||||
|
||||
mIsMouseInside = false;
|
||||
mRenderWindow = new GLRenderWindow((GLRenderDevice*)gBFApp->mRenderDevice, mSDLWindow);
|
||||
mRenderWindow->mWindow = this;
|
||||
gBFApp->mRenderDevice->AddRenderWindow(mRenderWindow);
|
||||
|
||||
if (parent != NULL)
|
||||
parent->mChildren.push_back(this);
|
||||
if (parent != NULL)
|
||||
parent->mChildren.push_back(this);
|
||||
}
|
||||
|
||||
SdlBFWindow::~SdlBFWindow()
|
||||
{
|
||||
{
|
||||
if (mSDLWindow != NULL)
|
||||
TryClose();
|
||||
}
|
||||
|
||||
bool SdlBFWindow::TryClose()
|
||||
{
|
||||
{
|
||||
SdlBFApp* app = (SdlBFApp*)gBFApp;
|
||||
SdlWindowMap::iterator itr = app->mSdlWindowMap.find(SDL_GetWindowID(mSDLWindow));
|
||||
app->mSdlWindowMap.erase(itr);
|
||||
|
||||
app->mSdlWindowMap.Remove(SDL_GetWindowID(mSDLWindow));
|
||||
|
||||
SDL_DestroyWindow(mSDLWindow);
|
||||
mSDLWindow = NULL;
|
||||
return true;
|
||||
}
|
||||
|
||||
//LRESULT SdlBFWindow::WindowProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
|
||||
//{
|
||||
// SdlBFApp* app = (SdlBFApp*) gBFApp;
|
||||
//
|
||||
// switch (Msg)
|
||||
// {
|
||||
// case WM_CLOSE:
|
||||
// {
|
||||
// if (mCloseQueryFunc(this) != 0)
|
||||
// gBFApp->RemoveWindow(this);
|
||||
// return 0;
|
||||
// }
|
||||
// break;
|
||||
// case WM_DESTROY:
|
||||
// /*if (mFlags & BFWINDOW_QUIT_ON_CLOSE)
|
||||
// {
|
||||
// gBFApp->mRunning = false;
|
||||
// }*/
|
||||
// mHWnd = NULL;
|
||||
// break;
|
||||
// }
|
||||
//
|
||||
// LRESULT result = 0;
|
||||
// bool doResult = false;
|
||||
//
|
||||
// if (!app->mInMsgProc)
|
||||
// {
|
||||
// app->mInMsgProc = true;
|
||||
//
|
||||
// switch (Msg)
|
||||
// {
|
||||
//
|
||||
// case WM_SIZE:
|
||||
// mRenderWindow->Resized();
|
||||
// if (mMovedFunc != NULL)
|
||||
// mMovedFunc(this);
|
||||
// break;
|
||||
// case WM_PAINT:
|
||||
// break;
|
||||
// case WM_LBUTTONDOWN:
|
||||
// case WM_RBUTTONDOWN:
|
||||
// case WM_MBUTTONDOWN:
|
||||
// case WM_LBUTTONDBLCLK:
|
||||
// case WM_RBUTTONDBLCLK:
|
||||
// case WM_LBUTTONUP:
|
||||
// case WM_RBUTTONUP:
|
||||
// case WM_MBUTTONUP:
|
||||
// case WM_MOUSEWHEEL:
|
||||
// case WM_MOUSEMOVE:
|
||||
// {
|
||||
// int x = (short) LOWORD(lParam);
|
||||
// int y = (short) HIWORD(lParam);
|
||||
//
|
||||
// bool releaseCapture = false;
|
||||
//
|
||||
// POINT point = {x, y};
|
||||
// ::ClientToScreen(hWnd, &point);
|
||||
// HWND windowAtPoint = ::WindowFromPoint(point);
|
||||
//
|
||||
// bool isMouseOver = windowAtPoint == hWnd;
|
||||
//
|
||||
// if ((!mIsMouseInside) && (isMouseOver))
|
||||
// {
|
||||
// TRACKMOUSEEVENT tme;
|
||||
// tme.cbSize = sizeof(TRACKMOUSEEVENT);
|
||||
// tme.dwFlags = TME_LEAVE;
|
||||
// tme.hwndTrack = hWnd;
|
||||
// TrackMouseEvent(&tme);
|
||||
// mIsMouseInside = true;
|
||||
// }
|
||||
//
|
||||
// if ((mIsMouseInside) && (!isMouseOver))
|
||||
// {
|
||||
// mIsMouseInside = false;
|
||||
// mMouseLeaveFunc(this);
|
||||
// }
|
||||
//
|
||||
// switch (Msg)
|
||||
// {
|
||||
// case WM_LBUTTONDOWN:
|
||||
// SetCapture(hWnd);
|
||||
// mMouseDownFunc(this, x, y, 0, 1);
|
||||
// break;
|
||||
// case WM_RBUTTONDOWN:
|
||||
// SetCapture(hWnd);
|
||||
// mMouseDownFunc(this, x, y, 1, 1);
|
||||
// break;
|
||||
// case WM_MBUTTONDOWN:
|
||||
// SetCapture(hWnd);
|
||||
// mMouseDownFunc(this, x, y, 2, 1);
|
||||
// break;
|
||||
// case WM_LBUTTONDBLCLK:
|
||||
// SetCapture(hWnd);
|
||||
// mMouseDownFunc(this, x, y, 0, 2);
|
||||
// break;
|
||||
// case WM_RBUTTONDBLCLK:
|
||||
// SetCapture(hWnd);
|
||||
// mMouseDownFunc(this, x, y, 1, 2);
|
||||
// break;
|
||||
// case WM_MBUTTONDBLCLK:
|
||||
// SetCapture(hWnd);
|
||||
// mMouseDownFunc(this, x, y, 2, 2);
|
||||
// break;
|
||||
// case WM_LBUTTONUP:
|
||||
// releaseCapture = true;
|
||||
// mMouseUpFunc(this, x, y, 0);
|
||||
// break;
|
||||
// case WM_RBUTTONUP:
|
||||
// releaseCapture = true;
|
||||
// mMouseUpFunc(this, x, y, 1);
|
||||
// break;
|
||||
// case WM_MBUTTONUP:
|
||||
// releaseCapture = true;
|
||||
// mMouseUpFunc(this, x, y, 2);
|
||||
// break;
|
||||
// case WM_MOUSEWHEEL:
|
||||
// {
|
||||
// POINT pt = {x, y};
|
||||
// ScreenToClient(mHWnd, &pt);
|
||||
//
|
||||
// int delta = ((int16)HIWORD(wParam)) / 120;
|
||||
// mMouseWheelFunc(this, pt.x, pt.y, delta);
|
||||
// }
|
||||
// break;
|
||||
// case WM_MOUSEMOVE:
|
||||
// {
|
||||
// mMouseMoveFunc(this, x, y);
|
||||
//
|
||||
// if ((wParam != 0) && (gBFApp->mWindowList.size() > 1))
|
||||
// {
|
||||
// // See if our mouse is down and has entered into another window's space
|
||||
// POINT point = {x, y};
|
||||
// ::ClientToScreen(hWnd, &point);
|
||||
//
|
||||
// HWND windowAtPoint = ::WindowFromPoint(point);
|
||||
//
|
||||
// BFWindowList::iterator itr = gBFApp->mWindowList.begin();
|
||||
// while (itr != gBFApp->mWindowList.end())
|
||||
// {
|
||||
// SdlBFWindow* aWindow = (SdlBFWindow*) *itr;
|
||||
// if (aWindow != this)
|
||||
// {
|
||||
// if (aWindow->mHWnd == windowAtPoint)
|
||||
// {
|
||||
// POINT clientPt = point;
|
||||
// ::ScreenToClient(aWindow->mHWnd, &clientPt);
|
||||
// aWindow->mMouseProxyMoveFunc(this, clientPt.x, clientPt.y);
|
||||
// aWindow->mIsMouseInside = true;
|
||||
// }
|
||||
// else if (aWindow->mIsMouseInside)
|
||||
// {
|
||||
// aWindow->mMouseLeaveFunc(this);
|
||||
// aWindow->mIsMouseInside = false;
|
||||
// }
|
||||
// }
|
||||
// ++itr;
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// break;
|
||||
// }
|
||||
//
|
||||
// if (releaseCapture)
|
||||
// {
|
||||
// ReleaseCapture();
|
||||
//
|
||||
// BFWindowList::iterator itr = gBFApp->mWindowList.begin();
|
||||
// while (itr != gBFApp->mWindowList.end())
|
||||
// {
|
||||
// SdlBFWindow* aWindow = (SdlBFWindow*) *itr;
|
||||
// if ((aWindow != this) && (aWindow->mIsMouseInside))
|
||||
// {
|
||||
// aWindow->mMouseLeaveFunc(this);
|
||||
// aWindow->mIsMouseInside = false;
|
||||
// }
|
||||
// ++itr;
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// break;
|
||||
//
|
||||
// case WM_COMMAND:
|
||||
// {
|
||||
// SdlBFMenu* aMenu = mMenuIDMap[(uint32)wParam];
|
||||
// if (aMenu != NULL)
|
||||
// mMenuItemSelectedFunc(this, aMenu);
|
||||
// }
|
||||
// break;
|
||||
// case WM_INITMENUPOPUP:
|
||||
// {
|
||||
// HMENU hMenu = (HMENU) wParam;
|
||||
// SdlBFMenu* aMenu = mHMenuMap[hMenu];
|
||||
// if (aMenu != NULL)
|
||||
// mMenuItemSelectedFunc(this, aMenu);
|
||||
// }
|
||||
// break;
|
||||
//
|
||||
// case WM_MOUSEACTIVATE:
|
||||
// if (mFlags & BFWINDOW_NO_MOUSE_ACTIVATE)
|
||||
// {
|
||||
// doResult = true;
|
||||
// result = MA_NOACTIVATE;
|
||||
// }
|
||||
// break;
|
||||
//
|
||||
// case WM_KILLFOCUS:
|
||||
// mLostFocusFunc(this);
|
||||
// break;
|
||||
// case WM_SETFOCUS:
|
||||
// mGotFocusFunc(this);
|
||||
// break;
|
||||
// case WM_MOUSELEAVE:
|
||||
// mIsMouseInside = false;
|
||||
// mMouseLeaveFunc(this);
|
||||
// break;
|
||||
//
|
||||
// case WM_CHAR:
|
||||
// mKeyCharFunc(this, (WCHAR)wParam);
|
||||
// break;
|
||||
// case WM_SYSKEYDOWN:
|
||||
// case WM_KEYDOWN:
|
||||
// {
|
||||
// int keyCode = (int) wParam;
|
||||
// mIsKeyDown[keyCode] = true;
|
||||
//
|
||||
// WinMenuIDMap::iterator itr = mMenuIDMap.begin();
|
||||
// while (itr != mMenuIDMap.end())
|
||||
// {
|
||||
// SdlBFMenu* aMenu = itr->second;
|
||||
// if ((aMenu->mKeyCode == keyCode) &&
|
||||
// (aMenu->mKeyShift == mIsKeyDown[VK_SHIFT]) &&
|
||||
// (aMenu->mKeyCtrl == mIsKeyDown[VK_CONTROL]) &&
|
||||
// (aMenu->mKeyAlt == mIsKeyDown[VK_MENU]))
|
||||
// {
|
||||
// mMenuItemSelectedFunc(this, aMenu);
|
||||
// doResult = true;
|
||||
// break;
|
||||
// }
|
||||
// ++itr;
|
||||
// }
|
||||
// mKeyDownFunc(this, (int) wParam, (lParam & 0x7FFF) != 0);
|
||||
// }
|
||||
// break;
|
||||
// case WM_SYSCHAR:
|
||||
// {
|
||||
// int keyCode = toupper((int) wParam);
|
||||
//
|
||||
// WinMenuIDMap::iterator itr = mMenuIDMap.begin();
|
||||
// while (itr != mMenuIDMap.end())
|
||||
// {
|
||||
// SdlBFMenu* aMenu = itr->second;
|
||||
// if ((aMenu->mKeyCode == keyCode) &&
|
||||
// (aMenu->mKeyShift == mIsKeyDown[VK_SHIFT]) &&
|
||||
// (aMenu->mKeyCtrl == mIsKeyDown[VK_CONTROL]) &&
|
||||
// (aMenu->mKeyAlt == mIsKeyDown[VK_MENU]))
|
||||
// {
|
||||
// doResult = true;
|
||||
// break;
|
||||
// }
|
||||
// ++itr;
|
||||
// }
|
||||
// }
|
||||
// break;
|
||||
// case WM_SYSKEYUP:
|
||||
// case WM_KEYUP:
|
||||
// {
|
||||
// int keyCode = (int) wParam;
|
||||
// if (mIsKeyDown[keyCode])
|
||||
// {
|
||||
// mKeyUpFunc(this, (int) wParam);
|
||||
// mIsKeyDown[keyCode] = false;
|
||||
// }
|
||||
// }
|
||||
// break;
|
||||
//
|
||||
// case WM_TIMER:
|
||||
// if (gBFApp->mSysDialogCnt == 0)
|
||||
// gBFApp->Process();
|
||||
// break;
|
||||
//
|
||||
// case WM_SETCURSOR:
|
||||
// gBFApp->PhysSetCursor();
|
||||
// break;
|
||||
//
|
||||
// case WM_MOVING:
|
||||
// if (mMovedFunc != NULL)
|
||||
// mMovedFunc(this);
|
||||
// break;
|
||||
// case WM_SIZING:
|
||||
// mRenderWindow->Resized();
|
||||
// if (mMovedFunc != NULL)
|
||||
// mMovedFunc(this);
|
||||
// if (gBFApp->mSysDialogCnt == 0)
|
||||
// gBFApp->Process();
|
||||
// break;
|
||||
// }
|
||||
//
|
||||
//
|
||||
// app->mInMsgProc = false;
|
||||
// }
|
||||
//
|
||||
// if (doResult)
|
||||
// return result;
|
||||
//
|
||||
// return DefWindowProc(hWnd, Msg, wParam, lParam);
|
||||
//}
|
||||
|
||||
static int SDLConvertScanCode(int scanCode)
|
||||
{
|
||||
if ((scanCode >= SDL_SCANCODE_A) && (scanCode <= SDL_SCANCODE_Z))
|
||||
|
|
@ -383,8 +78,8 @@ static int SDLConvertScanCode(int scanCode)
|
|||
return (scanCode - SDL_SCANCODE_0) + '0';
|
||||
|
||||
switch (scanCode)
|
||||
{
|
||||
case SDL_SCANCODE_CANCEL: return 0x03;
|
||||
{
|
||||
case SDL_SCANCODE_CANCEL: return 0x03;
|
||||
case SDL_SCANCODE_AC_BACK: return 0x08;
|
||||
case SDL_SCANCODE_TAB: return 0x09;
|
||||
case SDL_SCANCODE_CLEAR: return 0x0C;
|
||||
|
|
@ -394,14 +89,14 @@ static int SDLConvertScanCode(int scanCode)
|
|||
case SDL_SCANCODE_LCTRL: return 0x11;
|
||||
case SDL_SCANCODE_RCTRL: return 0x11;
|
||||
case SDL_SCANCODE_MENU: return 0x12;
|
||||
case SDL_SCANCODE_PAUSE: return 0x13;
|
||||
case SDL_SCANCODE_PAUSE: return 0x13;
|
||||
case SDL_SCANCODE_LANG1: return 0x15;
|
||||
case SDL_SCANCODE_LANG2: return 0x15;
|
||||
case SDL_SCANCODE_LANG3: return 0x17;
|
||||
case SDL_SCANCODE_LANG4: return 0x18;
|
||||
case SDL_SCANCODE_LANG5: return 0x19;
|
||||
case SDL_SCANCODE_LANG6: return 0x19;
|
||||
case SDL_SCANCODE_ESCAPE: return 0x1B;
|
||||
case SDL_SCANCODE_ESCAPE: return 0x1B;
|
||||
case SDL_SCANCODE_SPACE: return 0x20;
|
||||
case SDL_SCANCODE_PAGEUP: return 0x21;
|
||||
case SDL_SCANCODE_PAGEDOWN: return 0x22;
|
||||
|
|
@ -413,7 +108,7 @@ static int SDLConvertScanCode(int scanCode)
|
|||
case SDL_SCANCODE_DOWN: return 0x28;
|
||||
case SDL_SCANCODE_SELECT: return 0x29;
|
||||
case SDL_SCANCODE_PRINTSCREEN: return 0x2A;
|
||||
case SDL_SCANCODE_EXECUTE: return 0x2B;
|
||||
case SDL_SCANCODE_EXECUTE: return 0x2B;
|
||||
case SDL_SCANCODE_INSERT: return 0x2D;
|
||||
case SDL_SCANCODE_DELETE: return 0x2E;
|
||||
case SDL_SCANCODE_HELP: return 0x2F;
|
||||
|
|
@ -461,62 +156,50 @@ extern HINSTANCE gDLLInstance;
|
|||
|
||||
SdlBFApp::SdlBFApp()
|
||||
{
|
||||
|
||||
//_CrtSetReportHook(SdlBFReportHook);
|
||||
|
||||
mRunning = false;
|
||||
mRenderDevice = NULL;
|
||||
mRenderDevice = NULL;
|
||||
|
||||
wchar_t aStr[MAX_PATH];
|
||||
#ifdef _WIN32
|
||||
GetModuleFileNameW(gDLLInstance, aStr, MAX_PATH);
|
||||
#else
|
||||
GetModuleFileNameW(NULL, aStr, MAX_PATH);
|
||||
#endif
|
||||
|
||||
if (aStr[0] == '!')
|
||||
{
|
||||
new SdlBFWindow(NULL, "", 0, 0, 0, 0, 0);
|
||||
}
|
||||
|
||||
mInstallDir = aStr;
|
||||
Beefy::String exePath;
|
||||
BfpGetStrHelper(exePath, [](char* outStr, int* inOutStrSize, BfpResult* result)
|
||||
{
|
||||
BfpSystem_GetExecutablePath(outStr, inOutStrSize, (BfpSystemResult*)result);
|
||||
});
|
||||
|
||||
int lastSlash = std::max((int)mInstallDir.rfind('\\'), (int)mInstallDir.rfind('/'));
|
||||
mInstallDir = GetFileDir(exePath) + "/";
|
||||
|
||||
int lastSlash = std::max((int)mInstallDir.LastIndexOf('\\'), (int)mInstallDir.LastIndexOf('/'));
|
||||
if (lastSlash != -1)
|
||||
mInstallDir = mInstallDir.substr(0, lastSlash);
|
||||
mInstallDir = mInstallDir.Substring(0, lastSlash);
|
||||
|
||||
//TODO: We're not properly using DataDir vs InstallDir
|
||||
#if (!defined BFSYSLIB_DYNAMIC) && (defined BF_RESOURCES_REL_DIR)
|
||||
mInstallDir += "/" + Beefy::UTF8Decode(BF_RESOURCES_REL_DIR);
|
||||
#endif
|
||||
|
||||
|
||||
mInstallDir += "/";
|
||||
|
||||
//OutputDebugStrF(L"DataDir: %s\n", mInstallDir.c_str());
|
||||
|
||||
mDataDir = mInstallDir;
|
||||
|
||||
|
||||
if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_GAMECONTROLLER) < 0)
|
||||
BF_FATAL(StrFormat("Unable to initialize SDL: %s", SDL_GetError()).c_str());
|
||||
}
|
||||
|
||||
SdlBFApp::~SdlBFApp()
|
||||
{
|
||||
{
|
||||
}
|
||||
|
||||
SdlBFWindow* SdlBFApp::GetSdlWindowFromId(uint32 id)
|
||||
{
|
||||
SdlWindowMap::iterator itr = mSdlWindowMap.find(id);
|
||||
if (itr != mSdlWindowMap.end())
|
||||
return itr->second;
|
||||
return NULL;
|
||||
SdlBFWindow* window = NULL;
|
||||
mSdlWindowMap.TryGetValue(id, &window);
|
||||
return window;
|
||||
}
|
||||
|
||||
void SdlBFApp::Init()
|
||||
{
|
||||
mRunning = true;
|
||||
mInMsgProc = false;
|
||||
|
||||
|
||||
mRenderDevice = new GLRenderDevice();
|
||||
mRenderDevice->Init(this);
|
||||
}
|
||||
|
|
@ -533,9 +216,9 @@ void SdlBFApp::Run()
|
|||
if (!SDL_PollEvent(&sdlEvent))
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
//Beefy::DebugTimeGuard suspendTimeGuard(30, "BFApp::Run2");
|
||||
|
||||
|
||||
switch (sdlEvent.type)
|
||||
{
|
||||
case SDL_QUIT:
|
||||
|
|
@ -551,7 +234,7 @@ void SdlBFApp::Run()
|
|||
case SDL_MOUSEBUTTONDOWN:
|
||||
{
|
||||
SdlBFWindow* sdlBFWindow = GetSdlWindowFromId(sdlEvent.button.windowID);
|
||||
sdlBFWindow->mMouseDownFunc(sdlBFWindow, sdlEvent.button.x, sdlEvent.button.y, sdlEvent.button.button, 1);
|
||||
sdlBFWindow->mMouseDownFunc(sdlBFWindow, sdlEvent.button.x, sdlEvent.button.y, sdlEvent.button.button, 1);
|
||||
}
|
||||
break;
|
||||
case SDL_MOUSEMOTION:
|
||||
|
|
@ -572,10 +255,10 @@ void SdlBFApp::Run()
|
|||
SdlBFWindow* sdlBFWindow = GetSdlWindowFromId(sdlEvent.key.windowID);
|
||||
sdlBFWindow->mKeyUpFunc(sdlBFWindow, SDLConvertScanCode(sdlEvent.key.keysym.scancode));
|
||||
}
|
||||
break;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Process();
|
||||
}
|
||||
}
|
||||
|
|
@ -586,25 +269,25 @@ int gBFDrawBatchCount = 0;
|
|||
void SdlBFApp::Draw()
|
||||
{
|
||||
//Beefy::DebugTimeGuard suspendTimeGuard(30, "SdlBFApp::Draw");
|
||||
|
||||
|
||||
glDisable(GL_SCISSOR_TEST);
|
||||
glDisable(GL_CULL_FACE);
|
||||
glDisable(GL_DEPTH_TEST);
|
||||
glClearColor(1.0f, 0.0f, 1.0f, 1.0f);
|
||||
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
|
||||
|
||||
|
||||
gPixelsDrawn = 0;
|
||||
gBFDrawBatchCount = 0;
|
||||
|
||||
mRenderDevice->FrameStart();
|
||||
BFApp::Draw();
|
||||
|
||||
mRenderDevice->FrameStart();
|
||||
BFApp::Draw();
|
||||
mRenderDevice->FrameEnd();
|
||||
|
||||
|
||||
gFrameCount++;
|
||||
//if (gFrameCount % 60 == 0)
|
||||
//OutputDebugStrF("Pixels: %d Batches: %d\n", gPixelsDrawn / 1000, gBFDrawBatchCount);
|
||||
}
|
||||
|
||||
|
||||
BFWindow* SdlBFApp::CreateNewWindow(BFWindow* parent, const StringImpl& title, int x, int y, int width, int height, int windowFlags)
|
||||
{
|
||||
SdlBFWindow* aWindow = new SdlBFWindow(parent, title, x, y, width, height, windowFlags);
|
||||
|
|
@ -623,29 +306,7 @@ void SdlBFWindow::GetPosition(int* x, int* y, int* width, int* height, int* clie
|
|||
|
||||
void SdlBFApp::PhysSetCursor()
|
||||
{
|
||||
//
|
||||
//static HCURSOR cursors [] =
|
||||
// {
|
||||
// ::LoadCursor(NULL, IDC_ARROW),
|
||||
//
|
||||
// //TODO: mApp->mHandCursor);
|
||||
// ::LoadCursor(NULL, IDC_ARROW),
|
||||
// //TODO: mApp->mDraggingCursor);
|
||||
// ::LoadCursor(NULL, IDC_ARROW),
|
||||
|
||||
// ::LoadCursor(NULL, IDC_IBEAM),
|
||||
//
|
||||
// ::LoadCursor(NULL, IDC_NO),
|
||||
// ::LoadCursor(NULL, IDC_SIZEALL),
|
||||
// ::LoadCursor(NULL, IDC_SIZENESW),
|
||||
// ::LoadCursor(NULL, IDC_SIZENS),
|
||||
// ::LoadCursor(NULL, IDC_SIZENWSE),
|
||||
// ::LoadCursor(NULL, IDC_SIZEWE),
|
||||
// ::LoadCursor(NULL, IDC_WAIT),
|
||||
// NULL
|
||||
// };
|
||||
|
||||
//::SetCursor(cursors[mCursor]);
|
||||
}
|
||||
|
||||
void SdlBFWindow::SetClientPosition(int x, int y)
|
||||
|
|
@ -668,7 +329,7 @@ uint32 SdlBFApp::GetClipboardFormat(const StringImpl& format)
|
|||
|
||||
void* SdlBFApp::GetClipboardData(const StringImpl& format, int* size)
|
||||
{
|
||||
return SDL_GetClipboardText();
|
||||
return SDL_GetClipboardText();
|
||||
}
|
||||
|
||||
void SdlBFApp::ReleaseClipboardData(void* ptr)
|
||||
|
|
@ -677,17 +338,17 @@ void SdlBFApp::ReleaseClipboardData(void* ptr)
|
|||
}
|
||||
|
||||
void SdlBFApp::SetClipboardData(const StringImpl& format, const void* ptr, int size, bool resetClipboard)
|
||||
{
|
||||
{
|
||||
SDL_SetClipboardText((const char*)ptr);
|
||||
}
|
||||
|
||||
BFMenu* SdlBFWindow::AddMenuItem(BFMenu* parent, const wchar_t* text, const wchar_t* hotKey, BFSysBitmap* sysBitmap, bool enabled, int checkState, bool radioCheck)
|
||||
{
|
||||
BFMenu* SdlBFWindow::AddMenuItem(BFMenu* parent, int insertIdx, const char* text, const char* hotKey, BFSysBitmap* bitmap, bool enabled, int checkState, bool radioCheck)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
void SdlBFWindow::RemoveMenuItem(BFMenu* item)
|
||||
{
|
||||
{
|
||||
}
|
||||
|
||||
BFSysBitmap* SdlBFApp::LoadSysBitmap(const wchar_t* fileName)
|
||||
|
|
@ -706,20 +367,21 @@ DrawLayer* SdlBFApp::CreateDrawLayer(BFWindow* window)
|
|||
GLDrawLayer* drawLayer = new GLDrawLayer();
|
||||
if (window != NULL)
|
||||
{
|
||||
drawLayer->mRenderWindow = window->mRenderWindow;
|
||||
drawLayer->mRenderWindow = window->mRenderWindow;
|
||||
window->mRenderWindow->mDrawLayerList.push_back(drawLayer);
|
||||
}
|
||||
drawLayer->mRenderDevice = mRenderDevice;
|
||||
return drawLayer;
|
||||
}
|
||||
|
||||
|
||||
void SdlBFApp::GetDesktopResolution(int& width, int& height) override
|
||||
void SdlBFApp::GetDesktopResolution(int& width, int& height)
|
||||
{
|
||||
width = 1024;
|
||||
height = 768;
|
||||
}
|
||||
|
||||
void SdlBFApp::GetWorkspaceRect(int& x, int& y, int& width, int& height) override
|
||||
void SdlBFApp::GetWorkspaceRect(int& x, int& y, int& width, int& height)
|
||||
{
|
||||
x = 0;
|
||||
y = 0;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue