ref: 983a17461a4a353fa44bcaa4c2a16b8d9d656938
parent: c77edc56c6facea60f0439acaa4352793f33b8ec
author: David <gek@katherine>
date: Sat Feb 20 10:53:49 EST 2021
Added NoSDL mode in the demos
--- a/README.md
+++ b/README.md
@@ -118,6 +118,9 @@
* the X dimension of the rendering window with must be a multiple of 4.
+* Line and point rendering have no blending. Point rendering is planned to be updated but line rendering is a secondary priority.
+(Games don't use wireframe rendering very much- but point rendering is useful for fast point sprites)
+
* <Undocumented limitations that have not been tested>
### HOW DO I USE THIS LIBRARY???
--- a/SDL_Examples/gears.c
+++ b/SDL_Examples/gears.c
@@ -24,7 +24,7 @@
typedef unsigned char uchar;
#endif
#include <SDL/SDL.h>
-
+int noSDL = 0;
#ifndef M_PI
#define M_PI 3.14159265
#endif
@@ -308,32 +308,40 @@
override_drawmodes = 1;
if (!strcmp(argv[i],"-points"))
override_drawmodes = 2;
+ if (!strcmp(argv[i],"-nosdl"))
+ noSDL = 1;
if (!strcmp(argv[i],"-notext"))
dotext = 0;
larg = argv[i];
}
}
+ if(!noSDL){#ifdef PLAY_MUSIC
- if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO) < 0) {+ if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO) < 0) {#else
- if (SDL_Init(SDL_INIT_VIDEO) < 0) {+ if (SDL_Init(SDL_INIT_VIDEO) < 0) {#endif
- fprintf(stderr, "ERROR: cannot initialize SDL video.\n");
- return 1;
- }
+ fprintf(stderr, "ERROR: cannot initialize SDL video.\n");
+ return 1;
+ }
+ } else if(SDL_Init(0) < 0) fprintf(stderr, "ERROR: cannot initialize SDL without video.\n");
#ifdef PLAY_MUSIC
- ainit(0);
+ if(!noSDL) ainit(0);
#endif
SDL_Surface* screen = NULL;
+ if(!noSDL)
if ((screen = SDL_SetVideoMode(winSizeX, winSizeY, TGL_FEATURE_RENDER_BITS, SDL_SWSURFACE)) == 0) {fprintf(stderr, "ERROR: Video mode set failed.\n");
return 1;
}
- printf("\nRMASK IS %u", screen->format->Rmask);- printf("\nGMASK IS %u", screen->format->Gmask);- printf("\nBMASK IS %u", screen->format->Bmask);- printf("\nAMASK IS %u", screen->format->Amask);+ if(!noSDL){+ printf("\nRMASK IS %u", screen->format->Rmask);+ printf("\nGMASK IS %u", screen->format->Gmask);+ printf("\nBMASK IS %u", screen->format->Bmask);+ printf("\nAMASK IS %u", screen->format->Amask);+ }
#if TGL_FEATURE_RENDER_BITS == 32
+ if(!noSDL)
if (screen->format->Rmask != 0x00FF0000 || screen->format->Gmask != 0x0000FF00 || screen->format->Bmask != 0x000000FF) {needsRGBAFix = 1;
printf("\nYour screen is using an RGBA output different than this library expects.");@@ -340,23 +348,26 @@
printf("\nYou should consider using the 16 bit version for optimal performance");}
#endif
- printf("\nRSHIFT IS %u", screen->format->Rshift);- printf("\nGSHIFT IS %u", screen->format->Gshift);- printf("\nBSHIFT IS %u", screen->format->Bshift);- printf("\nASHIFT IS %u\n", screen->format->Ashift);+ if(!noSDL){+ printf("\nRSHIFT IS %u", screen->format->Rshift);+ printf("\nGSHIFT IS %u", screen->format->Gshift);+ printf("\nBSHIFT IS %u", screen->format->Bshift);+ printf("\nASHIFT IS %u\n", screen->format->Ashift);+ }
fflush(stdout);
-
#ifdef PLAY_MUSIC
+
track* myTrack = NULL;
- myTrack = lmus("WWGW.mp3");- mplay(myTrack, -1, 1000);
+ if(!noSDL) myTrack = lmus("WWGW.mp3");+ if(!noSDL) mplay(myTrack, -1, 1000);
#endif
- SDL_ShowCursor(SDL_DISABLE);
- SDL_WM_SetCaption(argv[0], 0);
+ if(!noSDL) SDL_ShowCursor(SDL_DISABLE);
+ if(!noSDL) SDL_WM_SetCaption(argv[0], 0);
// initialize TinyGL:
// unsigned int pitch;
int mode;
+ if(!noSDL)
switch (screen->format->BitsPerPixel) {case 8:
fprintf(stderr, "ERROR: Palettes are currently not supported.\n");
@@ -382,7 +393,11 @@
return 1;
break;
}
- ZBuffer* frameBuffer = ZB_open(winSizeX, winSizeY, mode, 0);
+ ZBuffer* frameBuffer = NULL;
+ if(TGL_FEATURE_RENDER_BITS == 32)
+ frameBuffer = ZB_open(winSizeX, winSizeY, ZB_MODE_RGBA, 0);
+ else
+ frameBuffer = ZB_open(winSizeX, winSizeY, ZB_MODE_5R6G5B, 0);
if(!frameBuffer){printf("\nZB_open failed!");exit(1);}glInit(frameBuffer);
@@ -435,10 +450,12 @@
//float test = 0;
while (isRunning) {++frames;
+ //Depending on SDL to give us ticks even without a window open...
tNow = SDL_GetTicks();
// test = TEST_fastInvSqrt(tNow);
// printf("\n%f",test);// do event handling:
+ if(!noSDL){SDL_Event evt;
while (SDL_PollEvent(&evt))
switch (evt.type) {@@ -467,7 +484,7 @@
isRunning = 0;
break;
}
-
+ }
// draw scene:
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
draw();
@@ -479,6 +496,7 @@
glDrawText((unsigned char*)"BLUE text", 0, 48, 0xFF);
}
// swap buffers:
+ if(!noSDL)
if (SDL_MUSTLOCK(screen) && (SDL_LockSurface(screen) < 0)) {fprintf(stderr, "SDL ERROR: Can't lock screen: %s\n", SDL_GetError());
return 1;
@@ -493,20 +511,25 @@
((DATONE & 0x000000FF) >> 16) << screen->format->Bshift;
}
#endif
- ZB_copyFrameBuffer(frameBuffer, screen->pixels, screen->pitch);
- if (SDL_MUSTLOCK(screen))
- SDL_UnlockSurface(screen);
- SDL_Flip(screen);
- if (fps > 0)
- if ((1000 / fps) > (SDL_GetTicks() - tNow)) {- SDL_Delay((1000 / fps) - (SDL_GetTicks() - tNow)); // Yay stable framerate!
- }
+
+ if(!noSDL) ZB_copyFrameBuffer(frameBuffer, screen->pixels, screen->pitch);
+ if(!noSDL)
+ if (SDL_MUSTLOCK(screen))
+ SDL_UnlockSurface(screen);
+ if(!noSDL)SDL_Flip(screen);
+ if(!noSDL)
+ if (fps > 0)
+ if ((1000 / fps) > (SDL_GetTicks() - tNow)) {+ SDL_Delay((1000 / fps) - (SDL_GetTicks() - tNow)); // Yay stable framerate!
+ }
// check for error conditions:
+ if(!noSDL){char* sdl_error = SDL_GetError();
if (sdl_error[0] != '\0') {fprintf(stderr, "SDL ERROR: \"%s\"\n", sdl_error);
SDL_ClearError();
}
+ }
// update fps:
if (tNow >= tLastFps + 5000) { printf("%i frames in %f secs, %f frames per second.\n", frames, (float)(tNow - tLastFps) * 0.001f,@@ -522,12 +545,13 @@
//glDeleteList(gear3);
ZB_close(frameBuffer);
glClose();
+ if(!noSDL)
if (SDL_WasInit(SDL_INIT_VIDEO))
SDL_QuitSubSystem(SDL_INIT_VIDEO);
#ifdef PLAY_MUSIC
- mhalt();
- Mix_FreeMusic(myTrack);
- acleanup();
+ if(!noSDL)mhalt();
+ if(!noSDL)Mix_FreeMusic(myTrack);
+ if(!noSDL)acleanup();
#endif
SDL_Quit();
return 0;
--- a/SDL_Examples/helloworld.c
+++ b/SDL_Examples/helloworld.c
@@ -25,7 +25,7 @@
typedef unsigned char uchar;
#endif
#include <SDL/SDL.h>
-
+int noSDL = 0;
#ifndef M_PI
#define M_PI 3.14159265
#endif
@@ -119,7 +119,7 @@
unsigned int fps = 0;
char needsRGBAFix = 0;
- if (argc > 2) {+ if (argc > 1) {char* larg = argv[1];
for (int i = 0; i < argc; i++) {if (!strcmp(larg, "-w"))
@@ -128,30 +128,38 @@
winSizeY = atoi(argv[i]);
if (!strcmp(larg, "-fps"))
fps = strtoull(argv[i], 0, 10);
+ if (!strcmp(argv[i],"-nosdl"))
+ noSDL = 1;
larg = argv[i];
}
}
+ if(!noSDL){#ifdef PLAY_MUSIC
- if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO) < 0) {+ if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO) < 0) {#else
- if (SDL_Init(SDL_INIT_VIDEO) < 0) {+ if (SDL_Init(SDL_INIT_VIDEO) < 0) {#endif
- fprintf(stderr, "ERROR: cannot initialize SDL video.\n");
- return 1;
- }
+ fprintf(stderr, "ERROR: cannot initialize SDL video.\n");
+ return 1;
+ }
+ } else if(SDL_Init(0) < 0) fprintf(stderr, "ERROR: cannot initialize SDL without video.\n");
#ifdef PLAY_MUSIC
- ainit(0);
+ if(!noSDL)ainit(0);
#endif
SDL_Surface* screen = NULL;
+ if(!noSDL)
if ((screen = SDL_SetVideoMode(winSizeX, winSizeY, TGL_FEATURE_RENDER_BITS, SDL_SWSURFACE)) == 0) {fprintf(stderr, "ERROR: Video mode set failed.\n");
return 1;
}
- printf("\nRMASK IS %u", screen->format->Rmask);- printf("\nGMASK IS %u", screen->format->Gmask);- printf("\nBMASK IS %u", screen->format->Bmask);- printf("\nAMASK IS %u", screen->format->Amask);+ if(!noSDL){+ printf("\nRMASK IS %u", screen->format->Rmask);+ printf("\nGMASK IS %u", screen->format->Gmask);+ printf("\nBMASK IS %u", screen->format->Bmask);+ printf("\nAMASK IS %u", screen->format->Amask);+ }
#if TGL_FEATURE_RENDER_BITS == 32
+ if(!noSDL)
if (screen->format->Rmask != 0x00FF0000 || screen->format->Gmask != 0x0000FF00 || screen->format->Bmask != 0x000000FF) {needsRGBAFix = 1;
printf("\nYour screen is using an RGBA output different than this library expects.");@@ -158,23 +166,25 @@
printf("\nYou should consider using the 16 bit version for optimal performance");}
#endif
-
- printf("\nRSHIFT IS %u", screen->format->Rshift);- printf("\nGSHIFT IS %u", screen->format->Gshift);- printf("\nBSHIFT IS %u", screen->format->Bshift);- printf("\nASHIFT IS %u\n", screen->format->Ashift);+ if(!noSDL){+ printf("\nRSHIFT IS %u", screen->format->Rshift);+ printf("\nGSHIFT IS %u", screen->format->Gshift);+ printf("\nBSHIFT IS %u", screen->format->Bshift);+ printf("\nASHIFT IS %u\n", screen->format->Ashift);+ }
fflush(stdout);
#ifdef PLAY_MUSIC
track* myTrack = NULL;
- myTrack = lmus("WWGW.mp3");- mplay(myTrack, -1, 1000);
+ if(!noSDL) myTrack = lmus("WWGW.mp3");+ if(!noSDL) mplay(myTrack, -1, 1000);
#endif
- SDL_ShowCursor(SDL_DISABLE);
- SDL_WM_SetCaption(argv[0], 0);
+ if(!noSDL)SDL_ShowCursor(SDL_DISABLE);
+ if(!noSDL)SDL_WM_SetCaption(argv[0], 0);
// initialize TinyGL:
// unsigned int pitch;
int mode;
+ if(!noSDL)
switch (screen->format->BitsPerPixel) {case 8:
fprintf(stderr, "ERROR: Palettes are currently not supported.\n");
@@ -200,7 +210,11 @@
return 1;
break;
}
- ZBuffer* frameBuffer = ZB_open(winSizeX, winSizeY, mode, 0);
+ ZBuffer* frameBuffer = NULL;
+ if(TGL_FEATURE_RENDER_BITS == 32)
+ frameBuffer = ZB_open(winSizeX, winSizeY, ZB_MODE_RGBA, 0);
+ else
+ frameBuffer = ZB_open(winSizeX, winSizeY, ZB_MODE_5R6G5B, 0);
glInit(frameBuffer);
// initialize GL:
@@ -252,6 +266,7 @@
draw();
glDrawText((unsigned char*)"Hello World!\nFrom TinyGL", 0, 0, 0x00FFFFFF);
// swap buffers:
+ if(!noSDL)
if (SDL_MUSTLOCK(screen) && (SDL_LockSurface(screen) < 0)) {fprintf(stderr, "SDL ERROR: Can't lock screen: %s\n", SDL_GetError());
return 1;
@@ -271,20 +286,21 @@
((DATONE & 0x00FF0000) >> 16) << screen->format->Bshift;
}
#endif
- ZB_copyFrameBuffer(frameBuffer, screen->pixels, screen->pitch);
- if (SDL_MUSTLOCK(screen))
- SDL_UnlockSurface(screen);
- SDL_Flip(screen);
- if (fps > 0)
+ if(!noSDL) ZB_copyFrameBuffer(frameBuffer, screen->pixels, screen->pitch);
+ if(!noSDL) if (SDL_MUSTLOCK(screen)) SDL_UnlockSurface(screen);
+ if(!noSDL) SDL_Flip(screen);
+ if(!noSDL) if (fps > 0)
if ((1000 / fps) > (SDL_GetTicks() - tNow)) {SDL_Delay((1000 / fps) - (SDL_GetTicks() - tNow)); // Yay stable framerate!
}
// check for error conditions:
+ {char* sdl_error = SDL_GetError();
if (sdl_error[0] != '\0') {fprintf(stderr, "SDL ERROR: \"%s\"\n", sdl_error);
SDL_ClearError();
}
+ }
// update fps:
if (tNow >= tLastFps + 5000) { printf("%i frames in %f secs, %f frames per second.\n", frames, (float)(tNow - tLastFps) * 0.001f,@@ -297,12 +313,13 @@
// cleanup:
ZB_close(frameBuffer);
glClose();
+ if(!noSDL)
if (SDL_WasInit(SDL_INIT_VIDEO))
SDL_QuitSubSystem(SDL_INIT_VIDEO);
#ifdef PLAY_MUSIC
- mhalt();
- Mix_FreeMusic(myTrack);
- acleanup();
+ if(!noSDL)mhalt();
+ if(!noSDL)Mix_FreeMusic(myTrack);
+ if(!noSDL)acleanup();
#endif
SDL_Quit();
return 0;
--- a/SDL_Examples/model.c
+++ b/SDL_Examples/model.c
@@ -26,7 +26,7 @@
#endif
#include <SDL/SDL.h>
#include <time.h>
-
+int noSDL = 0;
#ifndef M_PI
#define M_PI 3.14159265
#endif
@@ -318,7 +318,11 @@
break;
}
- ZBuffer* frameBuffer = ZB_open(winSizeX, winSizeY, mode, 0);
+ ZBuffer* frameBuffer = NULL;
+ if(TGL_FEATURE_RENDER_BITS == 32)
+ frameBuffer = ZB_open(winSizeX, winSizeY, ZB_MODE_RGBA, 0);
+ else
+ frameBuffer = ZB_open(winSizeX, winSizeY, ZB_MODE_5R6G5B, 0);
glInit(frameBuffer);
srand(time(NULL));
--- a/SDL_Examples/texture.c
+++ b/SDL_Examples/texture.c
@@ -24,6 +24,7 @@
#define STB_IMAGE_IMPLEMENTATION
#include "include/stb_image.h"
#include <SDL/SDL.h>
+int noSDL = 0;
#ifndef M_PI
#define M_PI 3.14159265
@@ -190,7 +191,11 @@
return 1;
break;
}
- ZBuffer* frameBuffer = ZB_open(winSizeX, winSizeY, mode, 0);
+ ZBuffer* frameBuffer = NULL;
+ if(TGL_FEATURE_RENDER_BITS == 32)
+ frameBuffer = ZB_open(winSizeX, winSizeY, ZB_MODE_RGBA, 0);
+ else
+ frameBuffer = ZB_open(winSizeX, winSizeY, ZB_MODE_5R6G5B, 0);
glInit(frameBuffer);
// initialize GL:
--- a/include/zfeatures.h
+++ b/include/zfeatures.h
@@ -5,7 +5,7 @@
//Enables setting the error flags when there's an error, so you can check it with glGetError
//Disabling this has slight performance gains.
-#define TGL_FEATURE_ERROR_CHECK 0
+#define TGL_FEATURE_ERROR_CHECK 1
//Strict out-of-memory checking. All OpenGL function calls are invalidated (ALL OF THEM) if a GL_OUT_OF_MEMORY error occurs.
//The checks slow down the renderer so it is not recommended , but
//it's part of the GL spec and it was relatively easy to add so I added it.
--- a/src/list.c
+++ b/src/list.c
@@ -183,7 +183,7 @@
#if TGL_FEATURE_ERROR_CHECK == 1
if (l == NULL) {gl_fatal_error("Bad list op, not defined");}#else
- if(l == NULL)return; //MARK <COST>
+ //if(l == NULL)return; //MARK <COST>
#endif
p = l->first_op_buffer->ops;
@@ -216,8 +216,8 @@
#include "error_check.h"
#else
- assert(mode == GL_COMPILE || mode == GL_COMPILE_AND_EXECUTE); //MARK <COST>
- assert(c->compile_flag == 0); //MARK <COST>
+ //assert(mode == GL_COMPILE || mode == GL_COMPILE_AND_EXECUTE); //MARK <COST>
+ //assert(c->compile_flag == 0); //MARK <COST>
#endif
l = find_list(c, list);
if (l != NULL)
@@ -247,7 +247,7 @@
#define ERROR_FLAG GL_INVALID_OPERATION
#include "error_check.h"
#else
- assert(c->compile_flag == 1); //MARK <COST>
+ //assert(c->compile_flag == 1); //MARK <COST>
#endif
/* end of list */
p[0].op = OP_EndList;