jepler/regal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

another checkpoint, still not rendering correctly yet

Browse source
This commit is contained in:
Cass Everitt 2014-01-17 17:08:48 -06:00
parent 820fe0e31d
commit 466a0824ae
7 changed files with 55 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
examples/alphatorus/osx/RegalView.mm
View file

@ -44,7 +44,7 @@ NSTimer *timer = nil;
[super initWithCoder: aDecoder];
NSOpenGLPixelFormatAttribute attr[] = {
#if 1
#if 0
NSOpenGLPFAOpenGLProfile, NSOpenGLProfileVersionLegacy,
#else
NSOpenGLPFAOpenGLProfile, NSOpenGLProfileVersion3_2Core,

30
examples/alphatorus/osx/alphatorus.xcodeproj/project.pbxproj
View file

@ -18,7 +18,6 @@
8D11072D0486CEB800E47090 /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.mm */; settings = {ATTRIBUTES = (); }; };
8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
BC3A59B31804680000992687 /* libapitrace.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BC9F8ABB1804648500C68C71 /* libapitrace.a */; };
BC3A59BA1804680400992687 /* libjsonsl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BC9F8AC2180464A200C68C71 /* libjsonsl.a */; };
BC3A59BB1804680800992687 /* libmd5.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BC9F8AC8180464B200C68C71 /* libmd5.a */; };
BC3A59BC1804680B00992687 /* libmongoose.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BC9F8ACE180464C500C68C71 /* libmongoose.a */; };
BC3A59BD1804680E00992687 /* libsnappy.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BC9F8AD4180464D700C68C71 /* libsnappy.a */; };
@ -61,13 +60,6 @@
remoteGlobalIDString = 433667A917C56F3500D45AD9;
remoteInfo = apitrace;
};
BC9F8AC1180464A200C68C71 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = BC9F8ABD180464A200C68C71 /* jsonsl.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 4336679417C56EF900D45AD9;
remoteInfo = jsonsl;
};
BC9F8AC7180464B200C68C71 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = BC9F8AC3180464B100C68C71 /* md5.xcodeproj */;
@ -120,7 +112,6 @@
8D1107310486CEB800E47090 /* alphatorus-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "alphatorus-Info.plist"; sourceTree = "<group>"; };
8D1107320486CEB800E47090 /* alphatorus.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = alphatorus.app; sourceTree = BUILT_PRODUCTS_DIR; };
BC9F8AB61804648400C68C71 /* apitrace.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = apitrace.xcodeproj; path = ../../../build/mac/apitrace/apitrace.xcodeproj; sourceTree = "<group>"; };
BC9F8ABD180464A200C68C71 /* jsonsl.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = jsonsl.xcodeproj; path = ../../../build/mac/jsonsl/jsonsl.xcodeproj; sourceTree = "<group>"; };
BC9F8AC3180464B100C68C71 /* md5.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = md5.xcodeproj; path = ../../../build/mac/md5/md5.xcodeproj; sourceTree = "<group>"; };
BC9F8AC9180464C500C68C71 /* mongoose.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = mongoose.xcodeproj; path = ../../../build/mac/mongoose/mongoose.xcodeproj; sourceTree = "<group>"; };
BC9F8ACF180464D700C68C71 /* snappy.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = snappy.xcodeproj; path = ../../../build/mac/snappy/snappy.xcodeproj; sourceTree = "<group>"; };
@ -136,7 +127,6 @@
BC3A59BD1804680E00992687 /* libsnappy.a in Frameworks */,
BC3A59BC1804680B00992687 /* libmongoose.a in Frameworks */,
BC3A59BB1804680800992687 /* libmd5.a in Frameworks */,
BC3A59BA1804680400992687 /* libjsonsl.a in Frameworks */,
BC3A59B31804680000992687 /* libapitrace.a in Frameworks */,
8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */,
431D3C0815C9B648009DD04F /* libRegal.a in Frameworks */,
@ -180,7 +170,6 @@
BC9F8ACF180464D700C68C71 /* snappy.xcodeproj */,
BC9F8AC9180464C500C68C71 /* mongoose.xcodeproj */,
BC9F8AC3180464B100C68C71 /* md5.xcodeproj */,
BC9F8ABD180464A200C68C71 /* jsonsl.xcodeproj */,
BC9F8AB61804648400C68C71 /* apitrace.xcodeproj */,
29B97315FDCFA39411CA2CEA /* code */,
29B97317FDCFA39411CA2CEA /* Resources */,
@ -246,14 +235,6 @@
name = Products;
sourceTree = "<group>";
};
BC9F8ABE180464A200C68C71 /* Products */ = {
isa = PBXGroup;
children = (
BC9F8AC2180464A200C68C71 /* libjsonsl.a */,
);
name = Products;
sourceTree = "<group>";
};
BC9F8AC4180464B100C68C71 /* Products */ = {
isa = PBXGroup;
children = (
@ -332,10 +313,6 @@
ProductGroup = BC9F8AB71804648400C68C71 /* Products */;
ProjectRef = BC9F8AB61804648400C68C71 /* apitrace.xcodeproj */;
},
{
ProductGroup = BC9F8ABE180464A200C68C71 /* Products */;
ProjectRef = BC9F8ABD180464A200C68C71 /* jsonsl.xcodeproj */;
},
{
ProductGroup = BC9F8AC4180464B100C68C71 /* Products */;
ProjectRef = BC9F8AC3180464B100C68C71 /* md5.xcodeproj */;
@ -400,13 +377,6 @@
remoteRef = BC9F8ABA1804648500C68C71 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
BC9F8AC2180464A200C68C71 /* libjsonsl.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libjsonsl.a;
remoteRef = BC9F8AC1180464A200C68C71 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
BC9F8AC8180464B200C68C71 /* libmd5.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;

8
examples/alphatorus/src/render.cpp
View file

@ -140,8 +140,8 @@ void alphaTorusInitProgram() {
GLuint vs = glCreateShader( GL_VERTEX_SHADER );
{
char vshader[] =
"varying vec4 ocol;\n"
"varying vec2 tc;\n"
"out vec4 ocol;\n"
"out vec2 tc;\n"
"\n"
"void main() {\n"
" gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;\n"
@ -163,8 +163,8 @@ void alphaTorusInitProgram() {
{
char fshader[] =
"uniform sampler2D tex;\n"
"varying vec4 ocol;\n"
"varying vec2 tc;\n"
"in vec4 ocol;\n"
"in vec2 tc;\n"
"\n"
"void main() {\n"
" gl_FragColor.xyz = texture2D(tex, tc).xyz;\n"

83
examples/dreamtorus/osx/minimal_osx.xcodeproj/project.pbxproj
View file

@ -18,7 +18,6 @@
8D11072D0486CEB800E47090 /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.mm */; settings = {ATTRIBUTES = (); }; };
8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
BC3A59B31804680000992687 /* libapitrace.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BC9F8ABB1804648500C68C71 /* libapitrace.a */; };
BC3A59BA1804680400992687 /* libjsonsl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BC9F8AC2180464A200C68C71 /* libjsonsl.a */; };
BC3A59BB1804680800992687 /* libmd5.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BC9F8AC8180464B200C68C71 /* libmd5.a */; };
BC3A59BC1804680B00992687 /* libmongoose.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BC9F8ACE180464C500C68C71 /* libmongoose.a */; };
BC3A59BD1804680E00992687 /* libsnappy.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BC9F8AD4180464D700C68C71 /* libsnappy.a */; };
@ -33,6 +32,27 @@
remoteGlobalIDString = 43A6C1C615C48CD90063667E;
remoteInfo = Regal;
};
43D4464F1889EDDA00F38443 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 431D3BFF15C9B635009DD04F /* Regal.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 4359158318367621002CB92C;
remoteInfo = RegalDynamic;
};
43D446511889EDDA00F38443 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 431D3BFF15C9B635009DD04F /* Regal.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 435916DA18367DEE002CB92C;
remoteInfo = RegalWrangler;
};
43D446531889EDDA00F38443 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 431D3BFF15C9B635009DD04F /* Regal.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 4359176F18367E05002CB92C;
remoteInfo = RegalWranglerDynamic;
};
BC9F8ABA1804648500C68C71 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = BC9F8AB61804648400C68C71 /* apitrace.xcodeproj */;
@ -40,13 +60,6 @@
remoteGlobalIDString = 433667A917C56F3500D45AD9;
remoteInfo = apitrace;
};
BC9F8AC1180464A200C68C71 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = BC9F8ABD180464A200C68C71 /* jsonsl.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 4336679417C56EF900D45AD9;
remoteInfo = jsonsl;
};
BC9F8AC7180464B200C68C71 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = BC9F8AC3180464B100C68C71 /* md5.xcodeproj */;
@ -99,7 +112,6 @@
8D1107310486CEB800E47090 /* minimal_osx-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "minimal_osx-Info.plist"; sourceTree = "<group>"; };
8D1107320486CEB800E47090 /* minimal_osx.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = minimal_osx.app; sourceTree = BUILT_PRODUCTS_DIR; };
BC9F8AB61804648400C68C71 /* apitrace.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = apitrace.xcodeproj; path = ../../../build/mac/apitrace/apitrace.xcodeproj; sourceTree = "<group>"; };
BC9F8ABD180464A200C68C71 /* jsonsl.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = jsonsl.xcodeproj; path = ../../../build/mac/jsonsl/jsonsl.xcodeproj; sourceTree = "<group>"; };
BC9F8AC3180464B100C68C71 /* md5.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = md5.xcodeproj; path = ../../../build/mac/md5/md5.xcodeproj; sourceTree = "<group>"; };
BC9F8AC9180464C500C68C71 /* mongoose.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = mongoose.xcodeproj; path = ../../../build/mac/mongoose/mongoose.xcodeproj; sourceTree = "<group>"; };
BC9F8ACF180464D700C68C71 /* snappy.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = snappy.xcodeproj; path = ../../../build/mac/snappy/snappy.xcodeproj; sourceTree = "<group>"; };
@ -115,7 +127,6 @@
BC3A59BD1804680E00992687 /* libsnappy.a in Frameworks */,
BC3A59BC1804680B00992687 /* libmongoose.a in Frameworks */,
BC3A59BB1804680800992687 /* libmd5.a in Frameworks */,
BC3A59BA1804680400992687 /* libjsonsl.a in Frameworks */,
BC3A59B31804680000992687 /* libapitrace.a in Frameworks */,
8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */,
431D3C0815C9B648009DD04F /* libRegal.a in Frameworks */,
@ -159,7 +170,6 @@
BC9F8ACF180464D700C68C71 /* snappy.xcodeproj */,
BC9F8AC9180464C500C68C71 /* mongoose.xcodeproj */,
BC9F8AC3180464B100C68C71 /* md5.xcodeproj */,
BC9F8ABD180464A200C68C71 /* jsonsl.xcodeproj */,
BC9F8AB61804648400C68C71 /* apitrace.xcodeproj */,
29B97315FDCFA39411CA2CEA /* code */,
29B97317FDCFA39411CA2CEA /* Resources */,
@ -210,6 +220,9 @@
isa = PBXGroup;
children = (
431D3C0715C9B636009DD04F /* libRegal.a */,
43D446501889EDDA00F38443 /* libRegal.dylib */,
43D446521889EDDA00F38443 /* libRegalW.a */,
43D446541889EDDA00F38443 /* libRegalW.dylib */,
);
name = Products;
sourceTree = "<group>";
@ -222,14 +235,6 @@
name = Products;
sourceTree = "<group>";
};
BC9F8ABE180464A200C68C71 /* Products */ = {
isa = PBXGroup;
children = (
BC9F8AC2180464A200C68C71 /* libjsonsl.a */,
);
name = Products;
sourceTree = "<group>";
};
BC9F8AC4180464B100C68C71 /* Products */ = {
isa = PBXGroup;
children = (
@ -308,10 +313,6 @@
ProductGroup = BC9F8AB71804648400C68C71 /* Products */;
ProjectRef = BC9F8AB61804648400C68C71 /* apitrace.xcodeproj */;
},
{
ProductGroup = BC9F8ABE180464A200C68C71 /* Products */;
ProjectRef = BC9F8ABD180464A200C68C71 /* jsonsl.xcodeproj */;
},
{
ProductGroup = BC9F8AC4180464B100C68C71 /* Products */;
ProjectRef = BC9F8AC3180464B100C68C71 /* md5.xcodeproj */;
@ -348,6 +349,27 @@
remoteRef = 431D3C0615C9B636009DD04F /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
43D446501889EDDA00F38443 /* libRegal.dylib */ = {
isa = PBXReferenceProxy;
fileType = "compiled.mach-o.dylib";
path = libRegal.dylib;
remoteRef = 43D4464F1889EDDA00F38443 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
43D446521889EDDA00F38443 /* libRegalW.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libRegalW.a;
remoteRef = 43D446511889EDDA00F38443 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
43D446541889EDDA00F38443 /* libRegalW.dylib */ = {
isa = PBXReferenceProxy;
fileType = "compiled.mach-o.dylib";
path = libRegalW.dylib;
remoteRef = 43D446531889EDDA00F38443 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
BC9F8ABB1804648500C68C71 /* libapitrace.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
@ -355,13 +377,6 @@
remoteRef = BC9F8ABA1804648500C68C71 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
BC9F8AC2180464A200C68C71 /* libjsonsl.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libjsonsl.a;
remoteRef = BC9F8AC1180464A200C68C71 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
BC9F8AC8180464B200C68C71 /* libmd5.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
@ -455,7 +470,7 @@
INSTALL_PATH = "$(HOME)/Applications";
MACOSX_DEPLOYMENT_TARGET = 10.6;
PRODUCT_NAME = minimal_osx;
SDKROOT = macosx10.7;
SDKROOT = macosx;
};
name = Debug;
};
@ -472,7 +487,7 @@
INSTALL_PATH = "$(HOME)/Applications";
MACOSX_DEPLOYMENT_TARGET = 10.6;
PRODUCT_NAME = minimal_osx;
SDKROOT = macosx10.7;
SDKROOT = macosx;
};
name = Release;
};
@ -486,7 +501,7 @@
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = ../../../include;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx10.7;
SDKROOT = macosx;
};
name = Debug;
};
@ -498,7 +513,7 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = ../../../include;
SDKROOT = macosx10.7;
SDKROOT = macosx;
};
name = Release;
};

1
scripts/regal/RegalContext.py
View file

@ -96,7 +96,6 @@ REGAL_GLOBAL_BEGIN
#include "RegalPrivate.h"
#include "RegalContextInfo.h"
#include "RegalDispatchDebug.h"
#include "RegalDispatchEmu.h"
#include "RegalDispatchLog.h"
#include "RegalDispatchError.h"
#include "RegalDispatchHttp.h"

1
src/regal/RegalContext.h
View file

@ -49,7 +49,6 @@ REGAL_GLOBAL_BEGIN
#include "RegalPrivate.h"
#include "RegalContextInfo.h"
#include "RegalDispatchDebug.h"
#include "RegalDispatchEmu.h"
#include "RegalDispatchLog.h"
#include "RegalDispatchError.h"
#include "RegalDispatchHttp.h"

2
src/regal/RegalLog.cpp
View file

@ -372,7 +372,7 @@ namespace Logging {
line[1] = '0' + (count % 100)/10;
line[2] = '0' + (count % 10);
p += full_prefix.size();
m.replace( p, 3, line, 3 );
m.replace( p, 0, line, 3 );
p = m.find( full_prefix, p );
count++;
}