X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=blobdiff_plain;f=libs%2Fpicomodel%2Fpicointernal.h;h=98b6cf8f1cd0ff1c7f20766a576c2215dd0b9c67;hp=07c24cb570c39b2a5b2d102ee253f4addf158a2c;hb=fda66ae00e9a2ab6d3ebaede13b12fa6767cf856;hpb=b7e36c120eb1546a6c6f97f30e42ab7f9a559c61

diff --git a/libs/picomodel/picointernal.h b/libs/picomodel/picointernal.h
index 07c24cb5..98b6cf8f 100644
--- a/libs/picomodel/picointernal.h
+++ b/libs/picomodel/picointernal.h
@@ -38,6 +38,8 @@
 #ifndef PICOINTERNAL_H
 #define PICOINTERNAL_H
 
+#include "globaldefs.h"
+
 #ifdef __cplusplus
 extern "C"
 {
@@ -56,7 +58,7 @@ extern "C"
 
 
 /* os dependent replacements */
-#if WIN32 || _WIN32
+#if GDEF_OS_WINDOWS
 	#define _pico_stricmp stricmp
 	#define _pico_strnicmp strnicmp
 #else
@@ -75,25 +77,31 @@ extern "C"
 #define PICO_IOEOF  1
 #define PICO_IOERR  2
 
+extern const picoColor_t picoColor_white;
+
 /* types */
+#ifndef byte
+	typedef unsigned char byte;
+#endif
+
 typedef struct picoParser_s
 {
-	const char  *buffer;
+	const char *buffer;
 	int bufSize;
-	char    *token;
+	char *token;
 	int tokenSize;
 	int tokenMax;
-	const char  *cursor;
-	const char  *max;
+	const char *cursor;
+	const char *max;
 	int curLine;
 }
 picoParser_t;
 
 typedef struct picoMemStream_s
 {
-	const picoByte_t    *buffer;
+	const picoByte_t *buffer;
 	int bufSize;
-	const picoByte_t    *curPos;
+	const picoByte_t *curPos;
 	int flag;
 }
 picoMemStream_t;
@@ -132,10 +140,11 @@ void            _pico_printf( int level, const char *format, ... );
 const char      *_pico_stristr( const char *str, const char *substr );
 void            _pico_unixify( char *path );
 int             _pico_nofname( const char *path, char *dest, int destSize );
-const char *_pico_nopath( const char *path );
+const char      *_pico_nopath( const char *path );
 char            *_pico_setfext( char *path, const char *ext );
 int             _pico_getline( char *buf, int bufsize, char *dest, int destsize );
 char            *_pico_strlwr( char *str );
+void            _pico_deduce_shadernames( picoModel_t *model );
 
 /* vectors */
 void            _pico_zero_bounds( picoVec3_t mins, picoVec3_t maxs );
@@ -146,7 +155,7 @@ void            _pico_zero_vec4( picoVec4_t vec );
 void            _pico_set_vec( picoVec3_t v, float a, float b, float c );
 void            _pico_set_vec4( picoVec4_t v, float a, float b, float c, float d );
 void            _pico_set_color( picoColor_t c, int r, int g, int b, int a );
-void            _pico_copy_color( picoColor_t src, picoColor_t dest );
+void            _pico_copy_color( const picoColor_t src, picoColor_t dest );
 void            _pico_copy_vec( picoVec3_t src, picoVec3_t dest );
 void            _pico_copy_vec2( picoVec2_t src, picoVec2_t dest );
 picoVec_t       _pico_normalize_vec( picoVec3_t vec );