Pixellight

Source/scrollrt.cpp

@@ -894,7 +894,15 @@ extern void DrawControllerModifierHints();
  */
 void DrawView(int StartX, int StartY)
 {
+#ifdef PIXEL_LIGHT
+	gpBuffer = (BYTE *)pal_surface->pixels;
+	memset(gpBuffer, 0, sizeof(gpBuffer));
+#endif
 	DrawGame(StartX, StartY);
+#ifdef PIXEL_LIGHT
+	gpBuffer = (BYTE *)ui_surface->pixels;
+	memset(gpBuffer, 0, sizeof(gpBuffer));
+#endif
 	if (automapflag) {
 		DrawAutomap();
 	}

Source/scrollrt.h

@@ -40,4 +40,8 @@ void DrawAndBlit();
 extern char *szMonModeAssert[18];
 extern char *szPlrModeAssert[12];
 
+#ifdef PIXEL_LIGHT
+extern SDL_Surface *pal_surface;
+extern SDL_Surface *ui_surface;
+#endif
 #endif /* __SCROLLRT_H__ */

SourceX/dx.cpp

@@ -28,6 +28,12 @@ SDL_Surface *renderer_texture_surface = nullptr;
 /** 8-bit surface wrapper around #gpBuffer */
 SDL_Surface *pal_surface;
 
+#ifdef PIXEL_LIGHT
+SDL_Surface *ui_surface;
+SDL_Surface *ui_surface_24;
+SDL_Texture *ui_texture;
+#endif
+
 static void dx_create_back_buffer()
 {
 	pal_surface = SDL_CreateRGBSurfaceWithFormat(0, BUFFER_WIDTH, BUFFER_HEIGHT, 8, SDL_PIXELFORMAT_INDEX8);
@@ -216,10 +222,6 @@ void LimitFrameRate()
 }
 
 #ifdef PIXEL_LIGHT
-SDL_Surface *lightSurf;
-SDL_Texture *lightTex;
-
-SDL_Surface *fpsVision;
 SDL_Texture *fpsTex;
 
 SDL_Surface *predrawnEllipses[20];
@@ -294,7 +296,6 @@ void drawRadius(int lid, int row, int col, int radius, int color)
 	}
 	sx += xoff;
 	sy += yoff;
-	SDL_Rect rect;
 
 	int srcx = width / 2;
 	int srcy = height / 2;
@@ -303,6 +304,7 @@ void drawRadius(int lid, int row, int col, int radius, int color)
 	int offsetx = targetx - srcx;
 	int offsety = targety - srcy;
 
+	SDL_Rect rect;
 	rect.x = offsetx;
 	rect.y = offsety;
 	rect.w = width;
