chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-11 08:10:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Mac pBuffer stub cleanup

Browse Source
This commit is contained in:
Mark Watkins 2011-06-17 20:23:36 +10:00
parent b5425d708e
commit 48796f14ba
5 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Projects/CodeBlocks/SleepyHead.depend
View File

@ -8309,7 +8309,7 @@
1308026543 D 1308026543 D
1308304657 /home/mark/projects/git/sleepyhead/src/version.h 1308306194 /home/mark/projects/git/sleepyhead/src/version.h
1308003040 ent of cb2ab33... Linux wx2.8 & wx2.9 builds fixed 1308003040 ent of cb2ab33... Linux wx2.8 & wx2.9 builds fixed
<wx/dcbuffer.h> <wx/dcbuffer.h>
@ -11062,12 +11062,14 @@
<string.h> <string.h>
"freetype-gl/vector.h" "freetype-gl/vector.h"
1308302350 /home/mark/projects/git/sleepyhead/src/graphs/gl_pbuffer.h 1308306186 /home/mark/projects/git/sleepyhead/src/graphs/gl_pbuffer.h
<wx/log.h> <wx/log.h>
<GL/glew.h> <GL/glew.h>
<GL/wglew.h> <GL/wglew.h>
<OpenGL/gl.h> <OpenGL/gl.h>
<AGL/agl.h> <AGL/agl.h>
<Carbon/Carbon.h>
<Cocoa/Cocoa.h>
<GL/gl.h> <GL/gl.h>
<GL/glx.h> <GL/glx.h>

8
Projects/CodeBlocks/SleepyHead.layout
View File

@ -16,14 +16,14 @@
<File name="../../src/SleepyHeadMain.h" open="1" top="0" tabpos="2"> <File name="../../src/SleepyHeadMain.h" open="1" top="0" tabpos="2">
<Cursor position="2035" topLine="47" /> <Cursor position="2035" topLine="47" />
</File> </File>
<File name="../../src/graphs/gl_pbuffer.cpp" open="1" top="0" tabpos="5"> <File name="../../src/graphs/gl_pbuffer.cpp" open="1" top="1" tabpos="5">
<Cursor position="8152" topLine="220" /> <Cursor position="7612" topLine="222" />
</File> </File>
<File name="../../src/graphs/gl_pbuffer.h" open="1" top="0" tabpos="6"> <File name="../../src/graphs/gl_pbuffer.h" open="1" top="0" tabpos="6">
<Cursor position="644" topLine="58" /> <Cursor position="644" topLine="58" />
</File> </File>
<File name="../../src/graphs/graph.cpp" open="1" top="1" tabpos="3"> <File name="../../src/graphs/graph.cpp" open="1" top="0" tabpos="3">
<Cursor position="454" topLine="0" /> <Cursor position="2743" topLine="83" />
</File> </File>
<File name="../../src/graphs/graph.h" open="1" top="0" tabpos="4"> <File name="../../src/graphs/graph.h" open="1" top="0" tabpos="4">
<Cursor position="10808" topLine="297" /> <Cursor position="10808" topLine="297" />

12
src/graphs/gl_pbuffer.cpp
View File

@ -338,7 +338,7 @@ pBufferAGL::pBufferAGL(int width, int height)
AGL_DEPTH_SIZE, 24, AGL_DEPTH_SIZE, 24,
AGL_NONE AGL_NONE
}; };
display2 = CGDisplayIDToOpenGLDisplayMask(CGMainDisplayID()); /*display2 = CGDisplayIDToOpenGLDisplayMask(CGMainDisplayID());
display = GetMainDevice(); display = GetMainDevice();
wxRect windowRect = { 100, 100, 100 + width, 100 + height }; wxRect windowRect = { 100, 100, 100 + width, 100 + height };
@ -378,7 +378,7 @@ pBufferAGL::pBufferAGL(int width, int height)
// initialize window context & draw window // initialize window context & draw window
GLuint texid; GLuint texid;
init( context, pbuffer, &texid ); init( context, pbuffer, &texid );
drawWindow( context, texid ); drawWindow( context, texid ); */
// stub event loop // stub event loop
} }
@ -386,19 +386,19 @@ pBufferAGL::pBufferAGL(int width, int height)
} }
pBufferAGL::~pBufferAGL() pBufferAGL::~pBufferAGL()
{ {
aglSetCurrentContext( NULL ); /*aglSetCurrentContext( NULL );
aglDestroyContext( context ); aglDestroyContext( context );
aglDestroyContext( pbContext ); aglDestroyContext( pbContext );
aglDestroyPBuffer( pbuffer ); aglDestroyPBuffer( pbuffer ); */
} }
void pBufferAGL::UseBuffer(bool b) void pBufferAGL::UseBuffer(bool b)
{ {
if (b) { /* if (b) {
wglMakeCurrent(hdc, hGlRc); wglMakeCurrent(hdc, hGlRc);
} else { } else {
wglMakeCurrent(saveHdc, saveHglrc); wglMakeCurrent(saveHdc, saveHglrc);
} } */
} }
#endif #endif

12
src/graphs/gl_pbuffer.h
View File

@ -26,6 +26,14 @@ License: GPL
#include <OpenGL/gl.h> #include <OpenGL/gl.h>
#include <AGL/agl.h> #include <AGL/agl.h>
// Not sure about these
#if defined(__WXCARBON__)
#include <Carbon/Carbon.h>
#elif defined(__WXCOCOA__)
#include <Cocoa/Cocoa.h>
#endif
#elif defined(__UNIX__) #elif defined(__UNIX__)
#include <GL/gl.h> #include <GL/gl.h>
#include <GL/glx.h> #include <GL/glx.h>
@ -102,12 +110,12 @@ public:
virtual ~pBufferAGL(); virtual ~pBufferAGL();
virtual void UseBuffer(bool b); virtual void UseBuffer(bool b);
protected: protected:
AGLPixelFormat pixelFormat; /* AGLPixelFormat pixelFormat;
AGLPbuffer pbuffer; AGLPbuffer pbuffer;
AGLContext context, pbContext; AGLContext context, pbContext;
long virtualScreen; long virtualScreen;
GDHandle display2; GDHandle display2;
GDHandle display; GDHandle display; */
}; };
#endif #endif

10
src/version.h
View File

@ -16,14 +16,14 @@ namespace AutoVersion{
//Standard Version Type //Standard Version Type
static const long _MAJOR = 0; static const long _MAJOR = 0;
static const long _MINOR = 7; static const long _MINOR = 7;
static const long _BUILD = 6515; static const long _BUILD = 6516;
static const long _REVISION = 18840; static const long _REVISION = 18844;
//Miscellaneous Version Types //Miscellaneous Version Types
static const long _BUILDS_COUNT = 7759; static const long _BUILDS_COUNT = 7759;
#define _RC_FILEVERSION 0,7,6515,18840 #define _RC_FILEVERSION 0,7,6516,18844
#define _RC_FILEVERSION_STRING "0, 7, 6515, 18840\0" #define _RC_FILEVERSION_STRING "0, 7, 6516, 18844\0"
static const char _FULLVERSION_STRING[] = "0.7.6515.18840"; static const char _FULLVERSION_STRING[] = "0.7.6516.18844";
//These values are to keep track of your versioning state, don't modify them. //These values are to keep track of your versioning state, don't modify them.
static const long _BUILD_HISTORY = 0; static const long _BUILD_HISTORY = 0;