quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added plugins to win32/linux installers; fixed crash when plugins are disabled

Browse Source 
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@63 8a3a26a2-13c4-0310-b231-cf6edde360e5
This commit is contained in:
spog
2006-05-13 12:25:54 +00:00
parent 8649824a42
commit 23cc0661e0
8 changed files with 93 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
radiant/renderstate.cpp
View File

@@ -2629,7 +2629,32 @@ void OpenGLShader::construct(const char* name)
#include "modulesystem/singletonmodule.h"
#include "modulesystem/moduleregistry.h"
class ShaderCacheDependencies : public GlobalShadersModuleRef, public GlobalTexturesModuleRef
class OpenGLStateLibraryAPI
{
OpenGLStateMap m_stateMap;
public:
typedef OpenGLStateLibrary Type;
STRING_CONSTANT(Name, "*");
OpenGLStateLibraryAPI()
{
g_openglStates = &m_stateMap;
}
~OpenGLStateLibraryAPI()
{
g_openglStates = 0;
}
OpenGLStateLibrary* getTable()
{
return &m_stateMap;
}
};
typedef SingletonModule<OpenGLStateLibraryAPI> OpenGLStateLibraryModule;
typedef Static<OpenGLStateLibraryModule> StaticOpenGLStateLibraryModule;
StaticRegisterModule staticRegisterOpenGLStateLibrary(StaticOpenGLStateLibraryModule::instance());
class ShaderCacheDependencies : public GlobalShadersModuleRef, public GlobalTexturesModuleRef, public GlobalOpenGLStateLibraryModuleRef
{
public:
ShaderCacheDependencies() :
@@ -2666,27 +2691,3 @@ typedef Static<ShaderCacheModule> StaticShaderCacheModule;
StaticRegisterModule staticRegisterShaderCache(StaticShaderCacheModule::instance());
class OpenGLStateLibraryAPI
{
OpenGLStateMap m_stateMap;
public:
typedef OpenGLStateLibrary Type;
STRING_CONSTANT(Name, "*");
OpenGLStateLibraryAPI()
{
g_openglStates = &m_stateMap;
}
~OpenGLStateLibraryAPI()
{
g_openglStates = 0;
}
OpenGLStateLibrary* getTable()
{
return &m_stateMap;
}
};
typedef SingletonModule<OpenGLStateLibraryAPI> OpenGLStateLibraryModule;
typedef Static<OpenGLStateLibraryModule> StaticOpenGLStateLibraryModule;
StaticRegisterModule staticRegisterOpenGLStateLibrary(StaticOpenGLStateLibraryModule::instance());