Half-Life-RTX
/
xash3d-fwgs
mirror of https://github.com/w23/xash3d-fwgs
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix rad file parsing 

parsing strings in c is hard
This commit is contained in:
Ivan Avdeev 2021-09-06 13:37:06 -07:00 committed by Ivan Avdeev
parent 86d669c708
commit 2b2552cd72
2 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ref_vk/shaders/ray.rgen
View File

@ -327,5 +327,5 @@ void main() {
prev_frame *= prev_frame;
C = mix(C, prev_frame, push_constants.prev_frame_blend_factor);
}
imageStore(image, ivec2(gl_LaunchIDEXT.xy), vec4(sqrt(C), 1.));
imageStore(image, ivec2(gl_LaunchIDEXT.xy), vec4(sqrt(C/20.), 1.));
}

34
ref_vk/vk_light.c
View File

@ -32,7 +32,8 @@ static int lookupTextureF( const char *fmt, ...) {
static void loadRadData( const model_t *map, const char *fmt, ... ) {
fs_offset_t size;
byte *data, *buffer;
char *data;
byte *buffer;
char filename[1024];
va_list argptr;
@ -47,12 +48,22 @@ static void loadRadData( const model_t *map, const char *fmt, ... ) {
return;
}
data = buffer;
while (*data != '\0') {
data = (char*)buffer;
for (;;) {
string name;
float r, g, b, scale;
float r=0, g=0, b=0, scale=0;
int num;
char* line_end;
int num = sscanf(data, "%s %f %f %f %f", name, &r, &g, &b, &scale);
while (*data != '\0' && isspace(*data)) ++data;
if (*data == '\0')
break;
line_end = Q_strchr(data, '\n');
if (line_end) *line_end = '\0';
num = sscanf(data, "%s %f %f %f %f", name, &r, &g, &b, &scale);
gEngine.Con_Printf("raw rad entry (%d): %s %f %f %f %f\n", num, name, r, g, b, scale);
if (num == 2) {
r = g = b;
} else if (num == 5) {
@ -68,7 +79,7 @@ static void loadRadData( const model_t *map, const char *fmt, ... ) {
}
if (num != 0) {
gEngine.Con_Printf("rad entry: %s %f %f %f\n", name, r, g, b);
gEngine.Con_Printf("rad entry (%d): %s %f %f %f (%f)\n", num, name, r, g, b, scale);
{
const char *wad_name = NULL;
@ -96,10 +107,6 @@ static void loadRadData( const model_t *map, const char *fmt, ... ) {
tex_id = lookupTextureF("%s.wad/%s.mip", wad_name, texture_name);
}
if (!tex_id) {
tex_id = lookupTextureF("%s.wad/+%s.mip", wad_name, texture_name);
}
if (tex_id) {
ASSERT(tex_id < MAX_TEXTURES);
@ -111,11 +118,10 @@ static void loadRadData( const model_t *map, const char *fmt, ... ) {
}
}
data = Q_strchr(data, '\n');
if (!data)
if (!line_end)
break;
while (!isalnum(*data) && *data != '\0')
++data;
data = line_end + 1;
}
Mem_Free(buffer);