Compare commits
43
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f029a2b7d8 | ||
|
|
32bd5a02ec | ||
|
|
546fae5110 | ||
|
|
ee4c060cc8 | ||
|
|
ebd5b86e87 | ||
|
|
9321036049 | ||
|
|
12f43ae504 | ||
|
|
cfc94c0f9e | ||
|
|
3385df4c7e | ||
|
|
561f871e61 | ||
|
|
bffafa0540 | ||
|
|
9a100439df | ||
|
|
3b37f85024 | ||
|
|
27a65ef973 | ||
|
|
ffa9b2fa9a | ||
|
|
ab9e0f923e | ||
|
|
8bf3953b4a | ||
|
|
44ef42cf84 | ||
|
|
746035bfea | ||
|
|
70bc9879b3 | ||
|
|
0e6a794a84 | ||
|
|
4eccf40a0a | ||
|
|
e3fd46297a | ||
|
|
4c2e119385 | ||
|
|
229a6a161e | ||
|
|
1b2e4a1acc | ||
|
|
2e6d49fcd6 | ||
|
|
7a8c66781b | ||
|
|
c877226bfe | ||
|
|
ac3c8b1d25 | ||
|
|
feeba45b0d | ||
|
|
06f3d2c91b | ||
|
|
332fadc823 | ||
|
|
39dc1b85e3 | ||
|
|
5b2413444f | ||
|
|
7855b2ed95 | ||
|
|
caebe62ddb | ||
|
|
9de285caac | ||
|
|
9bb4420ad3 | ||
|
|
8dc3d870a1 | ||
|
|
158546bd73 | ||
|
|
b89a3f1017 | ||
|
|
f2e355a5a8 |
No files matched your search
@@ -1043,6 +1043,8 @@ void D_RegisterClientCommands(void)
|
|||||||
|
|
||||||
CV_RegisterVar(&cv_rumble[i]);
|
CV_RegisterVar(&cv_rumble[i]);
|
||||||
CV_RegisterVar(&cv_rumble_strength[i]);
|
CV_RegisterVar(&cv_rumble_strength[i]);
|
||||||
|
|
||||||
|
CV_RegisterVar(&cv_rumble_wallbonk[i]);
|
||||||
CV_RegisterVar(&cv_rumble_spinout[i]);
|
CV_RegisterVar(&cv_rumble_spinout[i]);
|
||||||
CV_RegisterVar(&cv_rumble_sneakerboost[i]);
|
CV_RegisterVar(&cv_rumble_sneakerboost[i]);
|
||||||
CV_RegisterVar(&cv_rumble_offroad[i]);
|
CV_RegisterVar(&cv_rumble_offroad[i]);
|
||||||
|
|||||||
+39
-62
@@ -17,14 +17,9 @@
|
|||||||
#include "g_game.h"
|
#include "g_game.h"
|
||||||
#include "keys.h"
|
#include "keys.h"
|
||||||
#include "hu_stuff.h" // need HUFONT start & end
|
#include "hu_stuff.h" // need HUFONT start & end
|
||||||
#include "d_net.h"
|
|
||||||
#include "console.h"
|
#include "console.h"
|
||||||
|
|
||||||
#include "m_menu.h"
|
|
||||||
|
|
||||||
#include "i_system.h"
|
#include "i_system.h"
|
||||||
#include "i_video.h"
|
|
||||||
#include "r_draw.h"
|
|
||||||
#include "v_video.h"
|
#include "v_video.h"
|
||||||
|
|
||||||
#define MAXMOUSESENSITIVITY 100 // sensitivity steps
|
#define MAXMOUSESENSITIVITY 100 // sensitivity steps
|
||||||
@@ -36,10 +31,11 @@ static CV_PossibleValue_t turnsmooth_cons_t[] = {{2, "Slow"}, {1, "Fast"}, {0, "
|
|||||||
// mouse values are used once
|
// mouse values are used once
|
||||||
consvar_t cv_mousexsens = {"mousexsens", "20", CV_SAVE, mousesens_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_mousexsens = {"mousexsens", "20", CV_SAVE, mousesens_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
consvar_t cv_mouseysens = {"mouseysens", "20", CV_SAVE, mousesens_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_mouseysens = {"mouseysens", "20", CV_SAVE, mousesens_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
consvar_t cv_controlperkey = {"controlperkey", "One", CV_SAVE, onecontrolperkey_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_controlperkey = {"controlperkey", "One", CV_SAVE, onecontrolperkey_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
consvar_t cv_turnsmooth[MAXSPLITSCREENPLAYERS] = {
|
consvar_t cv_turnsmooth[MAXSPLITSCREENPLAYERS] = {
|
||||||
{"turnsmoothing", "Slow", CV_SAVE, turnsmooth_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
|
{"turnsmoothing", "Slow", CV_SAVE, turnsmooth_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
|
||||||
{"turnsmoothing2", "Slow", CV_SAVE, turnsmooth_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
|
{"turnsmoothing2", "Slow", CV_SAVE, turnsmooth_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
|
||||||
{"turnsmoothing3", "Slow", CV_SAVE, turnsmooth_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
|
{"turnsmoothing3", "Slow", CV_SAVE, turnsmooth_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
|
||||||
{"turnsmoothing4", "Slow", CV_SAVE, turnsmooth_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}
|
{"turnsmoothing4", "Slow", CV_SAVE, turnsmooth_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}
|
||||||
@@ -81,6 +77,7 @@ consvar_t cv_rumble_##type [MAXSPLITSCREENPLAYERS] = {\
|
|||||||
{"rumble4_" #type, "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}\
|
{"rumble4_" #type, "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}\
|
||||||
};
|
};
|
||||||
|
|
||||||
|
IMPL_RUMBLE_TYPE(wallbonk);
|
||||||
IMPL_RUMBLE_TYPE(spinout);
|
IMPL_RUMBLE_TYPE(spinout);
|
||||||
IMPL_RUMBLE_TYPE(sneakerboost);
|
IMPL_RUMBLE_TYPE(sneakerboost);
|
||||||
IMPL_RUMBLE_TYPE(offroad);
|
IMPL_RUMBLE_TYPE(offroad);
|
||||||
@@ -89,7 +86,6 @@ IMPL_RUMBLE_TYPE(stairjank);
|
|||||||
IMPL_RUMBLE_TYPE(brakedrift);
|
IMPL_RUMBLE_TYPE(brakedrift);
|
||||||
IMPL_RUMBLE_TYPE(driftcharge);
|
IMPL_RUMBLE_TYPE(driftcharge);
|
||||||
|
|
||||||
|
|
||||||
static CV_PossibleValue_t gamepadled_cons_t[] = {{0, "Off"}, {1, "Skincolor"}, {2, "Mobjcolor"}, {0, NULL}};
|
static CV_PossibleValue_t gamepadled_cons_t[] = {{0, "Off"}, {1, "Skincolor"}, {2, "Mobjcolor"}, {0, NULL}};
|
||||||
consvar_t cv_gamepadled[MAXSPLITSCREENPLAYERS] = {
|
consvar_t cv_gamepadled[MAXSPLITSCREENPLAYERS] = {
|
||||||
{"gamepadled", "Skincolor", CV_SAVE|CV_CALL|CV_NOINIT, gamepadled_cons_t, led_off_handle, 0, NULL, NULL, 0, 0, NULL},
|
{"gamepadled", "Skincolor", CV_SAVE|CV_CALL|CV_NOINIT, gamepadled_cons_t, led_off_handle, 0, NULL, NULL, 0, 0, NULL},
|
||||||
@@ -195,7 +191,6 @@ void G_MapEventsToControls(event_t *ev)
|
|||||||
{
|
{
|
||||||
CONS_Debug(DBG_GAMELOGIC, "Bad downkey input %d\n",ev->data1);
|
CONS_Debug(DBG_GAMELOGIC, "Bad downkey input %d\n",ev->data1);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
break;
|
break;
|
||||||
|
|
||||||
@@ -951,16 +946,15 @@ void G_SetPlayerGamepadIndicatorColor(INT32 playernum, UINT8 color)
|
|||||||
|
|
||||||
I_Assert(playernum >= 0 && playernum < MAXSPLITSCREENPLAYERS);
|
I_Assert(playernum >= 0 && playernum < MAXSPLITSCREENPLAYERS);
|
||||||
|
|
||||||
if (cv_gamepadled[playernum].value == 0 || (window_notinfocus && cv_gamepadledifunfocused.value == 0)
|
if (cv_gamepadled[playernum].value == 0 ||
|
||||||
|| color >= MAXTRANSLATIONS)
|
(window_notinfocus && cv_gamepadledifunfocused.value == 0) ||
|
||||||
|
color >= MAXTRANSLATIONS)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!I_GamepadHasLED(playernum))
|
if (!I_GamepadHasLED(playernum))
|
||||||
{
|
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
|
|
||||||
// so we can override this
|
// so we can override this
|
||||||
skincolor = color ? color : G_GetSkinColorForGamepad(playernum);
|
skincolor = color ? color : G_GetSkinColorForGamepad(playernum);
|
||||||
@@ -990,29 +984,21 @@ void G_DeviceLEDTick(void)
|
|||||||
UINT8 i, newcolor;
|
UINT8 i, newcolor;
|
||||||
|
|
||||||
if (numcontrollers == 0)
|
if (numcontrollers == 0)
|
||||||
{
|
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
|
|
||||||
for (i = 0; i <= splitscreen; i++)
|
for (i = 0; i <= splitscreen; i++)
|
||||||
{
|
{
|
||||||
if (!cv_usejoystick[i].value || !cv_gamepadled[i].value)
|
if (!cv_usejoystick[i].value || !cv_gamepadled[i].value)
|
||||||
{
|
|
||||||
continue;
|
continue;
|
||||||
}
|
|
||||||
|
|
||||||
// does not have a configurable led! :c
|
// does not have a configurable led! :c
|
||||||
if (!I_GamepadHasLED(i))
|
if (!I_GamepadHasLED(i))
|
||||||
{
|
|
||||||
continue;
|
continue;
|
||||||
}
|
|
||||||
|
|
||||||
newcolor = G_GetSkinColorForGamepad(i);
|
newcolor = G_GetSkinColorForGamepad(i);
|
||||||
|
|
||||||
if (curcolor[i] == newcolor) // dont update if same colour
|
if (curcolor[i] == newcolor) // dont update if same colour
|
||||||
{
|
|
||||||
continue;
|
continue;
|
||||||
}
|
|
||||||
|
|
||||||
G_SetPlayerGamepadIndicatorColor(i, newcolor);
|
G_SetPlayerGamepadIndicatorColor(i, newcolor);
|
||||||
curcolor[i] = newcolor;
|
curcolor[i] = newcolor;
|
||||||
@@ -1046,9 +1032,7 @@ void G_PlayerDeviceRumble(INT32 playernum, UINT16 low_strength, UINT16 high_stre
|
|||||||
I_Assert(playernum >= 0 && playernum < MAXSPLITSCREENPLAYERS);
|
I_Assert(playernum >= 0 && playernum < MAXSPLITSCREENPLAYERS);
|
||||||
|
|
||||||
if (cv_rumble[playernum].value == 0 || (window_notinfocus && cv_rumbleifunfocused.value == 0))
|
if (cv_rumble[playernum].value == 0 || (window_notinfocus && cv_rumbleifunfocused.value == 0))
|
||||||
{
|
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
|
|
||||||
// doesent need to be super precise
|
// doesent need to be super precise
|
||||||
// but ensure this is within range (0-65535)
|
// but ensure this is within range (0-65535)
|
||||||
@@ -1077,46 +1061,34 @@ void G_DeviceRumbleTick(void)
|
|||||||
UINT8 i;
|
UINT8 i;
|
||||||
|
|
||||||
if (dedicated || numcontrollers == 0 || gamestate != GS_LEVEL || demo.playback)
|
if (dedicated || numcontrollers == 0 || gamestate != GS_LEVEL || demo.playback)
|
||||||
{
|
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
|
|
||||||
for (i = 0; i <= splitscreen; i++)
|
for (i = 0; i <= splitscreen; i++)
|
||||||
{
|
{
|
||||||
if (!cv_usejoystick[i].value || !cv_rumble[i].value)
|
if (!cv_usejoystick[i].value || !cv_rumble[i].value)
|
||||||
{
|
|
||||||
continue;
|
continue;
|
||||||
}
|
|
||||||
|
|
||||||
// does not support rumble! :c
|
// does not support rumble! :c
|
||||||
if (!I_GamepadHasRumble(i))
|
if (!I_GamepadHasRumble(i))
|
||||||
{
|
|
||||||
continue;
|
continue;
|
||||||
}
|
|
||||||
|
|
||||||
if (camera[i].freecam)
|
if (camera[i].freecam)
|
||||||
{
|
|
||||||
continue;
|
continue;
|
||||||
}
|
|
||||||
|
|
||||||
// SDL rumble strength goes from a range or 0-65535 respectively
|
// SDL rumble strength goes from a range or 0-65535 respectively
|
||||||
// the higher, the stronger it is
|
// the higher, the stronger it is
|
||||||
UINT16 low = 0, high = 0;
|
UINT16 low = 0, high = 0;
|
||||||
// for how long the action should rumble, in ms
|
// for how long the action should rumble, in ms
|
||||||
UINT16 lenght = 57; // 57ms is a short pulse, matches super well with this updating once per tic
|
UINT16 length = 57; // 57ms is a short pulse, matches super well with this updating once per tic
|
||||||
|
|
||||||
const player_t *player = P_GetLocalPlayerForNum(i);
|
const player_t *player = P_GetLocalPlayerForNum(i);
|
||||||
|
|
||||||
if (!player)
|
if (!player)
|
||||||
{
|
|
||||||
continue;
|
continue;
|
||||||
}
|
|
||||||
|
|
||||||
// allow lua to do some crap for spectators
|
// allow lua to do some crap for spectators
|
||||||
if (player->spectator || !player->mo)
|
if (player->spectator || !player->mo)
|
||||||
{
|
|
||||||
continue;
|
continue;
|
||||||
}
|
|
||||||
|
|
||||||
// reset the rumble if you exit or are ded lel
|
// reset the rumble if you exit or are ded lel
|
||||||
if (player->exiting ||
|
if (player->exiting ||
|
||||||
@@ -1127,21 +1099,28 @@ void G_DeviceRumbleTick(void)
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (cv_rumble_spinout[i].value
|
if (cv_rumble_wallbonk[i].value &&
|
||||||
&& player->kartstuff[k_spinouttimer])
|
(player->mo->eflags & MFE_JUSTBOUNCEDWALL))
|
||||||
|
{
|
||||||
|
high = RUMBLE_STRONG;
|
||||||
|
low = RUMBLE_MODERATE;
|
||||||
|
}
|
||||||
|
else if (cv_rumble_spinout[i].value &&
|
||||||
|
player->kartstuff[k_spinouttimer])
|
||||||
{
|
{
|
||||||
//low = high = FRACUNIT / 6;
|
//low = high = FRACUNIT / 6;
|
||||||
low = high = FixedMul((RUMBLE_VERYSTRONG), (FixedDiv(player->kartstuff[k_spinouttimer], (3*TICRATE / 2)))); // try do some some kinda fadeout, 3*TICRATE / 2 is the "default" spinout time
|
// try do some some kinda fadeout, 3*TICRATE / 2 is the "default" spinout time
|
||||||
|
low = high = FixedMul(RUMBLE_VERYSTRONG, FixedDiv(player->kartstuff[k_spinouttimer], (3*TICRATE / 2)));
|
||||||
}
|
}
|
||||||
else if (cv_rumble_sneakerboost[i].value
|
else if (cv_rumble_sneakerboost[i].value &&
|
||||||
&& (player->kartstuff[k_sneakertimer] > (sneakertime-(TICRATE/2))))
|
(player->kartstuff[k_sneakertimer] > (sneakertime-(TICRATE/2))))
|
||||||
{
|
{
|
||||||
low = high = RUMBLE_STRONG;
|
low = high = RUMBLE_STRONG;
|
||||||
}
|
}
|
||||||
else if (cv_rumble_offroad[i].value
|
else if (cv_rumble_offroad[i].value &&
|
||||||
&& (player->kartstuff[k_offroad])
|
(player->kartstuff[k_offroad]) &&
|
||||||
&& (player->speed != 0)
|
(player->speed != 0) &&
|
||||||
&& P_IsObjectOnGround(player->mo))
|
P_IsObjectOnGround(player->mo))
|
||||||
{
|
{
|
||||||
// weaken this depending on if you got hyu or invinc
|
// weaken this depending on if you got hyu or invinc
|
||||||
if (player->kartstuff[k_hyudorotimer])
|
if (player->kartstuff[k_hyudorotimer])
|
||||||
@@ -1157,50 +1136,48 @@ void G_DeviceRumbleTick(void)
|
|||||||
low = high = RUMBLE_MODERATE;
|
low = high = RUMBLE_MODERATE;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (cv_rumble_bananadrag[i].value
|
else if (cv_rumble_bananadrag[i].value &&
|
||||||
&& (player->kartstuff[k_bananadrag] > TICRATE)
|
(player->kartstuff[k_bananadrag] > TICRATE) &&
|
||||||
&& (player->speed != 0)
|
(player->speed != 0) &&
|
||||||
&& P_IsObjectOnGround(player->mo))
|
P_IsObjectOnGround(player->mo))
|
||||||
{
|
{
|
||||||
if (leveltime & 1) // this is actually funny lel
|
if (leveltime & 1) // this is actually funny lel
|
||||||
high = RUMBLE_MODERATE;
|
high = RUMBLE_MODERATE;
|
||||||
}
|
}
|
||||||
else if (cv_rumble_stairjank[i].value
|
else if (cv_rumble_stairjank[i].value &&
|
||||||
&& (player->stairjank > 8)
|
(player->stairjank > 8) &&
|
||||||
&& (player->speed != 0)
|
(player->speed != 0) &&
|
||||||
&& P_IsObjectOnGround(player->mo))
|
P_IsObjectOnGround(player->mo))
|
||||||
{
|
{
|
||||||
low = high = RUMBLE_VERYWEAK;
|
low = high = RUMBLE_VERYWEAK;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (cv_rumble_brakedrift[i].value
|
if (cv_rumble_brakedrift[i].value &&
|
||||||
&& player->kartstuff[k_brakedrift])
|
player->kartstuff[k_brakedrift])
|
||||||
{
|
{
|
||||||
high = CLAMP((high + RUMBLE_VERYWEAK), 0, UINT16_MAX);
|
high = CLAMP((high + RUMBLE_VERYWEAK), 0, UINT16_MAX);
|
||||||
}
|
}
|
||||||
|
|
||||||
// pulse when gettin new driftlevel
|
// pulse when gettin new driftlevel
|
||||||
// let this come last
|
// let this come last
|
||||||
if (cv_rumble_driftcharge[i].value
|
if (cv_rumble_driftcharge[i].value &&
|
||||||
&& player->kartstuff[k_driftcharge]
|
player->kartstuff[k_driftcharge] &&
|
||||||
&& player->driftlevel)
|
player->driftlevel)
|
||||||
{
|
{
|
||||||
high = CLAMP((high + RUMBLE_VERYWEAK), 0, UINT16_MAX);
|
high = CLAMP((high + RUMBLE_VERYWEAK), 0, UINT16_MAX);
|
||||||
|
|
||||||
// make it rumble slightly longer the higher your driftlevel!
|
// make it rumble slightly longer the higher your driftlevel!
|
||||||
if (player->driftlevel == 2)
|
if (player->driftlevel == 2)
|
||||||
lenght = 114;
|
length = 114;
|
||||||
else if (player->driftlevel == 3)
|
else if (player->driftlevel == 3)
|
||||||
lenght = 174;
|
length = 174;
|
||||||
}
|
}
|
||||||
|
|
||||||
// hack alert! i just dont want this thing constantly resetting the rumble lol
|
// hack alert! i just dont want this thing constantly resetting the rumble lol
|
||||||
if (low == 0 && high == 0)
|
if (low == 0 && high == 0)
|
||||||
{
|
|
||||||
continue;
|
continue;
|
||||||
}
|
|
||||||
|
|
||||||
G_PlayerDeviceRumble(i, low, high, lenght);
|
G_PlayerDeviceRumble(i, low, high, length);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -118,6 +118,8 @@ extern consvar_t cv_gamepadled[MAXSPLITSCREENPLAYERS];
|
|||||||
|
|
||||||
extern consvar_t cv_rumble[MAXSPLITSCREENPLAYERS];
|
extern consvar_t cv_rumble[MAXSPLITSCREENPLAYERS];
|
||||||
extern consvar_t cv_rumble_strength[MAXSPLITSCREENPLAYERS];
|
extern consvar_t cv_rumble_strength[MAXSPLITSCREENPLAYERS];
|
||||||
|
// rumble types
|
||||||
|
extern consvar_t cv_rumble_wallbonk[MAXSPLITSCREENPLAYERS];
|
||||||
extern consvar_t cv_rumble_spinout[MAXSPLITSCREENPLAYERS];
|
extern consvar_t cv_rumble_spinout[MAXSPLITSCREENPLAYERS];
|
||||||
extern consvar_t cv_rumble_sneakerboost[MAXSPLITSCREENPLAYERS];
|
extern consvar_t cv_rumble_sneakerboost[MAXSPLITSCREENPLAYERS];
|
||||||
extern consvar_t cv_rumble_offroad[MAXSPLITSCREENPLAYERS];
|
extern consvar_t cv_rumble_offroad[MAXSPLITSCREENPLAYERS];
|
||||||
|
|||||||
+15
-18
@@ -54,10 +54,6 @@ typedef struct {
|
|||||||
// if no portals are found, the portal scanning phase can be skipped while rendering, saving a bit of time.
|
// if no portals are found, the portal scanning phase can be skipped while rendering, saving a bit of time.
|
||||||
boolean gl_maphasportals = false;
|
boolean gl_maphasportals = false;
|
||||||
|
|
||||||
// Determine on mapload if current map has any Horizonlines present
|
|
||||||
// avoids doing a bunch of work during rendering
|
|
||||||
boolean gl_maphashorizonlines = false;
|
|
||||||
|
|
||||||
// ==========================================================================
|
// ==========================================================================
|
||||||
// FLOOR & CEILING CONVEX POLYS GENERATION
|
// FLOOR & CEILING CONVEX POLYS GENERATION
|
||||||
// ==========================================================================
|
// ==========================================================================
|
||||||
@@ -405,7 +401,7 @@ static void SplitPoly (fdivline_t *dlnp, // splitting parametric line
|
|||||||
}
|
}
|
||||||
|
|
||||||
// checks if any line is a portal or horizonline, for optimization
|
// checks if any line is a portal or horizonline, for optimization
|
||||||
static inline void CheckForPortalsAndHorizonLines(boolean firstside, const line_t *line)
|
static inline void CheckForPortalsAndHorizonLines(boolean firstside, const line_t *line, subsector_t *sub)
|
||||||
{
|
{
|
||||||
// portal check
|
// portal check
|
||||||
if (!gl_maphasportals && firstside && line->special == PORTALSPECIAL)
|
if (!gl_maphasportals && firstside && line->special == PORTALSPECIAL)
|
||||||
@@ -421,8 +417,8 @@ static inline void CheckForPortalsAndHorizonLines(boolean firstside, const line_
|
|||||||
}
|
}
|
||||||
|
|
||||||
// horizonline check
|
// horizonline check
|
||||||
if (!gl_maphashorizonlines && line->special == HORIZONSPECIAL)
|
if (line->special == HORIZONSPECIAL)
|
||||||
gl_maphashorizonlines = true;
|
sub->hashorizon = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Use each seg of the poly as a partition line, keep only the
|
// Use each seg of the poly as a partition line, keep only the
|
||||||
@@ -435,7 +431,7 @@ static inline void CheckForPortalsAndHorizonLines(boolean firstside, const line_
|
|||||||
// segcount : number of seg in the array
|
// segcount : number of seg in the array
|
||||||
// Return frontpoly, which may be new or ptr to poly.
|
// Return frontpoly, which may be new or ptr to poly.
|
||||||
// Called from: HWR_SubsecPoly
|
// Called from: HWR_SubsecPoly
|
||||||
static poly_t *CutOutSubsecPoly(seg_t *lseg, INT32 segcount, poly_t *poly)
|
static poly_t *CutOutSubsecPoly(seg_t *lseg, INT32 segcount, poly_t *poly, subsector_t *sub)
|
||||||
{
|
{
|
||||||
INT32 i, j;
|
INT32 i, j;
|
||||||
poly_t* frontpoly = poly; // default, return same poly
|
poly_t* frontpoly = poly; // default, return same poly
|
||||||
@@ -447,10 +443,6 @@ static poly_t *CutOutSubsecPoly(seg_t *lseg, INT32 segcount, poly_t *poly)
|
|||||||
vertex_t *v1, *v2;
|
vertex_t *v1, *v2;
|
||||||
fdivline_t cutseg; // x, y, dx, dy as start of node_t struct
|
fdivline_t cutseg; // x, y, dx, dy as start of node_t struct
|
||||||
|
|
||||||
// empty poly? just save us some time then
|
|
||||||
if (poly->numpts <= 0)
|
|
||||||
return frontpoly;
|
|
||||||
|
|
||||||
// for each seg of the subsector
|
// for each seg of the subsector
|
||||||
for (; segcount--; lseg++)
|
for (; segcount--; lseg++)
|
||||||
{
|
{
|
||||||
@@ -460,7 +452,7 @@ static poly_t *CutOutSubsecPoly(seg_t *lseg, INT32 segcount, poly_t *poly)
|
|||||||
if (!line)
|
if (!line)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
CheckForPortalsAndHorizonLines(lseg->side == 0, line);
|
CheckForPortalsAndHorizonLines(lseg->side == 0, line, sub);
|
||||||
|
|
||||||
if (line->sidenum[1] != NO_INDEX)
|
if (line->sidenum[1] != NO_INDEX)
|
||||||
{
|
{
|
||||||
@@ -623,7 +615,7 @@ static inline void HWR_SubsecPoly(INT32 ssindex, poly_t *poly)
|
|||||||
|
|
||||||
if (poly)
|
if (poly)
|
||||||
{
|
{
|
||||||
poly = CutOutSubsecPoly(lseg, segcount, poly);
|
poly = CutOutSubsecPoly(lseg, segcount, poly, sub);
|
||||||
#ifdef DEBUG_HWBSP
|
#ifdef DEBUG_HWBSP
|
||||||
totalsubsecpolys++;
|
totalsubsecpolys++;
|
||||||
#endif
|
#endif
|
||||||
@@ -752,7 +744,7 @@ static void WalkBSPNode(INT32 bspnum, poly_t *poly, UINT16 *leafnode, fixed_t *b
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Recursively divide front space.
|
// Recursively divide front space.
|
||||||
if (LIKELY(frontpoly))
|
if (frontpoly)
|
||||||
{
|
{
|
||||||
WalkBSPNode(bsp->children[0], frontpoly, &bsp->children[0],bsp->bbox[0]);
|
WalkBSPNode(bsp->children[0], frontpoly, &bsp->children[0],bsp->bbox[0]);
|
||||||
|
|
||||||
@@ -879,7 +871,9 @@ static boolean PointInSeg(polyvertex_t *va, polyvertex_t *v1, polyvertex_t *v2)
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef DEBUG_HWBSP
|
||||||
static INT32 numsplitpoly;
|
static INT32 numsplitpoly;
|
||||||
|
#endif
|
||||||
|
|
||||||
static void SearchSegInBSP(INT32 bspnum, polyvertex_t *p, poly_t *poly)
|
static void SearchSegInBSP(INT32 bspnum, polyvertex_t *p, poly_t *poly)
|
||||||
{
|
{
|
||||||
@@ -918,8 +912,9 @@ static void SearchSegInBSP(INT32 bspnum, polyvertex_t *p, poly_t *poly)
|
|||||||
|
|
||||||
for (n = k+1; n < newpoly->numpts; n++)
|
for (n = k+1; n < newpoly->numpts; n++)
|
||||||
newpoly->pts[n] = q->pts[n-1];
|
newpoly->pts[n] = q->pts[n-1];
|
||||||
|
#ifdef DEBUG_HWBSP
|
||||||
numsplitpoly++;
|
numsplitpoly++;
|
||||||
|
#endif
|
||||||
extrasubsectors[bspnum].planepoly = newpoly;
|
extrasubsectors[bspnum].planepoly = newpoly;
|
||||||
HWR_FreePoly(q);
|
HWR_FreePoly(q);
|
||||||
return;
|
return;
|
||||||
@@ -965,7 +960,9 @@ static void SolveTProblem(void)
|
|||||||
I_FinishUpdate(); // page flip or blit buffer
|
I_FinishUpdate(); // page flip or blit buffer
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef DEBUG_HWBSP
|
||||||
numsplitpoly = 0;
|
numsplitpoly = 0;
|
||||||
|
#endif
|
||||||
|
|
||||||
for (ssnum = 0; ssnum < num_extra_subsector; ssnum++)
|
for (ssnum = 0; ssnum < num_extra_subsector; ssnum++)
|
||||||
{
|
{
|
||||||
@@ -1002,8 +999,8 @@ void HWR_CreatePlanePolygons(INT32 bspnum)
|
|||||||
I_FinishUpdate(); // page flip or blit buffer
|
I_FinishUpdate(); // page flip or blit buffer
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// reset the portal and horizonline flag
|
// reset the portal flag
|
||||||
gl_maphasportals = gl_maphashorizonlines = false;
|
gl_maphasportals = false;
|
||||||
|
|
||||||
// find min/max boundaries of map
|
// find min/max boundaries of map
|
||||||
#ifdef DEBUG_HWBSP
|
#ifdef DEBUG_HWBSP
|
||||||
|
|||||||
+275
-11
@@ -16,6 +16,7 @@
|
|||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
|
#include "../d_main.h"
|
||||||
#include "../doomstat.h"
|
#include "../doomstat.h"
|
||||||
#include "../doomdef.h"
|
#include "../doomdef.h"
|
||||||
|
|
||||||
@@ -120,7 +121,7 @@ ps_metric_t ps_hw_batchdrawtime = {};
|
|||||||
static void HWR_SplitWall(sector_t *sector, FOutVector *wallVerts, INT32 texnum, boolean noencore, FSurfaceInfo* Surf, INT32 cutflag, ffloor_t *pfloor, FBITFIELD polyflags);
|
static void HWR_SplitWall(sector_t *sector, FOutVector *wallVerts, INT32 texnum, boolean noencore, FSurfaceInfo* Surf, INT32 cutflag, ffloor_t *pfloor, FBITFIELD polyflags);
|
||||||
static void HWR_RenderWall(FOutVector *wallVerts, FSurfaceInfo *pSurf, FBITFIELD blend, boolean fogwall, INT32 lightlevel, extracolormap_t *wallcolormap);
|
static void HWR_RenderWall(FOutVector *wallVerts, FSurfaceInfo *pSurf, FBITFIELD blend, boolean fogwall, INT32 lightlevel, extracolormap_t *wallcolormap);
|
||||||
|
|
||||||
static void HWR_AddTransparentFloor(lumpnum_t lumpnum, extrasubsector_t *xsub, boolean isceiling, fixed_t fixedheight, INT32 lightlevel, INT32 alpha, sector_t *FOFSector, FBITFIELD blend, boolean fogplane, extracolormap_t *planecolormap);
|
static void HWR_AddTransparentFloor(lumpnum_t lumpnum, extrasubsector_t *xsub, boolean isceiling, fixed_t fixedheight, INT32 lightlevel, INT32 alpha, sector_t *FOFSector, FBITFIELD blend, boolean fogplane, extracolormap_t *planecolormap, subsector_t *subsector);
|
||||||
static void HWR_AddTransparentWall(FOutVector *wallVerts, FSurfaceInfo *pSurf, INT32 texnum, boolean noencore, FBITFIELD blend, boolean fogwall, INT32 lightlevel, extracolormap_t *wallcolormap);
|
static void HWR_AddTransparentWall(FOutVector *wallVerts, FSurfaceInfo *pSurf, INT32 texnum, boolean noencore, FBITFIELD blend, boolean fogwall, INT32 lightlevel, extracolormap_t *wallcolormap);
|
||||||
static void HWR_AddTransparentPolyobjectFloor(lumpnum_t lumpnum, polyobj_t *polysector, boolean isceiling, fixed_t fixedheight, INT32 lightlevel, INT32 alpha, sector_t *FOFSector, FBITFIELD blend, extracolormap_t *planecolormap);
|
static void HWR_AddTransparentPolyobjectFloor(lumpnum_t lumpnum, polyobj_t *polysector, boolean isceiling, fixed_t fixedheight, INT32 lightlevel, INT32 alpha, sector_t *FOFSector, FBITFIELD blend, extracolormap_t *planecolormap);
|
||||||
|
|
||||||
@@ -204,7 +205,8 @@ static CV_PossibleValue_t glpalettedepth_cons_t[] = {{16, "16 bits"}, {24, "24 b
|
|||||||
consvar_t cv_glscreentextures = {"gr_screentextures", "All", CV_CALL|CV_SAVE, glscreentextures_cons_t, CV_screentextures_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_glscreentextures = {"gr_screentextures", "All", CV_CALL|CV_SAVE, glscreentextures_cons_t, CV_screentextures_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
#ifdef USE_FBO_OGL
|
#ifdef USE_FBO_OGL
|
||||||
consvar_t cv_glframebuffer = {"gr_framebuffer", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, CV_glframebuffer_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
static CV_PossibleValue_t glframebuffer_cons_t[] = {{0, "Off"}, {1, "Downsample"}, {2, "Always"}, {0, NULL}};
|
||||||
|
consvar_t cv_glframebuffer = {"gr_framebuffer", "Off", CV_SAVE|CV_CALL, glframebuffer_cons_t, CV_glframebuffer_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
consvar_t cv_glmdls = {"gr_mdls", "Off", CV_SAVE|CV_CALL, CV_OnOff, M_UpdateOGLMenu, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_glmdls = {"gr_mdls", "Off", CV_SAVE|CV_CALL, CV_OnOff, M_UpdateOGLMenu, 0, NULL, NULL, 0, 0, NULL};
|
||||||
@@ -267,8 +269,8 @@ static void CV_glframebuffer_OnChange(void)
|
|||||||
// screen FBO needs screen textures currently
|
// screen FBO needs screen textures currently
|
||||||
if (cv_glframebuffer.value != 0 && ((cv_glscreentextures.value != 2) || !supportFBO))
|
if (cv_glframebuffer.value != 0 && ((cv_glscreentextures.value != 2) || !supportFBO))
|
||||||
CV_StealthSetValue(&cv_glframebuffer, 0); // dont recursively call this lul
|
CV_StealthSetValue(&cv_glframebuffer, 0); // dont recursively call this lul
|
||||||
|
if (loaded_config) // dont do this crap on startup, this is handled elsewhere
|
||||||
I_CheckDownSampleState(true);
|
I_CheckDownSampleState(true);
|
||||||
M_UpdateOGLMenu();
|
M_UpdateOGLMenu();
|
||||||
intermissionbginit = false;
|
intermissionbginit = false;
|
||||||
}
|
}
|
||||||
@@ -721,7 +723,7 @@ static void HWR_RenderPlane(subsector_t *subsector, extrasubsector_t *xsub, bool
|
|||||||
|
|
||||||
HWR_ProcessPolygon(&Surf, planeVerts, nrPlaneVerts, PolyFlags, shader, false);
|
HWR_ProcessPolygon(&Surf, planeVerts, nrPlaneVerts, PolyFlags, shader, false);
|
||||||
|
|
||||||
if (gl_maphashorizonlines && subsector && !FOFsector && cv_glhorizonlines.value)
|
if (subsector && subsector->hashorizon && cv_glhorizonlines.value)
|
||||||
{
|
{
|
||||||
// Horizon lines
|
// Horizon lines
|
||||||
FOutVector horizonpts[6];
|
FOutVector horizonpts[6];
|
||||||
@@ -806,6 +808,268 @@ static void HWR_RenderPlane(subsector_t *subsector, extrasubsector_t *xsub, bool
|
|||||||
#undef SETUP3DVERT
|
#undef SETUP3DVERT
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void HWR_RenderFOFHorizonPlane(subsector_t *subsector, extrasubsector_t *xsub, boolean isceiling, fixed_t fixedheight, FBITFIELD PolyFlags, INT32 lightlevel, lumpnum_t lumpnum, sector_t *FOFsector, UINT8 alpha, extracolormap_t *planecolormap)
|
||||||
|
{
|
||||||
|
FSurfaceInfo Surf = {};
|
||||||
|
polyvertex_t *pv;
|
||||||
|
pslope_t *slope = NULL;
|
||||||
|
INT32 shader = SHADER_NONE;
|
||||||
|
|
||||||
|
size_t nrPlaneVerts;
|
||||||
|
INT32 i;
|
||||||
|
|
||||||
|
float height; // constant y for all points on the convex flat polygon
|
||||||
|
static float flatxref = 0.0f, flatyref = 0.0f;
|
||||||
|
static float fflatsize = 64.0f;
|
||||||
|
static INT32 flatflag = 63;
|
||||||
|
size_t len;
|
||||||
|
|
||||||
|
float tempxsow, tempytow;
|
||||||
|
float scrollx = 0.0f, scrolly = 0.0f;
|
||||||
|
float anglef = 0.0f, cosangf = 0.0f, sinangf = 0.0f;
|
||||||
|
angle_t angle = 0;
|
||||||
|
|
||||||
|
static FOutVector *planeVerts = NULL;
|
||||||
|
static UINT16 numAllocedPlaneVerts = 0;
|
||||||
|
|
||||||
|
poly_t *planepoly = xsub->planepoly;
|
||||||
|
|
||||||
|
if (!cv_glhorizonlines.value)
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (!subsector || !subsector->hashorizon)
|
||||||
|
return;
|
||||||
|
|
||||||
|
// no convex poly were generated for this subsector
|
||||||
|
if (!planepoly)
|
||||||
|
return;
|
||||||
|
|
||||||
|
nrPlaneVerts = planepoly->numpts;
|
||||||
|
|
||||||
|
if (nrPlaneVerts < 3) // not even a triangle ?
|
||||||
|
return;
|
||||||
|
|
||||||
|
const sector_t *sec = FOFsector;
|
||||||
|
|
||||||
|
if (!(PolyFlags & PF_NoTexture))
|
||||||
|
{
|
||||||
|
HWR_GetFlat(lumpnum, R_NoEncore(FOFsector, !isceiling));
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get the slope pointer to simplify future code
|
||||||
|
if (!isceiling && sec->f_slope)
|
||||||
|
slope = sec->f_slope;
|
||||||
|
else if (isceiling && sec->c_slope)
|
||||||
|
slope = sec->c_slope;
|
||||||
|
|
||||||
|
height = FixedToFloat(fixedheight);
|
||||||
|
|
||||||
|
// Allocate plane-vertex buffer if we need to
|
||||||
|
if (!planeVerts || nrPlaneVerts > numAllocedPlaneVerts)
|
||||||
|
{
|
||||||
|
numAllocedPlaneVerts = (UINT16)nrPlaneVerts;
|
||||||
|
Z_Free(planeVerts);
|
||||||
|
Z_Malloc(numAllocedPlaneVerts * sizeof (FOutVector), PU_LEVEL, &planeVerts);
|
||||||
|
}
|
||||||
|
|
||||||
|
len = W_LumpLength(lumpnum);
|
||||||
|
|
||||||
|
switch (len)
|
||||||
|
{
|
||||||
|
case 4194304: // 2048x2048 lump
|
||||||
|
fflatsize = 2048.0f;
|
||||||
|
flatflag = 2047;
|
||||||
|
break;
|
||||||
|
case 1048576: // 1024x1024 lump
|
||||||
|
fflatsize = 1024.0f;
|
||||||
|
flatflag = 1023;
|
||||||
|
break;
|
||||||
|
case 262144: // 512x512 lump
|
||||||
|
fflatsize = 512.0f;
|
||||||
|
flatflag = 511;
|
||||||
|
break;
|
||||||
|
case 65536: // 256x256 lump
|
||||||
|
fflatsize = 256.0f;
|
||||||
|
flatflag = 255;
|
||||||
|
break;
|
||||||
|
case 16384: // 128x128 lump
|
||||||
|
fflatsize = 128.0f;
|
||||||
|
flatflag = 127;
|
||||||
|
break;
|
||||||
|
case 1024: // 32x32 lump
|
||||||
|
fflatsize = 32.0f;
|
||||||
|
flatflag = 31;
|
||||||
|
break;
|
||||||
|
default: // 64x64 lump
|
||||||
|
fflatsize = 64.0f;
|
||||||
|
flatflag = 63;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
pv = planepoly->pts;
|
||||||
|
|
||||||
|
// reference point for flat texture coord for each vertex around the polygon
|
||||||
|
flatxref = static_cast<float>(static_cast<fixed_t>(pv->x) & (~flatflag)) / fflatsize;
|
||||||
|
flatyref = static_cast<float>(static_cast<fixed_t>(pv->y) & (~flatflag)) / fflatsize;
|
||||||
|
|
||||||
|
if (!isceiling) // it's a floor
|
||||||
|
{
|
||||||
|
scrollx = FixedToFloat(sec->floor_xoffs)/fflatsize;
|
||||||
|
scrolly = FixedToFloat(sec->floor_yoffs)/fflatsize;
|
||||||
|
angle = sec->floorpic_angle;
|
||||||
|
}
|
||||||
|
else // it's a ceiling
|
||||||
|
{
|
||||||
|
scrollx = FixedToFloat(sec->ceiling_xoffs)/fflatsize;
|
||||||
|
scrolly = FixedToFloat(sec->ceiling_yoffs)/fflatsize;
|
||||||
|
angle = sec->ceilingpic_angle;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (angle) // Only needs to be done if there's an altered angle
|
||||||
|
{
|
||||||
|
// This needs to be done so that it scrolls in a different direction after rotation like software
|
||||||
|
tempxsow = flatxref;
|
||||||
|
tempytow = flatyref;
|
||||||
|
anglef = ANG2RAD(InvAngle(angle));
|
||||||
|
|
||||||
|
// This needs to be done so everything aligns after rotation
|
||||||
|
// It would be done so that rotation is done, THEN the translation, but I couldn't get it to rotate AND scroll like software does
|
||||||
|
cosangf = cosf(anglef);
|
||||||
|
sinangf = sinf(anglef);
|
||||||
|
flatxref = (tempxsow * cosangf) - (tempytow * sinangf);
|
||||||
|
flatyref = (tempxsow * sinangf) + (tempytow * cosangf);
|
||||||
|
}
|
||||||
|
|
||||||
|
#define SETUP3DVERT(vert, vx, vy) {\
|
||||||
|
/* Hurdler: add scrolling texture on floor/ceiling */\
|
||||||
|
vert->s = (float)(((vx) / fflatsize) - flatxref + scrollx);\
|
||||||
|
vert->t = (float)(flatyref - ((vy) / fflatsize) + scrolly);\
|
||||||
|
\
|
||||||
|
/* Need to rotate before translate */\
|
||||||
|
if (angle) /* Only needs to be done if there's an altered angle */\
|
||||||
|
{\
|
||||||
|
tempxsow = vert->s;\
|
||||||
|
tempytow = vert->t;\
|
||||||
|
vert->s = (tempxsow * cosangf) - (tempytow * sinangf);\
|
||||||
|
vert->t = (tempxsow * sinangf) + (tempytow * cosangf);\
|
||||||
|
}\
|
||||||
|
\
|
||||||
|
if (slope)\
|
||||||
|
{\
|
||||||
|
fixedheight = P_GetSlopeZAt(slope, FloatToFixed((vx)), FloatToFixed((vy)));\
|
||||||
|
height = FixedToFloat(fixedheight);\
|
||||||
|
}\
|
||||||
|
\
|
||||||
|
vert->x = (vx);\
|
||||||
|
vert->y = height;\
|
||||||
|
vert->z = (vy);\
|
||||||
|
\
|
||||||
|
}
|
||||||
|
|
||||||
|
HWR_Lighting(&Surf, lightlevel, planecolormap, false);
|
||||||
|
|
||||||
|
if (PolyFlags & (PF_Translucent|PF_Fog|PF_Additive|PF_Subtractive|PF_ReverseSubtract|PF_Multiplicative|PF_Environment))
|
||||||
|
{
|
||||||
|
Surf.PolyColor.s.alpha = (UINT8)alpha;
|
||||||
|
PolyFlags |= PF_Modulated;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
PolyFlags |= PF_Masked|PF_Modulated;
|
||||||
|
|
||||||
|
if (HWR_UseShader())
|
||||||
|
{
|
||||||
|
if (PolyFlags & PF_Fog)
|
||||||
|
shader = SHADER_FOG;
|
||||||
|
else if (cv_ripplewater.value && (PolyFlags & PF_Ripple))
|
||||||
|
shader = SHADER_WATER;
|
||||||
|
else
|
||||||
|
shader = SHADER_FLOOR;
|
||||||
|
|
||||||
|
PolyFlags |= PF_ColorMapped;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Horizon lines
|
||||||
|
FOutVector horizonpts[6];
|
||||||
|
float dist, vx, vy;
|
||||||
|
float x1, y1, xd, yd;
|
||||||
|
UINT8 numplanes, j;
|
||||||
|
vertex_t v; // For determining the closest distance from the line to the camera, to split render planes for minimum distortion;
|
||||||
|
|
||||||
|
static constexpr float renderdist = 27000.0f; // How far out to properly render the plane
|
||||||
|
static constexpr float farrenderdist = 32768.0f; // From here, raise plane to horizon level to fill in the line with some texture distortion
|
||||||
|
|
||||||
|
const seg_t *line = &segs[subsector->firstline];
|
||||||
|
|
||||||
|
for (i = 0; i < subsector->numlines; i++, line++)
|
||||||
|
{
|
||||||
|
if (line->polyseg)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
line_t* ld = line->linedef;
|
||||||
|
|
||||||
|
if (LIKELY(ld->special != HORIZONSPECIAL))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
if (R_PointOnSegSide(viewx, viewy, line) != 0)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
P_ClosestPointOnLine(viewx, viewy, ld, &v);
|
||||||
|
dist = FixedToFloat(R_PointToDist(v.x, v.y));
|
||||||
|
|
||||||
|
x1 = (line->fv1.x);
|
||||||
|
y1 = (line->fv1.y);
|
||||||
|
|
||||||
|
xd = (line->fv2.x) - x1;
|
||||||
|
yd = (line->fv2.y) - y1;
|
||||||
|
|
||||||
|
// Based on the seg length and the distance from the line, split horizon into multiple poly sets to reduce distortion
|
||||||
|
dist = sqrtf((xd*xd) + (yd*yd)) / dist / 16.0f;
|
||||||
|
|
||||||
|
if (dist > 100.0f)
|
||||||
|
numplanes = 100;
|
||||||
|
else
|
||||||
|
numplanes = (UINT8)dist + 1;
|
||||||
|
|
||||||
|
for (j = 0; j < numplanes; j++)
|
||||||
|
{
|
||||||
|
// Left side
|
||||||
|
vx = x1 + xd * j / numplanes;
|
||||||
|
vy = y1 + yd * j / numplanes;
|
||||||
|
SETUP3DVERT((&horizonpts[1]), vx, vy);
|
||||||
|
|
||||||
|
dist = sqrtf(powf(vx - gl_viewx, 2) + powf(vy - gl_viewy, 2));
|
||||||
|
vx = (vx - gl_viewx) * renderdist / dist + gl_viewx;
|
||||||
|
vy = (vy - gl_viewy) * renderdist / dist + gl_viewy;
|
||||||
|
SETUP3DVERT((&horizonpts[0]), vx, vy);
|
||||||
|
|
||||||
|
// Right side
|
||||||
|
vx = x1 + xd * (j+1) / numplanes;
|
||||||
|
vy = y1 + yd * (j+1) / numplanes;
|
||||||
|
SETUP3DVERT((&horizonpts[2]), vx, vy);
|
||||||
|
|
||||||
|
dist = sqrtf(powf(vx - gl_viewx, 2) + powf(vy - gl_viewy, 2));
|
||||||
|
vx = (vx - gl_viewx) * renderdist / dist + gl_viewx;
|
||||||
|
vy = (vy - gl_viewy) * renderdist / dist + gl_viewy;
|
||||||
|
SETUP3DVERT((&horizonpts[3]), vx, vy);
|
||||||
|
|
||||||
|
// Horizon fills
|
||||||
|
vx = (horizonpts[0].x - gl_viewx) * farrenderdist / renderdist + gl_viewx;
|
||||||
|
vy = (horizonpts[0].z - gl_viewy) * farrenderdist / renderdist + gl_viewy;
|
||||||
|
SETUP3DVERT((&horizonpts[5]), vx, vy);
|
||||||
|
horizonpts[5].y = gl_viewz;
|
||||||
|
|
||||||
|
vx = (horizonpts[3].x - gl_viewx) * farrenderdist / renderdist + gl_viewx;
|
||||||
|
vy = (horizonpts[3].z - gl_viewy) * farrenderdist / renderdist + gl_viewy;
|
||||||
|
SETUP3DVERT((&horizonpts[4]), vx, vy);
|
||||||
|
horizonpts[4].y = gl_viewz;
|
||||||
|
|
||||||
|
// Draw
|
||||||
|
HWR_ProcessPolygon(&Surf, horizonpts, 6, PolyFlags, shader, true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#undef SETUP3DVERT
|
||||||
|
}
|
||||||
|
|
||||||
#ifdef WALLSPLATS
|
#ifdef WALLSPLATS
|
||||||
static void HWR_DrawSegsSplats(FSurfaceInfo * pSurf)
|
static void HWR_DrawSegsSplats(FSurfaceInfo * pSurf)
|
||||||
{
|
{
|
||||||
@@ -2960,16 +3224,14 @@ static void HWR_Subsector(size_t num)
|
|||||||
UINT8 alpha;
|
UINT8 alpha;
|
||||||
|
|
||||||
light = R_GetPlaneLight(gl_frontsector, centerHeight, underside);
|
light = R_GetPlaneLight(gl_frontsector, centerHeight, underside);
|
||||||
|
|
||||||
alpha = HWR_FogBlockAlpha(*gl_frontsector->lightlist[light].lightlevel, rover->master->frontsector->extra_colormap);
|
alpha = HWR_FogBlockAlpha(*gl_frontsector->lightlist[light].lightlevel, rover->master->frontsector->extra_colormap);
|
||||||
|
|
||||||
HWR_AddTransparentFloor(0,
|
HWR_AddTransparentFloor(0,
|
||||||
&extrasubsectors[num],
|
&extrasubsectors[num],
|
||||||
!bottom,
|
!bottom,
|
||||||
roverheight,
|
roverheight,
|
||||||
*gl_frontsector->lightlist[light].lightlevel,
|
*gl_frontsector->lightlist[light].lightlevel,
|
||||||
alpha, rover->master->frontsector, PF_Fog|PF_NoTexture,
|
alpha, rover->master->frontsector, PF_Fog|PF_NoTexture,
|
||||||
true, rover->master->frontsector->extra_colormap);
|
true, rover->master->frontsector->extra_colormap, sub);
|
||||||
}
|
}
|
||||||
else if ((rover->flags & FF_TRANSLUCENT && rover->alpha < 256) || rover->blend) // SoM: Flags are more efficient
|
else if ((rover->flags & FF_TRANSLUCENT && rover->alpha < 256) || rover->blend) // SoM: Flags are more efficient
|
||||||
{
|
{
|
||||||
@@ -2981,13 +3243,12 @@ static void HWR_Subsector(size_t num)
|
|||||||
roverheight,
|
roverheight,
|
||||||
*gl_frontsector->lightlist[light].lightlevel,
|
*gl_frontsector->lightlist[light].lightlevel,
|
||||||
CLAMP(rover->alpha, 0, 255), rover->master->frontsector, HWR_RippleBlend(gl_frontsector, rover, false) | (rover->blend ? HWR_GetBlendModeFlag(rover->blend) : static_cast<FBITFIELD>(PF_Translucent)),
|
CLAMP(rover->alpha, 0, 255), rover->master->frontsector, HWR_RippleBlend(gl_frontsector, rover, false) | (rover->blend ? HWR_GetBlendModeFlag(rover->blend) : static_cast<FBITFIELD>(PF_Translucent)),
|
||||||
false, gl_frontsector->lightlist[light].extra_colormap);
|
false, gl_frontsector->lightlist[light].extra_colormap, sub);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
HWR_GetFlat(flatlump, R_NoEncore(rover->master->frontsector, bottom));
|
HWR_GetFlat(flatlump, R_NoEncore(rover->master->frontsector, bottom));
|
||||||
light = R_GetPlaneLight(gl_frontsector, centerHeight, underside);
|
light = R_GetPlaneLight(gl_frontsector, centerHeight, underside);
|
||||||
|
|
||||||
HWR_RenderPlane(sub, &extrasubsectors[num], !bottom, roverheight, HWR_RippleBlend(gl_frontsector, rover, false)|PF_Occlude, *gl_frontsector->lightlist[light].lightlevel, flatlump,
|
HWR_RenderPlane(sub, &extrasubsectors[num], !bottom, roverheight, HWR_RippleBlend(gl_frontsector, rover, false)|PF_Occlude, *gl_frontsector->lightlist[light].lightlevel, flatlump,
|
||||||
rover->master->frontsector, 255, gl_frontsector->lightlist[light].extra_colormap);
|
rover->master->frontsector, 255, gl_frontsector->lightlist[light].extra_colormap);
|
||||||
}
|
}
|
||||||
@@ -4191,7 +4452,7 @@ static void HWR_AddTransparentWall(FOutVector *wallVerts, FSurfaceInfo *pSurf, I
|
|||||||
wallinfo->wallcolormap = wallcolormap;
|
wallinfo->wallcolormap = wallcolormap;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void HWR_AddTransparentFloor(lumpnum_t lumpnum, extrasubsector_t *xsub, boolean isceiling, fixed_t fixedheight, INT32 lightlevel, INT32 alpha, sector_t *FOFSector, FBITFIELD blend, boolean fogplane, extracolormap_t *planecolormap)
|
static void HWR_AddTransparentFloor(lumpnum_t lumpnum, extrasubsector_t *xsub, boolean isceiling, fixed_t fixedheight, INT32 lightlevel, INT32 alpha, sector_t *FOFSector, FBITFIELD blend, boolean fogplane, extracolormap_t *planecolormap, subsector_t *subsector)
|
||||||
{
|
{
|
||||||
planeinfo_t *planeinfo = static_cast<planeinfo_t*>(HWR_CreateDrawNode(DRAWNODE_PLANE));
|
planeinfo_t *planeinfo = static_cast<planeinfo_t*>(HWR_CreateDrawNode(DRAWNODE_PLANE));
|
||||||
|
|
||||||
@@ -4205,6 +4466,9 @@ static void HWR_AddTransparentFloor(lumpnum_t lumpnum, extrasubsector_t *xsub, b
|
|||||||
planeinfo->blend = blend;
|
planeinfo->blend = blend;
|
||||||
planeinfo->fogplane = fogplane;
|
planeinfo->fogplane = fogplane;
|
||||||
planeinfo->planecolormap = planecolormap;
|
planeinfo->planecolormap = planecolormap;
|
||||||
|
|
||||||
|
// horizonplanes need to be drawn BEFORE skywalls, so lets hope this works without too many issues....
|
||||||
|
HWR_RenderFOFHorizonPlane(subsector, planeinfo->xsub, planeinfo->isceiling, planeinfo->fixedheight, planeinfo->blend, planeinfo->lightlevel, planeinfo->lumpnum, planeinfo->FOFSector, (UINT8)planeinfo->alpha, planeinfo->planecolormap);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Adding this for now until I can create extrasubsector info for polyobjects
|
// Adding this for now until I can create extrasubsector info for polyobjects
|
||||||
|
|||||||
@@ -171,7 +171,6 @@ void HWR_ProcessSeg(void); // Sort of like GLWall::Process in GZDoom
|
|||||||
// hw_bsp.c
|
// hw_bsp.c
|
||||||
void HWR_CreatePlanePolygons(INT32 bspnum);
|
void HWR_CreatePlanePolygons(INT32 bspnum);
|
||||||
extern boolean gl_maphasportals;
|
extern boolean gl_maphasportals;
|
||||||
extern boolean gl_maphashorizonlines;
|
|
||||||
|
|
||||||
// Console variables
|
// Console variables
|
||||||
extern CV_PossibleValue_t glanisotropicmode_cons_t[];
|
extern CV_PossibleValue_t glanisotropicmode_cons_t[];
|
||||||
|
|||||||
@@ -141,26 +141,56 @@ enum
|
|||||||
|
|
||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
GLuint fboobj; // actual Framebuffer Object
|
GLuint fboobj; // normal single sample fbo
|
||||||
GLuint rboobj; // Renderbuffer Object
|
GLuint rboobj; // normal single sample rbo for depth and stencil stuff
|
||||||
GLuint tex; // Framebuffer texture
|
GLuint tex; // fbo texture for color
|
||||||
|
GLuint msaa_fboobj; // msaa fbo
|
||||||
|
GLuint msaa_rboobj; // msaa rbo for color this time
|
||||||
|
GLuint msaa_depthrboobj; // msaa rbo for depth and stencil stuff
|
||||||
boolean init;
|
boolean init;
|
||||||
|
boolean msaa; // true if the msaa fbo is the render target ugh
|
||||||
|
boolean bound; // true if the fbo is currently bound as the framebuffer
|
||||||
} fboobj_t;
|
} fboobj_t;
|
||||||
|
|
||||||
|
// this is a little messy but less messy than having two of those tbh
|
||||||
static fboobj_t framebufferobject = {};
|
static fboobj_t framebufferobject = {};
|
||||||
|
|
||||||
int supportFBO = FBO_NONE;
|
int supportFBO = FBO_NONE;
|
||||||
|
|
||||||
// older gl versions might not have these, so prevent compile errors
|
// older gl versions might not have these, so prevent compile errors
|
||||||
// this should still give a simple depth only rbo
|
#ifndef GL_DEPTH_COMPONENT
|
||||||
|
#define GL_DEPTH_COMPONENT 0x1902
|
||||||
|
#endif
|
||||||
|
#ifndef GL_DEPTH_ATTACHMENT_EXT
|
||||||
|
#define GL_DEPTH_ATTACHMENT_EXT 0x8D00
|
||||||
|
#endif
|
||||||
#ifndef GL_DEPTH24_STENCIL8
|
#ifndef GL_DEPTH24_STENCIL8
|
||||||
GL_DEPTH24_STENCIL8 GL_DEPTH_COMPONENT_EXT
|
#define GL_DEPTH24_STENCIL8 0x88F0
|
||||||
#endif
|
#endif
|
||||||
#ifndef GL_DEPTH_STENCIL_ATTACHMENT
|
#ifndef GL_DEPTH_STENCIL_ATTACHMENT
|
||||||
GL_DEPTH_STENCIL_ATTACHMENT GL_DEPTH_ATTACHMENT_EXT
|
#define GL_DEPTH_STENCIL_ATTACHMENT 0x821A
|
||||||
|
#endif
|
||||||
|
#ifndef GL_COLOR_ATTACHMENT0_EXT
|
||||||
|
#define GL_COLOR_ATTACHMENT0_EXT 0x8CE0
|
||||||
|
#endif
|
||||||
|
#ifndef GL_READ_FRAMEBUFFER_EXT
|
||||||
|
#define GL_READ_FRAMEBUFFER_EXT 0x8CA8
|
||||||
|
#endif
|
||||||
|
#ifndef GL_DRAW_FRAMEBUFFER_EXT
|
||||||
|
#define GL_DRAW_FRAMEBUFFER_EXT 0x8CA9
|
||||||
|
#endif
|
||||||
|
#ifndef GL_FRAMEBUFFER_EXT
|
||||||
|
#define GL_FRAMEBUFFER_EXT 0x8D40
|
||||||
|
#endif
|
||||||
|
#ifndef GL_RENDERBUFFER_EXT
|
||||||
|
#define GL_RENDERBUFFER_EXT 0x8D41
|
||||||
|
#endif
|
||||||
|
#ifndef GL_FRAMEBUFFER_COMPLETE_EXT
|
||||||
|
#define GL_FRAMEBUFFER_COMPLETE_EXT 0x8CD5
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static void GL_FBO_DeleteAttachments(void);
|
static void GL_FBO_DeleteAttachments(void);
|
||||||
|
static void GL_FBO_Resolve(GLbitfield mask);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// needed for glportals
|
// needed for glportals
|
||||||
@@ -478,6 +508,10 @@ typedef void (APIENTRY * PFNglRenderbufferStorage) (GLenum target, GLenum intern
|
|||||||
static PFNglRenderbufferStorage pglRenderbufferStorage;
|
static PFNglRenderbufferStorage pglRenderbufferStorage;
|
||||||
typedef void (APIENTRY * PFNglFramebufferRenderbuffer) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLenum renderbuffer);
|
typedef void (APIENTRY * PFNglFramebufferRenderbuffer) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLenum renderbuffer);
|
||||||
static PFNglFramebufferRenderbuffer pglFramebufferRenderbuffer;
|
static PFNglFramebufferRenderbuffer pglFramebufferRenderbuffer;
|
||||||
|
typedef void (APIENTRY * PFNglRenderbufferStorageMultisample) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
|
||||||
|
static PFNglRenderbufferStorageMultisample pglRenderbufferStorageMultisample;
|
||||||
|
typedef void (APIENTRY * PFNglBlitFramebuffer) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
|
||||||
|
static PFNglBlitFramebuffer pglBlitFramebuffer;
|
||||||
|
|
||||||
/* 2.1 extension functions for framebuffers and renderbuffers */
|
/* 2.1 extension functions for framebuffers and renderbuffers */
|
||||||
typedef void (APIENTRY * PFNglGenFramebuffersEXT) (GLsizei n, GLuint *ids);
|
typedef void (APIENTRY * PFNglGenFramebuffersEXT) (GLsizei n, GLuint *ids);
|
||||||
@@ -899,6 +933,17 @@ void SetupGLFunc4(void)
|
|||||||
GetGLfunc(glRenderbufferStorage);
|
GetGLfunc(glRenderbufferStorage);
|
||||||
GetGLfunc(glFramebufferRenderbuffer);
|
GetGLfunc(glFramebufferRenderbuffer);
|
||||||
|
|
||||||
|
// multisample support, this should be in core per gl 3.0 and newer
|
||||||
|
pglRenderbufferStorageMultisample = GetGLFunc("glRenderbufferStorageMultisample");
|
||||||
|
pglBlitFramebuffer = GetGLFunc("glBlitFramebuffer");
|
||||||
|
|
||||||
|
if (!pglRenderbufferStorageMultisample || !pglBlitFramebuffer)
|
||||||
|
{
|
||||||
|
pglRenderbufferStorageMultisample = NULL;
|
||||||
|
pglBlitFramebuffer = NULL;
|
||||||
|
GL_DBG_Printf("\nFBO: No multisample support\n");
|
||||||
|
}
|
||||||
|
|
||||||
GL_DBG_Printf("\nFBO: ARB extensions found\n");
|
GL_DBG_Printf("\nFBO: ARB extensions found\n");
|
||||||
}
|
}
|
||||||
else if (fbocheck == FBO_EXT) // uh oh only support old fbo extensions...
|
else if (fbocheck == FBO_EXT) // uh oh only support old fbo extensions...
|
||||||
@@ -935,6 +980,21 @@ void SetupGLFunc4(void)
|
|||||||
GetGLfunc(glFramebufferRenderbufferEXT);
|
GetGLfunc(glFramebufferRenderbufferEXT);
|
||||||
pglFramebufferRenderbuffer = pglFramebufferRenderbufferEXT;
|
pglFramebufferRenderbuffer = pglFramebufferRenderbufferEXT;
|
||||||
|
|
||||||
|
// multisample support needs the EXT multisample and blit extensions
|
||||||
|
if (GL_isExtAvailable("GL_EXT_framebuffer_multisample", gl_extensions) &&
|
||||||
|
GL_isExtAvailable("GL_EXT_framebuffer_blit", gl_extensions))
|
||||||
|
{
|
||||||
|
pglRenderbufferStorageMultisample = GetGLFunc("glRenderbufferStorageMultisampleEXT");
|
||||||
|
pglBlitFramebuffer = GetGLFunc("glBlitFramebufferEXT");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!pglRenderbufferStorageMultisample || !pglBlitFramebuffer)
|
||||||
|
{
|
||||||
|
pglRenderbufferStorageMultisample = NULL;
|
||||||
|
pglBlitFramebuffer = NULL;
|
||||||
|
GL_DBG_Printf("\nFBO: No multisample support\n");
|
||||||
|
}
|
||||||
|
|
||||||
GL_DBG_Printf("\nFBO: EXT extensions with packed depth-stencil\n");
|
GL_DBG_Printf("\nFBO: EXT extensions with packed depth-stencil\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1455,6 +1515,15 @@ void GL_ReadScreenTexture(int tex, UINT8 *restrict dest, INT32 scale)
|
|||||||
const INT32 stride = (screen_width/scale)*3;
|
const INT32 stride = (screen_width/scale)*3;
|
||||||
INT32 scanlines = screen_height;
|
INT32 scanlines = screen_height;
|
||||||
GLubyte * restrict image;
|
GLubyte * restrict image;
|
||||||
|
#ifdef USE_FBO_OGL
|
||||||
|
const boolean msaa_fbo = (framebufferobject.bound && framebufferobject.msaa);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef USE_FBO_OGL
|
||||||
|
// cant read from the msaa fbo, so gotta blit it first into either the single sample fbo or the screen framebuffer....
|
||||||
|
if (msaa_fbo)
|
||||||
|
GL_FBO_Resolve(GL_COLOR_BUFFER_BIT);
|
||||||
|
#endif
|
||||||
|
|
||||||
// at the time this function is called, generic2 can be found drawn on the framebuffer
|
// at the time this function is called, generic2 can be found drawn on the framebuffer
|
||||||
// if some other screen texture is needed, draw it to the framebuffer
|
// if some other screen texture is needed, draw it to the framebuffer
|
||||||
@@ -1496,9 +1565,16 @@ void GL_ReadScreenTexture(int tex, UINT8 *restrict dest, INT32 scale)
|
|||||||
memcpy(dest + i, image + i*scale, 3);
|
memcpy(dest + i, image + i*scale, 3);
|
||||||
dest += stride;
|
dest += stride;
|
||||||
}
|
}
|
||||||
|
// this probably could be done with fbos, might mess around with that some time :3
|
||||||
|
|
||||||
// ...yet still, restrict doesn't make the inner loop any faster
|
// ...yet still, restrict doesn't make the inner loop any faster
|
||||||
free(image - ((screen_height % scale) * screen_width*3));
|
free(image - ((screen_height % scale) * screen_width*3));
|
||||||
|
|
||||||
|
#ifdef USE_FBO_OGL
|
||||||
|
// this´ll reenable the msaa fbo....
|
||||||
|
if (msaa_fbo)
|
||||||
|
GL_FBO_Enable();
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
// -----------------+
|
// -----------------+
|
||||||
@@ -2252,7 +2328,7 @@ static void GL_Shader_SetUniforms(FSurfaceInfo *Surface, GLRGBAFloat *poly, GLRG
|
|||||||
|
|
||||||
UNIFORM_1(shader->uniforms[gluniform_leveltime], shader_leveltime, pglUniform1f);
|
UNIFORM_1(shader->uniforms[gluniform_leveltime], shader_leveltime, pglUniform1f);
|
||||||
|
|
||||||
UNIFORM_2(shader->uniforms[gluniform_scr_resolution], (GLfloat)vid.width, (GLfloat)vid.height, pglUniform2f);
|
UNIFORM_2(shader->uniforms[gluniform_scr_resolution], (GLfloat)screen_width, (GLfloat)screen_height, pglUniform2f);
|
||||||
|
|
||||||
#undef UNIFORM_1
|
#undef UNIFORM_1
|
||||||
#undef UNIFORM_2
|
#undef UNIFORM_2
|
||||||
@@ -3242,7 +3318,7 @@ void GL_SetTransform(FTransform *stransform)
|
|||||||
#ifdef USE_FBO_OGL
|
#ifdef USE_FBO_OGL
|
||||||
static void GL_FBO_DeleteAttachments(void)
|
static void GL_FBO_DeleteAttachments(void)
|
||||||
{
|
{
|
||||||
if (supportFBO == FBO_NONE || !framebufferobject.init)
|
if (supportFBO == FBO_NONE)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
// Unbind the framebuffer
|
// Unbind the framebuffer
|
||||||
@@ -3255,13 +3331,44 @@ static void GL_FBO_DeleteAttachments(void)
|
|||||||
if (framebufferobject.rboobj)
|
if (framebufferobject.rboobj)
|
||||||
pglDeleteRenderbuffers(1, &framebufferobject.rboobj);
|
pglDeleteRenderbuffers(1, &framebufferobject.rboobj);
|
||||||
|
|
||||||
|
if (framebufferobject.msaa_rboobj)
|
||||||
|
pglDeleteRenderbuffers(1, &framebufferobject.msaa_rboobj);
|
||||||
|
|
||||||
|
if (framebufferobject.msaa_depthrboobj)
|
||||||
|
pglDeleteRenderbuffers(1, &framebufferobject.msaa_depthrboobj);
|
||||||
|
|
||||||
framebufferobject.tex = 0;
|
framebufferobject.tex = 0;
|
||||||
framebufferobject.rboobj = 0;
|
framebufferobject.rboobj = 0;
|
||||||
|
framebufferobject.msaa_rboobj = 0;
|
||||||
|
framebufferobject.msaa_depthrboobj = 0;
|
||||||
framebufferobject.init = false;
|
framebufferobject.init = false;
|
||||||
|
framebufferobject.bound = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// blit the msaa fbo into the normal single sample fbo
|
||||||
|
// so we can use it to copy from and stuff
|
||||||
|
static void GL_FBO_Resolve(GLbitfield mask)
|
||||||
|
{
|
||||||
|
if (supportFBO == FBO_NONE || !framebufferobject.init || !framebufferobject.msaa)
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (!pglBlitFramebuffer)
|
||||||
|
return;
|
||||||
|
|
||||||
|
pglBindFramebuffer(GL_READ_FRAMEBUFFER_EXT, framebufferobject.msaa_fboobj);
|
||||||
|
pglBindFramebuffer(GL_DRAW_FRAMEBUFFER_EXT, framebufferobject.fboobj);
|
||||||
|
|
||||||
|
pglBlitFramebuffer(0, 0, screen_width, screen_height,
|
||||||
|
0, 0, screen_width, screen_height,
|
||||||
|
mask, GL_NEAREST);
|
||||||
|
|
||||||
|
pglBindFramebuffer(GL_FRAMEBUFFER_EXT, framebufferobject.fboobj);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void GL_FBO_Generate(void)
|
static void GL_FBO_Generate(void)
|
||||||
{
|
{
|
||||||
|
GLint msaasamples;
|
||||||
|
|
||||||
if (supportFBO == FBO_NONE || framebufferobject.init)
|
if (supportFBO == FBO_NONE || framebufferobject.init)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
@@ -3321,12 +3428,76 @@ static void GL_FBO_Generate(void)
|
|||||||
GL_MSG_Error("GL_FBO_Generate: Failed to create Framebuffer Object");
|
GL_MSG_Error("GL_FBO_Generate: Failed to create Framebuffer Object");
|
||||||
|
|
||||||
// if this fails, dont retry it a gazillion times
|
// if this fails, dont retry it a gazillion times
|
||||||
// this wouldnt recover
|
// this probably wouldnt recover and we dont want any more black screens...
|
||||||
supportFBO = FBO_NONE;
|
supportFBO = FBO_NONE;
|
||||||
pglBindFramebuffer(GL_FRAMEBUFFER_EXT, 0);
|
pglBindFramebuffer(GL_FRAMEBUFFER_EXT, 0);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Try to set up a multisampled render target for MSAA
|
||||||
|
framebufferobject.msaa = false;
|
||||||
|
msaasamples = (GLint)msaa;
|
||||||
|
|
||||||
|
// maybe should just make more "supportFBO" cases or smth but :chaosleep:
|
||||||
|
if (msaasamples > 1 && pglRenderbufferStorageMultisample && pglBlitFramebuffer)
|
||||||
|
{
|
||||||
|
if (!framebufferobject.msaa_fboobj)
|
||||||
|
pglGenFramebuffers(1, &framebufferobject.msaa_fboobj);
|
||||||
|
|
||||||
|
pglBindFramebuffer(GL_FRAMEBUFFER_EXT, framebufferobject.msaa_fboobj);
|
||||||
|
|
||||||
|
// Generate the multisampled color renderbuffer
|
||||||
|
if (!framebufferobject.msaa_rboobj)
|
||||||
|
{
|
||||||
|
pglGenRenderbuffers(1, &framebufferobject.msaa_rboobj);
|
||||||
|
pglBindRenderbuffer(GL_RENDERBUFFER_EXT, framebufferobject.msaa_rboobj);
|
||||||
|
pglRenderbufferStorageMultisample(GL_RENDERBUFFER_EXT, msaasamples, GL_RGBA8, screen_width, screen_height);
|
||||||
|
pglFramebufferRenderbuffer(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_RENDERBUFFER_EXT, framebufferobject.msaa_rboobj);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Generate the multisampled depth/stencil renderbuffer
|
||||||
|
if (!framebufferobject.msaa_depthrboobj)
|
||||||
|
{
|
||||||
|
pglGenRenderbuffers(1, &framebufferobject.msaa_depthrboobj);
|
||||||
|
pglBindRenderbuffer(GL_RENDERBUFFER_EXT, framebufferobject.msaa_depthrboobj);
|
||||||
|
|
||||||
|
if (supportFBO == FBO_ARB)
|
||||||
|
{
|
||||||
|
pglRenderbufferStorageMultisample(GL_RENDERBUFFER_EXT, msaasamples, GL_DEPTH24_STENCIL8, screen_width, screen_height);
|
||||||
|
pglFramebufferRenderbuffer(GL_FRAMEBUFFER_EXT, GL_DEPTH_STENCIL_ATTACHMENT, GL_RENDERBUFFER_EXT, framebufferobject.msaa_depthrboobj);
|
||||||
|
}
|
||||||
|
else if (supportFBO == FBO_EXT)
|
||||||
|
{
|
||||||
|
pglRenderbufferStorageMultisample(GL_RENDERBUFFER_EXT, msaasamples, GL_DEPTH_STENCIL_EXT, screen_width, screen_height);
|
||||||
|
// attach a renderbuffer to depth attachment point
|
||||||
|
pglFramebufferRenderbuffer(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT, framebufferobject.msaa_depthrboobj);
|
||||||
|
// attach a renderbuffer to stencil attachment point
|
||||||
|
pglFramebufferRenderbuffer(GL_FRAMEBUFFER_EXT, GL_STENCIL_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT, framebufferobject.msaa_depthrboobj);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pglBindRenderbuffer(GL_RENDERBUFFER_EXT, 0);
|
||||||
|
|
||||||
|
if (pglCheckFramebufferStatus(GL_FRAMEBUFFER_EXT) == GL_FRAMEBUFFER_COMPLETE_EXT)
|
||||||
|
{
|
||||||
|
framebufferobject.msaa = true;
|
||||||
|
GL_ClearBuffer(true, true, true, NULL);
|
||||||
|
GL_DBG_Printf("\nGL_FBO_Generate: Multisampled framebuffer created with %d samples\n", msaasamples);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
GL_MSG_Warning("GL_FBO_Generate: Failed to create multisampled Framebuffer Object, falling back to no MSAA");
|
||||||
|
|
||||||
|
if (framebufferobject.msaa_rboobj)
|
||||||
|
pglDeleteRenderbuffers(1, &framebufferobject.msaa_rboobj);
|
||||||
|
if (framebufferobject.msaa_depthrboobj)
|
||||||
|
pglDeleteRenderbuffers(1, &framebufferobject.msaa_depthrboobj);
|
||||||
|
|
||||||
|
framebufferobject.msaa_rboobj = 0;
|
||||||
|
framebufferobject.msaa_depthrboobj = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Unbind the framebuffer
|
// Unbind the framebuffer
|
||||||
pglBindFramebuffer(GL_FRAMEBUFFER_EXT, 0);
|
pglBindFramebuffer(GL_FRAMEBUFFER_EXT, 0);
|
||||||
|
|
||||||
@@ -3335,11 +3506,13 @@ static void GL_FBO_Generate(void)
|
|||||||
|
|
||||||
void GL_FBO_BindMainFrameBuffer(void)
|
void GL_FBO_BindMainFrameBuffer(void)
|
||||||
{
|
{
|
||||||
if (supportFBO == FBO_NONE || !framebufferobject.init)
|
if (supportFBO == FBO_NONE)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
pglBindFramebuffer(GL_FRAMEBUFFER_EXT, 0);
|
pglBindFramebuffer(GL_FRAMEBUFFER_EXT, 0);
|
||||||
pglBindRenderbuffer(GL_RENDERBUFFER_EXT, 0);
|
pglBindRenderbuffer(GL_RENDERBUFFER_EXT, 0);
|
||||||
|
|
||||||
|
framebufferobject.bound = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
void GL_FBO_Enable(void)
|
void GL_FBO_Enable(void)
|
||||||
@@ -3353,13 +3526,23 @@ void GL_FBO_Enable(void)
|
|||||||
if (!framebufferobject.init)
|
if (!framebufferobject.init)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
pglBindFramebuffer(GL_FRAMEBUFFER_EXT, framebufferobject.fboobj);
|
if (framebufferobject.msaa)
|
||||||
pglBindRenderbuffer(GL_RENDERBUFFER_EXT, framebufferobject.rboobj);
|
{
|
||||||
|
pglBindFramebuffer(GL_FRAMEBUFFER_EXT, framebufferobject.msaa_fboobj);
|
||||||
|
pglBindRenderbuffer(GL_RENDERBUFFER_EXT, framebufferobject.msaa_rboobj);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
pglBindFramebuffer(GL_FRAMEBUFFER_EXT, framebufferobject.fboobj);
|
||||||
|
pglBindRenderbuffer(GL_RENDERBUFFER_EXT, framebufferobject.rboobj);
|
||||||
|
}
|
||||||
|
|
||||||
|
framebufferobject.bound = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void GL_FBO_Disable(void)
|
void GL_FBO_Disable(void)
|
||||||
{
|
{
|
||||||
if (supportFBO == FBO_NONE || !framebufferobject.init)
|
if (supportFBO == FBO_NONE)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
pglBindFramebuffer(GL_FRAMEBUFFER_EXT, 0);
|
pglBindFramebuffer(GL_FRAMEBUFFER_EXT, 0);
|
||||||
@@ -3370,7 +3553,14 @@ void GL_FBO_Disable(void)
|
|||||||
pglDeleteFramebuffers(1, &framebufferobject.fboobj);
|
pglDeleteFramebuffers(1, &framebufferobject.fboobj);
|
||||||
framebufferobject.fboobj = 0;
|
framebufferobject.fboobj = 0;
|
||||||
|
|
||||||
|
if (framebufferobject.msaa_fboobj)
|
||||||
|
pglDeleteFramebuffers(1, &framebufferobject.msaa_fboobj);
|
||||||
|
framebufferobject.msaa_fboobj = 0;
|
||||||
|
|
||||||
GL_FBO_DeleteAttachments();
|
GL_FBO_DeleteAttachments();
|
||||||
|
|
||||||
|
framebufferobject.msaa = false;
|
||||||
|
framebufferobject.bound = false;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -3722,10 +3912,19 @@ void GL_MakeScreenTexture(int tex)
|
|||||||
{
|
{
|
||||||
boolean firstTime;
|
boolean firstTime;
|
||||||
static GLint lastfiltermode[NUMSCREENTEXTURES] = {-1, -1, -1, -1, -1};
|
static GLint lastfiltermode[NUMSCREENTEXTURES] = {-1, -1, -1, -1, -1};
|
||||||
|
#ifdef USE_FBO_OGL
|
||||||
|
const boolean msaa_fbo = (framebufferobject.bound && framebufferobject.msaa);
|
||||||
|
#endif
|
||||||
|
|
||||||
if (!gl_enable_screen_textures)
|
if (!gl_enable_screen_textures)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
#ifdef USE_FBO_OGL
|
||||||
|
// cant read from the msaa fbo, so gotta blit it first into either the single sample fbo or the screen framebuffer....
|
||||||
|
if (msaa_fbo)
|
||||||
|
GL_FBO_Resolve(GL_COLOR_BUFFER_BIT);
|
||||||
|
#endif
|
||||||
|
|
||||||
firstTime = (screenTextures[tex] == 0);
|
firstTime = (screenTextures[tex] == 0);
|
||||||
|
|
||||||
// Create screen texture
|
// Create screen texture
|
||||||
@@ -3759,6 +3958,11 @@ void GL_MakeScreenTexture(int tex)
|
|||||||
}
|
}
|
||||||
|
|
||||||
tex_downloaded = screenTextures[tex];
|
tex_downloaded = screenTextures[tex];
|
||||||
|
|
||||||
|
#ifdef USE_FBO_OGL
|
||||||
|
if (msaa_fbo)
|
||||||
|
GL_FBO_Enable();
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void GL_DrawScreenFinalTexture(int tex, INT32 width, INT32 height)
|
void GL_DrawScreenFinalTexture(int tex, INT32 width, INT32 height)
|
||||||
|
|||||||
+34
-4
@@ -752,9 +752,14 @@ static inline ssize_t SOCK_SendToAddr(SOCKET_TYPE socket, mysockaddr_t *sockaddr
|
|||||||
|
|
||||||
static void SOCK_Send(void)
|
static void SOCK_Send(void)
|
||||||
{
|
{
|
||||||
ssize_t c = ERRSOCKET;
|
|
||||||
int e = 0; // save error code so it can't be modified later code and avoid calling WSAGetLastError() more then once
|
|
||||||
size_t i, j;
|
size_t i, j;
|
||||||
|
int retrycount = 0;
|
||||||
|
ssize_t c;
|
||||||
|
int e; // save error code so it can't be modified later code and avoid calling WSAGetLastError() more then once
|
||||||
|
|
||||||
|
retry:
|
||||||
|
c = ERRSOCKET;
|
||||||
|
e = 0;
|
||||||
|
|
||||||
if (doomcom->remotenode < 0 || !nodeconnected[doomcom->remotenode])
|
if (doomcom->remotenode < 0 || !nodeconnected[doomcom->remotenode])
|
||||||
return;
|
return;
|
||||||
@@ -808,10 +813,35 @@ static void SOCK_Send(void)
|
|||||||
|
|
||||||
if (c == ERRSOCKET && e != 0) // 0 means no socket for the address family was found
|
if (c == ERRSOCKET && e != 0) // 0 means no socket for the address family was found
|
||||||
{
|
{
|
||||||
if (!ALLOWEDERROR(e))
|
if (ALLOWEDERROR(e))
|
||||||
I_Error("SOCK_Send, error sending to node %d (%s) #%u, %s", doomcom->remotenode,
|
return;
|
||||||
|
|
||||||
|
//if (!ALLOWEDERROR(e))
|
||||||
|
//I_Error("SOCK_Send, error sending to node %d (%s) #%u, %s", doomcom->remotenode,
|
||||||
|
//SOCK_GetNodeAddress(doomcom->remotenode), e, strerror(e));
|
||||||
|
|
||||||
|
// no need to spam this on retries
|
||||||
|
if (retrycount == 0)
|
||||||
|
CONS_Alert(CONS_ERROR, "SOCK_Send, error sending to node %d (%s) #%u, %s\n", doomcom->remotenode,
|
||||||
|
SOCK_GetNodeAddress(doomcom->remotenode), e, strerror(e));
|
||||||
|
|
||||||
|
// retry sending it
|
||||||
|
if (retrycount <= 3)
|
||||||
|
{
|
||||||
|
CONS_Printf("SOCK_Send: retrying... Attempt %d\n", retrycount+1);
|
||||||
|
retrycount++;
|
||||||
|
// wait quarter of a second or smth
|
||||||
|
I_Sleep(250);
|
||||||
|
goto retry;
|
||||||
|
}
|
||||||
|
|
||||||
|
// no recovery, guess we die
|
||||||
|
I_Error("SOCK_Send, error sending to node %d (%s) #%u, %s", doomcom->remotenode,
|
||||||
SOCK_GetNodeAddress(doomcom->remotenode), e, strerror(e));
|
SOCK_GetNodeAddress(doomcom->remotenode), e, strerror(e));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (retrycount > 0)
|
||||||
|
CONS_Alert(CONS_NOTICE, "SOCK_Send: successfully reconnected on Attempt %d\n", retrycount);
|
||||||
}
|
}
|
||||||
#undef ALLOWEDERROR
|
#undef ALLOWEDERROR
|
||||||
|
|
||||||
|
|||||||
@@ -118,11 +118,8 @@ void I_UpdateNoVsync(void);
|
|||||||
*/
|
*/
|
||||||
void I_ReadScreen(UINT8 * restrict scr, INT32 scale);
|
void I_ReadScreen(UINT8 * restrict scr, INT32 scale);
|
||||||
|
|
||||||
|
|
||||||
UINT32 I_GetRefreshRate(void);
|
UINT32 I_GetRefreshRate(void);
|
||||||
|
|
||||||
boolean I_CheckNativeRes(void);
|
|
||||||
|
|
||||||
void I_SetBorderlessWindow(void);
|
void I_SetBorderlessWindow(void);
|
||||||
|
|
||||||
#ifdef USE_FBO_OGL
|
#ifdef USE_FBO_OGL
|
||||||
|
|||||||
+141
-148
@@ -344,19 +344,16 @@ static int mobj_get(lua_State *L)
|
|||||||
lua_pushangle(L, mo->slopepitch);
|
lua_pushangle(L, mo->slopepitch);
|
||||||
break;
|
break;
|
||||||
case mobj_rollsum:
|
case mobj_rollsum:
|
||||||
{
|
|
||||||
angle_t pitchnroll = P_MobjPitchAndRoll(mo);
|
|
||||||
|
|
||||||
angle_t rollsum = mo->rollangle + pitchnroll;
|
|
||||||
|
|
||||||
if (mo->player)
|
|
||||||
{
|
{
|
||||||
rollsum += R_PlayerSliptideAngle(mo->player);
|
angle_t pitchnroll = P_MobjPitchAndRoll(mo);
|
||||||
|
angle_t rollsum = mo->rollangle + pitchnroll;
|
||||||
|
if (mo->player)
|
||||||
|
{
|
||||||
|
rollsum += R_PlayerSliptideAngle(mo->player);
|
||||||
|
}
|
||||||
|
lua_pushangle(L, rollsum);
|
||||||
}
|
}
|
||||||
|
|
||||||
lua_pushangle(L, rollsum);
|
|
||||||
break;
|
break;
|
||||||
}
|
|
||||||
case mobj_spritexscale:
|
case mobj_spritexscale:
|
||||||
lua_pushfixed(L, mo->spritexscale);
|
lua_pushfixed(L, mo->spritexscale);
|
||||||
break;
|
break;
|
||||||
@@ -431,30 +428,24 @@ static int mobj_set(lua_State *L)
|
|||||||
case mobj_y:
|
case mobj_y:
|
||||||
return NOSETPOS;
|
return NOSETPOS;
|
||||||
case mobj_z:
|
case mobj_z:
|
||||||
{
|
{
|
||||||
// z doesn't cross sector bounds so it's okay.
|
// z doesn't cross sector bounds so it's okay.
|
||||||
mobj_t *ptmthing = tmthing;
|
mobj_t *ptmthing = tmthing;
|
||||||
mo->z = luaL_checkfixed(L, 3);
|
mo->z = luaL_checkfixed(L, 3);
|
||||||
P_CheckPosition(mo, mo->x, mo->y);
|
P_CheckPosition(mo, mo->x, mo->y);
|
||||||
mo->floorz = tmfloorz;
|
mo->floorz = tmfloorz;
|
||||||
mo->ceilingz = tmceilingz;
|
mo->ceilingz = tmceilingz;
|
||||||
P_SetTarget(&tmthing, ptmthing);
|
P_SetTarget(&tmthing, ptmthing);
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
|
||||||
case mobj_snext:
|
case mobj_snext:
|
||||||
return NOSETPOS;
|
return NOSETPOS;
|
||||||
case mobj_sprev:
|
case mobj_sprev:
|
||||||
return UNIMPLEMENTED;
|
return UNIMPLEMENTED;
|
||||||
case mobj_angle:
|
case mobj_angle:
|
||||||
mo->angle = luaL_checkangle(L, 3);
|
mo->angle = luaL_checkangle(L, 3);
|
||||||
if (mo->player == &players[consoleplayer])
|
if (mo->player)
|
||||||
localangle[0] = mo->angle;
|
P_ForceLocalAngle(mo->player, mo->angle);
|
||||||
else if (mo->player == &players[displayplayers[1]])
|
|
||||||
localangle[1] = mo->angle;
|
|
||||||
else if (mo->player == &players[displayplayers[2]])
|
|
||||||
localangle[2] = mo->angle;
|
|
||||||
else if (mo->player == &players[displayplayers[3]])
|
|
||||||
localangle[3] = mo->angle;
|
|
||||||
break;
|
break;
|
||||||
case mobj_sprite:
|
case mobj_sprite:
|
||||||
mo->sprite = luaL_checkinteger(L, 3);
|
mo->sprite = luaL_checkinteger(L, 3);
|
||||||
@@ -474,29 +465,29 @@ static int mobj_set(lua_State *L)
|
|||||||
case mobj_ceilingz:
|
case mobj_ceilingz:
|
||||||
return NOSETPOS;
|
return NOSETPOS;
|
||||||
case mobj_radius:
|
case mobj_radius:
|
||||||
{
|
{
|
||||||
mobj_t *ptmthing = tmthing;
|
mobj_t *ptmthing = tmthing;
|
||||||
mo->radius = luaL_checkfixed(L, 3);
|
mo->radius = luaL_checkfixed(L, 3);
|
||||||
if (mo->radius < 0)
|
if (mo->radius < 0)
|
||||||
mo->radius = 0;
|
mo->radius = 0;
|
||||||
P_CheckPosition(mo, mo->x, mo->y);
|
P_CheckPosition(mo, mo->x, mo->y);
|
||||||
mo->floorz = tmfloorz;
|
mo->floorz = tmfloorz;
|
||||||
mo->ceilingz = tmceilingz;
|
mo->ceilingz = tmceilingz;
|
||||||
P_SetTarget(&tmthing, ptmthing);
|
P_SetTarget(&tmthing, ptmthing);
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
|
||||||
case mobj_height:
|
case mobj_height:
|
||||||
{
|
{
|
||||||
mobj_t *ptmthing = tmthing;
|
mobj_t *ptmthing = tmthing;
|
||||||
mo->height = luaL_checkfixed(L, 3);
|
mo->height = luaL_checkfixed(L, 3);
|
||||||
if (mo->height < 0)
|
if (mo->height < 0)
|
||||||
mo->height = 0;
|
mo->height = 0;
|
||||||
P_CheckPosition(mo, mo->x, mo->y);
|
P_CheckPosition(mo, mo->x, mo->y);
|
||||||
mo->floorz = tmfloorz;
|
mo->floorz = tmfloorz;
|
||||||
mo->ceilingz = tmceilingz;
|
mo->ceilingz = tmceilingz;
|
||||||
P_SetTarget(&tmthing, ptmthing);
|
P_SetTarget(&tmthing, ptmthing);
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
|
||||||
case mobj_momx:
|
case mobj_momx:
|
||||||
mo->momx = luaL_checkfixed(L, 3);
|
mo->momx = luaL_checkfixed(L, 3);
|
||||||
break;
|
break;
|
||||||
@@ -520,25 +511,25 @@ static int mobj_set(lua_State *L)
|
|||||||
P_SetMobjState(mo, luaL_checkinteger(L, 3));
|
P_SetMobjState(mo, luaL_checkinteger(L, 3));
|
||||||
break;
|
break;
|
||||||
case mobj_flags: // special handling for MF_NOBLOCKMAP and MF_NOSECTOR
|
case mobj_flags: // special handling for MF_NOBLOCKMAP and MF_NOSECTOR
|
||||||
{
|
|
||||||
UINT32 flags = luaL_checkinteger(L, 3);
|
|
||||||
if ((flags & (MF_NOBLOCKMAP|MF_NOSECTOR)) != (mo->flags & (MF_NOBLOCKMAP|MF_NOSECTOR)))
|
|
||||||
{
|
{
|
||||||
P_UnsetThingPosition(mo);
|
UINT32 flags = luaL_checkinteger(L, 3);
|
||||||
mo->flags = flags;
|
if ((flags & (MF_NOBLOCKMAP|MF_NOSECTOR)) != (mo->flags & (MF_NOBLOCKMAP|MF_NOSECTOR)))
|
||||||
if (flags & MF_NOSECTOR && sector_list)
|
|
||||||
{
|
{
|
||||||
P_DelSeclist(sector_list);
|
P_UnsetThingPosition(mo);
|
||||||
sector_list = NULL;
|
mo->flags = flags;
|
||||||
|
if (flags & MF_NOSECTOR && sector_list)
|
||||||
|
{
|
||||||
|
P_DelSeclist(sector_list);
|
||||||
|
sector_list = NULL;
|
||||||
|
}
|
||||||
|
mo->snext = NULL, mo->sprev = NULL;
|
||||||
|
mo->bnext = NULL, mo->bprev = NULL;
|
||||||
|
P_SetThingPosition(mo);
|
||||||
}
|
}
|
||||||
mo->snext = NULL, mo->sprev = NULL;
|
else
|
||||||
mo->bnext = NULL, mo->bprev = NULL;
|
mo->flags = flags;
|
||||||
P_SetThingPosition(mo);
|
|
||||||
}
|
}
|
||||||
else
|
|
||||||
mo->flags = flags;
|
|
||||||
break;
|
break;
|
||||||
}
|
|
||||||
case mobj_flags2:
|
case mobj_flags2:
|
||||||
mo->flags2 = (UINT32)luaL_checkinteger(L, 3);
|
mo->flags2 = (UINT32)luaL_checkinteger(L, 3);
|
||||||
break;
|
break;
|
||||||
@@ -546,27 +537,29 @@ static int mobj_set(lua_State *L)
|
|||||||
mo->eflags = (UINT32)luaL_checkinteger(L, 3);
|
mo->eflags = (UINT32)luaL_checkinteger(L, 3);
|
||||||
break;
|
break;
|
||||||
case mobj_skin: // set skin by name
|
case mobj_skin: // set skin by name
|
||||||
{
|
{
|
||||||
INT32 i;
|
INT32 i;
|
||||||
char skin[SKINNAMESIZE+1]; // all skin names are limited to this length
|
char skin[SKINNAMESIZE+1]; // all skin names are limited to this length
|
||||||
strlcpy(skin, luaL_checkstring(L, 3), sizeof skin);
|
strlcpy(skin, luaL_checkstring(L, 3), sizeof skin);
|
||||||
strlwr(skin); // all skin names are lowercase
|
strlwr(skin); // all skin names are lowercase
|
||||||
for (i = 0; i < numskins; i++)
|
for (i = 0; i < numskins; i++)
|
||||||
if (fastcmp(skins[i].name, skin))
|
|
||||||
{
|
{
|
||||||
mo->skin = &skins[i];
|
if (fastcmp(skins[i].name, skin))
|
||||||
return 0;
|
{
|
||||||
|
mo->skin = &skins[i];
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return luaL_error(L, "mobj.skin '%s' not found!", skin);
|
return luaL_error(L, "mobj.skin '%s' not found!", skin);
|
||||||
}
|
}
|
||||||
case mobj_color:
|
case mobj_color:
|
||||||
{
|
{
|
||||||
UINT8 newcolor = (UINT8)luaL_checkinteger(L,3);
|
UINT8 newcolor = (UINT8)luaL_checkinteger(L,3);
|
||||||
if (newcolor >= MAXTRANSLATIONS)
|
if (newcolor >= MAXTRANSLATIONS)
|
||||||
return luaL_error(L, "mobj.color %d out of range (0 - %d).", newcolor, MAXTRANSLATIONS-1);
|
return luaL_error(L, "mobj.color %d out of range (0 - %d).", newcolor, MAXTRANSLATIONS-1);
|
||||||
mo->color = newcolor;
|
mo->color = newcolor;
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
|
||||||
case mobj_bnext:
|
case mobj_bnext:
|
||||||
return NOSETPOS;
|
return NOSETPOS;
|
||||||
case mobj_bprev:
|
case mobj_bprev:
|
||||||
@@ -590,15 +583,15 @@ static int mobj_set(lua_State *L)
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case mobj_type: // yeah sure, we'll let you change the mobj's type.
|
case mobj_type: // yeah sure, we'll let you change the mobj's type.
|
||||||
{
|
{
|
||||||
mobjtype_t newtype = luaL_checkinteger(L, 3);
|
mobjtype_t newtype = luaL_checkinteger(L, 3);
|
||||||
if (newtype >= NUMMOBJTYPES)
|
if (newtype >= NUMMOBJTYPES)
|
||||||
return luaL_error(L, "mobj.type %d out of range (0 - %d).", newtype, NUMMOBJTYPES-1);
|
return luaL_error(L, "mobj.type %d out of range (0 - %d).", newtype, NUMMOBJTYPES-1);
|
||||||
mo->type = newtype;
|
mo->type = newtype;
|
||||||
mo->info = &mobjinfo[newtype];
|
mo->info = &mobjinfo[newtype];
|
||||||
P_SetScale(mo, mo->scale);
|
P_SetScale(mo, mo->scale);
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
|
||||||
case mobj_info:
|
case mobj_info:
|
||||||
return NOSET;
|
return NOSET;
|
||||||
case mobj_health:
|
case mobj_health:
|
||||||
@@ -666,23 +659,23 @@ static int mobj_set(lua_State *L)
|
|||||||
case mobj_mobjnum:
|
case mobj_mobjnum:
|
||||||
return UNIMPLEMENTED;
|
return UNIMPLEMENTED;
|
||||||
case mobj_scale:
|
case mobj_scale:
|
||||||
{
|
{
|
||||||
fixed_t scale = luaL_checkfixed(L, 3);
|
fixed_t scale = luaL_checkfixed(L, 3);
|
||||||
if (scale < FRACUNIT/100)
|
if (scale < FRACUNIT/100)
|
||||||
scale = FRACUNIT/100;
|
scale = FRACUNIT/100;
|
||||||
mo->destscale = scale;
|
mo->destscale = scale;
|
||||||
P_SetScale(mo, scale);
|
P_SetScale(mo, scale);
|
||||||
mo->old_scale = scale;
|
mo->old_scale = scale;
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
|
||||||
case mobj_destscale:
|
case mobj_destscale:
|
||||||
{
|
{
|
||||||
fixed_t scale = luaL_checkfixed(L, 3);
|
fixed_t scale = luaL_checkfixed(L, 3);
|
||||||
if (scale < FRACUNIT/100)
|
if (scale < FRACUNIT/100)
|
||||||
scale = FRACUNIT/100;
|
scale = FRACUNIT/100;
|
||||||
mo->destscale = scale;
|
mo->destscale = scale;
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
|
||||||
case mobj_scalespeed:
|
case mobj_scalespeed:
|
||||||
mo->scalespeed = luaL_checkfixed(L, 3);
|
mo->scalespeed = luaL_checkfixed(L, 3);
|
||||||
break;
|
break;
|
||||||
@@ -747,58 +740,58 @@ static int mobj_set(lua_State *L)
|
|||||||
mo->lightlevel = (INT16)luaL_checkinteger(L, 3);
|
mo->lightlevel = (INT16)luaL_checkinteger(L, 3);
|
||||||
break;
|
break;
|
||||||
case mobj_localskin:
|
case mobj_localskin:
|
||||||
{
|
|
||||||
if (mo->player)
|
|
||||||
{
|
{
|
||||||
SetLocalPlayerSkin(mo->player - players, luaL_optstring(L, 3, "none"), NULL);
|
if (mo->player)
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
INT32 i;
|
|
||||||
char skin[SKINNAMESIZE+1]; // all skin names are limited to this length
|
|
||||||
strlcpy(skin, luaL_optstring(L, 3, "none"), sizeof skin);
|
|
||||||
strlwr(skin); // all skin names are lowercase
|
|
||||||
|
|
||||||
if (!fasticmp(skin, "none"))
|
|
||||||
{
|
{
|
||||||
// Try localskins
|
SetLocalPlayerSkin(mo->player - players, luaL_optstring(L, 3, "none"), NULL);
|
||||||
for (i = 0; i < numlocalskins; i++)
|
|
||||||
{
|
|
||||||
if (fasticmp(localskins[i].name, skin))
|
|
||||||
{
|
|
||||||
mo->localskin = &localskins[i];
|
|
||||||
mo->skinlocal = true;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Try other skins
|
|
||||||
for (i = 0; i < numskins; i++)
|
|
||||||
{
|
|
||||||
if (fasticmp(skins[i].name, skin))
|
|
||||||
{
|
|
||||||
mo->localskin = &skins[i];
|
|
||||||
mo->skinlocal = false;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
mo->localskin = NULL;
|
INT32 i;
|
||||||
mo->skinlocal = false;
|
char skin[SKINNAMESIZE+1]; // all skin names are limited to this length
|
||||||
|
strlcpy(skin, luaL_optstring(L, 3, "none"), sizeof skin);
|
||||||
|
strlwr(skin); // all skin names are lowercase
|
||||||
|
|
||||||
|
if (!fasticmp(skin, "none"))
|
||||||
|
{
|
||||||
|
// Try localskins
|
||||||
|
for (i = 0; i < numlocalskins; i++)
|
||||||
|
{
|
||||||
|
if (fasticmp(localskins[i].name, skin))
|
||||||
|
{
|
||||||
|
mo->localskin = &localskins[i];
|
||||||
|
mo->skinlocal = true;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Try other skins
|
||||||
|
for (i = 0; i < numskins; i++)
|
||||||
|
{
|
||||||
|
if (fasticmp(skins[i].name, skin))
|
||||||
|
{
|
||||||
|
mo->localskin = &skins[i];
|
||||||
|
mo->skinlocal = false;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
mo->localskin = NULL;
|
||||||
|
mo->skinlocal = false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
|
||||||
case mobj_blendmode:
|
case mobj_blendmode:
|
||||||
{
|
{
|
||||||
INT32 blendmode = (INT32)luaL_checkinteger(L, 3);
|
INT32 blendmode = (INT32)luaL_checkinteger(L, 3);
|
||||||
if (blendmode < 0 || blendmode > AST_OVERLAY)
|
if (blendmode < 0 || blendmode > AST_OVERLAY)
|
||||||
return luaL_error(L, "mobj.blendmode %d out of range (0 - %d).", blendmode, AST_OVERLAY);
|
return luaL_error(L, "mobj.blendmode %d out of range (0 - %d).", blendmode, AST_OVERLAY);
|
||||||
mo->blendmode = blendmode;
|
mo->blendmode = blendmode;
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
|
||||||
case mobj_mirrored:
|
case mobj_mirrored:
|
||||||
mo->mirrored = luaL_checkboolean(L, 3);
|
mo->mirrored = luaL_checkboolean(L, 3);
|
||||||
break;
|
break;
|
||||||
@@ -950,13 +943,13 @@ static int mapthing_set(lua_State *L)
|
|||||||
mt->z = (INT16)luaL_checkinteger(L, 3);
|
mt->z = (INT16)luaL_checkinteger(L, 3);
|
||||||
break;
|
break;
|
||||||
case mapthing_extrainfo:
|
case mapthing_extrainfo:
|
||||||
{
|
{
|
||||||
INT32 extrainfo = luaL_checkinteger(L, 3);
|
INT32 extrainfo = luaL_checkinteger(L, 3);
|
||||||
if (extrainfo & ~15)
|
if (extrainfo & ~15)
|
||||||
return luaL_error(L, "mapthing_t extrainfo set %d out of range (%d - %d)", extrainfo, 0, 15);
|
return luaL_error(L, "mapthing_t extrainfo set %d out of range (%d - %d)", extrainfo, 0, 15);
|
||||||
mt->extrainfo = (UINT8)extrainfo;
|
mt->extrainfo = (UINT8)extrainfo;
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
|
||||||
case mapthing_mobj:
|
case mapthing_mobj:
|
||||||
mt->mobj = *((mobj_t **)luaL_checkudata(L, 3, META_MOBJ));
|
mt->mobj = *((mobj_t **)luaL_checkudata(L, 3, META_MOBJ));
|
||||||
break;
|
break;
|
||||||
|
|||||||
+45
-45
@@ -298,12 +298,12 @@ static int player_get(lua_State *L)
|
|||||||
lua_pushstring(L, player_names[plr-players]);
|
lua_pushstring(L, player_names[plr-players]);
|
||||||
break;
|
break;
|
||||||
case player_mo:
|
case player_mo:
|
||||||
{
|
{
|
||||||
if (plr->spectator)
|
if (plr->spectator)
|
||||||
lua_pushnil(L);
|
lua_pushnil(L);
|
||||||
else
|
else
|
||||||
LUA_PushUserdata(L, plr->mo, META_MOBJ);
|
LUA_PushUserdata(L, plr->mo, META_MOBJ);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case player_cmd:
|
case player_cmd:
|
||||||
LUA_PushUserdata(L, &plr->cmd, META_TICCMD);
|
LUA_PushUserdata(L, &plr->cmd, META_TICCMD);
|
||||||
@@ -668,11 +668,11 @@ static int player_set(lua_State *L)
|
|||||||
return 0; // In vanilla those are not handled and are added into player fields table, but they aren't accessible anyway so we can just ignore them
|
return 0; // In vanilla those are not handled and are added into player fields table, but they aren't accessible anyway so we can just ignore them
|
||||||
break;
|
break;
|
||||||
case player_mo:
|
case player_mo:
|
||||||
{
|
{
|
||||||
mobj_t *newmo = *((mobj_t **)luaL_checkudata(L, 3, META_MOBJ));
|
mobj_t *newmo = *((mobj_t **)luaL_checkudata(L, 3, META_MOBJ));
|
||||||
plr->mo->player = NULL; // remove player pointer from old mobj
|
plr->mo->player = NULL; // remove player pointer from old mobj
|
||||||
(newmo->player = plr)->mo = newmo; // set player pointer for new mobj, and set new mobj as the player's mobj
|
(newmo->player = plr)->mo = newmo; // set player pointer for new mobj, and set new mobj as the player's mobj
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case player_cmd:
|
case player_cmd:
|
||||||
return NOSET;
|
return NOSET;
|
||||||
@@ -692,17 +692,17 @@ static int player_set(lua_State *L)
|
|||||||
case player_bob:
|
case player_bob:
|
||||||
plr->bob = luaL_checkfixed(L, 3);*/
|
plr->bob = luaL_checkfixed(L, 3);*/
|
||||||
break;
|
break;
|
||||||
case player_aiming: {
|
case player_aiming:
|
||||||
plr->aiming = luaL_checkangle(L, 3);
|
{
|
||||||
if (plr == &players[consoleplayer])
|
plr->aiming = luaL_checkangle(L, 3);
|
||||||
localaiming[0] = plr->aiming;
|
for (UINT8 i = 0; i <= splitscreen; i++)
|
||||||
else if (plr == &players[displayplayers[1]])
|
{
|
||||||
localaiming[1] = plr->aiming;
|
if (plr == &players[displayplayers[i]])
|
||||||
else if (plr == &players[displayplayers[2]])
|
{
|
||||||
localaiming[2] = plr->aiming;
|
localaiming[i] = plr->aiming;
|
||||||
else if (plr == &players[displayplayers[3]])
|
}
|
||||||
localaiming[3] = plr->aiming;
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case player_health:
|
case player_health:
|
||||||
plr->health = (INT32)luaL_checkinteger(L, 3);
|
plr->health = (INT32)luaL_checkinteger(L, 3);
|
||||||
@@ -732,12 +732,12 @@ static int player_set(lua_State *L)
|
|||||||
plr->flashpal = (UINT16)luaL_checkinteger(L, 3);
|
plr->flashpal = (UINT16)luaL_checkinteger(L, 3);
|
||||||
break;
|
break;
|
||||||
case player_skincolor:
|
case player_skincolor:
|
||||||
{
|
{
|
||||||
UINT8 newcolor = (UINT8)luaL_checkinteger(L,3);
|
UINT8 newcolor = (UINT8)luaL_checkinteger(L,3);
|
||||||
if (newcolor >= MAXSKINCOLORS)
|
if (newcolor >= MAXSKINCOLORS)
|
||||||
return luaL_error(L, "player.skincolor %d out of range (0 - %d).", newcolor, MAXSKINCOLORS-1);
|
return luaL_error(L, "player.skincolor %d out of range (0 - %d).", newcolor, MAXSKINCOLORS-1);
|
||||||
plr->skincolor = newcolor;
|
plr->skincolor = newcolor;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case player_score:
|
case player_score:
|
||||||
plr->score = (UINT32)luaL_checkinteger(L, 3);
|
plr->score = (UINT32)luaL_checkinteger(L, 3);
|
||||||
@@ -907,12 +907,12 @@ static int player_set(lua_State *L)
|
|||||||
plr->bonustime = luaL_checkboolean(L, 3);
|
plr->bonustime = luaL_checkboolean(L, 3);
|
||||||
break;
|
break;
|
||||||
case player_capsule:
|
case player_capsule:
|
||||||
{
|
{
|
||||||
mobj_t *mo = NULL;
|
mobj_t *mo = NULL;
|
||||||
if (!lua_isnil(L, 3))
|
if (!lua_isnil(L, 3))
|
||||||
mo = *((mobj_t **)luaL_checkudata(L, 3, META_MOBJ));
|
mo = *((mobj_t **)luaL_checkudata(L, 3, META_MOBJ));
|
||||||
P_SetTarget(&plr->capsule, mo);
|
P_SetTarget(&plr->capsule, mo);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case player_mare:
|
case player_mare:
|
||||||
plr->mare = (UINT8)luaL_checkinteger(L, 3);
|
plr->mare = (UINT8)luaL_checkinteger(L, 3);
|
||||||
@@ -963,19 +963,19 @@ static int player_set(lua_State *L)
|
|||||||
plr->onconveyor = (INT32)luaL_checkinteger(L, 3);
|
plr->onconveyor = (INT32)luaL_checkinteger(L, 3);
|
||||||
break;
|
break;
|
||||||
case player_awayviewmobj:
|
case player_awayviewmobj:
|
||||||
{
|
{
|
||||||
mobj_t *mo = NULL;
|
mobj_t *mo = NULL;
|
||||||
if (!lua_isnil(L, 3))
|
if (!lua_isnil(L, 3))
|
||||||
mo = *((mobj_t **)luaL_checkudata(L, 3, META_MOBJ));
|
mo = *((mobj_t **)luaL_checkudata(L, 3, META_MOBJ));
|
||||||
P_SetTarget(&plr->awayviewmobj, mo);
|
P_SetTarget(&plr->awayviewmobj, mo);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case player_awayviewtics:
|
case player_awayviewtics:
|
||||||
{
|
{
|
||||||
plr->awayviewtics = (INT32)luaL_checkinteger(L, 3);
|
plr->awayviewtics = (INT32)luaL_checkinteger(L, 3);
|
||||||
if (plr->awayviewtics && !plr->awayviewmobj) // awayviewtics must ALWAYS have an awayviewmobj set!!
|
if (plr->awayviewtics && !plr->awayviewmobj) // awayviewtics must ALWAYS have an awayviewmobj set!!
|
||||||
P_SetTarget(&plr->awayviewmobj, plr->mo); // but since the script might set awayviewmobj immediately AFTER setting awayviewtics, use player mobj as filler for now.
|
P_SetTarget(&plr->awayviewmobj, plr->mo); // but since the script might set awayviewmobj immediately AFTER setting awayviewtics, use player mobj as filler for now.
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case player_awayviewaiming:
|
case player_awayviewaiming:
|
||||||
plr->awayviewaiming = luaL_checkangle(L, 3);
|
plr->awayviewaiming = luaL_checkangle(L, 3);
|
||||||
|
|||||||
+2
-2
@@ -1004,7 +1004,7 @@ static menuitem_t OP_ExpOptionsMenu[] =
|
|||||||
#ifdef HWRENDER
|
#ifdef HWRENDER
|
||||||
{IT_STRING | IT_CVAR, NULL, "Screen Textures", &cv_glscreentextures, 95},
|
{IT_STRING | IT_CVAR, NULL, "Screen Textures", &cv_glscreentextures, 95},
|
||||||
#ifdef USE_FBO_OGL
|
#ifdef USE_FBO_OGL
|
||||||
{IT_STRING | IT_CVAR, NULL, "FBO Downsampling support", &cv_glframebuffer, 100},
|
{IT_STRING | IT_CVAR, NULL, "FBO support", &cv_glframebuffer, 100},
|
||||||
{IT_STRING | IT_CVAR, NULL, "Palette Depth", &cv_glpalettedepth, 110},
|
{IT_STRING | IT_CVAR, NULL, "Palette Depth", &cv_glpalettedepth, 110},
|
||||||
{IT_DISABLED, NULL, "", NULL, 120}, // dummy text
|
{IT_DISABLED, NULL, "", NULL, 120}, // dummy text
|
||||||
#else
|
#else
|
||||||
@@ -1030,7 +1030,7 @@ static const char* OP_ExpTooltips[] =
|
|||||||
#ifdef HWRENDER
|
#ifdef HWRENDER
|
||||||
"Disabling Screen Textures may result in a performance boost\nbut will break certain effects.\nScreen textures are required at resolutions lower than your desktop resolution!",
|
"Disabling Screen Textures may result in a performance boost\nbut will break certain effects.\nScreen textures are required at resolutions lower than your desktop resolution!",
|
||||||
#ifdef USE_FBO_OGL
|
#ifdef USE_FBO_OGL
|
||||||
"Allows the game to downsample from a higher resolution\nthan your display in OpenGL renderer mode.\nRequires a GPU with atleast OpenGL 2.1 support.",
|
"Allows the game to downsample from a higher resolution\nthan your display in OpenGL renderer mode.\nThis can be set to automatically enable if the game resolution\nis higher than the current Display Resolution\nor enabled at all times.\nThis may improve performance in some cases.\nRequires a GPU with atleast OpenGL 2.1 support.",
|
||||||
#endif
|
#endif
|
||||||
"Change the bit depth of the Lookup Palette in Palette rendering mode\n 16 bits is like software looks ingame\nwhile 24 bits is how software looks in screenshots.",
|
"Change the bit depth of the Lookup Palette in Palette rendering mode\n 16 bits is like software looks ingame\nwhile 24 bits is how software looks in screenshots.",
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -504,6 +504,9 @@ typedef struct subsector_s
|
|||||||
void *splats; // floorsplat_t list
|
void *splats; // floorsplat_t list
|
||||||
#endif
|
#endif
|
||||||
size_t validcount;
|
size_t validcount;
|
||||||
|
#ifdef HWRENDER
|
||||||
|
boolean hashorizon; // not really needed for software, this stuff works differently there
|
||||||
|
#endif
|
||||||
} subsector_t;
|
} subsector_t;
|
||||||
|
|
||||||
// Sector list node showing all sectors an object appears in.
|
// Sector list node showing all sectors an object appears in.
|
||||||
|
|||||||
+19
-54
@@ -113,10 +113,6 @@ consvar_t cv_keyboardlayout = {"keyboardlayout", "Default US", CV_SAVE|CV_CALL,
|
|||||||
|
|
||||||
static void Impl_SetVsync(void);
|
static void Impl_SetVsync(void);
|
||||||
|
|
||||||
static INT32 desktopwidth = 0, desktopheight = 0;
|
|
||||||
|
|
||||||
static void I_CheckDesktopRes(void);
|
|
||||||
|
|
||||||
// synchronize page flipping with screen refresh
|
// synchronize page flipping with screen refresh
|
||||||
consvar_t cv_vidwait = {"vid_wait", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, Impl_SetVsync, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_vidwait = {"vid_wait", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, Impl_SetVsync, 0, NULL, NULL, 0, 0, NULL};
|
||||||
static consvar_t cv_stretch = {"stretch", "Off", CV_SAVE|CV_NOSHOWHELP, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
static consvar_t cv_stretch = {"stretch", "Off", CV_SAVE|CV_NOSHOWHELP, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
@@ -512,10 +508,10 @@ static void Impl_HandleWindowEvent(SDL_WindowEvent evt)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (windowmoved && rendermode == render_opengl)
|
if (windowmoved)
|
||||||
{
|
{
|
||||||
I_CheckDesktopRes();
|
|
||||||
#ifdef USE_FBO_OGL
|
#ifdef USE_FBO_OGL
|
||||||
|
if (rendermode == render_opengl)
|
||||||
I_CheckDownSampleState(false);
|
I_CheckDownSampleState(false);
|
||||||
#endif
|
#endif
|
||||||
windowmoved = SDL_FALSE;
|
windowmoved = SDL_FALSE;
|
||||||
@@ -1223,9 +1219,7 @@ static void VID_Command_ModeList_f(void)
|
|||||||
// List windowed modes
|
// List windowed modes
|
||||||
INT32 i = 0;
|
INT32 i = 0;
|
||||||
|
|
||||||
CONS_Printf("NOTE: Under SDL2, all modes are supported on all platforms.\n"
|
CONS_Printf("NOTE: Under SDL2, all modes are supported on all platforms.\n");
|
||||||
"Under opengl, fullscreen only supports native desktop resolution.\n"
|
|
||||||
"Under software, the mode is stretched up to desktop resolution.\n");
|
|
||||||
|
|
||||||
for (i = 0; i < MAXWINMODES; i++)
|
for (i = 0; i < MAXWINMODES; i++)
|
||||||
{
|
{
|
||||||
@@ -1251,44 +1245,6 @@ static void VID_Command_Mode_f (void)
|
|||||||
setmodeneeded = modenum+1; // request vid mode change
|
setmodeneeded = modenum+1; // request vid mode change
|
||||||
}
|
}
|
||||||
|
|
||||||
// Get the desktop resolution from the current display the gamewindow resides on
|
|
||||||
static void I_CheckDesktopRes(void)
|
|
||||||
{
|
|
||||||
int currentDisplayIndex = -1;
|
|
||||||
SDL_DisplayMode curmode;
|
|
||||||
|
|
||||||
// just fallback to game res ig?
|
|
||||||
desktopwidth = vid.width;
|
|
||||||
desktopheight = vid.height;
|
|
||||||
|
|
||||||
currentDisplayIndex = SDL_GetWindowDisplayIndex(window);
|
|
||||||
|
|
||||||
// No valid index
|
|
||||||
if (currentDisplayIndex < 0)
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (SDL_GetCurrentDisplayMode(currentDisplayIndex, &curmode) < 0)
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
desktopwidth = curmode.w;
|
|
||||||
desktopheight = curmode.h;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check if the game resolution matches the desktop resolution
|
|
||||||
boolean I_CheckNativeRes(void)
|
|
||||||
{
|
|
||||||
return (vid.width == desktopwidth && vid.height == desktopheight);
|
|
||||||
}
|
|
||||||
|
|
||||||
static boolean I_CheckAboveDesktopRes(INT32 width, INT32 height)
|
|
||||||
{
|
|
||||||
return (width > desktopwidth || height > desktopheight);
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifdef USE_FBO_OGL
|
#ifdef USE_FBO_OGL
|
||||||
static boolean vid_downsampling = false;
|
static boolean vid_downsampling = false;
|
||||||
|
|
||||||
@@ -1307,16 +1263,24 @@ void I_CheckDownSampleState(boolean forcerefresh)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// no sense to do this crap if we cant benefit from it
|
// no sense to do this crap if we cant benefit from it
|
||||||
const boolean newdownsamplestate = cv_glframebuffer.value && (cv_glscreentextures.value == 2) && I_CheckAboveDesktopRes(vid.width, vid.height);
|
boolean newdownsamplestate = false;
|
||||||
|
|
||||||
|
if (cv_glframebuffer.value && (cv_glscreentextures.value == 2))
|
||||||
|
{
|
||||||
|
int sdlw, sdlh;
|
||||||
|
SDL_GetWindowSize(window, &sdlw, &sdlh);
|
||||||
|
if (vid.width > sdlw || vid.height > sdlh)
|
||||||
|
newdownsamplestate = true;
|
||||||
|
}
|
||||||
|
|
||||||
// state changed or fbo was toggled
|
// state changed or fbo was toggled
|
||||||
if (vid_downsampling != newdownsamplestate || forcerefresh)
|
if (vid_downsampling != newdownsamplestate || forcerefresh)
|
||||||
{
|
{
|
||||||
//printf("downsample changed from %d to %d\n", vid_downsampling, curdownsamplestate);
|
//printf("downsample changed from %d to %d\n", vid_downsampling, newdownsamplestate);
|
||||||
|
// needs to be reset before refreshing the gl surface!
|
||||||
|
vid_downsampling = newdownsamplestate;
|
||||||
OglSdlSurface(vid.width, vid.height);
|
OglSdlSurface(vid.width, vid.height);
|
||||||
}
|
}
|
||||||
|
|
||||||
vid_downsampling = newdownsamplestate;
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -1346,8 +1310,8 @@ static void SDLSetMode(INT32 width, INT32 height, SDL_bool fullscreen)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Reposition window only in windowed mode
|
// Reposition window only in windowed mode
|
||||||
const int windowpos = SDL_GetWindowDisplayIndex(window);
|
|
||||||
SDL_SetWindowSize(window, width, height);
|
SDL_SetWindowSize(window, width, height);
|
||||||
|
const int windowpos = SDL_GetWindowDisplayIndex(window);
|
||||||
SDL_SetWindowPosition(window,
|
SDL_SetWindowPosition(window,
|
||||||
SDL_WINDOWPOS_CENTERED_DISPLAY(windowpos),
|
SDL_WINDOWPOS_CENTERED_DISPLAY(windowpos),
|
||||||
SDL_WINDOWPOS_CENTERED_DISPLAY(windowpos)
|
SDL_WINDOWPOS_CENTERED_DISPLAY(windowpos)
|
||||||
@@ -1370,7 +1334,6 @@ static void SDLSetMode(INT32 width, INT32 height, SDL_bool fullscreen)
|
|||||||
#ifdef HWRENDER
|
#ifdef HWRENDER
|
||||||
if (rendermode == render_opengl)
|
if (rendermode == render_opengl)
|
||||||
{
|
{
|
||||||
I_CheckDesktopRes();
|
|
||||||
#ifdef USE_FBO_OGL
|
#ifdef USE_FBO_OGL
|
||||||
I_CheckDownSampleState(false);
|
I_CheckDownSampleState(false);
|
||||||
#endif
|
#endif
|
||||||
@@ -1568,7 +1531,7 @@ void VID_PrepareModeList(void)
|
|||||||
static UINT32 refresh_rate;
|
static UINT32 refresh_rate;
|
||||||
static UINT32 VID_GetRefreshRate(void)
|
static UINT32 VID_GetRefreshRate(void)
|
||||||
{
|
{
|
||||||
int index = SDL_GetWindowDisplayIndex(window);
|
int index;
|
||||||
SDL_DisplayMode m;
|
SDL_DisplayMode m;
|
||||||
|
|
||||||
if (SDL_WasInit(SDL_INIT_VIDEO) == 0)
|
if (SDL_WasInit(SDL_INIT_VIDEO) == 0)
|
||||||
@@ -1577,6 +1540,8 @@ static UINT32 VID_GetRefreshRate(void)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
index = SDL_GetWindowDisplayIndex(window);
|
||||||
|
|
||||||
if (SDL_GetDesktopDisplayMode(index, &m) != 0)
|
if (SDL_GetDesktopDisplayMode(index, &m) != 0)
|
||||||
{
|
{
|
||||||
// Error has occurred.
|
// Error has occurred.
|
||||||
|
|||||||
+3
-5
@@ -65,7 +65,7 @@ PFNglGetString pglGetString;
|
|||||||
#ifdef USE_FBO_OGL
|
#ifdef USE_FBO_OGL
|
||||||
boolean UseScreenFBO(void)
|
boolean UseScreenFBO(void)
|
||||||
{
|
{
|
||||||
return (supportFBO && cv_glframebuffer.value && I_IsDownsampling() && (cv_glscreentextures.value == 2));
|
return (supportFBO && cv_glframebuffer.value && (cv_glscreentextures.value == 2) && (cv_glframebuffer.value == 2 || I_IsDownsampling()));
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -225,7 +225,6 @@ boolean OglSdlSurface(INT32 w, INT32 h)
|
|||||||
void OglSdlFinishUpdate(SDL_Window *window)
|
void OglSdlFinishUpdate(SDL_Window *window)
|
||||||
{
|
{
|
||||||
int sdlw, sdlh;
|
int sdlw, sdlh;
|
||||||
|
|
||||||
#ifdef USE_FBO_OGL
|
#ifdef USE_FBO_OGL
|
||||||
const boolean usefbo = UseScreenFBO();
|
const boolean usefbo = UseScreenFBO();
|
||||||
#endif
|
#endif
|
||||||
@@ -262,11 +261,10 @@ void OglSdlFinishUpdate(SDL_Window *window)
|
|||||||
|
|
||||||
// Sryder: We need to draw the final screen texture again into the other buffer in the original position so that
|
// Sryder: We need to draw the final screen texture again into the other buffer in the original position so that
|
||||||
// effects that want to take the old screen can do so after this
|
// effects that want to take the old screen can do so after this
|
||||||
// well we dont need it on native res it seems
|
|
||||||
#ifdef USE_FBO_OGL
|
#ifdef USE_FBO_OGL
|
||||||
if (!usefbo && (!I_CheckNativeRes() || WipeInAction))
|
if (!usefbo && (realwidth != sdlw || realheight != sdlh)) // not needed if fbo is in use
|
||||||
#else
|
#else
|
||||||
if (!I_CheckNativeRes() || WipeInAction)
|
if (realwidth != sdlw || realheight != sdlh) // this is not needed if the render size matches window size
|
||||||
#endif
|
#endif
|
||||||
HWR_DrawScreenFinalTexture(realwidth, realheight);
|
HWR_DrawScreenFinalTexture(realwidth, realheight);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user