@@ -362,7 +364,7 @@ void predrawEllipse(int radius)
 void prepareFPS(){
 	if (!frameflag)
 		return;
-	fpsVision = SDL_CreateRGBSurfaceWithFormat(0, 50, 50, SDL_BITSPERPIXEL(format), format);
+	SDL_Surface *fpsVision = SDL_CreateRGBSurfaceWithFormat(0, 50, 50, SDL_BITSPERPIXEL(format), format);
 	if (fpsVision == NULL)
 		ErrSdl();
 	if(SDL_SetSurfaceBlendMode(fpsVision, SDL_BLENDMODE_ADD) < 0)
@@ -372,6 +374,7 @@ void prepareFPS(){
 	fpsTex = SDL_CreateTextureFromSurface(renderer, fpsVision);
 	if (fpsTex == NULL)
 		ErrSdl();
+	SDL_FreeSurface(fpsVision);
 	if(SDL_SetTextureBlendMode(fpsTex, SDL_BLENDMODE_ADD) < 0)
 		ErrSdl();
 }
@@ -399,9 +402,6 @@ void prepareLight()
 	SDL_RenderGetLogicalSize(renderer, &width, &height);
 	if (SDL_QueryTexture(texture, &format, nullptr, nullptr, nullptr) < 0)
 		ErrSdl();
-	lightSurf = SDL_CreateRGBSurfaceWithFormat(0, width, height, SDL_BITSPERPIXEL(format), format);
-	if (lightSurf == NULL)
-		ErrSdl();
 	for (int i = 1; i <= 15; i++) {
 		predrawnEllipses[i] = SDL_CreateRGBSurfaceWithFormat(0, width, height, SDL_BITSPERPIXEL(format), format);
 		if (predrawnEllipses[i] == NULL)
@@ -417,6 +417,24 @@ void prepareLight()
 		if (SDL_SetTextureBlendMode(ellipsesTextures[i], SDL_BLENDMODE_ADD) < 0)
 			ErrSdl();
 	}
+
+	ui_surface = SDL_CreateRGBSurfaceWithFormat(0, BUFFER_WIDTH, BUFFER_HEIGHT, 8, SDL_PIXELFORMAT_INDEX8);
+	//ui_surface = SDL_CreateRGBSurfaceWithFormat(0, width, height, SDL_BITSPERPIXEL(format), format);
+	if (ui_surface == NULL)
+		ErrSdl();
+	if (SDLC_SetSurfaceColors(ui_surface, palette) < 0)
+		ErrSdl();
+	if (SDL_FillRect(ui_surface, NULL, SDL_MapRGB(ui_surface->format, 0, 125, 0)) < 0)
+		ErrSdl();
+
+	ui_surface_24 = SDL_CreateRGBSurfaceWithFormat(0, width, height, SDL_BITSPERPIXEL(format), format);
+	if (ui_surface_24 == NULL)
+		ErrSdl();
+	ui_texture = SDL_CreateTexture(renderer, SDL_PIXELFORMAT_RGB888, SDL_TEXTUREACCESS_STREAMING, width, height);
+	if (ui_texture == NULL)
+		ErrSdl();
+	if (SDL_SetTextureBlendMode(ui_texture, SDL_BLENDMODE_ADD) < 0)
+		ErrSdl();
 }
 
 #endif
@@ -439,11 +457,6 @@ void RenderPresent()
 				prepareLight();
 				prepareFPS();
 			}
-			if(SDL_FillRect(lightSurf, NULL, SDL_MapRGB(lightSurf->format, 0, 0, 0)) < 0)
-				ErrSdl();
-			lightTex = SDL_CreateTextureFromSurface(renderer, lightSurf);
-			if (lightTex == NULL)
-				ErrSdl();
 			SDL_BlendMode bm;
 			switch (testvar5) {
 			case 0:
@@ -459,8 +472,6 @@ void RenderPresent()
 				bm = SDL_BLENDMODE_MOD;
 				break;
 			}
-			if(SDL_SetTextureBlendMode(lightTex, bm) < 0)
-				ErrSdl();
 			if(SDL_SetTextureBlendMode(texture, bm) < 0)
 				ErrSdl();
 		} else {
@@ -484,17 +495,33 @@ void RenderPresent()
 
 #ifdef PIXEL_LIGHT
 		if (testvar3 != 0 && leveltype != DTYPE_TOWN) {
-			if (SDL_RenderCopy(renderer, lightTex, NULL, NULL) < 0)
-				ErrSdl();
 			lightLoop();
 			showFPS();
-			SDL_DestroyTexture(lightTex);
 		}
 
 #endif
 		if (SDL_RenderCopy(renderer, texture, NULL, NULL) <= -1) {
 			ErrSdl();
 		}
+#ifdef PIXEL_LIGHT
+		if (testvar3 != 0 && leveltype != DTYPE_TOWN) {
+		//SDL_Surface *tmp = SDL_ConvertSurface(ui_surface, GetOutputSurface()->format, 0);
+		//if (tmp ==  NULL)
+		//	ErrSdl();
+		 SDL_Rect rect;
+			rect.x = 0;
+			rect.y = 0;
+			rect.w = 250;
+			rect.h = 250;
+		if(SDL_BlitSurface(ui_surface, NULL, ui_surface_24, &rect) < 0)
+			ErrSdl();
+		if (SDL_UpdateTexture(ui_texture, NULL, ui_surface_24->pixels, ui_surface_24->pitch) < 0)
+			ErrSdl();
+		//SDL_FreeSurface(tmp);
+		if (SDL_RenderCopy(renderer, ui_texture, NULL, NULL) < 0)
+			ErrSdl();
+		}
+#endif
 		SDL_RenderPresent(renderer);
 	} else {
 		if (SDL_UpdateWindowSurface(window) <= -1) {