diff --git a/extern/lib/glad.lib b/extern/lib/glad.lib index 2b72d5e4..dbd51707 100644 Binary files a/extern/lib/glad.lib and b/extern/lib/glad.lib differ diff --git a/extern/lib/glad.pdb b/extern/lib/glad.pdb index 00514a32..9a889114 100644 Binary files a/extern/lib/glad.pdb and b/extern/lib/glad.pdb differ diff --git a/extern/lib/gladd.lib b/extern/lib/gladd.lib index ec49bee3..4d74024a 100644 Binary files a/extern/lib/gladd.lib and b/extern/lib/gladd.lib differ diff --git a/extern/lib/gladd.pdb b/extern/lib/gladd.pdb index a9037388..86f91a7f 100644 Binary files a/extern/lib/gladd.pdb and b/extern/lib/gladd.pdb differ diff --git a/extern/src/glad/glad.h b/extern/src/glad/glad.h index aa397df6..b10ccb8b 100644 --- a/extern/src/glad/glad.h +++ b/extern/src/glad/glad.h @@ -1,4698 +1,5190 @@ -/* - - OpenGL loader generated by glad 0.1.36 on Mon Feb 14 10:15:05 2022. - - Language/Generator: C/C++ - Specification: gl - APIs: gl=4.3 - Profile: compatibility - Extensions: - GL_EXT_texture_compression_rgtc, - GL_EXT_texture_compression_s3tc, - GL_EXT_texture_filter_anisotropic - Loader: False - Local files: False - Omit khrplatform: False - Reproducible: False - - Commandline: - --profile="compatibility" --api="gl=4.3" --generator="c" --spec="gl" --no-loader --extensions="GL_EXT_texture_compression_rgtc,GL_EXT_texture_compression_s3tc,GL_EXT_texture_filter_anisotropic" - Online: - https://glad.dav1d.de/#profile=compatibility&language=c&specification=gl&api=gl%3D4.3&extensions=GL_EXT_texture_compression_rgtc&extensions=GL_EXT_texture_compression_s3tc&extensions=GL_EXT_texture_filter_anisotropic -*/ - - -#ifndef __glad_h_ -#define __glad_h_ - -#ifdef __gl_h_ -#error OpenGL header already included, remove this include, glad already provides it -#endif -#define __gl_h_ - -#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) -#define APIENTRY __stdcall -#endif - -#ifndef APIENTRY -#define APIENTRY -#endif -#ifndef APIENTRYP -#define APIENTRYP APIENTRY * -#endif - -#ifndef GLAPIENTRY -#define GLAPIENTRY APIENTRY -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -struct gladGLversionStruct { - int major; - int minor; -}; - -typedef void* (* GLADloadproc)(const char *name); - -#ifndef GLAPI -# if defined(GLAD_GLAPI_EXPORT) -# if defined(_WIN32) || defined(__CYGWIN__) -# if defined(GLAD_GLAPI_EXPORT_BUILD) -# if defined(__GNUC__) -# define GLAPI __attribute__ ((dllexport)) extern -# else -# define GLAPI __declspec(dllexport) extern -# endif -# else -# if defined(__GNUC__) -# define GLAPI __attribute__ ((dllimport)) extern -# else -# define GLAPI __declspec(dllimport) extern -# endif -# endif -# elif defined(__GNUC__) && defined(GLAD_GLAPI_EXPORT_BUILD) -# define GLAPI __attribute__ ((visibility ("default"))) extern -# else -# define GLAPI extern -# endif -# else -# define GLAPI extern -# endif -#endif - -GLAPI struct gladGLversionStruct GLVersion; -GLAPI int gladLoadGLLoader(GLADloadproc); - -#include -typedef unsigned int GLenum; -typedef unsigned char GLboolean; -typedef unsigned int GLbitfield; -typedef void GLvoid; -typedef khronos_int8_t GLbyte; -typedef khronos_uint8_t GLubyte; -typedef khronos_int16_t GLshort; -typedef khronos_uint16_t GLushort; -typedef int GLint; -typedef unsigned int GLuint; -typedef khronos_int32_t GLclampx; -typedef int GLsizei; -typedef khronos_float_t GLfloat; -typedef khronos_float_t GLclampf; -typedef double GLdouble; -typedef double GLclampd; -typedef void *GLeglClientBufferEXT; -typedef void *GLeglImageOES; -typedef char GLchar; -typedef char GLcharARB; -#ifdef __APPLE__ -typedef void *GLhandleARB; -#else -typedef unsigned int GLhandleARB; -#endif -typedef khronos_uint16_t GLhalf; -typedef khronos_uint16_t GLhalfARB; -typedef khronos_int32_t GLfixed; -typedef khronos_intptr_t GLintptr; -typedef khronos_intptr_t GLintptrARB; -typedef khronos_ssize_t GLsizeiptr; -typedef khronos_ssize_t GLsizeiptrARB; -typedef khronos_int64_t GLint64; -typedef khronos_int64_t GLint64EXT; -typedef khronos_uint64_t GLuint64; -typedef khronos_uint64_t GLuint64EXT; -typedef struct __GLsync *GLsync; -struct _cl_context; -struct _cl_event; -typedef void (APIENTRY *GLDEBUGPROC)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,const void *userParam); -typedef void (APIENTRY *GLDEBUGPROCARB)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,const void *userParam); -typedef void (APIENTRY *GLDEBUGPROCKHR)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,const void *userParam); -typedef void (APIENTRY *GLDEBUGPROCAMD)(GLuint id,GLenum category,GLenum severity,GLsizei length,const GLchar *message,void *userParam); -typedef unsigned short GLhalfNV; -typedef GLintptr GLvdpauSurfaceNV; -typedef void (APIENTRY *GLVULKANPROCNV)(void); -#define GL_DEPTH_BUFFER_BIT 0x00000100 -#define GL_STENCIL_BUFFER_BIT 0x00000400 -#define GL_COLOR_BUFFER_BIT 0x00004000 -#define GL_FALSE 0 -#define GL_TRUE 1 -#define GL_POINTS 0x0000 -#define GL_LINES 0x0001 -#define GL_LINE_LOOP 0x0002 -#define GL_LINE_STRIP 0x0003 -#define GL_TRIANGLES 0x0004 -#define GL_TRIANGLE_STRIP 0x0005 -#define GL_TRIANGLE_FAN 0x0006 -#define GL_QUADS 0x0007 -#define GL_NEVER 0x0200 -#define GL_LESS 0x0201 -#define GL_EQUAL 0x0202 -#define GL_LEQUAL 0x0203 -#define GL_GREATER 0x0204 -#define GL_NOTEQUAL 0x0205 -#define GL_GEQUAL 0x0206 -#define GL_ALWAYS 0x0207 -#define GL_ZERO 0 -#define GL_ONE 1 -#define GL_SRC_COLOR 0x0300 -#define GL_ONE_MINUS_SRC_COLOR 0x0301 -#define GL_SRC_ALPHA 0x0302 -#define GL_ONE_MINUS_SRC_ALPHA 0x0303 -#define GL_DST_ALPHA 0x0304 -#define GL_ONE_MINUS_DST_ALPHA 0x0305 -#define GL_DST_COLOR 0x0306 -#define GL_ONE_MINUS_DST_COLOR 0x0307 -#define GL_SRC_ALPHA_SATURATE 0x0308 -#define GL_NONE 0 -#define GL_FRONT_LEFT 0x0400 -#define GL_FRONT_RIGHT 0x0401 -#define GL_BACK_LEFT 0x0402 -#define GL_BACK_RIGHT 0x0403 -#define GL_FRONT 0x0404 -#define GL_BACK 0x0405 -#define GL_LEFT 0x0406 -#define GL_RIGHT 0x0407 -#define GL_FRONT_AND_BACK 0x0408 -#define GL_NO_ERROR 0 -#define GL_INVALID_ENUM 0x0500 -#define GL_INVALID_VALUE 0x0501 -#define GL_INVALID_OPERATION 0x0502 -#define GL_OUT_OF_MEMORY 0x0505 -#define GL_CW 0x0900 -#define GL_CCW 0x0901 -#define GL_POINT_SIZE 0x0B11 -#define GL_POINT_SIZE_RANGE 0x0B12 -#define GL_POINT_SIZE_GRANULARITY 0x0B13 -#define GL_LINE_SMOOTH 0x0B20 -#define GL_LINE_WIDTH 0x0B21 -#define GL_LINE_WIDTH_RANGE 0x0B22 -#define GL_LINE_WIDTH_GRANULARITY 0x0B23 -#define GL_POLYGON_MODE 0x0B40 -#define GL_POLYGON_SMOOTH 0x0B41 -#define GL_CULL_FACE 0x0B44 -#define GL_CULL_FACE_MODE 0x0B45 -#define GL_FRONT_FACE 0x0B46 -#define GL_DEPTH_RANGE 0x0B70 -#define GL_DEPTH_TEST 0x0B71 -#define GL_DEPTH_WRITEMASK 0x0B72 -#define GL_DEPTH_CLEAR_VALUE 0x0B73 -#define GL_DEPTH_FUNC 0x0B74 -#define GL_STENCIL_TEST 0x0B90 -#define GL_STENCIL_CLEAR_VALUE 0x0B91 -#define GL_STENCIL_FUNC 0x0B92 -#define GL_STENCIL_VALUE_MASK 0x0B93 -#define GL_STENCIL_FAIL 0x0B94 -#define GL_STENCIL_PASS_DEPTH_FAIL 0x0B95 -#define GL_STENCIL_PASS_DEPTH_PASS 0x0B96 -#define GL_STENCIL_REF 0x0B97 -#define GL_STENCIL_WRITEMASK 0x0B98 -#define GL_VIEWPORT 0x0BA2 -#define GL_DITHER 0x0BD0 -#define GL_BLEND_DST 0x0BE0 -#define GL_BLEND_SRC 0x0BE1 -#define GL_BLEND 0x0BE2 -#define GL_LOGIC_OP_MODE 0x0BF0 -#define GL_DRAW_BUFFER 0x0C01 -#define GL_READ_BUFFER 0x0C02 -#define GL_SCISSOR_BOX 0x0C10 -#define GL_SCISSOR_TEST 0x0C11 -#define GL_COLOR_CLEAR_VALUE 0x0C22 -#define GL_COLOR_WRITEMASK 0x0C23 -#define GL_DOUBLEBUFFER 0x0C32 -#define GL_STEREO 0x0C33 -#define GL_LINE_SMOOTH_HINT 0x0C52 -#define GL_POLYGON_SMOOTH_HINT 0x0C53 -#define GL_UNPACK_SWAP_BYTES 0x0CF0 -#define GL_UNPACK_LSB_FIRST 0x0CF1 -#define GL_UNPACK_ROW_LENGTH 0x0CF2 -#define GL_UNPACK_SKIP_ROWS 0x0CF3 -#define GL_UNPACK_SKIP_PIXELS 0x0CF4 -#define GL_UNPACK_ALIGNMENT 0x0CF5 -#define GL_PACK_SWAP_BYTES 0x0D00 -#define GL_PACK_LSB_FIRST 0x0D01 -#define GL_PACK_ROW_LENGTH 0x0D02 -#define GL_PACK_SKIP_ROWS 0x0D03 -#define GL_PACK_SKIP_PIXELS 0x0D04 -#define GL_PACK_ALIGNMENT 0x0D05 -#define GL_MAX_TEXTURE_SIZE 0x0D33 -#define GL_MAX_VIEWPORT_DIMS 0x0D3A -#define GL_SUBPIXEL_BITS 0x0D50 -#define GL_TEXTURE_1D 0x0DE0 -#define GL_TEXTURE_2D 0x0DE1 -#define GL_TEXTURE_WIDTH 0x1000 -#define GL_TEXTURE_HEIGHT 0x1001 -#define GL_TEXTURE_BORDER_COLOR 0x1004 -#define GL_DONT_CARE 0x1100 -#define GL_FASTEST 0x1101 -#define GL_NICEST 0x1102 -#define GL_BYTE 0x1400 -#define GL_UNSIGNED_BYTE 0x1401 -#define GL_SHORT 0x1402 -#define GL_UNSIGNED_SHORT 0x1403 -#define GL_INT 0x1404 -#define GL_UNSIGNED_INT 0x1405 -#define GL_FLOAT 0x1406 -#define GL_STACK_OVERFLOW 0x0503 -#define GL_STACK_UNDERFLOW 0x0504 -#define GL_CLEAR 0x1500 -#define GL_AND 0x1501 -#define GL_AND_REVERSE 0x1502 -#define GL_COPY 0x1503 -#define GL_AND_INVERTED 0x1504 -#define GL_NOOP 0x1505 -#define GL_XOR 0x1506 -#define GL_OR 0x1507 -#define GL_NOR 0x1508 -#define GL_EQUIV 0x1509 -#define GL_INVERT 0x150A -#define GL_OR_REVERSE 0x150B -#define GL_COPY_INVERTED 0x150C -#define GL_OR_INVERTED 0x150D -#define GL_NAND 0x150E -#define GL_SET 0x150F -#define GL_TEXTURE 0x1702 -#define GL_COLOR 0x1800 -#define GL_DEPTH 0x1801 -#define GL_STENCIL 0x1802 -#define GL_STENCIL_INDEX 0x1901 -#define GL_DEPTH_COMPONENT 0x1902 -#define GL_RED 0x1903 -#define GL_GREEN 0x1904 -#define GL_BLUE 0x1905 -#define GL_ALPHA 0x1906 -#define GL_RGB 0x1907 -#define GL_RGBA 0x1908 -#define GL_POINT 0x1B00 -#define GL_LINE 0x1B01 -#define GL_FILL 0x1B02 -#define GL_KEEP 0x1E00 -#define GL_REPLACE 0x1E01 -#define GL_INCR 0x1E02 -#define GL_DECR 0x1E03 -#define GL_VENDOR 0x1F00 -#define GL_RENDERER 0x1F01 -#define GL_VERSION 0x1F02 -#define GL_EXTENSIONS 0x1F03 -#define GL_NEAREST 0x2600 -#define GL_LINEAR 0x2601 -#define GL_NEAREST_MIPMAP_NEAREST 0x2700 -#define GL_LINEAR_MIPMAP_NEAREST 0x2701 -#define GL_NEAREST_MIPMAP_LINEAR 0x2702 -#define GL_LINEAR_MIPMAP_LINEAR 0x2703 -#define GL_TEXTURE_MAG_FILTER 0x2800 -#define GL_TEXTURE_MIN_FILTER 0x2801 -#define GL_TEXTURE_WRAP_S 0x2802 -#define GL_TEXTURE_WRAP_T 0x2803 -#define GL_REPEAT 0x2901 -#define GL_CURRENT_BIT 0x00000001 -#define GL_POINT_BIT 0x00000002 -#define GL_LINE_BIT 0x00000004 -#define GL_POLYGON_BIT 0x00000008 -#define GL_POLYGON_STIPPLE_BIT 0x00000010 -#define GL_PIXEL_MODE_BIT 0x00000020 -#define GL_LIGHTING_BIT 0x00000040 -#define GL_FOG_BIT 0x00000080 -#define GL_ACCUM_BUFFER_BIT 0x00000200 -#define GL_VIEWPORT_BIT 0x00000800 -#define GL_TRANSFORM_BIT 0x00001000 -#define GL_ENABLE_BIT 0x00002000 -#define GL_HINT_BIT 0x00008000 -#define GL_EVAL_BIT 0x00010000 -#define GL_LIST_BIT 0x00020000 -#define GL_TEXTURE_BIT 0x00040000 -#define GL_SCISSOR_BIT 0x00080000 -#define GL_ALL_ATTRIB_BITS 0xFFFFFFFF -#define GL_QUAD_STRIP 0x0008 -#define GL_POLYGON 0x0009 -#define GL_ACCUM 0x0100 -#define GL_LOAD 0x0101 -#define GL_RETURN 0x0102 -#define GL_MULT 0x0103 -#define GL_ADD 0x0104 -#define GL_AUX0 0x0409 -#define GL_AUX1 0x040A -#define GL_AUX2 0x040B -#define GL_AUX3 0x040C -#define GL_2D 0x0600 -#define GL_3D 0x0601 -#define GL_3D_COLOR 0x0602 -#define GL_3D_COLOR_TEXTURE 0x0603 -#define GL_4D_COLOR_TEXTURE 0x0604 -#define GL_PASS_THROUGH_TOKEN 0x0700 -#define GL_POINT_TOKEN 0x0701 -#define GL_LINE_TOKEN 0x0702 -#define GL_POLYGON_TOKEN 0x0703 -#define GL_BITMAP_TOKEN 0x0704 -#define GL_DRAW_PIXEL_TOKEN 0x0705 -#define GL_COPY_PIXEL_TOKEN 0x0706 -#define GL_LINE_RESET_TOKEN 0x0707 -#define GL_EXP 0x0800 -#define GL_EXP2 0x0801 -#define GL_COEFF 0x0A00 -#define GL_ORDER 0x0A01 -#define GL_DOMAIN 0x0A02 -#define GL_PIXEL_MAP_I_TO_I 0x0C70 -#define GL_PIXEL_MAP_S_TO_S 0x0C71 -#define GL_PIXEL_MAP_I_TO_R 0x0C72 -#define GL_PIXEL_MAP_I_TO_G 0x0C73 -#define GL_PIXEL_MAP_I_TO_B 0x0C74 -#define GL_PIXEL_MAP_I_TO_A 0x0C75 -#define GL_PIXEL_MAP_R_TO_R 0x0C76 -#define GL_PIXEL_MAP_G_TO_G 0x0C77 -#define GL_PIXEL_MAP_B_TO_B 0x0C78 -#define GL_PIXEL_MAP_A_TO_A 0x0C79 -#define GL_CURRENT_COLOR 0x0B00 -#define GL_CURRENT_INDEX 0x0B01 -#define GL_CURRENT_NORMAL 0x0B02 -#define GL_CURRENT_TEXTURE_COORDS 0x0B03 -#define GL_CURRENT_RASTER_COLOR 0x0B04 -#define GL_CURRENT_RASTER_INDEX 0x0B05 -#define GL_CURRENT_RASTER_TEXTURE_COORDS 0x0B06 -#define GL_CURRENT_RASTER_POSITION 0x0B07 -#define GL_CURRENT_RASTER_POSITION_VALID 0x0B08 -#define GL_CURRENT_RASTER_DISTANCE 0x0B09 -#define GL_POINT_SMOOTH 0x0B10 -#define GL_LINE_STIPPLE 0x0B24 -#define GL_LINE_STIPPLE_PATTERN 0x0B25 -#define GL_LINE_STIPPLE_REPEAT 0x0B26 -#define GL_LIST_MODE 0x0B30 -#define GL_MAX_LIST_NESTING 0x0B31 -#define GL_LIST_BASE 0x0B32 -#define GL_LIST_INDEX 0x0B33 -#define GL_POLYGON_STIPPLE 0x0B42 -#define GL_EDGE_FLAG 0x0B43 -#define GL_LIGHTING 0x0B50 -#define GL_LIGHT_MODEL_LOCAL_VIEWER 0x0B51 -#define GL_LIGHT_MODEL_TWO_SIDE 0x0B52 -#define GL_LIGHT_MODEL_AMBIENT 0x0B53 -#define GL_SHADE_MODEL 0x0B54 -#define GL_COLOR_MATERIAL_FACE 0x0B55 -#define GL_COLOR_MATERIAL_PARAMETER 0x0B56 -#define GL_COLOR_MATERIAL 0x0B57 -#define GL_FOG 0x0B60 -#define GL_FOG_INDEX 0x0B61 -#define GL_FOG_DENSITY 0x0B62 -#define GL_FOG_START 0x0B63 -#define GL_FOG_END 0x0B64 -#define GL_FOG_MODE 0x0B65 -#define GL_FOG_COLOR 0x0B66 -#define GL_ACCUM_CLEAR_VALUE 0x0B80 -#define GL_MATRIX_MODE 0x0BA0 -#define GL_NORMALIZE 0x0BA1 -#define GL_MODELVIEW_STACK_DEPTH 0x0BA3 -#define GL_PROJECTION_STACK_DEPTH 0x0BA4 -#define GL_TEXTURE_STACK_DEPTH 0x0BA5 -#define GL_MODELVIEW_MATRIX 0x0BA6 -#define GL_PROJECTION_MATRIX 0x0BA7 -#define GL_TEXTURE_MATRIX 0x0BA8 -#define GL_ATTRIB_STACK_DEPTH 0x0BB0 -#define GL_ALPHA_TEST 0x0BC0 -#define GL_ALPHA_TEST_FUNC 0x0BC1 -#define GL_ALPHA_TEST_REF 0x0BC2 -#define GL_LOGIC_OP 0x0BF1 -#define GL_AUX_BUFFERS 0x0C00 -#define GL_INDEX_CLEAR_VALUE 0x0C20 -#define GL_INDEX_WRITEMASK 0x0C21 -#define GL_INDEX_MODE 0x0C30 -#define GL_RGBA_MODE 0x0C31 -#define GL_RENDER_MODE 0x0C40 -#define GL_PERSPECTIVE_CORRECTION_HINT 0x0C50 -#define GL_POINT_SMOOTH_HINT 0x0C51 -#define GL_FOG_HINT 0x0C54 -#define GL_TEXTURE_GEN_S 0x0C60 -#define GL_TEXTURE_GEN_T 0x0C61 -#define GL_TEXTURE_GEN_R 0x0C62 -#define GL_TEXTURE_GEN_Q 0x0C63 -#define GL_PIXEL_MAP_I_TO_I_SIZE 0x0CB0 -#define GL_PIXEL_MAP_S_TO_S_SIZE 0x0CB1 -#define GL_PIXEL_MAP_I_TO_R_SIZE 0x0CB2 -#define GL_PIXEL_MAP_I_TO_G_SIZE 0x0CB3 -#define GL_PIXEL_MAP_I_TO_B_SIZE 0x0CB4 -#define GL_PIXEL_MAP_I_TO_A_SIZE 0x0CB5 -#define GL_PIXEL_MAP_R_TO_R_SIZE 0x0CB6 -#define GL_PIXEL_MAP_G_TO_G_SIZE 0x0CB7 -#define GL_PIXEL_MAP_B_TO_B_SIZE 0x0CB8 -#define GL_PIXEL_MAP_A_TO_A_SIZE 0x0CB9 -#define GL_MAP_COLOR 0x0D10 -#define GL_MAP_STENCIL 0x0D11 -#define GL_INDEX_SHIFT 0x0D12 -#define GL_INDEX_OFFSET 0x0D13 -#define GL_RED_SCALE 0x0D14 -#define GL_RED_BIAS 0x0D15 -#define GL_ZOOM_X 0x0D16 -#define GL_ZOOM_Y 0x0D17 -#define GL_GREEN_SCALE 0x0D18 -#define GL_GREEN_BIAS 0x0D19 -#define GL_BLUE_SCALE 0x0D1A -#define GL_BLUE_BIAS 0x0D1B -#define GL_ALPHA_SCALE 0x0D1C -#define GL_ALPHA_BIAS 0x0D1D -#define GL_DEPTH_SCALE 0x0D1E -#define GL_DEPTH_BIAS 0x0D1F -#define GL_MAX_EVAL_ORDER 0x0D30 -#define GL_MAX_LIGHTS 0x0D31 -#define GL_MAX_CLIP_PLANES 0x0D32 -#define GL_MAX_PIXEL_MAP_TABLE 0x0D34 -#define GL_MAX_ATTRIB_STACK_DEPTH 0x0D35 -#define GL_MAX_MODELVIEW_STACK_DEPTH 0x0D36 -#define GL_MAX_NAME_STACK_DEPTH 0x0D37 -#define GL_MAX_PROJECTION_STACK_DEPTH 0x0D38 -#define GL_MAX_TEXTURE_STACK_DEPTH 0x0D39 -#define GL_INDEX_BITS 0x0D51 -#define GL_RED_BITS 0x0D52 -#define GL_GREEN_BITS 0x0D53 -#define GL_BLUE_BITS 0x0D54 -#define GL_ALPHA_BITS 0x0D55 -#define GL_DEPTH_BITS 0x0D56 -#define GL_STENCIL_BITS 0x0D57 -#define GL_ACCUM_RED_BITS 0x0D58 -#define GL_ACCUM_GREEN_BITS 0x0D59 -#define GL_ACCUM_BLUE_BITS 0x0D5A -#define GL_ACCUM_ALPHA_BITS 0x0D5B -#define GL_NAME_STACK_DEPTH 0x0D70 -#define GL_AUTO_NORMAL 0x0D80 -#define GL_MAP1_COLOR_4 0x0D90 -#define GL_MAP1_INDEX 0x0D91 -#define GL_MAP1_NORMAL 0x0D92 -#define GL_MAP1_TEXTURE_COORD_1 0x0D93 -#define GL_MAP1_TEXTURE_COORD_2 0x0D94 -#define GL_MAP1_TEXTURE_COORD_3 0x0D95 -#define GL_MAP1_TEXTURE_COORD_4 0x0D96 -#define GL_MAP1_VERTEX_3 0x0D97 -#define GL_MAP1_VERTEX_4 0x0D98 -#define GL_MAP2_COLOR_4 0x0DB0 -#define GL_MAP2_INDEX 0x0DB1 -#define GL_MAP2_NORMAL 0x0DB2 -#define GL_MAP2_TEXTURE_COORD_1 0x0DB3 -#define GL_MAP2_TEXTURE_COORD_2 0x0DB4 -#define GL_MAP2_TEXTURE_COORD_3 0x0DB5 -#define GL_MAP2_TEXTURE_COORD_4 0x0DB6 -#define GL_MAP2_VERTEX_3 0x0DB7 -#define GL_MAP2_VERTEX_4 0x0DB8 -#define GL_MAP1_GRID_DOMAIN 0x0DD0 -#define GL_MAP1_GRID_SEGMENTS 0x0DD1 -#define GL_MAP2_GRID_DOMAIN 0x0DD2 -#define GL_MAP2_GRID_SEGMENTS 0x0DD3 -#define GL_TEXTURE_COMPONENTS 0x1003 -#define GL_TEXTURE_BORDER 0x1005 -#define GL_AMBIENT 0x1200 -#define GL_DIFFUSE 0x1201 -#define GL_SPECULAR 0x1202 -#define GL_POSITION 0x1203 -#define GL_SPOT_DIRECTION 0x1204 -#define GL_SPOT_EXPONENT 0x1205 -#define GL_SPOT_CUTOFF 0x1206 -#define GL_CONSTANT_ATTENUATION 0x1207 -#define GL_LINEAR_ATTENUATION 0x1208 -#define GL_QUADRATIC_ATTENUATION 0x1209 -#define GL_COMPILE 0x1300 -#define GL_COMPILE_AND_EXECUTE 0x1301 -#define GL_2_BYTES 0x1407 -#define GL_3_BYTES 0x1408 -#define GL_4_BYTES 0x1409 -#define GL_EMISSION 0x1600 -#define GL_SHININESS 0x1601 -#define GL_AMBIENT_AND_DIFFUSE 0x1602 -#define GL_COLOR_INDEXES 0x1603 -#define GL_MODELVIEW 0x1700 -#define GL_PROJECTION 0x1701 -#define GL_COLOR_INDEX 0x1900 -#define GL_LUMINANCE 0x1909 -#define GL_LUMINANCE_ALPHA 0x190A -#define GL_BITMAP 0x1A00 -#define GL_RENDER 0x1C00 -#define GL_FEEDBACK 0x1C01 -#define GL_SELECT 0x1C02 -#define GL_FLAT 0x1D00 -#define GL_SMOOTH 0x1D01 -#define GL_S 0x2000 -#define GL_T 0x2001 -#define GL_R 0x2002 -#define GL_Q 0x2003 -#define GL_MODULATE 0x2100 -#define GL_DECAL 0x2101 -#define GL_TEXTURE_ENV_MODE 0x2200 -#define GL_TEXTURE_ENV_COLOR 0x2201 -#define GL_TEXTURE_ENV 0x2300 -#define GL_EYE_LINEAR 0x2400 -#define GL_OBJECT_LINEAR 0x2401 -#define GL_SPHERE_MAP 0x2402 -#define GL_TEXTURE_GEN_MODE 0x2500 -#define GL_OBJECT_PLANE 0x2501 -#define GL_EYE_PLANE 0x2502 -#define GL_CLAMP 0x2900 -#define GL_CLIP_PLANE0 0x3000 -#define GL_CLIP_PLANE1 0x3001 -#define GL_CLIP_PLANE2 0x3002 -#define GL_CLIP_PLANE3 0x3003 -#define GL_CLIP_PLANE4 0x3004 -#define GL_CLIP_PLANE5 0x3005 -#define GL_LIGHT0 0x4000 -#define GL_LIGHT1 0x4001 -#define GL_LIGHT2 0x4002 -#define GL_LIGHT3 0x4003 -#define GL_LIGHT4 0x4004 -#define GL_LIGHT5 0x4005 -#define GL_LIGHT6 0x4006 -#define GL_LIGHT7 0x4007 -#define GL_COLOR_LOGIC_OP 0x0BF2 -#define GL_POLYGON_OFFSET_UNITS 0x2A00 -#define GL_POLYGON_OFFSET_POINT 0x2A01 -#define GL_POLYGON_OFFSET_LINE 0x2A02 -#define GL_POLYGON_OFFSET_FILL 0x8037 -#define GL_POLYGON_OFFSET_FACTOR 0x8038 -#define GL_TEXTURE_BINDING_1D 0x8068 -#define GL_TEXTURE_BINDING_2D 0x8069 -#define GL_TEXTURE_INTERNAL_FORMAT 0x1003 -#define GL_TEXTURE_RED_SIZE 0x805C -#define GL_TEXTURE_GREEN_SIZE 0x805D -#define GL_TEXTURE_BLUE_SIZE 0x805E -#define GL_TEXTURE_ALPHA_SIZE 0x805F -#define GL_DOUBLE 0x140A -#define GL_PROXY_TEXTURE_1D 0x8063 -#define GL_PROXY_TEXTURE_2D 0x8064 -#define GL_R3_G3_B2 0x2A10 -#define GL_RGB4 0x804F -#define GL_RGB5 0x8050 -#define GL_RGB8 0x8051 -#define GL_RGB10 0x8052 -#define GL_RGB12 0x8053 -#define GL_RGB16 0x8054 -#define GL_RGBA2 0x8055 -#define GL_RGBA4 0x8056 -#define GL_RGB5_A1 0x8057 -#define GL_RGBA8 0x8058 -#define GL_RGB10_A2 0x8059 -#define GL_RGBA12 0x805A -#define GL_RGBA16 0x805B -#define GL_CLIENT_PIXEL_STORE_BIT 0x00000001 -#define GL_CLIENT_VERTEX_ARRAY_BIT 0x00000002 -#define GL_CLIENT_ALL_ATTRIB_BITS 0xFFFFFFFF -#define GL_VERTEX_ARRAY_POINTER 0x808E -#define GL_NORMAL_ARRAY_POINTER 0x808F -#define GL_COLOR_ARRAY_POINTER 0x8090 -#define GL_INDEX_ARRAY_POINTER 0x8091 -#define GL_TEXTURE_COORD_ARRAY_POINTER 0x8092 -#define GL_EDGE_FLAG_ARRAY_POINTER 0x8093 -#define GL_FEEDBACK_BUFFER_POINTER 0x0DF0 -#define GL_SELECTION_BUFFER_POINTER 0x0DF3 -#define GL_CLIENT_ATTRIB_STACK_DEPTH 0x0BB1 -#define GL_INDEX_LOGIC_OP 0x0BF1 -#define GL_MAX_CLIENT_ATTRIB_STACK_DEPTH 0x0D3B -#define GL_FEEDBACK_BUFFER_SIZE 0x0DF1 -#define GL_FEEDBACK_BUFFER_TYPE 0x0DF2 -#define GL_SELECTION_BUFFER_SIZE 0x0DF4 -#define GL_VERTEX_ARRAY 0x8074 -#define GL_NORMAL_ARRAY 0x8075 -#define GL_COLOR_ARRAY 0x8076 -#define GL_INDEX_ARRAY 0x8077 -#define GL_TEXTURE_COORD_ARRAY 0x8078 -#define GL_EDGE_FLAG_ARRAY 0x8079 -#define GL_VERTEX_ARRAY_SIZE 0x807A -#define GL_VERTEX_ARRAY_TYPE 0x807B -#define GL_VERTEX_ARRAY_STRIDE 0x807C -#define GL_NORMAL_ARRAY_TYPE 0x807E -#define GL_NORMAL_ARRAY_STRIDE 0x807F -#define GL_COLOR_ARRAY_SIZE 0x8081 -#define GL_COLOR_ARRAY_TYPE 0x8082 -#define GL_COLOR_ARRAY_STRIDE 0x8083 -#define GL_INDEX_ARRAY_TYPE 0x8085 -#define GL_INDEX_ARRAY_STRIDE 0x8086 -#define GL_TEXTURE_COORD_ARRAY_SIZE 0x8088 -#define GL_TEXTURE_COORD_ARRAY_TYPE 0x8089 -#define GL_TEXTURE_COORD_ARRAY_STRIDE 0x808A -#define GL_EDGE_FLAG_ARRAY_STRIDE 0x808C -#define GL_TEXTURE_LUMINANCE_SIZE 0x8060 -#define GL_TEXTURE_INTENSITY_SIZE 0x8061 -#define GL_TEXTURE_PRIORITY 0x8066 -#define GL_TEXTURE_RESIDENT 0x8067 -#define GL_ALPHA4 0x803B -#define GL_ALPHA8 0x803C -#define GL_ALPHA12 0x803D -#define GL_ALPHA16 0x803E -#define GL_LUMINANCE4 0x803F -#define GL_LUMINANCE8 0x8040 -#define GL_LUMINANCE12 0x8041 -#define GL_LUMINANCE16 0x8042 -#define GL_LUMINANCE4_ALPHA4 0x8043 -#define GL_LUMINANCE6_ALPHA2 0x8044 -#define GL_LUMINANCE8_ALPHA8 0x8045 -#define GL_LUMINANCE12_ALPHA4 0x8046 -#define GL_LUMINANCE12_ALPHA12 0x8047 -#define GL_LUMINANCE16_ALPHA16 0x8048 -#define GL_INTENSITY 0x8049 -#define GL_INTENSITY4 0x804A -#define GL_INTENSITY8 0x804B -#define GL_INTENSITY12 0x804C -#define GL_INTENSITY16 0x804D -#define GL_V2F 0x2A20 -#define GL_V3F 0x2A21 -#define GL_C4UB_V2F 0x2A22 -#define GL_C4UB_V3F 0x2A23 -#define GL_C3F_V3F 0x2A24 -#define GL_N3F_V3F 0x2A25 -#define GL_C4F_N3F_V3F 0x2A26 -#define GL_T2F_V3F 0x2A27 -#define GL_T4F_V4F 0x2A28 -#define GL_T2F_C4UB_V3F 0x2A29 -#define GL_T2F_C3F_V3F 0x2A2A -#define GL_T2F_N3F_V3F 0x2A2B -#define GL_T2F_C4F_N3F_V3F 0x2A2C -#define GL_T4F_C4F_N3F_V4F 0x2A2D -#define GL_UNSIGNED_BYTE_3_3_2 0x8032 -#define GL_UNSIGNED_SHORT_4_4_4_4 0x8033 -#define GL_UNSIGNED_SHORT_5_5_5_1 0x8034 -#define GL_UNSIGNED_INT_8_8_8_8 0x8035 -#define GL_UNSIGNED_INT_10_10_10_2 0x8036 -#define GL_TEXTURE_BINDING_3D 0x806A -#define GL_PACK_SKIP_IMAGES 0x806B -#define GL_PACK_IMAGE_HEIGHT 0x806C -#define GL_UNPACK_SKIP_IMAGES 0x806D -#define GL_UNPACK_IMAGE_HEIGHT 0x806E -#define GL_TEXTURE_3D 0x806F -#define GL_PROXY_TEXTURE_3D 0x8070 -#define GL_TEXTURE_DEPTH 0x8071 -#define GL_TEXTURE_WRAP_R 0x8072 -#define GL_MAX_3D_TEXTURE_SIZE 0x8073 -#define GL_UNSIGNED_BYTE_2_3_3_REV 0x8362 -#define GL_UNSIGNED_SHORT_5_6_5 0x8363 -#define GL_UNSIGNED_SHORT_5_6_5_REV 0x8364 -#define GL_UNSIGNED_SHORT_4_4_4_4_REV 0x8365 -#define GL_UNSIGNED_SHORT_1_5_5_5_REV 0x8366 -#define GL_UNSIGNED_INT_8_8_8_8_REV 0x8367 -#define GL_UNSIGNED_INT_2_10_10_10_REV 0x8368 -#define GL_BGR 0x80E0 -#define GL_BGRA 0x80E1 -#define GL_MAX_ELEMENTS_VERTICES 0x80E8 -#define GL_MAX_ELEMENTS_INDICES 0x80E9 -#define GL_CLAMP_TO_EDGE 0x812F -#define GL_TEXTURE_MIN_LOD 0x813A -#define GL_TEXTURE_MAX_LOD 0x813B -#define GL_TEXTURE_BASE_LEVEL 0x813C -#define GL_TEXTURE_MAX_LEVEL 0x813D -#define GL_SMOOTH_POINT_SIZE_RANGE 0x0B12 -#define GL_SMOOTH_POINT_SIZE_GRANULARITY 0x0B13 -#define GL_SMOOTH_LINE_WIDTH_RANGE 0x0B22 -#define GL_SMOOTH_LINE_WIDTH_GRANULARITY 0x0B23 -#define GL_ALIASED_LINE_WIDTH_RANGE 0x846E -#define GL_RESCALE_NORMAL 0x803A -#define GL_LIGHT_MODEL_COLOR_CONTROL 0x81F8 -#define GL_SINGLE_COLOR 0x81F9 -#define GL_SEPARATE_SPECULAR_COLOR 0x81FA -#define GL_ALIASED_POINT_SIZE_RANGE 0x846D -#define GL_TEXTURE0 0x84C0 -#define GL_TEXTURE1 0x84C1 -#define GL_TEXTURE2 0x84C2 -#define GL_TEXTURE3 0x84C3 -#define GL_TEXTURE4 0x84C4 -#define GL_TEXTURE5 0x84C5 -#define GL_TEXTURE6 0x84C6 -#define GL_TEXTURE7 0x84C7 -#define GL_TEXTURE8 0x84C8 -#define GL_TEXTURE9 0x84C9 -#define GL_TEXTURE10 0x84CA -#define GL_TEXTURE11 0x84CB -#define GL_TEXTURE12 0x84CC -#define GL_TEXTURE13 0x84CD -#define GL_TEXTURE14 0x84CE -#define GL_TEXTURE15 0x84CF -#define GL_TEXTURE16 0x84D0 -#define GL_TEXTURE17 0x84D1 -#define GL_TEXTURE18 0x84D2 -#define GL_TEXTURE19 0x84D3 -#define GL_TEXTURE20 0x84D4 -#define GL_TEXTURE21 0x84D5 -#define GL_TEXTURE22 0x84D6 -#define GL_TEXTURE23 0x84D7 -#define GL_TEXTURE24 0x84D8 -#define GL_TEXTURE25 0x84D9 -#define GL_TEXTURE26 0x84DA -#define GL_TEXTURE27 0x84DB -#define GL_TEXTURE28 0x84DC -#define GL_TEXTURE29 0x84DD -#define GL_TEXTURE30 0x84DE -#define GL_TEXTURE31 0x84DF -#define GL_ACTIVE_TEXTURE 0x84E0 -#define GL_MULTISAMPLE 0x809D -#define GL_SAMPLE_ALPHA_TO_COVERAGE 0x809E -#define GL_SAMPLE_ALPHA_TO_ONE 0x809F -#define GL_SAMPLE_COVERAGE 0x80A0 -#define GL_SAMPLE_BUFFERS 0x80A8 -#define GL_SAMPLES 0x80A9 -#define GL_SAMPLE_COVERAGE_VALUE 0x80AA -#define GL_SAMPLE_COVERAGE_INVERT 0x80AB -#define GL_TEXTURE_CUBE_MAP 0x8513 -#define GL_TEXTURE_BINDING_CUBE_MAP 0x8514 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_X 0x8515 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X 0x8516 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y 0x8517 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y 0x8518 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z 0x8519 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z 0x851A -#define GL_PROXY_TEXTURE_CUBE_MAP 0x851B -#define GL_MAX_CUBE_MAP_TEXTURE_SIZE 0x851C -#define GL_COMPRESSED_RGB 0x84ED -#define GL_COMPRESSED_RGBA 0x84EE -#define GL_TEXTURE_COMPRESSION_HINT 0x84EF -#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE 0x86A0 -#define GL_TEXTURE_COMPRESSED 0x86A1 -#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2 -#define GL_COMPRESSED_TEXTURE_FORMATS 0x86A3 -#define GL_CLAMP_TO_BORDER 0x812D -#define GL_CLIENT_ACTIVE_TEXTURE 0x84E1 -#define GL_MAX_TEXTURE_UNITS 0x84E2 -#define GL_TRANSPOSE_MODELVIEW_MATRIX 0x84E3 -#define GL_TRANSPOSE_PROJECTION_MATRIX 0x84E4 -#define GL_TRANSPOSE_TEXTURE_MATRIX 0x84E5 -#define GL_TRANSPOSE_COLOR_MATRIX 0x84E6 -#define GL_MULTISAMPLE_BIT 0x20000000 -#define GL_NORMAL_MAP 0x8511 -#define GL_REFLECTION_MAP 0x8512 -#define GL_COMPRESSED_ALPHA 0x84E9 -#define GL_COMPRESSED_LUMINANCE 0x84EA -#define GL_COMPRESSED_LUMINANCE_ALPHA 0x84EB -#define GL_COMPRESSED_INTENSITY 0x84EC -#define GL_COMBINE 0x8570 -#define GL_COMBINE_RGB 0x8571 -#define GL_COMBINE_ALPHA 0x8572 -#define GL_SOURCE0_RGB 0x8580 -#define GL_SOURCE1_RGB 0x8581 -#define GL_SOURCE2_RGB 0x8582 -#define GL_SOURCE0_ALPHA 0x8588 -#define GL_SOURCE1_ALPHA 0x8589 -#define GL_SOURCE2_ALPHA 0x858A -#define GL_OPERAND0_RGB 0x8590 -#define GL_OPERAND1_RGB 0x8591 -#define GL_OPERAND2_RGB 0x8592 -#define GL_OPERAND0_ALPHA 0x8598 -#define GL_OPERAND1_ALPHA 0x8599 -#define GL_OPERAND2_ALPHA 0x859A -#define GL_RGB_SCALE 0x8573 -#define GL_ADD_SIGNED 0x8574 -#define GL_INTERPOLATE 0x8575 -#define GL_SUBTRACT 0x84E7 -#define GL_CONSTANT 0x8576 -#define GL_PRIMARY_COLOR 0x8577 -#define GL_PREVIOUS 0x8578 -#define GL_DOT3_RGB 0x86AE -#define GL_DOT3_RGBA 0x86AF -#define GL_BLEND_DST_RGB 0x80C8 -#define GL_BLEND_SRC_RGB 0x80C9 -#define GL_BLEND_DST_ALPHA 0x80CA -#define GL_BLEND_SRC_ALPHA 0x80CB -#define GL_POINT_FADE_THRESHOLD_SIZE 0x8128 -#define GL_DEPTH_COMPONENT16 0x81A5 -#define GL_DEPTH_COMPONENT24 0x81A6 -#define GL_DEPTH_COMPONENT32 0x81A7 -#define GL_MIRRORED_REPEAT 0x8370 -#define GL_MAX_TEXTURE_LOD_BIAS 0x84FD -#define GL_TEXTURE_LOD_BIAS 0x8501 -#define GL_INCR_WRAP 0x8507 -#define GL_DECR_WRAP 0x8508 -#define GL_TEXTURE_DEPTH_SIZE 0x884A -#define GL_TEXTURE_COMPARE_MODE 0x884C -#define GL_TEXTURE_COMPARE_FUNC 0x884D -#define GL_POINT_SIZE_MIN 0x8126 -#define GL_POINT_SIZE_MAX 0x8127 -#define GL_POINT_DISTANCE_ATTENUATION 0x8129 -#define GL_GENERATE_MIPMAP 0x8191 -#define GL_GENERATE_MIPMAP_HINT 0x8192 -#define GL_FOG_COORDINATE_SOURCE 0x8450 -#define GL_FOG_COORDINATE 0x8451 -#define GL_FRAGMENT_DEPTH 0x8452 -#define GL_CURRENT_FOG_COORDINATE 0x8453 -#define GL_FOG_COORDINATE_ARRAY_TYPE 0x8454 -#define GL_FOG_COORDINATE_ARRAY_STRIDE 0x8455 -#define GL_FOG_COORDINATE_ARRAY_POINTER 0x8456 -#define GL_FOG_COORDINATE_ARRAY 0x8457 -#define GL_COLOR_SUM 0x8458 -#define GL_CURRENT_SECONDARY_COLOR 0x8459 -#define GL_SECONDARY_COLOR_ARRAY_SIZE 0x845A -#define GL_SECONDARY_COLOR_ARRAY_TYPE 0x845B -#define GL_SECONDARY_COLOR_ARRAY_STRIDE 0x845C -#define GL_SECONDARY_COLOR_ARRAY_POINTER 0x845D -#define GL_SECONDARY_COLOR_ARRAY 0x845E -#define GL_TEXTURE_FILTER_CONTROL 0x8500 -#define GL_DEPTH_TEXTURE_MODE 0x884B -#define GL_COMPARE_R_TO_TEXTURE 0x884E -#define GL_BLEND_COLOR 0x8005 -#define GL_BLEND_EQUATION 0x8009 -#define GL_CONSTANT_COLOR 0x8001 -#define GL_ONE_MINUS_CONSTANT_COLOR 0x8002 -#define GL_CONSTANT_ALPHA 0x8003 -#define GL_ONE_MINUS_CONSTANT_ALPHA 0x8004 -#define GL_FUNC_ADD 0x8006 -#define GL_FUNC_REVERSE_SUBTRACT 0x800B -#define GL_FUNC_SUBTRACT 0x800A -#define GL_MIN 0x8007 -#define GL_MAX 0x8008 -#define GL_BUFFER_SIZE 0x8764 -#define GL_BUFFER_USAGE 0x8765 -#define GL_QUERY_COUNTER_BITS 0x8864 -#define GL_CURRENT_QUERY 0x8865 -#define GL_QUERY_RESULT 0x8866 -#define GL_QUERY_RESULT_AVAILABLE 0x8867 -#define GL_ARRAY_BUFFER 0x8892 -#define GL_ELEMENT_ARRAY_BUFFER 0x8893 -#define GL_ARRAY_BUFFER_BINDING 0x8894 -#define GL_ELEMENT_ARRAY_BUFFER_BINDING 0x8895 -#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING 0x889F -#define GL_READ_ONLY 0x88B8 -#define GL_WRITE_ONLY 0x88B9 -#define GL_READ_WRITE 0x88BA -#define GL_BUFFER_ACCESS 0x88BB -#define GL_BUFFER_MAPPED 0x88BC -#define GL_BUFFER_MAP_POINTER 0x88BD -#define GL_STREAM_DRAW 0x88E0 -#define GL_STREAM_READ 0x88E1 -#define GL_STREAM_COPY 0x88E2 -#define GL_STATIC_DRAW 0x88E4 -#define GL_STATIC_READ 0x88E5 -#define GL_STATIC_COPY 0x88E6 -#define GL_DYNAMIC_DRAW 0x88E8 -#define GL_DYNAMIC_READ 0x88E9 -#define GL_DYNAMIC_COPY 0x88EA -#define GL_SAMPLES_PASSED 0x8914 -#define GL_SRC1_ALPHA 0x8589 -#define GL_VERTEX_ARRAY_BUFFER_BINDING 0x8896 -#define GL_NORMAL_ARRAY_BUFFER_BINDING 0x8897 -#define GL_COLOR_ARRAY_BUFFER_BINDING 0x8898 -#define GL_INDEX_ARRAY_BUFFER_BINDING 0x8899 -#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING 0x889A -#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING 0x889B -#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING 0x889C -#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING 0x889D -#define GL_WEIGHT_ARRAY_BUFFER_BINDING 0x889E -#define GL_FOG_COORD_SRC 0x8450 -#define GL_FOG_COORD 0x8451 -#define GL_CURRENT_FOG_COORD 0x8453 -#define GL_FOG_COORD_ARRAY_TYPE 0x8454 -#define GL_FOG_COORD_ARRAY_STRIDE 0x8455 -#define GL_FOG_COORD_ARRAY_POINTER 0x8456 -#define GL_FOG_COORD_ARRAY 0x8457 -#define GL_FOG_COORD_ARRAY_BUFFER_BINDING 0x889D -#define GL_SRC0_RGB 0x8580 -#define GL_SRC1_RGB 0x8581 -#define GL_SRC2_RGB 0x8582 -#define GL_SRC0_ALPHA 0x8588 -#define GL_SRC2_ALPHA 0x858A -#define GL_BLEND_EQUATION_RGB 0x8009 -#define GL_VERTEX_ATTRIB_ARRAY_ENABLED 0x8622 -#define GL_VERTEX_ATTRIB_ARRAY_SIZE 0x8623 -#define GL_VERTEX_ATTRIB_ARRAY_STRIDE 0x8624 -#define GL_VERTEX_ATTRIB_ARRAY_TYPE 0x8625 -#define GL_CURRENT_VERTEX_ATTRIB 0x8626 -#define GL_VERTEX_PROGRAM_POINT_SIZE 0x8642 -#define GL_VERTEX_ATTRIB_ARRAY_POINTER 0x8645 -#define GL_STENCIL_BACK_FUNC 0x8800 -#define GL_STENCIL_BACK_FAIL 0x8801 -#define GL_STENCIL_BACK_PASS_DEPTH_FAIL 0x8802 -#define GL_STENCIL_BACK_PASS_DEPTH_PASS 0x8803 -#define GL_MAX_DRAW_BUFFERS 0x8824 -#define GL_DRAW_BUFFER0 0x8825 -#define GL_DRAW_BUFFER1 0x8826 -#define GL_DRAW_BUFFER2 0x8827 -#define GL_DRAW_BUFFER3 0x8828 -#define GL_DRAW_BUFFER4 0x8829 -#define GL_DRAW_BUFFER5 0x882A -#define GL_DRAW_BUFFER6 0x882B -#define GL_DRAW_BUFFER7 0x882C -#define GL_DRAW_BUFFER8 0x882D -#define GL_DRAW_BUFFER9 0x882E -#define GL_DRAW_BUFFER10 0x882F -#define GL_DRAW_BUFFER11 0x8830 -#define GL_DRAW_BUFFER12 0x8831 -#define GL_DRAW_BUFFER13 0x8832 -#define GL_DRAW_BUFFER14 0x8833 -#define GL_DRAW_BUFFER15 0x8834 -#define GL_BLEND_EQUATION_ALPHA 0x883D -#define GL_MAX_VERTEX_ATTRIBS 0x8869 -#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED 0x886A -#define GL_MAX_TEXTURE_IMAGE_UNITS 0x8872 -#define GL_FRAGMENT_SHADER 0x8B30 -#define GL_VERTEX_SHADER 0x8B31 -#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS 0x8B49 -#define GL_MAX_VERTEX_UNIFORM_COMPONENTS 0x8B4A -#define GL_MAX_VARYING_FLOATS 0x8B4B -#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS 0x8B4C -#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS 0x8B4D -#define GL_SHADER_TYPE 0x8B4F -#define GL_FLOAT_VEC2 0x8B50 -#define GL_FLOAT_VEC3 0x8B51 -#define GL_FLOAT_VEC4 0x8B52 -#define GL_INT_VEC2 0x8B53 -#define GL_INT_VEC3 0x8B54 -#define GL_INT_VEC4 0x8B55 -#define GL_BOOL 0x8B56 -#define GL_BOOL_VEC2 0x8B57 -#define GL_BOOL_VEC3 0x8B58 -#define GL_BOOL_VEC4 0x8B59 -#define GL_FLOAT_MAT2 0x8B5A -#define GL_FLOAT_MAT3 0x8B5B -#define GL_FLOAT_MAT4 0x8B5C -#define GL_SAMPLER_1D 0x8B5D -#define GL_SAMPLER_2D 0x8B5E -#define GL_SAMPLER_3D 0x8B5F -#define GL_SAMPLER_CUBE 0x8B60 -#define GL_SAMPLER_1D_SHADOW 0x8B61 -#define GL_SAMPLER_2D_SHADOW 0x8B62 -#define GL_DELETE_STATUS 0x8B80 -#define GL_COMPILE_STATUS 0x8B81 -#define GL_LINK_STATUS 0x8B82 -#define GL_VALIDATE_STATUS 0x8B83 -#define GL_INFO_LOG_LENGTH 0x8B84 -#define GL_ATTACHED_SHADERS 0x8B85 -#define GL_ACTIVE_UNIFORMS 0x8B86 -#define GL_ACTIVE_UNIFORM_MAX_LENGTH 0x8B87 -#define GL_SHADER_SOURCE_LENGTH 0x8B88 -#define GL_ACTIVE_ATTRIBUTES 0x8B89 -#define GL_ACTIVE_ATTRIBUTE_MAX_LENGTH 0x8B8A -#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT 0x8B8B -#define GL_SHADING_LANGUAGE_VERSION 0x8B8C -#define GL_CURRENT_PROGRAM 0x8B8D -#define GL_POINT_SPRITE_COORD_ORIGIN 0x8CA0 -#define GL_LOWER_LEFT 0x8CA1 -#define GL_UPPER_LEFT 0x8CA2 -#define GL_STENCIL_BACK_REF 0x8CA3 -#define GL_STENCIL_BACK_VALUE_MASK 0x8CA4 -#define GL_STENCIL_BACK_WRITEMASK 0x8CA5 -#define GL_VERTEX_PROGRAM_TWO_SIDE 0x8643 -#define GL_POINT_SPRITE 0x8861 -#define GL_COORD_REPLACE 0x8862 -#define GL_MAX_TEXTURE_COORDS 0x8871 -#define GL_PIXEL_PACK_BUFFER 0x88EB -#define GL_PIXEL_UNPACK_BUFFER 0x88EC -#define GL_PIXEL_PACK_BUFFER_BINDING 0x88ED -#define GL_PIXEL_UNPACK_BUFFER_BINDING 0x88EF -#define GL_FLOAT_MAT2x3 0x8B65 -#define GL_FLOAT_MAT2x4 0x8B66 -#define GL_FLOAT_MAT3x2 0x8B67 -#define GL_FLOAT_MAT3x4 0x8B68 -#define GL_FLOAT_MAT4x2 0x8B69 -#define GL_FLOAT_MAT4x3 0x8B6A -#define GL_SRGB 0x8C40 -#define GL_SRGB8 0x8C41 -#define GL_SRGB_ALPHA 0x8C42 -#define GL_SRGB8_ALPHA8 0x8C43 -#define GL_COMPRESSED_SRGB 0x8C48 -#define GL_COMPRESSED_SRGB_ALPHA 0x8C49 -#define GL_CURRENT_RASTER_SECONDARY_COLOR 0x845F -#define GL_SLUMINANCE_ALPHA 0x8C44 -#define GL_SLUMINANCE8_ALPHA8 0x8C45 -#define GL_SLUMINANCE 0x8C46 -#define GL_SLUMINANCE8 0x8C47 -#define GL_COMPRESSED_SLUMINANCE 0x8C4A -#define GL_COMPRESSED_SLUMINANCE_ALPHA 0x8C4B -#define GL_COMPARE_REF_TO_TEXTURE 0x884E -#define GL_CLIP_DISTANCE0 0x3000 -#define GL_CLIP_DISTANCE1 0x3001 -#define GL_CLIP_DISTANCE2 0x3002 -#define GL_CLIP_DISTANCE3 0x3003 -#define GL_CLIP_DISTANCE4 0x3004 -#define GL_CLIP_DISTANCE5 0x3005 -#define GL_CLIP_DISTANCE6 0x3006 -#define GL_CLIP_DISTANCE7 0x3007 -#define GL_MAX_CLIP_DISTANCES 0x0D32 -#define GL_MAJOR_VERSION 0x821B -#define GL_MINOR_VERSION 0x821C -#define GL_NUM_EXTENSIONS 0x821D -#define GL_CONTEXT_FLAGS 0x821E -#define GL_COMPRESSED_RED 0x8225 -#define GL_COMPRESSED_RG 0x8226 -#define GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT 0x00000001 -#define GL_RGBA32F 0x8814 -#define GL_RGB32F 0x8815 -#define GL_RGBA16F 0x881A -#define GL_RGB16F 0x881B -#define GL_VERTEX_ATTRIB_ARRAY_INTEGER 0x88FD -#define GL_MAX_ARRAY_TEXTURE_LAYERS 0x88FF -#define GL_MIN_PROGRAM_TEXEL_OFFSET 0x8904 -#define GL_MAX_PROGRAM_TEXEL_OFFSET 0x8905 -#define GL_CLAMP_READ_COLOR 0x891C -#define GL_FIXED_ONLY 0x891D -#define GL_MAX_VARYING_COMPONENTS 0x8B4B -#define GL_TEXTURE_1D_ARRAY 0x8C18 -#define GL_PROXY_TEXTURE_1D_ARRAY 0x8C19 -#define GL_TEXTURE_2D_ARRAY 0x8C1A -#define GL_PROXY_TEXTURE_2D_ARRAY 0x8C1B -#define GL_TEXTURE_BINDING_1D_ARRAY 0x8C1C -#define GL_TEXTURE_BINDING_2D_ARRAY 0x8C1D -#define GL_R11F_G11F_B10F 0x8C3A -#define GL_UNSIGNED_INT_10F_11F_11F_REV 0x8C3B -#define GL_RGB9_E5 0x8C3D -#define GL_UNSIGNED_INT_5_9_9_9_REV 0x8C3E -#define GL_TEXTURE_SHARED_SIZE 0x8C3F -#define GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH 0x8C76 -#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE 0x8C7F -#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS 0x8C80 -#define GL_TRANSFORM_FEEDBACK_VARYINGS 0x8C83 -#define GL_TRANSFORM_FEEDBACK_BUFFER_START 0x8C84 -#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE 0x8C85 -#define GL_PRIMITIVES_GENERATED 0x8C87 -#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN 0x8C88 -#define GL_RASTERIZER_DISCARD 0x8C89 -#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS 0x8C8A -#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS 0x8C8B -#define GL_INTERLEAVED_ATTRIBS 0x8C8C -#define GL_SEPARATE_ATTRIBS 0x8C8D -#define GL_TRANSFORM_FEEDBACK_BUFFER 0x8C8E -#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING 0x8C8F -#define GL_RGBA32UI 0x8D70 -#define GL_RGB32UI 0x8D71 -#define GL_RGBA16UI 0x8D76 -#define GL_RGB16UI 0x8D77 -#define GL_RGBA8UI 0x8D7C -#define GL_RGB8UI 0x8D7D -#define GL_RGBA32I 0x8D82 -#define GL_RGB32I 0x8D83 -#define GL_RGBA16I 0x8D88 -#define GL_RGB16I 0x8D89 -#define GL_RGBA8I 0x8D8E -#define GL_RGB8I 0x8D8F -#define GL_RED_INTEGER 0x8D94 -#define GL_GREEN_INTEGER 0x8D95 -#define GL_BLUE_INTEGER 0x8D96 -#define GL_RGB_INTEGER 0x8D98 -#define GL_RGBA_INTEGER 0x8D99 -#define GL_BGR_INTEGER 0x8D9A -#define GL_BGRA_INTEGER 0x8D9B -#define GL_SAMPLER_1D_ARRAY 0x8DC0 -#define GL_SAMPLER_2D_ARRAY 0x8DC1 -#define GL_SAMPLER_1D_ARRAY_SHADOW 0x8DC3 -#define GL_SAMPLER_2D_ARRAY_SHADOW 0x8DC4 -#define GL_SAMPLER_CUBE_SHADOW 0x8DC5 -#define GL_UNSIGNED_INT_VEC2 0x8DC6 -#define GL_UNSIGNED_INT_VEC3 0x8DC7 -#define GL_UNSIGNED_INT_VEC4 0x8DC8 -#define GL_INT_SAMPLER_1D 0x8DC9 -#define GL_INT_SAMPLER_2D 0x8DCA -#define GL_INT_SAMPLER_3D 0x8DCB -#define GL_INT_SAMPLER_CUBE 0x8DCC -#define GL_INT_SAMPLER_1D_ARRAY 0x8DCE -#define GL_INT_SAMPLER_2D_ARRAY 0x8DCF -#define GL_UNSIGNED_INT_SAMPLER_1D 0x8DD1 -#define GL_UNSIGNED_INT_SAMPLER_2D 0x8DD2 -#define GL_UNSIGNED_INT_SAMPLER_3D 0x8DD3 -#define GL_UNSIGNED_INT_SAMPLER_CUBE 0x8DD4 -#define GL_UNSIGNED_INT_SAMPLER_1D_ARRAY 0x8DD6 -#define GL_UNSIGNED_INT_SAMPLER_2D_ARRAY 0x8DD7 -#define GL_QUERY_WAIT 0x8E13 -#define GL_QUERY_NO_WAIT 0x8E14 -#define GL_QUERY_BY_REGION_WAIT 0x8E15 -#define GL_QUERY_BY_REGION_NO_WAIT 0x8E16 -#define GL_BUFFER_ACCESS_FLAGS 0x911F -#define GL_BUFFER_MAP_LENGTH 0x9120 -#define GL_BUFFER_MAP_OFFSET 0x9121 -#define GL_DEPTH_COMPONENT32F 0x8CAC -#define GL_DEPTH32F_STENCIL8 0x8CAD -#define GL_FLOAT_32_UNSIGNED_INT_24_8_REV 0x8DAD -#define GL_INVALID_FRAMEBUFFER_OPERATION 0x0506 -#define GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING 0x8210 -#define GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE 0x8211 -#define GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE 0x8212 -#define GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE 0x8213 -#define GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE 0x8214 -#define GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE 0x8215 -#define GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE 0x8216 -#define GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE 0x8217 -#define GL_FRAMEBUFFER_DEFAULT 0x8218 -#define GL_FRAMEBUFFER_UNDEFINED 0x8219 -#define GL_DEPTH_STENCIL_ATTACHMENT 0x821A -#define GL_MAX_RENDERBUFFER_SIZE 0x84E8 -#define GL_DEPTH_STENCIL 0x84F9 -#define GL_UNSIGNED_INT_24_8 0x84FA -#define GL_DEPTH24_STENCIL8 0x88F0 -#define GL_TEXTURE_STENCIL_SIZE 0x88F1 -#define GL_TEXTURE_RED_TYPE 0x8C10 -#define GL_TEXTURE_GREEN_TYPE 0x8C11 -#define GL_TEXTURE_BLUE_TYPE 0x8C12 -#define GL_TEXTURE_ALPHA_TYPE 0x8C13 -#define GL_TEXTURE_DEPTH_TYPE 0x8C16 -#define GL_UNSIGNED_NORMALIZED 0x8C17 -#define GL_FRAMEBUFFER_BINDING 0x8CA6 -#define GL_DRAW_FRAMEBUFFER_BINDING 0x8CA6 -#define GL_RENDERBUFFER_BINDING 0x8CA7 -#define GL_READ_FRAMEBUFFER 0x8CA8 -#define GL_DRAW_FRAMEBUFFER 0x8CA9 -#define GL_READ_FRAMEBUFFER_BINDING 0x8CAA -#define GL_RENDERBUFFER_SAMPLES 0x8CAB -#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE 0x8CD0 -#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME 0x8CD1 -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL 0x8CD2 -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE 0x8CD3 -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER 0x8CD4 -#define GL_FRAMEBUFFER_COMPLETE 0x8CD5 -#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT 0x8CD6 -#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT 0x8CD7 -#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER 0x8CDB -#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER 0x8CDC -#define GL_FRAMEBUFFER_UNSUPPORTED 0x8CDD -#define GL_MAX_COLOR_ATTACHMENTS 0x8CDF -#define GL_COLOR_ATTACHMENT0 0x8CE0 -#define GL_COLOR_ATTACHMENT1 0x8CE1 -#define GL_COLOR_ATTACHMENT2 0x8CE2 -#define GL_COLOR_ATTACHMENT3 0x8CE3 -#define GL_COLOR_ATTACHMENT4 0x8CE4 -#define GL_COLOR_ATTACHMENT5 0x8CE5 -#define GL_COLOR_ATTACHMENT6 0x8CE6 -#define GL_COLOR_ATTACHMENT7 0x8CE7 -#define GL_COLOR_ATTACHMENT8 0x8CE8 -#define GL_COLOR_ATTACHMENT9 0x8CE9 -#define GL_COLOR_ATTACHMENT10 0x8CEA -#define GL_COLOR_ATTACHMENT11 0x8CEB -#define GL_COLOR_ATTACHMENT12 0x8CEC -#define GL_COLOR_ATTACHMENT13 0x8CED -#define GL_COLOR_ATTACHMENT14 0x8CEE -#define GL_COLOR_ATTACHMENT15 0x8CEF -#define GL_COLOR_ATTACHMENT16 0x8CF0 -#define GL_COLOR_ATTACHMENT17 0x8CF1 -#define GL_COLOR_ATTACHMENT18 0x8CF2 -#define GL_COLOR_ATTACHMENT19 0x8CF3 -#define GL_COLOR_ATTACHMENT20 0x8CF4 -#define GL_COLOR_ATTACHMENT21 0x8CF5 -#define GL_COLOR_ATTACHMENT22 0x8CF6 -#define GL_COLOR_ATTACHMENT23 0x8CF7 -#define GL_COLOR_ATTACHMENT24 0x8CF8 -#define GL_COLOR_ATTACHMENT25 0x8CF9 -#define GL_COLOR_ATTACHMENT26 0x8CFA -#define GL_COLOR_ATTACHMENT27 0x8CFB -#define GL_COLOR_ATTACHMENT28 0x8CFC -#define GL_COLOR_ATTACHMENT29 0x8CFD -#define GL_COLOR_ATTACHMENT30 0x8CFE -#define GL_COLOR_ATTACHMENT31 0x8CFF -#define GL_DEPTH_ATTACHMENT 0x8D00 -#define GL_STENCIL_ATTACHMENT 0x8D20 -#define GL_FRAMEBUFFER 0x8D40 -#define GL_RENDERBUFFER 0x8D41 -#define GL_RENDERBUFFER_WIDTH 0x8D42 -#define GL_RENDERBUFFER_HEIGHT 0x8D43 -#define GL_RENDERBUFFER_INTERNAL_FORMAT 0x8D44 -#define GL_STENCIL_INDEX1 0x8D46 -#define GL_STENCIL_INDEX4 0x8D47 -#define GL_STENCIL_INDEX8 0x8D48 -#define GL_STENCIL_INDEX16 0x8D49 -#define GL_RENDERBUFFER_RED_SIZE 0x8D50 -#define GL_RENDERBUFFER_GREEN_SIZE 0x8D51 -#define GL_RENDERBUFFER_BLUE_SIZE 0x8D52 -#define GL_RENDERBUFFER_ALPHA_SIZE 0x8D53 -#define GL_RENDERBUFFER_DEPTH_SIZE 0x8D54 -#define GL_RENDERBUFFER_STENCIL_SIZE 0x8D55 -#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE 0x8D56 -#define GL_MAX_SAMPLES 0x8D57 -#define GL_INDEX 0x8222 -#define GL_TEXTURE_LUMINANCE_TYPE 0x8C14 -#define GL_TEXTURE_INTENSITY_TYPE 0x8C15 -#define GL_FRAMEBUFFER_SRGB 0x8DB9 -#define GL_HALF_FLOAT 0x140B -#define GL_MAP_READ_BIT 0x0001 -#define GL_MAP_WRITE_BIT 0x0002 -#define GL_MAP_INVALIDATE_RANGE_BIT 0x0004 -#define GL_MAP_INVALIDATE_BUFFER_BIT 0x0008 -#define GL_MAP_FLUSH_EXPLICIT_BIT 0x0010 -#define GL_MAP_UNSYNCHRONIZED_BIT 0x0020 -#define GL_COMPRESSED_RED_RGTC1 0x8DBB -#define GL_COMPRESSED_SIGNED_RED_RGTC1 0x8DBC -#define GL_COMPRESSED_RG_RGTC2 0x8DBD -#define GL_COMPRESSED_SIGNED_RG_RGTC2 0x8DBE -#define GL_RG 0x8227 -#define GL_RG_INTEGER 0x8228 -#define GL_R8 0x8229 -#define GL_R16 0x822A -#define GL_RG8 0x822B -#define GL_RG16 0x822C -#define GL_R16F 0x822D -#define GL_R32F 0x822E -#define GL_RG16F 0x822F -#define GL_RG32F 0x8230 -#define GL_R8I 0x8231 -#define GL_R8UI 0x8232 -#define GL_R16I 0x8233 -#define GL_R16UI 0x8234 -#define GL_R32I 0x8235 -#define GL_R32UI 0x8236 -#define GL_RG8I 0x8237 -#define GL_RG8UI 0x8238 -#define GL_RG16I 0x8239 -#define GL_RG16UI 0x823A -#define GL_RG32I 0x823B -#define GL_RG32UI 0x823C -#define GL_VERTEX_ARRAY_BINDING 0x85B5 -#define GL_CLAMP_VERTEX_COLOR 0x891A -#define GL_CLAMP_FRAGMENT_COLOR 0x891B -#define GL_ALPHA_INTEGER 0x8D97 -#define GL_SAMPLER_2D_RECT 0x8B63 -#define GL_SAMPLER_2D_RECT_SHADOW 0x8B64 -#define GL_SAMPLER_BUFFER 0x8DC2 -#define GL_INT_SAMPLER_2D_RECT 0x8DCD -#define GL_INT_SAMPLER_BUFFER 0x8DD0 -#define GL_UNSIGNED_INT_SAMPLER_2D_RECT 0x8DD5 -#define GL_UNSIGNED_INT_SAMPLER_BUFFER 0x8DD8 -#define GL_TEXTURE_BUFFER 0x8C2A -#define GL_MAX_TEXTURE_BUFFER_SIZE 0x8C2B -#define GL_TEXTURE_BINDING_BUFFER 0x8C2C -#define GL_TEXTURE_BUFFER_DATA_STORE_BINDING 0x8C2D -#define GL_TEXTURE_RECTANGLE 0x84F5 -#define GL_TEXTURE_BINDING_RECTANGLE 0x84F6 -#define GL_PROXY_TEXTURE_RECTANGLE 0x84F7 -#define GL_MAX_RECTANGLE_TEXTURE_SIZE 0x84F8 -#define GL_R8_SNORM 0x8F94 -#define GL_RG8_SNORM 0x8F95 -#define GL_RGB8_SNORM 0x8F96 -#define GL_RGBA8_SNORM 0x8F97 -#define GL_R16_SNORM 0x8F98 -#define GL_RG16_SNORM 0x8F99 -#define GL_RGB16_SNORM 0x8F9A -#define GL_RGBA16_SNORM 0x8F9B -#define GL_SIGNED_NORMALIZED 0x8F9C -#define GL_PRIMITIVE_RESTART 0x8F9D -#define GL_PRIMITIVE_RESTART_INDEX 0x8F9E -#define GL_COPY_READ_BUFFER 0x8F36 -#define GL_COPY_WRITE_BUFFER 0x8F37 -#define GL_UNIFORM_BUFFER 0x8A11 -#define GL_UNIFORM_BUFFER_BINDING 0x8A28 -#define GL_UNIFORM_BUFFER_START 0x8A29 -#define GL_UNIFORM_BUFFER_SIZE 0x8A2A -#define GL_MAX_VERTEX_UNIFORM_BLOCKS 0x8A2B -#define GL_MAX_GEOMETRY_UNIFORM_BLOCKS 0x8A2C -#define GL_MAX_FRAGMENT_UNIFORM_BLOCKS 0x8A2D -#define GL_MAX_COMBINED_UNIFORM_BLOCKS 0x8A2E -#define GL_MAX_UNIFORM_BUFFER_BINDINGS 0x8A2F -#define GL_MAX_UNIFORM_BLOCK_SIZE 0x8A30 -#define GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS 0x8A31 -#define GL_MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS 0x8A32 -#define GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS 0x8A33 -#define GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT 0x8A34 -#define GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH 0x8A35 -#define GL_ACTIVE_UNIFORM_BLOCKS 0x8A36 -#define GL_UNIFORM_TYPE 0x8A37 -#define GL_UNIFORM_SIZE 0x8A38 -#define GL_UNIFORM_NAME_LENGTH 0x8A39 -#define GL_UNIFORM_BLOCK_INDEX 0x8A3A -#define GL_UNIFORM_OFFSET 0x8A3B -#define GL_UNIFORM_ARRAY_STRIDE 0x8A3C -#define GL_UNIFORM_MATRIX_STRIDE 0x8A3D -#define GL_UNIFORM_IS_ROW_MAJOR 0x8A3E -#define GL_UNIFORM_BLOCK_BINDING 0x8A3F -#define GL_UNIFORM_BLOCK_DATA_SIZE 0x8A40 -#define GL_UNIFORM_BLOCK_NAME_LENGTH 0x8A41 -#define GL_UNIFORM_BLOCK_ACTIVE_UNIFORMS 0x8A42 -#define GL_UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES 0x8A43 -#define GL_UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER 0x8A44 -#define GL_UNIFORM_BLOCK_REFERENCED_BY_GEOMETRY_SHADER 0x8A45 -#define GL_UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER 0x8A46 -#define GL_INVALID_INDEX 0xFFFFFFFF -#define GL_CONTEXT_CORE_PROFILE_BIT 0x00000001 -#define GL_CONTEXT_COMPATIBILITY_PROFILE_BIT 0x00000002 -#define GL_LINES_ADJACENCY 0x000A -#define GL_LINE_STRIP_ADJACENCY 0x000B -#define GL_TRIANGLES_ADJACENCY 0x000C -#define GL_TRIANGLE_STRIP_ADJACENCY 0x000D -#define GL_PROGRAM_POINT_SIZE 0x8642 -#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS 0x8C29 -#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED 0x8DA7 -#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS 0x8DA8 -#define GL_GEOMETRY_SHADER 0x8DD9 -#define GL_GEOMETRY_VERTICES_OUT 0x8916 -#define GL_GEOMETRY_INPUT_TYPE 0x8917 -#define GL_GEOMETRY_OUTPUT_TYPE 0x8918 -#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS 0x8DDF -#define GL_MAX_GEOMETRY_OUTPUT_VERTICES 0x8DE0 -#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS 0x8DE1 -#define GL_MAX_VERTEX_OUTPUT_COMPONENTS 0x9122 -#define GL_MAX_GEOMETRY_INPUT_COMPONENTS 0x9123 -#define GL_MAX_GEOMETRY_OUTPUT_COMPONENTS 0x9124 -#define GL_MAX_FRAGMENT_INPUT_COMPONENTS 0x9125 -#define GL_CONTEXT_PROFILE_MASK 0x9126 -#define GL_DEPTH_CLAMP 0x864F -#define GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION 0x8E4C -#define GL_FIRST_VERTEX_CONVENTION 0x8E4D -#define GL_LAST_VERTEX_CONVENTION 0x8E4E -#define GL_PROVOKING_VERTEX 0x8E4F -#define GL_TEXTURE_CUBE_MAP_SEAMLESS 0x884F -#define GL_MAX_SERVER_WAIT_TIMEOUT 0x9111 -#define GL_OBJECT_TYPE 0x9112 -#define GL_SYNC_CONDITION 0x9113 -#define GL_SYNC_STATUS 0x9114 -#define GL_SYNC_FLAGS 0x9115 -#define GL_SYNC_FENCE 0x9116 -#define GL_SYNC_GPU_COMMANDS_COMPLETE 0x9117 -#define GL_UNSIGNALED 0x9118 -#define GL_SIGNALED 0x9119 -#define GL_ALREADY_SIGNALED 0x911A -#define GL_TIMEOUT_EXPIRED 0x911B -#define GL_CONDITION_SATISFIED 0x911C -#define GL_WAIT_FAILED 0x911D -#define GL_TIMEOUT_IGNORED 0xFFFFFFFFFFFFFFFF -#define GL_SYNC_FLUSH_COMMANDS_BIT 0x00000001 -#define GL_SAMPLE_POSITION 0x8E50 -#define GL_SAMPLE_MASK 0x8E51 -#define GL_SAMPLE_MASK_VALUE 0x8E52 -#define GL_MAX_SAMPLE_MASK_WORDS 0x8E59 -#define GL_TEXTURE_2D_MULTISAMPLE 0x9100 -#define GL_PROXY_TEXTURE_2D_MULTISAMPLE 0x9101 -#define GL_TEXTURE_2D_MULTISAMPLE_ARRAY 0x9102 -#define GL_PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY 0x9103 -#define GL_TEXTURE_BINDING_2D_MULTISAMPLE 0x9104 -#define GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY 0x9105 -#define GL_TEXTURE_SAMPLES 0x9106 -#define GL_TEXTURE_FIXED_SAMPLE_LOCATIONS 0x9107 -#define GL_SAMPLER_2D_MULTISAMPLE 0x9108 -#define GL_INT_SAMPLER_2D_MULTISAMPLE 0x9109 -#define GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE 0x910A -#define GL_SAMPLER_2D_MULTISAMPLE_ARRAY 0x910B -#define GL_INT_SAMPLER_2D_MULTISAMPLE_ARRAY 0x910C -#define GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY 0x910D -#define GL_MAX_COLOR_TEXTURE_SAMPLES 0x910E -#define GL_MAX_DEPTH_TEXTURE_SAMPLES 0x910F -#define GL_MAX_INTEGER_SAMPLES 0x9110 -#define GL_VERTEX_ATTRIB_ARRAY_DIVISOR 0x88FE -#define GL_SRC1_COLOR 0x88F9 -#define GL_ONE_MINUS_SRC1_COLOR 0x88FA -#define GL_ONE_MINUS_SRC1_ALPHA 0x88FB -#define GL_MAX_DUAL_SOURCE_DRAW_BUFFERS 0x88FC -#define GL_ANY_SAMPLES_PASSED 0x8C2F -#define GL_SAMPLER_BINDING 0x8919 -#define GL_RGB10_A2UI 0x906F -#define GL_TEXTURE_SWIZZLE_R 0x8E42 -#define GL_TEXTURE_SWIZZLE_G 0x8E43 -#define GL_TEXTURE_SWIZZLE_B 0x8E44 -#define GL_TEXTURE_SWIZZLE_A 0x8E45 -#define GL_TEXTURE_SWIZZLE_RGBA 0x8E46 -#define GL_TIME_ELAPSED 0x88BF -#define GL_TIMESTAMP 0x8E28 -#define GL_INT_2_10_10_10_REV 0x8D9F -#define GL_SAMPLE_SHADING 0x8C36 -#define GL_MIN_SAMPLE_SHADING_VALUE 0x8C37 -#define GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET 0x8E5E -#define GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET 0x8E5F -#define GL_TEXTURE_CUBE_MAP_ARRAY 0x9009 -#define GL_TEXTURE_BINDING_CUBE_MAP_ARRAY 0x900A -#define GL_PROXY_TEXTURE_CUBE_MAP_ARRAY 0x900B -#define GL_SAMPLER_CUBE_MAP_ARRAY 0x900C -#define GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW 0x900D -#define GL_INT_SAMPLER_CUBE_MAP_ARRAY 0x900E -#define GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY 0x900F -#define GL_DRAW_INDIRECT_BUFFER 0x8F3F -#define GL_DRAW_INDIRECT_BUFFER_BINDING 0x8F43 -#define GL_GEOMETRY_SHADER_INVOCATIONS 0x887F -#define GL_MAX_GEOMETRY_SHADER_INVOCATIONS 0x8E5A -#define GL_MIN_FRAGMENT_INTERPOLATION_OFFSET 0x8E5B -#define GL_MAX_FRAGMENT_INTERPOLATION_OFFSET 0x8E5C -#define GL_FRAGMENT_INTERPOLATION_OFFSET_BITS 0x8E5D -#define GL_MAX_VERTEX_STREAMS 0x8E71 -#define GL_DOUBLE_VEC2 0x8FFC -#define GL_DOUBLE_VEC3 0x8FFD -#define GL_DOUBLE_VEC4 0x8FFE -#define GL_DOUBLE_MAT2 0x8F46 -#define GL_DOUBLE_MAT3 0x8F47 -#define GL_DOUBLE_MAT4 0x8F48 -#define GL_DOUBLE_MAT2x3 0x8F49 -#define GL_DOUBLE_MAT2x4 0x8F4A -#define GL_DOUBLE_MAT3x2 0x8F4B -#define GL_DOUBLE_MAT3x4 0x8F4C -#define GL_DOUBLE_MAT4x2 0x8F4D -#define GL_DOUBLE_MAT4x3 0x8F4E -#define GL_ACTIVE_SUBROUTINES 0x8DE5 -#define GL_ACTIVE_SUBROUTINE_UNIFORMS 0x8DE6 -#define GL_ACTIVE_SUBROUTINE_UNIFORM_LOCATIONS 0x8E47 -#define GL_ACTIVE_SUBROUTINE_MAX_LENGTH 0x8E48 -#define GL_ACTIVE_SUBROUTINE_UNIFORM_MAX_LENGTH 0x8E49 -#define GL_MAX_SUBROUTINES 0x8DE7 -#define GL_MAX_SUBROUTINE_UNIFORM_LOCATIONS 0x8DE8 -#define GL_NUM_COMPATIBLE_SUBROUTINES 0x8E4A -#define GL_COMPATIBLE_SUBROUTINES 0x8E4B -#define GL_PATCHES 0x000E -#define GL_PATCH_VERTICES 0x8E72 -#define GL_PATCH_DEFAULT_INNER_LEVEL 0x8E73 -#define GL_PATCH_DEFAULT_OUTER_LEVEL 0x8E74 -#define GL_TESS_CONTROL_OUTPUT_VERTICES 0x8E75 -#define GL_TESS_GEN_MODE 0x8E76 -#define GL_TESS_GEN_SPACING 0x8E77 -#define GL_TESS_GEN_VERTEX_ORDER 0x8E78 -#define GL_TESS_GEN_POINT_MODE 0x8E79 -#define GL_ISOLINES 0x8E7A -#define GL_FRACTIONAL_ODD 0x8E7B -#define GL_FRACTIONAL_EVEN 0x8E7C -#define GL_MAX_PATCH_VERTICES 0x8E7D -#define GL_MAX_TESS_GEN_LEVEL 0x8E7E -#define GL_MAX_TESS_CONTROL_UNIFORM_COMPONENTS 0x8E7F -#define GL_MAX_TESS_EVALUATION_UNIFORM_COMPONENTS 0x8E80 -#define GL_MAX_TESS_CONTROL_TEXTURE_IMAGE_UNITS 0x8E81 -#define GL_MAX_TESS_EVALUATION_TEXTURE_IMAGE_UNITS 0x8E82 -#define GL_MAX_TESS_CONTROL_OUTPUT_COMPONENTS 0x8E83 -#define GL_MAX_TESS_PATCH_COMPONENTS 0x8E84 -#define GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS 0x8E85 -#define GL_MAX_TESS_EVALUATION_OUTPUT_COMPONENTS 0x8E86 -#define GL_MAX_TESS_CONTROL_UNIFORM_BLOCKS 0x8E89 -#define GL_MAX_TESS_EVALUATION_UNIFORM_BLOCKS 0x8E8A -#define GL_MAX_TESS_CONTROL_INPUT_COMPONENTS 0x886C -#define GL_MAX_TESS_EVALUATION_INPUT_COMPONENTS 0x886D -#define GL_MAX_COMBINED_TESS_CONTROL_UNIFORM_COMPONENTS 0x8E1E -#define GL_MAX_COMBINED_TESS_EVALUATION_UNIFORM_COMPONENTS 0x8E1F -#define GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_CONTROL_SHADER 0x84F0 -#define GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_EVALUATION_SHADER 0x84F1 -#define GL_TESS_EVALUATION_SHADER 0x8E87 -#define GL_TESS_CONTROL_SHADER 0x8E88 -#define GL_TRANSFORM_FEEDBACK 0x8E22 -#define GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED 0x8E23 -#define GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE 0x8E24 -#define GL_TRANSFORM_FEEDBACK_BINDING 0x8E25 -#define GL_MAX_TRANSFORM_FEEDBACK_BUFFERS 0x8E70 -#define GL_FIXED 0x140C -#define GL_IMPLEMENTATION_COLOR_READ_TYPE 0x8B9A -#define GL_IMPLEMENTATION_COLOR_READ_FORMAT 0x8B9B -#define GL_LOW_FLOAT 0x8DF0 -#define GL_MEDIUM_FLOAT 0x8DF1 -#define GL_HIGH_FLOAT 0x8DF2 -#define GL_LOW_INT 0x8DF3 -#define GL_MEDIUM_INT 0x8DF4 -#define GL_HIGH_INT 0x8DF5 -#define GL_SHADER_COMPILER 0x8DFA -#define GL_SHADER_BINARY_FORMATS 0x8DF8 -#define GL_NUM_SHADER_BINARY_FORMATS 0x8DF9 -#define GL_MAX_VERTEX_UNIFORM_VECTORS 0x8DFB -#define GL_MAX_VARYING_VECTORS 0x8DFC -#define GL_MAX_FRAGMENT_UNIFORM_VECTORS 0x8DFD -#define GL_RGB565 0x8D62 -#define GL_PROGRAM_BINARY_RETRIEVABLE_HINT 0x8257 -#define GL_PROGRAM_BINARY_LENGTH 0x8741 -#define GL_NUM_PROGRAM_BINARY_FORMATS 0x87FE -#define GL_PROGRAM_BINARY_FORMATS 0x87FF -#define GL_VERTEX_SHADER_BIT 0x00000001 -#define GL_FRAGMENT_SHADER_BIT 0x00000002 -#define GL_GEOMETRY_SHADER_BIT 0x00000004 -#define GL_TESS_CONTROL_SHADER_BIT 0x00000008 -#define GL_TESS_EVALUATION_SHADER_BIT 0x00000010 -#define GL_ALL_SHADER_BITS 0xFFFFFFFF -#define GL_PROGRAM_SEPARABLE 0x8258 -#define GL_ACTIVE_PROGRAM 0x8259 -#define GL_PROGRAM_PIPELINE_BINDING 0x825A -#define GL_MAX_VIEWPORTS 0x825B -#define GL_VIEWPORT_SUBPIXEL_BITS 0x825C -#define GL_VIEWPORT_BOUNDS_RANGE 0x825D -#define GL_LAYER_PROVOKING_VERTEX 0x825E -#define GL_VIEWPORT_INDEX_PROVOKING_VERTEX 0x825F -#define GL_UNDEFINED_VERTEX 0x8260 -#define GL_COPY_READ_BUFFER_BINDING 0x8F36 -#define GL_COPY_WRITE_BUFFER_BINDING 0x8F37 -#define GL_TRANSFORM_FEEDBACK_ACTIVE 0x8E24 -#define GL_TRANSFORM_FEEDBACK_PAUSED 0x8E23 -#define GL_UNPACK_COMPRESSED_BLOCK_WIDTH 0x9127 -#define GL_UNPACK_COMPRESSED_BLOCK_HEIGHT 0x9128 -#define GL_UNPACK_COMPRESSED_BLOCK_DEPTH 0x9129 -#define GL_UNPACK_COMPRESSED_BLOCK_SIZE 0x912A -#define GL_PACK_COMPRESSED_BLOCK_WIDTH 0x912B -#define GL_PACK_COMPRESSED_BLOCK_HEIGHT 0x912C -#define GL_PACK_COMPRESSED_BLOCK_DEPTH 0x912D -#define GL_PACK_COMPRESSED_BLOCK_SIZE 0x912E -#define GL_NUM_SAMPLE_COUNTS 0x9380 -#define GL_MIN_MAP_BUFFER_ALIGNMENT 0x90BC -#define GL_ATOMIC_COUNTER_BUFFER 0x92C0 -#define GL_ATOMIC_COUNTER_BUFFER_BINDING 0x92C1 -#define GL_ATOMIC_COUNTER_BUFFER_START 0x92C2 -#define GL_ATOMIC_COUNTER_BUFFER_SIZE 0x92C3 -#define GL_ATOMIC_COUNTER_BUFFER_DATA_SIZE 0x92C4 -#define GL_ATOMIC_COUNTER_BUFFER_ACTIVE_ATOMIC_COUNTERS 0x92C5 -#define GL_ATOMIC_COUNTER_BUFFER_ACTIVE_ATOMIC_COUNTER_INDICES 0x92C6 -#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_VERTEX_SHADER 0x92C7 -#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_TESS_CONTROL_SHADER 0x92C8 -#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_TESS_EVALUATION_SHADER 0x92C9 -#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_GEOMETRY_SHADER 0x92CA -#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_FRAGMENT_SHADER 0x92CB -#define GL_MAX_VERTEX_ATOMIC_COUNTER_BUFFERS 0x92CC -#define GL_MAX_TESS_CONTROL_ATOMIC_COUNTER_BUFFERS 0x92CD -#define GL_MAX_TESS_EVALUATION_ATOMIC_COUNTER_BUFFERS 0x92CE -#define GL_MAX_GEOMETRY_ATOMIC_COUNTER_BUFFERS 0x92CF -#define GL_MAX_FRAGMENT_ATOMIC_COUNTER_BUFFERS 0x92D0 -#define GL_MAX_COMBINED_ATOMIC_COUNTER_BUFFERS 0x92D1 -#define GL_MAX_VERTEX_ATOMIC_COUNTERS 0x92D2 -#define GL_MAX_TESS_CONTROL_ATOMIC_COUNTERS 0x92D3 -#define GL_MAX_TESS_EVALUATION_ATOMIC_COUNTERS 0x92D4 -#define GL_MAX_GEOMETRY_ATOMIC_COUNTERS 0x92D5 -#define GL_MAX_FRAGMENT_ATOMIC_COUNTERS 0x92D6 -#define GL_MAX_COMBINED_ATOMIC_COUNTERS 0x92D7 -#define GL_MAX_ATOMIC_COUNTER_BUFFER_SIZE 0x92D8 -#define GL_MAX_ATOMIC_COUNTER_BUFFER_BINDINGS 0x92DC -#define GL_ACTIVE_ATOMIC_COUNTER_BUFFERS 0x92D9 -#define GL_UNIFORM_ATOMIC_COUNTER_BUFFER_INDEX 0x92DA -#define GL_UNSIGNED_INT_ATOMIC_COUNTER 0x92DB -#define GL_VERTEX_ATTRIB_ARRAY_BARRIER_BIT 0x00000001 -#define GL_ELEMENT_ARRAY_BARRIER_BIT 0x00000002 -#define GL_UNIFORM_BARRIER_BIT 0x00000004 -#define GL_TEXTURE_FETCH_BARRIER_BIT 0x00000008 -#define GL_SHADER_IMAGE_ACCESS_BARRIER_BIT 0x00000020 -#define GL_COMMAND_BARRIER_BIT 0x00000040 -#define GL_PIXEL_BUFFER_BARRIER_BIT 0x00000080 -#define GL_TEXTURE_UPDATE_BARRIER_BIT 0x00000100 -#define GL_BUFFER_UPDATE_BARRIER_BIT 0x00000200 -#define GL_FRAMEBUFFER_BARRIER_BIT 0x00000400 -#define GL_TRANSFORM_FEEDBACK_BARRIER_BIT 0x00000800 -#define GL_ATOMIC_COUNTER_BARRIER_BIT 0x00001000 -#define GL_ALL_BARRIER_BITS 0xFFFFFFFF -#define GL_MAX_IMAGE_UNITS 0x8F38 -#define GL_MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS 0x8F39 -#define GL_IMAGE_BINDING_NAME 0x8F3A -#define GL_IMAGE_BINDING_LEVEL 0x8F3B -#define GL_IMAGE_BINDING_LAYERED 0x8F3C -#define GL_IMAGE_BINDING_LAYER 0x8F3D -#define GL_IMAGE_BINDING_ACCESS 0x8F3E -#define GL_IMAGE_1D 0x904C -#define GL_IMAGE_2D 0x904D -#define GL_IMAGE_3D 0x904E -#define GL_IMAGE_2D_RECT 0x904F -#define GL_IMAGE_CUBE 0x9050 -#define GL_IMAGE_BUFFER 0x9051 -#define GL_IMAGE_1D_ARRAY 0x9052 -#define GL_IMAGE_2D_ARRAY 0x9053 -#define GL_IMAGE_CUBE_MAP_ARRAY 0x9054 -#define GL_IMAGE_2D_MULTISAMPLE 0x9055 -#define GL_IMAGE_2D_MULTISAMPLE_ARRAY 0x9056 -#define GL_INT_IMAGE_1D 0x9057 -#define GL_INT_IMAGE_2D 0x9058 -#define GL_INT_IMAGE_3D 0x9059 -#define GL_INT_IMAGE_2D_RECT 0x905A -#define GL_INT_IMAGE_CUBE 0x905B -#define GL_INT_IMAGE_BUFFER 0x905C -#define GL_INT_IMAGE_1D_ARRAY 0x905D -#define GL_INT_IMAGE_2D_ARRAY 0x905E -#define GL_INT_IMAGE_CUBE_MAP_ARRAY 0x905F -#define GL_INT_IMAGE_2D_MULTISAMPLE 0x9060 -#define GL_INT_IMAGE_2D_MULTISAMPLE_ARRAY 0x9061 -#define GL_UNSIGNED_INT_IMAGE_1D 0x9062 -#define GL_UNSIGNED_INT_IMAGE_2D 0x9063 -#define GL_UNSIGNED_INT_IMAGE_3D 0x9064 -#define GL_UNSIGNED_INT_IMAGE_2D_RECT 0x9065 -#define GL_UNSIGNED_INT_IMAGE_CUBE 0x9066 -#define GL_UNSIGNED_INT_IMAGE_BUFFER 0x9067 -#define GL_UNSIGNED_INT_IMAGE_1D_ARRAY 0x9068 -#define GL_UNSIGNED_INT_IMAGE_2D_ARRAY 0x9069 -#define GL_UNSIGNED_INT_IMAGE_CUBE_MAP_ARRAY 0x906A -#define GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE 0x906B -#define GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_ARRAY 0x906C -#define GL_MAX_IMAGE_SAMPLES 0x906D -#define GL_IMAGE_BINDING_FORMAT 0x906E -#define GL_IMAGE_FORMAT_COMPATIBILITY_TYPE 0x90C7 -#define GL_IMAGE_FORMAT_COMPATIBILITY_BY_SIZE 0x90C8 -#define GL_IMAGE_FORMAT_COMPATIBILITY_BY_CLASS 0x90C9 -#define GL_MAX_VERTEX_IMAGE_UNIFORMS 0x90CA -#define GL_MAX_TESS_CONTROL_IMAGE_UNIFORMS 0x90CB -#define GL_MAX_TESS_EVALUATION_IMAGE_UNIFORMS 0x90CC -#define GL_MAX_GEOMETRY_IMAGE_UNIFORMS 0x90CD -#define GL_MAX_FRAGMENT_IMAGE_UNIFORMS 0x90CE -#define GL_MAX_COMBINED_IMAGE_UNIFORMS 0x90CF -#define GL_COMPRESSED_RGBA_BPTC_UNORM 0x8E8C -#define GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM 0x8E8D -#define GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT 0x8E8E -#define GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT 0x8E8F -#define GL_TEXTURE_IMMUTABLE_FORMAT 0x912F -#define GL_NUM_SHADING_LANGUAGE_VERSIONS 0x82E9 -#define GL_VERTEX_ATTRIB_ARRAY_LONG 0x874E -#define GL_COMPRESSED_RGB8_ETC2 0x9274 -#define GL_COMPRESSED_SRGB8_ETC2 0x9275 -#define GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2 0x9276 -#define GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2 0x9277 -#define GL_COMPRESSED_RGBA8_ETC2_EAC 0x9278 -#define GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC 0x9279 -#define GL_COMPRESSED_R11_EAC 0x9270 -#define GL_COMPRESSED_SIGNED_R11_EAC 0x9271 -#define GL_COMPRESSED_RG11_EAC 0x9272 -#define GL_COMPRESSED_SIGNED_RG11_EAC 0x9273 -#define GL_PRIMITIVE_RESTART_FIXED_INDEX 0x8D69 -#define GL_ANY_SAMPLES_PASSED_CONSERVATIVE 0x8D6A -#define GL_MAX_ELEMENT_INDEX 0x8D6B -#define GL_COMPUTE_SHADER 0x91B9 -#define GL_MAX_COMPUTE_UNIFORM_BLOCKS 0x91BB -#define GL_MAX_COMPUTE_TEXTURE_IMAGE_UNITS 0x91BC -#define GL_MAX_COMPUTE_IMAGE_UNIFORMS 0x91BD -#define GL_MAX_COMPUTE_SHARED_MEMORY_SIZE 0x8262 -#define GL_MAX_COMPUTE_UNIFORM_COMPONENTS 0x8263 -#define GL_MAX_COMPUTE_ATOMIC_COUNTER_BUFFERS 0x8264 -#define GL_MAX_COMPUTE_ATOMIC_COUNTERS 0x8265 -#define GL_MAX_COMBINED_COMPUTE_UNIFORM_COMPONENTS 0x8266 -#define GL_MAX_COMPUTE_WORK_GROUP_INVOCATIONS 0x90EB -#define GL_MAX_COMPUTE_WORK_GROUP_COUNT 0x91BE -#define GL_MAX_COMPUTE_WORK_GROUP_SIZE 0x91BF -#define GL_COMPUTE_WORK_GROUP_SIZE 0x8267 -#define GL_UNIFORM_BLOCK_REFERENCED_BY_COMPUTE_SHADER 0x90EC -#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_COMPUTE_SHADER 0x90ED -#define GL_DISPATCH_INDIRECT_BUFFER 0x90EE -#define GL_DISPATCH_INDIRECT_BUFFER_BINDING 0x90EF -#define GL_COMPUTE_SHADER_BIT 0x00000020 -#define GL_DEBUG_OUTPUT_SYNCHRONOUS 0x8242 -#define GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH 0x8243 -#define GL_DEBUG_CALLBACK_FUNCTION 0x8244 -#define GL_DEBUG_CALLBACK_USER_PARAM 0x8245 -#define GL_DEBUG_SOURCE_API 0x8246 -#define GL_DEBUG_SOURCE_WINDOW_SYSTEM 0x8247 -#define GL_DEBUG_SOURCE_SHADER_COMPILER 0x8248 -#define GL_DEBUG_SOURCE_THIRD_PARTY 0x8249 -#define GL_DEBUG_SOURCE_APPLICATION 0x824A -#define GL_DEBUG_SOURCE_OTHER 0x824B -#define GL_DEBUG_TYPE_ERROR 0x824C -#define GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR 0x824D -#define GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR 0x824E -#define GL_DEBUG_TYPE_PORTABILITY 0x824F -#define GL_DEBUG_TYPE_PERFORMANCE 0x8250 -#define GL_DEBUG_TYPE_OTHER 0x8251 -#define GL_MAX_DEBUG_MESSAGE_LENGTH 0x9143 -#define GL_MAX_DEBUG_LOGGED_MESSAGES 0x9144 -#define GL_DEBUG_LOGGED_MESSAGES 0x9145 -#define GL_DEBUG_SEVERITY_HIGH 0x9146 -#define GL_DEBUG_SEVERITY_MEDIUM 0x9147 -#define GL_DEBUG_SEVERITY_LOW 0x9148 -#define GL_DEBUG_TYPE_MARKER 0x8268 -#define GL_DEBUG_TYPE_PUSH_GROUP 0x8269 -#define GL_DEBUG_TYPE_POP_GROUP 0x826A -#define GL_DEBUG_SEVERITY_NOTIFICATION 0x826B -#define GL_MAX_DEBUG_GROUP_STACK_DEPTH 0x826C -#define GL_DEBUG_GROUP_STACK_DEPTH 0x826D -#define GL_BUFFER 0x82E0 -#define GL_SHADER 0x82E1 -#define GL_PROGRAM 0x82E2 -#define GL_QUERY 0x82E3 -#define GL_PROGRAM_PIPELINE 0x82E4 -#define GL_SAMPLER 0x82E6 -#define GL_MAX_LABEL_LENGTH 0x82E8 -#define GL_DEBUG_OUTPUT 0x92E0 -#define GL_CONTEXT_FLAG_DEBUG_BIT 0x00000002 -#define GL_MAX_UNIFORM_LOCATIONS 0x826E -#define GL_FRAMEBUFFER_DEFAULT_WIDTH 0x9310 -#define GL_FRAMEBUFFER_DEFAULT_HEIGHT 0x9311 -#define GL_FRAMEBUFFER_DEFAULT_LAYERS 0x9312 -#define GL_FRAMEBUFFER_DEFAULT_SAMPLES 0x9313 -#define GL_FRAMEBUFFER_DEFAULT_FIXED_SAMPLE_LOCATIONS 0x9314 -#define GL_MAX_FRAMEBUFFER_WIDTH 0x9315 -#define GL_MAX_FRAMEBUFFER_HEIGHT 0x9316 -#define GL_MAX_FRAMEBUFFER_LAYERS 0x9317 -#define GL_MAX_FRAMEBUFFER_SAMPLES 0x9318 -#define GL_INTERNALFORMAT_SUPPORTED 0x826F -#define GL_INTERNALFORMAT_PREFERRED 0x8270 -#define GL_INTERNALFORMAT_RED_SIZE 0x8271 -#define GL_INTERNALFORMAT_GREEN_SIZE 0x8272 -#define GL_INTERNALFORMAT_BLUE_SIZE 0x8273 -#define GL_INTERNALFORMAT_ALPHA_SIZE 0x8274 -#define GL_INTERNALFORMAT_DEPTH_SIZE 0x8275 -#define GL_INTERNALFORMAT_STENCIL_SIZE 0x8276 -#define GL_INTERNALFORMAT_SHARED_SIZE 0x8277 -#define GL_INTERNALFORMAT_RED_TYPE 0x8278 -#define GL_INTERNALFORMAT_GREEN_TYPE 0x8279 -#define GL_INTERNALFORMAT_BLUE_TYPE 0x827A -#define GL_INTERNALFORMAT_ALPHA_TYPE 0x827B -#define GL_INTERNALFORMAT_DEPTH_TYPE 0x827C -#define GL_INTERNALFORMAT_STENCIL_TYPE 0x827D -#define GL_MAX_WIDTH 0x827E -#define GL_MAX_HEIGHT 0x827F -#define GL_MAX_DEPTH 0x8280 -#define GL_MAX_LAYERS 0x8281 -#define GL_MAX_COMBINED_DIMENSIONS 0x8282 -#define GL_COLOR_COMPONENTS 0x8283 -#define GL_DEPTH_COMPONENTS 0x8284 -#define GL_STENCIL_COMPONENTS 0x8285 -#define GL_COLOR_RENDERABLE 0x8286 -#define GL_DEPTH_RENDERABLE 0x8287 -#define GL_STENCIL_RENDERABLE 0x8288 -#define GL_FRAMEBUFFER_RENDERABLE 0x8289 -#define GL_FRAMEBUFFER_RENDERABLE_LAYERED 0x828A -#define GL_FRAMEBUFFER_BLEND 0x828B -#define GL_READ_PIXELS 0x828C -#define GL_READ_PIXELS_FORMAT 0x828D -#define GL_READ_PIXELS_TYPE 0x828E -#define GL_TEXTURE_IMAGE_FORMAT 0x828F -#define GL_TEXTURE_IMAGE_TYPE 0x8290 -#define GL_GET_TEXTURE_IMAGE_FORMAT 0x8291 -#define GL_GET_TEXTURE_IMAGE_TYPE 0x8292 -#define GL_MIPMAP 0x8293 -#define GL_MANUAL_GENERATE_MIPMAP 0x8294 -#define GL_AUTO_GENERATE_MIPMAP 0x8295 -#define GL_COLOR_ENCODING 0x8296 -#define GL_SRGB_READ 0x8297 -#define GL_SRGB_WRITE 0x8298 -#define GL_FILTER 0x829A -#define GL_VERTEX_TEXTURE 0x829B -#define GL_TESS_CONTROL_TEXTURE 0x829C -#define GL_TESS_EVALUATION_TEXTURE 0x829D -#define GL_GEOMETRY_TEXTURE 0x829E -#define GL_FRAGMENT_TEXTURE 0x829F -#define GL_COMPUTE_TEXTURE 0x82A0 -#define GL_TEXTURE_SHADOW 0x82A1 -#define GL_TEXTURE_GATHER 0x82A2 -#define GL_TEXTURE_GATHER_SHADOW 0x82A3 -#define GL_SHADER_IMAGE_LOAD 0x82A4 -#define GL_SHADER_IMAGE_STORE 0x82A5 -#define GL_SHADER_IMAGE_ATOMIC 0x82A6 -#define GL_IMAGE_TEXEL_SIZE 0x82A7 -#define GL_IMAGE_COMPATIBILITY_CLASS 0x82A8 -#define GL_IMAGE_PIXEL_FORMAT 0x82A9 -#define GL_IMAGE_PIXEL_TYPE 0x82AA -#define GL_SIMULTANEOUS_TEXTURE_AND_DEPTH_TEST 0x82AC -#define GL_SIMULTANEOUS_TEXTURE_AND_STENCIL_TEST 0x82AD -#define GL_SIMULTANEOUS_TEXTURE_AND_DEPTH_WRITE 0x82AE -#define GL_SIMULTANEOUS_TEXTURE_AND_STENCIL_WRITE 0x82AF -#define GL_TEXTURE_COMPRESSED_BLOCK_WIDTH 0x82B1 -#define GL_TEXTURE_COMPRESSED_BLOCK_HEIGHT 0x82B2 -#define GL_TEXTURE_COMPRESSED_BLOCK_SIZE 0x82B3 -#define GL_CLEAR_BUFFER 0x82B4 -#define GL_TEXTURE_VIEW 0x82B5 -#define GL_VIEW_COMPATIBILITY_CLASS 0x82B6 -#define GL_FULL_SUPPORT 0x82B7 -#define GL_CAVEAT_SUPPORT 0x82B8 -#define GL_IMAGE_CLASS_4_X_32 0x82B9 -#define GL_IMAGE_CLASS_2_X_32 0x82BA -#define GL_IMAGE_CLASS_1_X_32 0x82BB -#define GL_IMAGE_CLASS_4_X_16 0x82BC -#define GL_IMAGE_CLASS_2_X_16 0x82BD -#define GL_IMAGE_CLASS_1_X_16 0x82BE -#define GL_IMAGE_CLASS_4_X_8 0x82BF -#define GL_IMAGE_CLASS_2_X_8 0x82C0 -#define GL_IMAGE_CLASS_1_X_8 0x82C1 -#define GL_IMAGE_CLASS_11_11_10 0x82C2 -#define GL_IMAGE_CLASS_10_10_10_2 0x82C3 -#define GL_VIEW_CLASS_128_BITS 0x82C4 -#define GL_VIEW_CLASS_96_BITS 0x82C5 -#define GL_VIEW_CLASS_64_BITS 0x82C6 -#define GL_VIEW_CLASS_48_BITS 0x82C7 -#define GL_VIEW_CLASS_32_BITS 0x82C8 -#define GL_VIEW_CLASS_24_BITS 0x82C9 -#define GL_VIEW_CLASS_16_BITS 0x82CA -#define GL_VIEW_CLASS_8_BITS 0x82CB -#define GL_VIEW_CLASS_S3TC_DXT1_RGB 0x82CC -#define GL_VIEW_CLASS_S3TC_DXT1_RGBA 0x82CD -#define GL_VIEW_CLASS_S3TC_DXT3_RGBA 0x82CE -#define GL_VIEW_CLASS_S3TC_DXT5_RGBA 0x82CF -#define GL_VIEW_CLASS_RGTC1_RED 0x82D0 -#define GL_VIEW_CLASS_RGTC2_RG 0x82D1 -#define GL_VIEW_CLASS_BPTC_UNORM 0x82D2 -#define GL_VIEW_CLASS_BPTC_FLOAT 0x82D3 -#define GL_UNIFORM 0x92E1 -#define GL_UNIFORM_BLOCK 0x92E2 -#define GL_PROGRAM_INPUT 0x92E3 -#define GL_PROGRAM_OUTPUT 0x92E4 -#define GL_BUFFER_VARIABLE 0x92E5 -#define GL_SHADER_STORAGE_BLOCK 0x92E6 -#define GL_VERTEX_SUBROUTINE 0x92E8 -#define GL_TESS_CONTROL_SUBROUTINE 0x92E9 -#define GL_TESS_EVALUATION_SUBROUTINE 0x92EA -#define GL_GEOMETRY_SUBROUTINE 0x92EB -#define GL_FRAGMENT_SUBROUTINE 0x92EC -#define GL_COMPUTE_SUBROUTINE 0x92ED -#define GL_VERTEX_SUBROUTINE_UNIFORM 0x92EE -#define GL_TESS_CONTROL_SUBROUTINE_UNIFORM 0x92EF -#define GL_TESS_EVALUATION_SUBROUTINE_UNIFORM 0x92F0 -#define GL_GEOMETRY_SUBROUTINE_UNIFORM 0x92F1 -#define GL_FRAGMENT_SUBROUTINE_UNIFORM 0x92F2 -#define GL_COMPUTE_SUBROUTINE_UNIFORM 0x92F3 -#define GL_TRANSFORM_FEEDBACK_VARYING 0x92F4 -#define GL_ACTIVE_RESOURCES 0x92F5 -#define GL_MAX_NAME_LENGTH 0x92F6 -#define GL_MAX_NUM_ACTIVE_VARIABLES 0x92F7 -#define GL_MAX_NUM_COMPATIBLE_SUBROUTINES 0x92F8 -#define GL_NAME_LENGTH 0x92F9 -#define GL_TYPE 0x92FA -#define GL_ARRAY_SIZE 0x92FB -#define GL_OFFSET 0x92FC -#define GL_BLOCK_INDEX 0x92FD -#define GL_ARRAY_STRIDE 0x92FE -#define GL_MATRIX_STRIDE 0x92FF -#define GL_IS_ROW_MAJOR 0x9300 -#define GL_ATOMIC_COUNTER_BUFFER_INDEX 0x9301 -#define GL_BUFFER_BINDING 0x9302 -#define GL_BUFFER_DATA_SIZE 0x9303 -#define GL_NUM_ACTIVE_VARIABLES 0x9304 -#define GL_ACTIVE_VARIABLES 0x9305 -#define GL_REFERENCED_BY_VERTEX_SHADER 0x9306 -#define GL_REFERENCED_BY_TESS_CONTROL_SHADER 0x9307 -#define GL_REFERENCED_BY_TESS_EVALUATION_SHADER 0x9308 -#define GL_REFERENCED_BY_GEOMETRY_SHADER 0x9309 -#define GL_REFERENCED_BY_FRAGMENT_SHADER 0x930A -#define GL_REFERENCED_BY_COMPUTE_SHADER 0x930B -#define GL_TOP_LEVEL_ARRAY_SIZE 0x930C -#define GL_TOP_LEVEL_ARRAY_STRIDE 0x930D -#define GL_LOCATION 0x930E -#define GL_LOCATION_INDEX 0x930F -#define GL_IS_PER_PATCH 0x92E7 -#define GL_SHADER_STORAGE_BUFFER 0x90D2 -#define GL_SHADER_STORAGE_BUFFER_BINDING 0x90D3 -#define GL_SHADER_STORAGE_BUFFER_START 0x90D4 -#define GL_SHADER_STORAGE_BUFFER_SIZE 0x90D5 -#define GL_MAX_VERTEX_SHADER_STORAGE_BLOCKS 0x90D6 -#define GL_MAX_GEOMETRY_SHADER_STORAGE_BLOCKS 0x90D7 -#define GL_MAX_TESS_CONTROL_SHADER_STORAGE_BLOCKS 0x90D8 -#define GL_MAX_TESS_EVALUATION_SHADER_STORAGE_BLOCKS 0x90D9 -#define GL_MAX_FRAGMENT_SHADER_STORAGE_BLOCKS 0x90DA -#define GL_MAX_COMPUTE_SHADER_STORAGE_BLOCKS 0x90DB -#define GL_MAX_COMBINED_SHADER_STORAGE_BLOCKS 0x90DC -#define GL_MAX_SHADER_STORAGE_BUFFER_BINDINGS 0x90DD -#define GL_MAX_SHADER_STORAGE_BLOCK_SIZE 0x90DE -#define GL_SHADER_STORAGE_BUFFER_OFFSET_ALIGNMENT 0x90DF -#define GL_SHADER_STORAGE_BARRIER_BIT 0x00002000 -#define GL_MAX_COMBINED_SHADER_OUTPUT_RESOURCES 0x8F39 -#define GL_DEPTH_STENCIL_TEXTURE_MODE 0x90EA -#define GL_TEXTURE_BUFFER_OFFSET 0x919D -#define GL_TEXTURE_BUFFER_SIZE 0x919E -#define GL_TEXTURE_BUFFER_OFFSET_ALIGNMENT 0x919F -#define GL_TEXTURE_VIEW_MIN_LEVEL 0x82DB -#define GL_TEXTURE_VIEW_NUM_LEVELS 0x82DC -#define GL_TEXTURE_VIEW_MIN_LAYER 0x82DD -#define GL_TEXTURE_VIEW_NUM_LAYERS 0x82DE -#define GL_TEXTURE_IMMUTABLE_LEVELS 0x82DF -#define GL_VERTEX_ATTRIB_BINDING 0x82D4 -#define GL_VERTEX_ATTRIB_RELATIVE_OFFSET 0x82D5 -#define GL_VERTEX_BINDING_DIVISOR 0x82D6 -#define GL_VERTEX_BINDING_OFFSET 0x82D7 -#define GL_VERTEX_BINDING_STRIDE 0x82D8 -#define GL_MAX_VERTEX_ATTRIB_RELATIVE_OFFSET 0x82D9 -#define GL_MAX_VERTEX_ATTRIB_BINDINGS 0x82DA -#define GL_VERTEX_BINDING_BUFFER 0x8F4F -#define GL_DISPLAY_LIST 0x82E7 -#ifndef GL_VERSION_1_0 -#define GL_VERSION_1_0 1 -GLAPI int GLAD_GL_VERSION_1_0; -typedef void (APIENTRYP PFNGLCULLFACEPROC)(GLenum mode); -GLAPI PFNGLCULLFACEPROC glad_glCullFace; -#define glCullFace glad_glCullFace -typedef void (APIENTRYP PFNGLFRONTFACEPROC)(GLenum mode); -GLAPI PFNGLFRONTFACEPROC glad_glFrontFace; -#define glFrontFace glad_glFrontFace -typedef void (APIENTRYP PFNGLHINTPROC)(GLenum target, GLenum mode); -GLAPI PFNGLHINTPROC glad_glHint; -#define glHint glad_glHint -typedef void (APIENTRYP PFNGLLINEWIDTHPROC)(GLfloat width); -GLAPI PFNGLLINEWIDTHPROC glad_glLineWidth; -#define glLineWidth glad_glLineWidth -typedef void (APIENTRYP PFNGLPOINTSIZEPROC)(GLfloat size); -GLAPI PFNGLPOINTSIZEPROC glad_glPointSize; -#define glPointSize glad_glPointSize -typedef void (APIENTRYP PFNGLPOLYGONMODEPROC)(GLenum face, GLenum mode); -GLAPI PFNGLPOLYGONMODEPROC glad_glPolygonMode; -#define glPolygonMode glad_glPolygonMode -typedef void (APIENTRYP PFNGLSCISSORPROC)(GLint x, GLint y, GLsizei width, GLsizei height); -GLAPI PFNGLSCISSORPROC glad_glScissor; -#define glScissor glad_glScissor -typedef void (APIENTRYP PFNGLTEXPARAMETERFPROC)(GLenum target, GLenum pname, GLfloat param); -GLAPI PFNGLTEXPARAMETERFPROC glad_glTexParameterf; -#define glTexParameterf glad_glTexParameterf -typedef void (APIENTRYP PFNGLTEXPARAMETERFVPROC)(GLenum target, GLenum pname, const GLfloat *params); -GLAPI PFNGLTEXPARAMETERFVPROC glad_glTexParameterfv; -#define glTexParameterfv glad_glTexParameterfv -typedef void (APIENTRYP PFNGLTEXPARAMETERIPROC)(GLenum target, GLenum pname, GLint param); -GLAPI PFNGLTEXPARAMETERIPROC glad_glTexParameteri; -#define glTexParameteri glad_glTexParameteri -typedef void (APIENTRYP PFNGLTEXPARAMETERIVPROC)(GLenum target, GLenum pname, const GLint *params); -GLAPI PFNGLTEXPARAMETERIVPROC glad_glTexParameteriv; -#define glTexParameteriv glad_glTexParameteriv -typedef void (APIENTRYP PFNGLTEXIMAGE1DPROC)(GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const void *pixels); -GLAPI PFNGLTEXIMAGE1DPROC glad_glTexImage1D; -#define glTexImage1D glad_glTexImage1D -typedef void (APIENTRYP PFNGLTEXIMAGE2DPROC)(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void *pixels); -GLAPI PFNGLTEXIMAGE2DPROC glad_glTexImage2D; -#define glTexImage2D glad_glTexImage2D -typedef void (APIENTRYP PFNGLDRAWBUFFERPROC)(GLenum buf); -GLAPI PFNGLDRAWBUFFERPROC glad_glDrawBuffer; -#define glDrawBuffer glad_glDrawBuffer -typedef void (APIENTRYP PFNGLCLEARPROC)(GLbitfield mask); -GLAPI PFNGLCLEARPROC glad_glClear; -#define glClear glad_glClear -typedef void (APIENTRYP PFNGLCLEARCOLORPROC)(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha); -GLAPI PFNGLCLEARCOLORPROC glad_glClearColor; -#define glClearColor glad_glClearColor -typedef void (APIENTRYP PFNGLCLEARSTENCILPROC)(GLint s); -GLAPI PFNGLCLEARSTENCILPROC glad_glClearStencil; -#define glClearStencil glad_glClearStencil -typedef void (APIENTRYP PFNGLCLEARDEPTHPROC)(GLdouble depth); -GLAPI PFNGLCLEARDEPTHPROC glad_glClearDepth; -#define glClearDepth glad_glClearDepth -typedef void (APIENTRYP PFNGLSTENCILMASKPROC)(GLuint mask); -GLAPI PFNGLSTENCILMASKPROC glad_glStencilMask; -#define glStencilMask glad_glStencilMask -typedef void (APIENTRYP PFNGLCOLORMASKPROC)(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha); -GLAPI PFNGLCOLORMASKPROC glad_glColorMask; -#define glColorMask glad_glColorMask -typedef void (APIENTRYP PFNGLDEPTHMASKPROC)(GLboolean flag); -GLAPI PFNGLDEPTHMASKPROC glad_glDepthMask; -#define glDepthMask glad_glDepthMask -typedef void (APIENTRYP PFNGLDISABLEPROC)(GLenum cap); -GLAPI PFNGLDISABLEPROC glad_glDisable; -#define glDisable glad_glDisable -typedef void (APIENTRYP PFNGLENABLEPROC)(GLenum cap); -GLAPI PFNGLENABLEPROC glad_glEnable; -#define glEnable glad_glEnable -typedef void (APIENTRYP PFNGLFINISHPROC)(void); -GLAPI PFNGLFINISHPROC glad_glFinish; -#define glFinish glad_glFinish -typedef void (APIENTRYP PFNGLFLUSHPROC)(void); -GLAPI PFNGLFLUSHPROC glad_glFlush; -#define glFlush glad_glFlush -typedef void (APIENTRYP PFNGLBLENDFUNCPROC)(GLenum sfactor, GLenum dfactor); -GLAPI PFNGLBLENDFUNCPROC glad_glBlendFunc; -#define glBlendFunc glad_glBlendFunc -typedef void (APIENTRYP PFNGLLOGICOPPROC)(GLenum opcode); -GLAPI PFNGLLOGICOPPROC glad_glLogicOp; -#define glLogicOp glad_glLogicOp -typedef void (APIENTRYP PFNGLSTENCILFUNCPROC)(GLenum func, GLint ref, GLuint mask); -GLAPI PFNGLSTENCILFUNCPROC glad_glStencilFunc; -#define glStencilFunc glad_glStencilFunc -typedef void (APIENTRYP PFNGLSTENCILOPPROC)(GLenum fail, GLenum zfail, GLenum zpass); -GLAPI PFNGLSTENCILOPPROC glad_glStencilOp; -#define glStencilOp glad_glStencilOp -typedef void (APIENTRYP PFNGLDEPTHFUNCPROC)(GLenum func); -GLAPI PFNGLDEPTHFUNCPROC glad_glDepthFunc; -#define glDepthFunc glad_glDepthFunc -typedef void (APIENTRYP PFNGLPIXELSTOREFPROC)(GLenum pname, GLfloat param); -GLAPI PFNGLPIXELSTOREFPROC glad_glPixelStoref; -#define glPixelStoref glad_glPixelStoref -typedef void (APIENTRYP PFNGLPIXELSTOREIPROC)(GLenum pname, GLint param); -GLAPI PFNGLPIXELSTOREIPROC glad_glPixelStorei; -#define glPixelStorei glad_glPixelStorei -typedef void (APIENTRYP PFNGLREADBUFFERPROC)(GLenum src); -GLAPI PFNGLREADBUFFERPROC glad_glReadBuffer; -#define glReadBuffer glad_glReadBuffer -typedef void (APIENTRYP PFNGLREADPIXELSPROC)(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, void *pixels); -GLAPI PFNGLREADPIXELSPROC glad_glReadPixels; -#define glReadPixels glad_glReadPixels -typedef void (APIENTRYP PFNGLGETBOOLEANVPROC)(GLenum pname, GLboolean *data); -GLAPI PFNGLGETBOOLEANVPROC glad_glGetBooleanv; -#define glGetBooleanv glad_glGetBooleanv -typedef void (APIENTRYP PFNGLGETDOUBLEVPROC)(GLenum pname, GLdouble *data); -GLAPI PFNGLGETDOUBLEVPROC glad_glGetDoublev; -#define glGetDoublev glad_glGetDoublev -typedef GLenum (APIENTRYP PFNGLGETERRORPROC)(void); -GLAPI PFNGLGETERRORPROC glad_glGetError; -#define glGetError glad_glGetError -typedef void (APIENTRYP PFNGLGETFLOATVPROC)(GLenum pname, GLfloat *data); -GLAPI PFNGLGETFLOATVPROC glad_glGetFloatv; -#define glGetFloatv glad_glGetFloatv -typedef void (APIENTRYP PFNGLGETINTEGERVPROC)(GLenum pname, GLint *data); -GLAPI PFNGLGETINTEGERVPROC glad_glGetIntegerv; -#define glGetIntegerv glad_glGetIntegerv -typedef const GLubyte * (APIENTRYP PFNGLGETSTRINGPROC)(GLenum name); -GLAPI PFNGLGETSTRINGPROC glad_glGetString; -#define glGetString glad_glGetString -typedef void (APIENTRYP PFNGLGETTEXIMAGEPROC)(GLenum target, GLint level, GLenum format, GLenum type, void *pixels); -GLAPI PFNGLGETTEXIMAGEPROC glad_glGetTexImage; -#define glGetTexImage glad_glGetTexImage -typedef void (APIENTRYP PFNGLGETTEXPARAMETERFVPROC)(GLenum target, GLenum pname, GLfloat *params); -GLAPI PFNGLGETTEXPARAMETERFVPROC glad_glGetTexParameterfv; -#define glGetTexParameterfv glad_glGetTexParameterfv -typedef void (APIENTRYP PFNGLGETTEXPARAMETERIVPROC)(GLenum target, GLenum pname, GLint *params); -GLAPI PFNGLGETTEXPARAMETERIVPROC glad_glGetTexParameteriv; -#define glGetTexParameteriv glad_glGetTexParameteriv -typedef void (APIENTRYP PFNGLGETTEXLEVELPARAMETERFVPROC)(GLenum target, GLint level, GLenum pname, GLfloat *params); -GLAPI PFNGLGETTEXLEVELPARAMETERFVPROC glad_glGetTexLevelParameterfv; -#define glGetTexLevelParameterfv glad_glGetTexLevelParameterfv -typedef void (APIENTRYP PFNGLGETTEXLEVELPARAMETERIVPROC)(GLenum target, GLint level, GLenum pname, GLint *params); -GLAPI PFNGLGETTEXLEVELPARAMETERIVPROC glad_glGetTexLevelParameteriv; -#define glGetTexLevelParameteriv glad_glGetTexLevelParameteriv -typedef GLboolean (APIENTRYP PFNGLISENABLEDPROC)(GLenum cap); -GLAPI PFNGLISENABLEDPROC glad_glIsEnabled; -#define glIsEnabled glad_glIsEnabled -typedef void (APIENTRYP PFNGLDEPTHRANGEPROC)(GLdouble n, GLdouble f); -GLAPI PFNGLDEPTHRANGEPROC glad_glDepthRange; -#define glDepthRange glad_glDepthRange -typedef void (APIENTRYP PFNGLVIEWPORTPROC)(GLint x, GLint y, GLsizei width, GLsizei height); -GLAPI PFNGLVIEWPORTPROC glad_glViewport; -#define glViewport glad_glViewport -typedef void (APIENTRYP PFNGLNEWLISTPROC)(GLuint list, GLenum mode); -GLAPI PFNGLNEWLISTPROC glad_glNewList; -#define glNewList glad_glNewList -typedef void (APIENTRYP PFNGLENDLISTPROC)(void); -GLAPI PFNGLENDLISTPROC glad_glEndList; -#define glEndList glad_glEndList -typedef void (APIENTRYP PFNGLCALLLISTPROC)(GLuint list); -GLAPI PFNGLCALLLISTPROC glad_glCallList; -#define glCallList glad_glCallList -typedef void (APIENTRYP PFNGLCALLLISTSPROC)(GLsizei n, GLenum type, const void *lists); -GLAPI PFNGLCALLLISTSPROC glad_glCallLists; -#define glCallLists glad_glCallLists -typedef void (APIENTRYP PFNGLDELETELISTSPROC)(GLuint list, GLsizei range); -GLAPI PFNGLDELETELISTSPROC glad_glDeleteLists; -#define glDeleteLists glad_glDeleteLists -typedef GLuint (APIENTRYP PFNGLGENLISTSPROC)(GLsizei range); -GLAPI PFNGLGENLISTSPROC glad_glGenLists; -#define glGenLists glad_glGenLists -typedef void (APIENTRYP PFNGLLISTBASEPROC)(GLuint base); -GLAPI PFNGLLISTBASEPROC glad_glListBase; -#define glListBase glad_glListBase -typedef void (APIENTRYP PFNGLBEGINPROC)(GLenum mode); -GLAPI PFNGLBEGINPROC glad_glBegin; -#define glBegin glad_glBegin -typedef void (APIENTRYP PFNGLBITMAPPROC)(GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove, const GLubyte *bitmap); -GLAPI PFNGLBITMAPPROC glad_glBitmap; -#define glBitmap glad_glBitmap -typedef void (APIENTRYP PFNGLCOLOR3BPROC)(GLbyte red, GLbyte green, GLbyte blue); -GLAPI PFNGLCOLOR3BPROC glad_glColor3b; -#define glColor3b glad_glColor3b -typedef void (APIENTRYP PFNGLCOLOR3BVPROC)(const GLbyte *v); -GLAPI PFNGLCOLOR3BVPROC glad_glColor3bv; -#define glColor3bv glad_glColor3bv -typedef void (APIENTRYP PFNGLCOLOR3DPROC)(GLdouble red, GLdouble green, GLdouble blue); -GLAPI PFNGLCOLOR3DPROC glad_glColor3d; -#define glColor3d glad_glColor3d -typedef void (APIENTRYP PFNGLCOLOR3DVPROC)(const GLdouble *v); -GLAPI PFNGLCOLOR3DVPROC glad_glColor3dv; -#define glColor3dv glad_glColor3dv -typedef void (APIENTRYP PFNGLCOLOR3FPROC)(GLfloat red, GLfloat green, GLfloat blue); -GLAPI PFNGLCOLOR3FPROC glad_glColor3f; -#define glColor3f glad_glColor3f -typedef void (APIENTRYP PFNGLCOLOR3FVPROC)(const GLfloat *v); -GLAPI PFNGLCOLOR3FVPROC glad_glColor3fv; -#define glColor3fv glad_glColor3fv -typedef void (APIENTRYP PFNGLCOLOR3IPROC)(GLint red, GLint green, GLint blue); -GLAPI PFNGLCOLOR3IPROC glad_glColor3i; -#define glColor3i glad_glColor3i -typedef void (APIENTRYP PFNGLCOLOR3IVPROC)(const GLint *v); -GLAPI PFNGLCOLOR3IVPROC glad_glColor3iv; -#define glColor3iv glad_glColor3iv -typedef void (APIENTRYP PFNGLCOLOR3SPROC)(GLshort red, GLshort green, GLshort blue); -GLAPI PFNGLCOLOR3SPROC glad_glColor3s; -#define glColor3s glad_glColor3s -typedef void (APIENTRYP PFNGLCOLOR3SVPROC)(const GLshort *v); -GLAPI PFNGLCOLOR3SVPROC glad_glColor3sv; -#define glColor3sv glad_glColor3sv -typedef void (APIENTRYP PFNGLCOLOR3UBPROC)(GLubyte red, GLubyte green, GLubyte blue); -GLAPI PFNGLCOLOR3UBPROC glad_glColor3ub; -#define glColor3ub glad_glColor3ub -typedef void (APIENTRYP PFNGLCOLOR3UBVPROC)(const GLubyte *v); -GLAPI PFNGLCOLOR3UBVPROC glad_glColor3ubv; -#define glColor3ubv glad_glColor3ubv -typedef void (APIENTRYP PFNGLCOLOR3UIPROC)(GLuint red, GLuint green, GLuint blue); -GLAPI PFNGLCOLOR3UIPROC glad_glColor3ui; -#define glColor3ui glad_glColor3ui -typedef void (APIENTRYP PFNGLCOLOR3UIVPROC)(const GLuint *v); -GLAPI PFNGLCOLOR3UIVPROC glad_glColor3uiv; -#define glColor3uiv glad_glColor3uiv -typedef void (APIENTRYP PFNGLCOLOR3USPROC)(GLushort red, GLushort green, GLushort blue); -GLAPI PFNGLCOLOR3USPROC glad_glColor3us; -#define glColor3us glad_glColor3us -typedef void (APIENTRYP PFNGLCOLOR3USVPROC)(const GLushort *v); -GLAPI PFNGLCOLOR3USVPROC glad_glColor3usv; -#define glColor3usv glad_glColor3usv -typedef void (APIENTRYP PFNGLCOLOR4BPROC)(GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha); -GLAPI PFNGLCOLOR4BPROC glad_glColor4b; -#define glColor4b glad_glColor4b -typedef void (APIENTRYP PFNGLCOLOR4BVPROC)(const GLbyte *v); -GLAPI PFNGLCOLOR4BVPROC glad_glColor4bv; -#define glColor4bv glad_glColor4bv -typedef void (APIENTRYP PFNGLCOLOR4DPROC)(GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha); -GLAPI PFNGLCOLOR4DPROC glad_glColor4d; -#define glColor4d glad_glColor4d -typedef void (APIENTRYP PFNGLCOLOR4DVPROC)(const GLdouble *v); -GLAPI PFNGLCOLOR4DVPROC glad_glColor4dv; -#define glColor4dv glad_glColor4dv -typedef void (APIENTRYP PFNGLCOLOR4FPROC)(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha); -GLAPI PFNGLCOLOR4FPROC glad_glColor4f; -#define glColor4f glad_glColor4f -typedef void (APIENTRYP PFNGLCOLOR4FVPROC)(const GLfloat *v); -GLAPI PFNGLCOLOR4FVPROC glad_glColor4fv; -#define glColor4fv glad_glColor4fv -typedef void (APIENTRYP PFNGLCOLOR4IPROC)(GLint red, GLint green, GLint blue, GLint alpha); -GLAPI PFNGLCOLOR4IPROC glad_glColor4i; -#define glColor4i glad_glColor4i -typedef void (APIENTRYP PFNGLCOLOR4IVPROC)(const GLint *v); -GLAPI PFNGLCOLOR4IVPROC glad_glColor4iv; -#define glColor4iv glad_glColor4iv -typedef void (APIENTRYP PFNGLCOLOR4SPROC)(GLshort red, GLshort green, GLshort blue, GLshort alpha); -GLAPI PFNGLCOLOR4SPROC glad_glColor4s; -#define glColor4s glad_glColor4s -typedef void (APIENTRYP PFNGLCOLOR4SVPROC)(const GLshort *v); -GLAPI PFNGLCOLOR4SVPROC glad_glColor4sv; -#define glColor4sv glad_glColor4sv -typedef void (APIENTRYP PFNGLCOLOR4UBPROC)(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha); -GLAPI PFNGLCOLOR4UBPROC glad_glColor4ub; -#define glColor4ub glad_glColor4ub -typedef void (APIENTRYP PFNGLCOLOR4UBVPROC)(const GLubyte *v); -GLAPI PFNGLCOLOR4UBVPROC glad_glColor4ubv; -#define glColor4ubv glad_glColor4ubv -typedef void (APIENTRYP PFNGLCOLOR4UIPROC)(GLuint red, GLuint green, GLuint blue, GLuint alpha); -GLAPI PFNGLCOLOR4UIPROC glad_glColor4ui; -#define glColor4ui glad_glColor4ui -typedef void (APIENTRYP PFNGLCOLOR4UIVPROC)(const GLuint *v); -GLAPI PFNGLCOLOR4UIVPROC glad_glColor4uiv; -#define glColor4uiv glad_glColor4uiv -typedef void (APIENTRYP PFNGLCOLOR4USPROC)(GLushort red, GLushort green, GLushort blue, GLushort alpha); -GLAPI PFNGLCOLOR4USPROC glad_glColor4us; -#define glColor4us glad_glColor4us -typedef void (APIENTRYP PFNGLCOLOR4USVPROC)(const GLushort *v); -GLAPI PFNGLCOLOR4USVPROC glad_glColor4usv; -#define glColor4usv glad_glColor4usv -typedef void (APIENTRYP PFNGLEDGEFLAGPROC)(GLboolean flag); -GLAPI PFNGLEDGEFLAGPROC glad_glEdgeFlag; -#define glEdgeFlag glad_glEdgeFlag -typedef void (APIENTRYP PFNGLEDGEFLAGVPROC)(const GLboolean *flag); -GLAPI PFNGLEDGEFLAGVPROC glad_glEdgeFlagv; -#define glEdgeFlagv glad_glEdgeFlagv -typedef void (APIENTRYP PFNGLENDPROC)(void); -GLAPI PFNGLENDPROC glad_glEnd; -#define glEnd glad_glEnd -typedef void (APIENTRYP PFNGLINDEXDPROC)(GLdouble c); -GLAPI PFNGLINDEXDPROC glad_glIndexd; -#define glIndexd glad_glIndexd -typedef void (APIENTRYP PFNGLINDEXDVPROC)(const GLdouble *c); -GLAPI PFNGLINDEXDVPROC glad_glIndexdv; -#define glIndexdv glad_glIndexdv -typedef void (APIENTRYP PFNGLINDEXFPROC)(GLfloat c); -GLAPI PFNGLINDEXFPROC glad_glIndexf; -#define glIndexf glad_glIndexf -typedef void (APIENTRYP PFNGLINDEXFVPROC)(const GLfloat *c); -GLAPI PFNGLINDEXFVPROC glad_glIndexfv; -#define glIndexfv glad_glIndexfv -typedef void (APIENTRYP PFNGLINDEXIPROC)(GLint c); -GLAPI PFNGLINDEXIPROC glad_glIndexi; -#define glIndexi glad_glIndexi -typedef void (APIENTRYP PFNGLINDEXIVPROC)(const GLint *c); -GLAPI PFNGLINDEXIVPROC glad_glIndexiv; -#define glIndexiv glad_glIndexiv -typedef void (APIENTRYP PFNGLINDEXSPROC)(GLshort c); -GLAPI PFNGLINDEXSPROC glad_glIndexs; -#define glIndexs glad_glIndexs -typedef void (APIENTRYP PFNGLINDEXSVPROC)(const GLshort *c); -GLAPI PFNGLINDEXSVPROC glad_glIndexsv; -#define glIndexsv glad_glIndexsv -typedef void (APIENTRYP PFNGLNORMAL3BPROC)(GLbyte nx, GLbyte ny, GLbyte nz); -GLAPI PFNGLNORMAL3BPROC glad_glNormal3b; -#define glNormal3b glad_glNormal3b -typedef void (APIENTRYP PFNGLNORMAL3BVPROC)(const GLbyte *v); -GLAPI PFNGLNORMAL3BVPROC glad_glNormal3bv; -#define glNormal3bv glad_glNormal3bv -typedef void (APIENTRYP PFNGLNORMAL3DPROC)(GLdouble nx, GLdouble ny, GLdouble nz); -GLAPI PFNGLNORMAL3DPROC glad_glNormal3d; -#define glNormal3d glad_glNormal3d -typedef void (APIENTRYP PFNGLNORMAL3DVPROC)(const GLdouble *v); -GLAPI PFNGLNORMAL3DVPROC glad_glNormal3dv; -#define glNormal3dv glad_glNormal3dv -typedef void (APIENTRYP PFNGLNORMAL3FPROC)(GLfloat nx, GLfloat ny, GLfloat nz); -GLAPI PFNGLNORMAL3FPROC glad_glNormal3f; -#define glNormal3f glad_glNormal3f -typedef void (APIENTRYP PFNGLNORMAL3FVPROC)(const GLfloat *v); -GLAPI PFNGLNORMAL3FVPROC glad_glNormal3fv; -#define glNormal3fv glad_glNormal3fv -typedef void (APIENTRYP PFNGLNORMAL3IPROC)(GLint nx, GLint ny, GLint nz); -GLAPI PFNGLNORMAL3IPROC glad_glNormal3i; -#define glNormal3i glad_glNormal3i -typedef void (APIENTRYP PFNGLNORMAL3IVPROC)(const GLint *v); -GLAPI PFNGLNORMAL3IVPROC glad_glNormal3iv; -#define glNormal3iv glad_glNormal3iv -typedef void (APIENTRYP PFNGLNORMAL3SPROC)(GLshort nx, GLshort ny, GLshort nz); -GLAPI PFNGLNORMAL3SPROC glad_glNormal3s; -#define glNormal3s glad_glNormal3s -typedef void (APIENTRYP PFNGLNORMAL3SVPROC)(const GLshort *v); -GLAPI PFNGLNORMAL3SVPROC glad_glNormal3sv; -#define glNormal3sv glad_glNormal3sv -typedef void (APIENTRYP PFNGLRASTERPOS2DPROC)(GLdouble x, GLdouble y); -GLAPI PFNGLRASTERPOS2DPROC glad_glRasterPos2d; -#define glRasterPos2d glad_glRasterPos2d -typedef void (APIENTRYP PFNGLRASTERPOS2DVPROC)(const GLdouble *v); -GLAPI PFNGLRASTERPOS2DVPROC glad_glRasterPos2dv; -#define glRasterPos2dv glad_glRasterPos2dv -typedef void (APIENTRYP PFNGLRASTERPOS2FPROC)(GLfloat x, GLfloat y); -GLAPI PFNGLRASTERPOS2FPROC glad_glRasterPos2f; -#define glRasterPos2f glad_glRasterPos2f -typedef void (APIENTRYP PFNGLRASTERPOS2FVPROC)(const GLfloat *v); -GLAPI PFNGLRASTERPOS2FVPROC glad_glRasterPos2fv; -#define glRasterPos2fv glad_glRasterPos2fv -typedef void (APIENTRYP PFNGLRASTERPOS2IPROC)(GLint x, GLint y); -GLAPI PFNGLRASTERPOS2IPROC glad_glRasterPos2i; -#define glRasterPos2i glad_glRasterPos2i -typedef void (APIENTRYP PFNGLRASTERPOS2IVPROC)(const GLint *v); -GLAPI PFNGLRASTERPOS2IVPROC glad_glRasterPos2iv; -#define glRasterPos2iv glad_glRasterPos2iv -typedef void (APIENTRYP PFNGLRASTERPOS2SPROC)(GLshort x, GLshort y); -GLAPI PFNGLRASTERPOS2SPROC glad_glRasterPos2s; -#define glRasterPos2s glad_glRasterPos2s -typedef void (APIENTRYP PFNGLRASTERPOS2SVPROC)(const GLshort *v); -GLAPI PFNGLRASTERPOS2SVPROC glad_glRasterPos2sv; -#define glRasterPos2sv glad_glRasterPos2sv -typedef void (APIENTRYP PFNGLRASTERPOS3DPROC)(GLdouble x, GLdouble y, GLdouble z); -GLAPI PFNGLRASTERPOS3DPROC glad_glRasterPos3d; -#define glRasterPos3d glad_glRasterPos3d -typedef void (APIENTRYP PFNGLRASTERPOS3DVPROC)(const GLdouble *v); -GLAPI PFNGLRASTERPOS3DVPROC glad_glRasterPos3dv; -#define glRasterPos3dv glad_glRasterPos3dv -typedef void (APIENTRYP PFNGLRASTERPOS3FPROC)(GLfloat x, GLfloat y, GLfloat z); -GLAPI PFNGLRASTERPOS3FPROC glad_glRasterPos3f; -#define glRasterPos3f glad_glRasterPos3f -typedef void (APIENTRYP PFNGLRASTERPOS3FVPROC)(const GLfloat *v); -GLAPI PFNGLRASTERPOS3FVPROC glad_glRasterPos3fv; -#define glRasterPos3fv glad_glRasterPos3fv -typedef void (APIENTRYP PFNGLRASTERPOS3IPROC)(GLint x, GLint y, GLint z); -GLAPI PFNGLRASTERPOS3IPROC glad_glRasterPos3i; -#define glRasterPos3i glad_glRasterPos3i -typedef void (APIENTRYP PFNGLRASTERPOS3IVPROC)(const GLint *v); -GLAPI PFNGLRASTERPOS3IVPROC glad_glRasterPos3iv; -#define glRasterPos3iv glad_glRasterPos3iv -typedef void (APIENTRYP PFNGLRASTERPOS3SPROC)(GLshort x, GLshort y, GLshort z); -GLAPI PFNGLRASTERPOS3SPROC glad_glRasterPos3s; -#define glRasterPos3s glad_glRasterPos3s -typedef void (APIENTRYP PFNGLRASTERPOS3SVPROC)(const GLshort *v); -GLAPI PFNGLRASTERPOS3SVPROC glad_glRasterPos3sv; -#define glRasterPos3sv glad_glRasterPos3sv -typedef void (APIENTRYP PFNGLRASTERPOS4DPROC)(GLdouble x, GLdouble y, GLdouble z, GLdouble w); -GLAPI PFNGLRASTERPOS4DPROC glad_glRasterPos4d; -#define glRasterPos4d glad_glRasterPos4d -typedef void (APIENTRYP PFNGLRASTERPOS4DVPROC)(const GLdouble *v); -GLAPI PFNGLRASTERPOS4DVPROC glad_glRasterPos4dv; -#define glRasterPos4dv glad_glRasterPos4dv -typedef void (APIENTRYP PFNGLRASTERPOS4FPROC)(GLfloat x, GLfloat y, GLfloat z, GLfloat w); -GLAPI PFNGLRASTERPOS4FPROC glad_glRasterPos4f; -#define glRasterPos4f glad_glRasterPos4f -typedef void (APIENTRYP PFNGLRASTERPOS4FVPROC)(const GLfloat *v); -GLAPI PFNGLRASTERPOS4FVPROC glad_glRasterPos4fv; -#define glRasterPos4fv glad_glRasterPos4fv -typedef void (APIENTRYP PFNGLRASTERPOS4IPROC)(GLint x, GLint y, GLint z, GLint w); -GLAPI PFNGLRASTERPOS4IPROC glad_glRasterPos4i; -#define glRasterPos4i glad_glRasterPos4i -typedef void (APIENTRYP PFNGLRASTERPOS4IVPROC)(const GLint *v); -GLAPI PFNGLRASTERPOS4IVPROC glad_glRasterPos4iv; -#define glRasterPos4iv glad_glRasterPos4iv -typedef void (APIENTRYP PFNGLRASTERPOS4SPROC)(GLshort x, GLshort y, GLshort z, GLshort w); -GLAPI PFNGLRASTERPOS4SPROC glad_glRasterPos4s; -#define glRasterPos4s glad_glRasterPos4s -typedef void (APIENTRYP PFNGLRASTERPOS4SVPROC)(const GLshort *v); -GLAPI PFNGLRASTERPOS4SVPROC glad_glRasterPos4sv; -#define glRasterPos4sv glad_glRasterPos4sv -typedef void (APIENTRYP PFNGLRECTDPROC)(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2); -GLAPI PFNGLRECTDPROC glad_glRectd; -#define glRectd glad_glRectd -typedef void (APIENTRYP PFNGLRECTDVPROC)(const GLdouble *v1, const GLdouble *v2); -GLAPI PFNGLRECTDVPROC glad_glRectdv; -#define glRectdv glad_glRectdv -typedef void (APIENTRYP PFNGLRECTFPROC)(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2); -GLAPI PFNGLRECTFPROC glad_glRectf; -#define glRectf glad_glRectf -typedef void (APIENTRYP PFNGLRECTFVPROC)(const GLfloat *v1, const GLfloat *v2); -GLAPI PFNGLRECTFVPROC glad_glRectfv; -#define glRectfv glad_glRectfv -typedef void (APIENTRYP PFNGLRECTIPROC)(GLint x1, GLint y1, GLint x2, GLint y2); -GLAPI PFNGLRECTIPROC glad_glRecti; -#define glRecti glad_glRecti -typedef void (APIENTRYP PFNGLRECTIVPROC)(const GLint *v1, const GLint *v2); -GLAPI PFNGLRECTIVPROC glad_glRectiv; -#define glRectiv glad_glRectiv -typedef void (APIENTRYP PFNGLRECTSPROC)(GLshort x1, GLshort y1, GLshort x2, GLshort y2); -GLAPI PFNGLRECTSPROC glad_glRects; -#define glRects glad_glRects -typedef void (APIENTRYP PFNGLRECTSVPROC)(const GLshort *v1, const GLshort *v2); -GLAPI PFNGLRECTSVPROC glad_glRectsv; -#define glRectsv glad_glRectsv -typedef void (APIENTRYP PFNGLTEXCOORD1DPROC)(GLdouble s); -GLAPI PFNGLTEXCOORD1DPROC glad_glTexCoord1d; -#define glTexCoord1d glad_glTexCoord1d -typedef void (APIENTRYP PFNGLTEXCOORD1DVPROC)(const GLdouble *v); -GLAPI PFNGLTEXCOORD1DVPROC glad_glTexCoord1dv; -#define glTexCoord1dv glad_glTexCoord1dv -typedef void (APIENTRYP PFNGLTEXCOORD1FPROC)(GLfloat s); -GLAPI PFNGLTEXCOORD1FPROC glad_glTexCoord1f; -#define glTexCoord1f glad_glTexCoord1f -typedef void (APIENTRYP PFNGLTEXCOORD1FVPROC)(const GLfloat *v); -GLAPI PFNGLTEXCOORD1FVPROC glad_glTexCoord1fv; -#define glTexCoord1fv glad_glTexCoord1fv -typedef void (APIENTRYP PFNGLTEXCOORD1IPROC)(GLint s); -GLAPI PFNGLTEXCOORD1IPROC glad_glTexCoord1i; -#define glTexCoord1i glad_glTexCoord1i -typedef void (APIENTRYP PFNGLTEXCOORD1IVPROC)(const GLint *v); -GLAPI PFNGLTEXCOORD1IVPROC glad_glTexCoord1iv; -#define glTexCoord1iv glad_glTexCoord1iv -typedef void (APIENTRYP PFNGLTEXCOORD1SPROC)(GLshort s); -GLAPI PFNGLTEXCOORD1SPROC glad_glTexCoord1s; -#define glTexCoord1s glad_glTexCoord1s -typedef void (APIENTRYP PFNGLTEXCOORD1SVPROC)(const GLshort *v); -GLAPI PFNGLTEXCOORD1SVPROC glad_glTexCoord1sv; -#define glTexCoord1sv glad_glTexCoord1sv -typedef void (APIENTRYP PFNGLTEXCOORD2DPROC)(GLdouble s, GLdouble t); -GLAPI PFNGLTEXCOORD2DPROC glad_glTexCoord2d; -#define glTexCoord2d glad_glTexCoord2d -typedef void (APIENTRYP PFNGLTEXCOORD2DVPROC)(const GLdouble *v); -GLAPI PFNGLTEXCOORD2DVPROC glad_glTexCoord2dv; -#define glTexCoord2dv glad_glTexCoord2dv -typedef void (APIENTRYP PFNGLTEXCOORD2FPROC)(GLfloat s, GLfloat t); -GLAPI PFNGLTEXCOORD2FPROC glad_glTexCoord2f; -#define glTexCoord2f glad_glTexCoord2f -typedef void (APIENTRYP PFNGLTEXCOORD2FVPROC)(const GLfloat *v); -GLAPI PFNGLTEXCOORD2FVPROC glad_glTexCoord2fv; -#define glTexCoord2fv glad_glTexCoord2fv -typedef void (APIENTRYP PFNGLTEXCOORD2IPROC)(GLint s, GLint t); -GLAPI PFNGLTEXCOORD2IPROC glad_glTexCoord2i; -#define glTexCoord2i glad_glTexCoord2i -typedef void (APIENTRYP PFNGLTEXCOORD2IVPROC)(const GLint *v); -GLAPI PFNGLTEXCOORD2IVPROC glad_glTexCoord2iv; -#define glTexCoord2iv glad_glTexCoord2iv -typedef void (APIENTRYP PFNGLTEXCOORD2SPROC)(GLshort s, GLshort t); -GLAPI PFNGLTEXCOORD2SPROC glad_glTexCoord2s; -#define glTexCoord2s glad_glTexCoord2s -typedef void (APIENTRYP PFNGLTEXCOORD2SVPROC)(const GLshort *v); -GLAPI PFNGLTEXCOORD2SVPROC glad_glTexCoord2sv; -#define glTexCoord2sv glad_glTexCoord2sv -typedef void (APIENTRYP PFNGLTEXCOORD3DPROC)(GLdouble s, GLdouble t, GLdouble r); -GLAPI PFNGLTEXCOORD3DPROC glad_glTexCoord3d; -#define glTexCoord3d glad_glTexCoord3d -typedef void (APIENTRYP PFNGLTEXCOORD3DVPROC)(const GLdouble *v); -GLAPI PFNGLTEXCOORD3DVPROC glad_glTexCoord3dv; -#define glTexCoord3dv glad_glTexCoord3dv -typedef void (APIENTRYP PFNGLTEXCOORD3FPROC)(GLfloat s, GLfloat t, GLfloat r); -GLAPI PFNGLTEXCOORD3FPROC glad_glTexCoord3f; -#define glTexCoord3f glad_glTexCoord3f -typedef void (APIENTRYP PFNGLTEXCOORD3FVPROC)(const GLfloat *v); -GLAPI PFNGLTEXCOORD3FVPROC glad_glTexCoord3fv; -#define glTexCoord3fv glad_glTexCoord3fv -typedef void (APIENTRYP PFNGLTEXCOORD3IPROC)(GLint s, GLint t, GLint r); -GLAPI PFNGLTEXCOORD3IPROC glad_glTexCoord3i; -#define glTexCoord3i glad_glTexCoord3i -typedef void (APIENTRYP PFNGLTEXCOORD3IVPROC)(const GLint *v); -GLAPI PFNGLTEXCOORD3IVPROC glad_glTexCoord3iv; -#define glTexCoord3iv glad_glTexCoord3iv -typedef void (APIENTRYP PFNGLTEXCOORD3SPROC)(GLshort s, GLshort t, GLshort r); -GLAPI PFNGLTEXCOORD3SPROC glad_glTexCoord3s; -#define glTexCoord3s glad_glTexCoord3s -typedef void (APIENTRYP PFNGLTEXCOORD3SVPROC)(const GLshort *v); -GLAPI PFNGLTEXCOORD3SVPROC glad_glTexCoord3sv; -#define glTexCoord3sv glad_glTexCoord3sv -typedef void (APIENTRYP PFNGLTEXCOORD4DPROC)(GLdouble s, GLdouble t, GLdouble r, GLdouble q); -GLAPI PFNGLTEXCOORD4DPROC glad_glTexCoord4d; -#define glTexCoord4d glad_glTexCoord4d -typedef void (APIENTRYP PFNGLTEXCOORD4DVPROC)(const GLdouble *v); -GLAPI PFNGLTEXCOORD4DVPROC glad_glTexCoord4dv; -#define glTexCoord4dv glad_glTexCoord4dv -typedef void (APIENTRYP PFNGLTEXCOORD4FPROC)(GLfloat s, GLfloat t, GLfloat r, GLfloat q); -GLAPI PFNGLTEXCOORD4FPROC glad_glTexCoord4f; -#define glTexCoord4f glad_glTexCoord4f -typedef void (APIENTRYP PFNGLTEXCOORD4FVPROC)(const GLfloat *v); -GLAPI PFNGLTEXCOORD4FVPROC glad_glTexCoord4fv; -#define glTexCoord4fv glad_glTexCoord4fv -typedef void (APIENTRYP PFNGLTEXCOORD4IPROC)(GLint s, GLint t, GLint r, GLint q); -GLAPI PFNGLTEXCOORD4IPROC glad_glTexCoord4i; -#define glTexCoord4i glad_glTexCoord4i -typedef void (APIENTRYP PFNGLTEXCOORD4IVPROC)(const GLint *v); -GLAPI PFNGLTEXCOORD4IVPROC glad_glTexCoord4iv; -#define glTexCoord4iv glad_glTexCoord4iv -typedef void (APIENTRYP PFNGLTEXCOORD4SPROC)(GLshort s, GLshort t, GLshort r, GLshort q); -GLAPI PFNGLTEXCOORD4SPROC glad_glTexCoord4s; -#define glTexCoord4s glad_glTexCoord4s -typedef void (APIENTRYP PFNGLTEXCOORD4SVPROC)(const GLshort *v); -GLAPI PFNGLTEXCOORD4SVPROC glad_glTexCoord4sv; -#define glTexCoord4sv glad_glTexCoord4sv -typedef void (APIENTRYP PFNGLVERTEX2DPROC)(GLdouble x, GLdouble y); -GLAPI PFNGLVERTEX2DPROC glad_glVertex2d; -#define glVertex2d glad_glVertex2d -typedef void (APIENTRYP PFNGLVERTEX2DVPROC)(const GLdouble *v); -GLAPI PFNGLVERTEX2DVPROC glad_glVertex2dv; -#define glVertex2dv glad_glVertex2dv -typedef void (APIENTRYP PFNGLVERTEX2FPROC)(GLfloat x, GLfloat y); -GLAPI PFNGLVERTEX2FPROC glad_glVertex2f; -#define glVertex2f glad_glVertex2f -typedef void (APIENTRYP PFNGLVERTEX2FVPROC)(const GLfloat *v); -GLAPI PFNGLVERTEX2FVPROC glad_glVertex2fv; -#define glVertex2fv glad_glVertex2fv -typedef void (APIENTRYP PFNGLVERTEX2IPROC)(GLint x, GLint y); -GLAPI PFNGLVERTEX2IPROC glad_glVertex2i; -#define glVertex2i glad_glVertex2i -typedef void (APIENTRYP PFNGLVERTEX2IVPROC)(const GLint *v); -GLAPI PFNGLVERTEX2IVPROC glad_glVertex2iv; -#define glVertex2iv glad_glVertex2iv -typedef void (APIENTRYP PFNGLVERTEX2SPROC)(GLshort x, GLshort y); -GLAPI PFNGLVERTEX2SPROC glad_glVertex2s; -#define glVertex2s glad_glVertex2s -typedef void (APIENTRYP PFNGLVERTEX2SVPROC)(const GLshort *v); -GLAPI PFNGLVERTEX2SVPROC glad_glVertex2sv; -#define glVertex2sv glad_glVertex2sv -typedef void (APIENTRYP PFNGLVERTEX3DPROC)(GLdouble x, GLdouble y, GLdouble z); -GLAPI PFNGLVERTEX3DPROC glad_glVertex3d; -#define glVertex3d glad_glVertex3d -typedef void (APIENTRYP PFNGLVERTEX3DVPROC)(const GLdouble *v); -GLAPI PFNGLVERTEX3DVPROC glad_glVertex3dv; -#define glVertex3dv glad_glVertex3dv -typedef void (APIENTRYP PFNGLVERTEX3FPROC)(GLfloat x, GLfloat y, GLfloat z); -GLAPI PFNGLVERTEX3FPROC glad_glVertex3f; -#define glVertex3f glad_glVertex3f -typedef void (APIENTRYP PFNGLVERTEX3FVPROC)(const GLfloat *v); -GLAPI PFNGLVERTEX3FVPROC glad_glVertex3fv; -#define glVertex3fv glad_glVertex3fv -typedef void (APIENTRYP PFNGLVERTEX3IPROC)(GLint x, GLint y, GLint z); -GLAPI PFNGLVERTEX3IPROC glad_glVertex3i; -#define glVertex3i glad_glVertex3i -typedef void (APIENTRYP PFNGLVERTEX3IVPROC)(const GLint *v); -GLAPI PFNGLVERTEX3IVPROC glad_glVertex3iv; -#define glVertex3iv glad_glVertex3iv -typedef void (APIENTRYP PFNGLVERTEX3SPROC)(GLshort x, GLshort y, GLshort z); -GLAPI PFNGLVERTEX3SPROC glad_glVertex3s; -#define glVertex3s glad_glVertex3s -typedef void (APIENTRYP PFNGLVERTEX3SVPROC)(const GLshort *v); -GLAPI PFNGLVERTEX3SVPROC glad_glVertex3sv; -#define glVertex3sv glad_glVertex3sv -typedef void (APIENTRYP PFNGLVERTEX4DPROC)(GLdouble x, GLdouble y, GLdouble z, GLdouble w); -GLAPI PFNGLVERTEX4DPROC glad_glVertex4d; -#define glVertex4d glad_glVertex4d -typedef void (APIENTRYP PFNGLVERTEX4DVPROC)(const GLdouble *v); -GLAPI PFNGLVERTEX4DVPROC glad_glVertex4dv; -#define glVertex4dv glad_glVertex4dv -typedef void (APIENTRYP PFNGLVERTEX4FPROC)(GLfloat x, GLfloat y, GLfloat z, GLfloat w); -GLAPI PFNGLVERTEX4FPROC glad_glVertex4f; -#define glVertex4f glad_glVertex4f -typedef void (APIENTRYP PFNGLVERTEX4FVPROC)(const GLfloat *v); -GLAPI PFNGLVERTEX4FVPROC glad_glVertex4fv; -#define glVertex4fv glad_glVertex4fv -typedef void (APIENTRYP PFNGLVERTEX4IPROC)(GLint x, GLint y, GLint z, GLint w); -GLAPI PFNGLVERTEX4IPROC glad_glVertex4i; -#define glVertex4i glad_glVertex4i -typedef void (APIENTRYP PFNGLVERTEX4IVPROC)(const GLint *v); -GLAPI PFNGLVERTEX4IVPROC glad_glVertex4iv; -#define glVertex4iv glad_glVertex4iv -typedef void (APIENTRYP PFNGLVERTEX4SPROC)(GLshort x, GLshort y, GLshort z, GLshort w); -GLAPI PFNGLVERTEX4SPROC glad_glVertex4s; -#define glVertex4s glad_glVertex4s -typedef void (APIENTRYP PFNGLVERTEX4SVPROC)(const GLshort *v); -GLAPI PFNGLVERTEX4SVPROC glad_glVertex4sv; -#define glVertex4sv glad_glVertex4sv -typedef void (APIENTRYP PFNGLCLIPPLANEPROC)(GLenum plane, const GLdouble *equation); -GLAPI PFNGLCLIPPLANEPROC glad_glClipPlane; -#define glClipPlane glad_glClipPlane -typedef void (APIENTRYP PFNGLCOLORMATERIALPROC)(GLenum face, GLenum mode); -GLAPI PFNGLCOLORMATERIALPROC glad_glColorMaterial; -#define glColorMaterial glad_glColorMaterial -typedef void (APIENTRYP PFNGLFOGFPROC)(GLenum pname, GLfloat param); -GLAPI PFNGLFOGFPROC glad_glFogf; -#define glFogf glad_glFogf -typedef void (APIENTRYP PFNGLFOGFVPROC)(GLenum pname, const GLfloat *params); -GLAPI PFNGLFOGFVPROC glad_glFogfv; -#define glFogfv glad_glFogfv -typedef void (APIENTRYP PFNGLFOGIPROC)(GLenum pname, GLint param); -GLAPI PFNGLFOGIPROC glad_glFogi; -#define glFogi glad_glFogi -typedef void (APIENTRYP PFNGLFOGIVPROC)(GLenum pname, const GLint *params); -GLAPI PFNGLFOGIVPROC glad_glFogiv; -#define glFogiv glad_glFogiv -typedef void (APIENTRYP PFNGLLIGHTFPROC)(GLenum light, GLenum pname, GLfloat param); -GLAPI PFNGLLIGHTFPROC glad_glLightf; -#define glLightf glad_glLightf -typedef void (APIENTRYP PFNGLLIGHTFVPROC)(GLenum light, GLenum pname, const GLfloat *params); -GLAPI PFNGLLIGHTFVPROC glad_glLightfv; -#define glLightfv glad_glLightfv -typedef void (APIENTRYP PFNGLLIGHTIPROC)(GLenum light, GLenum pname, GLint param); -GLAPI PFNGLLIGHTIPROC glad_glLighti; -#define glLighti glad_glLighti -typedef void (APIENTRYP PFNGLLIGHTIVPROC)(GLenum light, GLenum pname, const GLint *params); -GLAPI PFNGLLIGHTIVPROC glad_glLightiv; -#define glLightiv glad_glLightiv -typedef void (APIENTRYP PFNGLLIGHTMODELFPROC)(GLenum pname, GLfloat param); -GLAPI PFNGLLIGHTMODELFPROC glad_glLightModelf; -#define glLightModelf glad_glLightModelf -typedef void (APIENTRYP PFNGLLIGHTMODELFVPROC)(GLenum pname, const GLfloat *params); -GLAPI PFNGLLIGHTMODELFVPROC glad_glLightModelfv; -#define glLightModelfv glad_glLightModelfv -typedef void (APIENTRYP PFNGLLIGHTMODELIPROC)(GLenum pname, GLint param); -GLAPI PFNGLLIGHTMODELIPROC glad_glLightModeli; -#define glLightModeli glad_glLightModeli -typedef void (APIENTRYP PFNGLLIGHTMODELIVPROC)(GLenum pname, const GLint *params); -GLAPI PFNGLLIGHTMODELIVPROC glad_glLightModeliv; -#define glLightModeliv glad_glLightModeliv -typedef void (APIENTRYP PFNGLLINESTIPPLEPROC)(GLint factor, GLushort pattern); -GLAPI PFNGLLINESTIPPLEPROC glad_glLineStipple; -#define glLineStipple glad_glLineStipple -typedef void (APIENTRYP PFNGLMATERIALFPROC)(GLenum face, GLenum pname, GLfloat param); -GLAPI PFNGLMATERIALFPROC glad_glMaterialf; -#define glMaterialf glad_glMaterialf -typedef void (APIENTRYP PFNGLMATERIALFVPROC)(GLenum face, GLenum pname, const GLfloat *params); -GLAPI PFNGLMATERIALFVPROC glad_glMaterialfv; -#define glMaterialfv glad_glMaterialfv -typedef void (APIENTRYP PFNGLMATERIALIPROC)(GLenum face, GLenum pname, GLint param); -GLAPI PFNGLMATERIALIPROC glad_glMateriali; -#define glMateriali glad_glMateriali -typedef void (APIENTRYP PFNGLMATERIALIVPROC)(GLenum face, GLenum pname, const GLint *params); -GLAPI PFNGLMATERIALIVPROC glad_glMaterialiv; -#define glMaterialiv glad_glMaterialiv -typedef void (APIENTRYP PFNGLPOLYGONSTIPPLEPROC)(const GLubyte *mask); -GLAPI PFNGLPOLYGONSTIPPLEPROC glad_glPolygonStipple; -#define glPolygonStipple glad_glPolygonStipple -typedef void (APIENTRYP PFNGLSHADEMODELPROC)(GLenum mode); -GLAPI PFNGLSHADEMODELPROC glad_glShadeModel; -#define glShadeModel glad_glShadeModel -typedef void (APIENTRYP PFNGLTEXENVFPROC)(GLenum target, GLenum pname, GLfloat param); -GLAPI PFNGLTEXENVFPROC glad_glTexEnvf; -#define glTexEnvf glad_glTexEnvf -typedef void (APIENTRYP PFNGLTEXENVFVPROC)(GLenum target, GLenum pname, const GLfloat *params); -GLAPI PFNGLTEXENVFVPROC glad_glTexEnvfv; -#define glTexEnvfv glad_glTexEnvfv -typedef void (APIENTRYP PFNGLTEXENVIPROC)(GLenum target, GLenum pname, GLint param); -GLAPI PFNGLTEXENVIPROC glad_glTexEnvi; -#define glTexEnvi glad_glTexEnvi -typedef void (APIENTRYP PFNGLTEXENVIVPROC)(GLenum target, GLenum pname, const GLint *params); -GLAPI PFNGLTEXENVIVPROC glad_glTexEnviv; -#define glTexEnviv glad_glTexEnviv -typedef void (APIENTRYP PFNGLTEXGENDPROC)(GLenum coord, GLenum pname, GLdouble param); -GLAPI PFNGLTEXGENDPROC glad_glTexGend; -#define glTexGend glad_glTexGend -typedef void (APIENTRYP PFNGLTEXGENDVPROC)(GLenum coord, GLenum pname, const GLdouble *params); -GLAPI PFNGLTEXGENDVPROC glad_glTexGendv; -#define glTexGendv glad_glTexGendv -typedef void (APIENTRYP PFNGLTEXGENFPROC)(GLenum coord, GLenum pname, GLfloat param); -GLAPI PFNGLTEXGENFPROC glad_glTexGenf; -#define glTexGenf glad_glTexGenf -typedef void (APIENTRYP PFNGLTEXGENFVPROC)(GLenum coord, GLenum pname, const GLfloat *params); -GLAPI PFNGLTEXGENFVPROC glad_glTexGenfv; -#define glTexGenfv glad_glTexGenfv -typedef void (APIENTRYP PFNGLTEXGENIPROC)(GLenum coord, GLenum pname, GLint param); -GLAPI PFNGLTEXGENIPROC glad_glTexGeni; -#define glTexGeni glad_glTexGeni -typedef void (APIENTRYP PFNGLTEXGENIVPROC)(GLenum coord, GLenum pname, const GLint *params); -GLAPI PFNGLTEXGENIVPROC glad_glTexGeniv; -#define glTexGeniv glad_glTexGeniv -typedef void (APIENTRYP PFNGLFEEDBACKBUFFERPROC)(GLsizei size, GLenum type, GLfloat *buffer); -GLAPI PFNGLFEEDBACKBUFFERPROC glad_glFeedbackBuffer; -#define glFeedbackBuffer glad_glFeedbackBuffer -typedef void (APIENTRYP PFNGLSELECTBUFFERPROC)(GLsizei size, GLuint *buffer); -GLAPI PFNGLSELECTBUFFERPROC glad_glSelectBuffer; -#define glSelectBuffer glad_glSelectBuffer -typedef GLint (APIENTRYP PFNGLRENDERMODEPROC)(GLenum mode); -GLAPI PFNGLRENDERMODEPROC glad_glRenderMode; -#define glRenderMode glad_glRenderMode -typedef void (APIENTRYP PFNGLINITNAMESPROC)(void); -GLAPI PFNGLINITNAMESPROC glad_glInitNames; -#define glInitNames glad_glInitNames -typedef void (APIENTRYP PFNGLLOADNAMEPROC)(GLuint name); -GLAPI PFNGLLOADNAMEPROC glad_glLoadName; -#define glLoadName glad_glLoadName -typedef void (APIENTRYP PFNGLPASSTHROUGHPROC)(GLfloat token); -GLAPI PFNGLPASSTHROUGHPROC glad_glPassThrough; -#define glPassThrough glad_glPassThrough -typedef void (APIENTRYP PFNGLPOPNAMEPROC)(void); -GLAPI PFNGLPOPNAMEPROC glad_glPopName; -#define glPopName glad_glPopName -typedef void (APIENTRYP PFNGLPUSHNAMEPROC)(GLuint name); -GLAPI PFNGLPUSHNAMEPROC glad_glPushName; -#define glPushName glad_glPushName -typedef void (APIENTRYP PFNGLCLEARACCUMPROC)(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha); -GLAPI PFNGLCLEARACCUMPROC glad_glClearAccum; -#define glClearAccum glad_glClearAccum -typedef void (APIENTRYP PFNGLCLEARINDEXPROC)(GLfloat c); -GLAPI PFNGLCLEARINDEXPROC glad_glClearIndex; -#define glClearIndex glad_glClearIndex -typedef void (APIENTRYP PFNGLINDEXMASKPROC)(GLuint mask); -GLAPI PFNGLINDEXMASKPROC glad_glIndexMask; -#define glIndexMask glad_glIndexMask -typedef void (APIENTRYP PFNGLACCUMPROC)(GLenum op, GLfloat value); -GLAPI PFNGLACCUMPROC glad_glAccum; -#define glAccum glad_glAccum -typedef void (APIENTRYP PFNGLPOPATTRIBPROC)(void); -GLAPI PFNGLPOPATTRIBPROC glad_glPopAttrib; -#define glPopAttrib glad_glPopAttrib -typedef void (APIENTRYP PFNGLPUSHATTRIBPROC)(GLbitfield mask); -GLAPI PFNGLPUSHATTRIBPROC glad_glPushAttrib; -#define glPushAttrib glad_glPushAttrib -typedef void (APIENTRYP PFNGLMAP1DPROC)(GLenum target, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble *points); -GLAPI PFNGLMAP1DPROC glad_glMap1d; -#define glMap1d glad_glMap1d -typedef void (APIENTRYP PFNGLMAP1FPROC)(GLenum target, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat *points); -GLAPI PFNGLMAP1FPROC glad_glMap1f; -#define glMap1f glad_glMap1f -typedef void (APIENTRYP PFNGLMAP2DPROC)(GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble *points); -GLAPI PFNGLMAP2DPROC glad_glMap2d; -#define glMap2d glad_glMap2d -typedef void (APIENTRYP PFNGLMAP2FPROC)(GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat *points); -GLAPI PFNGLMAP2FPROC glad_glMap2f; -#define glMap2f glad_glMap2f -typedef void (APIENTRYP PFNGLMAPGRID1DPROC)(GLint un, GLdouble u1, GLdouble u2); -GLAPI PFNGLMAPGRID1DPROC glad_glMapGrid1d; -#define glMapGrid1d glad_glMapGrid1d -typedef void (APIENTRYP PFNGLMAPGRID1FPROC)(GLint un, GLfloat u1, GLfloat u2); -GLAPI PFNGLMAPGRID1FPROC glad_glMapGrid1f; -#define glMapGrid1f glad_glMapGrid1f -typedef void (APIENTRYP PFNGLMAPGRID2DPROC)(GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1, GLdouble v2); -GLAPI PFNGLMAPGRID2DPROC glad_glMapGrid2d; -#define glMapGrid2d glad_glMapGrid2d -typedef void (APIENTRYP PFNGLMAPGRID2FPROC)(GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1, GLfloat v2); -GLAPI PFNGLMAPGRID2FPROC glad_glMapGrid2f; -#define glMapGrid2f glad_glMapGrid2f -typedef void (APIENTRYP PFNGLEVALCOORD1DPROC)(GLdouble u); -GLAPI PFNGLEVALCOORD1DPROC glad_glEvalCoord1d; -#define glEvalCoord1d glad_glEvalCoord1d -typedef void (APIENTRYP PFNGLEVALCOORD1DVPROC)(const GLdouble *u); -GLAPI PFNGLEVALCOORD1DVPROC glad_glEvalCoord1dv; -#define glEvalCoord1dv glad_glEvalCoord1dv -typedef void (APIENTRYP PFNGLEVALCOORD1FPROC)(GLfloat u); -GLAPI PFNGLEVALCOORD1FPROC glad_glEvalCoord1f; -#define glEvalCoord1f glad_glEvalCoord1f -typedef void (APIENTRYP PFNGLEVALCOORD1FVPROC)(const GLfloat *u); -GLAPI PFNGLEVALCOORD1FVPROC glad_glEvalCoord1fv; -#define glEvalCoord1fv glad_glEvalCoord1fv -typedef void (APIENTRYP PFNGLEVALCOORD2DPROC)(GLdouble u, GLdouble v); -GLAPI PFNGLEVALCOORD2DPROC glad_glEvalCoord2d; -#define glEvalCoord2d glad_glEvalCoord2d -typedef void (APIENTRYP PFNGLEVALCOORD2DVPROC)(const GLdouble *u); -GLAPI PFNGLEVALCOORD2DVPROC glad_glEvalCoord2dv; -#define glEvalCoord2dv glad_glEvalCoord2dv -typedef void (APIENTRYP PFNGLEVALCOORD2FPROC)(GLfloat u, GLfloat v); -GLAPI PFNGLEVALCOORD2FPROC glad_glEvalCoord2f; -#define glEvalCoord2f glad_glEvalCoord2f -typedef void (APIENTRYP PFNGLEVALCOORD2FVPROC)(const GLfloat *u); -GLAPI PFNGLEVALCOORD2FVPROC glad_glEvalCoord2fv; -#define glEvalCoord2fv glad_glEvalCoord2fv -typedef void (APIENTRYP PFNGLEVALMESH1PROC)(GLenum mode, GLint i1, GLint i2); -GLAPI PFNGLEVALMESH1PROC glad_glEvalMesh1; -#define glEvalMesh1 glad_glEvalMesh1 -typedef void (APIENTRYP PFNGLEVALPOINT1PROC)(GLint i); -GLAPI PFNGLEVALPOINT1PROC glad_glEvalPoint1; -#define glEvalPoint1 glad_glEvalPoint1 -typedef void (APIENTRYP PFNGLEVALMESH2PROC)(GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2); -GLAPI PFNGLEVALMESH2PROC glad_glEvalMesh2; -#define glEvalMesh2 glad_glEvalMesh2 -typedef void (APIENTRYP PFNGLEVALPOINT2PROC)(GLint i, GLint j); -GLAPI PFNGLEVALPOINT2PROC glad_glEvalPoint2; -#define glEvalPoint2 glad_glEvalPoint2 -typedef void (APIENTRYP PFNGLALPHAFUNCPROC)(GLenum func, GLfloat ref); -GLAPI PFNGLALPHAFUNCPROC glad_glAlphaFunc; -#define glAlphaFunc glad_glAlphaFunc -typedef void (APIENTRYP PFNGLPIXELZOOMPROC)(GLfloat xfactor, GLfloat yfactor); -GLAPI PFNGLPIXELZOOMPROC glad_glPixelZoom; -#define glPixelZoom glad_glPixelZoom -typedef void (APIENTRYP PFNGLPIXELTRANSFERFPROC)(GLenum pname, GLfloat param); -GLAPI PFNGLPIXELTRANSFERFPROC glad_glPixelTransferf; -#define glPixelTransferf glad_glPixelTransferf -typedef void (APIENTRYP PFNGLPIXELTRANSFERIPROC)(GLenum pname, GLint param); -GLAPI PFNGLPIXELTRANSFERIPROC glad_glPixelTransferi; -#define glPixelTransferi glad_glPixelTransferi -typedef void (APIENTRYP PFNGLPIXELMAPFVPROC)(GLenum map, GLsizei mapsize, const GLfloat *values); -GLAPI PFNGLPIXELMAPFVPROC glad_glPixelMapfv; -#define glPixelMapfv glad_glPixelMapfv -typedef void (APIENTRYP PFNGLPIXELMAPUIVPROC)(GLenum map, GLsizei mapsize, const GLuint *values); -GLAPI PFNGLPIXELMAPUIVPROC glad_glPixelMapuiv; -#define glPixelMapuiv glad_glPixelMapuiv -typedef void (APIENTRYP PFNGLPIXELMAPUSVPROC)(GLenum map, GLsizei mapsize, const GLushort *values); -GLAPI PFNGLPIXELMAPUSVPROC glad_glPixelMapusv; -#define glPixelMapusv glad_glPixelMapusv -typedef void (APIENTRYP PFNGLCOPYPIXELSPROC)(GLint x, GLint y, GLsizei width, GLsizei height, GLenum type); -GLAPI PFNGLCOPYPIXELSPROC glad_glCopyPixels; -#define glCopyPixels glad_glCopyPixels -typedef void (APIENTRYP PFNGLDRAWPIXELSPROC)(GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels); -GLAPI PFNGLDRAWPIXELSPROC glad_glDrawPixels; -#define glDrawPixels glad_glDrawPixels -typedef void (APIENTRYP PFNGLGETCLIPPLANEPROC)(GLenum plane, GLdouble *equation); -GLAPI PFNGLGETCLIPPLANEPROC glad_glGetClipPlane; -#define glGetClipPlane glad_glGetClipPlane -typedef void (APIENTRYP PFNGLGETLIGHTFVPROC)(GLenum light, GLenum pname, GLfloat *params); -GLAPI PFNGLGETLIGHTFVPROC glad_glGetLightfv; -#define glGetLightfv glad_glGetLightfv -typedef void (APIENTRYP PFNGLGETLIGHTIVPROC)(GLenum light, GLenum pname, GLint *params); -GLAPI PFNGLGETLIGHTIVPROC glad_glGetLightiv; -#define glGetLightiv glad_glGetLightiv -typedef void (APIENTRYP PFNGLGETMAPDVPROC)(GLenum target, GLenum query, GLdouble *v); -GLAPI PFNGLGETMAPDVPROC glad_glGetMapdv; -#define glGetMapdv glad_glGetMapdv -typedef void (APIENTRYP PFNGLGETMAPFVPROC)(GLenum target, GLenum query, GLfloat *v); -GLAPI PFNGLGETMAPFVPROC glad_glGetMapfv; -#define glGetMapfv glad_glGetMapfv -typedef void (APIENTRYP PFNGLGETMAPIVPROC)(GLenum target, GLenum query, GLint *v); -GLAPI PFNGLGETMAPIVPROC glad_glGetMapiv; -#define glGetMapiv glad_glGetMapiv -typedef void (APIENTRYP PFNGLGETMATERIALFVPROC)(GLenum face, GLenum pname, GLfloat *params); -GLAPI PFNGLGETMATERIALFVPROC glad_glGetMaterialfv; -#define glGetMaterialfv glad_glGetMaterialfv -typedef void (APIENTRYP PFNGLGETMATERIALIVPROC)(GLenum face, GLenum pname, GLint *params); -GLAPI PFNGLGETMATERIALIVPROC glad_glGetMaterialiv; -#define glGetMaterialiv glad_glGetMaterialiv -typedef void (APIENTRYP PFNGLGETPIXELMAPFVPROC)(GLenum map, GLfloat *values); -GLAPI PFNGLGETPIXELMAPFVPROC glad_glGetPixelMapfv; -#define glGetPixelMapfv glad_glGetPixelMapfv -typedef void (APIENTRYP PFNGLGETPIXELMAPUIVPROC)(GLenum map, GLuint *values); -GLAPI PFNGLGETPIXELMAPUIVPROC glad_glGetPixelMapuiv; -#define glGetPixelMapuiv glad_glGetPixelMapuiv -typedef void (APIENTRYP PFNGLGETPIXELMAPUSVPROC)(GLenum map, GLushort *values); -GLAPI PFNGLGETPIXELMAPUSVPROC glad_glGetPixelMapusv; -#define glGetPixelMapusv glad_glGetPixelMapusv -typedef void (APIENTRYP PFNGLGETPOLYGONSTIPPLEPROC)(GLubyte *mask); -GLAPI PFNGLGETPOLYGONSTIPPLEPROC glad_glGetPolygonStipple; -#define glGetPolygonStipple glad_glGetPolygonStipple -typedef void (APIENTRYP PFNGLGETTEXENVFVPROC)(GLenum target, GLenum pname, GLfloat *params); -GLAPI PFNGLGETTEXENVFVPROC glad_glGetTexEnvfv; -#define glGetTexEnvfv glad_glGetTexEnvfv -typedef void (APIENTRYP PFNGLGETTEXENVIVPROC)(GLenum target, GLenum pname, GLint *params); -GLAPI PFNGLGETTEXENVIVPROC glad_glGetTexEnviv; -#define glGetTexEnviv glad_glGetTexEnviv -typedef void (APIENTRYP PFNGLGETTEXGENDVPROC)(GLenum coord, GLenum pname, GLdouble *params); -GLAPI PFNGLGETTEXGENDVPROC glad_glGetTexGendv; -#define glGetTexGendv glad_glGetTexGendv -typedef void (APIENTRYP PFNGLGETTEXGENFVPROC)(GLenum coord, GLenum pname, GLfloat *params); -GLAPI PFNGLGETTEXGENFVPROC glad_glGetTexGenfv; -#define glGetTexGenfv glad_glGetTexGenfv -typedef void (APIENTRYP PFNGLGETTEXGENIVPROC)(GLenum coord, GLenum pname, GLint *params); -GLAPI PFNGLGETTEXGENIVPROC glad_glGetTexGeniv; -#define glGetTexGeniv glad_glGetTexGeniv -typedef GLboolean (APIENTRYP PFNGLISLISTPROC)(GLuint list); -GLAPI PFNGLISLISTPROC glad_glIsList; -#define glIsList glad_glIsList -typedef void (APIENTRYP PFNGLFRUSTUMPROC)(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar); -GLAPI PFNGLFRUSTUMPROC glad_glFrustum; -#define glFrustum glad_glFrustum -typedef void (APIENTRYP PFNGLLOADIDENTITYPROC)(void); -GLAPI PFNGLLOADIDENTITYPROC glad_glLoadIdentity; -#define glLoadIdentity glad_glLoadIdentity -typedef void (APIENTRYP PFNGLLOADMATRIXFPROC)(const GLfloat *m); -GLAPI PFNGLLOADMATRIXFPROC glad_glLoadMatrixf; -#define glLoadMatrixf glad_glLoadMatrixf -typedef void (APIENTRYP PFNGLLOADMATRIXDPROC)(const GLdouble *m); -GLAPI PFNGLLOADMATRIXDPROC glad_glLoadMatrixd; -#define glLoadMatrixd glad_glLoadMatrixd -typedef void (APIENTRYP PFNGLMATRIXMODEPROC)(GLenum mode); -GLAPI PFNGLMATRIXMODEPROC glad_glMatrixMode; -#define glMatrixMode glad_glMatrixMode -typedef void (APIENTRYP PFNGLMULTMATRIXFPROC)(const GLfloat *m); -GLAPI PFNGLMULTMATRIXFPROC glad_glMultMatrixf; -#define glMultMatrixf glad_glMultMatrixf -typedef void (APIENTRYP PFNGLMULTMATRIXDPROC)(const GLdouble *m); -GLAPI PFNGLMULTMATRIXDPROC glad_glMultMatrixd; -#define glMultMatrixd glad_glMultMatrixd -typedef void (APIENTRYP PFNGLORTHOPROC)(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar); -GLAPI PFNGLORTHOPROC glad_glOrtho; -#define glOrtho glad_glOrtho -typedef void (APIENTRYP PFNGLPOPMATRIXPROC)(void); -GLAPI PFNGLPOPMATRIXPROC glad_glPopMatrix; -#define glPopMatrix glad_glPopMatrix -typedef void (APIENTRYP PFNGLPUSHMATRIXPROC)(void); -GLAPI PFNGLPUSHMATRIXPROC glad_glPushMatrix; -#define glPushMatrix glad_glPushMatrix -typedef void (APIENTRYP PFNGLROTATEDPROC)(GLdouble angle, GLdouble x, GLdouble y, GLdouble z); -GLAPI PFNGLROTATEDPROC glad_glRotated; -#define glRotated glad_glRotated -typedef void (APIENTRYP PFNGLROTATEFPROC)(GLfloat angle, GLfloat x, GLfloat y, GLfloat z); -GLAPI PFNGLROTATEFPROC glad_glRotatef; -#define glRotatef glad_glRotatef -typedef void (APIENTRYP PFNGLSCALEDPROC)(GLdouble x, GLdouble y, GLdouble z); -GLAPI PFNGLSCALEDPROC glad_glScaled; -#define glScaled glad_glScaled -typedef void (APIENTRYP PFNGLSCALEFPROC)(GLfloat x, GLfloat y, GLfloat z); -GLAPI PFNGLSCALEFPROC glad_glScalef; -#define glScalef glad_glScalef -typedef void (APIENTRYP PFNGLTRANSLATEDPROC)(GLdouble x, GLdouble y, GLdouble z); -GLAPI PFNGLTRANSLATEDPROC glad_glTranslated; -#define glTranslated glad_glTranslated -typedef void (APIENTRYP PFNGLTRANSLATEFPROC)(GLfloat x, GLfloat y, GLfloat z); -GLAPI PFNGLTRANSLATEFPROC glad_glTranslatef; -#define glTranslatef glad_glTranslatef -#endif -#ifndef GL_VERSION_1_1 -#define GL_VERSION_1_1 1 -GLAPI int GLAD_GL_VERSION_1_1; -typedef void (APIENTRYP PFNGLDRAWARRAYSPROC)(GLenum mode, GLint first, GLsizei count); -GLAPI PFNGLDRAWARRAYSPROC glad_glDrawArrays; -#define glDrawArrays glad_glDrawArrays -typedef void (APIENTRYP PFNGLDRAWELEMENTSPROC)(GLenum mode, GLsizei count, GLenum type, const void *indices); -GLAPI PFNGLDRAWELEMENTSPROC glad_glDrawElements; -#define glDrawElements glad_glDrawElements -typedef void (APIENTRYP PFNGLGETPOINTERVPROC)(GLenum pname, void **params); -GLAPI PFNGLGETPOINTERVPROC glad_glGetPointerv; -#define glGetPointerv glad_glGetPointerv -typedef void (APIENTRYP PFNGLPOLYGONOFFSETPROC)(GLfloat factor, GLfloat units); -GLAPI PFNGLPOLYGONOFFSETPROC glad_glPolygonOffset; -#define glPolygonOffset glad_glPolygonOffset -typedef void (APIENTRYP PFNGLCOPYTEXIMAGE1DPROC)(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border); -GLAPI PFNGLCOPYTEXIMAGE1DPROC glad_glCopyTexImage1D; -#define glCopyTexImage1D glad_glCopyTexImage1D -typedef void (APIENTRYP PFNGLCOPYTEXIMAGE2DPROC)(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border); -GLAPI PFNGLCOPYTEXIMAGE2DPROC glad_glCopyTexImage2D; -#define glCopyTexImage2D glad_glCopyTexImage2D -typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE1DPROC)(GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width); -GLAPI PFNGLCOPYTEXSUBIMAGE1DPROC glad_glCopyTexSubImage1D; -#define glCopyTexSubImage1D glad_glCopyTexSubImage1D -typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE2DPROC)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height); -GLAPI PFNGLCOPYTEXSUBIMAGE2DPROC glad_glCopyTexSubImage2D; -#define glCopyTexSubImage2D glad_glCopyTexSubImage2D -typedef void (APIENTRYP PFNGLTEXSUBIMAGE1DPROC)(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void *pixels); -GLAPI PFNGLTEXSUBIMAGE1DPROC glad_glTexSubImage1D; -#define glTexSubImage1D glad_glTexSubImage1D -typedef void (APIENTRYP PFNGLTEXSUBIMAGE2DPROC)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels); -GLAPI PFNGLTEXSUBIMAGE2DPROC glad_glTexSubImage2D; -#define glTexSubImage2D glad_glTexSubImage2D -typedef void (APIENTRYP PFNGLBINDTEXTUREPROC)(GLenum target, GLuint texture); -GLAPI PFNGLBINDTEXTUREPROC glad_glBindTexture; -#define glBindTexture glad_glBindTexture -typedef void (APIENTRYP PFNGLDELETETEXTURESPROC)(GLsizei n, const GLuint *textures); -GLAPI PFNGLDELETETEXTURESPROC glad_glDeleteTextures; -#define glDeleteTextures glad_glDeleteTextures -typedef void (APIENTRYP PFNGLGENTEXTURESPROC)(GLsizei n, GLuint *textures); -GLAPI PFNGLGENTEXTURESPROC glad_glGenTextures; -#define glGenTextures glad_glGenTextures -typedef GLboolean (APIENTRYP PFNGLISTEXTUREPROC)(GLuint texture); -GLAPI PFNGLISTEXTUREPROC glad_glIsTexture; -#define glIsTexture glad_glIsTexture -typedef void (APIENTRYP PFNGLARRAYELEMENTPROC)(GLint i); -GLAPI PFNGLARRAYELEMENTPROC glad_glArrayElement; -#define glArrayElement glad_glArrayElement -typedef void (APIENTRYP PFNGLCOLORPOINTERPROC)(GLint size, GLenum type, GLsizei stride, const void *pointer); -GLAPI PFNGLCOLORPOINTERPROC glad_glColorPointer; -#define glColorPointer glad_glColorPointer -typedef void (APIENTRYP PFNGLDISABLECLIENTSTATEPROC)(GLenum array); -GLAPI PFNGLDISABLECLIENTSTATEPROC glad_glDisableClientState; -#define glDisableClientState glad_glDisableClientState -typedef void (APIENTRYP PFNGLEDGEFLAGPOINTERPROC)(GLsizei stride, const void *pointer); -GLAPI PFNGLEDGEFLAGPOINTERPROC glad_glEdgeFlagPointer; -#define glEdgeFlagPointer glad_glEdgeFlagPointer -typedef void (APIENTRYP PFNGLENABLECLIENTSTATEPROC)(GLenum array); -GLAPI PFNGLENABLECLIENTSTATEPROC glad_glEnableClientState; -#define glEnableClientState glad_glEnableClientState -typedef void (APIENTRYP PFNGLINDEXPOINTERPROC)(GLenum type, GLsizei stride, const void *pointer); -GLAPI PFNGLINDEXPOINTERPROC glad_glIndexPointer; -#define glIndexPointer glad_glIndexPointer -typedef void (APIENTRYP PFNGLINTERLEAVEDARRAYSPROC)(GLenum format, GLsizei stride, const void *pointer); -GLAPI PFNGLINTERLEAVEDARRAYSPROC glad_glInterleavedArrays; -#define glInterleavedArrays glad_glInterleavedArrays -typedef void (APIENTRYP PFNGLNORMALPOINTERPROC)(GLenum type, GLsizei stride, const void *pointer); -GLAPI PFNGLNORMALPOINTERPROC glad_glNormalPointer; -#define glNormalPointer glad_glNormalPointer -typedef void (APIENTRYP PFNGLTEXCOORDPOINTERPROC)(GLint size, GLenum type, GLsizei stride, const void *pointer); -GLAPI PFNGLTEXCOORDPOINTERPROC glad_glTexCoordPointer; -#define glTexCoordPointer glad_glTexCoordPointer -typedef void (APIENTRYP PFNGLVERTEXPOINTERPROC)(GLint size, GLenum type, GLsizei stride, const void *pointer); -GLAPI PFNGLVERTEXPOINTERPROC glad_glVertexPointer; -#define glVertexPointer glad_glVertexPointer -typedef GLboolean (APIENTRYP PFNGLARETEXTURESRESIDENTPROC)(GLsizei n, const GLuint *textures, GLboolean *residences); -GLAPI PFNGLARETEXTURESRESIDENTPROC glad_glAreTexturesResident; -#define glAreTexturesResident glad_glAreTexturesResident -typedef void (APIENTRYP PFNGLPRIORITIZETEXTURESPROC)(GLsizei n, const GLuint *textures, const GLfloat *priorities); -GLAPI PFNGLPRIORITIZETEXTURESPROC glad_glPrioritizeTextures; -#define glPrioritizeTextures glad_glPrioritizeTextures -typedef void (APIENTRYP PFNGLINDEXUBPROC)(GLubyte c); -GLAPI PFNGLINDEXUBPROC glad_glIndexub; -#define glIndexub glad_glIndexub -typedef void (APIENTRYP PFNGLINDEXUBVPROC)(const GLubyte *c); -GLAPI PFNGLINDEXUBVPROC glad_glIndexubv; -#define glIndexubv glad_glIndexubv -typedef void (APIENTRYP PFNGLPOPCLIENTATTRIBPROC)(void); -GLAPI PFNGLPOPCLIENTATTRIBPROC glad_glPopClientAttrib; -#define glPopClientAttrib glad_glPopClientAttrib -typedef void (APIENTRYP PFNGLPUSHCLIENTATTRIBPROC)(GLbitfield mask); -GLAPI PFNGLPUSHCLIENTATTRIBPROC glad_glPushClientAttrib; -#define glPushClientAttrib glad_glPushClientAttrib -#endif -#ifndef GL_VERSION_1_2 -#define GL_VERSION_1_2 1 -GLAPI int GLAD_GL_VERSION_1_2; -typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSPROC)(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices); -GLAPI PFNGLDRAWRANGEELEMENTSPROC glad_glDrawRangeElements; -#define glDrawRangeElements glad_glDrawRangeElements -typedef void (APIENTRYP PFNGLTEXIMAGE3DPROC)(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels); -GLAPI PFNGLTEXIMAGE3DPROC glad_glTexImage3D; -#define glTexImage3D glad_glTexImage3D -typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DPROC)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels); -GLAPI PFNGLTEXSUBIMAGE3DPROC glad_glTexSubImage3D; -#define glTexSubImage3D glad_glTexSubImage3D -typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DPROC)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); -GLAPI PFNGLCOPYTEXSUBIMAGE3DPROC glad_glCopyTexSubImage3D; -#define glCopyTexSubImage3D glad_glCopyTexSubImage3D -#endif -#ifndef GL_VERSION_1_3 -#define GL_VERSION_1_3 1 -GLAPI int GLAD_GL_VERSION_1_3; -typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC)(GLenum texture); -GLAPI PFNGLACTIVETEXTUREPROC glad_glActiveTexture; -#define glActiveTexture glad_glActiveTexture -typedef void (APIENTRYP PFNGLSAMPLECOVERAGEPROC)(GLfloat value, GLboolean invert); -GLAPI PFNGLSAMPLECOVERAGEPROC glad_glSampleCoverage; -#define glSampleCoverage glad_glSampleCoverage -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DPROC)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data); -GLAPI PFNGLCOMPRESSEDTEXIMAGE3DPROC glad_glCompressedTexImage3D; -#define glCompressedTexImage3D glad_glCompressedTexImage3D -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DPROC)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *data); -GLAPI PFNGLCOMPRESSEDTEXIMAGE2DPROC glad_glCompressedTexImage2D; -#define glCompressedTexImage2D glad_glCompressedTexImage2D -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DPROC)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *data); -GLAPI PFNGLCOMPRESSEDTEXIMAGE1DPROC glad_glCompressedTexImage1D; -#define glCompressedTexImage1D glad_glCompressedTexImage1D -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data); -GLAPI PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC glad_glCompressedTexSubImage3D; -#define glCompressedTexSubImage3D glad_glCompressedTexSubImage3D -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data); -GLAPI PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC glad_glCompressedTexSubImage2D; -#define glCompressedTexSubImage2D glad_glCompressedTexSubImage2D -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC)(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *data); -GLAPI PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC glad_glCompressedTexSubImage1D; -#define glCompressedTexSubImage1D glad_glCompressedTexSubImage1D -typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEPROC)(GLenum target, GLint level, void *img); -GLAPI PFNGLGETCOMPRESSEDTEXIMAGEPROC glad_glGetCompressedTexImage; -#define glGetCompressedTexImage glad_glGetCompressedTexImage -typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREPROC)(GLenum texture); -GLAPI PFNGLCLIENTACTIVETEXTUREPROC glad_glClientActiveTexture; -#define glClientActiveTexture glad_glClientActiveTexture -typedef void (APIENTRYP PFNGLMULTITEXCOORD1DPROC)(GLenum target, GLdouble s); -GLAPI PFNGLMULTITEXCOORD1DPROC glad_glMultiTexCoord1d; -#define glMultiTexCoord1d glad_glMultiTexCoord1d -typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVPROC)(GLenum target, const GLdouble *v); -GLAPI PFNGLMULTITEXCOORD1DVPROC glad_glMultiTexCoord1dv; -#define glMultiTexCoord1dv glad_glMultiTexCoord1dv -typedef void (APIENTRYP PFNGLMULTITEXCOORD1FPROC)(GLenum target, GLfloat s); -GLAPI PFNGLMULTITEXCOORD1FPROC glad_glMultiTexCoord1f; -#define glMultiTexCoord1f glad_glMultiTexCoord1f -typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVPROC)(GLenum target, const GLfloat *v); -GLAPI PFNGLMULTITEXCOORD1FVPROC glad_glMultiTexCoord1fv; -#define glMultiTexCoord1fv glad_glMultiTexCoord1fv -typedef void (APIENTRYP PFNGLMULTITEXCOORD1IPROC)(GLenum target, GLint s); -GLAPI PFNGLMULTITEXCOORD1IPROC glad_glMultiTexCoord1i; -#define glMultiTexCoord1i glad_glMultiTexCoord1i -typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVPROC)(GLenum target, const GLint *v); -GLAPI PFNGLMULTITEXCOORD1IVPROC glad_glMultiTexCoord1iv; -#define glMultiTexCoord1iv glad_glMultiTexCoord1iv -typedef void (APIENTRYP PFNGLMULTITEXCOORD1SPROC)(GLenum target, GLshort s); -GLAPI PFNGLMULTITEXCOORD1SPROC glad_glMultiTexCoord1s; -#define glMultiTexCoord1s glad_glMultiTexCoord1s -typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVPROC)(GLenum target, const GLshort *v); -GLAPI PFNGLMULTITEXCOORD1SVPROC glad_glMultiTexCoord1sv; -#define glMultiTexCoord1sv glad_glMultiTexCoord1sv -typedef void (APIENTRYP PFNGLMULTITEXCOORD2DPROC)(GLenum target, GLdouble s, GLdouble t); -GLAPI PFNGLMULTITEXCOORD2DPROC glad_glMultiTexCoord2d; -#define glMultiTexCoord2d glad_glMultiTexCoord2d -typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVPROC)(GLenum target, const GLdouble *v); -GLAPI PFNGLMULTITEXCOORD2DVPROC glad_glMultiTexCoord2dv; -#define glMultiTexCoord2dv glad_glMultiTexCoord2dv -typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC)(GLenum target, GLfloat s, GLfloat t); -GLAPI PFNGLMULTITEXCOORD2FPROC glad_glMultiTexCoord2f; -#define glMultiTexCoord2f glad_glMultiTexCoord2f -typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVPROC)(GLenum target, const GLfloat *v); -GLAPI PFNGLMULTITEXCOORD2FVPROC glad_glMultiTexCoord2fv; -#define glMultiTexCoord2fv glad_glMultiTexCoord2fv -typedef void (APIENTRYP PFNGLMULTITEXCOORD2IPROC)(GLenum target, GLint s, GLint t); -GLAPI PFNGLMULTITEXCOORD2IPROC glad_glMultiTexCoord2i; -#define glMultiTexCoord2i glad_glMultiTexCoord2i -typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVPROC)(GLenum target, const GLint *v); -GLAPI PFNGLMULTITEXCOORD2IVPROC glad_glMultiTexCoord2iv; -#define glMultiTexCoord2iv glad_glMultiTexCoord2iv -typedef void (APIENTRYP PFNGLMULTITEXCOORD2SPROC)(GLenum target, GLshort s, GLshort t); -GLAPI PFNGLMULTITEXCOORD2SPROC glad_glMultiTexCoord2s; -#define glMultiTexCoord2s glad_glMultiTexCoord2s -typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVPROC)(GLenum target, const GLshort *v); -GLAPI PFNGLMULTITEXCOORD2SVPROC glad_glMultiTexCoord2sv; -#define glMultiTexCoord2sv glad_glMultiTexCoord2sv -typedef void (APIENTRYP PFNGLMULTITEXCOORD3DPROC)(GLenum target, GLdouble s, GLdouble t, GLdouble r); -GLAPI PFNGLMULTITEXCOORD3DPROC glad_glMultiTexCoord3d; -#define glMultiTexCoord3d glad_glMultiTexCoord3d -typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVPROC)(GLenum target, const GLdouble *v); -GLAPI PFNGLMULTITEXCOORD3DVPROC glad_glMultiTexCoord3dv; -#define glMultiTexCoord3dv glad_glMultiTexCoord3dv -typedef void (APIENTRYP PFNGLMULTITEXCOORD3FPROC)(GLenum target, GLfloat s, GLfloat t, GLfloat r); -GLAPI PFNGLMULTITEXCOORD3FPROC glad_glMultiTexCoord3f; -#define glMultiTexCoord3f glad_glMultiTexCoord3f -typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVPROC)(GLenum target, const GLfloat *v); -GLAPI PFNGLMULTITEXCOORD3FVPROC glad_glMultiTexCoord3fv; -#define glMultiTexCoord3fv glad_glMultiTexCoord3fv -typedef void (APIENTRYP PFNGLMULTITEXCOORD3IPROC)(GLenum target, GLint s, GLint t, GLint r); -GLAPI PFNGLMULTITEXCOORD3IPROC glad_glMultiTexCoord3i; -#define glMultiTexCoord3i glad_glMultiTexCoord3i -typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVPROC)(GLenum target, const GLint *v); -GLAPI PFNGLMULTITEXCOORD3IVPROC glad_glMultiTexCoord3iv; -#define glMultiTexCoord3iv glad_glMultiTexCoord3iv -typedef void (APIENTRYP PFNGLMULTITEXCOORD3SPROC)(GLenum target, GLshort s, GLshort t, GLshort r); -GLAPI PFNGLMULTITEXCOORD3SPROC glad_glMultiTexCoord3s; -#define glMultiTexCoord3s glad_glMultiTexCoord3s -typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVPROC)(GLenum target, const GLshort *v); -GLAPI PFNGLMULTITEXCOORD3SVPROC glad_glMultiTexCoord3sv; -#define glMultiTexCoord3sv glad_glMultiTexCoord3sv -typedef void (APIENTRYP PFNGLMULTITEXCOORD4DPROC)(GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q); -GLAPI PFNGLMULTITEXCOORD4DPROC glad_glMultiTexCoord4d; -#define glMultiTexCoord4d glad_glMultiTexCoord4d -typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVPROC)(GLenum target, const GLdouble *v); -GLAPI PFNGLMULTITEXCOORD4DVPROC glad_glMultiTexCoord4dv; -#define glMultiTexCoord4dv glad_glMultiTexCoord4dv -typedef void (APIENTRYP PFNGLMULTITEXCOORD4FPROC)(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q); -GLAPI PFNGLMULTITEXCOORD4FPROC glad_glMultiTexCoord4f; -#define glMultiTexCoord4f glad_glMultiTexCoord4f -typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVPROC)(GLenum target, const GLfloat *v); -GLAPI PFNGLMULTITEXCOORD4FVPROC glad_glMultiTexCoord4fv; -#define glMultiTexCoord4fv glad_glMultiTexCoord4fv -typedef void (APIENTRYP PFNGLMULTITEXCOORD4IPROC)(GLenum target, GLint s, GLint t, GLint r, GLint q); -GLAPI PFNGLMULTITEXCOORD4IPROC glad_glMultiTexCoord4i; -#define glMultiTexCoord4i glad_glMultiTexCoord4i -typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVPROC)(GLenum target, const GLint *v); -GLAPI PFNGLMULTITEXCOORD4IVPROC glad_glMultiTexCoord4iv; -#define glMultiTexCoord4iv glad_glMultiTexCoord4iv -typedef void (APIENTRYP PFNGLMULTITEXCOORD4SPROC)(GLenum target, GLshort s, GLshort t, GLshort r, GLshort q); -GLAPI PFNGLMULTITEXCOORD4SPROC glad_glMultiTexCoord4s; -#define glMultiTexCoord4s glad_glMultiTexCoord4s -typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVPROC)(GLenum target, const GLshort *v); -GLAPI PFNGLMULTITEXCOORD4SVPROC glad_glMultiTexCoord4sv; -#define glMultiTexCoord4sv glad_glMultiTexCoord4sv -typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXFPROC)(const GLfloat *m); -GLAPI PFNGLLOADTRANSPOSEMATRIXFPROC glad_glLoadTransposeMatrixf; -#define glLoadTransposeMatrixf glad_glLoadTransposeMatrixf -typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXDPROC)(const GLdouble *m); -GLAPI PFNGLLOADTRANSPOSEMATRIXDPROC glad_glLoadTransposeMatrixd; -#define glLoadTransposeMatrixd glad_glLoadTransposeMatrixd -typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXFPROC)(const GLfloat *m); -GLAPI PFNGLMULTTRANSPOSEMATRIXFPROC glad_glMultTransposeMatrixf; -#define glMultTransposeMatrixf glad_glMultTransposeMatrixf -typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXDPROC)(const GLdouble *m); -GLAPI PFNGLMULTTRANSPOSEMATRIXDPROC glad_glMultTransposeMatrixd; -#define glMultTransposeMatrixd glad_glMultTransposeMatrixd -#endif -#ifndef GL_VERSION_1_4 -#define GL_VERSION_1_4 1 -GLAPI int GLAD_GL_VERSION_1_4; -typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); -GLAPI PFNGLBLENDFUNCSEPARATEPROC glad_glBlendFuncSeparate; -#define glBlendFuncSeparate glad_glBlendFuncSeparate -typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSPROC)(GLenum mode, const GLint *first, const GLsizei *count, GLsizei drawcount); -GLAPI PFNGLMULTIDRAWARRAYSPROC glad_glMultiDrawArrays; -#define glMultiDrawArrays glad_glMultiDrawArrays -typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSPROC)(GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei drawcount); -GLAPI PFNGLMULTIDRAWELEMENTSPROC glad_glMultiDrawElements; -#define glMultiDrawElements glad_glMultiDrawElements -typedef void (APIENTRYP PFNGLPOINTPARAMETERFPROC)(GLenum pname, GLfloat param); -GLAPI PFNGLPOINTPARAMETERFPROC glad_glPointParameterf; -#define glPointParameterf glad_glPointParameterf -typedef void (APIENTRYP PFNGLPOINTPARAMETERFVPROC)(GLenum pname, const GLfloat *params); -GLAPI PFNGLPOINTPARAMETERFVPROC glad_glPointParameterfv; -#define glPointParameterfv glad_glPointParameterfv -typedef void (APIENTRYP PFNGLPOINTPARAMETERIPROC)(GLenum pname, GLint param); -GLAPI PFNGLPOINTPARAMETERIPROC glad_glPointParameteri; -#define glPointParameteri glad_glPointParameteri -typedef void (APIENTRYP PFNGLPOINTPARAMETERIVPROC)(GLenum pname, const GLint *params); -GLAPI PFNGLPOINTPARAMETERIVPROC glad_glPointParameteriv; -#define glPointParameteriv glad_glPointParameteriv -typedef void (APIENTRYP PFNGLFOGCOORDFPROC)(GLfloat coord); -GLAPI PFNGLFOGCOORDFPROC glad_glFogCoordf; -#define glFogCoordf glad_glFogCoordf -typedef void (APIENTRYP PFNGLFOGCOORDFVPROC)(const GLfloat *coord); -GLAPI PFNGLFOGCOORDFVPROC glad_glFogCoordfv; -#define glFogCoordfv glad_glFogCoordfv -typedef void (APIENTRYP PFNGLFOGCOORDDPROC)(GLdouble coord); -GLAPI PFNGLFOGCOORDDPROC glad_glFogCoordd; -#define glFogCoordd glad_glFogCoordd -typedef void (APIENTRYP PFNGLFOGCOORDDVPROC)(const GLdouble *coord); -GLAPI PFNGLFOGCOORDDVPROC glad_glFogCoorddv; -#define glFogCoorddv glad_glFogCoorddv -typedef void (APIENTRYP PFNGLFOGCOORDPOINTERPROC)(GLenum type, GLsizei stride, const void *pointer); -GLAPI PFNGLFOGCOORDPOINTERPROC glad_glFogCoordPointer; -#define glFogCoordPointer glad_glFogCoordPointer -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BPROC)(GLbyte red, GLbyte green, GLbyte blue); -GLAPI PFNGLSECONDARYCOLOR3BPROC glad_glSecondaryColor3b; -#define glSecondaryColor3b glad_glSecondaryColor3b -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BVPROC)(const GLbyte *v); -GLAPI PFNGLSECONDARYCOLOR3BVPROC glad_glSecondaryColor3bv; -#define glSecondaryColor3bv glad_glSecondaryColor3bv -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DPROC)(GLdouble red, GLdouble green, GLdouble blue); -GLAPI PFNGLSECONDARYCOLOR3DPROC glad_glSecondaryColor3d; -#define glSecondaryColor3d glad_glSecondaryColor3d -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DVPROC)(const GLdouble *v); -GLAPI PFNGLSECONDARYCOLOR3DVPROC glad_glSecondaryColor3dv; -#define glSecondaryColor3dv glad_glSecondaryColor3dv -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FPROC)(GLfloat red, GLfloat green, GLfloat blue); -GLAPI PFNGLSECONDARYCOLOR3FPROC glad_glSecondaryColor3f; -#define glSecondaryColor3f glad_glSecondaryColor3f -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FVPROC)(const GLfloat *v); -GLAPI PFNGLSECONDARYCOLOR3FVPROC glad_glSecondaryColor3fv; -#define glSecondaryColor3fv glad_glSecondaryColor3fv -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IPROC)(GLint red, GLint green, GLint blue); -GLAPI PFNGLSECONDARYCOLOR3IPROC glad_glSecondaryColor3i; -#define glSecondaryColor3i glad_glSecondaryColor3i -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IVPROC)(const GLint *v); -GLAPI PFNGLSECONDARYCOLOR3IVPROC glad_glSecondaryColor3iv; -#define glSecondaryColor3iv glad_glSecondaryColor3iv -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SPROC)(GLshort red, GLshort green, GLshort blue); -GLAPI PFNGLSECONDARYCOLOR3SPROC glad_glSecondaryColor3s; -#define glSecondaryColor3s glad_glSecondaryColor3s -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SVPROC)(const GLshort *v); -GLAPI PFNGLSECONDARYCOLOR3SVPROC glad_glSecondaryColor3sv; -#define glSecondaryColor3sv glad_glSecondaryColor3sv -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBPROC)(GLubyte red, GLubyte green, GLubyte blue); -GLAPI PFNGLSECONDARYCOLOR3UBPROC glad_glSecondaryColor3ub; -#define glSecondaryColor3ub glad_glSecondaryColor3ub -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBVPROC)(const GLubyte *v); -GLAPI PFNGLSECONDARYCOLOR3UBVPROC glad_glSecondaryColor3ubv; -#define glSecondaryColor3ubv glad_glSecondaryColor3ubv -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIPROC)(GLuint red, GLuint green, GLuint blue); -GLAPI PFNGLSECONDARYCOLOR3UIPROC glad_glSecondaryColor3ui; -#define glSecondaryColor3ui glad_glSecondaryColor3ui -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIVPROC)(const GLuint *v); -GLAPI PFNGLSECONDARYCOLOR3UIVPROC glad_glSecondaryColor3uiv; -#define glSecondaryColor3uiv glad_glSecondaryColor3uiv -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USPROC)(GLushort red, GLushort green, GLushort blue); -GLAPI PFNGLSECONDARYCOLOR3USPROC glad_glSecondaryColor3us; -#define glSecondaryColor3us glad_glSecondaryColor3us -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USVPROC)(const GLushort *v); -GLAPI PFNGLSECONDARYCOLOR3USVPROC glad_glSecondaryColor3usv; -#define glSecondaryColor3usv glad_glSecondaryColor3usv -typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTERPROC)(GLint size, GLenum type, GLsizei stride, const void *pointer); -GLAPI PFNGLSECONDARYCOLORPOINTERPROC glad_glSecondaryColorPointer; -#define glSecondaryColorPointer glad_glSecondaryColorPointer -typedef void (APIENTRYP PFNGLWINDOWPOS2DPROC)(GLdouble x, GLdouble y); -GLAPI PFNGLWINDOWPOS2DPROC glad_glWindowPos2d; -#define glWindowPos2d glad_glWindowPos2d -typedef void (APIENTRYP PFNGLWINDOWPOS2DVPROC)(const GLdouble *v); -GLAPI PFNGLWINDOWPOS2DVPROC glad_glWindowPos2dv; -#define glWindowPos2dv glad_glWindowPos2dv -typedef void (APIENTRYP PFNGLWINDOWPOS2FPROC)(GLfloat x, GLfloat y); -GLAPI PFNGLWINDOWPOS2FPROC glad_glWindowPos2f; -#define glWindowPos2f glad_glWindowPos2f -typedef void (APIENTRYP PFNGLWINDOWPOS2FVPROC)(const GLfloat *v); -GLAPI PFNGLWINDOWPOS2FVPROC glad_glWindowPos2fv; -#define glWindowPos2fv glad_glWindowPos2fv -typedef void (APIENTRYP PFNGLWINDOWPOS2IPROC)(GLint x, GLint y); -GLAPI PFNGLWINDOWPOS2IPROC glad_glWindowPos2i; -#define glWindowPos2i glad_glWindowPos2i -typedef void (APIENTRYP PFNGLWINDOWPOS2IVPROC)(const GLint *v); -GLAPI PFNGLWINDOWPOS2IVPROC glad_glWindowPos2iv; -#define glWindowPos2iv glad_glWindowPos2iv -typedef void (APIENTRYP PFNGLWINDOWPOS2SPROC)(GLshort x, GLshort y); -GLAPI PFNGLWINDOWPOS2SPROC glad_glWindowPos2s; -#define glWindowPos2s glad_glWindowPos2s -typedef void (APIENTRYP PFNGLWINDOWPOS2SVPROC)(const GLshort *v); -GLAPI PFNGLWINDOWPOS2SVPROC glad_glWindowPos2sv; -#define glWindowPos2sv glad_glWindowPos2sv -typedef void (APIENTRYP PFNGLWINDOWPOS3DPROC)(GLdouble x, GLdouble y, GLdouble z); -GLAPI PFNGLWINDOWPOS3DPROC glad_glWindowPos3d; -#define glWindowPos3d glad_glWindowPos3d -typedef void (APIENTRYP PFNGLWINDOWPOS3DVPROC)(const GLdouble *v); -GLAPI PFNGLWINDOWPOS3DVPROC glad_glWindowPos3dv; -#define glWindowPos3dv glad_glWindowPos3dv -typedef void (APIENTRYP PFNGLWINDOWPOS3FPROC)(GLfloat x, GLfloat y, GLfloat z); -GLAPI PFNGLWINDOWPOS3FPROC glad_glWindowPos3f; -#define glWindowPos3f glad_glWindowPos3f -typedef void (APIENTRYP PFNGLWINDOWPOS3FVPROC)(const GLfloat *v); -GLAPI PFNGLWINDOWPOS3FVPROC glad_glWindowPos3fv; -#define glWindowPos3fv glad_glWindowPos3fv -typedef void (APIENTRYP PFNGLWINDOWPOS3IPROC)(GLint x, GLint y, GLint z); -GLAPI PFNGLWINDOWPOS3IPROC glad_glWindowPos3i; -#define glWindowPos3i glad_glWindowPos3i -typedef void (APIENTRYP PFNGLWINDOWPOS3IVPROC)(const GLint *v); -GLAPI PFNGLWINDOWPOS3IVPROC glad_glWindowPos3iv; -#define glWindowPos3iv glad_glWindowPos3iv -typedef void (APIENTRYP PFNGLWINDOWPOS3SPROC)(GLshort x, GLshort y, GLshort z); -GLAPI PFNGLWINDOWPOS3SPROC glad_glWindowPos3s; -#define glWindowPos3s glad_glWindowPos3s -typedef void (APIENTRYP PFNGLWINDOWPOS3SVPROC)(const GLshort *v); -GLAPI PFNGLWINDOWPOS3SVPROC glad_glWindowPos3sv; -#define glWindowPos3sv glad_glWindowPos3sv -typedef void (APIENTRYP PFNGLBLENDCOLORPROC)(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha); -GLAPI PFNGLBLENDCOLORPROC glad_glBlendColor; -#define glBlendColor glad_glBlendColor -typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC)(GLenum mode); -GLAPI PFNGLBLENDEQUATIONPROC glad_glBlendEquation; -#define glBlendEquation glad_glBlendEquation -#endif -#ifndef GL_VERSION_1_5 -#define GL_VERSION_1_5 1 -GLAPI int GLAD_GL_VERSION_1_5; -typedef void (APIENTRYP PFNGLGENQUERIESPROC)(GLsizei n, GLuint *ids); -GLAPI PFNGLGENQUERIESPROC glad_glGenQueries; -#define glGenQueries glad_glGenQueries -typedef void (APIENTRYP PFNGLDELETEQUERIESPROC)(GLsizei n, const GLuint *ids); -GLAPI PFNGLDELETEQUERIESPROC glad_glDeleteQueries; -#define glDeleteQueries glad_glDeleteQueries -typedef GLboolean (APIENTRYP PFNGLISQUERYPROC)(GLuint id); -GLAPI PFNGLISQUERYPROC glad_glIsQuery; -#define glIsQuery glad_glIsQuery -typedef void (APIENTRYP PFNGLBEGINQUERYPROC)(GLenum target, GLuint id); -GLAPI PFNGLBEGINQUERYPROC glad_glBeginQuery; -#define glBeginQuery glad_glBeginQuery -typedef void (APIENTRYP PFNGLENDQUERYPROC)(GLenum target); -GLAPI PFNGLENDQUERYPROC glad_glEndQuery; -#define glEndQuery glad_glEndQuery -typedef void (APIENTRYP PFNGLGETQUERYIVPROC)(GLenum target, GLenum pname, GLint *params); -GLAPI PFNGLGETQUERYIVPROC glad_glGetQueryiv; -#define glGetQueryiv glad_glGetQueryiv -typedef void (APIENTRYP PFNGLGETQUERYOBJECTIVPROC)(GLuint id, GLenum pname, GLint *params); -GLAPI PFNGLGETQUERYOBJECTIVPROC glad_glGetQueryObjectiv; -#define glGetQueryObjectiv glad_glGetQueryObjectiv -typedef void (APIENTRYP PFNGLGETQUERYOBJECTUIVPROC)(GLuint id, GLenum pname, GLuint *params); -GLAPI PFNGLGETQUERYOBJECTUIVPROC glad_glGetQueryObjectuiv; -#define glGetQueryObjectuiv glad_glGetQueryObjectuiv -typedef void (APIENTRYP PFNGLBINDBUFFERPROC)(GLenum target, GLuint buffer); -GLAPI PFNGLBINDBUFFERPROC glad_glBindBuffer; -#define glBindBuffer glad_glBindBuffer -typedef void (APIENTRYP PFNGLDELETEBUFFERSPROC)(GLsizei n, const GLuint *buffers); -GLAPI PFNGLDELETEBUFFERSPROC glad_glDeleteBuffers; -#define glDeleteBuffers glad_glDeleteBuffers -typedef void (APIENTRYP PFNGLGENBUFFERSPROC)(GLsizei n, GLuint *buffers); -GLAPI PFNGLGENBUFFERSPROC glad_glGenBuffers; -#define glGenBuffers glad_glGenBuffers -typedef GLboolean (APIENTRYP PFNGLISBUFFERPROC)(GLuint buffer); -GLAPI PFNGLISBUFFERPROC glad_glIsBuffer; -#define glIsBuffer glad_glIsBuffer -typedef void (APIENTRYP PFNGLBUFFERDATAPROC)(GLenum target, GLsizeiptr size, const void *data, GLenum usage); -GLAPI PFNGLBUFFERDATAPROC glad_glBufferData; -#define glBufferData glad_glBufferData -typedef void (APIENTRYP PFNGLBUFFERSUBDATAPROC)(GLenum target, GLintptr offset, GLsizeiptr size, const void *data); -GLAPI PFNGLBUFFERSUBDATAPROC glad_glBufferSubData; -#define glBufferSubData glad_glBufferSubData -typedef void (APIENTRYP PFNGLGETBUFFERSUBDATAPROC)(GLenum target, GLintptr offset, GLsizeiptr size, void *data); -GLAPI PFNGLGETBUFFERSUBDATAPROC glad_glGetBufferSubData; -#define glGetBufferSubData glad_glGetBufferSubData -typedef void * (APIENTRYP PFNGLMAPBUFFERPROC)(GLenum target, GLenum access); -GLAPI PFNGLMAPBUFFERPROC glad_glMapBuffer; -#define glMapBuffer glad_glMapBuffer -typedef GLboolean (APIENTRYP PFNGLUNMAPBUFFERPROC)(GLenum target); -GLAPI PFNGLUNMAPBUFFERPROC glad_glUnmapBuffer; -#define glUnmapBuffer glad_glUnmapBuffer -typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERIVPROC)(GLenum target, GLenum pname, GLint *params); -GLAPI PFNGLGETBUFFERPARAMETERIVPROC glad_glGetBufferParameteriv; -#define glGetBufferParameteriv glad_glGetBufferParameteriv -typedef void (APIENTRYP PFNGLGETBUFFERPOINTERVPROC)(GLenum target, GLenum pname, void **params); -GLAPI PFNGLGETBUFFERPOINTERVPROC glad_glGetBufferPointerv; -#define glGetBufferPointerv glad_glGetBufferPointerv -#endif -#ifndef GL_VERSION_2_0 -#define GL_VERSION_2_0 1 -GLAPI int GLAD_GL_VERSION_2_0; -typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEPROC)(GLenum modeRGB, GLenum modeAlpha); -GLAPI PFNGLBLENDEQUATIONSEPARATEPROC glad_glBlendEquationSeparate; -#define glBlendEquationSeparate glad_glBlendEquationSeparate -typedef void (APIENTRYP PFNGLDRAWBUFFERSPROC)(GLsizei n, const GLenum *bufs); -GLAPI PFNGLDRAWBUFFERSPROC glad_glDrawBuffers; -#define glDrawBuffers glad_glDrawBuffers -typedef void (APIENTRYP PFNGLSTENCILOPSEPARATEPROC)(GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass); -GLAPI PFNGLSTENCILOPSEPARATEPROC glad_glStencilOpSeparate; -#define glStencilOpSeparate glad_glStencilOpSeparate -typedef void (APIENTRYP PFNGLSTENCILFUNCSEPARATEPROC)(GLenum face, GLenum func, GLint ref, GLuint mask); -GLAPI PFNGLSTENCILFUNCSEPARATEPROC glad_glStencilFuncSeparate; -#define glStencilFuncSeparate glad_glStencilFuncSeparate -typedef void (APIENTRYP PFNGLSTENCILMASKSEPARATEPROC)(GLenum face, GLuint mask); -GLAPI PFNGLSTENCILMASKSEPARATEPROC glad_glStencilMaskSeparate; -#define glStencilMaskSeparate glad_glStencilMaskSeparate -typedef void (APIENTRYP PFNGLATTACHSHADERPROC)(GLuint program, GLuint shader); -GLAPI PFNGLATTACHSHADERPROC glad_glAttachShader; -#define glAttachShader glad_glAttachShader -typedef void (APIENTRYP PFNGLBINDATTRIBLOCATIONPROC)(GLuint program, GLuint index, const GLchar *name); -GLAPI PFNGLBINDATTRIBLOCATIONPROC glad_glBindAttribLocation; -#define glBindAttribLocation glad_glBindAttribLocation -typedef void (APIENTRYP PFNGLCOMPILESHADERPROC)(GLuint shader); -GLAPI PFNGLCOMPILESHADERPROC glad_glCompileShader; -#define glCompileShader glad_glCompileShader -typedef GLuint (APIENTRYP PFNGLCREATEPROGRAMPROC)(void); -GLAPI PFNGLCREATEPROGRAMPROC glad_glCreateProgram; -#define glCreateProgram glad_glCreateProgram -typedef GLuint (APIENTRYP PFNGLCREATESHADERPROC)(GLenum type); -GLAPI PFNGLCREATESHADERPROC glad_glCreateShader; -#define glCreateShader glad_glCreateShader -typedef void (APIENTRYP PFNGLDELETEPROGRAMPROC)(GLuint program); -GLAPI PFNGLDELETEPROGRAMPROC glad_glDeleteProgram; -#define glDeleteProgram glad_glDeleteProgram -typedef void (APIENTRYP PFNGLDELETESHADERPROC)(GLuint shader); -GLAPI PFNGLDELETESHADERPROC glad_glDeleteShader; -#define glDeleteShader glad_glDeleteShader -typedef void (APIENTRYP PFNGLDETACHSHADERPROC)(GLuint program, GLuint shader); -GLAPI PFNGLDETACHSHADERPROC glad_glDetachShader; -#define glDetachShader glad_glDetachShader -typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBARRAYPROC)(GLuint index); -GLAPI PFNGLDISABLEVERTEXATTRIBARRAYPROC glad_glDisableVertexAttribArray; -#define glDisableVertexAttribArray glad_glDisableVertexAttribArray -typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBARRAYPROC)(GLuint index); -GLAPI PFNGLENABLEVERTEXATTRIBARRAYPROC glad_glEnableVertexAttribArray; -#define glEnableVertexAttribArray glad_glEnableVertexAttribArray -typedef void (APIENTRYP PFNGLGETACTIVEATTRIBPROC)(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name); -GLAPI PFNGLGETACTIVEATTRIBPROC glad_glGetActiveAttrib; -#define glGetActiveAttrib glad_glGetActiveAttrib -typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMPROC)(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name); -GLAPI PFNGLGETACTIVEUNIFORMPROC glad_glGetActiveUniform; -#define glGetActiveUniform glad_glGetActiveUniform -typedef void (APIENTRYP PFNGLGETATTACHEDSHADERSPROC)(GLuint program, GLsizei maxCount, GLsizei *count, GLuint *shaders); -GLAPI PFNGLGETATTACHEDSHADERSPROC glad_glGetAttachedShaders; -#define glGetAttachedShaders glad_glGetAttachedShaders -typedef GLint (APIENTRYP PFNGLGETATTRIBLOCATIONPROC)(GLuint program, const GLchar *name); -GLAPI PFNGLGETATTRIBLOCATIONPROC glad_glGetAttribLocation; -#define glGetAttribLocation glad_glGetAttribLocation -typedef void (APIENTRYP PFNGLGETPROGRAMIVPROC)(GLuint program, GLenum pname, GLint *params); -GLAPI PFNGLGETPROGRAMIVPROC glad_glGetProgramiv; -#define glGetProgramiv glad_glGetProgramiv -typedef void (APIENTRYP PFNGLGETPROGRAMINFOLOGPROC)(GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog); -GLAPI PFNGLGETPROGRAMINFOLOGPROC glad_glGetProgramInfoLog; -#define glGetProgramInfoLog glad_glGetProgramInfoLog -typedef void (APIENTRYP PFNGLGETSHADERIVPROC)(GLuint shader, GLenum pname, GLint *params); -GLAPI PFNGLGETSHADERIVPROC glad_glGetShaderiv; -#define glGetShaderiv glad_glGetShaderiv -typedef void (APIENTRYP PFNGLGETSHADERINFOLOGPROC)(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog); -GLAPI PFNGLGETSHADERINFOLOGPROC glad_glGetShaderInfoLog; -#define glGetShaderInfoLog glad_glGetShaderInfoLog -typedef void (APIENTRYP PFNGLGETSHADERSOURCEPROC)(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source); -GLAPI PFNGLGETSHADERSOURCEPROC glad_glGetShaderSource; -#define glGetShaderSource glad_glGetShaderSource -typedef GLint (APIENTRYP PFNGLGETUNIFORMLOCATIONPROC)(GLuint program, const GLchar *name); -GLAPI PFNGLGETUNIFORMLOCATIONPROC glad_glGetUniformLocation; -#define glGetUniformLocation glad_glGetUniformLocation -typedef void (APIENTRYP PFNGLGETUNIFORMFVPROC)(GLuint program, GLint location, GLfloat *params); -GLAPI PFNGLGETUNIFORMFVPROC glad_glGetUniformfv; -#define glGetUniformfv glad_glGetUniformfv -typedef void (APIENTRYP PFNGLGETUNIFORMIVPROC)(GLuint program, GLint location, GLint *params); -GLAPI PFNGLGETUNIFORMIVPROC glad_glGetUniformiv; -#define glGetUniformiv glad_glGetUniformiv -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVPROC)(GLuint index, GLenum pname, GLdouble *params); -GLAPI PFNGLGETVERTEXATTRIBDVPROC glad_glGetVertexAttribdv; -#define glGetVertexAttribdv glad_glGetVertexAttribdv -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVPROC)(GLuint index, GLenum pname, GLfloat *params); -GLAPI PFNGLGETVERTEXATTRIBFVPROC glad_glGetVertexAttribfv; -#define glGetVertexAttribfv glad_glGetVertexAttribfv -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVPROC)(GLuint index, GLenum pname, GLint *params); -GLAPI PFNGLGETVERTEXATTRIBIVPROC glad_glGetVertexAttribiv; -#define glGetVertexAttribiv glad_glGetVertexAttribiv -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVPROC)(GLuint index, GLenum pname, void **pointer); -GLAPI PFNGLGETVERTEXATTRIBPOINTERVPROC glad_glGetVertexAttribPointerv; -#define glGetVertexAttribPointerv glad_glGetVertexAttribPointerv -typedef GLboolean (APIENTRYP PFNGLISPROGRAMPROC)(GLuint program); -GLAPI PFNGLISPROGRAMPROC glad_glIsProgram; -#define glIsProgram glad_glIsProgram -typedef GLboolean (APIENTRYP PFNGLISSHADERPROC)(GLuint shader); -GLAPI PFNGLISSHADERPROC glad_glIsShader; -#define glIsShader glad_glIsShader -typedef void (APIENTRYP PFNGLLINKPROGRAMPROC)(GLuint program); -GLAPI PFNGLLINKPROGRAMPROC glad_glLinkProgram; -#define glLinkProgram glad_glLinkProgram -typedef void (APIENTRYP PFNGLSHADERSOURCEPROC)(GLuint shader, GLsizei count, const GLchar *const*string, const GLint *length); -GLAPI PFNGLSHADERSOURCEPROC glad_glShaderSource; -#define glShaderSource glad_glShaderSource -typedef void (APIENTRYP PFNGLUSEPROGRAMPROC)(GLuint program); -GLAPI PFNGLUSEPROGRAMPROC glad_glUseProgram; -#define glUseProgram glad_glUseProgram -typedef void (APIENTRYP PFNGLUNIFORM1FPROC)(GLint location, GLfloat v0); -GLAPI PFNGLUNIFORM1FPROC glad_glUniform1f; -#define glUniform1f glad_glUniform1f -typedef void (APIENTRYP PFNGLUNIFORM2FPROC)(GLint location, GLfloat v0, GLfloat v1); -GLAPI PFNGLUNIFORM2FPROC glad_glUniform2f; -#define glUniform2f glad_glUniform2f -typedef void (APIENTRYP PFNGLUNIFORM3FPROC)(GLint location, GLfloat v0, GLfloat v1, GLfloat v2); -GLAPI PFNGLUNIFORM3FPROC glad_glUniform3f; -#define glUniform3f glad_glUniform3f -typedef void (APIENTRYP PFNGLUNIFORM4FPROC)(GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3); -GLAPI PFNGLUNIFORM4FPROC glad_glUniform4f; -#define glUniform4f glad_glUniform4f -typedef void (APIENTRYP PFNGLUNIFORM1IPROC)(GLint location, GLint v0); -GLAPI PFNGLUNIFORM1IPROC glad_glUniform1i; -#define glUniform1i glad_glUniform1i -typedef void (APIENTRYP PFNGLUNIFORM2IPROC)(GLint location, GLint v0, GLint v1); -GLAPI PFNGLUNIFORM2IPROC glad_glUniform2i; -#define glUniform2i glad_glUniform2i -typedef void (APIENTRYP PFNGLUNIFORM3IPROC)(GLint location, GLint v0, GLint v1, GLint v2); -GLAPI PFNGLUNIFORM3IPROC glad_glUniform3i; -#define glUniform3i glad_glUniform3i -typedef void (APIENTRYP PFNGLUNIFORM4IPROC)(GLint location, GLint v0, GLint v1, GLint v2, GLint v3); -GLAPI PFNGLUNIFORM4IPROC glad_glUniform4i; -#define glUniform4i glad_glUniform4i -typedef void (APIENTRYP PFNGLUNIFORM1FVPROC)(GLint location, GLsizei count, const GLfloat *value); -GLAPI PFNGLUNIFORM1FVPROC glad_glUniform1fv; -#define glUniform1fv glad_glUniform1fv -typedef void (APIENTRYP PFNGLUNIFORM2FVPROC)(GLint location, GLsizei count, const GLfloat *value); -GLAPI PFNGLUNIFORM2FVPROC glad_glUniform2fv; -#define glUniform2fv glad_glUniform2fv -typedef void (APIENTRYP PFNGLUNIFORM3FVPROC)(GLint location, GLsizei count, const GLfloat *value); -GLAPI PFNGLUNIFORM3FVPROC glad_glUniform3fv; -#define glUniform3fv glad_glUniform3fv -typedef void (APIENTRYP PFNGLUNIFORM4FVPROC)(GLint location, GLsizei count, const GLfloat *value); -GLAPI PFNGLUNIFORM4FVPROC glad_glUniform4fv; -#define glUniform4fv glad_glUniform4fv -typedef void (APIENTRYP PFNGLUNIFORM1IVPROC)(GLint location, GLsizei count, const GLint *value); -GLAPI PFNGLUNIFORM1IVPROC glad_glUniform1iv; -#define glUniform1iv glad_glUniform1iv -typedef void (APIENTRYP PFNGLUNIFORM2IVPROC)(GLint location, GLsizei count, const GLint *value); -GLAPI PFNGLUNIFORM2IVPROC glad_glUniform2iv; -#define glUniform2iv glad_glUniform2iv -typedef void (APIENTRYP PFNGLUNIFORM3IVPROC)(GLint location, GLsizei count, const GLint *value); -GLAPI PFNGLUNIFORM3IVPROC glad_glUniform3iv; -#define glUniform3iv glad_glUniform3iv -typedef void (APIENTRYP PFNGLUNIFORM4IVPROC)(GLint location, GLsizei count, const GLint *value); -GLAPI PFNGLUNIFORM4IVPROC glad_glUniform4iv; -#define glUniform4iv glad_glUniform4iv -typedef void (APIENTRYP PFNGLUNIFORMMATRIX2FVPROC)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI PFNGLUNIFORMMATRIX2FVPROC glad_glUniformMatrix2fv; -#define glUniformMatrix2fv glad_glUniformMatrix2fv -typedef void (APIENTRYP PFNGLUNIFORMMATRIX3FVPROC)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI PFNGLUNIFORMMATRIX3FVPROC glad_glUniformMatrix3fv; -#define glUniformMatrix3fv glad_glUniformMatrix3fv -typedef void (APIENTRYP PFNGLUNIFORMMATRIX4FVPROC)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI PFNGLUNIFORMMATRIX4FVPROC glad_glUniformMatrix4fv; -#define glUniformMatrix4fv glad_glUniformMatrix4fv -typedef void (APIENTRYP PFNGLVALIDATEPROGRAMPROC)(GLuint program); -GLAPI PFNGLVALIDATEPROGRAMPROC glad_glValidateProgram; -#define glValidateProgram glad_glValidateProgram -typedef void (APIENTRYP PFNGLVERTEXATTRIB1DPROC)(GLuint index, GLdouble x); -GLAPI PFNGLVERTEXATTRIB1DPROC glad_glVertexAttrib1d; -#define glVertexAttrib1d glad_glVertexAttrib1d -typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVPROC)(GLuint index, const GLdouble *v); -GLAPI PFNGLVERTEXATTRIB1DVPROC glad_glVertexAttrib1dv; -#define glVertexAttrib1dv glad_glVertexAttrib1dv -typedef void (APIENTRYP PFNGLVERTEXATTRIB1FPROC)(GLuint index, GLfloat x); -GLAPI PFNGLVERTEXATTRIB1FPROC glad_glVertexAttrib1f; -#define glVertexAttrib1f glad_glVertexAttrib1f -typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVPROC)(GLuint index, const GLfloat *v); -GLAPI PFNGLVERTEXATTRIB1FVPROC glad_glVertexAttrib1fv; -#define glVertexAttrib1fv glad_glVertexAttrib1fv -typedef void (APIENTRYP PFNGLVERTEXATTRIB1SPROC)(GLuint index, GLshort x); -GLAPI PFNGLVERTEXATTRIB1SPROC glad_glVertexAttrib1s; -#define glVertexAttrib1s glad_glVertexAttrib1s -typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVPROC)(GLuint index, const GLshort *v); -GLAPI PFNGLVERTEXATTRIB1SVPROC glad_glVertexAttrib1sv; -#define glVertexAttrib1sv glad_glVertexAttrib1sv -typedef void (APIENTRYP PFNGLVERTEXATTRIB2DPROC)(GLuint index, GLdouble x, GLdouble y); -GLAPI PFNGLVERTEXATTRIB2DPROC glad_glVertexAttrib2d; -#define glVertexAttrib2d glad_glVertexAttrib2d -typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVPROC)(GLuint index, const GLdouble *v); -GLAPI PFNGLVERTEXATTRIB2DVPROC glad_glVertexAttrib2dv; -#define glVertexAttrib2dv glad_glVertexAttrib2dv -typedef void (APIENTRYP PFNGLVERTEXATTRIB2FPROC)(GLuint index, GLfloat x, GLfloat y); -GLAPI PFNGLVERTEXATTRIB2FPROC glad_glVertexAttrib2f; -#define glVertexAttrib2f glad_glVertexAttrib2f -typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVPROC)(GLuint index, const GLfloat *v); -GLAPI PFNGLVERTEXATTRIB2FVPROC glad_glVertexAttrib2fv; -#define glVertexAttrib2fv glad_glVertexAttrib2fv -typedef void (APIENTRYP PFNGLVERTEXATTRIB2SPROC)(GLuint index, GLshort x, GLshort y); -GLAPI PFNGLVERTEXATTRIB2SPROC glad_glVertexAttrib2s; -#define glVertexAttrib2s glad_glVertexAttrib2s -typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVPROC)(GLuint index, const GLshort *v); -GLAPI PFNGLVERTEXATTRIB2SVPROC glad_glVertexAttrib2sv; -#define glVertexAttrib2sv glad_glVertexAttrib2sv -typedef void (APIENTRYP PFNGLVERTEXATTRIB3DPROC)(GLuint index, GLdouble x, GLdouble y, GLdouble z); -GLAPI PFNGLVERTEXATTRIB3DPROC glad_glVertexAttrib3d; -#define glVertexAttrib3d glad_glVertexAttrib3d -typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVPROC)(GLuint index, const GLdouble *v); -GLAPI PFNGLVERTEXATTRIB3DVPROC glad_glVertexAttrib3dv; -#define glVertexAttrib3dv glad_glVertexAttrib3dv -typedef void (APIENTRYP PFNGLVERTEXATTRIB3FPROC)(GLuint index, GLfloat x, GLfloat y, GLfloat z); -GLAPI PFNGLVERTEXATTRIB3FPROC glad_glVertexAttrib3f; -#define glVertexAttrib3f glad_glVertexAttrib3f -typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVPROC)(GLuint index, const GLfloat *v); -GLAPI PFNGLVERTEXATTRIB3FVPROC glad_glVertexAttrib3fv; -#define glVertexAttrib3fv glad_glVertexAttrib3fv -typedef void (APIENTRYP PFNGLVERTEXATTRIB3SPROC)(GLuint index, GLshort x, GLshort y, GLshort z); -GLAPI PFNGLVERTEXATTRIB3SPROC glad_glVertexAttrib3s; -#define glVertexAttrib3s glad_glVertexAttrib3s -typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVPROC)(GLuint index, const GLshort *v); -GLAPI PFNGLVERTEXATTRIB3SVPROC glad_glVertexAttrib3sv; -#define glVertexAttrib3sv glad_glVertexAttrib3sv -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NBVPROC)(GLuint index, const GLbyte *v); -GLAPI PFNGLVERTEXATTRIB4NBVPROC glad_glVertexAttrib4Nbv; -#define glVertexAttrib4Nbv glad_glVertexAttrib4Nbv -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NIVPROC)(GLuint index, const GLint *v); -GLAPI PFNGLVERTEXATTRIB4NIVPROC glad_glVertexAttrib4Niv; -#define glVertexAttrib4Niv glad_glVertexAttrib4Niv -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NSVPROC)(GLuint index, const GLshort *v); -GLAPI PFNGLVERTEXATTRIB4NSVPROC glad_glVertexAttrib4Nsv; -#define glVertexAttrib4Nsv glad_glVertexAttrib4Nsv -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBPROC)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); -GLAPI PFNGLVERTEXATTRIB4NUBPROC glad_glVertexAttrib4Nub; -#define glVertexAttrib4Nub glad_glVertexAttrib4Nub -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBVPROC)(GLuint index, const GLubyte *v); -GLAPI PFNGLVERTEXATTRIB4NUBVPROC glad_glVertexAttrib4Nubv; -#define glVertexAttrib4Nubv glad_glVertexAttrib4Nubv -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUIVPROC)(GLuint index, const GLuint *v); -GLAPI PFNGLVERTEXATTRIB4NUIVPROC glad_glVertexAttrib4Nuiv; -#define glVertexAttrib4Nuiv glad_glVertexAttrib4Nuiv -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUSVPROC)(GLuint index, const GLushort *v); -GLAPI PFNGLVERTEXATTRIB4NUSVPROC glad_glVertexAttrib4Nusv; -#define glVertexAttrib4Nusv glad_glVertexAttrib4Nusv -typedef void (APIENTRYP PFNGLVERTEXATTRIB4BVPROC)(GLuint index, const GLbyte *v); -GLAPI PFNGLVERTEXATTRIB4BVPROC glad_glVertexAttrib4bv; -#define glVertexAttrib4bv glad_glVertexAttrib4bv -typedef void (APIENTRYP PFNGLVERTEXATTRIB4DPROC)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -GLAPI PFNGLVERTEXATTRIB4DPROC glad_glVertexAttrib4d; -#define glVertexAttrib4d glad_glVertexAttrib4d -typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVPROC)(GLuint index, const GLdouble *v); -GLAPI PFNGLVERTEXATTRIB4DVPROC glad_glVertexAttrib4dv; -#define glVertexAttrib4dv glad_glVertexAttrib4dv -typedef void (APIENTRYP PFNGLVERTEXATTRIB4FPROC)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -GLAPI PFNGLVERTEXATTRIB4FPROC glad_glVertexAttrib4f; -#define glVertexAttrib4f glad_glVertexAttrib4f -typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVPROC)(GLuint index, const GLfloat *v); -GLAPI PFNGLVERTEXATTRIB4FVPROC glad_glVertexAttrib4fv; -#define glVertexAttrib4fv glad_glVertexAttrib4fv -typedef void (APIENTRYP PFNGLVERTEXATTRIB4IVPROC)(GLuint index, const GLint *v); -GLAPI PFNGLVERTEXATTRIB4IVPROC glad_glVertexAttrib4iv; -#define glVertexAttrib4iv glad_glVertexAttrib4iv -typedef void (APIENTRYP PFNGLVERTEXATTRIB4SPROC)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); -GLAPI PFNGLVERTEXATTRIB4SPROC glad_glVertexAttrib4s; -#define glVertexAttrib4s glad_glVertexAttrib4s -typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVPROC)(GLuint index, const GLshort *v); -GLAPI PFNGLVERTEXATTRIB4SVPROC glad_glVertexAttrib4sv; -#define glVertexAttrib4sv glad_glVertexAttrib4sv -typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVPROC)(GLuint index, const GLubyte *v); -GLAPI PFNGLVERTEXATTRIB4UBVPROC glad_glVertexAttrib4ubv; -#define glVertexAttrib4ubv glad_glVertexAttrib4ubv -typedef void (APIENTRYP PFNGLVERTEXATTRIB4UIVPROC)(GLuint index, const GLuint *v); -GLAPI PFNGLVERTEXATTRIB4UIVPROC glad_glVertexAttrib4uiv; -#define glVertexAttrib4uiv glad_glVertexAttrib4uiv -typedef void (APIENTRYP PFNGLVERTEXATTRIB4USVPROC)(GLuint index, const GLushort *v); -GLAPI PFNGLVERTEXATTRIB4USVPROC glad_glVertexAttrib4usv; -#define glVertexAttrib4usv glad_glVertexAttrib4usv -typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERPROC)(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void *pointer); -GLAPI PFNGLVERTEXATTRIBPOINTERPROC glad_glVertexAttribPointer; -#define glVertexAttribPointer glad_glVertexAttribPointer -#endif -#ifndef GL_VERSION_2_1 -#define GL_VERSION_2_1 1 -GLAPI int GLAD_GL_VERSION_2_1; -typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X3FVPROC)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI PFNGLUNIFORMMATRIX2X3FVPROC glad_glUniformMatrix2x3fv; -#define glUniformMatrix2x3fv glad_glUniformMatrix2x3fv -typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X2FVPROC)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI PFNGLUNIFORMMATRIX3X2FVPROC glad_glUniformMatrix3x2fv; -#define glUniformMatrix3x2fv glad_glUniformMatrix3x2fv -typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X4FVPROC)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI PFNGLUNIFORMMATRIX2X4FVPROC glad_glUniformMatrix2x4fv; -#define glUniformMatrix2x4fv glad_glUniformMatrix2x4fv -typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X2FVPROC)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI PFNGLUNIFORMMATRIX4X2FVPROC glad_glUniformMatrix4x2fv; -#define glUniformMatrix4x2fv glad_glUniformMatrix4x2fv -typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X4FVPROC)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI PFNGLUNIFORMMATRIX3X4FVPROC glad_glUniformMatrix3x4fv; -#define glUniformMatrix3x4fv glad_glUniformMatrix3x4fv -typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X3FVPROC)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI PFNGLUNIFORMMATRIX4X3FVPROC glad_glUniformMatrix4x3fv; -#define glUniformMatrix4x3fv glad_glUniformMatrix4x3fv -#endif -#ifndef GL_VERSION_3_0 -#define GL_VERSION_3_0 1 -GLAPI int GLAD_GL_VERSION_3_0; -typedef void (APIENTRYP PFNGLCOLORMASKIPROC)(GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a); -GLAPI PFNGLCOLORMASKIPROC glad_glColorMaski; -#define glColorMaski glad_glColorMaski -typedef void (APIENTRYP PFNGLGETBOOLEANI_VPROC)(GLenum target, GLuint index, GLboolean *data); -GLAPI PFNGLGETBOOLEANI_VPROC glad_glGetBooleani_v; -#define glGetBooleani_v glad_glGetBooleani_v -typedef void (APIENTRYP PFNGLGETINTEGERI_VPROC)(GLenum target, GLuint index, GLint *data); -GLAPI PFNGLGETINTEGERI_VPROC glad_glGetIntegeri_v; -#define glGetIntegeri_v glad_glGetIntegeri_v -typedef void (APIENTRYP PFNGLENABLEIPROC)(GLenum target, GLuint index); -GLAPI PFNGLENABLEIPROC glad_glEnablei; -#define glEnablei glad_glEnablei -typedef void (APIENTRYP PFNGLDISABLEIPROC)(GLenum target, GLuint index); -GLAPI PFNGLDISABLEIPROC glad_glDisablei; -#define glDisablei glad_glDisablei -typedef GLboolean (APIENTRYP PFNGLISENABLEDIPROC)(GLenum target, GLuint index); -GLAPI PFNGLISENABLEDIPROC glad_glIsEnabledi; -#define glIsEnabledi glad_glIsEnabledi -typedef void (APIENTRYP PFNGLBEGINTRANSFORMFEEDBACKPROC)(GLenum primitiveMode); -GLAPI PFNGLBEGINTRANSFORMFEEDBACKPROC glad_glBeginTransformFeedback; -#define glBeginTransformFeedback glad_glBeginTransformFeedback -typedef void (APIENTRYP PFNGLENDTRANSFORMFEEDBACKPROC)(void); -GLAPI PFNGLENDTRANSFORMFEEDBACKPROC glad_glEndTransformFeedback; -#define glEndTransformFeedback glad_glEndTransformFeedback -typedef void (APIENTRYP PFNGLBINDBUFFERRANGEPROC)(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size); -GLAPI PFNGLBINDBUFFERRANGEPROC glad_glBindBufferRange; -#define glBindBufferRange glad_glBindBufferRange -typedef void (APIENTRYP PFNGLBINDBUFFERBASEPROC)(GLenum target, GLuint index, GLuint buffer); -GLAPI PFNGLBINDBUFFERBASEPROC glad_glBindBufferBase; -#define glBindBufferBase glad_glBindBufferBase -typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKVARYINGSPROC)(GLuint program, GLsizei count, const GLchar *const*varyings, GLenum bufferMode); -GLAPI PFNGLTRANSFORMFEEDBACKVARYINGSPROC glad_glTransformFeedbackVaryings; -#define glTransformFeedbackVaryings glad_glTransformFeedbackVaryings -typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKVARYINGPROC)(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name); -GLAPI PFNGLGETTRANSFORMFEEDBACKVARYINGPROC glad_glGetTransformFeedbackVarying; -#define glGetTransformFeedbackVarying glad_glGetTransformFeedbackVarying -typedef void (APIENTRYP PFNGLCLAMPCOLORPROC)(GLenum target, GLenum clamp); -GLAPI PFNGLCLAMPCOLORPROC glad_glClampColor; -#define glClampColor glad_glClampColor -typedef void (APIENTRYP PFNGLBEGINCONDITIONALRENDERPROC)(GLuint id, GLenum mode); -GLAPI PFNGLBEGINCONDITIONALRENDERPROC glad_glBeginConditionalRender; -#define glBeginConditionalRender glad_glBeginConditionalRender -typedef void (APIENTRYP PFNGLENDCONDITIONALRENDERPROC)(void); -GLAPI PFNGLENDCONDITIONALRENDERPROC glad_glEndConditionalRender; -#define glEndConditionalRender glad_glEndConditionalRender -typedef void (APIENTRYP PFNGLVERTEXATTRIBIPOINTERPROC)(GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer); -GLAPI PFNGLVERTEXATTRIBIPOINTERPROC glad_glVertexAttribIPointer; -#define glVertexAttribIPointer glad_glVertexAttribIPointer -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIIVPROC)(GLuint index, GLenum pname, GLint *params); -GLAPI PFNGLGETVERTEXATTRIBIIVPROC glad_glGetVertexAttribIiv; -#define glGetVertexAttribIiv glad_glGetVertexAttribIiv -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIUIVPROC)(GLuint index, GLenum pname, GLuint *params); -GLAPI PFNGLGETVERTEXATTRIBIUIVPROC glad_glGetVertexAttribIuiv; -#define glGetVertexAttribIuiv glad_glGetVertexAttribIuiv -typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IPROC)(GLuint index, GLint x); -GLAPI PFNGLVERTEXATTRIBI1IPROC glad_glVertexAttribI1i; -#define glVertexAttribI1i glad_glVertexAttribI1i -typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IPROC)(GLuint index, GLint x, GLint y); -GLAPI PFNGLVERTEXATTRIBI2IPROC glad_glVertexAttribI2i; -#define glVertexAttribI2i glad_glVertexAttribI2i -typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IPROC)(GLuint index, GLint x, GLint y, GLint z); -GLAPI PFNGLVERTEXATTRIBI3IPROC glad_glVertexAttribI3i; -#define glVertexAttribI3i glad_glVertexAttribI3i -typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IPROC)(GLuint index, GLint x, GLint y, GLint z, GLint w); -GLAPI PFNGLVERTEXATTRIBI4IPROC glad_glVertexAttribI4i; -#define glVertexAttribI4i glad_glVertexAttribI4i -typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIPROC)(GLuint index, GLuint x); -GLAPI PFNGLVERTEXATTRIBI1UIPROC glad_glVertexAttribI1ui; -#define glVertexAttribI1ui glad_glVertexAttribI1ui -typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIPROC)(GLuint index, GLuint x, GLuint y); -GLAPI PFNGLVERTEXATTRIBI2UIPROC glad_glVertexAttribI2ui; -#define glVertexAttribI2ui glad_glVertexAttribI2ui -typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIPROC)(GLuint index, GLuint x, GLuint y, GLuint z); -GLAPI PFNGLVERTEXATTRIBI3UIPROC glad_glVertexAttribI3ui; -#define glVertexAttribI3ui glad_glVertexAttribI3ui -typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIPROC)(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); -GLAPI PFNGLVERTEXATTRIBI4UIPROC glad_glVertexAttribI4ui; -#define glVertexAttribI4ui glad_glVertexAttribI4ui -typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IVPROC)(GLuint index, const GLint *v); -GLAPI PFNGLVERTEXATTRIBI1IVPROC glad_glVertexAttribI1iv; -#define glVertexAttribI1iv glad_glVertexAttribI1iv -typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IVPROC)(GLuint index, const GLint *v); -GLAPI PFNGLVERTEXATTRIBI2IVPROC glad_glVertexAttribI2iv; -#define glVertexAttribI2iv glad_glVertexAttribI2iv -typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IVPROC)(GLuint index, const GLint *v); -GLAPI PFNGLVERTEXATTRIBI3IVPROC glad_glVertexAttribI3iv; -#define glVertexAttribI3iv glad_glVertexAttribI3iv -typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IVPROC)(GLuint index, const GLint *v); -GLAPI PFNGLVERTEXATTRIBI4IVPROC glad_glVertexAttribI4iv; -#define glVertexAttribI4iv glad_glVertexAttribI4iv -typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIVPROC)(GLuint index, const GLuint *v); -GLAPI PFNGLVERTEXATTRIBI1UIVPROC glad_glVertexAttribI1uiv; -#define glVertexAttribI1uiv glad_glVertexAttribI1uiv -typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIVPROC)(GLuint index, const GLuint *v); -GLAPI PFNGLVERTEXATTRIBI2UIVPROC glad_glVertexAttribI2uiv; -#define glVertexAttribI2uiv glad_glVertexAttribI2uiv -typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIVPROC)(GLuint index, const GLuint *v); -GLAPI PFNGLVERTEXATTRIBI3UIVPROC glad_glVertexAttribI3uiv; -#define glVertexAttribI3uiv glad_glVertexAttribI3uiv -typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIVPROC)(GLuint index, const GLuint *v); -GLAPI PFNGLVERTEXATTRIBI4UIVPROC glad_glVertexAttribI4uiv; -#define glVertexAttribI4uiv glad_glVertexAttribI4uiv -typedef void (APIENTRYP PFNGLVERTEXATTRIBI4BVPROC)(GLuint index, const GLbyte *v); -GLAPI PFNGLVERTEXATTRIBI4BVPROC glad_glVertexAttribI4bv; -#define glVertexAttribI4bv glad_glVertexAttribI4bv -typedef void (APIENTRYP PFNGLVERTEXATTRIBI4SVPROC)(GLuint index, const GLshort *v); -GLAPI PFNGLVERTEXATTRIBI4SVPROC glad_glVertexAttribI4sv; -#define glVertexAttribI4sv glad_glVertexAttribI4sv -typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UBVPROC)(GLuint index, const GLubyte *v); -GLAPI PFNGLVERTEXATTRIBI4UBVPROC glad_glVertexAttribI4ubv; -#define glVertexAttribI4ubv glad_glVertexAttribI4ubv -typedef void (APIENTRYP PFNGLVERTEXATTRIBI4USVPROC)(GLuint index, const GLushort *v); -GLAPI PFNGLVERTEXATTRIBI4USVPROC glad_glVertexAttribI4usv; -#define glVertexAttribI4usv glad_glVertexAttribI4usv -typedef void (APIENTRYP PFNGLGETUNIFORMUIVPROC)(GLuint program, GLint location, GLuint *params); -GLAPI PFNGLGETUNIFORMUIVPROC glad_glGetUniformuiv; -#define glGetUniformuiv glad_glGetUniformuiv -typedef void (APIENTRYP PFNGLBINDFRAGDATALOCATIONPROC)(GLuint program, GLuint color, const GLchar *name); -GLAPI PFNGLBINDFRAGDATALOCATIONPROC glad_glBindFragDataLocation; -#define glBindFragDataLocation glad_glBindFragDataLocation -typedef GLint (APIENTRYP PFNGLGETFRAGDATALOCATIONPROC)(GLuint program, const GLchar *name); -GLAPI PFNGLGETFRAGDATALOCATIONPROC glad_glGetFragDataLocation; -#define glGetFragDataLocation glad_glGetFragDataLocation -typedef void (APIENTRYP PFNGLUNIFORM1UIPROC)(GLint location, GLuint v0); -GLAPI PFNGLUNIFORM1UIPROC glad_glUniform1ui; -#define glUniform1ui glad_glUniform1ui -typedef void (APIENTRYP PFNGLUNIFORM2UIPROC)(GLint location, GLuint v0, GLuint v1); -GLAPI PFNGLUNIFORM2UIPROC glad_glUniform2ui; -#define glUniform2ui glad_glUniform2ui -typedef void (APIENTRYP PFNGLUNIFORM3UIPROC)(GLint location, GLuint v0, GLuint v1, GLuint v2); -GLAPI PFNGLUNIFORM3UIPROC glad_glUniform3ui; -#define glUniform3ui glad_glUniform3ui -typedef void (APIENTRYP PFNGLUNIFORM4UIPROC)(GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3); -GLAPI PFNGLUNIFORM4UIPROC glad_glUniform4ui; -#define glUniform4ui glad_glUniform4ui -typedef void (APIENTRYP PFNGLUNIFORM1UIVPROC)(GLint location, GLsizei count, const GLuint *value); -GLAPI PFNGLUNIFORM1UIVPROC glad_glUniform1uiv; -#define glUniform1uiv glad_glUniform1uiv -typedef void (APIENTRYP PFNGLUNIFORM2UIVPROC)(GLint location, GLsizei count, const GLuint *value); -GLAPI PFNGLUNIFORM2UIVPROC glad_glUniform2uiv; -#define glUniform2uiv glad_glUniform2uiv -typedef void (APIENTRYP PFNGLUNIFORM3UIVPROC)(GLint location, GLsizei count, const GLuint *value); -GLAPI PFNGLUNIFORM3UIVPROC glad_glUniform3uiv; -#define glUniform3uiv glad_glUniform3uiv -typedef void (APIENTRYP PFNGLUNIFORM4UIVPROC)(GLint location, GLsizei count, const GLuint *value); -GLAPI PFNGLUNIFORM4UIVPROC glad_glUniform4uiv; -#define glUniform4uiv glad_glUniform4uiv -typedef void (APIENTRYP PFNGLTEXPARAMETERIIVPROC)(GLenum target, GLenum pname, const GLint *params); -GLAPI PFNGLTEXPARAMETERIIVPROC glad_glTexParameterIiv; -#define glTexParameterIiv glad_glTexParameterIiv -typedef void (APIENTRYP PFNGLTEXPARAMETERIUIVPROC)(GLenum target, GLenum pname, const GLuint *params); -GLAPI PFNGLTEXPARAMETERIUIVPROC glad_glTexParameterIuiv; -#define glTexParameterIuiv glad_glTexParameterIuiv -typedef void (APIENTRYP PFNGLGETTEXPARAMETERIIVPROC)(GLenum target, GLenum pname, GLint *params); -GLAPI PFNGLGETTEXPARAMETERIIVPROC glad_glGetTexParameterIiv; -#define glGetTexParameterIiv glad_glGetTexParameterIiv -typedef void (APIENTRYP PFNGLGETTEXPARAMETERIUIVPROC)(GLenum target, GLenum pname, GLuint *params); -GLAPI PFNGLGETTEXPARAMETERIUIVPROC glad_glGetTexParameterIuiv; -#define glGetTexParameterIuiv glad_glGetTexParameterIuiv -typedef void (APIENTRYP PFNGLCLEARBUFFERIVPROC)(GLenum buffer, GLint drawbuffer, const GLint *value); -GLAPI PFNGLCLEARBUFFERIVPROC glad_glClearBufferiv; -#define glClearBufferiv glad_glClearBufferiv -typedef void (APIENTRYP PFNGLCLEARBUFFERUIVPROC)(GLenum buffer, GLint drawbuffer, const GLuint *value); -GLAPI PFNGLCLEARBUFFERUIVPROC glad_glClearBufferuiv; -#define glClearBufferuiv glad_glClearBufferuiv -typedef void (APIENTRYP PFNGLCLEARBUFFERFVPROC)(GLenum buffer, GLint drawbuffer, const GLfloat *value); -GLAPI PFNGLCLEARBUFFERFVPROC glad_glClearBufferfv; -#define glClearBufferfv glad_glClearBufferfv -typedef void (APIENTRYP PFNGLCLEARBUFFERFIPROC)(GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil); -GLAPI PFNGLCLEARBUFFERFIPROC glad_glClearBufferfi; -#define glClearBufferfi glad_glClearBufferfi -typedef const GLubyte * (APIENTRYP PFNGLGETSTRINGIPROC)(GLenum name, GLuint index); -GLAPI PFNGLGETSTRINGIPROC glad_glGetStringi; -#define glGetStringi glad_glGetStringi -typedef GLboolean (APIENTRYP PFNGLISRENDERBUFFERPROC)(GLuint renderbuffer); -GLAPI PFNGLISRENDERBUFFERPROC glad_glIsRenderbuffer; -#define glIsRenderbuffer glad_glIsRenderbuffer -typedef void (APIENTRYP PFNGLBINDRENDERBUFFERPROC)(GLenum target, GLuint renderbuffer); -GLAPI PFNGLBINDRENDERBUFFERPROC glad_glBindRenderbuffer; -#define glBindRenderbuffer glad_glBindRenderbuffer -typedef void (APIENTRYP PFNGLDELETERENDERBUFFERSPROC)(GLsizei n, const GLuint *renderbuffers); -GLAPI PFNGLDELETERENDERBUFFERSPROC glad_glDeleteRenderbuffers; -#define glDeleteRenderbuffers glad_glDeleteRenderbuffers -typedef void (APIENTRYP PFNGLGENRENDERBUFFERSPROC)(GLsizei n, GLuint *renderbuffers); -GLAPI PFNGLGENRENDERBUFFERSPROC glad_glGenRenderbuffers; -#define glGenRenderbuffers glad_glGenRenderbuffers -typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEPROC)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height); -GLAPI PFNGLRENDERBUFFERSTORAGEPROC glad_glRenderbufferStorage; -#define glRenderbufferStorage glad_glRenderbufferStorage -typedef void (APIENTRYP PFNGLGETRENDERBUFFERPARAMETERIVPROC)(GLenum target, GLenum pname, GLint *params); -GLAPI PFNGLGETRENDERBUFFERPARAMETERIVPROC glad_glGetRenderbufferParameteriv; -#define glGetRenderbufferParameteriv glad_glGetRenderbufferParameteriv -typedef GLboolean (APIENTRYP PFNGLISFRAMEBUFFERPROC)(GLuint framebuffer); -GLAPI PFNGLISFRAMEBUFFERPROC glad_glIsFramebuffer; -#define glIsFramebuffer glad_glIsFramebuffer -typedef void (APIENTRYP PFNGLBINDFRAMEBUFFERPROC)(GLenum target, GLuint framebuffer); -GLAPI PFNGLBINDFRAMEBUFFERPROC glad_glBindFramebuffer; -#define glBindFramebuffer glad_glBindFramebuffer -typedef void (APIENTRYP PFNGLDELETEFRAMEBUFFERSPROC)(GLsizei n, const GLuint *framebuffers); -GLAPI PFNGLDELETEFRAMEBUFFERSPROC glad_glDeleteFramebuffers; -#define glDeleteFramebuffers glad_glDeleteFramebuffers -typedef void (APIENTRYP PFNGLGENFRAMEBUFFERSPROC)(GLsizei n, GLuint *framebuffers); -GLAPI PFNGLGENFRAMEBUFFERSPROC glad_glGenFramebuffers; -#define glGenFramebuffers glad_glGenFramebuffers -typedef GLenum (APIENTRYP PFNGLCHECKFRAMEBUFFERSTATUSPROC)(GLenum target); -GLAPI PFNGLCHECKFRAMEBUFFERSTATUSPROC glad_glCheckFramebufferStatus; -#define glCheckFramebufferStatus glad_glCheckFramebufferStatus -typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE1DPROC)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); -GLAPI PFNGLFRAMEBUFFERTEXTURE1DPROC glad_glFramebufferTexture1D; -#define glFramebufferTexture1D glad_glFramebufferTexture1D -typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DPROC)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); -GLAPI PFNGLFRAMEBUFFERTEXTURE2DPROC glad_glFramebufferTexture2D; -#define glFramebufferTexture2D glad_glFramebufferTexture2D -typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE3DPROC)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); -GLAPI PFNGLFRAMEBUFFERTEXTURE3DPROC glad_glFramebufferTexture3D; -#define glFramebufferTexture3D glad_glFramebufferTexture3D -typedef void (APIENTRYP PFNGLFRAMEBUFFERRENDERBUFFERPROC)(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); -GLAPI PFNGLFRAMEBUFFERRENDERBUFFERPROC glad_glFramebufferRenderbuffer; -#define glFramebufferRenderbuffer glad_glFramebufferRenderbuffer -typedef void (APIENTRYP PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC)(GLenum target, GLenum attachment, GLenum pname, GLint *params); -GLAPI PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC glad_glGetFramebufferAttachmentParameteriv; -#define glGetFramebufferAttachmentParameteriv glad_glGetFramebufferAttachmentParameteriv -typedef void (APIENTRYP PFNGLGENERATEMIPMAPPROC)(GLenum target); -GLAPI PFNGLGENERATEMIPMAPPROC glad_glGenerateMipmap; -#define glGenerateMipmap glad_glGenerateMipmap -typedef void (APIENTRYP PFNGLBLITFRAMEBUFFERPROC)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); -GLAPI PFNGLBLITFRAMEBUFFERPROC glad_glBlitFramebuffer; -#define glBlitFramebuffer glad_glBlitFramebuffer -typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC)(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); -GLAPI PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC glad_glRenderbufferStorageMultisample; -#define glRenderbufferStorageMultisample glad_glRenderbufferStorageMultisample -typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYERPROC)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); -GLAPI PFNGLFRAMEBUFFERTEXTURELAYERPROC glad_glFramebufferTextureLayer; -#define glFramebufferTextureLayer glad_glFramebufferTextureLayer -typedef void * (APIENTRYP PFNGLMAPBUFFERRANGEPROC)(GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access); -GLAPI PFNGLMAPBUFFERRANGEPROC glad_glMapBufferRange; -#define glMapBufferRange glad_glMapBufferRange -typedef void (APIENTRYP PFNGLFLUSHMAPPEDBUFFERRANGEPROC)(GLenum target, GLintptr offset, GLsizeiptr length); -GLAPI PFNGLFLUSHMAPPEDBUFFERRANGEPROC glad_glFlushMappedBufferRange; -#define glFlushMappedBufferRange glad_glFlushMappedBufferRange -typedef void (APIENTRYP PFNGLBINDVERTEXARRAYPROC)(GLuint array); -GLAPI PFNGLBINDVERTEXARRAYPROC glad_glBindVertexArray; -#define glBindVertexArray glad_glBindVertexArray -typedef void (APIENTRYP PFNGLDELETEVERTEXARRAYSPROC)(GLsizei n, const GLuint *arrays); -GLAPI PFNGLDELETEVERTEXARRAYSPROC glad_glDeleteVertexArrays; -#define glDeleteVertexArrays glad_glDeleteVertexArrays -typedef void (APIENTRYP PFNGLGENVERTEXARRAYSPROC)(GLsizei n, GLuint *arrays); -GLAPI PFNGLGENVERTEXARRAYSPROC glad_glGenVertexArrays; -#define glGenVertexArrays glad_glGenVertexArrays -typedef GLboolean (APIENTRYP PFNGLISVERTEXARRAYPROC)(GLuint array); -GLAPI PFNGLISVERTEXARRAYPROC glad_glIsVertexArray; -#define glIsVertexArray glad_glIsVertexArray -#endif -#ifndef GL_VERSION_3_1 -#define GL_VERSION_3_1 1 -GLAPI int GLAD_GL_VERSION_3_1; -typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDPROC)(GLenum mode, GLint first, GLsizei count, GLsizei instancecount); -GLAPI PFNGLDRAWARRAYSINSTANCEDPROC glad_glDrawArraysInstanced; -#define glDrawArraysInstanced glad_glDrawArraysInstanced -typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDPROC)(GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount); -GLAPI PFNGLDRAWELEMENTSINSTANCEDPROC glad_glDrawElementsInstanced; -#define glDrawElementsInstanced glad_glDrawElementsInstanced -typedef void (APIENTRYP PFNGLTEXBUFFERPROC)(GLenum target, GLenum internalformat, GLuint buffer); -GLAPI PFNGLTEXBUFFERPROC glad_glTexBuffer; -#define glTexBuffer glad_glTexBuffer -typedef void (APIENTRYP PFNGLPRIMITIVERESTARTINDEXPROC)(GLuint index); -GLAPI PFNGLPRIMITIVERESTARTINDEXPROC glad_glPrimitiveRestartIndex; -#define glPrimitiveRestartIndex glad_glPrimitiveRestartIndex -typedef void (APIENTRYP PFNGLCOPYBUFFERSUBDATAPROC)(GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size); -GLAPI PFNGLCOPYBUFFERSUBDATAPROC glad_glCopyBufferSubData; -#define glCopyBufferSubData glad_glCopyBufferSubData -typedef void (APIENTRYP PFNGLGETUNIFORMINDICESPROC)(GLuint program, GLsizei uniformCount, const GLchar *const*uniformNames, GLuint *uniformIndices); -GLAPI PFNGLGETUNIFORMINDICESPROC glad_glGetUniformIndices; -#define glGetUniformIndices glad_glGetUniformIndices -typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMSIVPROC)(GLuint program, GLsizei uniformCount, const GLuint *uniformIndices, GLenum pname, GLint *params); -GLAPI PFNGLGETACTIVEUNIFORMSIVPROC glad_glGetActiveUniformsiv; -#define glGetActiveUniformsiv glad_glGetActiveUniformsiv -typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMNAMEPROC)(GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformName); -GLAPI PFNGLGETACTIVEUNIFORMNAMEPROC glad_glGetActiveUniformName; -#define glGetActiveUniformName glad_glGetActiveUniformName -typedef GLuint (APIENTRYP PFNGLGETUNIFORMBLOCKINDEXPROC)(GLuint program, const GLchar *uniformBlockName); -GLAPI PFNGLGETUNIFORMBLOCKINDEXPROC glad_glGetUniformBlockIndex; -#define glGetUniformBlockIndex glad_glGetUniformBlockIndex -typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMBLOCKIVPROC)(GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint *params); -GLAPI PFNGLGETACTIVEUNIFORMBLOCKIVPROC glad_glGetActiveUniformBlockiv; -#define glGetActiveUniformBlockiv glad_glGetActiveUniformBlockiv -typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMBLOCKNAMEPROC)(GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformBlockName); -GLAPI PFNGLGETACTIVEUNIFORMBLOCKNAMEPROC glad_glGetActiveUniformBlockName; -#define glGetActiveUniformBlockName glad_glGetActiveUniformBlockName -typedef void (APIENTRYP PFNGLUNIFORMBLOCKBINDINGPROC)(GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding); -GLAPI PFNGLUNIFORMBLOCKBINDINGPROC glad_glUniformBlockBinding; -#define glUniformBlockBinding glad_glUniformBlockBinding -#endif -#ifndef GL_VERSION_3_2 -#define GL_VERSION_3_2 1 -GLAPI int GLAD_GL_VERSION_3_2; -typedef void (APIENTRYP PFNGLDRAWELEMENTSBASEVERTEXPROC)(GLenum mode, GLsizei count, GLenum type, const void *indices, GLint basevertex); -GLAPI PFNGLDRAWELEMENTSBASEVERTEXPROC glad_glDrawElementsBaseVertex; -#define glDrawElementsBaseVertex glad_glDrawElementsBaseVertex -typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSBASEVERTEXPROC)(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices, GLint basevertex); -GLAPI PFNGLDRAWRANGEELEMENTSBASEVERTEXPROC glad_glDrawRangeElementsBaseVertex; -#define glDrawRangeElementsBaseVertex glad_glDrawRangeElementsBaseVertex -typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC)(GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLint basevertex); -GLAPI PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC glad_glDrawElementsInstancedBaseVertex; -#define glDrawElementsInstancedBaseVertex glad_glDrawElementsInstancedBaseVertex -typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSBASEVERTEXPROC)(GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei drawcount, const GLint *basevertex); -GLAPI PFNGLMULTIDRAWELEMENTSBASEVERTEXPROC glad_glMultiDrawElementsBaseVertex; -#define glMultiDrawElementsBaseVertex glad_glMultiDrawElementsBaseVertex -typedef void (APIENTRYP PFNGLPROVOKINGVERTEXPROC)(GLenum mode); -GLAPI PFNGLPROVOKINGVERTEXPROC glad_glProvokingVertex; -#define glProvokingVertex glad_glProvokingVertex -typedef GLsync (APIENTRYP PFNGLFENCESYNCPROC)(GLenum condition, GLbitfield flags); -GLAPI PFNGLFENCESYNCPROC glad_glFenceSync; -#define glFenceSync glad_glFenceSync -typedef GLboolean (APIENTRYP PFNGLISSYNCPROC)(GLsync sync); -GLAPI PFNGLISSYNCPROC glad_glIsSync; -#define glIsSync glad_glIsSync -typedef void (APIENTRYP PFNGLDELETESYNCPROC)(GLsync sync); -GLAPI PFNGLDELETESYNCPROC glad_glDeleteSync; -#define glDeleteSync glad_glDeleteSync -typedef GLenum (APIENTRYP PFNGLCLIENTWAITSYNCPROC)(GLsync sync, GLbitfield flags, GLuint64 timeout); -GLAPI PFNGLCLIENTWAITSYNCPROC glad_glClientWaitSync; -#define glClientWaitSync glad_glClientWaitSync -typedef void (APIENTRYP PFNGLWAITSYNCPROC)(GLsync sync, GLbitfield flags, GLuint64 timeout); -GLAPI PFNGLWAITSYNCPROC glad_glWaitSync; -#define glWaitSync glad_glWaitSync -typedef void (APIENTRYP PFNGLGETINTEGER64VPROC)(GLenum pname, GLint64 *data); -GLAPI PFNGLGETINTEGER64VPROC glad_glGetInteger64v; -#define glGetInteger64v glad_glGetInteger64v -typedef void (APIENTRYP PFNGLGETSYNCIVPROC)(GLsync sync, GLenum pname, GLsizei count, GLsizei *length, GLint *values); -GLAPI PFNGLGETSYNCIVPROC glad_glGetSynciv; -#define glGetSynciv glad_glGetSynciv -typedef void (APIENTRYP PFNGLGETINTEGER64I_VPROC)(GLenum target, GLuint index, GLint64 *data); -GLAPI PFNGLGETINTEGER64I_VPROC glad_glGetInteger64i_v; -#define glGetInteger64i_v glad_glGetInteger64i_v -typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERI64VPROC)(GLenum target, GLenum pname, GLint64 *params); -GLAPI PFNGLGETBUFFERPARAMETERI64VPROC glad_glGetBufferParameteri64v; -#define glGetBufferParameteri64v glad_glGetBufferParameteri64v -typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREPROC)(GLenum target, GLenum attachment, GLuint texture, GLint level); -GLAPI PFNGLFRAMEBUFFERTEXTUREPROC glad_glFramebufferTexture; -#define glFramebufferTexture glad_glFramebufferTexture -typedef void (APIENTRYP PFNGLTEXIMAGE2DMULTISAMPLEPROC)(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations); -GLAPI PFNGLTEXIMAGE2DMULTISAMPLEPROC glad_glTexImage2DMultisample; -#define glTexImage2DMultisample glad_glTexImage2DMultisample -typedef void (APIENTRYP PFNGLTEXIMAGE3DMULTISAMPLEPROC)(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations); -GLAPI PFNGLTEXIMAGE3DMULTISAMPLEPROC glad_glTexImage3DMultisample; -#define glTexImage3DMultisample glad_glTexImage3DMultisample -typedef void (APIENTRYP PFNGLGETMULTISAMPLEFVPROC)(GLenum pname, GLuint index, GLfloat *val); -GLAPI PFNGLGETMULTISAMPLEFVPROC glad_glGetMultisamplefv; -#define glGetMultisamplefv glad_glGetMultisamplefv -typedef void (APIENTRYP PFNGLSAMPLEMASKIPROC)(GLuint maskNumber, GLbitfield mask); -GLAPI PFNGLSAMPLEMASKIPROC glad_glSampleMaski; -#define glSampleMaski glad_glSampleMaski -#endif -#ifndef GL_VERSION_3_3 -#define GL_VERSION_3_3 1 -GLAPI int GLAD_GL_VERSION_3_3; -typedef void (APIENTRYP PFNGLBINDFRAGDATALOCATIONINDEXEDPROC)(GLuint program, GLuint colorNumber, GLuint index, const GLchar *name); -GLAPI PFNGLBINDFRAGDATALOCATIONINDEXEDPROC glad_glBindFragDataLocationIndexed; -#define glBindFragDataLocationIndexed glad_glBindFragDataLocationIndexed -typedef GLint (APIENTRYP PFNGLGETFRAGDATAINDEXPROC)(GLuint program, const GLchar *name); -GLAPI PFNGLGETFRAGDATAINDEXPROC glad_glGetFragDataIndex; -#define glGetFragDataIndex glad_glGetFragDataIndex -typedef void (APIENTRYP PFNGLGENSAMPLERSPROC)(GLsizei count, GLuint *samplers); -GLAPI PFNGLGENSAMPLERSPROC glad_glGenSamplers; -#define glGenSamplers glad_glGenSamplers -typedef void (APIENTRYP PFNGLDELETESAMPLERSPROC)(GLsizei count, const GLuint *samplers); -GLAPI PFNGLDELETESAMPLERSPROC glad_glDeleteSamplers; -#define glDeleteSamplers glad_glDeleteSamplers -typedef GLboolean (APIENTRYP PFNGLISSAMPLERPROC)(GLuint sampler); -GLAPI PFNGLISSAMPLERPROC glad_glIsSampler; -#define glIsSampler glad_glIsSampler -typedef void (APIENTRYP PFNGLBINDSAMPLERPROC)(GLuint unit, GLuint sampler); -GLAPI PFNGLBINDSAMPLERPROC glad_glBindSampler; -#define glBindSampler glad_glBindSampler -typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIPROC)(GLuint sampler, GLenum pname, GLint param); -GLAPI PFNGLSAMPLERPARAMETERIPROC glad_glSamplerParameteri; -#define glSamplerParameteri glad_glSamplerParameteri -typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIVPROC)(GLuint sampler, GLenum pname, const GLint *param); -GLAPI PFNGLSAMPLERPARAMETERIVPROC glad_glSamplerParameteriv; -#define glSamplerParameteriv glad_glSamplerParameteriv -typedef void (APIENTRYP PFNGLSAMPLERPARAMETERFPROC)(GLuint sampler, GLenum pname, GLfloat param); -GLAPI PFNGLSAMPLERPARAMETERFPROC glad_glSamplerParameterf; -#define glSamplerParameterf glad_glSamplerParameterf -typedef void (APIENTRYP PFNGLSAMPLERPARAMETERFVPROC)(GLuint sampler, GLenum pname, const GLfloat *param); -GLAPI PFNGLSAMPLERPARAMETERFVPROC glad_glSamplerParameterfv; -#define glSamplerParameterfv glad_glSamplerParameterfv -typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIIVPROC)(GLuint sampler, GLenum pname, const GLint *param); -GLAPI PFNGLSAMPLERPARAMETERIIVPROC glad_glSamplerParameterIiv; -#define glSamplerParameterIiv glad_glSamplerParameterIiv -typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIUIVPROC)(GLuint sampler, GLenum pname, const GLuint *param); -GLAPI PFNGLSAMPLERPARAMETERIUIVPROC glad_glSamplerParameterIuiv; -#define glSamplerParameterIuiv glad_glSamplerParameterIuiv -typedef void (APIENTRYP PFNGLGETSAMPLERPARAMETERIVPROC)(GLuint sampler, GLenum pname, GLint *params); -GLAPI PFNGLGETSAMPLERPARAMETERIVPROC glad_glGetSamplerParameteriv; -#define glGetSamplerParameteriv glad_glGetSamplerParameteriv -typedef void (APIENTRYP PFNGLGETSAMPLERPARAMETERIIVPROC)(GLuint sampler, GLenum pname, GLint *params); -GLAPI PFNGLGETSAMPLERPARAMETERIIVPROC glad_glGetSamplerParameterIiv; -#define glGetSamplerParameterIiv glad_glGetSamplerParameterIiv -typedef void (APIENTRYP PFNGLGETSAMPLERPARAMETERFVPROC)(GLuint sampler, GLenum pname, GLfloat *params); -GLAPI PFNGLGETSAMPLERPARAMETERFVPROC glad_glGetSamplerParameterfv; -#define glGetSamplerParameterfv glad_glGetSamplerParameterfv -typedef void (APIENTRYP PFNGLGETSAMPLERPARAMETERIUIVPROC)(GLuint sampler, GLenum pname, GLuint *params); -GLAPI PFNGLGETSAMPLERPARAMETERIUIVPROC glad_glGetSamplerParameterIuiv; -#define glGetSamplerParameterIuiv glad_glGetSamplerParameterIuiv -typedef void (APIENTRYP PFNGLQUERYCOUNTERPROC)(GLuint id, GLenum target); -GLAPI PFNGLQUERYCOUNTERPROC glad_glQueryCounter; -#define glQueryCounter glad_glQueryCounter -typedef void (APIENTRYP PFNGLGETQUERYOBJECTI64VPROC)(GLuint id, GLenum pname, GLint64 *params); -GLAPI PFNGLGETQUERYOBJECTI64VPROC glad_glGetQueryObjecti64v; -#define glGetQueryObjecti64v glad_glGetQueryObjecti64v -typedef void (APIENTRYP PFNGLGETQUERYOBJECTUI64VPROC)(GLuint id, GLenum pname, GLuint64 *params); -GLAPI PFNGLGETQUERYOBJECTUI64VPROC glad_glGetQueryObjectui64v; -#define glGetQueryObjectui64v glad_glGetQueryObjectui64v -typedef void (APIENTRYP PFNGLVERTEXATTRIBDIVISORPROC)(GLuint index, GLuint divisor); -GLAPI PFNGLVERTEXATTRIBDIVISORPROC glad_glVertexAttribDivisor; -#define glVertexAttribDivisor glad_glVertexAttribDivisor -typedef void (APIENTRYP PFNGLVERTEXATTRIBP1UIPROC)(GLuint index, GLenum type, GLboolean normalized, GLuint value); -GLAPI PFNGLVERTEXATTRIBP1UIPROC glad_glVertexAttribP1ui; -#define glVertexAttribP1ui glad_glVertexAttribP1ui -typedef void (APIENTRYP PFNGLVERTEXATTRIBP1UIVPROC)(GLuint index, GLenum type, GLboolean normalized, const GLuint *value); -GLAPI PFNGLVERTEXATTRIBP1UIVPROC glad_glVertexAttribP1uiv; -#define glVertexAttribP1uiv glad_glVertexAttribP1uiv -typedef void (APIENTRYP PFNGLVERTEXATTRIBP2UIPROC)(GLuint index, GLenum type, GLboolean normalized, GLuint value); -GLAPI PFNGLVERTEXATTRIBP2UIPROC glad_glVertexAttribP2ui; -#define glVertexAttribP2ui glad_glVertexAttribP2ui -typedef void (APIENTRYP PFNGLVERTEXATTRIBP2UIVPROC)(GLuint index, GLenum type, GLboolean normalized, const GLuint *value); -GLAPI PFNGLVERTEXATTRIBP2UIVPROC glad_glVertexAttribP2uiv; -#define glVertexAttribP2uiv glad_glVertexAttribP2uiv -typedef void (APIENTRYP PFNGLVERTEXATTRIBP3UIPROC)(GLuint index, GLenum type, GLboolean normalized, GLuint value); -GLAPI PFNGLVERTEXATTRIBP3UIPROC glad_glVertexAttribP3ui; -#define glVertexAttribP3ui glad_glVertexAttribP3ui -typedef void (APIENTRYP PFNGLVERTEXATTRIBP3UIVPROC)(GLuint index, GLenum type, GLboolean normalized, const GLuint *value); -GLAPI PFNGLVERTEXATTRIBP3UIVPROC glad_glVertexAttribP3uiv; -#define glVertexAttribP3uiv glad_glVertexAttribP3uiv -typedef void (APIENTRYP PFNGLVERTEXATTRIBP4UIPROC)(GLuint index, GLenum type, GLboolean normalized, GLuint value); -GLAPI PFNGLVERTEXATTRIBP4UIPROC glad_glVertexAttribP4ui; -#define glVertexAttribP4ui glad_glVertexAttribP4ui -typedef void (APIENTRYP PFNGLVERTEXATTRIBP4UIVPROC)(GLuint index, GLenum type, GLboolean normalized, const GLuint *value); -GLAPI PFNGLVERTEXATTRIBP4UIVPROC glad_glVertexAttribP4uiv; -#define glVertexAttribP4uiv glad_glVertexAttribP4uiv -typedef void (APIENTRYP PFNGLVERTEXP2UIPROC)(GLenum type, GLuint value); -GLAPI PFNGLVERTEXP2UIPROC glad_glVertexP2ui; -#define glVertexP2ui glad_glVertexP2ui -typedef void (APIENTRYP PFNGLVERTEXP2UIVPROC)(GLenum type, const GLuint *value); -GLAPI PFNGLVERTEXP2UIVPROC glad_glVertexP2uiv; -#define glVertexP2uiv glad_glVertexP2uiv -typedef void (APIENTRYP PFNGLVERTEXP3UIPROC)(GLenum type, GLuint value); -GLAPI PFNGLVERTEXP3UIPROC glad_glVertexP3ui; -#define glVertexP3ui glad_glVertexP3ui -typedef void (APIENTRYP PFNGLVERTEXP3UIVPROC)(GLenum type, const GLuint *value); -GLAPI PFNGLVERTEXP3UIVPROC glad_glVertexP3uiv; -#define glVertexP3uiv glad_glVertexP3uiv -typedef void (APIENTRYP PFNGLVERTEXP4UIPROC)(GLenum type, GLuint value); -GLAPI PFNGLVERTEXP4UIPROC glad_glVertexP4ui; -#define glVertexP4ui glad_glVertexP4ui -typedef void (APIENTRYP PFNGLVERTEXP4UIVPROC)(GLenum type, const GLuint *value); -GLAPI PFNGLVERTEXP4UIVPROC glad_glVertexP4uiv; -#define glVertexP4uiv glad_glVertexP4uiv -typedef void (APIENTRYP PFNGLTEXCOORDP1UIPROC)(GLenum type, GLuint coords); -GLAPI PFNGLTEXCOORDP1UIPROC glad_glTexCoordP1ui; -#define glTexCoordP1ui glad_glTexCoordP1ui -typedef void (APIENTRYP PFNGLTEXCOORDP1UIVPROC)(GLenum type, const GLuint *coords); -GLAPI PFNGLTEXCOORDP1UIVPROC glad_glTexCoordP1uiv; -#define glTexCoordP1uiv glad_glTexCoordP1uiv -typedef void (APIENTRYP PFNGLTEXCOORDP2UIPROC)(GLenum type, GLuint coords); -GLAPI PFNGLTEXCOORDP2UIPROC glad_glTexCoordP2ui; -#define glTexCoordP2ui glad_glTexCoordP2ui -typedef void (APIENTRYP PFNGLTEXCOORDP2UIVPROC)(GLenum type, const GLuint *coords); -GLAPI PFNGLTEXCOORDP2UIVPROC glad_glTexCoordP2uiv; -#define glTexCoordP2uiv glad_glTexCoordP2uiv -typedef void (APIENTRYP PFNGLTEXCOORDP3UIPROC)(GLenum type, GLuint coords); -GLAPI PFNGLTEXCOORDP3UIPROC glad_glTexCoordP3ui; -#define glTexCoordP3ui glad_glTexCoordP3ui -typedef void (APIENTRYP PFNGLTEXCOORDP3UIVPROC)(GLenum type, const GLuint *coords); -GLAPI PFNGLTEXCOORDP3UIVPROC glad_glTexCoordP3uiv; -#define glTexCoordP3uiv glad_glTexCoordP3uiv -typedef void (APIENTRYP PFNGLTEXCOORDP4UIPROC)(GLenum type, GLuint coords); -GLAPI PFNGLTEXCOORDP4UIPROC glad_glTexCoordP4ui; -#define glTexCoordP4ui glad_glTexCoordP4ui -typedef void (APIENTRYP PFNGLTEXCOORDP4UIVPROC)(GLenum type, const GLuint *coords); -GLAPI PFNGLTEXCOORDP4UIVPROC glad_glTexCoordP4uiv; -#define glTexCoordP4uiv glad_glTexCoordP4uiv -typedef void (APIENTRYP PFNGLMULTITEXCOORDP1UIPROC)(GLenum texture, GLenum type, GLuint coords); -GLAPI PFNGLMULTITEXCOORDP1UIPROC glad_glMultiTexCoordP1ui; -#define glMultiTexCoordP1ui glad_glMultiTexCoordP1ui -typedef void (APIENTRYP PFNGLMULTITEXCOORDP1UIVPROC)(GLenum texture, GLenum type, const GLuint *coords); -GLAPI PFNGLMULTITEXCOORDP1UIVPROC glad_glMultiTexCoordP1uiv; -#define glMultiTexCoordP1uiv glad_glMultiTexCoordP1uiv -typedef void (APIENTRYP PFNGLMULTITEXCOORDP2UIPROC)(GLenum texture, GLenum type, GLuint coords); -GLAPI PFNGLMULTITEXCOORDP2UIPROC glad_glMultiTexCoordP2ui; -#define glMultiTexCoordP2ui glad_glMultiTexCoordP2ui -typedef void (APIENTRYP PFNGLMULTITEXCOORDP2UIVPROC)(GLenum texture, GLenum type, const GLuint *coords); -GLAPI PFNGLMULTITEXCOORDP2UIVPROC glad_glMultiTexCoordP2uiv; -#define glMultiTexCoordP2uiv glad_glMultiTexCoordP2uiv -typedef void (APIENTRYP PFNGLMULTITEXCOORDP3UIPROC)(GLenum texture, GLenum type, GLuint coords); -GLAPI PFNGLMULTITEXCOORDP3UIPROC glad_glMultiTexCoordP3ui; -#define glMultiTexCoordP3ui glad_glMultiTexCoordP3ui -typedef void (APIENTRYP PFNGLMULTITEXCOORDP3UIVPROC)(GLenum texture, GLenum type, const GLuint *coords); -GLAPI PFNGLMULTITEXCOORDP3UIVPROC glad_glMultiTexCoordP3uiv; -#define glMultiTexCoordP3uiv glad_glMultiTexCoordP3uiv -typedef void (APIENTRYP PFNGLMULTITEXCOORDP4UIPROC)(GLenum texture, GLenum type, GLuint coords); -GLAPI PFNGLMULTITEXCOORDP4UIPROC glad_glMultiTexCoordP4ui; -#define glMultiTexCoordP4ui glad_glMultiTexCoordP4ui -typedef void (APIENTRYP PFNGLMULTITEXCOORDP4UIVPROC)(GLenum texture, GLenum type, const GLuint *coords); -GLAPI PFNGLMULTITEXCOORDP4UIVPROC glad_glMultiTexCoordP4uiv; -#define glMultiTexCoordP4uiv glad_glMultiTexCoordP4uiv -typedef void (APIENTRYP PFNGLNORMALP3UIPROC)(GLenum type, GLuint coords); -GLAPI PFNGLNORMALP3UIPROC glad_glNormalP3ui; -#define glNormalP3ui glad_glNormalP3ui -typedef void (APIENTRYP PFNGLNORMALP3UIVPROC)(GLenum type, const GLuint *coords); -GLAPI PFNGLNORMALP3UIVPROC glad_glNormalP3uiv; -#define glNormalP3uiv glad_glNormalP3uiv -typedef void (APIENTRYP PFNGLCOLORP3UIPROC)(GLenum type, GLuint color); -GLAPI PFNGLCOLORP3UIPROC glad_glColorP3ui; -#define glColorP3ui glad_glColorP3ui -typedef void (APIENTRYP PFNGLCOLORP3UIVPROC)(GLenum type, const GLuint *color); -GLAPI PFNGLCOLORP3UIVPROC glad_glColorP3uiv; -#define glColorP3uiv glad_glColorP3uiv -typedef void (APIENTRYP PFNGLCOLORP4UIPROC)(GLenum type, GLuint color); -GLAPI PFNGLCOLORP4UIPROC glad_glColorP4ui; -#define glColorP4ui glad_glColorP4ui -typedef void (APIENTRYP PFNGLCOLORP4UIVPROC)(GLenum type, const GLuint *color); -GLAPI PFNGLCOLORP4UIVPROC glad_glColorP4uiv; -#define glColorP4uiv glad_glColorP4uiv -typedef void (APIENTRYP PFNGLSECONDARYCOLORP3UIPROC)(GLenum type, GLuint color); -GLAPI PFNGLSECONDARYCOLORP3UIPROC glad_glSecondaryColorP3ui; -#define glSecondaryColorP3ui glad_glSecondaryColorP3ui -typedef void (APIENTRYP PFNGLSECONDARYCOLORP3UIVPROC)(GLenum type, const GLuint *color); -GLAPI PFNGLSECONDARYCOLORP3UIVPROC glad_glSecondaryColorP3uiv; -#define glSecondaryColorP3uiv glad_glSecondaryColorP3uiv -#endif -#ifndef GL_VERSION_4_0 -#define GL_VERSION_4_0 1 -GLAPI int GLAD_GL_VERSION_4_0; -typedef void (APIENTRYP PFNGLMINSAMPLESHADINGPROC)(GLfloat value); -GLAPI PFNGLMINSAMPLESHADINGPROC glad_glMinSampleShading; -#define glMinSampleShading glad_glMinSampleShading -typedef void (APIENTRYP PFNGLBLENDEQUATIONIPROC)(GLuint buf, GLenum mode); -GLAPI PFNGLBLENDEQUATIONIPROC glad_glBlendEquationi; -#define glBlendEquationi glad_glBlendEquationi -typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEIPROC)(GLuint buf, GLenum modeRGB, GLenum modeAlpha); -GLAPI PFNGLBLENDEQUATIONSEPARATEIPROC glad_glBlendEquationSeparatei; -#define glBlendEquationSeparatei glad_glBlendEquationSeparatei -typedef void (APIENTRYP PFNGLBLENDFUNCIPROC)(GLuint buf, GLenum src, GLenum dst); -GLAPI PFNGLBLENDFUNCIPROC glad_glBlendFunci; -#define glBlendFunci glad_glBlendFunci -typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEIPROC)(GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha); -GLAPI PFNGLBLENDFUNCSEPARATEIPROC glad_glBlendFuncSeparatei; -#define glBlendFuncSeparatei glad_glBlendFuncSeparatei -typedef void (APIENTRYP PFNGLDRAWARRAYSINDIRECTPROC)(GLenum mode, const void *indirect); -GLAPI PFNGLDRAWARRAYSINDIRECTPROC glad_glDrawArraysIndirect; -#define glDrawArraysIndirect glad_glDrawArraysIndirect -typedef void (APIENTRYP PFNGLDRAWELEMENTSINDIRECTPROC)(GLenum mode, GLenum type, const void *indirect); -GLAPI PFNGLDRAWELEMENTSINDIRECTPROC glad_glDrawElementsIndirect; -#define glDrawElementsIndirect glad_glDrawElementsIndirect -typedef void (APIENTRYP PFNGLUNIFORM1DPROC)(GLint location, GLdouble x); -GLAPI PFNGLUNIFORM1DPROC glad_glUniform1d; -#define glUniform1d glad_glUniform1d -typedef void (APIENTRYP PFNGLUNIFORM2DPROC)(GLint location, GLdouble x, GLdouble y); -GLAPI PFNGLUNIFORM2DPROC glad_glUniform2d; -#define glUniform2d glad_glUniform2d -typedef void (APIENTRYP PFNGLUNIFORM3DPROC)(GLint location, GLdouble x, GLdouble y, GLdouble z); -GLAPI PFNGLUNIFORM3DPROC glad_glUniform3d; -#define glUniform3d glad_glUniform3d -typedef void (APIENTRYP PFNGLUNIFORM4DPROC)(GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -GLAPI PFNGLUNIFORM4DPROC glad_glUniform4d; -#define glUniform4d glad_glUniform4d -typedef void (APIENTRYP PFNGLUNIFORM1DVPROC)(GLint location, GLsizei count, const GLdouble *value); -GLAPI PFNGLUNIFORM1DVPROC glad_glUniform1dv; -#define glUniform1dv glad_glUniform1dv -typedef void (APIENTRYP PFNGLUNIFORM2DVPROC)(GLint location, GLsizei count, const GLdouble *value); -GLAPI PFNGLUNIFORM2DVPROC glad_glUniform2dv; -#define glUniform2dv glad_glUniform2dv -typedef void (APIENTRYP PFNGLUNIFORM3DVPROC)(GLint location, GLsizei count, const GLdouble *value); -GLAPI PFNGLUNIFORM3DVPROC glad_glUniform3dv; -#define glUniform3dv glad_glUniform3dv -typedef void (APIENTRYP PFNGLUNIFORM4DVPROC)(GLint location, GLsizei count, const GLdouble *value); -GLAPI PFNGLUNIFORM4DVPROC glad_glUniform4dv; -#define glUniform4dv glad_glUniform4dv -typedef void (APIENTRYP PFNGLUNIFORMMATRIX2DVPROC)(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI PFNGLUNIFORMMATRIX2DVPROC glad_glUniformMatrix2dv; -#define glUniformMatrix2dv glad_glUniformMatrix2dv -typedef void (APIENTRYP PFNGLUNIFORMMATRIX3DVPROC)(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI PFNGLUNIFORMMATRIX3DVPROC glad_glUniformMatrix3dv; -#define glUniformMatrix3dv glad_glUniformMatrix3dv -typedef void (APIENTRYP PFNGLUNIFORMMATRIX4DVPROC)(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI PFNGLUNIFORMMATRIX4DVPROC glad_glUniformMatrix4dv; -#define glUniformMatrix4dv glad_glUniformMatrix4dv -typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X3DVPROC)(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI PFNGLUNIFORMMATRIX2X3DVPROC glad_glUniformMatrix2x3dv; -#define glUniformMatrix2x3dv glad_glUniformMatrix2x3dv -typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X4DVPROC)(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI PFNGLUNIFORMMATRIX2X4DVPROC glad_glUniformMatrix2x4dv; -#define glUniformMatrix2x4dv glad_glUniformMatrix2x4dv -typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X2DVPROC)(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI PFNGLUNIFORMMATRIX3X2DVPROC glad_glUniformMatrix3x2dv; -#define glUniformMatrix3x2dv glad_glUniformMatrix3x2dv -typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X4DVPROC)(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI PFNGLUNIFORMMATRIX3X4DVPROC glad_glUniformMatrix3x4dv; -#define glUniformMatrix3x4dv glad_glUniformMatrix3x4dv -typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X2DVPROC)(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI PFNGLUNIFORMMATRIX4X2DVPROC glad_glUniformMatrix4x2dv; -#define glUniformMatrix4x2dv glad_glUniformMatrix4x2dv -typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X3DVPROC)(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI PFNGLUNIFORMMATRIX4X3DVPROC glad_glUniformMatrix4x3dv; -#define glUniformMatrix4x3dv glad_glUniformMatrix4x3dv -typedef void (APIENTRYP PFNGLGETUNIFORMDVPROC)(GLuint program, GLint location, GLdouble *params); -GLAPI PFNGLGETUNIFORMDVPROC glad_glGetUniformdv; -#define glGetUniformdv glad_glGetUniformdv -typedef GLint (APIENTRYP PFNGLGETSUBROUTINEUNIFORMLOCATIONPROC)(GLuint program, GLenum shadertype, const GLchar *name); -GLAPI PFNGLGETSUBROUTINEUNIFORMLOCATIONPROC glad_glGetSubroutineUniformLocation; -#define glGetSubroutineUniformLocation glad_glGetSubroutineUniformLocation -typedef GLuint (APIENTRYP PFNGLGETSUBROUTINEINDEXPROC)(GLuint program, GLenum shadertype, const GLchar *name); -GLAPI PFNGLGETSUBROUTINEINDEXPROC glad_glGetSubroutineIndex; -#define glGetSubroutineIndex glad_glGetSubroutineIndex -typedef void (APIENTRYP PFNGLGETACTIVESUBROUTINEUNIFORMIVPROC)(GLuint program, GLenum shadertype, GLuint index, GLenum pname, GLint *values); -GLAPI PFNGLGETACTIVESUBROUTINEUNIFORMIVPROC glad_glGetActiveSubroutineUniformiv; -#define glGetActiveSubroutineUniformiv glad_glGetActiveSubroutineUniformiv -typedef void (APIENTRYP PFNGLGETACTIVESUBROUTINEUNIFORMNAMEPROC)(GLuint program, GLenum shadertype, GLuint index, GLsizei bufSize, GLsizei *length, GLchar *name); -GLAPI PFNGLGETACTIVESUBROUTINEUNIFORMNAMEPROC glad_glGetActiveSubroutineUniformName; -#define glGetActiveSubroutineUniformName glad_glGetActiveSubroutineUniformName -typedef void (APIENTRYP PFNGLGETACTIVESUBROUTINENAMEPROC)(GLuint program, GLenum shadertype, GLuint index, GLsizei bufSize, GLsizei *length, GLchar *name); -GLAPI PFNGLGETACTIVESUBROUTINENAMEPROC glad_glGetActiveSubroutineName; -#define glGetActiveSubroutineName glad_glGetActiveSubroutineName -typedef void (APIENTRYP PFNGLUNIFORMSUBROUTINESUIVPROC)(GLenum shadertype, GLsizei count, const GLuint *indices); -GLAPI PFNGLUNIFORMSUBROUTINESUIVPROC glad_glUniformSubroutinesuiv; -#define glUniformSubroutinesuiv glad_glUniformSubroutinesuiv -typedef void (APIENTRYP PFNGLGETUNIFORMSUBROUTINEUIVPROC)(GLenum shadertype, GLint location, GLuint *params); -GLAPI PFNGLGETUNIFORMSUBROUTINEUIVPROC glad_glGetUniformSubroutineuiv; -#define glGetUniformSubroutineuiv glad_glGetUniformSubroutineuiv -typedef void (APIENTRYP PFNGLGETPROGRAMSTAGEIVPROC)(GLuint program, GLenum shadertype, GLenum pname, GLint *values); -GLAPI PFNGLGETPROGRAMSTAGEIVPROC glad_glGetProgramStageiv; -#define glGetProgramStageiv glad_glGetProgramStageiv -typedef void (APIENTRYP PFNGLPATCHPARAMETERIPROC)(GLenum pname, GLint value); -GLAPI PFNGLPATCHPARAMETERIPROC glad_glPatchParameteri; -#define glPatchParameteri glad_glPatchParameteri -typedef void (APIENTRYP PFNGLPATCHPARAMETERFVPROC)(GLenum pname, const GLfloat *values); -GLAPI PFNGLPATCHPARAMETERFVPROC glad_glPatchParameterfv; -#define glPatchParameterfv glad_glPatchParameterfv -typedef void (APIENTRYP PFNGLBINDTRANSFORMFEEDBACKPROC)(GLenum target, GLuint id); -GLAPI PFNGLBINDTRANSFORMFEEDBACKPROC glad_glBindTransformFeedback; -#define glBindTransformFeedback glad_glBindTransformFeedback -typedef void (APIENTRYP PFNGLDELETETRANSFORMFEEDBACKSPROC)(GLsizei n, const GLuint *ids); -GLAPI PFNGLDELETETRANSFORMFEEDBACKSPROC glad_glDeleteTransformFeedbacks; -#define glDeleteTransformFeedbacks glad_glDeleteTransformFeedbacks -typedef void (APIENTRYP PFNGLGENTRANSFORMFEEDBACKSPROC)(GLsizei n, GLuint *ids); -GLAPI PFNGLGENTRANSFORMFEEDBACKSPROC glad_glGenTransformFeedbacks; -#define glGenTransformFeedbacks glad_glGenTransformFeedbacks -typedef GLboolean (APIENTRYP PFNGLISTRANSFORMFEEDBACKPROC)(GLuint id); -GLAPI PFNGLISTRANSFORMFEEDBACKPROC glad_glIsTransformFeedback; -#define glIsTransformFeedback glad_glIsTransformFeedback -typedef void (APIENTRYP PFNGLPAUSETRANSFORMFEEDBACKPROC)(void); -GLAPI PFNGLPAUSETRANSFORMFEEDBACKPROC glad_glPauseTransformFeedback; -#define glPauseTransformFeedback glad_glPauseTransformFeedback -typedef void (APIENTRYP PFNGLRESUMETRANSFORMFEEDBACKPROC)(void); -GLAPI PFNGLRESUMETRANSFORMFEEDBACKPROC glad_glResumeTransformFeedback; -#define glResumeTransformFeedback glad_glResumeTransformFeedback -typedef void (APIENTRYP PFNGLDRAWTRANSFORMFEEDBACKPROC)(GLenum mode, GLuint id); -GLAPI PFNGLDRAWTRANSFORMFEEDBACKPROC glad_glDrawTransformFeedback; -#define glDrawTransformFeedback glad_glDrawTransformFeedback -typedef void (APIENTRYP PFNGLDRAWTRANSFORMFEEDBACKSTREAMPROC)(GLenum mode, GLuint id, GLuint stream); -GLAPI PFNGLDRAWTRANSFORMFEEDBACKSTREAMPROC glad_glDrawTransformFeedbackStream; -#define glDrawTransformFeedbackStream glad_glDrawTransformFeedbackStream -typedef void (APIENTRYP PFNGLBEGINQUERYINDEXEDPROC)(GLenum target, GLuint index, GLuint id); -GLAPI PFNGLBEGINQUERYINDEXEDPROC glad_glBeginQueryIndexed; -#define glBeginQueryIndexed glad_glBeginQueryIndexed -typedef void (APIENTRYP PFNGLENDQUERYINDEXEDPROC)(GLenum target, GLuint index); -GLAPI PFNGLENDQUERYINDEXEDPROC glad_glEndQueryIndexed; -#define glEndQueryIndexed glad_glEndQueryIndexed -typedef void (APIENTRYP PFNGLGETQUERYINDEXEDIVPROC)(GLenum target, GLuint index, GLenum pname, GLint *params); -GLAPI PFNGLGETQUERYINDEXEDIVPROC glad_glGetQueryIndexediv; -#define glGetQueryIndexediv glad_glGetQueryIndexediv -#endif -#ifndef GL_VERSION_4_1 -#define GL_VERSION_4_1 1 -GLAPI int GLAD_GL_VERSION_4_1; -typedef void (APIENTRYP PFNGLRELEASESHADERCOMPILERPROC)(void); -GLAPI PFNGLRELEASESHADERCOMPILERPROC glad_glReleaseShaderCompiler; -#define glReleaseShaderCompiler glad_glReleaseShaderCompiler -typedef void (APIENTRYP PFNGLSHADERBINARYPROC)(GLsizei count, const GLuint *shaders, GLenum binaryFormat, const void *binary, GLsizei length); -GLAPI PFNGLSHADERBINARYPROC glad_glShaderBinary; -#define glShaderBinary glad_glShaderBinary -typedef void (APIENTRYP PFNGLGETSHADERPRECISIONFORMATPROC)(GLenum shadertype, GLenum precisiontype, GLint *range, GLint *precision); -GLAPI PFNGLGETSHADERPRECISIONFORMATPROC glad_glGetShaderPrecisionFormat; -#define glGetShaderPrecisionFormat glad_glGetShaderPrecisionFormat -typedef void (APIENTRYP PFNGLDEPTHRANGEFPROC)(GLfloat n, GLfloat f); -GLAPI PFNGLDEPTHRANGEFPROC glad_glDepthRangef; -#define glDepthRangef glad_glDepthRangef -typedef void (APIENTRYP PFNGLCLEARDEPTHFPROC)(GLfloat d); -GLAPI PFNGLCLEARDEPTHFPROC glad_glClearDepthf; -#define glClearDepthf glad_glClearDepthf -typedef void (APIENTRYP PFNGLGETPROGRAMBINARYPROC)(GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, void *binary); -GLAPI PFNGLGETPROGRAMBINARYPROC glad_glGetProgramBinary; -#define glGetProgramBinary glad_glGetProgramBinary -typedef void (APIENTRYP PFNGLPROGRAMBINARYPROC)(GLuint program, GLenum binaryFormat, const void *binary, GLsizei length); -GLAPI PFNGLPROGRAMBINARYPROC glad_glProgramBinary; -#define glProgramBinary glad_glProgramBinary -typedef void (APIENTRYP PFNGLPROGRAMPARAMETERIPROC)(GLuint program, GLenum pname, GLint value); -GLAPI PFNGLPROGRAMPARAMETERIPROC glad_glProgramParameteri; -#define glProgramParameteri glad_glProgramParameteri -typedef void (APIENTRYP PFNGLUSEPROGRAMSTAGESPROC)(GLuint pipeline, GLbitfield stages, GLuint program); -GLAPI PFNGLUSEPROGRAMSTAGESPROC glad_glUseProgramStages; -#define glUseProgramStages glad_glUseProgramStages -typedef void (APIENTRYP PFNGLACTIVESHADERPROGRAMPROC)(GLuint pipeline, GLuint program); -GLAPI PFNGLACTIVESHADERPROGRAMPROC glad_glActiveShaderProgram; -#define glActiveShaderProgram glad_glActiveShaderProgram -typedef GLuint (APIENTRYP PFNGLCREATESHADERPROGRAMVPROC)(GLenum type, GLsizei count, const GLchar *const*strings); -GLAPI PFNGLCREATESHADERPROGRAMVPROC glad_glCreateShaderProgramv; -#define glCreateShaderProgramv glad_glCreateShaderProgramv -typedef void (APIENTRYP PFNGLBINDPROGRAMPIPELINEPROC)(GLuint pipeline); -GLAPI PFNGLBINDPROGRAMPIPELINEPROC glad_glBindProgramPipeline; -#define glBindProgramPipeline glad_glBindProgramPipeline -typedef void (APIENTRYP PFNGLDELETEPROGRAMPIPELINESPROC)(GLsizei n, const GLuint *pipelines); -GLAPI PFNGLDELETEPROGRAMPIPELINESPROC glad_glDeleteProgramPipelines; -#define glDeleteProgramPipelines glad_glDeleteProgramPipelines -typedef void (APIENTRYP PFNGLGENPROGRAMPIPELINESPROC)(GLsizei n, GLuint *pipelines); -GLAPI PFNGLGENPROGRAMPIPELINESPROC glad_glGenProgramPipelines; -#define glGenProgramPipelines glad_glGenProgramPipelines -typedef GLboolean (APIENTRYP PFNGLISPROGRAMPIPELINEPROC)(GLuint pipeline); -GLAPI PFNGLISPROGRAMPIPELINEPROC glad_glIsProgramPipeline; -#define glIsProgramPipeline glad_glIsProgramPipeline -typedef void (APIENTRYP PFNGLGETPROGRAMPIPELINEIVPROC)(GLuint pipeline, GLenum pname, GLint *params); -GLAPI PFNGLGETPROGRAMPIPELINEIVPROC glad_glGetProgramPipelineiv; -#define glGetProgramPipelineiv glad_glGetProgramPipelineiv -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1IPROC)(GLuint program, GLint location, GLint v0); -GLAPI PFNGLPROGRAMUNIFORM1IPROC glad_glProgramUniform1i; -#define glProgramUniform1i glad_glProgramUniform1i -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1IVPROC)(GLuint program, GLint location, GLsizei count, const GLint *value); -GLAPI PFNGLPROGRAMUNIFORM1IVPROC glad_glProgramUniform1iv; -#define glProgramUniform1iv glad_glProgramUniform1iv -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1FPROC)(GLuint program, GLint location, GLfloat v0); -GLAPI PFNGLPROGRAMUNIFORM1FPROC glad_glProgramUniform1f; -#define glProgramUniform1f glad_glProgramUniform1f -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1FVPROC)(GLuint program, GLint location, GLsizei count, const GLfloat *value); -GLAPI PFNGLPROGRAMUNIFORM1FVPROC glad_glProgramUniform1fv; -#define glProgramUniform1fv glad_glProgramUniform1fv -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1DPROC)(GLuint program, GLint location, GLdouble v0); -GLAPI PFNGLPROGRAMUNIFORM1DPROC glad_glProgramUniform1d; -#define glProgramUniform1d glad_glProgramUniform1d -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1DVPROC)(GLuint program, GLint location, GLsizei count, const GLdouble *value); -GLAPI PFNGLPROGRAMUNIFORM1DVPROC glad_glProgramUniform1dv; -#define glProgramUniform1dv glad_glProgramUniform1dv -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UIPROC)(GLuint program, GLint location, GLuint v0); -GLAPI PFNGLPROGRAMUNIFORM1UIPROC glad_glProgramUniform1ui; -#define glProgramUniform1ui glad_glProgramUniform1ui -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UIVPROC)(GLuint program, GLint location, GLsizei count, const GLuint *value); -GLAPI PFNGLPROGRAMUNIFORM1UIVPROC glad_glProgramUniform1uiv; -#define glProgramUniform1uiv glad_glProgramUniform1uiv -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2IPROC)(GLuint program, GLint location, GLint v0, GLint v1); -GLAPI PFNGLPROGRAMUNIFORM2IPROC glad_glProgramUniform2i; -#define glProgramUniform2i glad_glProgramUniform2i -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2IVPROC)(GLuint program, GLint location, GLsizei count, const GLint *value); -GLAPI PFNGLPROGRAMUNIFORM2IVPROC glad_glProgramUniform2iv; -#define glProgramUniform2iv glad_glProgramUniform2iv -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2FPROC)(GLuint program, GLint location, GLfloat v0, GLfloat v1); -GLAPI PFNGLPROGRAMUNIFORM2FPROC glad_glProgramUniform2f; -#define glProgramUniform2f glad_glProgramUniform2f -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2FVPROC)(GLuint program, GLint location, GLsizei count, const GLfloat *value); -GLAPI PFNGLPROGRAMUNIFORM2FVPROC glad_glProgramUniform2fv; -#define glProgramUniform2fv glad_glProgramUniform2fv -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2DPROC)(GLuint program, GLint location, GLdouble v0, GLdouble v1); -GLAPI PFNGLPROGRAMUNIFORM2DPROC glad_glProgramUniform2d; -#define glProgramUniform2d glad_glProgramUniform2d -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2DVPROC)(GLuint program, GLint location, GLsizei count, const GLdouble *value); -GLAPI PFNGLPROGRAMUNIFORM2DVPROC glad_glProgramUniform2dv; -#define glProgramUniform2dv glad_glProgramUniform2dv -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UIPROC)(GLuint program, GLint location, GLuint v0, GLuint v1); -GLAPI PFNGLPROGRAMUNIFORM2UIPROC glad_glProgramUniform2ui; -#define glProgramUniform2ui glad_glProgramUniform2ui -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UIVPROC)(GLuint program, GLint location, GLsizei count, const GLuint *value); -GLAPI PFNGLPROGRAMUNIFORM2UIVPROC glad_glProgramUniform2uiv; -#define glProgramUniform2uiv glad_glProgramUniform2uiv -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3IPROC)(GLuint program, GLint location, GLint v0, GLint v1, GLint v2); -GLAPI PFNGLPROGRAMUNIFORM3IPROC glad_glProgramUniform3i; -#define glProgramUniform3i glad_glProgramUniform3i -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3IVPROC)(GLuint program, GLint location, GLsizei count, const GLint *value); -GLAPI PFNGLPROGRAMUNIFORM3IVPROC glad_glProgramUniform3iv; -#define glProgramUniform3iv glad_glProgramUniform3iv -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3FPROC)(GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2); -GLAPI PFNGLPROGRAMUNIFORM3FPROC glad_glProgramUniform3f; -#define glProgramUniform3f glad_glProgramUniform3f -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3FVPROC)(GLuint program, GLint location, GLsizei count, const GLfloat *value); -GLAPI PFNGLPROGRAMUNIFORM3FVPROC glad_glProgramUniform3fv; -#define glProgramUniform3fv glad_glProgramUniform3fv -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3DPROC)(GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2); -GLAPI PFNGLPROGRAMUNIFORM3DPROC glad_glProgramUniform3d; -#define glProgramUniform3d glad_glProgramUniform3d -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3DVPROC)(GLuint program, GLint location, GLsizei count, const GLdouble *value); -GLAPI PFNGLPROGRAMUNIFORM3DVPROC glad_glProgramUniform3dv; -#define glProgramUniform3dv glad_glProgramUniform3dv -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UIPROC)(GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2); -GLAPI PFNGLPROGRAMUNIFORM3UIPROC glad_glProgramUniform3ui; -#define glProgramUniform3ui glad_glProgramUniform3ui -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UIVPROC)(GLuint program, GLint location, GLsizei count, const GLuint *value); -GLAPI PFNGLPROGRAMUNIFORM3UIVPROC glad_glProgramUniform3uiv; -#define glProgramUniform3uiv glad_glProgramUniform3uiv -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4IPROC)(GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3); -GLAPI PFNGLPROGRAMUNIFORM4IPROC glad_glProgramUniform4i; -#define glProgramUniform4i glad_glProgramUniform4i -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4IVPROC)(GLuint program, GLint location, GLsizei count, const GLint *value); -GLAPI PFNGLPROGRAMUNIFORM4IVPROC glad_glProgramUniform4iv; -#define glProgramUniform4iv glad_glProgramUniform4iv -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4FPROC)(GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3); -GLAPI PFNGLPROGRAMUNIFORM4FPROC glad_glProgramUniform4f; -#define glProgramUniform4f glad_glProgramUniform4f -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4FVPROC)(GLuint program, GLint location, GLsizei count, const GLfloat *value); -GLAPI PFNGLPROGRAMUNIFORM4FVPROC glad_glProgramUniform4fv; -#define glProgramUniform4fv glad_glProgramUniform4fv -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4DPROC)(GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2, GLdouble v3); -GLAPI PFNGLPROGRAMUNIFORM4DPROC glad_glProgramUniform4d; -#define glProgramUniform4d glad_glProgramUniform4d -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4DVPROC)(GLuint program, GLint location, GLsizei count, const GLdouble *value); -GLAPI PFNGLPROGRAMUNIFORM4DVPROC glad_glProgramUniform4dv; -#define glProgramUniform4dv glad_glProgramUniform4dv -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UIPROC)(GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3); -GLAPI PFNGLPROGRAMUNIFORM4UIPROC glad_glProgramUniform4ui; -#define glProgramUniform4ui glad_glProgramUniform4ui -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UIVPROC)(GLuint program, GLint location, GLsizei count, const GLuint *value); -GLAPI PFNGLPROGRAMUNIFORM4UIVPROC glad_glProgramUniform4uiv; -#define glProgramUniform4uiv glad_glProgramUniform4uiv -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2FVPROC)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI PFNGLPROGRAMUNIFORMMATRIX2FVPROC glad_glProgramUniformMatrix2fv; -#define glProgramUniformMatrix2fv glad_glProgramUniformMatrix2fv -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3FVPROC)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI PFNGLPROGRAMUNIFORMMATRIX3FVPROC glad_glProgramUniformMatrix3fv; -#define glProgramUniformMatrix3fv glad_glProgramUniformMatrix3fv -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4FVPROC)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI PFNGLPROGRAMUNIFORMMATRIX4FVPROC glad_glProgramUniformMatrix4fv; -#define glProgramUniformMatrix4fv glad_glProgramUniformMatrix4fv -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2DVPROC)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI PFNGLPROGRAMUNIFORMMATRIX2DVPROC glad_glProgramUniformMatrix2dv; -#define glProgramUniformMatrix2dv glad_glProgramUniformMatrix2dv -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3DVPROC)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI PFNGLPROGRAMUNIFORMMATRIX3DVPROC glad_glProgramUniformMatrix3dv; -#define glProgramUniformMatrix3dv glad_glProgramUniformMatrix3dv -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4DVPROC)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI PFNGLPROGRAMUNIFORMMATRIX4DVPROC glad_glProgramUniformMatrix4dv; -#define glProgramUniformMatrix4dv glad_glProgramUniformMatrix4dv -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X3FVPROC)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI PFNGLPROGRAMUNIFORMMATRIX2X3FVPROC glad_glProgramUniformMatrix2x3fv; -#define glProgramUniformMatrix2x3fv glad_glProgramUniformMatrix2x3fv -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X2FVPROC)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI PFNGLPROGRAMUNIFORMMATRIX3X2FVPROC glad_glProgramUniformMatrix3x2fv; -#define glProgramUniformMatrix3x2fv glad_glProgramUniformMatrix3x2fv -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X4FVPROC)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI PFNGLPROGRAMUNIFORMMATRIX2X4FVPROC glad_glProgramUniformMatrix2x4fv; -#define glProgramUniformMatrix2x4fv glad_glProgramUniformMatrix2x4fv -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X2FVPROC)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI PFNGLPROGRAMUNIFORMMATRIX4X2FVPROC glad_glProgramUniformMatrix4x2fv; -#define glProgramUniformMatrix4x2fv glad_glProgramUniformMatrix4x2fv -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X4FVPROC)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI PFNGLPROGRAMUNIFORMMATRIX3X4FVPROC glad_glProgramUniformMatrix3x4fv; -#define glProgramUniformMatrix3x4fv glad_glProgramUniformMatrix3x4fv -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X3FVPROC)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI PFNGLPROGRAMUNIFORMMATRIX4X3FVPROC glad_glProgramUniformMatrix4x3fv; -#define glProgramUniformMatrix4x3fv glad_glProgramUniformMatrix4x3fv -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X3DVPROC)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI PFNGLPROGRAMUNIFORMMATRIX2X3DVPROC glad_glProgramUniformMatrix2x3dv; -#define glProgramUniformMatrix2x3dv glad_glProgramUniformMatrix2x3dv -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X2DVPROC)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI PFNGLPROGRAMUNIFORMMATRIX3X2DVPROC glad_glProgramUniformMatrix3x2dv; -#define glProgramUniformMatrix3x2dv glad_glProgramUniformMatrix3x2dv -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X4DVPROC)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI PFNGLPROGRAMUNIFORMMATRIX2X4DVPROC glad_glProgramUniformMatrix2x4dv; -#define glProgramUniformMatrix2x4dv glad_glProgramUniformMatrix2x4dv -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X2DVPROC)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI PFNGLPROGRAMUNIFORMMATRIX4X2DVPROC glad_glProgramUniformMatrix4x2dv; -#define glProgramUniformMatrix4x2dv glad_glProgramUniformMatrix4x2dv -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X4DVPROC)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI PFNGLPROGRAMUNIFORMMATRIX3X4DVPROC glad_glProgramUniformMatrix3x4dv; -#define glProgramUniformMatrix3x4dv glad_glProgramUniformMatrix3x4dv -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X3DVPROC)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI PFNGLPROGRAMUNIFORMMATRIX4X3DVPROC glad_glProgramUniformMatrix4x3dv; -#define glProgramUniformMatrix4x3dv glad_glProgramUniformMatrix4x3dv -typedef void (APIENTRYP PFNGLVALIDATEPROGRAMPIPELINEPROC)(GLuint pipeline); -GLAPI PFNGLVALIDATEPROGRAMPIPELINEPROC glad_glValidateProgramPipeline; -#define glValidateProgramPipeline glad_glValidateProgramPipeline -typedef void (APIENTRYP PFNGLGETPROGRAMPIPELINEINFOLOGPROC)(GLuint pipeline, GLsizei bufSize, GLsizei *length, GLchar *infoLog); -GLAPI PFNGLGETPROGRAMPIPELINEINFOLOGPROC glad_glGetProgramPipelineInfoLog; -#define glGetProgramPipelineInfoLog glad_glGetProgramPipelineInfoLog -typedef void (APIENTRYP PFNGLVERTEXATTRIBL1DPROC)(GLuint index, GLdouble x); -GLAPI PFNGLVERTEXATTRIBL1DPROC glad_glVertexAttribL1d; -#define glVertexAttribL1d glad_glVertexAttribL1d -typedef void (APIENTRYP PFNGLVERTEXATTRIBL2DPROC)(GLuint index, GLdouble x, GLdouble y); -GLAPI PFNGLVERTEXATTRIBL2DPROC glad_glVertexAttribL2d; -#define glVertexAttribL2d glad_glVertexAttribL2d -typedef void (APIENTRYP PFNGLVERTEXATTRIBL3DPROC)(GLuint index, GLdouble x, GLdouble y, GLdouble z); -GLAPI PFNGLVERTEXATTRIBL3DPROC glad_glVertexAttribL3d; -#define glVertexAttribL3d glad_glVertexAttribL3d -typedef void (APIENTRYP PFNGLVERTEXATTRIBL4DPROC)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -GLAPI PFNGLVERTEXATTRIBL4DPROC glad_glVertexAttribL4d; -#define glVertexAttribL4d glad_glVertexAttribL4d -typedef void (APIENTRYP PFNGLVERTEXATTRIBL1DVPROC)(GLuint index, const GLdouble *v); -GLAPI PFNGLVERTEXATTRIBL1DVPROC glad_glVertexAttribL1dv; -#define glVertexAttribL1dv glad_glVertexAttribL1dv -typedef void (APIENTRYP PFNGLVERTEXATTRIBL2DVPROC)(GLuint index, const GLdouble *v); -GLAPI PFNGLVERTEXATTRIBL2DVPROC glad_glVertexAttribL2dv; -#define glVertexAttribL2dv glad_glVertexAttribL2dv -typedef void (APIENTRYP PFNGLVERTEXATTRIBL3DVPROC)(GLuint index, const GLdouble *v); -GLAPI PFNGLVERTEXATTRIBL3DVPROC glad_glVertexAttribL3dv; -#define glVertexAttribL3dv glad_glVertexAttribL3dv -typedef void (APIENTRYP PFNGLVERTEXATTRIBL4DVPROC)(GLuint index, const GLdouble *v); -GLAPI PFNGLVERTEXATTRIBL4DVPROC glad_glVertexAttribL4dv; -#define glVertexAttribL4dv glad_glVertexAttribL4dv -typedef void (APIENTRYP PFNGLVERTEXATTRIBLPOINTERPROC)(GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer); -GLAPI PFNGLVERTEXATTRIBLPOINTERPROC glad_glVertexAttribLPointer; -#define glVertexAttribLPointer glad_glVertexAttribLPointer -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBLDVPROC)(GLuint index, GLenum pname, GLdouble *params); -GLAPI PFNGLGETVERTEXATTRIBLDVPROC glad_glGetVertexAttribLdv; -#define glGetVertexAttribLdv glad_glGetVertexAttribLdv -typedef void (APIENTRYP PFNGLVIEWPORTARRAYVPROC)(GLuint first, GLsizei count, const GLfloat *v); -GLAPI PFNGLVIEWPORTARRAYVPROC glad_glViewportArrayv; -#define glViewportArrayv glad_glViewportArrayv -typedef void (APIENTRYP PFNGLVIEWPORTINDEXEDFPROC)(GLuint index, GLfloat x, GLfloat y, GLfloat w, GLfloat h); -GLAPI PFNGLVIEWPORTINDEXEDFPROC glad_glViewportIndexedf; -#define glViewportIndexedf glad_glViewportIndexedf -typedef void (APIENTRYP PFNGLVIEWPORTINDEXEDFVPROC)(GLuint index, const GLfloat *v); -GLAPI PFNGLVIEWPORTINDEXEDFVPROC glad_glViewportIndexedfv; -#define glViewportIndexedfv glad_glViewportIndexedfv -typedef void (APIENTRYP PFNGLSCISSORARRAYVPROC)(GLuint first, GLsizei count, const GLint *v); -GLAPI PFNGLSCISSORARRAYVPROC glad_glScissorArrayv; -#define glScissorArrayv glad_glScissorArrayv -typedef void (APIENTRYP PFNGLSCISSORINDEXEDPROC)(GLuint index, GLint left, GLint bottom, GLsizei width, GLsizei height); -GLAPI PFNGLSCISSORINDEXEDPROC glad_glScissorIndexed; -#define glScissorIndexed glad_glScissorIndexed -typedef void (APIENTRYP PFNGLSCISSORINDEXEDVPROC)(GLuint index, const GLint *v); -GLAPI PFNGLSCISSORINDEXEDVPROC glad_glScissorIndexedv; -#define glScissorIndexedv glad_glScissorIndexedv -typedef void (APIENTRYP PFNGLDEPTHRANGEARRAYVPROC)(GLuint first, GLsizei count, const GLdouble *v); -GLAPI PFNGLDEPTHRANGEARRAYVPROC glad_glDepthRangeArrayv; -#define glDepthRangeArrayv glad_glDepthRangeArrayv -typedef void (APIENTRYP PFNGLDEPTHRANGEINDEXEDPROC)(GLuint index, GLdouble n, GLdouble f); -GLAPI PFNGLDEPTHRANGEINDEXEDPROC glad_glDepthRangeIndexed; -#define glDepthRangeIndexed glad_glDepthRangeIndexed -typedef void (APIENTRYP PFNGLGETFLOATI_VPROC)(GLenum target, GLuint index, GLfloat *data); -GLAPI PFNGLGETFLOATI_VPROC glad_glGetFloati_v; -#define glGetFloati_v glad_glGetFloati_v -typedef void (APIENTRYP PFNGLGETDOUBLEI_VPROC)(GLenum target, GLuint index, GLdouble *data); -GLAPI PFNGLGETDOUBLEI_VPROC glad_glGetDoublei_v; -#define glGetDoublei_v glad_glGetDoublei_v -#endif -#ifndef GL_VERSION_4_2 -#define GL_VERSION_4_2 1 -GLAPI int GLAD_GL_VERSION_4_2; -typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDBASEINSTANCEPROC)(GLenum mode, GLint first, GLsizei count, GLsizei instancecount, GLuint baseinstance); -GLAPI PFNGLDRAWARRAYSINSTANCEDBASEINSTANCEPROC glad_glDrawArraysInstancedBaseInstance; -#define glDrawArraysInstancedBaseInstance glad_glDrawArraysInstancedBaseInstance -typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDBASEINSTANCEPROC)(GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLuint baseinstance); -GLAPI PFNGLDRAWELEMENTSINSTANCEDBASEINSTANCEPROC glad_glDrawElementsInstancedBaseInstance; -#define glDrawElementsInstancedBaseInstance glad_glDrawElementsInstancedBaseInstance -typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXBASEINSTANCEPROC)(GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLint basevertex, GLuint baseinstance); -GLAPI PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXBASEINSTANCEPROC glad_glDrawElementsInstancedBaseVertexBaseInstance; -#define glDrawElementsInstancedBaseVertexBaseInstance glad_glDrawElementsInstancedBaseVertexBaseInstance -typedef void (APIENTRYP PFNGLGETINTERNALFORMATIVPROC)(GLenum target, GLenum internalformat, GLenum pname, GLsizei count, GLint *params); -GLAPI PFNGLGETINTERNALFORMATIVPROC glad_glGetInternalformativ; -#define glGetInternalformativ glad_glGetInternalformativ -typedef void (APIENTRYP PFNGLGETACTIVEATOMICCOUNTERBUFFERIVPROC)(GLuint program, GLuint bufferIndex, GLenum pname, GLint *params); -GLAPI PFNGLGETACTIVEATOMICCOUNTERBUFFERIVPROC glad_glGetActiveAtomicCounterBufferiv; -#define glGetActiveAtomicCounterBufferiv glad_glGetActiveAtomicCounterBufferiv -typedef void (APIENTRYP PFNGLBINDIMAGETEXTUREPROC)(GLuint unit, GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum access, GLenum format); -GLAPI PFNGLBINDIMAGETEXTUREPROC glad_glBindImageTexture; -#define glBindImageTexture glad_glBindImageTexture -typedef void (APIENTRYP PFNGLMEMORYBARRIERPROC)(GLbitfield barriers); -GLAPI PFNGLMEMORYBARRIERPROC glad_glMemoryBarrier; -#define glMemoryBarrier glad_glMemoryBarrier -typedef void (APIENTRYP PFNGLTEXSTORAGE1DPROC)(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width); -GLAPI PFNGLTEXSTORAGE1DPROC glad_glTexStorage1D; -#define glTexStorage1D glad_glTexStorage1D -typedef void (APIENTRYP PFNGLTEXSTORAGE2DPROC)(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height); -GLAPI PFNGLTEXSTORAGE2DPROC glad_glTexStorage2D; -#define glTexStorage2D glad_glTexStorage2D -typedef void (APIENTRYP PFNGLTEXSTORAGE3DPROC)(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth); -GLAPI PFNGLTEXSTORAGE3DPROC glad_glTexStorage3D; -#define glTexStorage3D glad_glTexStorage3D -typedef void (APIENTRYP PFNGLDRAWTRANSFORMFEEDBACKINSTANCEDPROC)(GLenum mode, GLuint id, GLsizei instancecount); -GLAPI PFNGLDRAWTRANSFORMFEEDBACKINSTANCEDPROC glad_glDrawTransformFeedbackInstanced; -#define glDrawTransformFeedbackInstanced glad_glDrawTransformFeedbackInstanced -typedef void (APIENTRYP PFNGLDRAWTRANSFORMFEEDBACKSTREAMINSTANCEDPROC)(GLenum mode, GLuint id, GLuint stream, GLsizei instancecount); -GLAPI PFNGLDRAWTRANSFORMFEEDBACKSTREAMINSTANCEDPROC glad_glDrawTransformFeedbackStreamInstanced; -#define glDrawTransformFeedbackStreamInstanced glad_glDrawTransformFeedbackStreamInstanced -#endif -#ifndef GL_VERSION_4_3 -#define GL_VERSION_4_3 1 -GLAPI int GLAD_GL_VERSION_4_3; -typedef void (APIENTRYP PFNGLCLEARBUFFERDATAPROC)(GLenum target, GLenum internalformat, GLenum format, GLenum type, const void *data); -GLAPI PFNGLCLEARBUFFERDATAPROC glad_glClearBufferData; -#define glClearBufferData glad_glClearBufferData -typedef void (APIENTRYP PFNGLCLEARBUFFERSUBDATAPROC)(GLenum target, GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum type, const void *data); -GLAPI PFNGLCLEARBUFFERSUBDATAPROC glad_glClearBufferSubData; -#define glClearBufferSubData glad_glClearBufferSubData -typedef void (APIENTRYP PFNGLDISPATCHCOMPUTEPROC)(GLuint num_groups_x, GLuint num_groups_y, GLuint num_groups_z); -GLAPI PFNGLDISPATCHCOMPUTEPROC glad_glDispatchCompute; -#define glDispatchCompute glad_glDispatchCompute -typedef void (APIENTRYP PFNGLDISPATCHCOMPUTEINDIRECTPROC)(GLintptr indirect); -GLAPI PFNGLDISPATCHCOMPUTEINDIRECTPROC glad_glDispatchComputeIndirect; -#define glDispatchComputeIndirect glad_glDispatchComputeIndirect -typedef void (APIENTRYP PFNGLCOPYIMAGESUBDATAPROC)(GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth); -GLAPI PFNGLCOPYIMAGESUBDATAPROC glad_glCopyImageSubData; -#define glCopyImageSubData glad_glCopyImageSubData -typedef void (APIENTRYP PFNGLFRAMEBUFFERPARAMETERIPROC)(GLenum target, GLenum pname, GLint param); -GLAPI PFNGLFRAMEBUFFERPARAMETERIPROC glad_glFramebufferParameteri; -#define glFramebufferParameteri glad_glFramebufferParameteri -typedef void (APIENTRYP PFNGLGETFRAMEBUFFERPARAMETERIVPROC)(GLenum target, GLenum pname, GLint *params); -GLAPI PFNGLGETFRAMEBUFFERPARAMETERIVPROC glad_glGetFramebufferParameteriv; -#define glGetFramebufferParameteriv glad_glGetFramebufferParameteriv -typedef void (APIENTRYP PFNGLGETINTERNALFORMATI64VPROC)(GLenum target, GLenum internalformat, GLenum pname, GLsizei count, GLint64 *params); -GLAPI PFNGLGETINTERNALFORMATI64VPROC glad_glGetInternalformati64v; -#define glGetInternalformati64v glad_glGetInternalformati64v -typedef void (APIENTRYP PFNGLINVALIDATETEXSUBIMAGEPROC)(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth); -GLAPI PFNGLINVALIDATETEXSUBIMAGEPROC glad_glInvalidateTexSubImage; -#define glInvalidateTexSubImage glad_glInvalidateTexSubImage -typedef void (APIENTRYP PFNGLINVALIDATETEXIMAGEPROC)(GLuint texture, GLint level); -GLAPI PFNGLINVALIDATETEXIMAGEPROC glad_glInvalidateTexImage; -#define glInvalidateTexImage glad_glInvalidateTexImage -typedef void (APIENTRYP PFNGLINVALIDATEBUFFERSUBDATAPROC)(GLuint buffer, GLintptr offset, GLsizeiptr length); -GLAPI PFNGLINVALIDATEBUFFERSUBDATAPROC glad_glInvalidateBufferSubData; -#define glInvalidateBufferSubData glad_glInvalidateBufferSubData -typedef void (APIENTRYP PFNGLINVALIDATEBUFFERDATAPROC)(GLuint buffer); -GLAPI PFNGLINVALIDATEBUFFERDATAPROC glad_glInvalidateBufferData; -#define glInvalidateBufferData glad_glInvalidateBufferData -typedef void (APIENTRYP PFNGLINVALIDATEFRAMEBUFFERPROC)(GLenum target, GLsizei numAttachments, const GLenum *attachments); -GLAPI PFNGLINVALIDATEFRAMEBUFFERPROC glad_glInvalidateFramebuffer; -#define glInvalidateFramebuffer glad_glInvalidateFramebuffer -typedef void (APIENTRYP PFNGLINVALIDATESUBFRAMEBUFFERPROC)(GLenum target, GLsizei numAttachments, const GLenum *attachments, GLint x, GLint y, GLsizei width, GLsizei height); -GLAPI PFNGLINVALIDATESUBFRAMEBUFFERPROC glad_glInvalidateSubFramebuffer; -#define glInvalidateSubFramebuffer glad_glInvalidateSubFramebuffer -typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSINDIRECTPROC)(GLenum mode, const void *indirect, GLsizei drawcount, GLsizei stride); -GLAPI PFNGLMULTIDRAWARRAYSINDIRECTPROC glad_glMultiDrawArraysIndirect; -#define glMultiDrawArraysIndirect glad_glMultiDrawArraysIndirect -typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSINDIRECTPROC)(GLenum mode, GLenum type, const void *indirect, GLsizei drawcount, GLsizei stride); -GLAPI PFNGLMULTIDRAWELEMENTSINDIRECTPROC glad_glMultiDrawElementsIndirect; -#define glMultiDrawElementsIndirect glad_glMultiDrawElementsIndirect -typedef void (APIENTRYP PFNGLGETPROGRAMINTERFACEIVPROC)(GLuint program, GLenum programInterface, GLenum pname, GLint *params); -GLAPI PFNGLGETPROGRAMINTERFACEIVPROC glad_glGetProgramInterfaceiv; -#define glGetProgramInterfaceiv glad_glGetProgramInterfaceiv -typedef GLuint (APIENTRYP PFNGLGETPROGRAMRESOURCEINDEXPROC)(GLuint program, GLenum programInterface, const GLchar *name); -GLAPI PFNGLGETPROGRAMRESOURCEINDEXPROC glad_glGetProgramResourceIndex; -#define glGetProgramResourceIndex glad_glGetProgramResourceIndex -typedef void (APIENTRYP PFNGLGETPROGRAMRESOURCENAMEPROC)(GLuint program, GLenum programInterface, GLuint index, GLsizei bufSize, GLsizei *length, GLchar *name); -GLAPI PFNGLGETPROGRAMRESOURCENAMEPROC glad_glGetProgramResourceName; -#define glGetProgramResourceName glad_glGetProgramResourceName -typedef void (APIENTRYP PFNGLGETPROGRAMRESOURCEIVPROC)(GLuint program, GLenum programInterface, GLuint index, GLsizei propCount, const GLenum *props, GLsizei count, GLsizei *length, GLint *params); -GLAPI PFNGLGETPROGRAMRESOURCEIVPROC glad_glGetProgramResourceiv; -#define glGetProgramResourceiv glad_glGetProgramResourceiv -typedef GLint (APIENTRYP PFNGLGETPROGRAMRESOURCELOCATIONPROC)(GLuint program, GLenum programInterface, const GLchar *name); -GLAPI PFNGLGETPROGRAMRESOURCELOCATIONPROC glad_glGetProgramResourceLocation; -#define glGetProgramResourceLocation glad_glGetProgramResourceLocation -typedef GLint (APIENTRYP PFNGLGETPROGRAMRESOURCELOCATIONINDEXPROC)(GLuint program, GLenum programInterface, const GLchar *name); -GLAPI PFNGLGETPROGRAMRESOURCELOCATIONINDEXPROC glad_glGetProgramResourceLocationIndex; -#define glGetProgramResourceLocationIndex glad_glGetProgramResourceLocationIndex -typedef void (APIENTRYP PFNGLSHADERSTORAGEBLOCKBINDINGPROC)(GLuint program, GLuint storageBlockIndex, GLuint storageBlockBinding); -GLAPI PFNGLSHADERSTORAGEBLOCKBINDINGPROC glad_glShaderStorageBlockBinding; -#define glShaderStorageBlockBinding glad_glShaderStorageBlockBinding -typedef void (APIENTRYP PFNGLTEXBUFFERRANGEPROC)(GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size); -GLAPI PFNGLTEXBUFFERRANGEPROC glad_glTexBufferRange; -#define glTexBufferRange glad_glTexBufferRange -typedef void (APIENTRYP PFNGLTEXSTORAGE2DMULTISAMPLEPROC)(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations); -GLAPI PFNGLTEXSTORAGE2DMULTISAMPLEPROC glad_glTexStorage2DMultisample; -#define glTexStorage2DMultisample glad_glTexStorage2DMultisample -typedef void (APIENTRYP PFNGLTEXSTORAGE3DMULTISAMPLEPROC)(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations); -GLAPI PFNGLTEXSTORAGE3DMULTISAMPLEPROC glad_glTexStorage3DMultisample; -#define glTexStorage3DMultisample glad_glTexStorage3DMultisample -typedef void (APIENTRYP PFNGLTEXTUREVIEWPROC)(GLuint texture, GLenum target, GLuint origtexture, GLenum internalformat, GLuint minlevel, GLuint numlevels, GLuint minlayer, GLuint numlayers); -GLAPI PFNGLTEXTUREVIEWPROC glad_glTextureView; -#define glTextureView glad_glTextureView -typedef void (APIENTRYP PFNGLBINDVERTEXBUFFERPROC)(GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride); -GLAPI PFNGLBINDVERTEXBUFFERPROC glad_glBindVertexBuffer; -#define glBindVertexBuffer glad_glBindVertexBuffer -typedef void (APIENTRYP PFNGLVERTEXATTRIBFORMATPROC)(GLuint attribindex, GLint size, GLenum type, GLboolean normalized, GLuint relativeoffset); -GLAPI PFNGLVERTEXATTRIBFORMATPROC glad_glVertexAttribFormat; -#define glVertexAttribFormat glad_glVertexAttribFormat -typedef void (APIENTRYP PFNGLVERTEXATTRIBIFORMATPROC)(GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset); -GLAPI PFNGLVERTEXATTRIBIFORMATPROC glad_glVertexAttribIFormat; -#define glVertexAttribIFormat glad_glVertexAttribIFormat -typedef void (APIENTRYP PFNGLVERTEXATTRIBLFORMATPROC)(GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset); -GLAPI PFNGLVERTEXATTRIBLFORMATPROC glad_glVertexAttribLFormat; -#define glVertexAttribLFormat glad_glVertexAttribLFormat -typedef void (APIENTRYP PFNGLVERTEXATTRIBBINDINGPROC)(GLuint attribindex, GLuint bindingindex); -GLAPI PFNGLVERTEXATTRIBBINDINGPROC glad_glVertexAttribBinding; -#define glVertexAttribBinding glad_glVertexAttribBinding -typedef void (APIENTRYP PFNGLVERTEXBINDINGDIVISORPROC)(GLuint bindingindex, GLuint divisor); -GLAPI PFNGLVERTEXBINDINGDIVISORPROC glad_glVertexBindingDivisor; -#define glVertexBindingDivisor glad_glVertexBindingDivisor -typedef void (APIENTRYP PFNGLDEBUGMESSAGECONTROLPROC)(GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled); -GLAPI PFNGLDEBUGMESSAGECONTROLPROC glad_glDebugMessageControl; -#define glDebugMessageControl glad_glDebugMessageControl -typedef void (APIENTRYP PFNGLDEBUGMESSAGEINSERTPROC)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf); -GLAPI PFNGLDEBUGMESSAGEINSERTPROC glad_glDebugMessageInsert; -#define glDebugMessageInsert glad_glDebugMessageInsert -typedef void (APIENTRYP PFNGLDEBUGMESSAGECALLBACKPROC)(GLDEBUGPROC callback, const void *userParam); -GLAPI PFNGLDEBUGMESSAGECALLBACKPROC glad_glDebugMessageCallback; -#define glDebugMessageCallback glad_glDebugMessageCallback -typedef GLuint (APIENTRYP PFNGLGETDEBUGMESSAGELOGPROC)(GLuint count, GLsizei bufSize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog); -GLAPI PFNGLGETDEBUGMESSAGELOGPROC glad_glGetDebugMessageLog; -#define glGetDebugMessageLog glad_glGetDebugMessageLog -typedef void (APIENTRYP PFNGLPUSHDEBUGGROUPPROC)(GLenum source, GLuint id, GLsizei length, const GLchar *message); -GLAPI PFNGLPUSHDEBUGGROUPPROC glad_glPushDebugGroup; -#define glPushDebugGroup glad_glPushDebugGroup -typedef void (APIENTRYP PFNGLPOPDEBUGGROUPPROC)(void); -GLAPI PFNGLPOPDEBUGGROUPPROC glad_glPopDebugGroup; -#define glPopDebugGroup glad_glPopDebugGroup -typedef void (APIENTRYP PFNGLOBJECTLABELPROC)(GLenum identifier, GLuint name, GLsizei length, const GLchar *label); -GLAPI PFNGLOBJECTLABELPROC glad_glObjectLabel; -#define glObjectLabel glad_glObjectLabel -typedef void (APIENTRYP PFNGLGETOBJECTLABELPROC)(GLenum identifier, GLuint name, GLsizei bufSize, GLsizei *length, GLchar *label); -GLAPI PFNGLGETOBJECTLABELPROC glad_glGetObjectLabel; -#define glGetObjectLabel glad_glGetObjectLabel -typedef void (APIENTRYP PFNGLOBJECTPTRLABELPROC)(const void *ptr, GLsizei length, const GLchar *label); -GLAPI PFNGLOBJECTPTRLABELPROC glad_glObjectPtrLabel; -#define glObjectPtrLabel glad_glObjectPtrLabel -typedef void (APIENTRYP PFNGLGETOBJECTPTRLABELPROC)(const void *ptr, GLsizei bufSize, GLsizei *length, GLchar *label); -GLAPI PFNGLGETOBJECTPTRLABELPROC glad_glGetObjectPtrLabel; -#define glGetObjectPtrLabel glad_glGetObjectPtrLabel -#endif -#define GL_COMPRESSED_RED_RGTC1_EXT 0x8DBB -#define GL_COMPRESSED_SIGNED_RED_RGTC1_EXT 0x8DBC -#define GL_COMPRESSED_RED_GREEN_RGTC2_EXT 0x8DBD -#define GL_COMPRESSED_SIGNED_RED_GREEN_RGTC2_EXT 0x8DBE -#define GL_COMPRESSED_RGB_S3TC_DXT1_EXT 0x83F0 -#define GL_COMPRESSED_RGBA_S3TC_DXT1_EXT 0x83F1 -#define GL_COMPRESSED_RGBA_S3TC_DXT3_EXT 0x83F2 -#define GL_COMPRESSED_RGBA_S3TC_DXT5_EXT 0x83F3 -#define GL_TEXTURE_MAX_ANISOTROPY_EXT 0x84FE -#define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF -#ifndef GL_EXT_texture_compression_rgtc -#define GL_EXT_texture_compression_rgtc 1 -GLAPI int GLAD_GL_EXT_texture_compression_rgtc; -#endif -#ifndef GL_EXT_texture_compression_s3tc -#define GL_EXT_texture_compression_s3tc 1 -GLAPI int GLAD_GL_EXT_texture_compression_s3tc; -#endif -#ifndef GL_EXT_texture_filter_anisotropic -#define GL_EXT_texture_filter_anisotropic 1 -GLAPI int GLAD_GL_EXT_texture_filter_anisotropic; -#endif - -#ifdef __cplusplus -} -#endif - -#endif +/* + + OpenGL loader generated by glad 0.1.36 on Fri Nov 11 19:36:39 2022. + + Language/Generator: C/C++ + Specification: gl + APIs: gl=4.6 + Profile: compatibility + Extensions: + GL_EXT_texture_compression_rgtc, + GL_EXT_texture_compression_s3tc, + GL_EXT_texture_filter_anisotropic + Loader: False + Local files: False + Omit khrplatform: False + Reproducible: False + + Commandline: + --profile="compatibility" --api="gl=4.6" --generator="c" --spec="gl" --no-loader --extensions="GL_EXT_texture_compression_rgtc,GL_EXT_texture_compression_s3tc,GL_EXT_texture_filter_anisotropic" + Online: + https://glad.dav1d.de/#profile=compatibility&language=c&specification=gl&api=gl%3D4.6&extensions=GL_EXT_texture_compression_rgtc&extensions=GL_EXT_texture_compression_s3tc&extensions=GL_EXT_texture_filter_anisotropic +*/ + + +#ifndef __glad_h_ +#define __glad_h_ + +#ifdef __gl_h_ +#error OpenGL header already included, remove this include, glad already provides it +#endif +#define __gl_h_ + +#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) +#define APIENTRY __stdcall +#endif + +#ifndef APIENTRY +#define APIENTRY +#endif +#ifndef APIENTRYP +#define APIENTRYP APIENTRY * +#endif + +#ifndef GLAPIENTRY +#define GLAPIENTRY APIENTRY +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +struct gladGLversionStruct { + int major; + int minor; +}; + +typedef void* (* GLADloadproc)(const char *name); + +#ifndef GLAPI +# if defined(GLAD_GLAPI_EXPORT) +# if defined(_WIN32) || defined(__CYGWIN__) +# if defined(GLAD_GLAPI_EXPORT_BUILD) +# if defined(__GNUC__) +# define GLAPI __attribute__ ((dllexport)) extern +# else +# define GLAPI __declspec(dllexport) extern +# endif +# else +# if defined(__GNUC__) +# define GLAPI __attribute__ ((dllimport)) extern +# else +# define GLAPI __declspec(dllimport) extern +# endif +# endif +# elif defined(__GNUC__) && defined(GLAD_GLAPI_EXPORT_BUILD) +# define GLAPI __attribute__ ((visibility ("default"))) extern +# else +# define GLAPI extern +# endif +# else +# define GLAPI extern +# endif +#endif + +GLAPI struct gladGLversionStruct GLVersion; +GLAPI int gladLoadGLLoader(GLADloadproc); + +#include +typedef unsigned int GLenum; +typedef unsigned char GLboolean; +typedef unsigned int GLbitfield; +typedef void GLvoid; +typedef khronos_int8_t GLbyte; +typedef khronos_uint8_t GLubyte; +typedef khronos_int16_t GLshort; +typedef khronos_uint16_t GLushort; +typedef int GLint; +typedef unsigned int GLuint; +typedef khronos_int32_t GLclampx; +typedef int GLsizei; +typedef khronos_float_t GLfloat; +typedef khronos_float_t GLclampf; +typedef double GLdouble; +typedef double GLclampd; +typedef void *GLeglClientBufferEXT; +typedef void *GLeglImageOES; +typedef char GLchar; +typedef char GLcharARB; +#ifdef __APPLE__ +typedef void *GLhandleARB; +#else +typedef unsigned int GLhandleARB; +#endif +typedef khronos_uint16_t GLhalf; +typedef khronos_uint16_t GLhalfARB; +typedef khronos_int32_t GLfixed; +typedef khronos_intptr_t GLintptr; +typedef khronos_intptr_t GLintptrARB; +typedef khronos_ssize_t GLsizeiptr; +typedef khronos_ssize_t GLsizeiptrARB; +typedef khronos_int64_t GLint64; +typedef khronos_int64_t GLint64EXT; +typedef khronos_uint64_t GLuint64; +typedef khronos_uint64_t GLuint64EXT; +typedef struct __GLsync *GLsync; +struct _cl_context; +struct _cl_event; +typedef void (APIENTRY *GLDEBUGPROC)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,const void *userParam); +typedef void (APIENTRY *GLDEBUGPROCARB)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,const void *userParam); +typedef void (APIENTRY *GLDEBUGPROCKHR)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,const void *userParam); +typedef void (APIENTRY *GLDEBUGPROCAMD)(GLuint id,GLenum category,GLenum severity,GLsizei length,const GLchar *message,void *userParam); +typedef unsigned short GLhalfNV; +typedef GLintptr GLvdpauSurfaceNV; +typedef void (APIENTRY *GLVULKANPROCNV)(void); +#define GL_DEPTH_BUFFER_BIT 0x00000100 +#define GL_STENCIL_BUFFER_BIT 0x00000400 +#define GL_COLOR_BUFFER_BIT 0x00004000 +#define GL_FALSE 0 +#define GL_TRUE 1 +#define GL_POINTS 0x0000 +#define GL_LINES 0x0001 +#define GL_LINE_LOOP 0x0002 +#define GL_LINE_STRIP 0x0003 +#define GL_TRIANGLES 0x0004 +#define GL_TRIANGLE_STRIP 0x0005 +#define GL_TRIANGLE_FAN 0x0006 +#define GL_QUADS 0x0007 +#define GL_NEVER 0x0200 +#define GL_LESS 0x0201 +#define GL_EQUAL 0x0202 +#define GL_LEQUAL 0x0203 +#define GL_GREATER 0x0204 +#define GL_NOTEQUAL 0x0205 +#define GL_GEQUAL 0x0206 +#define GL_ALWAYS 0x0207 +#define GL_ZERO 0 +#define GL_ONE 1 +#define GL_SRC_COLOR 0x0300 +#define GL_ONE_MINUS_SRC_COLOR 0x0301 +#define GL_SRC_ALPHA 0x0302 +#define GL_ONE_MINUS_SRC_ALPHA 0x0303 +#define GL_DST_ALPHA 0x0304 +#define GL_ONE_MINUS_DST_ALPHA 0x0305 +#define GL_DST_COLOR 0x0306 +#define GL_ONE_MINUS_DST_COLOR 0x0307 +#define GL_SRC_ALPHA_SATURATE 0x0308 +#define GL_NONE 0 +#define GL_FRONT_LEFT 0x0400 +#define GL_FRONT_RIGHT 0x0401 +#define GL_BACK_LEFT 0x0402 +#define GL_BACK_RIGHT 0x0403 +#define GL_FRONT 0x0404 +#define GL_BACK 0x0405 +#define GL_LEFT 0x0406 +#define GL_RIGHT 0x0407 +#define GL_FRONT_AND_BACK 0x0408 +#define GL_NO_ERROR 0 +#define GL_INVALID_ENUM 0x0500 +#define GL_INVALID_VALUE 0x0501 +#define GL_INVALID_OPERATION 0x0502 +#define GL_OUT_OF_MEMORY 0x0505 +#define GL_CW 0x0900 +#define GL_CCW 0x0901 +#define GL_POINT_SIZE 0x0B11 +#define GL_POINT_SIZE_RANGE 0x0B12 +#define GL_POINT_SIZE_GRANULARITY 0x0B13 +#define GL_LINE_SMOOTH 0x0B20 +#define GL_LINE_WIDTH 0x0B21 +#define GL_LINE_WIDTH_RANGE 0x0B22 +#define GL_LINE_WIDTH_GRANULARITY 0x0B23 +#define GL_POLYGON_MODE 0x0B40 +#define GL_POLYGON_SMOOTH 0x0B41 +#define GL_CULL_FACE 0x0B44 +#define GL_CULL_FACE_MODE 0x0B45 +#define GL_FRONT_FACE 0x0B46 +#define GL_DEPTH_RANGE 0x0B70 +#define GL_DEPTH_TEST 0x0B71 +#define GL_DEPTH_WRITEMASK 0x0B72 +#define GL_DEPTH_CLEAR_VALUE 0x0B73 +#define GL_DEPTH_FUNC 0x0B74 +#define GL_STENCIL_TEST 0x0B90 +#define GL_STENCIL_CLEAR_VALUE 0x0B91 +#define GL_STENCIL_FUNC 0x0B92 +#define GL_STENCIL_VALUE_MASK 0x0B93 +#define GL_STENCIL_FAIL 0x0B94 +#define GL_STENCIL_PASS_DEPTH_FAIL 0x0B95 +#define GL_STENCIL_PASS_DEPTH_PASS 0x0B96 +#define GL_STENCIL_REF 0x0B97 +#define GL_STENCIL_WRITEMASK 0x0B98 +#define GL_VIEWPORT 0x0BA2 +#define GL_DITHER 0x0BD0 +#define GL_BLEND_DST 0x0BE0 +#define GL_BLEND_SRC 0x0BE1 +#define GL_BLEND 0x0BE2 +#define GL_LOGIC_OP_MODE 0x0BF0 +#define GL_DRAW_BUFFER 0x0C01 +#define GL_READ_BUFFER 0x0C02 +#define GL_SCISSOR_BOX 0x0C10 +#define GL_SCISSOR_TEST 0x0C11 +#define GL_COLOR_CLEAR_VALUE 0x0C22 +#define GL_COLOR_WRITEMASK 0x0C23 +#define GL_DOUBLEBUFFER 0x0C32 +#define GL_STEREO 0x0C33 +#define GL_LINE_SMOOTH_HINT 0x0C52 +#define GL_POLYGON_SMOOTH_HINT 0x0C53 +#define GL_UNPACK_SWAP_BYTES 0x0CF0 +#define GL_UNPACK_LSB_FIRST 0x0CF1 +#define GL_UNPACK_ROW_LENGTH 0x0CF2 +#define GL_UNPACK_SKIP_ROWS 0x0CF3 +#define GL_UNPACK_SKIP_PIXELS 0x0CF4 +#define GL_UNPACK_ALIGNMENT 0x0CF5 +#define GL_PACK_SWAP_BYTES 0x0D00 +#define GL_PACK_LSB_FIRST 0x0D01 +#define GL_PACK_ROW_LENGTH 0x0D02 +#define GL_PACK_SKIP_ROWS 0x0D03 +#define GL_PACK_SKIP_PIXELS 0x0D04 +#define GL_PACK_ALIGNMENT 0x0D05 +#define GL_MAX_TEXTURE_SIZE 0x0D33 +#define GL_MAX_VIEWPORT_DIMS 0x0D3A +#define GL_SUBPIXEL_BITS 0x0D50 +#define GL_TEXTURE_1D 0x0DE0 +#define GL_TEXTURE_2D 0x0DE1 +#define GL_TEXTURE_WIDTH 0x1000 +#define GL_TEXTURE_HEIGHT 0x1001 +#define GL_TEXTURE_BORDER_COLOR 0x1004 +#define GL_DONT_CARE 0x1100 +#define GL_FASTEST 0x1101 +#define GL_NICEST 0x1102 +#define GL_BYTE 0x1400 +#define GL_UNSIGNED_BYTE 0x1401 +#define GL_SHORT 0x1402 +#define GL_UNSIGNED_SHORT 0x1403 +#define GL_INT 0x1404 +#define GL_UNSIGNED_INT 0x1405 +#define GL_FLOAT 0x1406 +#define GL_STACK_OVERFLOW 0x0503 +#define GL_STACK_UNDERFLOW 0x0504 +#define GL_CLEAR 0x1500 +#define GL_AND 0x1501 +#define GL_AND_REVERSE 0x1502 +#define GL_COPY 0x1503 +#define GL_AND_INVERTED 0x1504 +#define GL_NOOP 0x1505 +#define GL_XOR 0x1506 +#define GL_OR 0x1507 +#define GL_NOR 0x1508 +#define GL_EQUIV 0x1509 +#define GL_INVERT 0x150A +#define GL_OR_REVERSE 0x150B +#define GL_COPY_INVERTED 0x150C +#define GL_OR_INVERTED 0x150D +#define GL_NAND 0x150E +#define GL_SET 0x150F +#define GL_TEXTURE 0x1702 +#define GL_COLOR 0x1800 +#define GL_DEPTH 0x1801 +#define GL_STENCIL 0x1802 +#define GL_STENCIL_INDEX 0x1901 +#define GL_DEPTH_COMPONENT 0x1902 +#define GL_RED 0x1903 +#define GL_GREEN 0x1904 +#define GL_BLUE 0x1905 +#define GL_ALPHA 0x1906 +#define GL_RGB 0x1907 +#define GL_RGBA 0x1908 +#define GL_POINT 0x1B00 +#define GL_LINE 0x1B01 +#define GL_FILL 0x1B02 +#define GL_KEEP 0x1E00 +#define GL_REPLACE 0x1E01 +#define GL_INCR 0x1E02 +#define GL_DECR 0x1E03 +#define GL_VENDOR 0x1F00 +#define GL_RENDERER 0x1F01 +#define GL_VERSION 0x1F02 +#define GL_EXTENSIONS 0x1F03 +#define GL_NEAREST 0x2600 +#define GL_LINEAR 0x2601 +#define GL_NEAREST_MIPMAP_NEAREST 0x2700 +#define GL_LINEAR_MIPMAP_NEAREST 0x2701 +#define GL_NEAREST_MIPMAP_LINEAR 0x2702 +#define GL_LINEAR_MIPMAP_LINEAR 0x2703 +#define GL_TEXTURE_MAG_FILTER 0x2800 +#define GL_TEXTURE_MIN_FILTER 0x2801 +#define GL_TEXTURE_WRAP_S 0x2802 +#define GL_TEXTURE_WRAP_T 0x2803 +#define GL_REPEAT 0x2901 +#define GL_CURRENT_BIT 0x00000001 +#define GL_POINT_BIT 0x00000002 +#define GL_LINE_BIT 0x00000004 +#define GL_POLYGON_BIT 0x00000008 +#define GL_POLYGON_STIPPLE_BIT 0x00000010 +#define GL_PIXEL_MODE_BIT 0x00000020 +#define GL_LIGHTING_BIT 0x00000040 +#define GL_FOG_BIT 0x00000080 +#define GL_ACCUM_BUFFER_BIT 0x00000200 +#define GL_VIEWPORT_BIT 0x00000800 +#define GL_TRANSFORM_BIT 0x00001000 +#define GL_ENABLE_BIT 0x00002000 +#define GL_HINT_BIT 0x00008000 +#define GL_EVAL_BIT 0x00010000 +#define GL_LIST_BIT 0x00020000 +#define GL_TEXTURE_BIT 0x00040000 +#define GL_SCISSOR_BIT 0x00080000 +#define GL_ALL_ATTRIB_BITS 0xFFFFFFFF +#define GL_QUAD_STRIP 0x0008 +#define GL_POLYGON 0x0009 +#define GL_ACCUM 0x0100 +#define GL_LOAD 0x0101 +#define GL_RETURN 0x0102 +#define GL_MULT 0x0103 +#define GL_ADD 0x0104 +#define GL_AUX0 0x0409 +#define GL_AUX1 0x040A +#define GL_AUX2 0x040B +#define GL_AUX3 0x040C +#define GL_2D 0x0600 +#define GL_3D 0x0601 +#define GL_3D_COLOR 0x0602 +#define GL_3D_COLOR_TEXTURE 0x0603 +#define GL_4D_COLOR_TEXTURE 0x0604 +#define GL_PASS_THROUGH_TOKEN 0x0700 +#define GL_POINT_TOKEN 0x0701 +#define GL_LINE_TOKEN 0x0702 +#define GL_POLYGON_TOKEN 0x0703 +#define GL_BITMAP_TOKEN 0x0704 +#define GL_DRAW_PIXEL_TOKEN 0x0705 +#define GL_COPY_PIXEL_TOKEN 0x0706 +#define GL_LINE_RESET_TOKEN 0x0707 +#define GL_EXP 0x0800 +#define GL_EXP2 0x0801 +#define GL_COEFF 0x0A00 +#define GL_ORDER 0x0A01 +#define GL_DOMAIN 0x0A02 +#define GL_PIXEL_MAP_I_TO_I 0x0C70 +#define GL_PIXEL_MAP_S_TO_S 0x0C71 +#define GL_PIXEL_MAP_I_TO_R 0x0C72 +#define GL_PIXEL_MAP_I_TO_G 0x0C73 +#define GL_PIXEL_MAP_I_TO_B 0x0C74 +#define GL_PIXEL_MAP_I_TO_A 0x0C75 +#define GL_PIXEL_MAP_R_TO_R 0x0C76 +#define GL_PIXEL_MAP_G_TO_G 0x0C77 +#define GL_PIXEL_MAP_B_TO_B 0x0C78 +#define GL_PIXEL_MAP_A_TO_A 0x0C79 +#define GL_CURRENT_COLOR 0x0B00 +#define GL_CURRENT_INDEX 0x0B01 +#define GL_CURRENT_NORMAL 0x0B02 +#define GL_CURRENT_TEXTURE_COORDS 0x0B03 +#define GL_CURRENT_RASTER_COLOR 0x0B04 +#define GL_CURRENT_RASTER_INDEX 0x0B05 +#define GL_CURRENT_RASTER_TEXTURE_COORDS 0x0B06 +#define GL_CURRENT_RASTER_POSITION 0x0B07 +#define GL_CURRENT_RASTER_POSITION_VALID 0x0B08 +#define GL_CURRENT_RASTER_DISTANCE 0x0B09 +#define GL_POINT_SMOOTH 0x0B10 +#define GL_LINE_STIPPLE 0x0B24 +#define GL_LINE_STIPPLE_PATTERN 0x0B25 +#define GL_LINE_STIPPLE_REPEAT 0x0B26 +#define GL_LIST_MODE 0x0B30 +#define GL_MAX_LIST_NESTING 0x0B31 +#define GL_LIST_BASE 0x0B32 +#define GL_LIST_INDEX 0x0B33 +#define GL_POLYGON_STIPPLE 0x0B42 +#define GL_EDGE_FLAG 0x0B43 +#define GL_LIGHTING 0x0B50 +#define GL_LIGHT_MODEL_LOCAL_VIEWER 0x0B51 +#define GL_LIGHT_MODEL_TWO_SIDE 0x0B52 +#define GL_LIGHT_MODEL_AMBIENT 0x0B53 +#define GL_SHADE_MODEL 0x0B54 +#define GL_COLOR_MATERIAL_FACE 0x0B55 +#define GL_COLOR_MATERIAL_PARAMETER 0x0B56 +#define GL_COLOR_MATERIAL 0x0B57 +#define GL_FOG 0x0B60 +#define GL_FOG_INDEX 0x0B61 +#define GL_FOG_DENSITY 0x0B62 +#define GL_FOG_START 0x0B63 +#define GL_FOG_END 0x0B64 +#define GL_FOG_MODE 0x0B65 +#define GL_FOG_COLOR 0x0B66 +#define GL_ACCUM_CLEAR_VALUE 0x0B80 +#define GL_MATRIX_MODE 0x0BA0 +#define GL_NORMALIZE 0x0BA1 +#define GL_MODELVIEW_STACK_DEPTH 0x0BA3 +#define GL_PROJECTION_STACK_DEPTH 0x0BA4 +#define GL_TEXTURE_STACK_DEPTH 0x0BA5 +#define GL_MODELVIEW_MATRIX 0x0BA6 +#define GL_PROJECTION_MATRIX 0x0BA7 +#define GL_TEXTURE_MATRIX 0x0BA8 +#define GL_ATTRIB_STACK_DEPTH 0x0BB0 +#define GL_ALPHA_TEST 0x0BC0 +#define GL_ALPHA_TEST_FUNC 0x0BC1 +#define GL_ALPHA_TEST_REF 0x0BC2 +#define GL_LOGIC_OP 0x0BF1 +#define GL_AUX_BUFFERS 0x0C00 +#define GL_INDEX_CLEAR_VALUE 0x0C20 +#define GL_INDEX_WRITEMASK 0x0C21 +#define GL_INDEX_MODE 0x0C30 +#define GL_RGBA_MODE 0x0C31 +#define GL_RENDER_MODE 0x0C40 +#define GL_PERSPECTIVE_CORRECTION_HINT 0x0C50 +#define GL_POINT_SMOOTH_HINT 0x0C51 +#define GL_FOG_HINT 0x0C54 +#define GL_TEXTURE_GEN_S 0x0C60 +#define GL_TEXTURE_GEN_T 0x0C61 +#define GL_TEXTURE_GEN_R 0x0C62 +#define GL_TEXTURE_GEN_Q 0x0C63 +#define GL_PIXEL_MAP_I_TO_I_SIZE 0x0CB0 +#define GL_PIXEL_MAP_S_TO_S_SIZE 0x0CB1 +#define GL_PIXEL_MAP_I_TO_R_SIZE 0x0CB2 +#define GL_PIXEL_MAP_I_TO_G_SIZE 0x0CB3 +#define GL_PIXEL_MAP_I_TO_B_SIZE 0x0CB4 +#define GL_PIXEL_MAP_I_TO_A_SIZE 0x0CB5 +#define GL_PIXEL_MAP_R_TO_R_SIZE 0x0CB6 +#define GL_PIXEL_MAP_G_TO_G_SIZE 0x0CB7 +#define GL_PIXEL_MAP_B_TO_B_SIZE 0x0CB8 +#define GL_PIXEL_MAP_A_TO_A_SIZE 0x0CB9 +#define GL_MAP_COLOR 0x0D10 +#define GL_MAP_STENCIL 0x0D11 +#define GL_INDEX_SHIFT 0x0D12 +#define GL_INDEX_OFFSET 0x0D13 +#define GL_RED_SCALE 0x0D14 +#define GL_RED_BIAS 0x0D15 +#define GL_ZOOM_X 0x0D16 +#define GL_ZOOM_Y 0x0D17 +#define GL_GREEN_SCALE 0x0D18 +#define GL_GREEN_BIAS 0x0D19 +#define GL_BLUE_SCALE 0x0D1A +#define GL_BLUE_BIAS 0x0D1B +#define GL_ALPHA_SCALE 0x0D1C +#define GL_ALPHA_BIAS 0x0D1D +#define GL_DEPTH_SCALE 0x0D1E +#define GL_DEPTH_BIAS 0x0D1F +#define GL_MAX_EVAL_ORDER 0x0D30 +#define GL_MAX_LIGHTS 0x0D31 +#define GL_MAX_CLIP_PLANES 0x0D32 +#define GL_MAX_PIXEL_MAP_TABLE 0x0D34 +#define GL_MAX_ATTRIB_STACK_DEPTH 0x0D35 +#define GL_MAX_MODELVIEW_STACK_DEPTH 0x0D36 +#define GL_MAX_NAME_STACK_DEPTH 0x0D37 +#define GL_MAX_PROJECTION_STACK_DEPTH 0x0D38 +#define GL_MAX_TEXTURE_STACK_DEPTH 0x0D39 +#define GL_INDEX_BITS 0x0D51 +#define GL_RED_BITS 0x0D52 +#define GL_GREEN_BITS 0x0D53 +#define GL_BLUE_BITS 0x0D54 +#define GL_ALPHA_BITS 0x0D55 +#define GL_DEPTH_BITS 0x0D56 +#define GL_STENCIL_BITS 0x0D57 +#define GL_ACCUM_RED_BITS 0x0D58 +#define GL_ACCUM_GREEN_BITS 0x0D59 +#define GL_ACCUM_BLUE_BITS 0x0D5A +#define GL_ACCUM_ALPHA_BITS 0x0D5B +#define GL_NAME_STACK_DEPTH 0x0D70 +#define GL_AUTO_NORMAL 0x0D80 +#define GL_MAP1_COLOR_4 0x0D90 +#define GL_MAP1_INDEX 0x0D91 +#define GL_MAP1_NORMAL 0x0D92 +#define GL_MAP1_TEXTURE_COORD_1 0x0D93 +#define GL_MAP1_TEXTURE_COORD_2 0x0D94 +#define GL_MAP1_TEXTURE_COORD_3 0x0D95 +#define GL_MAP1_TEXTURE_COORD_4 0x0D96 +#define GL_MAP1_VERTEX_3 0x0D97 +#define GL_MAP1_VERTEX_4 0x0D98 +#define GL_MAP2_COLOR_4 0x0DB0 +#define GL_MAP2_INDEX 0x0DB1 +#define GL_MAP2_NORMAL 0x0DB2 +#define GL_MAP2_TEXTURE_COORD_1 0x0DB3 +#define GL_MAP2_TEXTURE_COORD_2 0x0DB4 +#define GL_MAP2_TEXTURE_COORD_3 0x0DB5 +#define GL_MAP2_TEXTURE_COORD_4 0x0DB6 +#define GL_MAP2_VERTEX_3 0x0DB7 +#define GL_MAP2_VERTEX_4 0x0DB8 +#define GL_MAP1_GRID_DOMAIN 0x0DD0 +#define GL_MAP1_GRID_SEGMENTS 0x0DD1 +#define GL_MAP2_GRID_DOMAIN 0x0DD2 +#define GL_MAP2_GRID_SEGMENTS 0x0DD3 +#define GL_TEXTURE_COMPONENTS 0x1003 +#define GL_TEXTURE_BORDER 0x1005 +#define GL_AMBIENT 0x1200 +#define GL_DIFFUSE 0x1201 +#define GL_SPECULAR 0x1202 +#define GL_POSITION 0x1203 +#define GL_SPOT_DIRECTION 0x1204 +#define GL_SPOT_EXPONENT 0x1205 +#define GL_SPOT_CUTOFF 0x1206 +#define GL_CONSTANT_ATTENUATION 0x1207 +#define GL_LINEAR_ATTENUATION 0x1208 +#define GL_QUADRATIC_ATTENUATION 0x1209 +#define GL_COMPILE 0x1300 +#define GL_COMPILE_AND_EXECUTE 0x1301 +#define GL_2_BYTES 0x1407 +#define GL_3_BYTES 0x1408 +#define GL_4_BYTES 0x1409 +#define GL_EMISSION 0x1600 +#define GL_SHININESS 0x1601 +#define GL_AMBIENT_AND_DIFFUSE 0x1602 +#define GL_COLOR_INDEXES 0x1603 +#define GL_MODELVIEW 0x1700 +#define GL_PROJECTION 0x1701 +#define GL_COLOR_INDEX 0x1900 +#define GL_LUMINANCE 0x1909 +#define GL_LUMINANCE_ALPHA 0x190A +#define GL_BITMAP 0x1A00 +#define GL_RENDER 0x1C00 +#define GL_FEEDBACK 0x1C01 +#define GL_SELECT 0x1C02 +#define GL_FLAT 0x1D00 +#define GL_SMOOTH 0x1D01 +#define GL_S 0x2000 +#define GL_T 0x2001 +#define GL_R 0x2002 +#define GL_Q 0x2003 +#define GL_MODULATE 0x2100 +#define GL_DECAL 0x2101 +#define GL_TEXTURE_ENV_MODE 0x2200 +#define GL_TEXTURE_ENV_COLOR 0x2201 +#define GL_TEXTURE_ENV 0x2300 +#define GL_EYE_LINEAR 0x2400 +#define GL_OBJECT_LINEAR 0x2401 +#define GL_SPHERE_MAP 0x2402 +#define GL_TEXTURE_GEN_MODE 0x2500 +#define GL_OBJECT_PLANE 0x2501 +#define GL_EYE_PLANE 0x2502 +#define GL_CLAMP 0x2900 +#define GL_CLIP_PLANE0 0x3000 +#define GL_CLIP_PLANE1 0x3001 +#define GL_CLIP_PLANE2 0x3002 +#define GL_CLIP_PLANE3 0x3003 +#define GL_CLIP_PLANE4 0x3004 +#define GL_CLIP_PLANE5 0x3005 +#define GL_LIGHT0 0x4000 +#define GL_LIGHT1 0x4001 +#define GL_LIGHT2 0x4002 +#define GL_LIGHT3 0x4003 +#define GL_LIGHT4 0x4004 +#define GL_LIGHT5 0x4005 +#define GL_LIGHT6 0x4006 +#define GL_LIGHT7 0x4007 +#define GL_COLOR_LOGIC_OP 0x0BF2 +#define GL_POLYGON_OFFSET_UNITS 0x2A00 +#define GL_POLYGON_OFFSET_POINT 0x2A01 +#define GL_POLYGON_OFFSET_LINE 0x2A02 +#define GL_POLYGON_OFFSET_FILL 0x8037 +#define GL_POLYGON_OFFSET_FACTOR 0x8038 +#define GL_TEXTURE_BINDING_1D 0x8068 +#define GL_TEXTURE_BINDING_2D 0x8069 +#define GL_TEXTURE_INTERNAL_FORMAT 0x1003 +#define GL_TEXTURE_RED_SIZE 0x805C +#define GL_TEXTURE_GREEN_SIZE 0x805D +#define GL_TEXTURE_BLUE_SIZE 0x805E +#define GL_TEXTURE_ALPHA_SIZE 0x805F +#define GL_DOUBLE 0x140A +#define GL_PROXY_TEXTURE_1D 0x8063 +#define GL_PROXY_TEXTURE_2D 0x8064 +#define GL_R3_G3_B2 0x2A10 +#define GL_RGB4 0x804F +#define GL_RGB5 0x8050 +#define GL_RGB8 0x8051 +#define GL_RGB10 0x8052 +#define GL_RGB12 0x8053 +#define GL_RGB16 0x8054 +#define GL_RGBA2 0x8055 +#define GL_RGBA4 0x8056 +#define GL_RGB5_A1 0x8057 +#define GL_RGBA8 0x8058 +#define GL_RGB10_A2 0x8059 +#define GL_RGBA12 0x805A +#define GL_RGBA16 0x805B +#define GL_CLIENT_PIXEL_STORE_BIT 0x00000001 +#define GL_CLIENT_VERTEX_ARRAY_BIT 0x00000002 +#define GL_CLIENT_ALL_ATTRIB_BITS 0xFFFFFFFF +#define GL_VERTEX_ARRAY_POINTER 0x808E +#define GL_NORMAL_ARRAY_POINTER 0x808F +#define GL_COLOR_ARRAY_POINTER 0x8090 +#define GL_INDEX_ARRAY_POINTER 0x8091 +#define GL_TEXTURE_COORD_ARRAY_POINTER 0x8092 +#define GL_EDGE_FLAG_ARRAY_POINTER 0x8093 +#define GL_FEEDBACK_BUFFER_POINTER 0x0DF0 +#define GL_SELECTION_BUFFER_POINTER 0x0DF3 +#define GL_CLIENT_ATTRIB_STACK_DEPTH 0x0BB1 +#define GL_INDEX_LOGIC_OP 0x0BF1 +#define GL_MAX_CLIENT_ATTRIB_STACK_DEPTH 0x0D3B +#define GL_FEEDBACK_BUFFER_SIZE 0x0DF1 +#define GL_FEEDBACK_BUFFER_TYPE 0x0DF2 +#define GL_SELECTION_BUFFER_SIZE 0x0DF4 +#define GL_VERTEX_ARRAY 0x8074 +#define GL_NORMAL_ARRAY 0x8075 +#define GL_COLOR_ARRAY 0x8076 +#define GL_INDEX_ARRAY 0x8077 +#define GL_TEXTURE_COORD_ARRAY 0x8078 +#define GL_EDGE_FLAG_ARRAY 0x8079 +#define GL_VERTEX_ARRAY_SIZE 0x807A +#define GL_VERTEX_ARRAY_TYPE 0x807B +#define GL_VERTEX_ARRAY_STRIDE 0x807C +#define GL_NORMAL_ARRAY_TYPE 0x807E +#define GL_NORMAL_ARRAY_STRIDE 0x807F +#define GL_COLOR_ARRAY_SIZE 0x8081 +#define GL_COLOR_ARRAY_TYPE 0x8082 +#define GL_COLOR_ARRAY_STRIDE 0x8083 +#define GL_INDEX_ARRAY_TYPE 0x8085 +#define GL_INDEX_ARRAY_STRIDE 0x8086 +#define GL_TEXTURE_COORD_ARRAY_SIZE 0x8088 +#define GL_TEXTURE_COORD_ARRAY_TYPE 0x8089 +#define GL_TEXTURE_COORD_ARRAY_STRIDE 0x808A +#define GL_EDGE_FLAG_ARRAY_STRIDE 0x808C +#define GL_TEXTURE_LUMINANCE_SIZE 0x8060 +#define GL_TEXTURE_INTENSITY_SIZE 0x8061 +#define GL_TEXTURE_PRIORITY 0x8066 +#define GL_TEXTURE_RESIDENT 0x8067 +#define GL_ALPHA4 0x803B +#define GL_ALPHA8 0x803C +#define GL_ALPHA12 0x803D +#define GL_ALPHA16 0x803E +#define GL_LUMINANCE4 0x803F +#define GL_LUMINANCE8 0x8040 +#define GL_LUMINANCE12 0x8041 +#define GL_LUMINANCE16 0x8042 +#define GL_LUMINANCE4_ALPHA4 0x8043 +#define GL_LUMINANCE6_ALPHA2 0x8044 +#define GL_LUMINANCE8_ALPHA8 0x8045 +#define GL_LUMINANCE12_ALPHA4 0x8046 +#define GL_LUMINANCE12_ALPHA12 0x8047 +#define GL_LUMINANCE16_ALPHA16 0x8048 +#define GL_INTENSITY 0x8049 +#define GL_INTENSITY4 0x804A +#define GL_INTENSITY8 0x804B +#define GL_INTENSITY12 0x804C +#define GL_INTENSITY16 0x804D +#define GL_V2F 0x2A20 +#define GL_V3F 0x2A21 +#define GL_C4UB_V2F 0x2A22 +#define GL_C4UB_V3F 0x2A23 +#define GL_C3F_V3F 0x2A24 +#define GL_N3F_V3F 0x2A25 +#define GL_C4F_N3F_V3F 0x2A26 +#define GL_T2F_V3F 0x2A27 +#define GL_T4F_V4F 0x2A28 +#define GL_T2F_C4UB_V3F 0x2A29 +#define GL_T2F_C3F_V3F 0x2A2A +#define GL_T2F_N3F_V3F 0x2A2B +#define GL_T2F_C4F_N3F_V3F 0x2A2C +#define GL_T4F_C4F_N3F_V4F 0x2A2D +#define GL_UNSIGNED_BYTE_3_3_2 0x8032 +#define GL_UNSIGNED_SHORT_4_4_4_4 0x8033 +#define GL_UNSIGNED_SHORT_5_5_5_1 0x8034 +#define GL_UNSIGNED_INT_8_8_8_8 0x8035 +#define GL_UNSIGNED_INT_10_10_10_2 0x8036 +#define GL_TEXTURE_BINDING_3D 0x806A +#define GL_PACK_SKIP_IMAGES 0x806B +#define GL_PACK_IMAGE_HEIGHT 0x806C +#define GL_UNPACK_SKIP_IMAGES 0x806D +#define GL_UNPACK_IMAGE_HEIGHT 0x806E +#define GL_TEXTURE_3D 0x806F +#define GL_PROXY_TEXTURE_3D 0x8070 +#define GL_TEXTURE_DEPTH 0x8071 +#define GL_TEXTURE_WRAP_R 0x8072 +#define GL_MAX_3D_TEXTURE_SIZE 0x8073 +#define GL_UNSIGNED_BYTE_2_3_3_REV 0x8362 +#define GL_UNSIGNED_SHORT_5_6_5 0x8363 +#define GL_UNSIGNED_SHORT_5_6_5_REV 0x8364 +#define GL_UNSIGNED_SHORT_4_4_4_4_REV 0x8365 +#define GL_UNSIGNED_SHORT_1_5_5_5_REV 0x8366 +#define GL_UNSIGNED_INT_8_8_8_8_REV 0x8367 +#define GL_UNSIGNED_INT_2_10_10_10_REV 0x8368 +#define GL_BGR 0x80E0 +#define GL_BGRA 0x80E1 +#define GL_MAX_ELEMENTS_VERTICES 0x80E8 +#define GL_MAX_ELEMENTS_INDICES 0x80E9 +#define GL_CLAMP_TO_EDGE 0x812F +#define GL_TEXTURE_MIN_LOD 0x813A +#define GL_TEXTURE_MAX_LOD 0x813B +#define GL_TEXTURE_BASE_LEVEL 0x813C +#define GL_TEXTURE_MAX_LEVEL 0x813D +#define GL_SMOOTH_POINT_SIZE_RANGE 0x0B12 +#define GL_SMOOTH_POINT_SIZE_GRANULARITY 0x0B13 +#define GL_SMOOTH_LINE_WIDTH_RANGE 0x0B22 +#define GL_SMOOTH_LINE_WIDTH_GRANULARITY 0x0B23 +#define GL_ALIASED_LINE_WIDTH_RANGE 0x846E +#define GL_RESCALE_NORMAL 0x803A +#define GL_LIGHT_MODEL_COLOR_CONTROL 0x81F8 +#define GL_SINGLE_COLOR 0x81F9 +#define GL_SEPARATE_SPECULAR_COLOR 0x81FA +#define GL_ALIASED_POINT_SIZE_RANGE 0x846D +#define GL_TEXTURE0 0x84C0 +#define GL_TEXTURE1 0x84C1 +#define GL_TEXTURE2 0x84C2 +#define GL_TEXTURE3 0x84C3 +#define GL_TEXTURE4 0x84C4 +#define GL_TEXTURE5 0x84C5 +#define GL_TEXTURE6 0x84C6 +#define GL_TEXTURE7 0x84C7 +#define GL_TEXTURE8 0x84C8 +#define GL_TEXTURE9 0x84C9 +#define GL_TEXTURE10 0x84CA +#define GL_TEXTURE11 0x84CB +#define GL_TEXTURE12 0x84CC +#define GL_TEXTURE13 0x84CD +#define GL_TEXTURE14 0x84CE +#define GL_TEXTURE15 0x84CF +#define GL_TEXTURE16 0x84D0 +#define GL_TEXTURE17 0x84D1 +#define GL_TEXTURE18 0x84D2 +#define GL_TEXTURE19 0x84D3 +#define GL_TEXTURE20 0x84D4 +#define GL_TEXTURE21 0x84D5 +#define GL_TEXTURE22 0x84D6 +#define GL_TEXTURE23 0x84D7 +#define GL_TEXTURE24 0x84D8 +#define GL_TEXTURE25 0x84D9 +#define GL_TEXTURE26 0x84DA +#define GL_TEXTURE27 0x84DB +#define GL_TEXTURE28 0x84DC +#define GL_TEXTURE29 0x84DD +#define GL_TEXTURE30 0x84DE +#define GL_TEXTURE31 0x84DF +#define GL_ACTIVE_TEXTURE 0x84E0 +#define GL_MULTISAMPLE 0x809D +#define GL_SAMPLE_ALPHA_TO_COVERAGE 0x809E +#define GL_SAMPLE_ALPHA_TO_ONE 0x809F +#define GL_SAMPLE_COVERAGE 0x80A0 +#define GL_SAMPLE_BUFFERS 0x80A8 +#define GL_SAMPLES 0x80A9 +#define GL_SAMPLE_COVERAGE_VALUE 0x80AA +#define GL_SAMPLE_COVERAGE_INVERT 0x80AB +#define GL_TEXTURE_CUBE_MAP 0x8513 +#define GL_TEXTURE_BINDING_CUBE_MAP 0x8514 +#define GL_TEXTURE_CUBE_MAP_POSITIVE_X 0x8515 +#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X 0x8516 +#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y 0x8517 +#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y 0x8518 +#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z 0x8519 +#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z 0x851A +#define GL_PROXY_TEXTURE_CUBE_MAP 0x851B +#define GL_MAX_CUBE_MAP_TEXTURE_SIZE 0x851C +#define GL_COMPRESSED_RGB 0x84ED +#define GL_COMPRESSED_RGBA 0x84EE +#define GL_TEXTURE_COMPRESSION_HINT 0x84EF +#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE 0x86A0 +#define GL_TEXTURE_COMPRESSED 0x86A1 +#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2 +#define GL_COMPRESSED_TEXTURE_FORMATS 0x86A3 +#define GL_CLAMP_TO_BORDER 0x812D +#define GL_CLIENT_ACTIVE_TEXTURE 0x84E1 +#define GL_MAX_TEXTURE_UNITS 0x84E2 +#define GL_TRANSPOSE_MODELVIEW_MATRIX 0x84E3 +#define GL_TRANSPOSE_PROJECTION_MATRIX 0x84E4 +#define GL_TRANSPOSE_TEXTURE_MATRIX 0x84E5 +#define GL_TRANSPOSE_COLOR_MATRIX 0x84E6 +#define GL_MULTISAMPLE_BIT 0x20000000 +#define GL_NORMAL_MAP 0x8511 +#define GL_REFLECTION_MAP 0x8512 +#define GL_COMPRESSED_ALPHA 0x84E9 +#define GL_COMPRESSED_LUMINANCE 0x84EA +#define GL_COMPRESSED_LUMINANCE_ALPHA 0x84EB +#define GL_COMPRESSED_INTENSITY 0x84EC +#define GL_COMBINE 0x8570 +#define GL_COMBINE_RGB 0x8571 +#define GL_COMBINE_ALPHA 0x8572 +#define GL_SOURCE0_RGB 0x8580 +#define GL_SOURCE1_RGB 0x8581 +#define GL_SOURCE2_RGB 0x8582 +#define GL_SOURCE0_ALPHA 0x8588 +#define GL_SOURCE1_ALPHA 0x8589 +#define GL_SOURCE2_ALPHA 0x858A +#define GL_OPERAND0_RGB 0x8590 +#define GL_OPERAND1_RGB 0x8591 +#define GL_OPERAND2_RGB 0x8592 +#define GL_OPERAND0_ALPHA 0x8598 +#define GL_OPERAND1_ALPHA 0x8599 +#define GL_OPERAND2_ALPHA 0x859A +#define GL_RGB_SCALE 0x8573 +#define GL_ADD_SIGNED 0x8574 +#define GL_INTERPOLATE 0x8575 +#define GL_SUBTRACT 0x84E7 +#define GL_CONSTANT 0x8576 +#define GL_PRIMARY_COLOR 0x8577 +#define GL_PREVIOUS 0x8578 +#define GL_DOT3_RGB 0x86AE +#define GL_DOT3_RGBA 0x86AF +#define GL_BLEND_DST_RGB 0x80C8 +#define GL_BLEND_SRC_RGB 0x80C9 +#define GL_BLEND_DST_ALPHA 0x80CA +#define GL_BLEND_SRC_ALPHA 0x80CB +#define GL_POINT_FADE_THRESHOLD_SIZE 0x8128 +#define GL_DEPTH_COMPONENT16 0x81A5 +#define GL_DEPTH_COMPONENT24 0x81A6 +#define GL_DEPTH_COMPONENT32 0x81A7 +#define GL_MIRRORED_REPEAT 0x8370 +#define GL_MAX_TEXTURE_LOD_BIAS 0x84FD +#define GL_TEXTURE_LOD_BIAS 0x8501 +#define GL_INCR_WRAP 0x8507 +#define GL_DECR_WRAP 0x8508 +#define GL_TEXTURE_DEPTH_SIZE 0x884A +#define GL_TEXTURE_COMPARE_MODE 0x884C +#define GL_TEXTURE_COMPARE_FUNC 0x884D +#define GL_POINT_SIZE_MIN 0x8126 +#define GL_POINT_SIZE_MAX 0x8127 +#define GL_POINT_DISTANCE_ATTENUATION 0x8129 +#define GL_GENERATE_MIPMAP 0x8191 +#define GL_GENERATE_MIPMAP_HINT 0x8192 +#define GL_FOG_COORDINATE_SOURCE 0x8450 +#define GL_FOG_COORDINATE 0x8451 +#define GL_FRAGMENT_DEPTH 0x8452 +#define GL_CURRENT_FOG_COORDINATE 0x8453 +#define GL_FOG_COORDINATE_ARRAY_TYPE 0x8454 +#define GL_FOG_COORDINATE_ARRAY_STRIDE 0x8455 +#define GL_FOG_COORDINATE_ARRAY_POINTER 0x8456 +#define GL_FOG_COORDINATE_ARRAY 0x8457 +#define GL_COLOR_SUM 0x8458 +#define GL_CURRENT_SECONDARY_COLOR 0x8459 +#define GL_SECONDARY_COLOR_ARRAY_SIZE 0x845A +#define GL_SECONDARY_COLOR_ARRAY_TYPE 0x845B +#define GL_SECONDARY_COLOR_ARRAY_STRIDE 0x845C +#define GL_SECONDARY_COLOR_ARRAY_POINTER 0x845D +#define GL_SECONDARY_COLOR_ARRAY 0x845E +#define GL_TEXTURE_FILTER_CONTROL 0x8500 +#define GL_DEPTH_TEXTURE_MODE 0x884B +#define GL_COMPARE_R_TO_TEXTURE 0x884E +#define GL_BLEND_COLOR 0x8005 +#define GL_BLEND_EQUATION 0x8009 +#define GL_CONSTANT_COLOR 0x8001 +#define GL_ONE_MINUS_CONSTANT_COLOR 0x8002 +#define GL_CONSTANT_ALPHA 0x8003 +#define GL_ONE_MINUS_CONSTANT_ALPHA 0x8004 +#define GL_FUNC_ADD 0x8006 +#define GL_FUNC_REVERSE_SUBTRACT 0x800B +#define GL_FUNC_SUBTRACT 0x800A +#define GL_MIN 0x8007 +#define GL_MAX 0x8008 +#define GL_BUFFER_SIZE 0x8764 +#define GL_BUFFER_USAGE 0x8765 +#define GL_QUERY_COUNTER_BITS 0x8864 +#define GL_CURRENT_QUERY 0x8865 +#define GL_QUERY_RESULT 0x8866 +#define GL_QUERY_RESULT_AVAILABLE 0x8867 +#define GL_ARRAY_BUFFER 0x8892 +#define GL_ELEMENT_ARRAY_BUFFER 0x8893 +#define GL_ARRAY_BUFFER_BINDING 0x8894 +#define GL_ELEMENT_ARRAY_BUFFER_BINDING 0x8895 +#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING 0x889F +#define GL_READ_ONLY 0x88B8 +#define GL_WRITE_ONLY 0x88B9 +#define GL_READ_WRITE 0x88BA +#define GL_BUFFER_ACCESS 0x88BB +#define GL_BUFFER_MAPPED 0x88BC +#define GL_BUFFER_MAP_POINTER 0x88BD +#define GL_STREAM_DRAW 0x88E0 +#define GL_STREAM_READ 0x88E1 +#define GL_STREAM_COPY 0x88E2 +#define GL_STATIC_DRAW 0x88E4 +#define GL_STATIC_READ 0x88E5 +#define GL_STATIC_COPY 0x88E6 +#define GL_DYNAMIC_DRAW 0x88E8 +#define GL_DYNAMIC_READ 0x88E9 +#define GL_DYNAMIC_COPY 0x88EA +#define GL_SAMPLES_PASSED 0x8914 +#define GL_SRC1_ALPHA 0x8589 +#define GL_VERTEX_ARRAY_BUFFER_BINDING 0x8896 +#define GL_NORMAL_ARRAY_BUFFER_BINDING 0x8897 +#define GL_COLOR_ARRAY_BUFFER_BINDING 0x8898 +#define GL_INDEX_ARRAY_BUFFER_BINDING 0x8899 +#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING 0x889A +#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING 0x889B +#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING 0x889C +#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING 0x889D +#define GL_WEIGHT_ARRAY_BUFFER_BINDING 0x889E +#define GL_FOG_COORD_SRC 0x8450 +#define GL_FOG_COORD 0x8451 +#define GL_CURRENT_FOG_COORD 0x8453 +#define GL_FOG_COORD_ARRAY_TYPE 0x8454 +#define GL_FOG_COORD_ARRAY_STRIDE 0x8455 +#define GL_FOG_COORD_ARRAY_POINTER 0x8456 +#define GL_FOG_COORD_ARRAY 0x8457 +#define GL_FOG_COORD_ARRAY_BUFFER_BINDING 0x889D +#define GL_SRC0_RGB 0x8580 +#define GL_SRC1_RGB 0x8581 +#define GL_SRC2_RGB 0x8582 +#define GL_SRC0_ALPHA 0x8588 +#define GL_SRC2_ALPHA 0x858A +#define GL_BLEND_EQUATION_RGB 0x8009 +#define GL_VERTEX_ATTRIB_ARRAY_ENABLED 0x8622 +#define GL_VERTEX_ATTRIB_ARRAY_SIZE 0x8623 +#define GL_VERTEX_ATTRIB_ARRAY_STRIDE 0x8624 +#define GL_VERTEX_ATTRIB_ARRAY_TYPE 0x8625 +#define GL_CURRENT_VERTEX_ATTRIB 0x8626 +#define GL_VERTEX_PROGRAM_POINT_SIZE 0x8642 +#define GL_VERTEX_ATTRIB_ARRAY_POINTER 0x8645 +#define GL_STENCIL_BACK_FUNC 0x8800 +#define GL_STENCIL_BACK_FAIL 0x8801 +#define GL_STENCIL_BACK_PASS_DEPTH_FAIL 0x8802 +#define GL_STENCIL_BACK_PASS_DEPTH_PASS 0x8803 +#define GL_MAX_DRAW_BUFFERS 0x8824 +#define GL_DRAW_BUFFER0 0x8825 +#define GL_DRAW_BUFFER1 0x8826 +#define GL_DRAW_BUFFER2 0x8827 +#define GL_DRAW_BUFFER3 0x8828 +#define GL_DRAW_BUFFER4 0x8829 +#define GL_DRAW_BUFFER5 0x882A +#define GL_DRAW_BUFFER6 0x882B +#define GL_DRAW_BUFFER7 0x882C +#define GL_DRAW_BUFFER8 0x882D +#define GL_DRAW_BUFFER9 0x882E +#define GL_DRAW_BUFFER10 0x882F +#define GL_DRAW_BUFFER11 0x8830 +#define GL_DRAW_BUFFER12 0x8831 +#define GL_DRAW_BUFFER13 0x8832 +#define GL_DRAW_BUFFER14 0x8833 +#define GL_DRAW_BUFFER15 0x8834 +#define GL_BLEND_EQUATION_ALPHA 0x883D +#define GL_MAX_VERTEX_ATTRIBS 0x8869 +#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED 0x886A +#define GL_MAX_TEXTURE_IMAGE_UNITS 0x8872 +#define GL_FRAGMENT_SHADER 0x8B30 +#define GL_VERTEX_SHADER 0x8B31 +#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS 0x8B49 +#define GL_MAX_VERTEX_UNIFORM_COMPONENTS 0x8B4A +#define GL_MAX_VARYING_FLOATS 0x8B4B +#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS 0x8B4C +#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS 0x8B4D +#define GL_SHADER_TYPE 0x8B4F +#define GL_FLOAT_VEC2 0x8B50 +#define GL_FLOAT_VEC3 0x8B51 +#define GL_FLOAT_VEC4 0x8B52 +#define GL_INT_VEC2 0x8B53 +#define GL_INT_VEC3 0x8B54 +#define GL_INT_VEC4 0x8B55 +#define GL_BOOL 0x8B56 +#define GL_BOOL_VEC2 0x8B57 +#define GL_BOOL_VEC3 0x8B58 +#define GL_BOOL_VEC4 0x8B59 +#define GL_FLOAT_MAT2 0x8B5A +#define GL_FLOAT_MAT3 0x8B5B +#define GL_FLOAT_MAT4 0x8B5C +#define GL_SAMPLER_1D 0x8B5D +#define GL_SAMPLER_2D 0x8B5E +#define GL_SAMPLER_3D 0x8B5F +#define GL_SAMPLER_CUBE 0x8B60 +#define GL_SAMPLER_1D_SHADOW 0x8B61 +#define GL_SAMPLER_2D_SHADOW 0x8B62 +#define GL_DELETE_STATUS 0x8B80 +#define GL_COMPILE_STATUS 0x8B81 +#define GL_LINK_STATUS 0x8B82 +#define GL_VALIDATE_STATUS 0x8B83 +#define GL_INFO_LOG_LENGTH 0x8B84 +#define GL_ATTACHED_SHADERS 0x8B85 +#define GL_ACTIVE_UNIFORMS 0x8B86 +#define GL_ACTIVE_UNIFORM_MAX_LENGTH 0x8B87 +#define GL_SHADER_SOURCE_LENGTH 0x8B88 +#define GL_ACTIVE_ATTRIBUTES 0x8B89 +#define GL_ACTIVE_ATTRIBUTE_MAX_LENGTH 0x8B8A +#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT 0x8B8B +#define GL_SHADING_LANGUAGE_VERSION 0x8B8C +#define GL_CURRENT_PROGRAM 0x8B8D +#define GL_POINT_SPRITE_COORD_ORIGIN 0x8CA0 +#define GL_LOWER_LEFT 0x8CA1 +#define GL_UPPER_LEFT 0x8CA2 +#define GL_STENCIL_BACK_REF 0x8CA3 +#define GL_STENCIL_BACK_VALUE_MASK 0x8CA4 +#define GL_STENCIL_BACK_WRITEMASK 0x8CA5 +#define GL_VERTEX_PROGRAM_TWO_SIDE 0x8643 +#define GL_POINT_SPRITE 0x8861 +#define GL_COORD_REPLACE 0x8862 +#define GL_MAX_TEXTURE_COORDS 0x8871 +#define GL_PIXEL_PACK_BUFFER 0x88EB +#define GL_PIXEL_UNPACK_BUFFER 0x88EC +#define GL_PIXEL_PACK_BUFFER_BINDING 0x88ED +#define GL_PIXEL_UNPACK_BUFFER_BINDING 0x88EF +#define GL_FLOAT_MAT2x3 0x8B65 +#define GL_FLOAT_MAT2x4 0x8B66 +#define GL_FLOAT_MAT3x2 0x8B67 +#define GL_FLOAT_MAT3x4 0x8B68 +#define GL_FLOAT_MAT4x2 0x8B69 +#define GL_FLOAT_MAT4x3 0x8B6A +#define GL_SRGB 0x8C40 +#define GL_SRGB8 0x8C41 +#define GL_SRGB_ALPHA 0x8C42 +#define GL_SRGB8_ALPHA8 0x8C43 +#define GL_COMPRESSED_SRGB 0x8C48 +#define GL_COMPRESSED_SRGB_ALPHA 0x8C49 +#define GL_CURRENT_RASTER_SECONDARY_COLOR 0x845F +#define GL_SLUMINANCE_ALPHA 0x8C44 +#define GL_SLUMINANCE8_ALPHA8 0x8C45 +#define GL_SLUMINANCE 0x8C46 +#define GL_SLUMINANCE8 0x8C47 +#define GL_COMPRESSED_SLUMINANCE 0x8C4A +#define GL_COMPRESSED_SLUMINANCE_ALPHA 0x8C4B +#define GL_COMPARE_REF_TO_TEXTURE 0x884E +#define GL_CLIP_DISTANCE0 0x3000 +#define GL_CLIP_DISTANCE1 0x3001 +#define GL_CLIP_DISTANCE2 0x3002 +#define GL_CLIP_DISTANCE3 0x3003 +#define GL_CLIP_DISTANCE4 0x3004 +#define GL_CLIP_DISTANCE5 0x3005 +#define GL_CLIP_DISTANCE6 0x3006 +#define GL_CLIP_DISTANCE7 0x3007 +#define GL_MAX_CLIP_DISTANCES 0x0D32 +#define GL_MAJOR_VERSION 0x821B +#define GL_MINOR_VERSION 0x821C +#define GL_NUM_EXTENSIONS 0x821D +#define GL_CONTEXT_FLAGS 0x821E +#define GL_COMPRESSED_RED 0x8225 +#define GL_COMPRESSED_RG 0x8226 +#define GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT 0x00000001 +#define GL_RGBA32F 0x8814 +#define GL_RGB32F 0x8815 +#define GL_RGBA16F 0x881A +#define GL_RGB16F 0x881B +#define GL_VERTEX_ATTRIB_ARRAY_INTEGER 0x88FD +#define GL_MAX_ARRAY_TEXTURE_LAYERS 0x88FF +#define GL_MIN_PROGRAM_TEXEL_OFFSET 0x8904 +#define GL_MAX_PROGRAM_TEXEL_OFFSET 0x8905 +#define GL_CLAMP_READ_COLOR 0x891C +#define GL_FIXED_ONLY 0x891D +#define GL_MAX_VARYING_COMPONENTS 0x8B4B +#define GL_TEXTURE_1D_ARRAY 0x8C18 +#define GL_PROXY_TEXTURE_1D_ARRAY 0x8C19 +#define GL_TEXTURE_2D_ARRAY 0x8C1A +#define GL_PROXY_TEXTURE_2D_ARRAY 0x8C1B +#define GL_TEXTURE_BINDING_1D_ARRAY 0x8C1C +#define GL_TEXTURE_BINDING_2D_ARRAY 0x8C1D +#define GL_R11F_G11F_B10F 0x8C3A +#define GL_UNSIGNED_INT_10F_11F_11F_REV 0x8C3B +#define GL_RGB9_E5 0x8C3D +#define GL_UNSIGNED_INT_5_9_9_9_REV 0x8C3E +#define GL_TEXTURE_SHARED_SIZE 0x8C3F +#define GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH 0x8C76 +#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE 0x8C7F +#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS 0x8C80 +#define GL_TRANSFORM_FEEDBACK_VARYINGS 0x8C83 +#define GL_TRANSFORM_FEEDBACK_BUFFER_START 0x8C84 +#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE 0x8C85 +#define GL_PRIMITIVES_GENERATED 0x8C87 +#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN 0x8C88 +#define GL_RASTERIZER_DISCARD 0x8C89 +#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS 0x8C8A +#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS 0x8C8B +#define GL_INTERLEAVED_ATTRIBS 0x8C8C +#define GL_SEPARATE_ATTRIBS 0x8C8D +#define GL_TRANSFORM_FEEDBACK_BUFFER 0x8C8E +#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING 0x8C8F +#define GL_RGBA32UI 0x8D70 +#define GL_RGB32UI 0x8D71 +#define GL_RGBA16UI 0x8D76 +#define GL_RGB16UI 0x8D77 +#define GL_RGBA8UI 0x8D7C +#define GL_RGB8UI 0x8D7D +#define GL_RGBA32I 0x8D82 +#define GL_RGB32I 0x8D83 +#define GL_RGBA16I 0x8D88 +#define GL_RGB16I 0x8D89 +#define GL_RGBA8I 0x8D8E +#define GL_RGB8I 0x8D8F +#define GL_RED_INTEGER 0x8D94 +#define GL_GREEN_INTEGER 0x8D95 +#define GL_BLUE_INTEGER 0x8D96 +#define GL_RGB_INTEGER 0x8D98 +#define GL_RGBA_INTEGER 0x8D99 +#define GL_BGR_INTEGER 0x8D9A +#define GL_BGRA_INTEGER 0x8D9B +#define GL_SAMPLER_1D_ARRAY 0x8DC0 +#define GL_SAMPLER_2D_ARRAY 0x8DC1 +#define GL_SAMPLER_1D_ARRAY_SHADOW 0x8DC3 +#define GL_SAMPLER_2D_ARRAY_SHADOW 0x8DC4 +#define GL_SAMPLER_CUBE_SHADOW 0x8DC5 +#define GL_UNSIGNED_INT_VEC2 0x8DC6 +#define GL_UNSIGNED_INT_VEC3 0x8DC7 +#define GL_UNSIGNED_INT_VEC4 0x8DC8 +#define GL_INT_SAMPLER_1D 0x8DC9 +#define GL_INT_SAMPLER_2D 0x8DCA +#define GL_INT_SAMPLER_3D 0x8DCB +#define GL_INT_SAMPLER_CUBE 0x8DCC +#define GL_INT_SAMPLER_1D_ARRAY 0x8DCE +#define GL_INT_SAMPLER_2D_ARRAY 0x8DCF +#define GL_UNSIGNED_INT_SAMPLER_1D 0x8DD1 +#define GL_UNSIGNED_INT_SAMPLER_2D 0x8DD2 +#define GL_UNSIGNED_INT_SAMPLER_3D 0x8DD3 +#define GL_UNSIGNED_INT_SAMPLER_CUBE 0x8DD4 +#define GL_UNSIGNED_INT_SAMPLER_1D_ARRAY 0x8DD6 +#define GL_UNSIGNED_INT_SAMPLER_2D_ARRAY 0x8DD7 +#define GL_QUERY_WAIT 0x8E13 +#define GL_QUERY_NO_WAIT 0x8E14 +#define GL_QUERY_BY_REGION_WAIT 0x8E15 +#define GL_QUERY_BY_REGION_NO_WAIT 0x8E16 +#define GL_BUFFER_ACCESS_FLAGS 0x911F +#define GL_BUFFER_MAP_LENGTH 0x9120 +#define GL_BUFFER_MAP_OFFSET 0x9121 +#define GL_DEPTH_COMPONENT32F 0x8CAC +#define GL_DEPTH32F_STENCIL8 0x8CAD +#define GL_FLOAT_32_UNSIGNED_INT_24_8_REV 0x8DAD +#define GL_INVALID_FRAMEBUFFER_OPERATION 0x0506 +#define GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING 0x8210 +#define GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE 0x8211 +#define GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE 0x8212 +#define GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE 0x8213 +#define GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE 0x8214 +#define GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE 0x8215 +#define GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE 0x8216 +#define GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE 0x8217 +#define GL_FRAMEBUFFER_DEFAULT 0x8218 +#define GL_FRAMEBUFFER_UNDEFINED 0x8219 +#define GL_DEPTH_STENCIL_ATTACHMENT 0x821A +#define GL_MAX_RENDERBUFFER_SIZE 0x84E8 +#define GL_DEPTH_STENCIL 0x84F9 +#define GL_UNSIGNED_INT_24_8 0x84FA +#define GL_DEPTH24_STENCIL8 0x88F0 +#define GL_TEXTURE_STENCIL_SIZE 0x88F1 +#define GL_TEXTURE_RED_TYPE 0x8C10 +#define GL_TEXTURE_GREEN_TYPE 0x8C11 +#define GL_TEXTURE_BLUE_TYPE 0x8C12 +#define GL_TEXTURE_ALPHA_TYPE 0x8C13 +#define GL_TEXTURE_DEPTH_TYPE 0x8C16 +#define GL_UNSIGNED_NORMALIZED 0x8C17 +#define GL_FRAMEBUFFER_BINDING 0x8CA6 +#define GL_DRAW_FRAMEBUFFER_BINDING 0x8CA6 +#define GL_RENDERBUFFER_BINDING 0x8CA7 +#define GL_READ_FRAMEBUFFER 0x8CA8 +#define GL_DRAW_FRAMEBUFFER 0x8CA9 +#define GL_READ_FRAMEBUFFER_BINDING 0x8CAA +#define GL_RENDERBUFFER_SAMPLES 0x8CAB +#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE 0x8CD0 +#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME 0x8CD1 +#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL 0x8CD2 +#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE 0x8CD3 +#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER 0x8CD4 +#define GL_FRAMEBUFFER_COMPLETE 0x8CD5 +#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT 0x8CD6 +#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT 0x8CD7 +#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER 0x8CDB +#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER 0x8CDC +#define GL_FRAMEBUFFER_UNSUPPORTED 0x8CDD +#define GL_MAX_COLOR_ATTACHMENTS 0x8CDF +#define GL_COLOR_ATTACHMENT0 0x8CE0 +#define GL_COLOR_ATTACHMENT1 0x8CE1 +#define GL_COLOR_ATTACHMENT2 0x8CE2 +#define GL_COLOR_ATTACHMENT3 0x8CE3 +#define GL_COLOR_ATTACHMENT4 0x8CE4 +#define GL_COLOR_ATTACHMENT5 0x8CE5 +#define GL_COLOR_ATTACHMENT6 0x8CE6 +#define GL_COLOR_ATTACHMENT7 0x8CE7 +#define GL_COLOR_ATTACHMENT8 0x8CE8 +#define GL_COLOR_ATTACHMENT9 0x8CE9 +#define GL_COLOR_ATTACHMENT10 0x8CEA +#define GL_COLOR_ATTACHMENT11 0x8CEB +#define GL_COLOR_ATTACHMENT12 0x8CEC +#define GL_COLOR_ATTACHMENT13 0x8CED +#define GL_COLOR_ATTACHMENT14 0x8CEE +#define GL_COLOR_ATTACHMENT15 0x8CEF +#define GL_COLOR_ATTACHMENT16 0x8CF0 +#define GL_COLOR_ATTACHMENT17 0x8CF1 +#define GL_COLOR_ATTACHMENT18 0x8CF2 +#define GL_COLOR_ATTACHMENT19 0x8CF3 +#define GL_COLOR_ATTACHMENT20 0x8CF4 +#define GL_COLOR_ATTACHMENT21 0x8CF5 +#define GL_COLOR_ATTACHMENT22 0x8CF6 +#define GL_COLOR_ATTACHMENT23 0x8CF7 +#define GL_COLOR_ATTACHMENT24 0x8CF8 +#define GL_COLOR_ATTACHMENT25 0x8CF9 +#define GL_COLOR_ATTACHMENT26 0x8CFA +#define GL_COLOR_ATTACHMENT27 0x8CFB +#define GL_COLOR_ATTACHMENT28 0x8CFC +#define GL_COLOR_ATTACHMENT29 0x8CFD +#define GL_COLOR_ATTACHMENT30 0x8CFE +#define GL_COLOR_ATTACHMENT31 0x8CFF +#define GL_DEPTH_ATTACHMENT 0x8D00 +#define GL_STENCIL_ATTACHMENT 0x8D20 +#define GL_FRAMEBUFFER 0x8D40 +#define GL_RENDERBUFFER 0x8D41 +#define GL_RENDERBUFFER_WIDTH 0x8D42 +#define GL_RENDERBUFFER_HEIGHT 0x8D43 +#define GL_RENDERBUFFER_INTERNAL_FORMAT 0x8D44 +#define GL_STENCIL_INDEX1 0x8D46 +#define GL_STENCIL_INDEX4 0x8D47 +#define GL_STENCIL_INDEX8 0x8D48 +#define GL_STENCIL_INDEX16 0x8D49 +#define GL_RENDERBUFFER_RED_SIZE 0x8D50 +#define GL_RENDERBUFFER_GREEN_SIZE 0x8D51 +#define GL_RENDERBUFFER_BLUE_SIZE 0x8D52 +#define GL_RENDERBUFFER_ALPHA_SIZE 0x8D53 +#define GL_RENDERBUFFER_DEPTH_SIZE 0x8D54 +#define GL_RENDERBUFFER_STENCIL_SIZE 0x8D55 +#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE 0x8D56 +#define GL_MAX_SAMPLES 0x8D57 +#define GL_INDEX 0x8222 +#define GL_TEXTURE_LUMINANCE_TYPE 0x8C14 +#define GL_TEXTURE_INTENSITY_TYPE 0x8C15 +#define GL_FRAMEBUFFER_SRGB 0x8DB9 +#define GL_HALF_FLOAT 0x140B +#define GL_MAP_READ_BIT 0x0001 +#define GL_MAP_WRITE_BIT 0x0002 +#define GL_MAP_INVALIDATE_RANGE_BIT 0x0004 +#define GL_MAP_INVALIDATE_BUFFER_BIT 0x0008 +#define GL_MAP_FLUSH_EXPLICIT_BIT 0x0010 +#define GL_MAP_UNSYNCHRONIZED_BIT 0x0020 +#define GL_COMPRESSED_RED_RGTC1 0x8DBB +#define GL_COMPRESSED_SIGNED_RED_RGTC1 0x8DBC +#define GL_COMPRESSED_RG_RGTC2 0x8DBD +#define GL_COMPRESSED_SIGNED_RG_RGTC2 0x8DBE +#define GL_RG 0x8227 +#define GL_RG_INTEGER 0x8228 +#define GL_R8 0x8229 +#define GL_R16 0x822A +#define GL_RG8 0x822B +#define GL_RG16 0x822C +#define GL_R16F 0x822D +#define GL_R32F 0x822E +#define GL_RG16F 0x822F +#define GL_RG32F 0x8230 +#define GL_R8I 0x8231 +#define GL_R8UI 0x8232 +#define GL_R16I 0x8233 +#define GL_R16UI 0x8234 +#define GL_R32I 0x8235 +#define GL_R32UI 0x8236 +#define GL_RG8I 0x8237 +#define GL_RG8UI 0x8238 +#define GL_RG16I 0x8239 +#define GL_RG16UI 0x823A +#define GL_RG32I 0x823B +#define GL_RG32UI 0x823C +#define GL_VERTEX_ARRAY_BINDING 0x85B5 +#define GL_CLAMP_VERTEX_COLOR 0x891A +#define GL_CLAMP_FRAGMENT_COLOR 0x891B +#define GL_ALPHA_INTEGER 0x8D97 +#define GL_SAMPLER_2D_RECT 0x8B63 +#define GL_SAMPLER_2D_RECT_SHADOW 0x8B64 +#define GL_SAMPLER_BUFFER 0x8DC2 +#define GL_INT_SAMPLER_2D_RECT 0x8DCD +#define GL_INT_SAMPLER_BUFFER 0x8DD0 +#define GL_UNSIGNED_INT_SAMPLER_2D_RECT 0x8DD5 +#define GL_UNSIGNED_INT_SAMPLER_BUFFER 0x8DD8 +#define GL_TEXTURE_BUFFER 0x8C2A +#define GL_MAX_TEXTURE_BUFFER_SIZE 0x8C2B +#define GL_TEXTURE_BINDING_BUFFER 0x8C2C +#define GL_TEXTURE_BUFFER_DATA_STORE_BINDING 0x8C2D +#define GL_TEXTURE_RECTANGLE 0x84F5 +#define GL_TEXTURE_BINDING_RECTANGLE 0x84F6 +#define GL_PROXY_TEXTURE_RECTANGLE 0x84F7 +#define GL_MAX_RECTANGLE_TEXTURE_SIZE 0x84F8 +#define GL_R8_SNORM 0x8F94 +#define GL_RG8_SNORM 0x8F95 +#define GL_RGB8_SNORM 0x8F96 +#define GL_RGBA8_SNORM 0x8F97 +#define GL_R16_SNORM 0x8F98 +#define GL_RG16_SNORM 0x8F99 +#define GL_RGB16_SNORM 0x8F9A +#define GL_RGBA16_SNORM 0x8F9B +#define GL_SIGNED_NORMALIZED 0x8F9C +#define GL_PRIMITIVE_RESTART 0x8F9D +#define GL_PRIMITIVE_RESTART_INDEX 0x8F9E +#define GL_COPY_READ_BUFFER 0x8F36 +#define GL_COPY_WRITE_BUFFER 0x8F37 +#define GL_UNIFORM_BUFFER 0x8A11 +#define GL_UNIFORM_BUFFER_BINDING 0x8A28 +#define GL_UNIFORM_BUFFER_START 0x8A29 +#define GL_UNIFORM_BUFFER_SIZE 0x8A2A +#define GL_MAX_VERTEX_UNIFORM_BLOCKS 0x8A2B +#define GL_MAX_GEOMETRY_UNIFORM_BLOCKS 0x8A2C +#define GL_MAX_FRAGMENT_UNIFORM_BLOCKS 0x8A2D +#define GL_MAX_COMBINED_UNIFORM_BLOCKS 0x8A2E +#define GL_MAX_UNIFORM_BUFFER_BINDINGS 0x8A2F +#define GL_MAX_UNIFORM_BLOCK_SIZE 0x8A30 +#define GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS 0x8A31 +#define GL_MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS 0x8A32 +#define GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS 0x8A33 +#define GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT 0x8A34 +#define GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH 0x8A35 +#define GL_ACTIVE_UNIFORM_BLOCKS 0x8A36 +#define GL_UNIFORM_TYPE 0x8A37 +#define GL_UNIFORM_SIZE 0x8A38 +#define GL_UNIFORM_NAME_LENGTH 0x8A39 +#define GL_UNIFORM_BLOCK_INDEX 0x8A3A +#define GL_UNIFORM_OFFSET 0x8A3B +#define GL_UNIFORM_ARRAY_STRIDE 0x8A3C +#define GL_UNIFORM_MATRIX_STRIDE 0x8A3D +#define GL_UNIFORM_IS_ROW_MAJOR 0x8A3E +#define GL_UNIFORM_BLOCK_BINDING 0x8A3F +#define GL_UNIFORM_BLOCK_DATA_SIZE 0x8A40 +#define GL_UNIFORM_BLOCK_NAME_LENGTH 0x8A41 +#define GL_UNIFORM_BLOCK_ACTIVE_UNIFORMS 0x8A42 +#define GL_UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES 0x8A43 +#define GL_UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER 0x8A44 +#define GL_UNIFORM_BLOCK_REFERENCED_BY_GEOMETRY_SHADER 0x8A45 +#define GL_UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER 0x8A46 +#define GL_INVALID_INDEX 0xFFFFFFFF +#define GL_CONTEXT_CORE_PROFILE_BIT 0x00000001 +#define GL_CONTEXT_COMPATIBILITY_PROFILE_BIT 0x00000002 +#define GL_LINES_ADJACENCY 0x000A +#define GL_LINE_STRIP_ADJACENCY 0x000B +#define GL_TRIANGLES_ADJACENCY 0x000C +#define GL_TRIANGLE_STRIP_ADJACENCY 0x000D +#define GL_PROGRAM_POINT_SIZE 0x8642 +#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS 0x8C29 +#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED 0x8DA7 +#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS 0x8DA8 +#define GL_GEOMETRY_SHADER 0x8DD9 +#define GL_GEOMETRY_VERTICES_OUT 0x8916 +#define GL_GEOMETRY_INPUT_TYPE 0x8917 +#define GL_GEOMETRY_OUTPUT_TYPE 0x8918 +#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS 0x8DDF +#define GL_MAX_GEOMETRY_OUTPUT_VERTICES 0x8DE0 +#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS 0x8DE1 +#define GL_MAX_VERTEX_OUTPUT_COMPONENTS 0x9122 +#define GL_MAX_GEOMETRY_INPUT_COMPONENTS 0x9123 +#define GL_MAX_GEOMETRY_OUTPUT_COMPONENTS 0x9124 +#define GL_MAX_FRAGMENT_INPUT_COMPONENTS 0x9125 +#define GL_CONTEXT_PROFILE_MASK 0x9126 +#define GL_DEPTH_CLAMP 0x864F +#define GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION 0x8E4C +#define GL_FIRST_VERTEX_CONVENTION 0x8E4D +#define GL_LAST_VERTEX_CONVENTION 0x8E4E +#define GL_PROVOKING_VERTEX 0x8E4F +#define GL_TEXTURE_CUBE_MAP_SEAMLESS 0x884F +#define GL_MAX_SERVER_WAIT_TIMEOUT 0x9111 +#define GL_OBJECT_TYPE 0x9112 +#define GL_SYNC_CONDITION 0x9113 +#define GL_SYNC_STATUS 0x9114 +#define GL_SYNC_FLAGS 0x9115 +#define GL_SYNC_FENCE 0x9116 +#define GL_SYNC_GPU_COMMANDS_COMPLETE 0x9117 +#define GL_UNSIGNALED 0x9118 +#define GL_SIGNALED 0x9119 +#define GL_ALREADY_SIGNALED 0x911A +#define GL_TIMEOUT_EXPIRED 0x911B +#define GL_CONDITION_SATISFIED 0x911C +#define GL_WAIT_FAILED 0x911D +#define GL_TIMEOUT_IGNORED 0xFFFFFFFFFFFFFFFF +#define GL_SYNC_FLUSH_COMMANDS_BIT 0x00000001 +#define GL_SAMPLE_POSITION 0x8E50 +#define GL_SAMPLE_MASK 0x8E51 +#define GL_SAMPLE_MASK_VALUE 0x8E52 +#define GL_MAX_SAMPLE_MASK_WORDS 0x8E59 +#define GL_TEXTURE_2D_MULTISAMPLE 0x9100 +#define GL_PROXY_TEXTURE_2D_MULTISAMPLE 0x9101 +#define GL_TEXTURE_2D_MULTISAMPLE_ARRAY 0x9102 +#define GL_PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY 0x9103 +#define GL_TEXTURE_BINDING_2D_MULTISAMPLE 0x9104 +#define GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY 0x9105 +#define GL_TEXTURE_SAMPLES 0x9106 +#define GL_TEXTURE_FIXED_SAMPLE_LOCATIONS 0x9107 +#define GL_SAMPLER_2D_MULTISAMPLE 0x9108 +#define GL_INT_SAMPLER_2D_MULTISAMPLE 0x9109 +#define GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE 0x910A +#define GL_SAMPLER_2D_MULTISAMPLE_ARRAY 0x910B +#define GL_INT_SAMPLER_2D_MULTISAMPLE_ARRAY 0x910C +#define GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY 0x910D +#define GL_MAX_COLOR_TEXTURE_SAMPLES 0x910E +#define GL_MAX_DEPTH_TEXTURE_SAMPLES 0x910F +#define GL_MAX_INTEGER_SAMPLES 0x9110 +#define GL_VERTEX_ATTRIB_ARRAY_DIVISOR 0x88FE +#define GL_SRC1_COLOR 0x88F9 +#define GL_ONE_MINUS_SRC1_COLOR 0x88FA +#define GL_ONE_MINUS_SRC1_ALPHA 0x88FB +#define GL_MAX_DUAL_SOURCE_DRAW_BUFFERS 0x88FC +#define GL_ANY_SAMPLES_PASSED 0x8C2F +#define GL_SAMPLER_BINDING 0x8919 +#define GL_RGB10_A2UI 0x906F +#define GL_TEXTURE_SWIZZLE_R 0x8E42 +#define GL_TEXTURE_SWIZZLE_G 0x8E43 +#define GL_TEXTURE_SWIZZLE_B 0x8E44 +#define GL_TEXTURE_SWIZZLE_A 0x8E45 +#define GL_TEXTURE_SWIZZLE_RGBA 0x8E46 +#define GL_TIME_ELAPSED 0x88BF +#define GL_TIMESTAMP 0x8E28 +#define GL_INT_2_10_10_10_REV 0x8D9F +#define GL_SAMPLE_SHADING 0x8C36 +#define GL_MIN_SAMPLE_SHADING_VALUE 0x8C37 +#define GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET 0x8E5E +#define GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET 0x8E5F +#define GL_TEXTURE_CUBE_MAP_ARRAY 0x9009 +#define GL_TEXTURE_BINDING_CUBE_MAP_ARRAY 0x900A +#define GL_PROXY_TEXTURE_CUBE_MAP_ARRAY 0x900B +#define GL_SAMPLER_CUBE_MAP_ARRAY 0x900C +#define GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW 0x900D +#define GL_INT_SAMPLER_CUBE_MAP_ARRAY 0x900E +#define GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY 0x900F +#define GL_DRAW_INDIRECT_BUFFER 0x8F3F +#define GL_DRAW_INDIRECT_BUFFER_BINDING 0x8F43 +#define GL_GEOMETRY_SHADER_INVOCATIONS 0x887F +#define GL_MAX_GEOMETRY_SHADER_INVOCATIONS 0x8E5A +#define GL_MIN_FRAGMENT_INTERPOLATION_OFFSET 0x8E5B +#define GL_MAX_FRAGMENT_INTERPOLATION_OFFSET 0x8E5C +#define GL_FRAGMENT_INTERPOLATION_OFFSET_BITS 0x8E5D +#define GL_MAX_VERTEX_STREAMS 0x8E71 +#define GL_DOUBLE_VEC2 0x8FFC +#define GL_DOUBLE_VEC3 0x8FFD +#define GL_DOUBLE_VEC4 0x8FFE +#define GL_DOUBLE_MAT2 0x8F46 +#define GL_DOUBLE_MAT3 0x8F47 +#define GL_DOUBLE_MAT4 0x8F48 +#define GL_DOUBLE_MAT2x3 0x8F49 +#define GL_DOUBLE_MAT2x4 0x8F4A +#define GL_DOUBLE_MAT3x2 0x8F4B +#define GL_DOUBLE_MAT3x4 0x8F4C +#define GL_DOUBLE_MAT4x2 0x8F4D +#define GL_DOUBLE_MAT4x3 0x8F4E +#define GL_ACTIVE_SUBROUTINES 0x8DE5 +#define GL_ACTIVE_SUBROUTINE_UNIFORMS 0x8DE6 +#define GL_ACTIVE_SUBROUTINE_UNIFORM_LOCATIONS 0x8E47 +#define GL_ACTIVE_SUBROUTINE_MAX_LENGTH 0x8E48 +#define GL_ACTIVE_SUBROUTINE_UNIFORM_MAX_LENGTH 0x8E49 +#define GL_MAX_SUBROUTINES 0x8DE7 +#define GL_MAX_SUBROUTINE_UNIFORM_LOCATIONS 0x8DE8 +#define GL_NUM_COMPATIBLE_SUBROUTINES 0x8E4A +#define GL_COMPATIBLE_SUBROUTINES 0x8E4B +#define GL_PATCHES 0x000E +#define GL_PATCH_VERTICES 0x8E72 +#define GL_PATCH_DEFAULT_INNER_LEVEL 0x8E73 +#define GL_PATCH_DEFAULT_OUTER_LEVEL 0x8E74 +#define GL_TESS_CONTROL_OUTPUT_VERTICES 0x8E75 +#define GL_TESS_GEN_MODE 0x8E76 +#define GL_TESS_GEN_SPACING 0x8E77 +#define GL_TESS_GEN_VERTEX_ORDER 0x8E78 +#define GL_TESS_GEN_POINT_MODE 0x8E79 +#define GL_ISOLINES 0x8E7A +#define GL_FRACTIONAL_ODD 0x8E7B +#define GL_FRACTIONAL_EVEN 0x8E7C +#define GL_MAX_PATCH_VERTICES 0x8E7D +#define GL_MAX_TESS_GEN_LEVEL 0x8E7E +#define GL_MAX_TESS_CONTROL_UNIFORM_COMPONENTS 0x8E7F +#define GL_MAX_TESS_EVALUATION_UNIFORM_COMPONENTS 0x8E80 +#define GL_MAX_TESS_CONTROL_TEXTURE_IMAGE_UNITS 0x8E81 +#define GL_MAX_TESS_EVALUATION_TEXTURE_IMAGE_UNITS 0x8E82 +#define GL_MAX_TESS_CONTROL_OUTPUT_COMPONENTS 0x8E83 +#define GL_MAX_TESS_PATCH_COMPONENTS 0x8E84 +#define GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS 0x8E85 +#define GL_MAX_TESS_EVALUATION_OUTPUT_COMPONENTS 0x8E86 +#define GL_MAX_TESS_CONTROL_UNIFORM_BLOCKS 0x8E89 +#define GL_MAX_TESS_EVALUATION_UNIFORM_BLOCKS 0x8E8A +#define GL_MAX_TESS_CONTROL_INPUT_COMPONENTS 0x886C +#define GL_MAX_TESS_EVALUATION_INPUT_COMPONENTS 0x886D +#define GL_MAX_COMBINED_TESS_CONTROL_UNIFORM_COMPONENTS 0x8E1E +#define GL_MAX_COMBINED_TESS_EVALUATION_UNIFORM_COMPONENTS 0x8E1F +#define GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_CONTROL_SHADER 0x84F0 +#define GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_EVALUATION_SHADER 0x84F1 +#define GL_TESS_EVALUATION_SHADER 0x8E87 +#define GL_TESS_CONTROL_SHADER 0x8E88 +#define GL_TRANSFORM_FEEDBACK 0x8E22 +#define GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED 0x8E23 +#define GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE 0x8E24 +#define GL_TRANSFORM_FEEDBACK_BINDING 0x8E25 +#define GL_MAX_TRANSFORM_FEEDBACK_BUFFERS 0x8E70 +#define GL_FIXED 0x140C +#define GL_IMPLEMENTATION_COLOR_READ_TYPE 0x8B9A +#define GL_IMPLEMENTATION_COLOR_READ_FORMAT 0x8B9B +#define GL_LOW_FLOAT 0x8DF0 +#define GL_MEDIUM_FLOAT 0x8DF1 +#define GL_HIGH_FLOAT 0x8DF2 +#define GL_LOW_INT 0x8DF3 +#define GL_MEDIUM_INT 0x8DF4 +#define GL_HIGH_INT 0x8DF5 +#define GL_SHADER_COMPILER 0x8DFA +#define GL_SHADER_BINARY_FORMATS 0x8DF8 +#define GL_NUM_SHADER_BINARY_FORMATS 0x8DF9 +#define GL_MAX_VERTEX_UNIFORM_VECTORS 0x8DFB +#define GL_MAX_VARYING_VECTORS 0x8DFC +#define GL_MAX_FRAGMENT_UNIFORM_VECTORS 0x8DFD +#define GL_RGB565 0x8D62 +#define GL_PROGRAM_BINARY_RETRIEVABLE_HINT 0x8257 +#define GL_PROGRAM_BINARY_LENGTH 0x8741 +#define GL_NUM_PROGRAM_BINARY_FORMATS 0x87FE +#define GL_PROGRAM_BINARY_FORMATS 0x87FF +#define GL_VERTEX_SHADER_BIT 0x00000001 +#define GL_FRAGMENT_SHADER_BIT 0x00000002 +#define GL_GEOMETRY_SHADER_BIT 0x00000004 +#define GL_TESS_CONTROL_SHADER_BIT 0x00000008 +#define GL_TESS_EVALUATION_SHADER_BIT 0x00000010 +#define GL_ALL_SHADER_BITS 0xFFFFFFFF +#define GL_PROGRAM_SEPARABLE 0x8258 +#define GL_ACTIVE_PROGRAM 0x8259 +#define GL_PROGRAM_PIPELINE_BINDING 0x825A +#define GL_MAX_VIEWPORTS 0x825B +#define GL_VIEWPORT_SUBPIXEL_BITS 0x825C +#define GL_VIEWPORT_BOUNDS_RANGE 0x825D +#define GL_LAYER_PROVOKING_VERTEX 0x825E +#define GL_VIEWPORT_INDEX_PROVOKING_VERTEX 0x825F +#define GL_UNDEFINED_VERTEX 0x8260 +#define GL_COPY_READ_BUFFER_BINDING 0x8F36 +#define GL_COPY_WRITE_BUFFER_BINDING 0x8F37 +#define GL_TRANSFORM_FEEDBACK_ACTIVE 0x8E24 +#define GL_TRANSFORM_FEEDBACK_PAUSED 0x8E23 +#define GL_UNPACK_COMPRESSED_BLOCK_WIDTH 0x9127 +#define GL_UNPACK_COMPRESSED_BLOCK_HEIGHT 0x9128 +#define GL_UNPACK_COMPRESSED_BLOCK_DEPTH 0x9129 +#define GL_UNPACK_COMPRESSED_BLOCK_SIZE 0x912A +#define GL_PACK_COMPRESSED_BLOCK_WIDTH 0x912B +#define GL_PACK_COMPRESSED_BLOCK_HEIGHT 0x912C +#define GL_PACK_COMPRESSED_BLOCK_DEPTH 0x912D +#define GL_PACK_COMPRESSED_BLOCK_SIZE 0x912E +#define GL_NUM_SAMPLE_COUNTS 0x9380 +#define GL_MIN_MAP_BUFFER_ALIGNMENT 0x90BC +#define GL_ATOMIC_COUNTER_BUFFER 0x92C0 +#define GL_ATOMIC_COUNTER_BUFFER_BINDING 0x92C1 +#define GL_ATOMIC_COUNTER_BUFFER_START 0x92C2 +#define GL_ATOMIC_COUNTER_BUFFER_SIZE 0x92C3 +#define GL_ATOMIC_COUNTER_BUFFER_DATA_SIZE 0x92C4 +#define GL_ATOMIC_COUNTER_BUFFER_ACTIVE_ATOMIC_COUNTERS 0x92C5 +#define GL_ATOMIC_COUNTER_BUFFER_ACTIVE_ATOMIC_COUNTER_INDICES 0x92C6 +#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_VERTEX_SHADER 0x92C7 +#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_TESS_CONTROL_SHADER 0x92C8 +#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_TESS_EVALUATION_SHADER 0x92C9 +#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_GEOMETRY_SHADER 0x92CA +#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_FRAGMENT_SHADER 0x92CB +#define GL_MAX_VERTEX_ATOMIC_COUNTER_BUFFERS 0x92CC +#define GL_MAX_TESS_CONTROL_ATOMIC_COUNTER_BUFFERS 0x92CD +#define GL_MAX_TESS_EVALUATION_ATOMIC_COUNTER_BUFFERS 0x92CE +#define GL_MAX_GEOMETRY_ATOMIC_COUNTER_BUFFERS 0x92CF +#define GL_MAX_FRAGMENT_ATOMIC_COUNTER_BUFFERS 0x92D0 +#define GL_MAX_COMBINED_ATOMIC_COUNTER_BUFFERS 0x92D1 +#define GL_MAX_VERTEX_ATOMIC_COUNTERS 0x92D2 +#define GL_MAX_TESS_CONTROL_ATOMIC_COUNTERS 0x92D3 +#define GL_MAX_TESS_EVALUATION_ATOMIC_COUNTERS 0x92D4 +#define GL_MAX_GEOMETRY_ATOMIC_COUNTERS 0x92D5 +#define GL_MAX_FRAGMENT_ATOMIC_COUNTERS 0x92D6 +#define GL_MAX_COMBINED_ATOMIC_COUNTERS 0x92D7 +#define GL_MAX_ATOMIC_COUNTER_BUFFER_SIZE 0x92D8 +#define GL_MAX_ATOMIC_COUNTER_BUFFER_BINDINGS 0x92DC +#define GL_ACTIVE_ATOMIC_COUNTER_BUFFERS 0x92D9 +#define GL_UNIFORM_ATOMIC_COUNTER_BUFFER_INDEX 0x92DA +#define GL_UNSIGNED_INT_ATOMIC_COUNTER 0x92DB +#define GL_VERTEX_ATTRIB_ARRAY_BARRIER_BIT 0x00000001 +#define GL_ELEMENT_ARRAY_BARRIER_BIT 0x00000002 +#define GL_UNIFORM_BARRIER_BIT 0x00000004 +#define GL_TEXTURE_FETCH_BARRIER_BIT 0x00000008 +#define GL_SHADER_IMAGE_ACCESS_BARRIER_BIT 0x00000020 +#define GL_COMMAND_BARRIER_BIT 0x00000040 +#define GL_PIXEL_BUFFER_BARRIER_BIT 0x00000080 +#define GL_TEXTURE_UPDATE_BARRIER_BIT 0x00000100 +#define GL_BUFFER_UPDATE_BARRIER_BIT 0x00000200 +#define GL_FRAMEBUFFER_BARRIER_BIT 0x00000400 +#define GL_TRANSFORM_FEEDBACK_BARRIER_BIT 0x00000800 +#define GL_ATOMIC_COUNTER_BARRIER_BIT 0x00001000 +#define GL_ALL_BARRIER_BITS 0xFFFFFFFF +#define GL_MAX_IMAGE_UNITS 0x8F38 +#define GL_MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS 0x8F39 +#define GL_IMAGE_BINDING_NAME 0x8F3A +#define GL_IMAGE_BINDING_LEVEL 0x8F3B +#define GL_IMAGE_BINDING_LAYERED 0x8F3C +#define GL_IMAGE_BINDING_LAYER 0x8F3D +#define GL_IMAGE_BINDING_ACCESS 0x8F3E +#define GL_IMAGE_1D 0x904C +#define GL_IMAGE_2D 0x904D +#define GL_IMAGE_3D 0x904E +#define GL_IMAGE_2D_RECT 0x904F +#define GL_IMAGE_CUBE 0x9050 +#define GL_IMAGE_BUFFER 0x9051 +#define GL_IMAGE_1D_ARRAY 0x9052 +#define GL_IMAGE_2D_ARRAY 0x9053 +#define GL_IMAGE_CUBE_MAP_ARRAY 0x9054 +#define GL_IMAGE_2D_MULTISAMPLE 0x9055 +#define GL_IMAGE_2D_MULTISAMPLE_ARRAY 0x9056 +#define GL_INT_IMAGE_1D 0x9057 +#define GL_INT_IMAGE_2D 0x9058 +#define GL_INT_IMAGE_3D 0x9059 +#define GL_INT_IMAGE_2D_RECT 0x905A +#define GL_INT_IMAGE_CUBE 0x905B +#define GL_INT_IMAGE_BUFFER 0x905C +#define GL_INT_IMAGE_1D_ARRAY 0x905D +#define GL_INT_IMAGE_2D_ARRAY 0x905E +#define GL_INT_IMAGE_CUBE_MAP_ARRAY 0x905F +#define GL_INT_IMAGE_2D_MULTISAMPLE 0x9060 +#define GL_INT_IMAGE_2D_MULTISAMPLE_ARRAY 0x9061 +#define GL_UNSIGNED_INT_IMAGE_1D 0x9062 +#define GL_UNSIGNED_INT_IMAGE_2D 0x9063 +#define GL_UNSIGNED_INT_IMAGE_3D 0x9064 +#define GL_UNSIGNED_INT_IMAGE_2D_RECT 0x9065 +#define GL_UNSIGNED_INT_IMAGE_CUBE 0x9066 +#define GL_UNSIGNED_INT_IMAGE_BUFFER 0x9067 +#define GL_UNSIGNED_INT_IMAGE_1D_ARRAY 0x9068 +#define GL_UNSIGNED_INT_IMAGE_2D_ARRAY 0x9069 +#define GL_UNSIGNED_INT_IMAGE_CUBE_MAP_ARRAY 0x906A +#define GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE 0x906B +#define GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_ARRAY 0x906C +#define GL_MAX_IMAGE_SAMPLES 0x906D +#define GL_IMAGE_BINDING_FORMAT 0x906E +#define GL_IMAGE_FORMAT_COMPATIBILITY_TYPE 0x90C7 +#define GL_IMAGE_FORMAT_COMPATIBILITY_BY_SIZE 0x90C8 +#define GL_IMAGE_FORMAT_COMPATIBILITY_BY_CLASS 0x90C9 +#define GL_MAX_VERTEX_IMAGE_UNIFORMS 0x90CA +#define GL_MAX_TESS_CONTROL_IMAGE_UNIFORMS 0x90CB +#define GL_MAX_TESS_EVALUATION_IMAGE_UNIFORMS 0x90CC +#define GL_MAX_GEOMETRY_IMAGE_UNIFORMS 0x90CD +#define GL_MAX_FRAGMENT_IMAGE_UNIFORMS 0x90CE +#define GL_MAX_COMBINED_IMAGE_UNIFORMS 0x90CF +#define GL_COMPRESSED_RGBA_BPTC_UNORM 0x8E8C +#define GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM 0x8E8D +#define GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT 0x8E8E +#define GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT 0x8E8F +#define GL_TEXTURE_IMMUTABLE_FORMAT 0x912F +#define GL_NUM_SHADING_LANGUAGE_VERSIONS 0x82E9 +#define GL_VERTEX_ATTRIB_ARRAY_LONG 0x874E +#define GL_COMPRESSED_RGB8_ETC2 0x9274 +#define GL_COMPRESSED_SRGB8_ETC2 0x9275 +#define GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2 0x9276 +#define GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2 0x9277 +#define GL_COMPRESSED_RGBA8_ETC2_EAC 0x9278 +#define GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC 0x9279 +#define GL_COMPRESSED_R11_EAC 0x9270 +#define GL_COMPRESSED_SIGNED_R11_EAC 0x9271 +#define GL_COMPRESSED_RG11_EAC 0x9272 +#define GL_COMPRESSED_SIGNED_RG11_EAC 0x9273 +#define GL_PRIMITIVE_RESTART_FIXED_INDEX 0x8D69 +#define GL_ANY_SAMPLES_PASSED_CONSERVATIVE 0x8D6A +#define GL_MAX_ELEMENT_INDEX 0x8D6B +#define GL_COMPUTE_SHADER 0x91B9 +#define GL_MAX_COMPUTE_UNIFORM_BLOCKS 0x91BB +#define GL_MAX_COMPUTE_TEXTURE_IMAGE_UNITS 0x91BC +#define GL_MAX_COMPUTE_IMAGE_UNIFORMS 0x91BD +#define GL_MAX_COMPUTE_SHARED_MEMORY_SIZE 0x8262 +#define GL_MAX_COMPUTE_UNIFORM_COMPONENTS 0x8263 +#define GL_MAX_COMPUTE_ATOMIC_COUNTER_BUFFERS 0x8264 +#define GL_MAX_COMPUTE_ATOMIC_COUNTERS 0x8265 +#define GL_MAX_COMBINED_COMPUTE_UNIFORM_COMPONENTS 0x8266 +#define GL_MAX_COMPUTE_WORK_GROUP_INVOCATIONS 0x90EB +#define GL_MAX_COMPUTE_WORK_GROUP_COUNT 0x91BE +#define GL_MAX_COMPUTE_WORK_GROUP_SIZE 0x91BF +#define GL_COMPUTE_WORK_GROUP_SIZE 0x8267 +#define GL_UNIFORM_BLOCK_REFERENCED_BY_COMPUTE_SHADER 0x90EC +#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_COMPUTE_SHADER 0x90ED +#define GL_DISPATCH_INDIRECT_BUFFER 0x90EE +#define GL_DISPATCH_INDIRECT_BUFFER_BINDING 0x90EF +#define GL_COMPUTE_SHADER_BIT 0x00000020 +#define GL_DEBUG_OUTPUT_SYNCHRONOUS 0x8242 +#define GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH 0x8243 +#define GL_DEBUG_CALLBACK_FUNCTION 0x8244 +#define GL_DEBUG_CALLBACK_USER_PARAM 0x8245 +#define GL_DEBUG_SOURCE_API 0x8246 +#define GL_DEBUG_SOURCE_WINDOW_SYSTEM 0x8247 +#define GL_DEBUG_SOURCE_SHADER_COMPILER 0x8248 +#define GL_DEBUG_SOURCE_THIRD_PARTY 0x8249 +#define GL_DEBUG_SOURCE_APPLICATION 0x824A +#define GL_DEBUG_SOURCE_OTHER 0x824B +#define GL_DEBUG_TYPE_ERROR 0x824C +#define GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR 0x824D +#define GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR 0x824E +#define GL_DEBUG_TYPE_PORTABILITY 0x824F +#define GL_DEBUG_TYPE_PERFORMANCE 0x8250 +#define GL_DEBUG_TYPE_OTHER 0x8251 +#define GL_MAX_DEBUG_MESSAGE_LENGTH 0x9143 +#define GL_MAX_DEBUG_LOGGED_MESSAGES 0x9144 +#define GL_DEBUG_LOGGED_MESSAGES 0x9145 +#define GL_DEBUG_SEVERITY_HIGH 0x9146 +#define GL_DEBUG_SEVERITY_MEDIUM 0x9147 +#define GL_DEBUG_SEVERITY_LOW 0x9148 +#define GL_DEBUG_TYPE_MARKER 0x8268 +#define GL_DEBUG_TYPE_PUSH_GROUP 0x8269 +#define GL_DEBUG_TYPE_POP_GROUP 0x826A +#define GL_DEBUG_SEVERITY_NOTIFICATION 0x826B +#define GL_MAX_DEBUG_GROUP_STACK_DEPTH 0x826C +#define GL_DEBUG_GROUP_STACK_DEPTH 0x826D +#define GL_BUFFER 0x82E0 +#define GL_SHADER 0x82E1 +#define GL_PROGRAM 0x82E2 +#define GL_QUERY 0x82E3 +#define GL_PROGRAM_PIPELINE 0x82E4 +#define GL_SAMPLER 0x82E6 +#define GL_MAX_LABEL_LENGTH 0x82E8 +#define GL_DEBUG_OUTPUT 0x92E0 +#define GL_CONTEXT_FLAG_DEBUG_BIT 0x00000002 +#define GL_MAX_UNIFORM_LOCATIONS 0x826E +#define GL_FRAMEBUFFER_DEFAULT_WIDTH 0x9310 +#define GL_FRAMEBUFFER_DEFAULT_HEIGHT 0x9311 +#define GL_FRAMEBUFFER_DEFAULT_LAYERS 0x9312 +#define GL_FRAMEBUFFER_DEFAULT_SAMPLES 0x9313 +#define GL_FRAMEBUFFER_DEFAULT_FIXED_SAMPLE_LOCATIONS 0x9314 +#define GL_MAX_FRAMEBUFFER_WIDTH 0x9315 +#define GL_MAX_FRAMEBUFFER_HEIGHT 0x9316 +#define GL_MAX_FRAMEBUFFER_LAYERS 0x9317 +#define GL_MAX_FRAMEBUFFER_SAMPLES 0x9318 +#define GL_INTERNALFORMAT_SUPPORTED 0x826F +#define GL_INTERNALFORMAT_PREFERRED 0x8270 +#define GL_INTERNALFORMAT_RED_SIZE 0x8271 +#define GL_INTERNALFORMAT_GREEN_SIZE 0x8272 +#define GL_INTERNALFORMAT_BLUE_SIZE 0x8273 +#define GL_INTERNALFORMAT_ALPHA_SIZE 0x8274 +#define GL_INTERNALFORMAT_DEPTH_SIZE 0x8275 +#define GL_INTERNALFORMAT_STENCIL_SIZE 0x8276 +#define GL_INTERNALFORMAT_SHARED_SIZE 0x8277 +#define GL_INTERNALFORMAT_RED_TYPE 0x8278 +#define GL_INTERNALFORMAT_GREEN_TYPE 0x8279 +#define GL_INTERNALFORMAT_BLUE_TYPE 0x827A +#define GL_INTERNALFORMAT_ALPHA_TYPE 0x827B +#define GL_INTERNALFORMAT_DEPTH_TYPE 0x827C +#define GL_INTERNALFORMAT_STENCIL_TYPE 0x827D +#define GL_MAX_WIDTH 0x827E +#define GL_MAX_HEIGHT 0x827F +#define GL_MAX_DEPTH 0x8280 +#define GL_MAX_LAYERS 0x8281 +#define GL_MAX_COMBINED_DIMENSIONS 0x8282 +#define GL_COLOR_COMPONENTS 0x8283 +#define GL_DEPTH_COMPONENTS 0x8284 +#define GL_STENCIL_COMPONENTS 0x8285 +#define GL_COLOR_RENDERABLE 0x8286 +#define GL_DEPTH_RENDERABLE 0x8287 +#define GL_STENCIL_RENDERABLE 0x8288 +#define GL_FRAMEBUFFER_RENDERABLE 0x8289 +#define GL_FRAMEBUFFER_RENDERABLE_LAYERED 0x828A +#define GL_FRAMEBUFFER_BLEND 0x828B +#define GL_READ_PIXELS 0x828C +#define GL_READ_PIXELS_FORMAT 0x828D +#define GL_READ_PIXELS_TYPE 0x828E +#define GL_TEXTURE_IMAGE_FORMAT 0x828F +#define GL_TEXTURE_IMAGE_TYPE 0x8290 +#define GL_GET_TEXTURE_IMAGE_FORMAT 0x8291 +#define GL_GET_TEXTURE_IMAGE_TYPE 0x8292 +#define GL_MIPMAP 0x8293 +#define GL_MANUAL_GENERATE_MIPMAP 0x8294 +#define GL_AUTO_GENERATE_MIPMAP 0x8295 +#define GL_COLOR_ENCODING 0x8296 +#define GL_SRGB_READ 0x8297 +#define GL_SRGB_WRITE 0x8298 +#define GL_FILTER 0x829A +#define GL_VERTEX_TEXTURE 0x829B +#define GL_TESS_CONTROL_TEXTURE 0x829C +#define GL_TESS_EVALUATION_TEXTURE 0x829D +#define GL_GEOMETRY_TEXTURE 0x829E +#define GL_FRAGMENT_TEXTURE 0x829F +#define GL_COMPUTE_TEXTURE 0x82A0 +#define GL_TEXTURE_SHADOW 0x82A1 +#define GL_TEXTURE_GATHER 0x82A2 +#define GL_TEXTURE_GATHER_SHADOW 0x82A3 +#define GL_SHADER_IMAGE_LOAD 0x82A4 +#define GL_SHADER_IMAGE_STORE 0x82A5 +#define GL_SHADER_IMAGE_ATOMIC 0x82A6 +#define GL_IMAGE_TEXEL_SIZE 0x82A7 +#define GL_IMAGE_COMPATIBILITY_CLASS 0x82A8 +#define GL_IMAGE_PIXEL_FORMAT 0x82A9 +#define GL_IMAGE_PIXEL_TYPE 0x82AA +#define GL_SIMULTANEOUS_TEXTURE_AND_DEPTH_TEST 0x82AC +#define GL_SIMULTANEOUS_TEXTURE_AND_STENCIL_TEST 0x82AD +#define GL_SIMULTANEOUS_TEXTURE_AND_DEPTH_WRITE 0x82AE +#define GL_SIMULTANEOUS_TEXTURE_AND_STENCIL_WRITE 0x82AF +#define GL_TEXTURE_COMPRESSED_BLOCK_WIDTH 0x82B1 +#define GL_TEXTURE_COMPRESSED_BLOCK_HEIGHT 0x82B2 +#define GL_TEXTURE_COMPRESSED_BLOCK_SIZE 0x82B3 +#define GL_CLEAR_BUFFER 0x82B4 +#define GL_TEXTURE_VIEW 0x82B5 +#define GL_VIEW_COMPATIBILITY_CLASS 0x82B6 +#define GL_FULL_SUPPORT 0x82B7 +#define GL_CAVEAT_SUPPORT 0x82B8 +#define GL_IMAGE_CLASS_4_X_32 0x82B9 +#define GL_IMAGE_CLASS_2_X_32 0x82BA +#define GL_IMAGE_CLASS_1_X_32 0x82BB +#define GL_IMAGE_CLASS_4_X_16 0x82BC +#define GL_IMAGE_CLASS_2_X_16 0x82BD +#define GL_IMAGE_CLASS_1_X_16 0x82BE +#define GL_IMAGE_CLASS_4_X_8 0x82BF +#define GL_IMAGE_CLASS_2_X_8 0x82C0 +#define GL_IMAGE_CLASS_1_X_8 0x82C1 +#define GL_IMAGE_CLASS_11_11_10 0x82C2 +#define GL_IMAGE_CLASS_10_10_10_2 0x82C3 +#define GL_VIEW_CLASS_128_BITS 0x82C4 +#define GL_VIEW_CLASS_96_BITS 0x82C5 +#define GL_VIEW_CLASS_64_BITS 0x82C6 +#define GL_VIEW_CLASS_48_BITS 0x82C7 +#define GL_VIEW_CLASS_32_BITS 0x82C8 +#define GL_VIEW_CLASS_24_BITS 0x82C9 +#define GL_VIEW_CLASS_16_BITS 0x82CA +#define GL_VIEW_CLASS_8_BITS 0x82CB +#define GL_VIEW_CLASS_S3TC_DXT1_RGB 0x82CC +#define GL_VIEW_CLASS_S3TC_DXT1_RGBA 0x82CD +#define GL_VIEW_CLASS_S3TC_DXT3_RGBA 0x82CE +#define GL_VIEW_CLASS_S3TC_DXT5_RGBA 0x82CF +#define GL_VIEW_CLASS_RGTC1_RED 0x82D0 +#define GL_VIEW_CLASS_RGTC2_RG 0x82D1 +#define GL_VIEW_CLASS_BPTC_UNORM 0x82D2 +#define GL_VIEW_CLASS_BPTC_FLOAT 0x82D3 +#define GL_UNIFORM 0x92E1 +#define GL_UNIFORM_BLOCK 0x92E2 +#define GL_PROGRAM_INPUT 0x92E3 +#define GL_PROGRAM_OUTPUT 0x92E4 +#define GL_BUFFER_VARIABLE 0x92E5 +#define GL_SHADER_STORAGE_BLOCK 0x92E6 +#define GL_VERTEX_SUBROUTINE 0x92E8 +#define GL_TESS_CONTROL_SUBROUTINE 0x92E9 +#define GL_TESS_EVALUATION_SUBROUTINE 0x92EA +#define GL_GEOMETRY_SUBROUTINE 0x92EB +#define GL_FRAGMENT_SUBROUTINE 0x92EC +#define GL_COMPUTE_SUBROUTINE 0x92ED +#define GL_VERTEX_SUBROUTINE_UNIFORM 0x92EE +#define GL_TESS_CONTROL_SUBROUTINE_UNIFORM 0x92EF +#define GL_TESS_EVALUATION_SUBROUTINE_UNIFORM 0x92F0 +#define GL_GEOMETRY_SUBROUTINE_UNIFORM 0x92F1 +#define GL_FRAGMENT_SUBROUTINE_UNIFORM 0x92F2 +#define GL_COMPUTE_SUBROUTINE_UNIFORM 0x92F3 +#define GL_TRANSFORM_FEEDBACK_VARYING 0x92F4 +#define GL_ACTIVE_RESOURCES 0x92F5 +#define GL_MAX_NAME_LENGTH 0x92F6 +#define GL_MAX_NUM_ACTIVE_VARIABLES 0x92F7 +#define GL_MAX_NUM_COMPATIBLE_SUBROUTINES 0x92F8 +#define GL_NAME_LENGTH 0x92F9 +#define GL_TYPE 0x92FA +#define GL_ARRAY_SIZE 0x92FB +#define GL_OFFSET 0x92FC +#define GL_BLOCK_INDEX 0x92FD +#define GL_ARRAY_STRIDE 0x92FE +#define GL_MATRIX_STRIDE 0x92FF +#define GL_IS_ROW_MAJOR 0x9300 +#define GL_ATOMIC_COUNTER_BUFFER_INDEX 0x9301 +#define GL_BUFFER_BINDING 0x9302 +#define GL_BUFFER_DATA_SIZE 0x9303 +#define GL_NUM_ACTIVE_VARIABLES 0x9304 +#define GL_ACTIVE_VARIABLES 0x9305 +#define GL_REFERENCED_BY_VERTEX_SHADER 0x9306 +#define GL_REFERENCED_BY_TESS_CONTROL_SHADER 0x9307 +#define GL_REFERENCED_BY_TESS_EVALUATION_SHADER 0x9308 +#define GL_REFERENCED_BY_GEOMETRY_SHADER 0x9309 +#define GL_REFERENCED_BY_FRAGMENT_SHADER 0x930A +#define GL_REFERENCED_BY_COMPUTE_SHADER 0x930B +#define GL_TOP_LEVEL_ARRAY_SIZE 0x930C +#define GL_TOP_LEVEL_ARRAY_STRIDE 0x930D +#define GL_LOCATION 0x930E +#define GL_LOCATION_INDEX 0x930F +#define GL_IS_PER_PATCH 0x92E7 +#define GL_SHADER_STORAGE_BUFFER 0x90D2 +#define GL_SHADER_STORAGE_BUFFER_BINDING 0x90D3 +#define GL_SHADER_STORAGE_BUFFER_START 0x90D4 +#define GL_SHADER_STORAGE_BUFFER_SIZE 0x90D5 +#define GL_MAX_VERTEX_SHADER_STORAGE_BLOCKS 0x90D6 +#define GL_MAX_GEOMETRY_SHADER_STORAGE_BLOCKS 0x90D7 +#define GL_MAX_TESS_CONTROL_SHADER_STORAGE_BLOCKS 0x90D8 +#define GL_MAX_TESS_EVALUATION_SHADER_STORAGE_BLOCKS 0x90D9 +#define GL_MAX_FRAGMENT_SHADER_STORAGE_BLOCKS 0x90DA +#define GL_MAX_COMPUTE_SHADER_STORAGE_BLOCKS 0x90DB +#define GL_MAX_COMBINED_SHADER_STORAGE_BLOCKS 0x90DC +#define GL_MAX_SHADER_STORAGE_BUFFER_BINDINGS 0x90DD +#define GL_MAX_SHADER_STORAGE_BLOCK_SIZE 0x90DE +#define GL_SHADER_STORAGE_BUFFER_OFFSET_ALIGNMENT 0x90DF +#define GL_SHADER_STORAGE_BARRIER_BIT 0x00002000 +#define GL_MAX_COMBINED_SHADER_OUTPUT_RESOURCES 0x8F39 +#define GL_DEPTH_STENCIL_TEXTURE_MODE 0x90EA +#define GL_TEXTURE_BUFFER_OFFSET 0x919D +#define GL_TEXTURE_BUFFER_SIZE 0x919E +#define GL_TEXTURE_BUFFER_OFFSET_ALIGNMENT 0x919F +#define GL_TEXTURE_VIEW_MIN_LEVEL 0x82DB +#define GL_TEXTURE_VIEW_NUM_LEVELS 0x82DC +#define GL_TEXTURE_VIEW_MIN_LAYER 0x82DD +#define GL_TEXTURE_VIEW_NUM_LAYERS 0x82DE +#define GL_TEXTURE_IMMUTABLE_LEVELS 0x82DF +#define GL_VERTEX_ATTRIB_BINDING 0x82D4 +#define GL_VERTEX_ATTRIB_RELATIVE_OFFSET 0x82D5 +#define GL_VERTEX_BINDING_DIVISOR 0x82D6 +#define GL_VERTEX_BINDING_OFFSET 0x82D7 +#define GL_VERTEX_BINDING_STRIDE 0x82D8 +#define GL_MAX_VERTEX_ATTRIB_RELATIVE_OFFSET 0x82D9 +#define GL_MAX_VERTEX_ATTRIB_BINDINGS 0x82DA +#define GL_VERTEX_BINDING_BUFFER 0x8F4F +#define GL_DISPLAY_LIST 0x82E7 +#define GL_MAX_VERTEX_ATTRIB_STRIDE 0x82E5 +#define GL_PRIMITIVE_RESTART_FOR_PATCHES_SUPPORTED 0x8221 +#define GL_TEXTURE_BUFFER_BINDING 0x8C2A +#define GL_MAP_PERSISTENT_BIT 0x0040 +#define GL_MAP_COHERENT_BIT 0x0080 +#define GL_DYNAMIC_STORAGE_BIT 0x0100 +#define GL_CLIENT_STORAGE_BIT 0x0200 +#define GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT 0x00004000 +#define GL_BUFFER_IMMUTABLE_STORAGE 0x821F +#define GL_BUFFER_STORAGE_FLAGS 0x8220 +#define GL_CLEAR_TEXTURE 0x9365 +#define GL_LOCATION_COMPONENT 0x934A +#define GL_TRANSFORM_FEEDBACK_BUFFER_INDEX 0x934B +#define GL_TRANSFORM_FEEDBACK_BUFFER_STRIDE 0x934C +#define GL_QUERY_BUFFER 0x9192 +#define GL_QUERY_BUFFER_BARRIER_BIT 0x00008000 +#define GL_QUERY_BUFFER_BINDING 0x9193 +#define GL_QUERY_RESULT_NO_WAIT 0x9194 +#define GL_MIRROR_CLAMP_TO_EDGE 0x8743 +#define GL_CONTEXT_LOST 0x0507 +#define GL_NEGATIVE_ONE_TO_ONE 0x935E +#define GL_ZERO_TO_ONE 0x935F +#define GL_CLIP_ORIGIN 0x935C +#define GL_CLIP_DEPTH_MODE 0x935D +#define GL_QUERY_WAIT_INVERTED 0x8E17 +#define GL_QUERY_NO_WAIT_INVERTED 0x8E18 +#define GL_QUERY_BY_REGION_WAIT_INVERTED 0x8E19 +#define GL_QUERY_BY_REGION_NO_WAIT_INVERTED 0x8E1A +#define GL_MAX_CULL_DISTANCES 0x82F9 +#define GL_MAX_COMBINED_CLIP_AND_CULL_DISTANCES 0x82FA +#define GL_TEXTURE_TARGET 0x1006 +#define GL_QUERY_TARGET 0x82EA +#define GL_GUILTY_CONTEXT_RESET 0x8253 +#define GL_INNOCENT_CONTEXT_RESET 0x8254 +#define GL_UNKNOWN_CONTEXT_RESET 0x8255 +#define GL_RESET_NOTIFICATION_STRATEGY 0x8256 +#define GL_LOSE_CONTEXT_ON_RESET 0x8252 +#define GL_NO_RESET_NOTIFICATION 0x8261 +#define GL_CONTEXT_FLAG_ROBUST_ACCESS_BIT 0x00000004 +#define GL_COLOR_TABLE 0x80D0 +#define GL_POST_CONVOLUTION_COLOR_TABLE 0x80D1 +#define GL_POST_COLOR_MATRIX_COLOR_TABLE 0x80D2 +#define GL_PROXY_COLOR_TABLE 0x80D3 +#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE 0x80D4 +#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE 0x80D5 +#define GL_CONVOLUTION_1D 0x8010 +#define GL_CONVOLUTION_2D 0x8011 +#define GL_SEPARABLE_2D 0x8012 +#define GL_HISTOGRAM 0x8024 +#define GL_PROXY_HISTOGRAM 0x8025 +#define GL_MINMAX 0x802E +#define GL_CONTEXT_RELEASE_BEHAVIOR 0x82FB +#define GL_CONTEXT_RELEASE_BEHAVIOR_FLUSH 0x82FC +#define GL_SHADER_BINARY_FORMAT_SPIR_V 0x9551 +#define GL_SPIR_V_BINARY 0x9552 +#define GL_PARAMETER_BUFFER 0x80EE +#define GL_PARAMETER_BUFFER_BINDING 0x80EF +#define GL_CONTEXT_FLAG_NO_ERROR_BIT 0x00000008 +#define GL_VERTICES_SUBMITTED 0x82EE +#define GL_PRIMITIVES_SUBMITTED 0x82EF +#define GL_VERTEX_SHADER_INVOCATIONS 0x82F0 +#define GL_TESS_CONTROL_SHADER_PATCHES 0x82F1 +#define GL_TESS_EVALUATION_SHADER_INVOCATIONS 0x82F2 +#define GL_GEOMETRY_SHADER_PRIMITIVES_EMITTED 0x82F3 +#define GL_FRAGMENT_SHADER_INVOCATIONS 0x82F4 +#define GL_COMPUTE_SHADER_INVOCATIONS 0x82F5 +#define GL_CLIPPING_INPUT_PRIMITIVES 0x82F6 +#define GL_CLIPPING_OUTPUT_PRIMITIVES 0x82F7 +#define GL_POLYGON_OFFSET_CLAMP 0x8E1B +#define GL_SPIR_V_EXTENSIONS 0x9553 +#define GL_NUM_SPIR_V_EXTENSIONS 0x9554 +#define GL_TEXTURE_MAX_ANISOTROPY 0x84FE +#define GL_MAX_TEXTURE_MAX_ANISOTROPY 0x84FF +#define GL_TRANSFORM_FEEDBACK_OVERFLOW 0x82EC +#define GL_TRANSFORM_FEEDBACK_STREAM_OVERFLOW 0x82ED +#ifndef GL_VERSION_1_0 +#define GL_VERSION_1_0 1 +GLAPI int GLAD_GL_VERSION_1_0; +typedef void (APIENTRYP PFNGLCULLFACEPROC)(GLenum mode); +GLAPI PFNGLCULLFACEPROC glad_glCullFace; +#define glCullFace glad_glCullFace +typedef void (APIENTRYP PFNGLFRONTFACEPROC)(GLenum mode); +GLAPI PFNGLFRONTFACEPROC glad_glFrontFace; +#define glFrontFace glad_glFrontFace +typedef void (APIENTRYP PFNGLHINTPROC)(GLenum target, GLenum mode); +GLAPI PFNGLHINTPROC glad_glHint; +#define glHint glad_glHint +typedef void (APIENTRYP PFNGLLINEWIDTHPROC)(GLfloat width); +GLAPI PFNGLLINEWIDTHPROC glad_glLineWidth; +#define glLineWidth glad_glLineWidth +typedef void (APIENTRYP PFNGLPOINTSIZEPROC)(GLfloat size); +GLAPI PFNGLPOINTSIZEPROC glad_glPointSize; +#define glPointSize glad_glPointSize +typedef void (APIENTRYP PFNGLPOLYGONMODEPROC)(GLenum face, GLenum mode); +GLAPI PFNGLPOLYGONMODEPROC glad_glPolygonMode; +#define glPolygonMode glad_glPolygonMode +typedef void (APIENTRYP PFNGLSCISSORPROC)(GLint x, GLint y, GLsizei width, GLsizei height); +GLAPI PFNGLSCISSORPROC glad_glScissor; +#define glScissor glad_glScissor +typedef void (APIENTRYP PFNGLTEXPARAMETERFPROC)(GLenum target, GLenum pname, GLfloat param); +GLAPI PFNGLTEXPARAMETERFPROC glad_glTexParameterf; +#define glTexParameterf glad_glTexParameterf +typedef void (APIENTRYP PFNGLTEXPARAMETERFVPROC)(GLenum target, GLenum pname, const GLfloat *params); +GLAPI PFNGLTEXPARAMETERFVPROC glad_glTexParameterfv; +#define glTexParameterfv glad_glTexParameterfv +typedef void (APIENTRYP PFNGLTEXPARAMETERIPROC)(GLenum target, GLenum pname, GLint param); +GLAPI PFNGLTEXPARAMETERIPROC glad_glTexParameteri; +#define glTexParameteri glad_glTexParameteri +typedef void (APIENTRYP PFNGLTEXPARAMETERIVPROC)(GLenum target, GLenum pname, const GLint *params); +GLAPI PFNGLTEXPARAMETERIVPROC glad_glTexParameteriv; +#define glTexParameteriv glad_glTexParameteriv +typedef void (APIENTRYP PFNGLTEXIMAGE1DPROC)(GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const void *pixels); +GLAPI PFNGLTEXIMAGE1DPROC glad_glTexImage1D; +#define glTexImage1D glad_glTexImage1D +typedef void (APIENTRYP PFNGLTEXIMAGE2DPROC)(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void *pixels); +GLAPI PFNGLTEXIMAGE2DPROC glad_glTexImage2D; +#define glTexImage2D glad_glTexImage2D +typedef void (APIENTRYP PFNGLDRAWBUFFERPROC)(GLenum buf); +GLAPI PFNGLDRAWBUFFERPROC glad_glDrawBuffer; +#define glDrawBuffer glad_glDrawBuffer +typedef void (APIENTRYP PFNGLCLEARPROC)(GLbitfield mask); +GLAPI PFNGLCLEARPROC glad_glClear; +#define glClear glad_glClear +typedef void (APIENTRYP PFNGLCLEARCOLORPROC)(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha); +GLAPI PFNGLCLEARCOLORPROC glad_glClearColor; +#define glClearColor glad_glClearColor +typedef void (APIENTRYP PFNGLCLEARSTENCILPROC)(GLint s); +GLAPI PFNGLCLEARSTENCILPROC glad_glClearStencil; +#define glClearStencil glad_glClearStencil +typedef void (APIENTRYP PFNGLCLEARDEPTHPROC)(GLdouble depth); +GLAPI PFNGLCLEARDEPTHPROC glad_glClearDepth; +#define glClearDepth glad_glClearDepth +typedef void (APIENTRYP PFNGLSTENCILMASKPROC)(GLuint mask); +GLAPI PFNGLSTENCILMASKPROC glad_glStencilMask; +#define glStencilMask glad_glStencilMask +typedef void (APIENTRYP PFNGLCOLORMASKPROC)(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha); +GLAPI PFNGLCOLORMASKPROC glad_glColorMask; +#define glColorMask glad_glColorMask +typedef void (APIENTRYP PFNGLDEPTHMASKPROC)(GLboolean flag); +GLAPI PFNGLDEPTHMASKPROC glad_glDepthMask; +#define glDepthMask glad_glDepthMask +typedef void (APIENTRYP PFNGLDISABLEPROC)(GLenum cap); +GLAPI PFNGLDISABLEPROC glad_glDisable; +#define glDisable glad_glDisable +typedef void (APIENTRYP PFNGLENABLEPROC)(GLenum cap); +GLAPI PFNGLENABLEPROC glad_glEnable; +#define glEnable glad_glEnable +typedef void (APIENTRYP PFNGLFINISHPROC)(void); +GLAPI PFNGLFINISHPROC glad_glFinish; +#define glFinish glad_glFinish +typedef void (APIENTRYP PFNGLFLUSHPROC)(void); +GLAPI PFNGLFLUSHPROC glad_glFlush; +#define glFlush glad_glFlush +typedef void (APIENTRYP PFNGLBLENDFUNCPROC)(GLenum sfactor, GLenum dfactor); +GLAPI PFNGLBLENDFUNCPROC glad_glBlendFunc; +#define glBlendFunc glad_glBlendFunc +typedef void (APIENTRYP PFNGLLOGICOPPROC)(GLenum opcode); +GLAPI PFNGLLOGICOPPROC glad_glLogicOp; +#define glLogicOp glad_glLogicOp +typedef void (APIENTRYP PFNGLSTENCILFUNCPROC)(GLenum func, GLint ref, GLuint mask); +GLAPI PFNGLSTENCILFUNCPROC glad_glStencilFunc; +#define glStencilFunc glad_glStencilFunc +typedef void (APIENTRYP PFNGLSTENCILOPPROC)(GLenum fail, GLenum zfail, GLenum zpass); +GLAPI PFNGLSTENCILOPPROC glad_glStencilOp; +#define glStencilOp glad_glStencilOp +typedef void (APIENTRYP PFNGLDEPTHFUNCPROC)(GLenum func); +GLAPI PFNGLDEPTHFUNCPROC glad_glDepthFunc; +#define glDepthFunc glad_glDepthFunc +typedef void (APIENTRYP PFNGLPIXELSTOREFPROC)(GLenum pname, GLfloat param); +GLAPI PFNGLPIXELSTOREFPROC glad_glPixelStoref; +#define glPixelStoref glad_glPixelStoref +typedef void (APIENTRYP PFNGLPIXELSTOREIPROC)(GLenum pname, GLint param); +GLAPI PFNGLPIXELSTOREIPROC glad_glPixelStorei; +#define glPixelStorei glad_glPixelStorei +typedef void (APIENTRYP PFNGLREADBUFFERPROC)(GLenum src); +GLAPI PFNGLREADBUFFERPROC glad_glReadBuffer; +#define glReadBuffer glad_glReadBuffer +typedef void (APIENTRYP PFNGLREADPIXELSPROC)(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, void *pixels); +GLAPI PFNGLREADPIXELSPROC glad_glReadPixels; +#define glReadPixels glad_glReadPixels +typedef void (APIENTRYP PFNGLGETBOOLEANVPROC)(GLenum pname, GLboolean *data); +GLAPI PFNGLGETBOOLEANVPROC glad_glGetBooleanv; +#define glGetBooleanv glad_glGetBooleanv +typedef void (APIENTRYP PFNGLGETDOUBLEVPROC)(GLenum pname, GLdouble *data); +GLAPI PFNGLGETDOUBLEVPROC glad_glGetDoublev; +#define glGetDoublev glad_glGetDoublev +typedef GLenum (APIENTRYP PFNGLGETERRORPROC)(void); +GLAPI PFNGLGETERRORPROC glad_glGetError; +#define glGetError glad_glGetError +typedef void (APIENTRYP PFNGLGETFLOATVPROC)(GLenum pname, GLfloat *data); +GLAPI PFNGLGETFLOATVPROC glad_glGetFloatv; +#define glGetFloatv glad_glGetFloatv +typedef void (APIENTRYP PFNGLGETINTEGERVPROC)(GLenum pname, GLint *data); +GLAPI PFNGLGETINTEGERVPROC glad_glGetIntegerv; +#define glGetIntegerv glad_glGetIntegerv +typedef const GLubyte * (APIENTRYP PFNGLGETSTRINGPROC)(GLenum name); +GLAPI PFNGLGETSTRINGPROC glad_glGetString; +#define glGetString glad_glGetString +typedef void (APIENTRYP PFNGLGETTEXIMAGEPROC)(GLenum target, GLint level, GLenum format, GLenum type, void *pixels); +GLAPI PFNGLGETTEXIMAGEPROC glad_glGetTexImage; +#define glGetTexImage glad_glGetTexImage +typedef void (APIENTRYP PFNGLGETTEXPARAMETERFVPROC)(GLenum target, GLenum pname, GLfloat *params); +GLAPI PFNGLGETTEXPARAMETERFVPROC glad_glGetTexParameterfv; +#define glGetTexParameterfv glad_glGetTexParameterfv +typedef void (APIENTRYP PFNGLGETTEXPARAMETERIVPROC)(GLenum target, GLenum pname, GLint *params); +GLAPI PFNGLGETTEXPARAMETERIVPROC glad_glGetTexParameteriv; +#define glGetTexParameteriv glad_glGetTexParameteriv +typedef void (APIENTRYP PFNGLGETTEXLEVELPARAMETERFVPROC)(GLenum target, GLint level, GLenum pname, GLfloat *params); +GLAPI PFNGLGETTEXLEVELPARAMETERFVPROC glad_glGetTexLevelParameterfv; +#define glGetTexLevelParameterfv glad_glGetTexLevelParameterfv +typedef void (APIENTRYP PFNGLGETTEXLEVELPARAMETERIVPROC)(GLenum target, GLint level, GLenum pname, GLint *params); +GLAPI PFNGLGETTEXLEVELPARAMETERIVPROC glad_glGetTexLevelParameteriv; +#define glGetTexLevelParameteriv glad_glGetTexLevelParameteriv +typedef GLboolean (APIENTRYP PFNGLISENABLEDPROC)(GLenum cap); +GLAPI PFNGLISENABLEDPROC glad_glIsEnabled; +#define glIsEnabled glad_glIsEnabled +typedef void (APIENTRYP PFNGLDEPTHRANGEPROC)(GLdouble n, GLdouble f); +GLAPI PFNGLDEPTHRANGEPROC glad_glDepthRange; +#define glDepthRange glad_glDepthRange +typedef void (APIENTRYP PFNGLVIEWPORTPROC)(GLint x, GLint y, GLsizei width, GLsizei height); +GLAPI PFNGLVIEWPORTPROC glad_glViewport; +#define glViewport glad_glViewport +typedef void (APIENTRYP PFNGLNEWLISTPROC)(GLuint list, GLenum mode); +GLAPI PFNGLNEWLISTPROC glad_glNewList; +#define glNewList glad_glNewList +typedef void (APIENTRYP PFNGLENDLISTPROC)(void); +GLAPI PFNGLENDLISTPROC glad_glEndList; +#define glEndList glad_glEndList +typedef void (APIENTRYP PFNGLCALLLISTPROC)(GLuint list); +GLAPI PFNGLCALLLISTPROC glad_glCallList; +#define glCallList glad_glCallList +typedef void (APIENTRYP PFNGLCALLLISTSPROC)(GLsizei n, GLenum type, const void *lists); +GLAPI PFNGLCALLLISTSPROC glad_glCallLists; +#define glCallLists glad_glCallLists +typedef void (APIENTRYP PFNGLDELETELISTSPROC)(GLuint list, GLsizei range); +GLAPI PFNGLDELETELISTSPROC glad_glDeleteLists; +#define glDeleteLists glad_glDeleteLists +typedef GLuint (APIENTRYP PFNGLGENLISTSPROC)(GLsizei range); +GLAPI PFNGLGENLISTSPROC glad_glGenLists; +#define glGenLists glad_glGenLists +typedef void (APIENTRYP PFNGLLISTBASEPROC)(GLuint base); +GLAPI PFNGLLISTBASEPROC glad_glListBase; +#define glListBase glad_glListBase +typedef void (APIENTRYP PFNGLBEGINPROC)(GLenum mode); +GLAPI PFNGLBEGINPROC glad_glBegin; +#define glBegin glad_glBegin +typedef void (APIENTRYP PFNGLBITMAPPROC)(GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove, const GLubyte *bitmap); +GLAPI PFNGLBITMAPPROC glad_glBitmap; +#define glBitmap glad_glBitmap +typedef void (APIENTRYP PFNGLCOLOR3BPROC)(GLbyte red, GLbyte green, GLbyte blue); +GLAPI PFNGLCOLOR3BPROC glad_glColor3b; +#define glColor3b glad_glColor3b +typedef void (APIENTRYP PFNGLCOLOR3BVPROC)(const GLbyte *v); +GLAPI PFNGLCOLOR3BVPROC glad_glColor3bv; +#define glColor3bv glad_glColor3bv +typedef void (APIENTRYP PFNGLCOLOR3DPROC)(GLdouble red, GLdouble green, GLdouble blue); +GLAPI PFNGLCOLOR3DPROC glad_glColor3d; +#define glColor3d glad_glColor3d +typedef void (APIENTRYP PFNGLCOLOR3DVPROC)(const GLdouble *v); +GLAPI PFNGLCOLOR3DVPROC glad_glColor3dv; +#define glColor3dv glad_glColor3dv +typedef void (APIENTRYP PFNGLCOLOR3FPROC)(GLfloat red, GLfloat green, GLfloat blue); +GLAPI PFNGLCOLOR3FPROC glad_glColor3f; +#define glColor3f glad_glColor3f +typedef void (APIENTRYP PFNGLCOLOR3FVPROC)(const GLfloat *v); +GLAPI PFNGLCOLOR3FVPROC glad_glColor3fv; +#define glColor3fv glad_glColor3fv +typedef void (APIENTRYP PFNGLCOLOR3IPROC)(GLint red, GLint green, GLint blue); +GLAPI PFNGLCOLOR3IPROC glad_glColor3i; +#define glColor3i glad_glColor3i +typedef void (APIENTRYP PFNGLCOLOR3IVPROC)(const GLint *v); +GLAPI PFNGLCOLOR3IVPROC glad_glColor3iv; +#define glColor3iv glad_glColor3iv +typedef void (APIENTRYP PFNGLCOLOR3SPROC)(GLshort red, GLshort green, GLshort blue); +GLAPI PFNGLCOLOR3SPROC glad_glColor3s; +#define glColor3s glad_glColor3s +typedef void (APIENTRYP PFNGLCOLOR3SVPROC)(const GLshort *v); +GLAPI PFNGLCOLOR3SVPROC glad_glColor3sv; +#define glColor3sv glad_glColor3sv +typedef void (APIENTRYP PFNGLCOLOR3UBPROC)(GLubyte red, GLubyte green, GLubyte blue); +GLAPI PFNGLCOLOR3UBPROC glad_glColor3ub; +#define glColor3ub glad_glColor3ub +typedef void (APIENTRYP PFNGLCOLOR3UBVPROC)(const GLubyte *v); +GLAPI PFNGLCOLOR3UBVPROC glad_glColor3ubv; +#define glColor3ubv glad_glColor3ubv +typedef void (APIENTRYP PFNGLCOLOR3UIPROC)(GLuint red, GLuint green, GLuint blue); +GLAPI PFNGLCOLOR3UIPROC glad_glColor3ui; +#define glColor3ui glad_glColor3ui +typedef void (APIENTRYP PFNGLCOLOR3UIVPROC)(const GLuint *v); +GLAPI PFNGLCOLOR3UIVPROC glad_glColor3uiv; +#define glColor3uiv glad_glColor3uiv +typedef void (APIENTRYP PFNGLCOLOR3USPROC)(GLushort red, GLushort green, GLushort blue); +GLAPI PFNGLCOLOR3USPROC glad_glColor3us; +#define glColor3us glad_glColor3us +typedef void (APIENTRYP PFNGLCOLOR3USVPROC)(const GLushort *v); +GLAPI PFNGLCOLOR3USVPROC glad_glColor3usv; +#define glColor3usv glad_glColor3usv +typedef void (APIENTRYP PFNGLCOLOR4BPROC)(GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha); +GLAPI PFNGLCOLOR4BPROC glad_glColor4b; +#define glColor4b glad_glColor4b +typedef void (APIENTRYP PFNGLCOLOR4BVPROC)(const GLbyte *v); +GLAPI PFNGLCOLOR4BVPROC glad_glColor4bv; +#define glColor4bv glad_glColor4bv +typedef void (APIENTRYP PFNGLCOLOR4DPROC)(GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha); +GLAPI PFNGLCOLOR4DPROC glad_glColor4d; +#define glColor4d glad_glColor4d +typedef void (APIENTRYP PFNGLCOLOR4DVPROC)(const GLdouble *v); +GLAPI PFNGLCOLOR4DVPROC glad_glColor4dv; +#define glColor4dv glad_glColor4dv +typedef void (APIENTRYP PFNGLCOLOR4FPROC)(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha); +GLAPI PFNGLCOLOR4FPROC glad_glColor4f; +#define glColor4f glad_glColor4f +typedef void (APIENTRYP PFNGLCOLOR4FVPROC)(const GLfloat *v); +GLAPI PFNGLCOLOR4FVPROC glad_glColor4fv; +#define glColor4fv glad_glColor4fv +typedef void (APIENTRYP PFNGLCOLOR4IPROC)(GLint red, GLint green, GLint blue, GLint alpha); +GLAPI PFNGLCOLOR4IPROC glad_glColor4i; +#define glColor4i glad_glColor4i +typedef void (APIENTRYP PFNGLCOLOR4IVPROC)(const GLint *v); +GLAPI PFNGLCOLOR4IVPROC glad_glColor4iv; +#define glColor4iv glad_glColor4iv +typedef void (APIENTRYP PFNGLCOLOR4SPROC)(GLshort red, GLshort green, GLshort blue, GLshort alpha); +GLAPI PFNGLCOLOR4SPROC glad_glColor4s; +#define glColor4s glad_glColor4s +typedef void (APIENTRYP PFNGLCOLOR4SVPROC)(const GLshort *v); +GLAPI PFNGLCOLOR4SVPROC glad_glColor4sv; +#define glColor4sv glad_glColor4sv +typedef void (APIENTRYP PFNGLCOLOR4UBPROC)(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha); +GLAPI PFNGLCOLOR4UBPROC glad_glColor4ub; +#define glColor4ub glad_glColor4ub +typedef void (APIENTRYP PFNGLCOLOR4UBVPROC)(const GLubyte *v); +GLAPI PFNGLCOLOR4UBVPROC glad_glColor4ubv; +#define glColor4ubv glad_glColor4ubv +typedef void (APIENTRYP PFNGLCOLOR4UIPROC)(GLuint red, GLuint green, GLuint blue, GLuint alpha); +GLAPI PFNGLCOLOR4UIPROC glad_glColor4ui; +#define glColor4ui glad_glColor4ui +typedef void (APIENTRYP PFNGLCOLOR4UIVPROC)(const GLuint *v); +GLAPI PFNGLCOLOR4UIVPROC glad_glColor4uiv; +#define glColor4uiv glad_glColor4uiv +typedef void (APIENTRYP PFNGLCOLOR4USPROC)(GLushort red, GLushort green, GLushort blue, GLushort alpha); +GLAPI PFNGLCOLOR4USPROC glad_glColor4us; +#define glColor4us glad_glColor4us +typedef void (APIENTRYP PFNGLCOLOR4USVPROC)(const GLushort *v); +GLAPI PFNGLCOLOR4USVPROC glad_glColor4usv; +#define glColor4usv glad_glColor4usv +typedef void (APIENTRYP PFNGLEDGEFLAGPROC)(GLboolean flag); +GLAPI PFNGLEDGEFLAGPROC glad_glEdgeFlag; +#define glEdgeFlag glad_glEdgeFlag +typedef void (APIENTRYP PFNGLEDGEFLAGVPROC)(const GLboolean *flag); +GLAPI PFNGLEDGEFLAGVPROC glad_glEdgeFlagv; +#define glEdgeFlagv glad_glEdgeFlagv +typedef void (APIENTRYP PFNGLENDPROC)(void); +GLAPI PFNGLENDPROC glad_glEnd; +#define glEnd glad_glEnd +typedef void (APIENTRYP PFNGLINDEXDPROC)(GLdouble c); +GLAPI PFNGLINDEXDPROC glad_glIndexd; +#define glIndexd glad_glIndexd +typedef void (APIENTRYP PFNGLINDEXDVPROC)(const GLdouble *c); +GLAPI PFNGLINDEXDVPROC glad_glIndexdv; +#define glIndexdv glad_glIndexdv +typedef void (APIENTRYP PFNGLINDEXFPROC)(GLfloat c); +GLAPI PFNGLINDEXFPROC glad_glIndexf; +#define glIndexf glad_glIndexf +typedef void (APIENTRYP PFNGLINDEXFVPROC)(const GLfloat *c); +GLAPI PFNGLINDEXFVPROC glad_glIndexfv; +#define glIndexfv glad_glIndexfv +typedef void (APIENTRYP PFNGLINDEXIPROC)(GLint c); +GLAPI PFNGLINDEXIPROC glad_glIndexi; +#define glIndexi glad_glIndexi +typedef void (APIENTRYP PFNGLINDEXIVPROC)(const GLint *c); +GLAPI PFNGLINDEXIVPROC glad_glIndexiv; +#define glIndexiv glad_glIndexiv +typedef void (APIENTRYP PFNGLINDEXSPROC)(GLshort c); +GLAPI PFNGLINDEXSPROC glad_glIndexs; +#define glIndexs glad_glIndexs +typedef void (APIENTRYP PFNGLINDEXSVPROC)(const GLshort *c); +GLAPI PFNGLINDEXSVPROC glad_glIndexsv; +#define glIndexsv glad_glIndexsv +typedef void (APIENTRYP PFNGLNORMAL3BPROC)(GLbyte nx, GLbyte ny, GLbyte nz); +GLAPI PFNGLNORMAL3BPROC glad_glNormal3b; +#define glNormal3b glad_glNormal3b +typedef void (APIENTRYP PFNGLNORMAL3BVPROC)(const GLbyte *v); +GLAPI PFNGLNORMAL3BVPROC glad_glNormal3bv; +#define glNormal3bv glad_glNormal3bv +typedef void (APIENTRYP PFNGLNORMAL3DPROC)(GLdouble nx, GLdouble ny, GLdouble nz); +GLAPI PFNGLNORMAL3DPROC glad_glNormal3d; +#define glNormal3d glad_glNormal3d +typedef void (APIENTRYP PFNGLNORMAL3DVPROC)(const GLdouble *v); +GLAPI PFNGLNORMAL3DVPROC glad_glNormal3dv; +#define glNormal3dv glad_glNormal3dv +typedef void (APIENTRYP PFNGLNORMAL3FPROC)(GLfloat nx, GLfloat ny, GLfloat nz); +GLAPI PFNGLNORMAL3FPROC glad_glNormal3f; +#define glNormal3f glad_glNormal3f +typedef void (APIENTRYP PFNGLNORMAL3FVPROC)(const GLfloat *v); +GLAPI PFNGLNORMAL3FVPROC glad_glNormal3fv; +#define glNormal3fv glad_glNormal3fv +typedef void (APIENTRYP PFNGLNORMAL3IPROC)(GLint nx, GLint ny, GLint nz); +GLAPI PFNGLNORMAL3IPROC glad_glNormal3i; +#define glNormal3i glad_glNormal3i +typedef void (APIENTRYP PFNGLNORMAL3IVPROC)(const GLint *v); +GLAPI PFNGLNORMAL3IVPROC glad_glNormal3iv; +#define glNormal3iv glad_glNormal3iv +typedef void (APIENTRYP PFNGLNORMAL3SPROC)(GLshort nx, GLshort ny, GLshort nz); +GLAPI PFNGLNORMAL3SPROC glad_glNormal3s; +#define glNormal3s glad_glNormal3s +typedef void (APIENTRYP PFNGLNORMAL3SVPROC)(const GLshort *v); +GLAPI PFNGLNORMAL3SVPROC glad_glNormal3sv; +#define glNormal3sv glad_glNormal3sv +typedef void (APIENTRYP PFNGLRASTERPOS2DPROC)(GLdouble x, GLdouble y); +GLAPI PFNGLRASTERPOS2DPROC glad_glRasterPos2d; +#define glRasterPos2d glad_glRasterPos2d +typedef void (APIENTRYP PFNGLRASTERPOS2DVPROC)(const GLdouble *v); +GLAPI PFNGLRASTERPOS2DVPROC glad_glRasterPos2dv; +#define glRasterPos2dv glad_glRasterPos2dv +typedef void (APIENTRYP PFNGLRASTERPOS2FPROC)(GLfloat x, GLfloat y); +GLAPI PFNGLRASTERPOS2FPROC glad_glRasterPos2f; +#define glRasterPos2f glad_glRasterPos2f +typedef void (APIENTRYP PFNGLRASTERPOS2FVPROC)(const GLfloat *v); +GLAPI PFNGLRASTERPOS2FVPROC glad_glRasterPos2fv; +#define glRasterPos2fv glad_glRasterPos2fv +typedef void (APIENTRYP PFNGLRASTERPOS2IPROC)(GLint x, GLint y); +GLAPI PFNGLRASTERPOS2IPROC glad_glRasterPos2i; +#define glRasterPos2i glad_glRasterPos2i +typedef void (APIENTRYP PFNGLRASTERPOS2IVPROC)(const GLint *v); +GLAPI PFNGLRASTERPOS2IVPROC glad_glRasterPos2iv; +#define glRasterPos2iv glad_glRasterPos2iv +typedef void (APIENTRYP PFNGLRASTERPOS2SPROC)(GLshort x, GLshort y); +GLAPI PFNGLRASTERPOS2SPROC glad_glRasterPos2s; +#define glRasterPos2s glad_glRasterPos2s +typedef void (APIENTRYP PFNGLRASTERPOS2SVPROC)(const GLshort *v); +GLAPI PFNGLRASTERPOS2SVPROC glad_glRasterPos2sv; +#define glRasterPos2sv glad_glRasterPos2sv +typedef void (APIENTRYP PFNGLRASTERPOS3DPROC)(GLdouble x, GLdouble y, GLdouble z); +GLAPI PFNGLRASTERPOS3DPROC glad_glRasterPos3d; +#define glRasterPos3d glad_glRasterPos3d +typedef void (APIENTRYP PFNGLRASTERPOS3DVPROC)(const GLdouble *v); +GLAPI PFNGLRASTERPOS3DVPROC glad_glRasterPos3dv; +#define glRasterPos3dv glad_glRasterPos3dv +typedef void (APIENTRYP PFNGLRASTERPOS3FPROC)(GLfloat x, GLfloat y, GLfloat z); +GLAPI PFNGLRASTERPOS3FPROC glad_glRasterPos3f; +#define glRasterPos3f glad_glRasterPos3f +typedef void (APIENTRYP PFNGLRASTERPOS3FVPROC)(const GLfloat *v); +GLAPI PFNGLRASTERPOS3FVPROC glad_glRasterPos3fv; +#define glRasterPos3fv glad_glRasterPos3fv +typedef void (APIENTRYP PFNGLRASTERPOS3IPROC)(GLint x, GLint y, GLint z); +GLAPI PFNGLRASTERPOS3IPROC glad_glRasterPos3i; +#define glRasterPos3i glad_glRasterPos3i +typedef void (APIENTRYP PFNGLRASTERPOS3IVPROC)(const GLint *v); +GLAPI PFNGLRASTERPOS3IVPROC glad_glRasterPos3iv; +#define glRasterPos3iv glad_glRasterPos3iv +typedef void (APIENTRYP PFNGLRASTERPOS3SPROC)(GLshort x, GLshort y, GLshort z); +GLAPI PFNGLRASTERPOS3SPROC glad_glRasterPos3s; +#define glRasterPos3s glad_glRasterPos3s +typedef void (APIENTRYP PFNGLRASTERPOS3SVPROC)(const GLshort *v); +GLAPI PFNGLRASTERPOS3SVPROC glad_glRasterPos3sv; +#define glRasterPos3sv glad_glRasterPos3sv +typedef void (APIENTRYP PFNGLRASTERPOS4DPROC)(GLdouble x, GLdouble y, GLdouble z, GLdouble w); +GLAPI PFNGLRASTERPOS4DPROC glad_glRasterPos4d; +#define glRasterPos4d glad_glRasterPos4d +typedef void (APIENTRYP PFNGLRASTERPOS4DVPROC)(const GLdouble *v); +GLAPI PFNGLRASTERPOS4DVPROC glad_glRasterPos4dv; +#define glRasterPos4dv glad_glRasterPos4dv +typedef void (APIENTRYP PFNGLRASTERPOS4FPROC)(GLfloat x, GLfloat y, GLfloat z, GLfloat w); +GLAPI PFNGLRASTERPOS4FPROC glad_glRasterPos4f; +#define glRasterPos4f glad_glRasterPos4f +typedef void (APIENTRYP PFNGLRASTERPOS4FVPROC)(const GLfloat *v); +GLAPI PFNGLRASTERPOS4FVPROC glad_glRasterPos4fv; +#define glRasterPos4fv glad_glRasterPos4fv +typedef void (APIENTRYP PFNGLRASTERPOS4IPROC)(GLint x, GLint y, GLint z, GLint w); +GLAPI PFNGLRASTERPOS4IPROC glad_glRasterPos4i; +#define glRasterPos4i glad_glRasterPos4i +typedef void (APIENTRYP PFNGLRASTERPOS4IVPROC)(const GLint *v); +GLAPI PFNGLRASTERPOS4IVPROC glad_glRasterPos4iv; +#define glRasterPos4iv glad_glRasterPos4iv +typedef void (APIENTRYP PFNGLRASTERPOS4SPROC)(GLshort x, GLshort y, GLshort z, GLshort w); +GLAPI PFNGLRASTERPOS4SPROC glad_glRasterPos4s; +#define glRasterPos4s glad_glRasterPos4s +typedef void (APIENTRYP PFNGLRASTERPOS4SVPROC)(const GLshort *v); +GLAPI PFNGLRASTERPOS4SVPROC glad_glRasterPos4sv; +#define glRasterPos4sv glad_glRasterPos4sv +typedef void (APIENTRYP PFNGLRECTDPROC)(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2); +GLAPI PFNGLRECTDPROC glad_glRectd; +#define glRectd glad_glRectd +typedef void (APIENTRYP PFNGLRECTDVPROC)(const GLdouble *v1, const GLdouble *v2); +GLAPI PFNGLRECTDVPROC glad_glRectdv; +#define glRectdv glad_glRectdv +typedef void (APIENTRYP PFNGLRECTFPROC)(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2); +GLAPI PFNGLRECTFPROC glad_glRectf; +#define glRectf glad_glRectf +typedef void (APIENTRYP PFNGLRECTFVPROC)(const GLfloat *v1, const GLfloat *v2); +GLAPI PFNGLRECTFVPROC glad_glRectfv; +#define glRectfv glad_glRectfv +typedef void (APIENTRYP PFNGLRECTIPROC)(GLint x1, GLint y1, GLint x2, GLint y2); +GLAPI PFNGLRECTIPROC glad_glRecti; +#define glRecti glad_glRecti +typedef void (APIENTRYP PFNGLRECTIVPROC)(const GLint *v1, const GLint *v2); +GLAPI PFNGLRECTIVPROC glad_glRectiv; +#define glRectiv glad_glRectiv +typedef void (APIENTRYP PFNGLRECTSPROC)(GLshort x1, GLshort y1, GLshort x2, GLshort y2); +GLAPI PFNGLRECTSPROC glad_glRects; +#define glRects glad_glRects +typedef void (APIENTRYP PFNGLRECTSVPROC)(const GLshort *v1, const GLshort *v2); +GLAPI PFNGLRECTSVPROC glad_glRectsv; +#define glRectsv glad_glRectsv +typedef void (APIENTRYP PFNGLTEXCOORD1DPROC)(GLdouble s); +GLAPI PFNGLTEXCOORD1DPROC glad_glTexCoord1d; +#define glTexCoord1d glad_glTexCoord1d +typedef void (APIENTRYP PFNGLTEXCOORD1DVPROC)(const GLdouble *v); +GLAPI PFNGLTEXCOORD1DVPROC glad_glTexCoord1dv; +#define glTexCoord1dv glad_glTexCoord1dv +typedef void (APIENTRYP PFNGLTEXCOORD1FPROC)(GLfloat s); +GLAPI PFNGLTEXCOORD1FPROC glad_glTexCoord1f; +#define glTexCoord1f glad_glTexCoord1f +typedef void (APIENTRYP PFNGLTEXCOORD1FVPROC)(const GLfloat *v); +GLAPI PFNGLTEXCOORD1FVPROC glad_glTexCoord1fv; +#define glTexCoord1fv glad_glTexCoord1fv +typedef void (APIENTRYP PFNGLTEXCOORD1IPROC)(GLint s); +GLAPI PFNGLTEXCOORD1IPROC glad_glTexCoord1i; +#define glTexCoord1i glad_glTexCoord1i +typedef void (APIENTRYP PFNGLTEXCOORD1IVPROC)(const GLint *v); +GLAPI PFNGLTEXCOORD1IVPROC glad_glTexCoord1iv; +#define glTexCoord1iv glad_glTexCoord1iv +typedef void (APIENTRYP PFNGLTEXCOORD1SPROC)(GLshort s); +GLAPI PFNGLTEXCOORD1SPROC glad_glTexCoord1s; +#define glTexCoord1s glad_glTexCoord1s +typedef void (APIENTRYP PFNGLTEXCOORD1SVPROC)(const GLshort *v); +GLAPI PFNGLTEXCOORD1SVPROC glad_glTexCoord1sv; +#define glTexCoord1sv glad_glTexCoord1sv +typedef void (APIENTRYP PFNGLTEXCOORD2DPROC)(GLdouble s, GLdouble t); +GLAPI PFNGLTEXCOORD2DPROC glad_glTexCoord2d; +#define glTexCoord2d glad_glTexCoord2d +typedef void (APIENTRYP PFNGLTEXCOORD2DVPROC)(const GLdouble *v); +GLAPI PFNGLTEXCOORD2DVPROC glad_glTexCoord2dv; +#define glTexCoord2dv glad_glTexCoord2dv +typedef void (APIENTRYP PFNGLTEXCOORD2FPROC)(GLfloat s, GLfloat t); +GLAPI PFNGLTEXCOORD2FPROC glad_glTexCoord2f; +#define glTexCoord2f glad_glTexCoord2f +typedef void (APIENTRYP PFNGLTEXCOORD2FVPROC)(const GLfloat *v); +GLAPI PFNGLTEXCOORD2FVPROC glad_glTexCoord2fv; +#define glTexCoord2fv glad_glTexCoord2fv +typedef void (APIENTRYP PFNGLTEXCOORD2IPROC)(GLint s, GLint t); +GLAPI PFNGLTEXCOORD2IPROC glad_glTexCoord2i; +#define glTexCoord2i glad_glTexCoord2i +typedef void (APIENTRYP PFNGLTEXCOORD2IVPROC)(const GLint *v); +GLAPI PFNGLTEXCOORD2IVPROC glad_glTexCoord2iv; +#define glTexCoord2iv glad_glTexCoord2iv +typedef void (APIENTRYP PFNGLTEXCOORD2SPROC)(GLshort s, GLshort t); +GLAPI PFNGLTEXCOORD2SPROC glad_glTexCoord2s; +#define glTexCoord2s glad_glTexCoord2s +typedef void (APIENTRYP PFNGLTEXCOORD2SVPROC)(const GLshort *v); +GLAPI PFNGLTEXCOORD2SVPROC glad_glTexCoord2sv; +#define glTexCoord2sv glad_glTexCoord2sv +typedef void (APIENTRYP PFNGLTEXCOORD3DPROC)(GLdouble s, GLdouble t, GLdouble r); +GLAPI PFNGLTEXCOORD3DPROC glad_glTexCoord3d; +#define glTexCoord3d glad_glTexCoord3d +typedef void (APIENTRYP PFNGLTEXCOORD3DVPROC)(const GLdouble *v); +GLAPI PFNGLTEXCOORD3DVPROC glad_glTexCoord3dv; +#define glTexCoord3dv glad_glTexCoord3dv +typedef void (APIENTRYP PFNGLTEXCOORD3FPROC)(GLfloat s, GLfloat t, GLfloat r); +GLAPI PFNGLTEXCOORD3FPROC glad_glTexCoord3f; +#define glTexCoord3f glad_glTexCoord3f +typedef void (APIENTRYP PFNGLTEXCOORD3FVPROC)(const GLfloat *v); +GLAPI PFNGLTEXCOORD3FVPROC glad_glTexCoord3fv; +#define glTexCoord3fv glad_glTexCoord3fv +typedef void (APIENTRYP PFNGLTEXCOORD3IPROC)(GLint s, GLint t, GLint r); +GLAPI PFNGLTEXCOORD3IPROC glad_glTexCoord3i; +#define glTexCoord3i glad_glTexCoord3i +typedef void (APIENTRYP PFNGLTEXCOORD3IVPROC)(const GLint *v); +GLAPI PFNGLTEXCOORD3IVPROC glad_glTexCoord3iv; +#define glTexCoord3iv glad_glTexCoord3iv +typedef void (APIENTRYP PFNGLTEXCOORD3SPROC)(GLshort s, GLshort t, GLshort r); +GLAPI PFNGLTEXCOORD3SPROC glad_glTexCoord3s; +#define glTexCoord3s glad_glTexCoord3s +typedef void (APIENTRYP PFNGLTEXCOORD3SVPROC)(const GLshort *v); +GLAPI PFNGLTEXCOORD3SVPROC glad_glTexCoord3sv; +#define glTexCoord3sv glad_glTexCoord3sv +typedef void (APIENTRYP PFNGLTEXCOORD4DPROC)(GLdouble s, GLdouble t, GLdouble r, GLdouble q); +GLAPI PFNGLTEXCOORD4DPROC glad_glTexCoord4d; +#define glTexCoord4d glad_glTexCoord4d +typedef void (APIENTRYP PFNGLTEXCOORD4DVPROC)(const GLdouble *v); +GLAPI PFNGLTEXCOORD4DVPROC glad_glTexCoord4dv; +#define glTexCoord4dv glad_glTexCoord4dv +typedef void (APIENTRYP PFNGLTEXCOORD4FPROC)(GLfloat s, GLfloat t, GLfloat r, GLfloat q); +GLAPI PFNGLTEXCOORD4FPROC glad_glTexCoord4f; +#define glTexCoord4f glad_glTexCoord4f +typedef void (APIENTRYP PFNGLTEXCOORD4FVPROC)(const GLfloat *v); +GLAPI PFNGLTEXCOORD4FVPROC glad_glTexCoord4fv; +#define glTexCoord4fv glad_glTexCoord4fv +typedef void (APIENTRYP PFNGLTEXCOORD4IPROC)(GLint s, GLint t, GLint r, GLint q); +GLAPI PFNGLTEXCOORD4IPROC glad_glTexCoord4i; +#define glTexCoord4i glad_glTexCoord4i +typedef void (APIENTRYP PFNGLTEXCOORD4IVPROC)(const GLint *v); +GLAPI PFNGLTEXCOORD4IVPROC glad_glTexCoord4iv; +#define glTexCoord4iv glad_glTexCoord4iv +typedef void (APIENTRYP PFNGLTEXCOORD4SPROC)(GLshort s, GLshort t, GLshort r, GLshort q); +GLAPI PFNGLTEXCOORD4SPROC glad_glTexCoord4s; +#define glTexCoord4s glad_glTexCoord4s +typedef void (APIENTRYP PFNGLTEXCOORD4SVPROC)(const GLshort *v); +GLAPI PFNGLTEXCOORD4SVPROC glad_glTexCoord4sv; +#define glTexCoord4sv glad_glTexCoord4sv +typedef void (APIENTRYP PFNGLVERTEX2DPROC)(GLdouble x, GLdouble y); +GLAPI PFNGLVERTEX2DPROC glad_glVertex2d; +#define glVertex2d glad_glVertex2d +typedef void (APIENTRYP PFNGLVERTEX2DVPROC)(const GLdouble *v); +GLAPI PFNGLVERTEX2DVPROC glad_glVertex2dv; +#define glVertex2dv glad_glVertex2dv +typedef void (APIENTRYP PFNGLVERTEX2FPROC)(GLfloat x, GLfloat y); +GLAPI PFNGLVERTEX2FPROC glad_glVertex2f; +#define glVertex2f glad_glVertex2f +typedef void (APIENTRYP PFNGLVERTEX2FVPROC)(const GLfloat *v); +GLAPI PFNGLVERTEX2FVPROC glad_glVertex2fv; +#define glVertex2fv glad_glVertex2fv +typedef void (APIENTRYP PFNGLVERTEX2IPROC)(GLint x, GLint y); +GLAPI PFNGLVERTEX2IPROC glad_glVertex2i; +#define glVertex2i glad_glVertex2i +typedef void (APIENTRYP PFNGLVERTEX2IVPROC)(const GLint *v); +GLAPI PFNGLVERTEX2IVPROC glad_glVertex2iv; +#define glVertex2iv glad_glVertex2iv +typedef void (APIENTRYP PFNGLVERTEX2SPROC)(GLshort x, GLshort y); +GLAPI PFNGLVERTEX2SPROC glad_glVertex2s; +#define glVertex2s glad_glVertex2s +typedef void (APIENTRYP PFNGLVERTEX2SVPROC)(const GLshort *v); +GLAPI PFNGLVERTEX2SVPROC glad_glVertex2sv; +#define glVertex2sv glad_glVertex2sv +typedef void (APIENTRYP PFNGLVERTEX3DPROC)(GLdouble x, GLdouble y, GLdouble z); +GLAPI PFNGLVERTEX3DPROC glad_glVertex3d; +#define glVertex3d glad_glVertex3d +typedef void (APIENTRYP PFNGLVERTEX3DVPROC)(const GLdouble *v); +GLAPI PFNGLVERTEX3DVPROC glad_glVertex3dv; +#define glVertex3dv glad_glVertex3dv +typedef void (APIENTRYP PFNGLVERTEX3FPROC)(GLfloat x, GLfloat y, GLfloat z); +GLAPI PFNGLVERTEX3FPROC glad_glVertex3f; +#define glVertex3f glad_glVertex3f +typedef void (APIENTRYP PFNGLVERTEX3FVPROC)(const GLfloat *v); +GLAPI PFNGLVERTEX3FVPROC glad_glVertex3fv; +#define glVertex3fv glad_glVertex3fv +typedef void (APIENTRYP PFNGLVERTEX3IPROC)(GLint x, GLint y, GLint z); +GLAPI PFNGLVERTEX3IPROC glad_glVertex3i; +#define glVertex3i glad_glVertex3i +typedef void (APIENTRYP PFNGLVERTEX3IVPROC)(const GLint *v); +GLAPI PFNGLVERTEX3IVPROC glad_glVertex3iv; +#define glVertex3iv glad_glVertex3iv +typedef void (APIENTRYP PFNGLVERTEX3SPROC)(GLshort x, GLshort y, GLshort z); +GLAPI PFNGLVERTEX3SPROC glad_glVertex3s; +#define glVertex3s glad_glVertex3s +typedef void (APIENTRYP PFNGLVERTEX3SVPROC)(const GLshort *v); +GLAPI PFNGLVERTEX3SVPROC glad_glVertex3sv; +#define glVertex3sv glad_glVertex3sv +typedef void (APIENTRYP PFNGLVERTEX4DPROC)(GLdouble x, GLdouble y, GLdouble z, GLdouble w); +GLAPI PFNGLVERTEX4DPROC glad_glVertex4d; +#define glVertex4d glad_glVertex4d +typedef void (APIENTRYP PFNGLVERTEX4DVPROC)(const GLdouble *v); +GLAPI PFNGLVERTEX4DVPROC glad_glVertex4dv; +#define glVertex4dv glad_glVertex4dv +typedef void (APIENTRYP PFNGLVERTEX4FPROC)(GLfloat x, GLfloat y, GLfloat z, GLfloat w); +GLAPI PFNGLVERTEX4FPROC glad_glVertex4f; +#define glVertex4f glad_glVertex4f +typedef void (APIENTRYP PFNGLVERTEX4FVPROC)(const GLfloat *v); +GLAPI PFNGLVERTEX4FVPROC glad_glVertex4fv; +#define glVertex4fv glad_glVertex4fv +typedef void (APIENTRYP PFNGLVERTEX4IPROC)(GLint x, GLint y, GLint z, GLint w); +GLAPI PFNGLVERTEX4IPROC glad_glVertex4i; +#define glVertex4i glad_glVertex4i +typedef void (APIENTRYP PFNGLVERTEX4IVPROC)(const GLint *v); +GLAPI PFNGLVERTEX4IVPROC glad_glVertex4iv; +#define glVertex4iv glad_glVertex4iv +typedef void (APIENTRYP PFNGLVERTEX4SPROC)(GLshort x, GLshort y, GLshort z, GLshort w); +GLAPI PFNGLVERTEX4SPROC glad_glVertex4s; +#define glVertex4s glad_glVertex4s +typedef void (APIENTRYP PFNGLVERTEX4SVPROC)(const GLshort *v); +GLAPI PFNGLVERTEX4SVPROC glad_glVertex4sv; +#define glVertex4sv glad_glVertex4sv +typedef void (APIENTRYP PFNGLCLIPPLANEPROC)(GLenum plane, const GLdouble *equation); +GLAPI PFNGLCLIPPLANEPROC glad_glClipPlane; +#define glClipPlane glad_glClipPlane +typedef void (APIENTRYP PFNGLCOLORMATERIALPROC)(GLenum face, GLenum mode); +GLAPI PFNGLCOLORMATERIALPROC glad_glColorMaterial; +#define glColorMaterial glad_glColorMaterial +typedef void (APIENTRYP PFNGLFOGFPROC)(GLenum pname, GLfloat param); +GLAPI PFNGLFOGFPROC glad_glFogf; +#define glFogf glad_glFogf +typedef void (APIENTRYP PFNGLFOGFVPROC)(GLenum pname, const GLfloat *params); +GLAPI PFNGLFOGFVPROC glad_glFogfv; +#define glFogfv glad_glFogfv +typedef void (APIENTRYP PFNGLFOGIPROC)(GLenum pname, GLint param); +GLAPI PFNGLFOGIPROC glad_glFogi; +#define glFogi glad_glFogi +typedef void (APIENTRYP PFNGLFOGIVPROC)(GLenum pname, const GLint *params); +GLAPI PFNGLFOGIVPROC glad_glFogiv; +#define glFogiv glad_glFogiv +typedef void (APIENTRYP PFNGLLIGHTFPROC)(GLenum light, GLenum pname, GLfloat param); +GLAPI PFNGLLIGHTFPROC glad_glLightf; +#define glLightf glad_glLightf +typedef void (APIENTRYP PFNGLLIGHTFVPROC)(GLenum light, GLenum pname, const GLfloat *params); +GLAPI PFNGLLIGHTFVPROC glad_glLightfv; +#define glLightfv glad_glLightfv +typedef void (APIENTRYP PFNGLLIGHTIPROC)(GLenum light, GLenum pname, GLint param); +GLAPI PFNGLLIGHTIPROC glad_glLighti; +#define glLighti glad_glLighti +typedef void (APIENTRYP PFNGLLIGHTIVPROC)(GLenum light, GLenum pname, const GLint *params); +GLAPI PFNGLLIGHTIVPROC glad_glLightiv; +#define glLightiv glad_glLightiv +typedef void (APIENTRYP PFNGLLIGHTMODELFPROC)(GLenum pname, GLfloat param); +GLAPI PFNGLLIGHTMODELFPROC glad_glLightModelf; +#define glLightModelf glad_glLightModelf +typedef void (APIENTRYP PFNGLLIGHTMODELFVPROC)(GLenum pname, const GLfloat *params); +GLAPI PFNGLLIGHTMODELFVPROC glad_glLightModelfv; +#define glLightModelfv glad_glLightModelfv +typedef void (APIENTRYP PFNGLLIGHTMODELIPROC)(GLenum pname, GLint param); +GLAPI PFNGLLIGHTMODELIPROC glad_glLightModeli; +#define glLightModeli glad_glLightModeli +typedef void (APIENTRYP PFNGLLIGHTMODELIVPROC)(GLenum pname, const GLint *params); +GLAPI PFNGLLIGHTMODELIVPROC glad_glLightModeliv; +#define glLightModeliv glad_glLightModeliv +typedef void (APIENTRYP PFNGLLINESTIPPLEPROC)(GLint factor, GLushort pattern); +GLAPI PFNGLLINESTIPPLEPROC glad_glLineStipple; +#define glLineStipple glad_glLineStipple +typedef void (APIENTRYP PFNGLMATERIALFPROC)(GLenum face, GLenum pname, GLfloat param); +GLAPI PFNGLMATERIALFPROC glad_glMaterialf; +#define glMaterialf glad_glMaterialf +typedef void (APIENTRYP PFNGLMATERIALFVPROC)(GLenum face, GLenum pname, const GLfloat *params); +GLAPI PFNGLMATERIALFVPROC glad_glMaterialfv; +#define glMaterialfv glad_glMaterialfv +typedef void (APIENTRYP PFNGLMATERIALIPROC)(GLenum face, GLenum pname, GLint param); +GLAPI PFNGLMATERIALIPROC glad_glMateriali; +#define glMateriali glad_glMateriali +typedef void (APIENTRYP PFNGLMATERIALIVPROC)(GLenum face, GLenum pname, const GLint *params); +GLAPI PFNGLMATERIALIVPROC glad_glMaterialiv; +#define glMaterialiv glad_glMaterialiv +typedef void (APIENTRYP PFNGLPOLYGONSTIPPLEPROC)(const GLubyte *mask); +GLAPI PFNGLPOLYGONSTIPPLEPROC glad_glPolygonStipple; +#define glPolygonStipple glad_glPolygonStipple +typedef void (APIENTRYP PFNGLSHADEMODELPROC)(GLenum mode); +GLAPI PFNGLSHADEMODELPROC glad_glShadeModel; +#define glShadeModel glad_glShadeModel +typedef void (APIENTRYP PFNGLTEXENVFPROC)(GLenum target, GLenum pname, GLfloat param); +GLAPI PFNGLTEXENVFPROC glad_glTexEnvf; +#define glTexEnvf glad_glTexEnvf +typedef void (APIENTRYP PFNGLTEXENVFVPROC)(GLenum target, GLenum pname, const GLfloat *params); +GLAPI PFNGLTEXENVFVPROC glad_glTexEnvfv; +#define glTexEnvfv glad_glTexEnvfv +typedef void (APIENTRYP PFNGLTEXENVIPROC)(GLenum target, GLenum pname, GLint param); +GLAPI PFNGLTEXENVIPROC glad_glTexEnvi; +#define glTexEnvi glad_glTexEnvi +typedef void (APIENTRYP PFNGLTEXENVIVPROC)(GLenum target, GLenum pname, const GLint *params); +GLAPI PFNGLTEXENVIVPROC glad_glTexEnviv; +#define glTexEnviv glad_glTexEnviv +typedef void (APIENTRYP PFNGLTEXGENDPROC)(GLenum coord, GLenum pname, GLdouble param); +GLAPI PFNGLTEXGENDPROC glad_glTexGend; +#define glTexGend glad_glTexGend +typedef void (APIENTRYP PFNGLTEXGENDVPROC)(GLenum coord, GLenum pname, const GLdouble *params); +GLAPI PFNGLTEXGENDVPROC glad_glTexGendv; +#define glTexGendv glad_glTexGendv +typedef void (APIENTRYP PFNGLTEXGENFPROC)(GLenum coord, GLenum pname, GLfloat param); +GLAPI PFNGLTEXGENFPROC glad_glTexGenf; +#define glTexGenf glad_glTexGenf +typedef void (APIENTRYP PFNGLTEXGENFVPROC)(GLenum coord, GLenum pname, const GLfloat *params); +GLAPI PFNGLTEXGENFVPROC glad_glTexGenfv; +#define glTexGenfv glad_glTexGenfv +typedef void (APIENTRYP PFNGLTEXGENIPROC)(GLenum coord, GLenum pname, GLint param); +GLAPI PFNGLTEXGENIPROC glad_glTexGeni; +#define glTexGeni glad_glTexGeni +typedef void (APIENTRYP PFNGLTEXGENIVPROC)(GLenum coord, GLenum pname, const GLint *params); +GLAPI PFNGLTEXGENIVPROC glad_glTexGeniv; +#define glTexGeniv glad_glTexGeniv +typedef void (APIENTRYP PFNGLFEEDBACKBUFFERPROC)(GLsizei size, GLenum type, GLfloat *buffer); +GLAPI PFNGLFEEDBACKBUFFERPROC glad_glFeedbackBuffer; +#define glFeedbackBuffer glad_glFeedbackBuffer +typedef void (APIENTRYP PFNGLSELECTBUFFERPROC)(GLsizei size, GLuint *buffer); +GLAPI PFNGLSELECTBUFFERPROC glad_glSelectBuffer; +#define glSelectBuffer glad_glSelectBuffer +typedef GLint (APIENTRYP PFNGLRENDERMODEPROC)(GLenum mode); +GLAPI PFNGLRENDERMODEPROC glad_glRenderMode; +#define glRenderMode glad_glRenderMode +typedef void (APIENTRYP PFNGLINITNAMESPROC)(void); +GLAPI PFNGLINITNAMESPROC glad_glInitNames; +#define glInitNames glad_glInitNames +typedef void (APIENTRYP PFNGLLOADNAMEPROC)(GLuint name); +GLAPI PFNGLLOADNAMEPROC glad_glLoadName; +#define glLoadName glad_glLoadName +typedef void (APIENTRYP PFNGLPASSTHROUGHPROC)(GLfloat token); +GLAPI PFNGLPASSTHROUGHPROC glad_glPassThrough; +#define glPassThrough glad_glPassThrough +typedef void (APIENTRYP PFNGLPOPNAMEPROC)(void); +GLAPI PFNGLPOPNAMEPROC glad_glPopName; +#define glPopName glad_glPopName +typedef void (APIENTRYP PFNGLPUSHNAMEPROC)(GLuint name); +GLAPI PFNGLPUSHNAMEPROC glad_glPushName; +#define glPushName glad_glPushName +typedef void (APIENTRYP PFNGLCLEARACCUMPROC)(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha); +GLAPI PFNGLCLEARACCUMPROC glad_glClearAccum; +#define glClearAccum glad_glClearAccum +typedef void (APIENTRYP PFNGLCLEARINDEXPROC)(GLfloat c); +GLAPI PFNGLCLEARINDEXPROC glad_glClearIndex; +#define glClearIndex glad_glClearIndex +typedef void (APIENTRYP PFNGLINDEXMASKPROC)(GLuint mask); +GLAPI PFNGLINDEXMASKPROC glad_glIndexMask; +#define glIndexMask glad_glIndexMask +typedef void (APIENTRYP PFNGLACCUMPROC)(GLenum op, GLfloat value); +GLAPI PFNGLACCUMPROC glad_glAccum; +#define glAccum glad_glAccum +typedef void (APIENTRYP PFNGLPOPATTRIBPROC)(void); +GLAPI PFNGLPOPATTRIBPROC glad_glPopAttrib; +#define glPopAttrib glad_glPopAttrib +typedef void (APIENTRYP PFNGLPUSHATTRIBPROC)(GLbitfield mask); +GLAPI PFNGLPUSHATTRIBPROC glad_glPushAttrib; +#define glPushAttrib glad_glPushAttrib +typedef void (APIENTRYP PFNGLMAP1DPROC)(GLenum target, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble *points); +GLAPI PFNGLMAP1DPROC glad_glMap1d; +#define glMap1d glad_glMap1d +typedef void (APIENTRYP PFNGLMAP1FPROC)(GLenum target, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat *points); +GLAPI PFNGLMAP1FPROC glad_glMap1f; +#define glMap1f glad_glMap1f +typedef void (APIENTRYP PFNGLMAP2DPROC)(GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble *points); +GLAPI PFNGLMAP2DPROC glad_glMap2d; +#define glMap2d glad_glMap2d +typedef void (APIENTRYP PFNGLMAP2FPROC)(GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat *points); +GLAPI PFNGLMAP2FPROC glad_glMap2f; +#define glMap2f glad_glMap2f +typedef void (APIENTRYP PFNGLMAPGRID1DPROC)(GLint un, GLdouble u1, GLdouble u2); +GLAPI PFNGLMAPGRID1DPROC glad_glMapGrid1d; +#define glMapGrid1d glad_glMapGrid1d +typedef void (APIENTRYP PFNGLMAPGRID1FPROC)(GLint un, GLfloat u1, GLfloat u2); +GLAPI PFNGLMAPGRID1FPROC glad_glMapGrid1f; +#define glMapGrid1f glad_glMapGrid1f +typedef void (APIENTRYP PFNGLMAPGRID2DPROC)(GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1, GLdouble v2); +GLAPI PFNGLMAPGRID2DPROC glad_glMapGrid2d; +#define glMapGrid2d glad_glMapGrid2d +typedef void (APIENTRYP PFNGLMAPGRID2FPROC)(GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1, GLfloat v2); +GLAPI PFNGLMAPGRID2FPROC glad_glMapGrid2f; +#define glMapGrid2f glad_glMapGrid2f +typedef void (APIENTRYP PFNGLEVALCOORD1DPROC)(GLdouble u); +GLAPI PFNGLEVALCOORD1DPROC glad_glEvalCoord1d; +#define glEvalCoord1d glad_glEvalCoord1d +typedef void (APIENTRYP PFNGLEVALCOORD1DVPROC)(const GLdouble *u); +GLAPI PFNGLEVALCOORD1DVPROC glad_glEvalCoord1dv; +#define glEvalCoord1dv glad_glEvalCoord1dv +typedef void (APIENTRYP PFNGLEVALCOORD1FPROC)(GLfloat u); +GLAPI PFNGLEVALCOORD1FPROC glad_glEvalCoord1f; +#define glEvalCoord1f glad_glEvalCoord1f +typedef void (APIENTRYP PFNGLEVALCOORD1FVPROC)(const GLfloat *u); +GLAPI PFNGLEVALCOORD1FVPROC glad_glEvalCoord1fv; +#define glEvalCoord1fv glad_glEvalCoord1fv +typedef void (APIENTRYP PFNGLEVALCOORD2DPROC)(GLdouble u, GLdouble v); +GLAPI PFNGLEVALCOORD2DPROC glad_glEvalCoord2d; +#define glEvalCoord2d glad_glEvalCoord2d +typedef void (APIENTRYP PFNGLEVALCOORD2DVPROC)(const GLdouble *u); +GLAPI PFNGLEVALCOORD2DVPROC glad_glEvalCoord2dv; +#define glEvalCoord2dv glad_glEvalCoord2dv +typedef void (APIENTRYP PFNGLEVALCOORD2FPROC)(GLfloat u, GLfloat v); +GLAPI PFNGLEVALCOORD2FPROC glad_glEvalCoord2f; +#define glEvalCoord2f glad_glEvalCoord2f +typedef void (APIENTRYP PFNGLEVALCOORD2FVPROC)(const GLfloat *u); +GLAPI PFNGLEVALCOORD2FVPROC glad_glEvalCoord2fv; +#define glEvalCoord2fv glad_glEvalCoord2fv +typedef void (APIENTRYP PFNGLEVALMESH1PROC)(GLenum mode, GLint i1, GLint i2); +GLAPI PFNGLEVALMESH1PROC glad_glEvalMesh1; +#define glEvalMesh1 glad_glEvalMesh1 +typedef void (APIENTRYP PFNGLEVALPOINT1PROC)(GLint i); +GLAPI PFNGLEVALPOINT1PROC glad_glEvalPoint1; +#define glEvalPoint1 glad_glEvalPoint1 +typedef void (APIENTRYP PFNGLEVALMESH2PROC)(GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2); +GLAPI PFNGLEVALMESH2PROC glad_glEvalMesh2; +#define glEvalMesh2 glad_glEvalMesh2 +typedef void (APIENTRYP PFNGLEVALPOINT2PROC)(GLint i, GLint j); +GLAPI PFNGLEVALPOINT2PROC glad_glEvalPoint2; +#define glEvalPoint2 glad_glEvalPoint2 +typedef void (APIENTRYP PFNGLALPHAFUNCPROC)(GLenum func, GLfloat ref); +GLAPI PFNGLALPHAFUNCPROC glad_glAlphaFunc; +#define glAlphaFunc glad_glAlphaFunc +typedef void (APIENTRYP PFNGLPIXELZOOMPROC)(GLfloat xfactor, GLfloat yfactor); +GLAPI PFNGLPIXELZOOMPROC glad_glPixelZoom; +#define glPixelZoom glad_glPixelZoom +typedef void (APIENTRYP PFNGLPIXELTRANSFERFPROC)(GLenum pname, GLfloat param); +GLAPI PFNGLPIXELTRANSFERFPROC glad_glPixelTransferf; +#define glPixelTransferf glad_glPixelTransferf +typedef void (APIENTRYP PFNGLPIXELTRANSFERIPROC)(GLenum pname, GLint param); +GLAPI PFNGLPIXELTRANSFERIPROC glad_glPixelTransferi; +#define glPixelTransferi glad_glPixelTransferi +typedef void (APIENTRYP PFNGLPIXELMAPFVPROC)(GLenum map, GLsizei mapsize, const GLfloat *values); +GLAPI PFNGLPIXELMAPFVPROC glad_glPixelMapfv; +#define glPixelMapfv glad_glPixelMapfv +typedef void (APIENTRYP PFNGLPIXELMAPUIVPROC)(GLenum map, GLsizei mapsize, const GLuint *values); +GLAPI PFNGLPIXELMAPUIVPROC glad_glPixelMapuiv; +#define glPixelMapuiv glad_glPixelMapuiv +typedef void (APIENTRYP PFNGLPIXELMAPUSVPROC)(GLenum map, GLsizei mapsize, const GLushort *values); +GLAPI PFNGLPIXELMAPUSVPROC glad_glPixelMapusv; +#define glPixelMapusv glad_glPixelMapusv +typedef void (APIENTRYP PFNGLCOPYPIXELSPROC)(GLint x, GLint y, GLsizei width, GLsizei height, GLenum type); +GLAPI PFNGLCOPYPIXELSPROC glad_glCopyPixels; +#define glCopyPixels glad_glCopyPixels +typedef void (APIENTRYP PFNGLDRAWPIXELSPROC)(GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels); +GLAPI PFNGLDRAWPIXELSPROC glad_glDrawPixels; +#define glDrawPixels glad_glDrawPixels +typedef void (APIENTRYP PFNGLGETCLIPPLANEPROC)(GLenum plane, GLdouble *equation); +GLAPI PFNGLGETCLIPPLANEPROC glad_glGetClipPlane; +#define glGetClipPlane glad_glGetClipPlane +typedef void (APIENTRYP PFNGLGETLIGHTFVPROC)(GLenum light, GLenum pname, GLfloat *params); +GLAPI PFNGLGETLIGHTFVPROC glad_glGetLightfv; +#define glGetLightfv glad_glGetLightfv +typedef void (APIENTRYP PFNGLGETLIGHTIVPROC)(GLenum light, GLenum pname, GLint *params); +GLAPI PFNGLGETLIGHTIVPROC glad_glGetLightiv; +#define glGetLightiv glad_glGetLightiv +typedef void (APIENTRYP PFNGLGETMAPDVPROC)(GLenum target, GLenum query, GLdouble *v); +GLAPI PFNGLGETMAPDVPROC glad_glGetMapdv; +#define glGetMapdv glad_glGetMapdv +typedef void (APIENTRYP PFNGLGETMAPFVPROC)(GLenum target, GLenum query, GLfloat *v); +GLAPI PFNGLGETMAPFVPROC glad_glGetMapfv; +#define glGetMapfv glad_glGetMapfv +typedef void (APIENTRYP PFNGLGETMAPIVPROC)(GLenum target, GLenum query, GLint *v); +GLAPI PFNGLGETMAPIVPROC glad_glGetMapiv; +#define glGetMapiv glad_glGetMapiv +typedef void (APIENTRYP PFNGLGETMATERIALFVPROC)(GLenum face, GLenum pname, GLfloat *params); +GLAPI PFNGLGETMATERIALFVPROC glad_glGetMaterialfv; +#define glGetMaterialfv glad_glGetMaterialfv +typedef void (APIENTRYP PFNGLGETMATERIALIVPROC)(GLenum face, GLenum pname, GLint *params); +GLAPI PFNGLGETMATERIALIVPROC glad_glGetMaterialiv; +#define glGetMaterialiv glad_glGetMaterialiv +typedef void (APIENTRYP PFNGLGETPIXELMAPFVPROC)(GLenum map, GLfloat *values); +GLAPI PFNGLGETPIXELMAPFVPROC glad_glGetPixelMapfv; +#define glGetPixelMapfv glad_glGetPixelMapfv +typedef void (APIENTRYP PFNGLGETPIXELMAPUIVPROC)(GLenum map, GLuint *values); +GLAPI PFNGLGETPIXELMAPUIVPROC glad_glGetPixelMapuiv; +#define glGetPixelMapuiv glad_glGetPixelMapuiv +typedef void (APIENTRYP PFNGLGETPIXELMAPUSVPROC)(GLenum map, GLushort *values); +GLAPI PFNGLGETPIXELMAPUSVPROC glad_glGetPixelMapusv; +#define glGetPixelMapusv glad_glGetPixelMapusv +typedef void (APIENTRYP PFNGLGETPOLYGONSTIPPLEPROC)(GLubyte *mask); +GLAPI PFNGLGETPOLYGONSTIPPLEPROC glad_glGetPolygonStipple; +#define glGetPolygonStipple glad_glGetPolygonStipple +typedef void (APIENTRYP PFNGLGETTEXENVFVPROC)(GLenum target, GLenum pname, GLfloat *params); +GLAPI PFNGLGETTEXENVFVPROC glad_glGetTexEnvfv; +#define glGetTexEnvfv glad_glGetTexEnvfv +typedef void (APIENTRYP PFNGLGETTEXENVIVPROC)(GLenum target, GLenum pname, GLint *params); +GLAPI PFNGLGETTEXENVIVPROC glad_glGetTexEnviv; +#define glGetTexEnviv glad_glGetTexEnviv +typedef void (APIENTRYP PFNGLGETTEXGENDVPROC)(GLenum coord, GLenum pname, GLdouble *params); +GLAPI PFNGLGETTEXGENDVPROC glad_glGetTexGendv; +#define glGetTexGendv glad_glGetTexGendv +typedef void (APIENTRYP PFNGLGETTEXGENFVPROC)(GLenum coord, GLenum pname, GLfloat *params); +GLAPI PFNGLGETTEXGENFVPROC glad_glGetTexGenfv; +#define glGetTexGenfv glad_glGetTexGenfv +typedef void (APIENTRYP PFNGLGETTEXGENIVPROC)(GLenum coord, GLenum pname, GLint *params); +GLAPI PFNGLGETTEXGENIVPROC glad_glGetTexGeniv; +#define glGetTexGeniv glad_glGetTexGeniv +typedef GLboolean (APIENTRYP PFNGLISLISTPROC)(GLuint list); +GLAPI PFNGLISLISTPROC glad_glIsList; +#define glIsList glad_glIsList +typedef void (APIENTRYP PFNGLFRUSTUMPROC)(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar); +GLAPI PFNGLFRUSTUMPROC glad_glFrustum; +#define glFrustum glad_glFrustum +typedef void (APIENTRYP PFNGLLOADIDENTITYPROC)(void); +GLAPI PFNGLLOADIDENTITYPROC glad_glLoadIdentity; +#define glLoadIdentity glad_glLoadIdentity +typedef void (APIENTRYP PFNGLLOADMATRIXFPROC)(const GLfloat *m); +GLAPI PFNGLLOADMATRIXFPROC glad_glLoadMatrixf; +#define glLoadMatrixf glad_glLoadMatrixf +typedef void (APIENTRYP PFNGLLOADMATRIXDPROC)(const GLdouble *m); +GLAPI PFNGLLOADMATRIXDPROC glad_glLoadMatrixd; +#define glLoadMatrixd glad_glLoadMatrixd +typedef void (APIENTRYP PFNGLMATRIXMODEPROC)(GLenum mode); +GLAPI PFNGLMATRIXMODEPROC glad_glMatrixMode; +#define glMatrixMode glad_glMatrixMode +typedef void (APIENTRYP PFNGLMULTMATRIXFPROC)(const GLfloat *m); +GLAPI PFNGLMULTMATRIXFPROC glad_glMultMatrixf; +#define glMultMatrixf glad_glMultMatrixf +typedef void (APIENTRYP PFNGLMULTMATRIXDPROC)(const GLdouble *m); +GLAPI PFNGLMULTMATRIXDPROC glad_glMultMatrixd; +#define glMultMatrixd glad_glMultMatrixd +typedef void (APIENTRYP PFNGLORTHOPROC)(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar); +GLAPI PFNGLORTHOPROC glad_glOrtho; +#define glOrtho glad_glOrtho +typedef void (APIENTRYP PFNGLPOPMATRIXPROC)(void); +GLAPI PFNGLPOPMATRIXPROC glad_glPopMatrix; +#define glPopMatrix glad_glPopMatrix +typedef void (APIENTRYP PFNGLPUSHMATRIXPROC)(void); +GLAPI PFNGLPUSHMATRIXPROC glad_glPushMatrix; +#define glPushMatrix glad_glPushMatrix +typedef void (APIENTRYP PFNGLROTATEDPROC)(GLdouble angle, GLdouble x, GLdouble y, GLdouble z); +GLAPI PFNGLROTATEDPROC glad_glRotated; +#define glRotated glad_glRotated +typedef void (APIENTRYP PFNGLROTATEFPROC)(GLfloat angle, GLfloat x, GLfloat y, GLfloat z); +GLAPI PFNGLROTATEFPROC glad_glRotatef; +#define glRotatef glad_glRotatef +typedef void (APIENTRYP PFNGLSCALEDPROC)(GLdouble x, GLdouble y, GLdouble z); +GLAPI PFNGLSCALEDPROC glad_glScaled; +#define glScaled glad_glScaled +typedef void (APIENTRYP PFNGLSCALEFPROC)(GLfloat x, GLfloat y, GLfloat z); +GLAPI PFNGLSCALEFPROC glad_glScalef; +#define glScalef glad_glScalef +typedef void (APIENTRYP PFNGLTRANSLATEDPROC)(GLdouble x, GLdouble y, GLdouble z); +GLAPI PFNGLTRANSLATEDPROC glad_glTranslated; +#define glTranslated glad_glTranslated +typedef void (APIENTRYP PFNGLTRANSLATEFPROC)(GLfloat x, GLfloat y, GLfloat z); +GLAPI PFNGLTRANSLATEFPROC glad_glTranslatef; +#define glTranslatef glad_glTranslatef +#endif +#ifndef GL_VERSION_1_1 +#define GL_VERSION_1_1 1 +GLAPI int GLAD_GL_VERSION_1_1; +typedef void (APIENTRYP PFNGLDRAWARRAYSPROC)(GLenum mode, GLint first, GLsizei count); +GLAPI PFNGLDRAWARRAYSPROC glad_glDrawArrays; +#define glDrawArrays glad_glDrawArrays +typedef void (APIENTRYP PFNGLDRAWELEMENTSPROC)(GLenum mode, GLsizei count, GLenum type, const void *indices); +GLAPI PFNGLDRAWELEMENTSPROC glad_glDrawElements; +#define glDrawElements glad_glDrawElements +typedef void (APIENTRYP PFNGLGETPOINTERVPROC)(GLenum pname, void **params); +GLAPI PFNGLGETPOINTERVPROC glad_glGetPointerv; +#define glGetPointerv glad_glGetPointerv +typedef void (APIENTRYP PFNGLPOLYGONOFFSETPROC)(GLfloat factor, GLfloat units); +GLAPI PFNGLPOLYGONOFFSETPROC glad_glPolygonOffset; +#define glPolygonOffset glad_glPolygonOffset +typedef void (APIENTRYP PFNGLCOPYTEXIMAGE1DPROC)(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border); +GLAPI PFNGLCOPYTEXIMAGE1DPROC glad_glCopyTexImage1D; +#define glCopyTexImage1D glad_glCopyTexImage1D +typedef void (APIENTRYP PFNGLCOPYTEXIMAGE2DPROC)(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border); +GLAPI PFNGLCOPYTEXIMAGE2DPROC glad_glCopyTexImage2D; +#define glCopyTexImage2D glad_glCopyTexImage2D +typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE1DPROC)(GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width); +GLAPI PFNGLCOPYTEXSUBIMAGE1DPROC glad_glCopyTexSubImage1D; +#define glCopyTexSubImage1D glad_glCopyTexSubImage1D +typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE2DPROC)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height); +GLAPI PFNGLCOPYTEXSUBIMAGE2DPROC glad_glCopyTexSubImage2D; +#define glCopyTexSubImage2D glad_glCopyTexSubImage2D +typedef void (APIENTRYP PFNGLTEXSUBIMAGE1DPROC)(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void *pixels); +GLAPI PFNGLTEXSUBIMAGE1DPROC glad_glTexSubImage1D; +#define glTexSubImage1D glad_glTexSubImage1D +typedef void (APIENTRYP PFNGLTEXSUBIMAGE2DPROC)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels); +GLAPI PFNGLTEXSUBIMAGE2DPROC glad_glTexSubImage2D; +#define glTexSubImage2D glad_glTexSubImage2D +typedef void (APIENTRYP PFNGLBINDTEXTUREPROC)(GLenum target, GLuint texture); +GLAPI PFNGLBINDTEXTUREPROC glad_glBindTexture; +#define glBindTexture glad_glBindTexture +typedef void (APIENTRYP PFNGLDELETETEXTURESPROC)(GLsizei n, const GLuint *textures); +GLAPI PFNGLDELETETEXTURESPROC glad_glDeleteTextures; +#define glDeleteTextures glad_glDeleteTextures +typedef void (APIENTRYP PFNGLGENTEXTURESPROC)(GLsizei n, GLuint *textures); +GLAPI PFNGLGENTEXTURESPROC glad_glGenTextures; +#define glGenTextures glad_glGenTextures +typedef GLboolean (APIENTRYP PFNGLISTEXTUREPROC)(GLuint texture); +GLAPI PFNGLISTEXTUREPROC glad_glIsTexture; +#define glIsTexture glad_glIsTexture +typedef void (APIENTRYP PFNGLARRAYELEMENTPROC)(GLint i); +GLAPI PFNGLARRAYELEMENTPROC glad_glArrayElement; +#define glArrayElement glad_glArrayElement +typedef void (APIENTRYP PFNGLCOLORPOINTERPROC)(GLint size, GLenum type, GLsizei stride, const void *pointer); +GLAPI PFNGLCOLORPOINTERPROC glad_glColorPointer; +#define glColorPointer glad_glColorPointer +typedef void (APIENTRYP PFNGLDISABLECLIENTSTATEPROC)(GLenum array); +GLAPI PFNGLDISABLECLIENTSTATEPROC glad_glDisableClientState; +#define glDisableClientState glad_glDisableClientState +typedef void (APIENTRYP PFNGLEDGEFLAGPOINTERPROC)(GLsizei stride, const void *pointer); +GLAPI PFNGLEDGEFLAGPOINTERPROC glad_glEdgeFlagPointer; +#define glEdgeFlagPointer glad_glEdgeFlagPointer +typedef void (APIENTRYP PFNGLENABLECLIENTSTATEPROC)(GLenum array); +GLAPI PFNGLENABLECLIENTSTATEPROC glad_glEnableClientState; +#define glEnableClientState glad_glEnableClientState +typedef void (APIENTRYP PFNGLINDEXPOINTERPROC)(GLenum type, GLsizei stride, const void *pointer); +GLAPI PFNGLINDEXPOINTERPROC glad_glIndexPointer; +#define glIndexPointer glad_glIndexPointer +typedef void (APIENTRYP PFNGLINTERLEAVEDARRAYSPROC)(GLenum format, GLsizei stride, const void *pointer); +GLAPI PFNGLINTERLEAVEDARRAYSPROC glad_glInterleavedArrays; +#define glInterleavedArrays glad_glInterleavedArrays +typedef void (APIENTRYP PFNGLNORMALPOINTERPROC)(GLenum type, GLsizei stride, const void *pointer); +GLAPI PFNGLNORMALPOINTERPROC glad_glNormalPointer; +#define glNormalPointer glad_glNormalPointer +typedef void (APIENTRYP PFNGLTEXCOORDPOINTERPROC)(GLint size, GLenum type, GLsizei stride, const void *pointer); +GLAPI PFNGLTEXCOORDPOINTERPROC glad_glTexCoordPointer; +#define glTexCoordPointer glad_glTexCoordPointer +typedef void (APIENTRYP PFNGLVERTEXPOINTERPROC)(GLint size, GLenum type, GLsizei stride, const void *pointer); +GLAPI PFNGLVERTEXPOINTERPROC glad_glVertexPointer; +#define glVertexPointer glad_glVertexPointer +typedef GLboolean (APIENTRYP PFNGLARETEXTURESRESIDENTPROC)(GLsizei n, const GLuint *textures, GLboolean *residences); +GLAPI PFNGLARETEXTURESRESIDENTPROC glad_glAreTexturesResident; +#define glAreTexturesResident glad_glAreTexturesResident +typedef void (APIENTRYP PFNGLPRIORITIZETEXTURESPROC)(GLsizei n, const GLuint *textures, const GLfloat *priorities); +GLAPI PFNGLPRIORITIZETEXTURESPROC glad_glPrioritizeTextures; +#define glPrioritizeTextures glad_glPrioritizeTextures +typedef void (APIENTRYP PFNGLINDEXUBPROC)(GLubyte c); +GLAPI PFNGLINDEXUBPROC glad_glIndexub; +#define glIndexub glad_glIndexub +typedef void (APIENTRYP PFNGLINDEXUBVPROC)(const GLubyte *c); +GLAPI PFNGLINDEXUBVPROC glad_glIndexubv; +#define glIndexubv glad_glIndexubv +typedef void (APIENTRYP PFNGLPOPCLIENTATTRIBPROC)(void); +GLAPI PFNGLPOPCLIENTATTRIBPROC glad_glPopClientAttrib; +#define glPopClientAttrib glad_glPopClientAttrib +typedef void (APIENTRYP PFNGLPUSHCLIENTATTRIBPROC)(GLbitfield mask); +GLAPI PFNGLPUSHCLIENTATTRIBPROC glad_glPushClientAttrib; +#define glPushClientAttrib glad_glPushClientAttrib +#endif +#ifndef GL_VERSION_1_2 +#define GL_VERSION_1_2 1 +GLAPI int GLAD_GL_VERSION_1_2; +typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSPROC)(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices); +GLAPI PFNGLDRAWRANGEELEMENTSPROC glad_glDrawRangeElements; +#define glDrawRangeElements glad_glDrawRangeElements +typedef void (APIENTRYP PFNGLTEXIMAGE3DPROC)(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels); +GLAPI PFNGLTEXIMAGE3DPROC glad_glTexImage3D; +#define glTexImage3D glad_glTexImage3D +typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DPROC)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels); +GLAPI PFNGLTEXSUBIMAGE3DPROC glad_glTexSubImage3D; +#define glTexSubImage3D glad_glTexSubImage3D +typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DPROC)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); +GLAPI PFNGLCOPYTEXSUBIMAGE3DPROC glad_glCopyTexSubImage3D; +#define glCopyTexSubImage3D glad_glCopyTexSubImage3D +#endif +#ifndef GL_VERSION_1_3 +#define GL_VERSION_1_3 1 +GLAPI int GLAD_GL_VERSION_1_3; +typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC)(GLenum texture); +GLAPI PFNGLACTIVETEXTUREPROC glad_glActiveTexture; +#define glActiveTexture glad_glActiveTexture +typedef void (APIENTRYP PFNGLSAMPLECOVERAGEPROC)(GLfloat value, GLboolean invert); +GLAPI PFNGLSAMPLECOVERAGEPROC glad_glSampleCoverage; +#define glSampleCoverage glad_glSampleCoverage +typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DPROC)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data); +GLAPI PFNGLCOMPRESSEDTEXIMAGE3DPROC glad_glCompressedTexImage3D; +#define glCompressedTexImage3D glad_glCompressedTexImage3D +typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DPROC)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *data); +GLAPI PFNGLCOMPRESSEDTEXIMAGE2DPROC glad_glCompressedTexImage2D; +#define glCompressedTexImage2D glad_glCompressedTexImage2D +typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DPROC)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *data); +GLAPI PFNGLCOMPRESSEDTEXIMAGE1DPROC glad_glCompressedTexImage1D; +#define glCompressedTexImage1D glad_glCompressedTexImage1D +typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data); +GLAPI PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC glad_glCompressedTexSubImage3D; +#define glCompressedTexSubImage3D glad_glCompressedTexSubImage3D +typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data); +GLAPI PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC glad_glCompressedTexSubImage2D; +#define glCompressedTexSubImage2D glad_glCompressedTexSubImage2D +typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC)(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *data); +GLAPI PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC glad_glCompressedTexSubImage1D; +#define glCompressedTexSubImage1D glad_glCompressedTexSubImage1D +typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEPROC)(GLenum target, GLint level, void *img); +GLAPI PFNGLGETCOMPRESSEDTEXIMAGEPROC glad_glGetCompressedTexImage; +#define glGetCompressedTexImage glad_glGetCompressedTexImage +typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREPROC)(GLenum texture); +GLAPI PFNGLCLIENTACTIVETEXTUREPROC glad_glClientActiveTexture; +#define glClientActiveTexture glad_glClientActiveTexture +typedef void (APIENTRYP PFNGLMULTITEXCOORD1DPROC)(GLenum target, GLdouble s); +GLAPI PFNGLMULTITEXCOORD1DPROC glad_glMultiTexCoord1d; +#define glMultiTexCoord1d glad_glMultiTexCoord1d +typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVPROC)(GLenum target, const GLdouble *v); +GLAPI PFNGLMULTITEXCOORD1DVPROC glad_glMultiTexCoord1dv; +#define glMultiTexCoord1dv glad_glMultiTexCoord1dv +typedef void (APIENTRYP PFNGLMULTITEXCOORD1FPROC)(GLenum target, GLfloat s); +GLAPI PFNGLMULTITEXCOORD1FPROC glad_glMultiTexCoord1f; +#define glMultiTexCoord1f glad_glMultiTexCoord1f +typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVPROC)(GLenum target, const GLfloat *v); +GLAPI PFNGLMULTITEXCOORD1FVPROC glad_glMultiTexCoord1fv; +#define glMultiTexCoord1fv glad_glMultiTexCoord1fv +typedef void (APIENTRYP PFNGLMULTITEXCOORD1IPROC)(GLenum target, GLint s); +GLAPI PFNGLMULTITEXCOORD1IPROC glad_glMultiTexCoord1i; +#define glMultiTexCoord1i glad_glMultiTexCoord1i +typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVPROC)(GLenum target, const GLint *v); +GLAPI PFNGLMULTITEXCOORD1IVPROC glad_glMultiTexCoord1iv; +#define glMultiTexCoord1iv glad_glMultiTexCoord1iv +typedef void (APIENTRYP PFNGLMULTITEXCOORD1SPROC)(GLenum target, GLshort s); +GLAPI PFNGLMULTITEXCOORD1SPROC glad_glMultiTexCoord1s; +#define glMultiTexCoord1s glad_glMultiTexCoord1s +typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVPROC)(GLenum target, const GLshort *v); +GLAPI PFNGLMULTITEXCOORD1SVPROC glad_glMultiTexCoord1sv; +#define glMultiTexCoord1sv glad_glMultiTexCoord1sv +typedef void (APIENTRYP PFNGLMULTITEXCOORD2DPROC)(GLenum target, GLdouble s, GLdouble t); +GLAPI PFNGLMULTITEXCOORD2DPROC glad_glMultiTexCoord2d; +#define glMultiTexCoord2d glad_glMultiTexCoord2d +typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVPROC)(GLenum target, const GLdouble *v); +GLAPI PFNGLMULTITEXCOORD2DVPROC glad_glMultiTexCoord2dv; +#define glMultiTexCoord2dv glad_glMultiTexCoord2dv +typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC)(GLenum target, GLfloat s, GLfloat t); +GLAPI PFNGLMULTITEXCOORD2FPROC glad_glMultiTexCoord2f; +#define glMultiTexCoord2f glad_glMultiTexCoord2f +typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVPROC)(GLenum target, const GLfloat *v); +GLAPI PFNGLMULTITEXCOORD2FVPROC glad_glMultiTexCoord2fv; +#define glMultiTexCoord2fv glad_glMultiTexCoord2fv +typedef void (APIENTRYP PFNGLMULTITEXCOORD2IPROC)(GLenum target, GLint s, GLint t); +GLAPI PFNGLMULTITEXCOORD2IPROC glad_glMultiTexCoord2i; +#define glMultiTexCoord2i glad_glMultiTexCoord2i +typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVPROC)(GLenum target, const GLint *v); +GLAPI PFNGLMULTITEXCOORD2IVPROC glad_glMultiTexCoord2iv; +#define glMultiTexCoord2iv glad_glMultiTexCoord2iv +typedef void (APIENTRYP PFNGLMULTITEXCOORD2SPROC)(GLenum target, GLshort s, GLshort t); +GLAPI PFNGLMULTITEXCOORD2SPROC glad_glMultiTexCoord2s; +#define glMultiTexCoord2s glad_glMultiTexCoord2s +typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVPROC)(GLenum target, const GLshort *v); +GLAPI PFNGLMULTITEXCOORD2SVPROC glad_glMultiTexCoord2sv; +#define glMultiTexCoord2sv glad_glMultiTexCoord2sv +typedef void (APIENTRYP PFNGLMULTITEXCOORD3DPROC)(GLenum target, GLdouble s, GLdouble t, GLdouble r); +GLAPI PFNGLMULTITEXCOORD3DPROC glad_glMultiTexCoord3d; +#define glMultiTexCoord3d glad_glMultiTexCoord3d +typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVPROC)(GLenum target, const GLdouble *v); +GLAPI PFNGLMULTITEXCOORD3DVPROC glad_glMultiTexCoord3dv; +#define glMultiTexCoord3dv glad_glMultiTexCoord3dv +typedef void (APIENTRYP PFNGLMULTITEXCOORD3FPROC)(GLenum target, GLfloat s, GLfloat t, GLfloat r); +GLAPI PFNGLMULTITEXCOORD3FPROC glad_glMultiTexCoord3f; +#define glMultiTexCoord3f glad_glMultiTexCoord3f +typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVPROC)(GLenum target, const GLfloat *v); +GLAPI PFNGLMULTITEXCOORD3FVPROC glad_glMultiTexCoord3fv; +#define glMultiTexCoord3fv glad_glMultiTexCoord3fv +typedef void (APIENTRYP PFNGLMULTITEXCOORD3IPROC)(GLenum target, GLint s, GLint t, GLint r); +GLAPI PFNGLMULTITEXCOORD3IPROC glad_glMultiTexCoord3i; +#define glMultiTexCoord3i glad_glMultiTexCoord3i +typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVPROC)(GLenum target, const GLint *v); +GLAPI PFNGLMULTITEXCOORD3IVPROC glad_glMultiTexCoord3iv; +#define glMultiTexCoord3iv glad_glMultiTexCoord3iv +typedef void (APIENTRYP PFNGLMULTITEXCOORD3SPROC)(GLenum target, GLshort s, GLshort t, GLshort r); +GLAPI PFNGLMULTITEXCOORD3SPROC glad_glMultiTexCoord3s; +#define glMultiTexCoord3s glad_glMultiTexCoord3s +typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVPROC)(GLenum target, const GLshort *v); +GLAPI PFNGLMULTITEXCOORD3SVPROC glad_glMultiTexCoord3sv; +#define glMultiTexCoord3sv glad_glMultiTexCoord3sv +typedef void (APIENTRYP PFNGLMULTITEXCOORD4DPROC)(GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q); +GLAPI PFNGLMULTITEXCOORD4DPROC glad_glMultiTexCoord4d; +#define glMultiTexCoord4d glad_glMultiTexCoord4d +typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVPROC)(GLenum target, const GLdouble *v); +GLAPI PFNGLMULTITEXCOORD4DVPROC glad_glMultiTexCoord4dv; +#define glMultiTexCoord4dv glad_glMultiTexCoord4dv +typedef void (APIENTRYP PFNGLMULTITEXCOORD4FPROC)(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q); +GLAPI PFNGLMULTITEXCOORD4FPROC glad_glMultiTexCoord4f; +#define glMultiTexCoord4f glad_glMultiTexCoord4f +typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVPROC)(GLenum target, const GLfloat *v); +GLAPI PFNGLMULTITEXCOORD4FVPROC glad_glMultiTexCoord4fv; +#define glMultiTexCoord4fv glad_glMultiTexCoord4fv +typedef void (APIENTRYP PFNGLMULTITEXCOORD4IPROC)(GLenum target, GLint s, GLint t, GLint r, GLint q); +GLAPI PFNGLMULTITEXCOORD4IPROC glad_glMultiTexCoord4i; +#define glMultiTexCoord4i glad_glMultiTexCoord4i +typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVPROC)(GLenum target, const GLint *v); +GLAPI PFNGLMULTITEXCOORD4IVPROC glad_glMultiTexCoord4iv; +#define glMultiTexCoord4iv glad_glMultiTexCoord4iv +typedef void (APIENTRYP PFNGLMULTITEXCOORD4SPROC)(GLenum target, GLshort s, GLshort t, GLshort r, GLshort q); +GLAPI PFNGLMULTITEXCOORD4SPROC glad_glMultiTexCoord4s; +#define glMultiTexCoord4s glad_glMultiTexCoord4s +typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVPROC)(GLenum target, const GLshort *v); +GLAPI PFNGLMULTITEXCOORD4SVPROC glad_glMultiTexCoord4sv; +#define glMultiTexCoord4sv glad_glMultiTexCoord4sv +typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXFPROC)(const GLfloat *m); +GLAPI PFNGLLOADTRANSPOSEMATRIXFPROC glad_glLoadTransposeMatrixf; +#define glLoadTransposeMatrixf glad_glLoadTransposeMatrixf +typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXDPROC)(const GLdouble *m); +GLAPI PFNGLLOADTRANSPOSEMATRIXDPROC glad_glLoadTransposeMatrixd; +#define glLoadTransposeMatrixd glad_glLoadTransposeMatrixd +typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXFPROC)(const GLfloat *m); +GLAPI PFNGLMULTTRANSPOSEMATRIXFPROC glad_glMultTransposeMatrixf; +#define glMultTransposeMatrixf glad_glMultTransposeMatrixf +typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXDPROC)(const GLdouble *m); +GLAPI PFNGLMULTTRANSPOSEMATRIXDPROC glad_glMultTransposeMatrixd; +#define glMultTransposeMatrixd glad_glMultTransposeMatrixd +#endif +#ifndef GL_VERSION_1_4 +#define GL_VERSION_1_4 1 +GLAPI int GLAD_GL_VERSION_1_4; +typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); +GLAPI PFNGLBLENDFUNCSEPARATEPROC glad_glBlendFuncSeparate; +#define glBlendFuncSeparate glad_glBlendFuncSeparate +typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSPROC)(GLenum mode, const GLint *first, const GLsizei *count, GLsizei drawcount); +GLAPI PFNGLMULTIDRAWARRAYSPROC glad_glMultiDrawArrays; +#define glMultiDrawArrays glad_glMultiDrawArrays +typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSPROC)(GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei drawcount); +GLAPI PFNGLMULTIDRAWELEMENTSPROC glad_glMultiDrawElements; +#define glMultiDrawElements glad_glMultiDrawElements +typedef void (APIENTRYP PFNGLPOINTPARAMETERFPROC)(GLenum pname, GLfloat param); +GLAPI PFNGLPOINTPARAMETERFPROC glad_glPointParameterf; +#define glPointParameterf glad_glPointParameterf +typedef void (APIENTRYP PFNGLPOINTPARAMETERFVPROC)(GLenum pname, const GLfloat *params); +GLAPI PFNGLPOINTPARAMETERFVPROC glad_glPointParameterfv; +#define glPointParameterfv glad_glPointParameterfv +typedef void (APIENTRYP PFNGLPOINTPARAMETERIPROC)(GLenum pname, GLint param); +GLAPI PFNGLPOINTPARAMETERIPROC glad_glPointParameteri; +#define glPointParameteri glad_glPointParameteri +typedef void (APIENTRYP PFNGLPOINTPARAMETERIVPROC)(GLenum pname, const GLint *params); +GLAPI PFNGLPOINTPARAMETERIVPROC glad_glPointParameteriv; +#define glPointParameteriv glad_glPointParameteriv +typedef void (APIENTRYP PFNGLFOGCOORDFPROC)(GLfloat coord); +GLAPI PFNGLFOGCOORDFPROC glad_glFogCoordf; +#define glFogCoordf glad_glFogCoordf +typedef void (APIENTRYP PFNGLFOGCOORDFVPROC)(const GLfloat *coord); +GLAPI PFNGLFOGCOORDFVPROC glad_glFogCoordfv; +#define glFogCoordfv glad_glFogCoordfv +typedef void (APIENTRYP PFNGLFOGCOORDDPROC)(GLdouble coord); +GLAPI PFNGLFOGCOORDDPROC glad_glFogCoordd; +#define glFogCoordd glad_glFogCoordd +typedef void (APIENTRYP PFNGLFOGCOORDDVPROC)(const GLdouble *coord); +GLAPI PFNGLFOGCOORDDVPROC glad_glFogCoorddv; +#define glFogCoorddv glad_glFogCoorddv +typedef void (APIENTRYP PFNGLFOGCOORDPOINTERPROC)(GLenum type, GLsizei stride, const void *pointer); +GLAPI PFNGLFOGCOORDPOINTERPROC glad_glFogCoordPointer; +#define glFogCoordPointer glad_glFogCoordPointer +typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BPROC)(GLbyte red, GLbyte green, GLbyte blue); +GLAPI PFNGLSECONDARYCOLOR3BPROC glad_glSecondaryColor3b; +#define glSecondaryColor3b glad_glSecondaryColor3b +typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BVPROC)(const GLbyte *v); +GLAPI PFNGLSECONDARYCOLOR3BVPROC glad_glSecondaryColor3bv; +#define glSecondaryColor3bv glad_glSecondaryColor3bv +typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DPROC)(GLdouble red, GLdouble green, GLdouble blue); +GLAPI PFNGLSECONDARYCOLOR3DPROC glad_glSecondaryColor3d; +#define glSecondaryColor3d glad_glSecondaryColor3d +typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DVPROC)(const GLdouble *v); +GLAPI PFNGLSECONDARYCOLOR3DVPROC glad_glSecondaryColor3dv; +#define glSecondaryColor3dv glad_glSecondaryColor3dv +typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FPROC)(GLfloat red, GLfloat green, GLfloat blue); +GLAPI PFNGLSECONDARYCOLOR3FPROC glad_glSecondaryColor3f; +#define glSecondaryColor3f glad_glSecondaryColor3f +typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FVPROC)(const GLfloat *v); +GLAPI PFNGLSECONDARYCOLOR3FVPROC glad_glSecondaryColor3fv; +#define glSecondaryColor3fv glad_glSecondaryColor3fv +typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IPROC)(GLint red, GLint green, GLint blue); +GLAPI PFNGLSECONDARYCOLOR3IPROC glad_glSecondaryColor3i; +#define glSecondaryColor3i glad_glSecondaryColor3i +typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IVPROC)(const GLint *v); +GLAPI PFNGLSECONDARYCOLOR3IVPROC glad_glSecondaryColor3iv; +#define glSecondaryColor3iv glad_glSecondaryColor3iv +typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SPROC)(GLshort red, GLshort green, GLshort blue); +GLAPI PFNGLSECONDARYCOLOR3SPROC glad_glSecondaryColor3s; +#define glSecondaryColor3s glad_glSecondaryColor3s +typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SVPROC)(const GLshort *v); +GLAPI PFNGLSECONDARYCOLOR3SVPROC glad_glSecondaryColor3sv; +#define glSecondaryColor3sv glad_glSecondaryColor3sv +typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBPROC)(GLubyte red, GLubyte green, GLubyte blue); +GLAPI PFNGLSECONDARYCOLOR3UBPROC glad_glSecondaryColor3ub; +#define glSecondaryColor3ub glad_glSecondaryColor3ub +typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBVPROC)(const GLubyte *v); +GLAPI PFNGLSECONDARYCOLOR3UBVPROC glad_glSecondaryColor3ubv; +#define glSecondaryColor3ubv glad_glSecondaryColor3ubv +typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIPROC)(GLuint red, GLuint green, GLuint blue); +GLAPI PFNGLSECONDARYCOLOR3UIPROC glad_glSecondaryColor3ui; +#define glSecondaryColor3ui glad_glSecondaryColor3ui +typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIVPROC)(const GLuint *v); +GLAPI PFNGLSECONDARYCOLOR3UIVPROC glad_glSecondaryColor3uiv; +#define glSecondaryColor3uiv glad_glSecondaryColor3uiv +typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USPROC)(GLushort red, GLushort green, GLushort blue); +GLAPI PFNGLSECONDARYCOLOR3USPROC glad_glSecondaryColor3us; +#define glSecondaryColor3us glad_glSecondaryColor3us +typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USVPROC)(const GLushort *v); +GLAPI PFNGLSECONDARYCOLOR3USVPROC glad_glSecondaryColor3usv; +#define glSecondaryColor3usv glad_glSecondaryColor3usv +typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTERPROC)(GLint size, GLenum type, GLsizei stride, const void *pointer); +GLAPI PFNGLSECONDARYCOLORPOINTERPROC glad_glSecondaryColorPointer; +#define glSecondaryColorPointer glad_glSecondaryColorPointer +typedef void (APIENTRYP PFNGLWINDOWPOS2DPROC)(GLdouble x, GLdouble y); +GLAPI PFNGLWINDOWPOS2DPROC glad_glWindowPos2d; +#define glWindowPos2d glad_glWindowPos2d +typedef void (APIENTRYP PFNGLWINDOWPOS2DVPROC)(const GLdouble *v); +GLAPI PFNGLWINDOWPOS2DVPROC glad_glWindowPos2dv; +#define glWindowPos2dv glad_glWindowPos2dv +typedef void (APIENTRYP PFNGLWINDOWPOS2FPROC)(GLfloat x, GLfloat y); +GLAPI PFNGLWINDOWPOS2FPROC glad_glWindowPos2f; +#define glWindowPos2f glad_glWindowPos2f +typedef void (APIENTRYP PFNGLWINDOWPOS2FVPROC)(const GLfloat *v); +GLAPI PFNGLWINDOWPOS2FVPROC glad_glWindowPos2fv; +#define glWindowPos2fv glad_glWindowPos2fv +typedef void (APIENTRYP PFNGLWINDOWPOS2IPROC)(GLint x, GLint y); +GLAPI PFNGLWINDOWPOS2IPROC glad_glWindowPos2i; +#define glWindowPos2i glad_glWindowPos2i +typedef void (APIENTRYP PFNGLWINDOWPOS2IVPROC)(const GLint *v); +GLAPI PFNGLWINDOWPOS2IVPROC glad_glWindowPos2iv; +#define glWindowPos2iv glad_glWindowPos2iv +typedef void (APIENTRYP PFNGLWINDOWPOS2SPROC)(GLshort x, GLshort y); +GLAPI PFNGLWINDOWPOS2SPROC glad_glWindowPos2s; +#define glWindowPos2s glad_glWindowPos2s +typedef void (APIENTRYP PFNGLWINDOWPOS2SVPROC)(const GLshort *v); +GLAPI PFNGLWINDOWPOS2SVPROC glad_glWindowPos2sv; +#define glWindowPos2sv glad_glWindowPos2sv +typedef void (APIENTRYP PFNGLWINDOWPOS3DPROC)(GLdouble x, GLdouble y, GLdouble z); +GLAPI PFNGLWINDOWPOS3DPROC glad_glWindowPos3d; +#define glWindowPos3d glad_glWindowPos3d +typedef void (APIENTRYP PFNGLWINDOWPOS3DVPROC)(const GLdouble *v); +GLAPI PFNGLWINDOWPOS3DVPROC glad_glWindowPos3dv; +#define glWindowPos3dv glad_glWindowPos3dv +typedef void (APIENTRYP PFNGLWINDOWPOS3FPROC)(GLfloat x, GLfloat y, GLfloat z); +GLAPI PFNGLWINDOWPOS3FPROC glad_glWindowPos3f; +#define glWindowPos3f glad_glWindowPos3f +typedef void (APIENTRYP PFNGLWINDOWPOS3FVPROC)(const GLfloat *v); +GLAPI PFNGLWINDOWPOS3FVPROC glad_glWindowPos3fv; +#define glWindowPos3fv glad_glWindowPos3fv +typedef void (APIENTRYP PFNGLWINDOWPOS3IPROC)(GLint x, GLint y, GLint z); +GLAPI PFNGLWINDOWPOS3IPROC glad_glWindowPos3i; +#define glWindowPos3i glad_glWindowPos3i +typedef void (APIENTRYP PFNGLWINDOWPOS3IVPROC)(const GLint *v); +GLAPI PFNGLWINDOWPOS3IVPROC glad_glWindowPos3iv; +#define glWindowPos3iv glad_glWindowPos3iv +typedef void (APIENTRYP PFNGLWINDOWPOS3SPROC)(GLshort x, GLshort y, GLshort z); +GLAPI PFNGLWINDOWPOS3SPROC glad_glWindowPos3s; +#define glWindowPos3s glad_glWindowPos3s +typedef void (APIENTRYP PFNGLWINDOWPOS3SVPROC)(const GLshort *v); +GLAPI PFNGLWINDOWPOS3SVPROC glad_glWindowPos3sv; +#define glWindowPos3sv glad_glWindowPos3sv +typedef void (APIENTRYP PFNGLBLENDCOLORPROC)(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha); +GLAPI PFNGLBLENDCOLORPROC glad_glBlendColor; +#define glBlendColor glad_glBlendColor +typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC)(GLenum mode); +GLAPI PFNGLBLENDEQUATIONPROC glad_glBlendEquation; +#define glBlendEquation glad_glBlendEquation +#endif +#ifndef GL_VERSION_1_5 +#define GL_VERSION_1_5 1 +GLAPI int GLAD_GL_VERSION_1_5; +typedef void (APIENTRYP PFNGLGENQUERIESPROC)(GLsizei n, GLuint *ids); +GLAPI PFNGLGENQUERIESPROC glad_glGenQueries; +#define glGenQueries glad_glGenQueries +typedef void (APIENTRYP PFNGLDELETEQUERIESPROC)(GLsizei n, const GLuint *ids); +GLAPI PFNGLDELETEQUERIESPROC glad_glDeleteQueries; +#define glDeleteQueries glad_glDeleteQueries +typedef GLboolean (APIENTRYP PFNGLISQUERYPROC)(GLuint id); +GLAPI PFNGLISQUERYPROC glad_glIsQuery; +#define glIsQuery glad_glIsQuery +typedef void (APIENTRYP PFNGLBEGINQUERYPROC)(GLenum target, GLuint id); +GLAPI PFNGLBEGINQUERYPROC glad_glBeginQuery; +#define glBeginQuery glad_glBeginQuery +typedef void (APIENTRYP PFNGLENDQUERYPROC)(GLenum target); +GLAPI PFNGLENDQUERYPROC glad_glEndQuery; +#define glEndQuery glad_glEndQuery +typedef void (APIENTRYP PFNGLGETQUERYIVPROC)(GLenum target, GLenum pname, GLint *params); +GLAPI PFNGLGETQUERYIVPROC glad_glGetQueryiv; +#define glGetQueryiv glad_glGetQueryiv +typedef void (APIENTRYP PFNGLGETQUERYOBJECTIVPROC)(GLuint id, GLenum pname, GLint *params); +GLAPI PFNGLGETQUERYOBJECTIVPROC glad_glGetQueryObjectiv; +#define glGetQueryObjectiv glad_glGetQueryObjectiv +typedef void (APIENTRYP PFNGLGETQUERYOBJECTUIVPROC)(GLuint id, GLenum pname, GLuint *params); +GLAPI PFNGLGETQUERYOBJECTUIVPROC glad_glGetQueryObjectuiv; +#define glGetQueryObjectuiv glad_glGetQueryObjectuiv +typedef void (APIENTRYP PFNGLBINDBUFFERPROC)(GLenum target, GLuint buffer); +GLAPI PFNGLBINDBUFFERPROC glad_glBindBuffer; +#define glBindBuffer glad_glBindBuffer +typedef void (APIENTRYP PFNGLDELETEBUFFERSPROC)(GLsizei n, const GLuint *buffers); +GLAPI PFNGLDELETEBUFFERSPROC glad_glDeleteBuffers; +#define glDeleteBuffers glad_glDeleteBuffers +typedef void (APIENTRYP PFNGLGENBUFFERSPROC)(GLsizei n, GLuint *buffers); +GLAPI PFNGLGENBUFFERSPROC glad_glGenBuffers; +#define glGenBuffers glad_glGenBuffers +typedef GLboolean (APIENTRYP PFNGLISBUFFERPROC)(GLuint buffer); +GLAPI PFNGLISBUFFERPROC glad_glIsBuffer; +#define glIsBuffer glad_glIsBuffer +typedef void (APIENTRYP PFNGLBUFFERDATAPROC)(GLenum target, GLsizeiptr size, const void *data, GLenum usage); +GLAPI PFNGLBUFFERDATAPROC glad_glBufferData; +#define glBufferData glad_glBufferData +typedef void (APIENTRYP PFNGLBUFFERSUBDATAPROC)(GLenum target, GLintptr offset, GLsizeiptr size, const void *data); +GLAPI PFNGLBUFFERSUBDATAPROC glad_glBufferSubData; +#define glBufferSubData glad_glBufferSubData +typedef void (APIENTRYP PFNGLGETBUFFERSUBDATAPROC)(GLenum target, GLintptr offset, GLsizeiptr size, void *data); +GLAPI PFNGLGETBUFFERSUBDATAPROC glad_glGetBufferSubData; +#define glGetBufferSubData glad_glGetBufferSubData +typedef void * (APIENTRYP PFNGLMAPBUFFERPROC)(GLenum target, GLenum access); +GLAPI PFNGLMAPBUFFERPROC glad_glMapBuffer; +#define glMapBuffer glad_glMapBuffer +typedef GLboolean (APIENTRYP PFNGLUNMAPBUFFERPROC)(GLenum target); +GLAPI PFNGLUNMAPBUFFERPROC glad_glUnmapBuffer; +#define glUnmapBuffer glad_glUnmapBuffer +typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERIVPROC)(GLenum target, GLenum pname, GLint *params); +GLAPI PFNGLGETBUFFERPARAMETERIVPROC glad_glGetBufferParameteriv; +#define glGetBufferParameteriv glad_glGetBufferParameteriv +typedef void (APIENTRYP PFNGLGETBUFFERPOINTERVPROC)(GLenum target, GLenum pname, void **params); +GLAPI PFNGLGETBUFFERPOINTERVPROC glad_glGetBufferPointerv; +#define glGetBufferPointerv glad_glGetBufferPointerv +#endif +#ifndef GL_VERSION_2_0 +#define GL_VERSION_2_0 1 +GLAPI int GLAD_GL_VERSION_2_0; +typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEPROC)(GLenum modeRGB, GLenum modeAlpha); +GLAPI PFNGLBLENDEQUATIONSEPARATEPROC glad_glBlendEquationSeparate; +#define glBlendEquationSeparate glad_glBlendEquationSeparate +typedef void (APIENTRYP PFNGLDRAWBUFFERSPROC)(GLsizei n, const GLenum *bufs); +GLAPI PFNGLDRAWBUFFERSPROC glad_glDrawBuffers; +#define glDrawBuffers glad_glDrawBuffers +typedef void (APIENTRYP PFNGLSTENCILOPSEPARATEPROC)(GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass); +GLAPI PFNGLSTENCILOPSEPARATEPROC glad_glStencilOpSeparate; +#define glStencilOpSeparate glad_glStencilOpSeparate +typedef void (APIENTRYP PFNGLSTENCILFUNCSEPARATEPROC)(GLenum face, GLenum func, GLint ref, GLuint mask); +GLAPI PFNGLSTENCILFUNCSEPARATEPROC glad_glStencilFuncSeparate; +#define glStencilFuncSeparate glad_glStencilFuncSeparate +typedef void (APIENTRYP PFNGLSTENCILMASKSEPARATEPROC)(GLenum face, GLuint mask); +GLAPI PFNGLSTENCILMASKSEPARATEPROC glad_glStencilMaskSeparate; +#define glStencilMaskSeparate glad_glStencilMaskSeparate +typedef void (APIENTRYP PFNGLATTACHSHADERPROC)(GLuint program, GLuint shader); +GLAPI PFNGLATTACHSHADERPROC glad_glAttachShader; +#define glAttachShader glad_glAttachShader +typedef void (APIENTRYP PFNGLBINDATTRIBLOCATIONPROC)(GLuint program, GLuint index, const GLchar *name); +GLAPI PFNGLBINDATTRIBLOCATIONPROC glad_glBindAttribLocation; +#define glBindAttribLocation glad_glBindAttribLocation +typedef void (APIENTRYP PFNGLCOMPILESHADERPROC)(GLuint shader); +GLAPI PFNGLCOMPILESHADERPROC glad_glCompileShader; +#define glCompileShader glad_glCompileShader +typedef GLuint (APIENTRYP PFNGLCREATEPROGRAMPROC)(void); +GLAPI PFNGLCREATEPROGRAMPROC glad_glCreateProgram; +#define glCreateProgram glad_glCreateProgram +typedef GLuint (APIENTRYP PFNGLCREATESHADERPROC)(GLenum type); +GLAPI PFNGLCREATESHADERPROC glad_glCreateShader; +#define glCreateShader glad_glCreateShader +typedef void (APIENTRYP PFNGLDELETEPROGRAMPROC)(GLuint program); +GLAPI PFNGLDELETEPROGRAMPROC glad_glDeleteProgram; +#define glDeleteProgram glad_glDeleteProgram +typedef void (APIENTRYP PFNGLDELETESHADERPROC)(GLuint shader); +GLAPI PFNGLDELETESHADERPROC glad_glDeleteShader; +#define glDeleteShader glad_glDeleteShader +typedef void (APIENTRYP PFNGLDETACHSHADERPROC)(GLuint program, GLuint shader); +GLAPI PFNGLDETACHSHADERPROC glad_glDetachShader; +#define glDetachShader glad_glDetachShader +typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBARRAYPROC)(GLuint index); +GLAPI PFNGLDISABLEVERTEXATTRIBARRAYPROC glad_glDisableVertexAttribArray; +#define glDisableVertexAttribArray glad_glDisableVertexAttribArray +typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBARRAYPROC)(GLuint index); +GLAPI PFNGLENABLEVERTEXATTRIBARRAYPROC glad_glEnableVertexAttribArray; +#define glEnableVertexAttribArray glad_glEnableVertexAttribArray +typedef void (APIENTRYP PFNGLGETACTIVEATTRIBPROC)(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name); +GLAPI PFNGLGETACTIVEATTRIBPROC glad_glGetActiveAttrib; +#define glGetActiveAttrib glad_glGetActiveAttrib +typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMPROC)(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name); +GLAPI PFNGLGETACTIVEUNIFORMPROC glad_glGetActiveUniform; +#define glGetActiveUniform glad_glGetActiveUniform +typedef void (APIENTRYP PFNGLGETATTACHEDSHADERSPROC)(GLuint program, GLsizei maxCount, GLsizei *count, GLuint *shaders); +GLAPI PFNGLGETATTACHEDSHADERSPROC glad_glGetAttachedShaders; +#define glGetAttachedShaders glad_glGetAttachedShaders +typedef GLint (APIENTRYP PFNGLGETATTRIBLOCATIONPROC)(GLuint program, const GLchar *name); +GLAPI PFNGLGETATTRIBLOCATIONPROC glad_glGetAttribLocation; +#define glGetAttribLocation glad_glGetAttribLocation +typedef void (APIENTRYP PFNGLGETPROGRAMIVPROC)(GLuint program, GLenum pname, GLint *params); +GLAPI PFNGLGETPROGRAMIVPROC glad_glGetProgramiv; +#define glGetProgramiv glad_glGetProgramiv +typedef void (APIENTRYP PFNGLGETPROGRAMINFOLOGPROC)(GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog); +GLAPI PFNGLGETPROGRAMINFOLOGPROC glad_glGetProgramInfoLog; +#define glGetProgramInfoLog glad_glGetProgramInfoLog +typedef void (APIENTRYP PFNGLGETSHADERIVPROC)(GLuint shader, GLenum pname, GLint *params); +GLAPI PFNGLGETSHADERIVPROC glad_glGetShaderiv; +#define glGetShaderiv glad_glGetShaderiv +typedef void (APIENTRYP PFNGLGETSHADERINFOLOGPROC)(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog); +GLAPI PFNGLGETSHADERINFOLOGPROC glad_glGetShaderInfoLog; +#define glGetShaderInfoLog glad_glGetShaderInfoLog +typedef void (APIENTRYP PFNGLGETSHADERSOURCEPROC)(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source); +GLAPI PFNGLGETSHADERSOURCEPROC glad_glGetShaderSource; +#define glGetShaderSource glad_glGetShaderSource +typedef GLint (APIENTRYP PFNGLGETUNIFORMLOCATIONPROC)(GLuint program, const GLchar *name); +GLAPI PFNGLGETUNIFORMLOCATIONPROC glad_glGetUniformLocation; +#define glGetUniformLocation glad_glGetUniformLocation +typedef void (APIENTRYP PFNGLGETUNIFORMFVPROC)(GLuint program, GLint location, GLfloat *params); +GLAPI PFNGLGETUNIFORMFVPROC glad_glGetUniformfv; +#define glGetUniformfv glad_glGetUniformfv +typedef void (APIENTRYP PFNGLGETUNIFORMIVPROC)(GLuint program, GLint location, GLint *params); +GLAPI PFNGLGETUNIFORMIVPROC glad_glGetUniformiv; +#define glGetUniformiv glad_glGetUniformiv +typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVPROC)(GLuint index, GLenum pname, GLdouble *params); +GLAPI PFNGLGETVERTEXATTRIBDVPROC glad_glGetVertexAttribdv; +#define glGetVertexAttribdv glad_glGetVertexAttribdv +typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVPROC)(GLuint index, GLenum pname, GLfloat *params); +GLAPI PFNGLGETVERTEXATTRIBFVPROC glad_glGetVertexAttribfv; +#define glGetVertexAttribfv glad_glGetVertexAttribfv +typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVPROC)(GLuint index, GLenum pname, GLint *params); +GLAPI PFNGLGETVERTEXATTRIBIVPROC glad_glGetVertexAttribiv; +#define glGetVertexAttribiv glad_glGetVertexAttribiv +typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVPROC)(GLuint index, GLenum pname, void **pointer); +GLAPI PFNGLGETVERTEXATTRIBPOINTERVPROC glad_glGetVertexAttribPointerv; +#define glGetVertexAttribPointerv glad_glGetVertexAttribPointerv +typedef GLboolean (APIENTRYP PFNGLISPROGRAMPROC)(GLuint program); +GLAPI PFNGLISPROGRAMPROC glad_glIsProgram; +#define glIsProgram glad_glIsProgram +typedef GLboolean (APIENTRYP PFNGLISSHADERPROC)(GLuint shader); +GLAPI PFNGLISSHADERPROC glad_glIsShader; +#define glIsShader glad_glIsShader +typedef void (APIENTRYP PFNGLLINKPROGRAMPROC)(GLuint program); +GLAPI PFNGLLINKPROGRAMPROC glad_glLinkProgram; +#define glLinkProgram glad_glLinkProgram +typedef void (APIENTRYP PFNGLSHADERSOURCEPROC)(GLuint shader, GLsizei count, const GLchar *const*string, const GLint *length); +GLAPI PFNGLSHADERSOURCEPROC glad_glShaderSource; +#define glShaderSource glad_glShaderSource +typedef void (APIENTRYP PFNGLUSEPROGRAMPROC)(GLuint program); +GLAPI PFNGLUSEPROGRAMPROC glad_glUseProgram; +#define glUseProgram glad_glUseProgram +typedef void (APIENTRYP PFNGLUNIFORM1FPROC)(GLint location, GLfloat v0); +GLAPI PFNGLUNIFORM1FPROC glad_glUniform1f; +#define glUniform1f glad_glUniform1f +typedef void (APIENTRYP PFNGLUNIFORM2FPROC)(GLint location, GLfloat v0, GLfloat v1); +GLAPI PFNGLUNIFORM2FPROC glad_glUniform2f; +#define glUniform2f glad_glUniform2f +typedef void (APIENTRYP PFNGLUNIFORM3FPROC)(GLint location, GLfloat v0, GLfloat v1, GLfloat v2); +GLAPI PFNGLUNIFORM3FPROC glad_glUniform3f; +#define glUniform3f glad_glUniform3f +typedef void (APIENTRYP PFNGLUNIFORM4FPROC)(GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3); +GLAPI PFNGLUNIFORM4FPROC glad_glUniform4f; +#define glUniform4f glad_glUniform4f +typedef void (APIENTRYP PFNGLUNIFORM1IPROC)(GLint location, GLint v0); +GLAPI PFNGLUNIFORM1IPROC glad_glUniform1i; +#define glUniform1i glad_glUniform1i +typedef void (APIENTRYP PFNGLUNIFORM2IPROC)(GLint location, GLint v0, GLint v1); +GLAPI PFNGLUNIFORM2IPROC glad_glUniform2i; +#define glUniform2i glad_glUniform2i +typedef void (APIENTRYP PFNGLUNIFORM3IPROC)(GLint location, GLint v0, GLint v1, GLint v2); +GLAPI PFNGLUNIFORM3IPROC glad_glUniform3i; +#define glUniform3i glad_glUniform3i +typedef void (APIENTRYP PFNGLUNIFORM4IPROC)(GLint location, GLint v0, GLint v1, GLint v2, GLint v3); +GLAPI PFNGLUNIFORM4IPROC glad_glUniform4i; +#define glUniform4i glad_glUniform4i +typedef void (APIENTRYP PFNGLUNIFORM1FVPROC)(GLint location, GLsizei count, const GLfloat *value); +GLAPI PFNGLUNIFORM1FVPROC glad_glUniform1fv; +#define glUniform1fv glad_glUniform1fv +typedef void (APIENTRYP PFNGLUNIFORM2FVPROC)(GLint location, GLsizei count, const GLfloat *value); +GLAPI PFNGLUNIFORM2FVPROC glad_glUniform2fv; +#define glUniform2fv glad_glUniform2fv +typedef void (APIENTRYP PFNGLUNIFORM3FVPROC)(GLint location, GLsizei count, const GLfloat *value); +GLAPI PFNGLUNIFORM3FVPROC glad_glUniform3fv; +#define glUniform3fv glad_glUniform3fv +typedef void (APIENTRYP PFNGLUNIFORM4FVPROC)(GLint location, GLsizei count, const GLfloat *value); +GLAPI PFNGLUNIFORM4FVPROC glad_glUniform4fv; +#define glUniform4fv glad_glUniform4fv +typedef void (APIENTRYP PFNGLUNIFORM1IVPROC)(GLint location, GLsizei count, const GLint *value); +GLAPI PFNGLUNIFORM1IVPROC glad_glUniform1iv; +#define glUniform1iv glad_glUniform1iv +typedef void (APIENTRYP PFNGLUNIFORM2IVPROC)(GLint location, GLsizei count, const GLint *value); +GLAPI PFNGLUNIFORM2IVPROC glad_glUniform2iv; +#define glUniform2iv glad_glUniform2iv +typedef void (APIENTRYP PFNGLUNIFORM3IVPROC)(GLint location, GLsizei count, const GLint *value); +GLAPI PFNGLUNIFORM3IVPROC glad_glUniform3iv; +#define glUniform3iv glad_glUniform3iv +typedef void (APIENTRYP PFNGLUNIFORM4IVPROC)(GLint location, GLsizei count, const GLint *value); +GLAPI PFNGLUNIFORM4IVPROC glad_glUniform4iv; +#define glUniform4iv glad_glUniform4iv +typedef void (APIENTRYP PFNGLUNIFORMMATRIX2FVPROC)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); +GLAPI PFNGLUNIFORMMATRIX2FVPROC glad_glUniformMatrix2fv; +#define glUniformMatrix2fv glad_glUniformMatrix2fv +typedef void (APIENTRYP PFNGLUNIFORMMATRIX3FVPROC)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); +GLAPI PFNGLUNIFORMMATRIX3FVPROC glad_glUniformMatrix3fv; +#define glUniformMatrix3fv glad_glUniformMatrix3fv +typedef void (APIENTRYP PFNGLUNIFORMMATRIX4FVPROC)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); +GLAPI PFNGLUNIFORMMATRIX4FVPROC glad_glUniformMatrix4fv; +#define glUniformMatrix4fv glad_glUniformMatrix4fv +typedef void (APIENTRYP PFNGLVALIDATEPROGRAMPROC)(GLuint program); +GLAPI PFNGLVALIDATEPROGRAMPROC glad_glValidateProgram; +#define glValidateProgram glad_glValidateProgram +typedef void (APIENTRYP PFNGLVERTEXATTRIB1DPROC)(GLuint index, GLdouble x); +GLAPI PFNGLVERTEXATTRIB1DPROC glad_glVertexAttrib1d; +#define glVertexAttrib1d glad_glVertexAttrib1d +typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVPROC)(GLuint index, const GLdouble *v); +GLAPI PFNGLVERTEXATTRIB1DVPROC glad_glVertexAttrib1dv; +#define glVertexAttrib1dv glad_glVertexAttrib1dv +typedef void (APIENTRYP PFNGLVERTEXATTRIB1FPROC)(GLuint index, GLfloat x); +GLAPI PFNGLVERTEXATTRIB1FPROC glad_glVertexAttrib1f; +#define glVertexAttrib1f glad_glVertexAttrib1f +typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVPROC)(GLuint index, const GLfloat *v); +GLAPI PFNGLVERTEXATTRIB1FVPROC glad_glVertexAttrib1fv; +#define glVertexAttrib1fv glad_glVertexAttrib1fv +typedef void (APIENTRYP PFNGLVERTEXATTRIB1SPROC)(GLuint index, GLshort x); +GLAPI PFNGLVERTEXATTRIB1SPROC glad_glVertexAttrib1s; +#define glVertexAttrib1s glad_glVertexAttrib1s +typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVPROC)(GLuint index, const GLshort *v); +GLAPI PFNGLVERTEXATTRIB1SVPROC glad_glVertexAttrib1sv; +#define glVertexAttrib1sv glad_glVertexAttrib1sv +typedef void (APIENTRYP PFNGLVERTEXATTRIB2DPROC)(GLuint index, GLdouble x, GLdouble y); +GLAPI PFNGLVERTEXATTRIB2DPROC glad_glVertexAttrib2d; +#define glVertexAttrib2d glad_glVertexAttrib2d +typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVPROC)(GLuint index, const GLdouble *v); +GLAPI PFNGLVERTEXATTRIB2DVPROC glad_glVertexAttrib2dv; +#define glVertexAttrib2dv glad_glVertexAttrib2dv +typedef void (APIENTRYP PFNGLVERTEXATTRIB2FPROC)(GLuint index, GLfloat x, GLfloat y); +GLAPI PFNGLVERTEXATTRIB2FPROC glad_glVertexAttrib2f; +#define glVertexAttrib2f glad_glVertexAttrib2f +typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVPROC)(GLuint index, const GLfloat *v); +GLAPI PFNGLVERTEXATTRIB2FVPROC glad_glVertexAttrib2fv; +#define glVertexAttrib2fv glad_glVertexAttrib2fv +typedef void (APIENTRYP PFNGLVERTEXATTRIB2SPROC)(GLuint index, GLshort x, GLshort y); +GLAPI PFNGLVERTEXATTRIB2SPROC glad_glVertexAttrib2s; +#define glVertexAttrib2s glad_glVertexAttrib2s +typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVPROC)(GLuint index, const GLshort *v); +GLAPI PFNGLVERTEXATTRIB2SVPROC glad_glVertexAttrib2sv; +#define glVertexAttrib2sv glad_glVertexAttrib2sv +typedef void (APIENTRYP PFNGLVERTEXATTRIB3DPROC)(GLuint index, GLdouble x, GLdouble y, GLdouble z); +GLAPI PFNGLVERTEXATTRIB3DPROC glad_glVertexAttrib3d; +#define glVertexAttrib3d glad_glVertexAttrib3d +typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVPROC)(GLuint index, const GLdouble *v); +GLAPI PFNGLVERTEXATTRIB3DVPROC glad_glVertexAttrib3dv; +#define glVertexAttrib3dv glad_glVertexAttrib3dv +typedef void (APIENTRYP PFNGLVERTEXATTRIB3FPROC)(GLuint index, GLfloat x, GLfloat y, GLfloat z); +GLAPI PFNGLVERTEXATTRIB3FPROC glad_glVertexAttrib3f; +#define glVertexAttrib3f glad_glVertexAttrib3f +typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVPROC)(GLuint index, const GLfloat *v); +GLAPI PFNGLVERTEXATTRIB3FVPROC glad_glVertexAttrib3fv; +#define glVertexAttrib3fv glad_glVertexAttrib3fv +typedef void (APIENTRYP PFNGLVERTEXATTRIB3SPROC)(GLuint index, GLshort x, GLshort y, GLshort z); +GLAPI PFNGLVERTEXATTRIB3SPROC glad_glVertexAttrib3s; +#define glVertexAttrib3s glad_glVertexAttrib3s +typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVPROC)(GLuint index, const GLshort *v); +GLAPI PFNGLVERTEXATTRIB3SVPROC glad_glVertexAttrib3sv; +#define glVertexAttrib3sv glad_glVertexAttrib3sv +typedef void (APIENTRYP PFNGLVERTEXATTRIB4NBVPROC)(GLuint index, const GLbyte *v); +GLAPI PFNGLVERTEXATTRIB4NBVPROC glad_glVertexAttrib4Nbv; +#define glVertexAttrib4Nbv glad_glVertexAttrib4Nbv +typedef void (APIENTRYP PFNGLVERTEXATTRIB4NIVPROC)(GLuint index, const GLint *v); +GLAPI PFNGLVERTEXATTRIB4NIVPROC glad_glVertexAttrib4Niv; +#define glVertexAttrib4Niv glad_glVertexAttrib4Niv +typedef void (APIENTRYP PFNGLVERTEXATTRIB4NSVPROC)(GLuint index, const GLshort *v); +GLAPI PFNGLVERTEXATTRIB4NSVPROC glad_glVertexAttrib4Nsv; +#define glVertexAttrib4Nsv glad_glVertexAttrib4Nsv +typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBPROC)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); +GLAPI PFNGLVERTEXATTRIB4NUBPROC glad_glVertexAttrib4Nub; +#define glVertexAttrib4Nub glad_glVertexAttrib4Nub +typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBVPROC)(GLuint index, const GLubyte *v); +GLAPI PFNGLVERTEXATTRIB4NUBVPROC glad_glVertexAttrib4Nubv; +#define glVertexAttrib4Nubv glad_glVertexAttrib4Nubv +typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUIVPROC)(GLuint index, const GLuint *v); +GLAPI PFNGLVERTEXATTRIB4NUIVPROC glad_glVertexAttrib4Nuiv; +#define glVertexAttrib4Nuiv glad_glVertexAttrib4Nuiv +typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUSVPROC)(GLuint index, const GLushort *v); +GLAPI PFNGLVERTEXATTRIB4NUSVPROC glad_glVertexAttrib4Nusv; +#define glVertexAttrib4Nusv glad_glVertexAttrib4Nusv +typedef void (APIENTRYP PFNGLVERTEXATTRIB4BVPROC)(GLuint index, const GLbyte *v); +GLAPI PFNGLVERTEXATTRIB4BVPROC glad_glVertexAttrib4bv; +#define glVertexAttrib4bv glad_glVertexAttrib4bv +typedef void (APIENTRYP PFNGLVERTEXATTRIB4DPROC)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); +GLAPI PFNGLVERTEXATTRIB4DPROC glad_glVertexAttrib4d; +#define glVertexAttrib4d glad_glVertexAttrib4d +typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVPROC)(GLuint index, const GLdouble *v); +GLAPI PFNGLVERTEXATTRIB4DVPROC glad_glVertexAttrib4dv; +#define glVertexAttrib4dv glad_glVertexAttrib4dv +typedef void (APIENTRYP PFNGLVERTEXATTRIB4FPROC)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); +GLAPI PFNGLVERTEXATTRIB4FPROC glad_glVertexAttrib4f; +#define glVertexAttrib4f glad_glVertexAttrib4f +typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVPROC)(GLuint index, const GLfloat *v); +GLAPI PFNGLVERTEXATTRIB4FVPROC glad_glVertexAttrib4fv; +#define glVertexAttrib4fv glad_glVertexAttrib4fv +typedef void (APIENTRYP PFNGLVERTEXATTRIB4IVPROC)(GLuint index, const GLint *v); +GLAPI PFNGLVERTEXATTRIB4IVPROC glad_glVertexAttrib4iv; +#define glVertexAttrib4iv glad_glVertexAttrib4iv +typedef void (APIENTRYP PFNGLVERTEXATTRIB4SPROC)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); +GLAPI PFNGLVERTEXATTRIB4SPROC glad_glVertexAttrib4s; +#define glVertexAttrib4s glad_glVertexAttrib4s +typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVPROC)(GLuint index, const GLshort *v); +GLAPI PFNGLVERTEXATTRIB4SVPROC glad_glVertexAttrib4sv; +#define glVertexAttrib4sv glad_glVertexAttrib4sv +typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVPROC)(GLuint index, const GLubyte *v); +GLAPI PFNGLVERTEXATTRIB4UBVPROC glad_glVertexAttrib4ubv; +#define glVertexAttrib4ubv glad_glVertexAttrib4ubv +typedef void (APIENTRYP PFNGLVERTEXATTRIB4UIVPROC)(GLuint index, const GLuint *v); +GLAPI PFNGLVERTEXATTRIB4UIVPROC glad_glVertexAttrib4uiv; +#define glVertexAttrib4uiv glad_glVertexAttrib4uiv +typedef void (APIENTRYP PFNGLVERTEXATTRIB4USVPROC)(GLuint index, const GLushort *v); +GLAPI PFNGLVERTEXATTRIB4USVPROC glad_glVertexAttrib4usv; +#define glVertexAttrib4usv glad_glVertexAttrib4usv +typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERPROC)(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void *pointer); +GLAPI PFNGLVERTEXATTRIBPOINTERPROC glad_glVertexAttribPointer; +#define glVertexAttribPointer glad_glVertexAttribPointer +#endif +#ifndef GL_VERSION_2_1 +#define GL_VERSION_2_1 1 +GLAPI int GLAD_GL_VERSION_2_1; +typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X3FVPROC)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); +GLAPI PFNGLUNIFORMMATRIX2X3FVPROC glad_glUniformMatrix2x3fv; +#define glUniformMatrix2x3fv glad_glUniformMatrix2x3fv +typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X2FVPROC)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); +GLAPI PFNGLUNIFORMMATRIX3X2FVPROC glad_glUniformMatrix3x2fv; +#define glUniformMatrix3x2fv glad_glUniformMatrix3x2fv +typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X4FVPROC)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); +GLAPI PFNGLUNIFORMMATRIX2X4FVPROC glad_glUniformMatrix2x4fv; +#define glUniformMatrix2x4fv glad_glUniformMatrix2x4fv +typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X2FVPROC)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); +GLAPI PFNGLUNIFORMMATRIX4X2FVPROC glad_glUniformMatrix4x2fv; +#define glUniformMatrix4x2fv glad_glUniformMatrix4x2fv +typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X4FVPROC)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); +GLAPI PFNGLUNIFORMMATRIX3X4FVPROC glad_glUniformMatrix3x4fv; +#define glUniformMatrix3x4fv glad_glUniformMatrix3x4fv +typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X3FVPROC)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); +GLAPI PFNGLUNIFORMMATRIX4X3FVPROC glad_glUniformMatrix4x3fv; +#define glUniformMatrix4x3fv glad_glUniformMatrix4x3fv +#endif +#ifndef GL_VERSION_3_0 +#define GL_VERSION_3_0 1 +GLAPI int GLAD_GL_VERSION_3_0; +typedef void (APIENTRYP PFNGLCOLORMASKIPROC)(GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a); +GLAPI PFNGLCOLORMASKIPROC glad_glColorMaski; +#define glColorMaski glad_glColorMaski +typedef void (APIENTRYP PFNGLGETBOOLEANI_VPROC)(GLenum target, GLuint index, GLboolean *data); +GLAPI PFNGLGETBOOLEANI_VPROC glad_glGetBooleani_v; +#define glGetBooleani_v glad_glGetBooleani_v +typedef void (APIENTRYP PFNGLGETINTEGERI_VPROC)(GLenum target, GLuint index, GLint *data); +GLAPI PFNGLGETINTEGERI_VPROC glad_glGetIntegeri_v; +#define glGetIntegeri_v glad_glGetIntegeri_v +typedef void (APIENTRYP PFNGLENABLEIPROC)(GLenum target, GLuint index); +GLAPI PFNGLENABLEIPROC glad_glEnablei; +#define glEnablei glad_glEnablei +typedef void (APIENTRYP PFNGLDISABLEIPROC)(GLenum target, GLuint index); +GLAPI PFNGLDISABLEIPROC glad_glDisablei; +#define glDisablei glad_glDisablei +typedef GLboolean (APIENTRYP PFNGLISENABLEDIPROC)(GLenum target, GLuint index); +GLAPI PFNGLISENABLEDIPROC glad_glIsEnabledi; +#define glIsEnabledi glad_glIsEnabledi +typedef void (APIENTRYP PFNGLBEGINTRANSFORMFEEDBACKPROC)(GLenum primitiveMode); +GLAPI PFNGLBEGINTRANSFORMFEEDBACKPROC glad_glBeginTransformFeedback; +#define glBeginTransformFeedback glad_glBeginTransformFeedback +typedef void (APIENTRYP PFNGLENDTRANSFORMFEEDBACKPROC)(void); +GLAPI PFNGLENDTRANSFORMFEEDBACKPROC glad_glEndTransformFeedback; +#define glEndTransformFeedback glad_glEndTransformFeedback +typedef void (APIENTRYP PFNGLBINDBUFFERRANGEPROC)(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size); +GLAPI PFNGLBINDBUFFERRANGEPROC glad_glBindBufferRange; +#define glBindBufferRange glad_glBindBufferRange +typedef void (APIENTRYP PFNGLBINDBUFFERBASEPROC)(GLenum target, GLuint index, GLuint buffer); +GLAPI PFNGLBINDBUFFERBASEPROC glad_glBindBufferBase; +#define glBindBufferBase glad_glBindBufferBase +typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKVARYINGSPROC)(GLuint program, GLsizei count, const GLchar *const*varyings, GLenum bufferMode); +GLAPI PFNGLTRANSFORMFEEDBACKVARYINGSPROC glad_glTransformFeedbackVaryings; +#define glTransformFeedbackVaryings glad_glTransformFeedbackVaryings +typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKVARYINGPROC)(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name); +GLAPI PFNGLGETTRANSFORMFEEDBACKVARYINGPROC glad_glGetTransformFeedbackVarying; +#define glGetTransformFeedbackVarying glad_glGetTransformFeedbackVarying +typedef void (APIENTRYP PFNGLCLAMPCOLORPROC)(GLenum target, GLenum clamp); +GLAPI PFNGLCLAMPCOLORPROC glad_glClampColor; +#define glClampColor glad_glClampColor +typedef void (APIENTRYP PFNGLBEGINCONDITIONALRENDERPROC)(GLuint id, GLenum mode); +GLAPI PFNGLBEGINCONDITIONALRENDERPROC glad_glBeginConditionalRender; +#define glBeginConditionalRender glad_glBeginConditionalRender +typedef void (APIENTRYP PFNGLENDCONDITIONALRENDERPROC)(void); +GLAPI PFNGLENDCONDITIONALRENDERPROC glad_glEndConditionalRender; +#define glEndConditionalRender glad_glEndConditionalRender +typedef void (APIENTRYP PFNGLVERTEXATTRIBIPOINTERPROC)(GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer); +GLAPI PFNGLVERTEXATTRIBIPOINTERPROC glad_glVertexAttribIPointer; +#define glVertexAttribIPointer glad_glVertexAttribIPointer +typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIIVPROC)(GLuint index, GLenum pname, GLint *params); +GLAPI PFNGLGETVERTEXATTRIBIIVPROC glad_glGetVertexAttribIiv; +#define glGetVertexAttribIiv glad_glGetVertexAttribIiv +typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIUIVPROC)(GLuint index, GLenum pname, GLuint *params); +GLAPI PFNGLGETVERTEXATTRIBIUIVPROC glad_glGetVertexAttribIuiv; +#define glGetVertexAttribIuiv glad_glGetVertexAttribIuiv +typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IPROC)(GLuint index, GLint x); +GLAPI PFNGLVERTEXATTRIBI1IPROC glad_glVertexAttribI1i; +#define glVertexAttribI1i glad_glVertexAttribI1i +typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IPROC)(GLuint index, GLint x, GLint y); +GLAPI PFNGLVERTEXATTRIBI2IPROC glad_glVertexAttribI2i; +#define glVertexAttribI2i glad_glVertexAttribI2i +typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IPROC)(GLuint index, GLint x, GLint y, GLint z); +GLAPI PFNGLVERTEXATTRIBI3IPROC glad_glVertexAttribI3i; +#define glVertexAttribI3i glad_glVertexAttribI3i +typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IPROC)(GLuint index, GLint x, GLint y, GLint z, GLint w); +GLAPI PFNGLVERTEXATTRIBI4IPROC glad_glVertexAttribI4i; +#define glVertexAttribI4i glad_glVertexAttribI4i +typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIPROC)(GLuint index, GLuint x); +GLAPI PFNGLVERTEXATTRIBI1UIPROC glad_glVertexAttribI1ui; +#define glVertexAttribI1ui glad_glVertexAttribI1ui +typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIPROC)(GLuint index, GLuint x, GLuint y); +GLAPI PFNGLVERTEXATTRIBI2UIPROC glad_glVertexAttribI2ui; +#define glVertexAttribI2ui glad_glVertexAttribI2ui +typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIPROC)(GLuint index, GLuint x, GLuint y, GLuint z); +GLAPI PFNGLVERTEXATTRIBI3UIPROC glad_glVertexAttribI3ui; +#define glVertexAttribI3ui glad_glVertexAttribI3ui +typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIPROC)(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); +GLAPI PFNGLVERTEXATTRIBI4UIPROC glad_glVertexAttribI4ui; +#define glVertexAttribI4ui glad_glVertexAttribI4ui +typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IVPROC)(GLuint index, const GLint *v); +GLAPI PFNGLVERTEXATTRIBI1IVPROC glad_glVertexAttribI1iv; +#define glVertexAttribI1iv glad_glVertexAttribI1iv +typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IVPROC)(GLuint index, const GLint *v); +GLAPI PFNGLVERTEXATTRIBI2IVPROC glad_glVertexAttribI2iv; +#define glVertexAttribI2iv glad_glVertexAttribI2iv +typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IVPROC)(GLuint index, const GLint *v); +GLAPI PFNGLVERTEXATTRIBI3IVPROC glad_glVertexAttribI3iv; +#define glVertexAttribI3iv glad_glVertexAttribI3iv +typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IVPROC)(GLuint index, const GLint *v); +GLAPI PFNGLVERTEXATTRIBI4IVPROC glad_glVertexAttribI4iv; +#define glVertexAttribI4iv glad_glVertexAttribI4iv +typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIVPROC)(GLuint index, const GLuint *v); +GLAPI PFNGLVERTEXATTRIBI1UIVPROC glad_glVertexAttribI1uiv; +#define glVertexAttribI1uiv glad_glVertexAttribI1uiv +typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIVPROC)(GLuint index, const GLuint *v); +GLAPI PFNGLVERTEXATTRIBI2UIVPROC glad_glVertexAttribI2uiv; +#define glVertexAttribI2uiv glad_glVertexAttribI2uiv +typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIVPROC)(GLuint index, const GLuint *v); +GLAPI PFNGLVERTEXATTRIBI3UIVPROC glad_glVertexAttribI3uiv; +#define glVertexAttribI3uiv glad_glVertexAttribI3uiv +typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIVPROC)(GLuint index, const GLuint *v); +GLAPI PFNGLVERTEXATTRIBI4UIVPROC glad_glVertexAttribI4uiv; +#define glVertexAttribI4uiv glad_glVertexAttribI4uiv +typedef void (APIENTRYP PFNGLVERTEXATTRIBI4BVPROC)(GLuint index, const GLbyte *v); +GLAPI PFNGLVERTEXATTRIBI4BVPROC glad_glVertexAttribI4bv; +#define glVertexAttribI4bv glad_glVertexAttribI4bv +typedef void (APIENTRYP PFNGLVERTEXATTRIBI4SVPROC)(GLuint index, const GLshort *v); +GLAPI PFNGLVERTEXATTRIBI4SVPROC glad_glVertexAttribI4sv; +#define glVertexAttribI4sv glad_glVertexAttribI4sv +typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UBVPROC)(GLuint index, const GLubyte *v); +GLAPI PFNGLVERTEXATTRIBI4UBVPROC glad_glVertexAttribI4ubv; +#define glVertexAttribI4ubv glad_glVertexAttribI4ubv +typedef void (APIENTRYP PFNGLVERTEXATTRIBI4USVPROC)(GLuint index, const GLushort *v); +GLAPI PFNGLVERTEXATTRIBI4USVPROC glad_glVertexAttribI4usv; +#define glVertexAttribI4usv glad_glVertexAttribI4usv +typedef void (APIENTRYP PFNGLGETUNIFORMUIVPROC)(GLuint program, GLint location, GLuint *params); +GLAPI PFNGLGETUNIFORMUIVPROC glad_glGetUniformuiv; +#define glGetUniformuiv glad_glGetUniformuiv +typedef void (APIENTRYP PFNGLBINDFRAGDATALOCATIONPROC)(GLuint program, GLuint color, const GLchar *name); +GLAPI PFNGLBINDFRAGDATALOCATIONPROC glad_glBindFragDataLocation; +#define glBindFragDataLocation glad_glBindFragDataLocation +typedef GLint (APIENTRYP PFNGLGETFRAGDATALOCATIONPROC)(GLuint program, const GLchar *name); +GLAPI PFNGLGETFRAGDATALOCATIONPROC glad_glGetFragDataLocation; +#define glGetFragDataLocation glad_glGetFragDataLocation +typedef void (APIENTRYP PFNGLUNIFORM1UIPROC)(GLint location, GLuint v0); +GLAPI PFNGLUNIFORM1UIPROC glad_glUniform1ui; +#define glUniform1ui glad_glUniform1ui +typedef void (APIENTRYP PFNGLUNIFORM2UIPROC)(GLint location, GLuint v0, GLuint v1); +GLAPI PFNGLUNIFORM2UIPROC glad_glUniform2ui; +#define glUniform2ui glad_glUniform2ui +typedef void (APIENTRYP PFNGLUNIFORM3UIPROC)(GLint location, GLuint v0, GLuint v1, GLuint v2); +GLAPI PFNGLUNIFORM3UIPROC glad_glUniform3ui; +#define glUniform3ui glad_glUniform3ui +typedef void (APIENTRYP PFNGLUNIFORM4UIPROC)(GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3); +GLAPI PFNGLUNIFORM4UIPROC glad_glUniform4ui; +#define glUniform4ui glad_glUniform4ui +typedef void (APIENTRYP PFNGLUNIFORM1UIVPROC)(GLint location, GLsizei count, const GLuint *value); +GLAPI PFNGLUNIFORM1UIVPROC glad_glUniform1uiv; +#define glUniform1uiv glad_glUniform1uiv +typedef void (APIENTRYP PFNGLUNIFORM2UIVPROC)(GLint location, GLsizei count, const GLuint *value); +GLAPI PFNGLUNIFORM2UIVPROC glad_glUniform2uiv; +#define glUniform2uiv glad_glUniform2uiv +typedef void (APIENTRYP PFNGLUNIFORM3UIVPROC)(GLint location, GLsizei count, const GLuint *value); +GLAPI PFNGLUNIFORM3UIVPROC glad_glUniform3uiv; +#define glUniform3uiv glad_glUniform3uiv +typedef void (APIENTRYP PFNGLUNIFORM4UIVPROC)(GLint location, GLsizei count, const GLuint *value); +GLAPI PFNGLUNIFORM4UIVPROC glad_glUniform4uiv; +#define glUniform4uiv glad_glUniform4uiv +typedef void (APIENTRYP PFNGLTEXPARAMETERIIVPROC)(GLenum target, GLenum pname, const GLint *params); +GLAPI PFNGLTEXPARAMETERIIVPROC glad_glTexParameterIiv; +#define glTexParameterIiv glad_glTexParameterIiv +typedef void (APIENTRYP PFNGLTEXPARAMETERIUIVPROC)(GLenum target, GLenum pname, const GLuint *params); +GLAPI PFNGLTEXPARAMETERIUIVPROC glad_glTexParameterIuiv; +#define glTexParameterIuiv glad_glTexParameterIuiv +typedef void (APIENTRYP PFNGLGETTEXPARAMETERIIVPROC)(GLenum target, GLenum pname, GLint *params); +GLAPI PFNGLGETTEXPARAMETERIIVPROC glad_glGetTexParameterIiv; +#define glGetTexParameterIiv glad_glGetTexParameterIiv +typedef void (APIENTRYP PFNGLGETTEXPARAMETERIUIVPROC)(GLenum target, GLenum pname, GLuint *params); +GLAPI PFNGLGETTEXPARAMETERIUIVPROC glad_glGetTexParameterIuiv; +#define glGetTexParameterIuiv glad_glGetTexParameterIuiv +typedef void (APIENTRYP PFNGLCLEARBUFFERIVPROC)(GLenum buffer, GLint drawbuffer, const GLint *value); +GLAPI PFNGLCLEARBUFFERIVPROC glad_glClearBufferiv; +#define glClearBufferiv glad_glClearBufferiv +typedef void (APIENTRYP PFNGLCLEARBUFFERUIVPROC)(GLenum buffer, GLint drawbuffer, const GLuint *value); +GLAPI PFNGLCLEARBUFFERUIVPROC glad_glClearBufferuiv; +#define glClearBufferuiv glad_glClearBufferuiv +typedef void (APIENTRYP PFNGLCLEARBUFFERFVPROC)(GLenum buffer, GLint drawbuffer, const GLfloat *value); +GLAPI PFNGLCLEARBUFFERFVPROC glad_glClearBufferfv; +#define glClearBufferfv glad_glClearBufferfv +typedef void (APIENTRYP PFNGLCLEARBUFFERFIPROC)(GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil); +GLAPI PFNGLCLEARBUFFERFIPROC glad_glClearBufferfi; +#define glClearBufferfi glad_glClearBufferfi +typedef const GLubyte * (APIENTRYP PFNGLGETSTRINGIPROC)(GLenum name, GLuint index); +GLAPI PFNGLGETSTRINGIPROC glad_glGetStringi; +#define glGetStringi glad_glGetStringi +typedef GLboolean (APIENTRYP PFNGLISRENDERBUFFERPROC)(GLuint renderbuffer); +GLAPI PFNGLISRENDERBUFFERPROC glad_glIsRenderbuffer; +#define glIsRenderbuffer glad_glIsRenderbuffer +typedef void (APIENTRYP PFNGLBINDRENDERBUFFERPROC)(GLenum target, GLuint renderbuffer); +GLAPI PFNGLBINDRENDERBUFFERPROC glad_glBindRenderbuffer; +#define glBindRenderbuffer glad_glBindRenderbuffer +typedef void (APIENTRYP PFNGLDELETERENDERBUFFERSPROC)(GLsizei n, const GLuint *renderbuffers); +GLAPI PFNGLDELETERENDERBUFFERSPROC glad_glDeleteRenderbuffers; +#define glDeleteRenderbuffers glad_glDeleteRenderbuffers +typedef void (APIENTRYP PFNGLGENRENDERBUFFERSPROC)(GLsizei n, GLuint *renderbuffers); +GLAPI PFNGLGENRENDERBUFFERSPROC glad_glGenRenderbuffers; +#define glGenRenderbuffers glad_glGenRenderbuffers +typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEPROC)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height); +GLAPI PFNGLRENDERBUFFERSTORAGEPROC glad_glRenderbufferStorage; +#define glRenderbufferStorage glad_glRenderbufferStorage +typedef void (APIENTRYP PFNGLGETRENDERBUFFERPARAMETERIVPROC)(GLenum target, GLenum pname, GLint *params); +GLAPI PFNGLGETRENDERBUFFERPARAMETERIVPROC glad_glGetRenderbufferParameteriv; +#define glGetRenderbufferParameteriv glad_glGetRenderbufferParameteriv +typedef GLboolean (APIENTRYP PFNGLISFRAMEBUFFERPROC)(GLuint framebuffer); +GLAPI PFNGLISFRAMEBUFFERPROC glad_glIsFramebuffer; +#define glIsFramebuffer glad_glIsFramebuffer +typedef void (APIENTRYP PFNGLBINDFRAMEBUFFERPROC)(GLenum target, GLuint framebuffer); +GLAPI PFNGLBINDFRAMEBUFFERPROC glad_glBindFramebuffer; +#define glBindFramebuffer glad_glBindFramebuffer +typedef void (APIENTRYP PFNGLDELETEFRAMEBUFFERSPROC)(GLsizei n, const GLuint *framebuffers); +GLAPI PFNGLDELETEFRAMEBUFFERSPROC glad_glDeleteFramebuffers; +#define glDeleteFramebuffers glad_glDeleteFramebuffers +typedef void (APIENTRYP PFNGLGENFRAMEBUFFERSPROC)(GLsizei n, GLuint *framebuffers); +GLAPI PFNGLGENFRAMEBUFFERSPROC glad_glGenFramebuffers; +#define glGenFramebuffers glad_glGenFramebuffers +typedef GLenum (APIENTRYP PFNGLCHECKFRAMEBUFFERSTATUSPROC)(GLenum target); +GLAPI PFNGLCHECKFRAMEBUFFERSTATUSPROC glad_glCheckFramebufferStatus; +#define glCheckFramebufferStatus glad_glCheckFramebufferStatus +typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE1DPROC)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); +GLAPI PFNGLFRAMEBUFFERTEXTURE1DPROC glad_glFramebufferTexture1D; +#define glFramebufferTexture1D glad_glFramebufferTexture1D +typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DPROC)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); +GLAPI PFNGLFRAMEBUFFERTEXTURE2DPROC glad_glFramebufferTexture2D; +#define glFramebufferTexture2D glad_glFramebufferTexture2D +typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE3DPROC)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); +GLAPI PFNGLFRAMEBUFFERTEXTURE3DPROC glad_glFramebufferTexture3D; +#define glFramebufferTexture3D glad_glFramebufferTexture3D +typedef void (APIENTRYP PFNGLFRAMEBUFFERRENDERBUFFERPROC)(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); +GLAPI PFNGLFRAMEBUFFERRENDERBUFFERPROC glad_glFramebufferRenderbuffer; +#define glFramebufferRenderbuffer glad_glFramebufferRenderbuffer +typedef void (APIENTRYP PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC)(GLenum target, GLenum attachment, GLenum pname, GLint *params); +GLAPI PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC glad_glGetFramebufferAttachmentParameteriv; +#define glGetFramebufferAttachmentParameteriv glad_glGetFramebufferAttachmentParameteriv +typedef void (APIENTRYP PFNGLGENERATEMIPMAPPROC)(GLenum target); +GLAPI PFNGLGENERATEMIPMAPPROC glad_glGenerateMipmap; +#define glGenerateMipmap glad_glGenerateMipmap +typedef void (APIENTRYP PFNGLBLITFRAMEBUFFERPROC)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); +GLAPI PFNGLBLITFRAMEBUFFERPROC glad_glBlitFramebuffer; +#define glBlitFramebuffer glad_glBlitFramebuffer +typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC)(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); +GLAPI PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC glad_glRenderbufferStorageMultisample; +#define glRenderbufferStorageMultisample glad_glRenderbufferStorageMultisample +typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYERPROC)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); +GLAPI PFNGLFRAMEBUFFERTEXTURELAYERPROC glad_glFramebufferTextureLayer; +#define glFramebufferTextureLayer glad_glFramebufferTextureLayer +typedef void * (APIENTRYP PFNGLMAPBUFFERRANGEPROC)(GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access); +GLAPI PFNGLMAPBUFFERRANGEPROC glad_glMapBufferRange; +#define glMapBufferRange glad_glMapBufferRange +typedef void (APIENTRYP PFNGLFLUSHMAPPEDBUFFERRANGEPROC)(GLenum target, GLintptr offset, GLsizeiptr length); +GLAPI PFNGLFLUSHMAPPEDBUFFERRANGEPROC glad_glFlushMappedBufferRange; +#define glFlushMappedBufferRange glad_glFlushMappedBufferRange +typedef void (APIENTRYP PFNGLBINDVERTEXARRAYPROC)(GLuint array); +GLAPI PFNGLBINDVERTEXARRAYPROC glad_glBindVertexArray; +#define glBindVertexArray glad_glBindVertexArray +typedef void (APIENTRYP PFNGLDELETEVERTEXARRAYSPROC)(GLsizei n, const GLuint *arrays); +GLAPI PFNGLDELETEVERTEXARRAYSPROC glad_glDeleteVertexArrays; +#define glDeleteVertexArrays glad_glDeleteVertexArrays +typedef void (APIENTRYP PFNGLGENVERTEXARRAYSPROC)(GLsizei n, GLuint *arrays); +GLAPI PFNGLGENVERTEXARRAYSPROC glad_glGenVertexArrays; +#define glGenVertexArrays glad_glGenVertexArrays +typedef GLboolean (APIENTRYP PFNGLISVERTEXARRAYPROC)(GLuint array); +GLAPI PFNGLISVERTEXARRAYPROC glad_glIsVertexArray; +#define glIsVertexArray glad_glIsVertexArray +#endif +#ifndef GL_VERSION_3_1 +#define GL_VERSION_3_1 1 +GLAPI int GLAD_GL_VERSION_3_1; +typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDPROC)(GLenum mode, GLint first, GLsizei count, GLsizei instancecount); +GLAPI PFNGLDRAWARRAYSINSTANCEDPROC glad_glDrawArraysInstanced; +#define glDrawArraysInstanced glad_glDrawArraysInstanced +typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDPROC)(GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount); +GLAPI PFNGLDRAWELEMENTSINSTANCEDPROC glad_glDrawElementsInstanced; +#define glDrawElementsInstanced glad_glDrawElementsInstanced +typedef void (APIENTRYP PFNGLTEXBUFFERPROC)(GLenum target, GLenum internalformat, GLuint buffer); +GLAPI PFNGLTEXBUFFERPROC glad_glTexBuffer; +#define glTexBuffer glad_glTexBuffer +typedef void (APIENTRYP PFNGLPRIMITIVERESTARTINDEXPROC)(GLuint index); +GLAPI PFNGLPRIMITIVERESTARTINDEXPROC glad_glPrimitiveRestartIndex; +#define glPrimitiveRestartIndex glad_glPrimitiveRestartIndex +typedef void (APIENTRYP PFNGLCOPYBUFFERSUBDATAPROC)(GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size); +GLAPI PFNGLCOPYBUFFERSUBDATAPROC glad_glCopyBufferSubData; +#define glCopyBufferSubData glad_glCopyBufferSubData +typedef void (APIENTRYP PFNGLGETUNIFORMINDICESPROC)(GLuint program, GLsizei uniformCount, const GLchar *const*uniformNames, GLuint *uniformIndices); +GLAPI PFNGLGETUNIFORMINDICESPROC glad_glGetUniformIndices; +#define glGetUniformIndices glad_glGetUniformIndices +typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMSIVPROC)(GLuint program, GLsizei uniformCount, const GLuint *uniformIndices, GLenum pname, GLint *params); +GLAPI PFNGLGETACTIVEUNIFORMSIVPROC glad_glGetActiveUniformsiv; +#define glGetActiveUniformsiv glad_glGetActiveUniformsiv +typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMNAMEPROC)(GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformName); +GLAPI PFNGLGETACTIVEUNIFORMNAMEPROC glad_glGetActiveUniformName; +#define glGetActiveUniformName glad_glGetActiveUniformName +typedef GLuint (APIENTRYP PFNGLGETUNIFORMBLOCKINDEXPROC)(GLuint program, const GLchar *uniformBlockName); +GLAPI PFNGLGETUNIFORMBLOCKINDEXPROC glad_glGetUniformBlockIndex; +#define glGetUniformBlockIndex glad_glGetUniformBlockIndex +typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMBLOCKIVPROC)(GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint *params); +GLAPI PFNGLGETACTIVEUNIFORMBLOCKIVPROC glad_glGetActiveUniformBlockiv; +#define glGetActiveUniformBlockiv glad_glGetActiveUniformBlockiv +typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMBLOCKNAMEPROC)(GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformBlockName); +GLAPI PFNGLGETACTIVEUNIFORMBLOCKNAMEPROC glad_glGetActiveUniformBlockName; +#define glGetActiveUniformBlockName glad_glGetActiveUniformBlockName +typedef void (APIENTRYP PFNGLUNIFORMBLOCKBINDINGPROC)(GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding); +GLAPI PFNGLUNIFORMBLOCKBINDINGPROC glad_glUniformBlockBinding; +#define glUniformBlockBinding glad_glUniformBlockBinding +#endif +#ifndef GL_VERSION_3_2 +#define GL_VERSION_3_2 1 +GLAPI int GLAD_GL_VERSION_3_2; +typedef void (APIENTRYP PFNGLDRAWELEMENTSBASEVERTEXPROC)(GLenum mode, GLsizei count, GLenum type, const void *indices, GLint basevertex); +GLAPI PFNGLDRAWELEMENTSBASEVERTEXPROC glad_glDrawElementsBaseVertex; +#define glDrawElementsBaseVertex glad_glDrawElementsBaseVertex +typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSBASEVERTEXPROC)(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices, GLint basevertex); +GLAPI PFNGLDRAWRANGEELEMENTSBASEVERTEXPROC glad_glDrawRangeElementsBaseVertex; +#define glDrawRangeElementsBaseVertex glad_glDrawRangeElementsBaseVertex +typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC)(GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLint basevertex); +GLAPI PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC glad_glDrawElementsInstancedBaseVertex; +#define glDrawElementsInstancedBaseVertex glad_glDrawElementsInstancedBaseVertex +typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSBASEVERTEXPROC)(GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei drawcount, const GLint *basevertex); +GLAPI PFNGLMULTIDRAWELEMENTSBASEVERTEXPROC glad_glMultiDrawElementsBaseVertex; +#define glMultiDrawElementsBaseVertex glad_glMultiDrawElementsBaseVertex +typedef void (APIENTRYP PFNGLPROVOKINGVERTEXPROC)(GLenum mode); +GLAPI PFNGLPROVOKINGVERTEXPROC glad_glProvokingVertex; +#define glProvokingVertex glad_glProvokingVertex +typedef GLsync (APIENTRYP PFNGLFENCESYNCPROC)(GLenum condition, GLbitfield flags); +GLAPI PFNGLFENCESYNCPROC glad_glFenceSync; +#define glFenceSync glad_glFenceSync +typedef GLboolean (APIENTRYP PFNGLISSYNCPROC)(GLsync sync); +GLAPI PFNGLISSYNCPROC glad_glIsSync; +#define glIsSync glad_glIsSync +typedef void (APIENTRYP PFNGLDELETESYNCPROC)(GLsync sync); +GLAPI PFNGLDELETESYNCPROC glad_glDeleteSync; +#define glDeleteSync glad_glDeleteSync +typedef GLenum (APIENTRYP PFNGLCLIENTWAITSYNCPROC)(GLsync sync, GLbitfield flags, GLuint64 timeout); +GLAPI PFNGLCLIENTWAITSYNCPROC glad_glClientWaitSync; +#define glClientWaitSync glad_glClientWaitSync +typedef void (APIENTRYP PFNGLWAITSYNCPROC)(GLsync sync, GLbitfield flags, GLuint64 timeout); +GLAPI PFNGLWAITSYNCPROC glad_glWaitSync; +#define glWaitSync glad_glWaitSync +typedef void (APIENTRYP PFNGLGETINTEGER64VPROC)(GLenum pname, GLint64 *data); +GLAPI PFNGLGETINTEGER64VPROC glad_glGetInteger64v; +#define glGetInteger64v glad_glGetInteger64v +typedef void (APIENTRYP PFNGLGETSYNCIVPROC)(GLsync sync, GLenum pname, GLsizei count, GLsizei *length, GLint *values); +GLAPI PFNGLGETSYNCIVPROC glad_glGetSynciv; +#define glGetSynciv glad_glGetSynciv +typedef void (APIENTRYP PFNGLGETINTEGER64I_VPROC)(GLenum target, GLuint index, GLint64 *data); +GLAPI PFNGLGETINTEGER64I_VPROC glad_glGetInteger64i_v; +#define glGetInteger64i_v glad_glGetInteger64i_v +typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERI64VPROC)(GLenum target, GLenum pname, GLint64 *params); +GLAPI PFNGLGETBUFFERPARAMETERI64VPROC glad_glGetBufferParameteri64v; +#define glGetBufferParameteri64v glad_glGetBufferParameteri64v +typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREPROC)(GLenum target, GLenum attachment, GLuint texture, GLint level); +GLAPI PFNGLFRAMEBUFFERTEXTUREPROC glad_glFramebufferTexture; +#define glFramebufferTexture glad_glFramebufferTexture +typedef void (APIENTRYP PFNGLTEXIMAGE2DMULTISAMPLEPROC)(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations); +GLAPI PFNGLTEXIMAGE2DMULTISAMPLEPROC glad_glTexImage2DMultisample; +#define glTexImage2DMultisample glad_glTexImage2DMultisample +typedef void (APIENTRYP PFNGLTEXIMAGE3DMULTISAMPLEPROC)(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations); +GLAPI PFNGLTEXIMAGE3DMULTISAMPLEPROC glad_glTexImage3DMultisample; +#define glTexImage3DMultisample glad_glTexImage3DMultisample +typedef void (APIENTRYP PFNGLGETMULTISAMPLEFVPROC)(GLenum pname, GLuint index, GLfloat *val); +GLAPI PFNGLGETMULTISAMPLEFVPROC glad_glGetMultisamplefv; +#define glGetMultisamplefv glad_glGetMultisamplefv +typedef void (APIENTRYP PFNGLSAMPLEMASKIPROC)(GLuint maskNumber, GLbitfield mask); +GLAPI PFNGLSAMPLEMASKIPROC glad_glSampleMaski; +#define glSampleMaski glad_glSampleMaski +#endif +#ifndef GL_VERSION_3_3 +#define GL_VERSION_3_3 1 +GLAPI int GLAD_GL_VERSION_3_3; +typedef void (APIENTRYP PFNGLBINDFRAGDATALOCATIONINDEXEDPROC)(GLuint program, GLuint colorNumber, GLuint index, const GLchar *name); +GLAPI PFNGLBINDFRAGDATALOCATIONINDEXEDPROC glad_glBindFragDataLocationIndexed; +#define glBindFragDataLocationIndexed glad_glBindFragDataLocationIndexed +typedef GLint (APIENTRYP PFNGLGETFRAGDATAINDEXPROC)(GLuint program, const GLchar *name); +GLAPI PFNGLGETFRAGDATAINDEXPROC glad_glGetFragDataIndex; +#define glGetFragDataIndex glad_glGetFragDataIndex +typedef void (APIENTRYP PFNGLGENSAMPLERSPROC)(GLsizei count, GLuint *samplers); +GLAPI PFNGLGENSAMPLERSPROC glad_glGenSamplers; +#define glGenSamplers glad_glGenSamplers +typedef void (APIENTRYP PFNGLDELETESAMPLERSPROC)(GLsizei count, const GLuint *samplers); +GLAPI PFNGLDELETESAMPLERSPROC glad_glDeleteSamplers; +#define glDeleteSamplers glad_glDeleteSamplers +typedef GLboolean (APIENTRYP PFNGLISSAMPLERPROC)(GLuint sampler); +GLAPI PFNGLISSAMPLERPROC glad_glIsSampler; +#define glIsSampler glad_glIsSampler +typedef void (APIENTRYP PFNGLBINDSAMPLERPROC)(GLuint unit, GLuint sampler); +GLAPI PFNGLBINDSAMPLERPROC glad_glBindSampler; +#define glBindSampler glad_glBindSampler +typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIPROC)(GLuint sampler, GLenum pname, GLint param); +GLAPI PFNGLSAMPLERPARAMETERIPROC glad_glSamplerParameteri; +#define glSamplerParameteri glad_glSamplerParameteri +typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIVPROC)(GLuint sampler, GLenum pname, const GLint *param); +GLAPI PFNGLSAMPLERPARAMETERIVPROC glad_glSamplerParameteriv; +#define glSamplerParameteriv glad_glSamplerParameteriv +typedef void (APIENTRYP PFNGLSAMPLERPARAMETERFPROC)(GLuint sampler, GLenum pname, GLfloat param); +GLAPI PFNGLSAMPLERPARAMETERFPROC glad_glSamplerParameterf; +#define glSamplerParameterf glad_glSamplerParameterf +typedef void (APIENTRYP PFNGLSAMPLERPARAMETERFVPROC)(GLuint sampler, GLenum pname, const GLfloat *param); +GLAPI PFNGLSAMPLERPARAMETERFVPROC glad_glSamplerParameterfv; +#define glSamplerParameterfv glad_glSamplerParameterfv +typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIIVPROC)(GLuint sampler, GLenum pname, const GLint *param); +GLAPI PFNGLSAMPLERPARAMETERIIVPROC glad_glSamplerParameterIiv; +#define glSamplerParameterIiv glad_glSamplerParameterIiv +typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIUIVPROC)(GLuint sampler, GLenum pname, const GLuint *param); +GLAPI PFNGLSAMPLERPARAMETERIUIVPROC glad_glSamplerParameterIuiv; +#define glSamplerParameterIuiv glad_glSamplerParameterIuiv +typedef void (APIENTRYP PFNGLGETSAMPLERPARAMETERIVPROC)(GLuint sampler, GLenum pname, GLint *params); +GLAPI PFNGLGETSAMPLERPARAMETERIVPROC glad_glGetSamplerParameteriv; +#define glGetSamplerParameteriv glad_glGetSamplerParameteriv +typedef void (APIENTRYP PFNGLGETSAMPLERPARAMETERIIVPROC)(GLuint sampler, GLenum pname, GLint *params); +GLAPI PFNGLGETSAMPLERPARAMETERIIVPROC glad_glGetSamplerParameterIiv; +#define glGetSamplerParameterIiv glad_glGetSamplerParameterIiv +typedef void (APIENTRYP PFNGLGETSAMPLERPARAMETERFVPROC)(GLuint sampler, GLenum pname, GLfloat *params); +GLAPI PFNGLGETSAMPLERPARAMETERFVPROC glad_glGetSamplerParameterfv; +#define glGetSamplerParameterfv glad_glGetSamplerParameterfv +typedef void (APIENTRYP PFNGLGETSAMPLERPARAMETERIUIVPROC)(GLuint sampler, GLenum pname, GLuint *params); +GLAPI PFNGLGETSAMPLERPARAMETERIUIVPROC glad_glGetSamplerParameterIuiv; +#define glGetSamplerParameterIuiv glad_glGetSamplerParameterIuiv +typedef void (APIENTRYP PFNGLQUERYCOUNTERPROC)(GLuint id, GLenum target); +GLAPI PFNGLQUERYCOUNTERPROC glad_glQueryCounter; +#define glQueryCounter glad_glQueryCounter +typedef void (APIENTRYP PFNGLGETQUERYOBJECTI64VPROC)(GLuint id, GLenum pname, GLint64 *params); +GLAPI PFNGLGETQUERYOBJECTI64VPROC glad_glGetQueryObjecti64v; +#define glGetQueryObjecti64v glad_glGetQueryObjecti64v +typedef void (APIENTRYP PFNGLGETQUERYOBJECTUI64VPROC)(GLuint id, GLenum pname, GLuint64 *params); +GLAPI PFNGLGETQUERYOBJECTUI64VPROC glad_glGetQueryObjectui64v; +#define glGetQueryObjectui64v glad_glGetQueryObjectui64v +typedef void (APIENTRYP PFNGLVERTEXATTRIBDIVISORPROC)(GLuint index, GLuint divisor); +GLAPI PFNGLVERTEXATTRIBDIVISORPROC glad_glVertexAttribDivisor; +#define glVertexAttribDivisor glad_glVertexAttribDivisor +typedef void (APIENTRYP PFNGLVERTEXATTRIBP1UIPROC)(GLuint index, GLenum type, GLboolean normalized, GLuint value); +GLAPI PFNGLVERTEXATTRIBP1UIPROC glad_glVertexAttribP1ui; +#define glVertexAttribP1ui glad_glVertexAttribP1ui +typedef void (APIENTRYP PFNGLVERTEXATTRIBP1UIVPROC)(GLuint index, GLenum type, GLboolean normalized, const GLuint *value); +GLAPI PFNGLVERTEXATTRIBP1UIVPROC glad_glVertexAttribP1uiv; +#define glVertexAttribP1uiv glad_glVertexAttribP1uiv +typedef void (APIENTRYP PFNGLVERTEXATTRIBP2UIPROC)(GLuint index, GLenum type, GLboolean normalized, GLuint value); +GLAPI PFNGLVERTEXATTRIBP2UIPROC glad_glVertexAttribP2ui; +#define glVertexAttribP2ui glad_glVertexAttribP2ui +typedef void (APIENTRYP PFNGLVERTEXATTRIBP2UIVPROC)(GLuint index, GLenum type, GLboolean normalized, const GLuint *value); +GLAPI PFNGLVERTEXATTRIBP2UIVPROC glad_glVertexAttribP2uiv; +#define glVertexAttribP2uiv glad_glVertexAttribP2uiv +typedef void (APIENTRYP PFNGLVERTEXATTRIBP3UIPROC)(GLuint index, GLenum type, GLboolean normalized, GLuint value); +GLAPI PFNGLVERTEXATTRIBP3UIPROC glad_glVertexAttribP3ui; +#define glVertexAttribP3ui glad_glVertexAttribP3ui +typedef void (APIENTRYP PFNGLVERTEXATTRIBP3UIVPROC)(GLuint index, GLenum type, GLboolean normalized, const GLuint *value); +GLAPI PFNGLVERTEXATTRIBP3UIVPROC glad_glVertexAttribP3uiv; +#define glVertexAttribP3uiv glad_glVertexAttribP3uiv +typedef void (APIENTRYP PFNGLVERTEXATTRIBP4UIPROC)(GLuint index, GLenum type, GLboolean normalized, GLuint value); +GLAPI PFNGLVERTEXATTRIBP4UIPROC glad_glVertexAttribP4ui; +#define glVertexAttribP4ui glad_glVertexAttribP4ui +typedef void (APIENTRYP PFNGLVERTEXATTRIBP4UIVPROC)(GLuint index, GLenum type, GLboolean normalized, const GLuint *value); +GLAPI PFNGLVERTEXATTRIBP4UIVPROC glad_glVertexAttribP4uiv; +#define glVertexAttribP4uiv glad_glVertexAttribP4uiv +typedef void (APIENTRYP PFNGLVERTEXP2UIPROC)(GLenum type, GLuint value); +GLAPI PFNGLVERTEXP2UIPROC glad_glVertexP2ui; +#define glVertexP2ui glad_glVertexP2ui +typedef void (APIENTRYP PFNGLVERTEXP2UIVPROC)(GLenum type, const GLuint *value); +GLAPI PFNGLVERTEXP2UIVPROC glad_glVertexP2uiv; +#define glVertexP2uiv glad_glVertexP2uiv +typedef void (APIENTRYP PFNGLVERTEXP3UIPROC)(GLenum type, GLuint value); +GLAPI PFNGLVERTEXP3UIPROC glad_glVertexP3ui; +#define glVertexP3ui glad_glVertexP3ui +typedef void (APIENTRYP PFNGLVERTEXP3UIVPROC)(GLenum type, const GLuint *value); +GLAPI PFNGLVERTEXP3UIVPROC glad_glVertexP3uiv; +#define glVertexP3uiv glad_glVertexP3uiv +typedef void (APIENTRYP PFNGLVERTEXP4UIPROC)(GLenum type, GLuint value); +GLAPI PFNGLVERTEXP4UIPROC glad_glVertexP4ui; +#define glVertexP4ui glad_glVertexP4ui +typedef void (APIENTRYP PFNGLVERTEXP4UIVPROC)(GLenum type, const GLuint *value); +GLAPI PFNGLVERTEXP4UIVPROC glad_glVertexP4uiv; +#define glVertexP4uiv glad_glVertexP4uiv +typedef void (APIENTRYP PFNGLTEXCOORDP1UIPROC)(GLenum type, GLuint coords); +GLAPI PFNGLTEXCOORDP1UIPROC glad_glTexCoordP1ui; +#define glTexCoordP1ui glad_glTexCoordP1ui +typedef void (APIENTRYP PFNGLTEXCOORDP1UIVPROC)(GLenum type, const GLuint *coords); +GLAPI PFNGLTEXCOORDP1UIVPROC glad_glTexCoordP1uiv; +#define glTexCoordP1uiv glad_glTexCoordP1uiv +typedef void (APIENTRYP PFNGLTEXCOORDP2UIPROC)(GLenum type, GLuint coords); +GLAPI PFNGLTEXCOORDP2UIPROC glad_glTexCoordP2ui; +#define glTexCoordP2ui glad_glTexCoordP2ui +typedef void (APIENTRYP PFNGLTEXCOORDP2UIVPROC)(GLenum type, const GLuint *coords); +GLAPI PFNGLTEXCOORDP2UIVPROC glad_glTexCoordP2uiv; +#define glTexCoordP2uiv glad_glTexCoordP2uiv +typedef void (APIENTRYP PFNGLTEXCOORDP3UIPROC)(GLenum type, GLuint coords); +GLAPI PFNGLTEXCOORDP3UIPROC glad_glTexCoordP3ui; +#define glTexCoordP3ui glad_glTexCoordP3ui +typedef void (APIENTRYP PFNGLTEXCOORDP3UIVPROC)(GLenum type, const GLuint *coords); +GLAPI PFNGLTEXCOORDP3UIVPROC glad_glTexCoordP3uiv; +#define glTexCoordP3uiv glad_glTexCoordP3uiv +typedef void (APIENTRYP PFNGLTEXCOORDP4UIPROC)(GLenum type, GLuint coords); +GLAPI PFNGLTEXCOORDP4UIPROC glad_glTexCoordP4ui; +#define glTexCoordP4ui glad_glTexCoordP4ui +typedef void (APIENTRYP PFNGLTEXCOORDP4UIVPROC)(GLenum type, const GLuint *coords); +GLAPI PFNGLTEXCOORDP4UIVPROC glad_glTexCoordP4uiv; +#define glTexCoordP4uiv glad_glTexCoordP4uiv +typedef void (APIENTRYP PFNGLMULTITEXCOORDP1UIPROC)(GLenum texture, GLenum type, GLuint coords); +GLAPI PFNGLMULTITEXCOORDP1UIPROC glad_glMultiTexCoordP1ui; +#define glMultiTexCoordP1ui glad_glMultiTexCoordP1ui +typedef void (APIENTRYP PFNGLMULTITEXCOORDP1UIVPROC)(GLenum texture, GLenum type, const GLuint *coords); +GLAPI PFNGLMULTITEXCOORDP1UIVPROC glad_glMultiTexCoordP1uiv; +#define glMultiTexCoordP1uiv glad_glMultiTexCoordP1uiv +typedef void (APIENTRYP PFNGLMULTITEXCOORDP2UIPROC)(GLenum texture, GLenum type, GLuint coords); +GLAPI PFNGLMULTITEXCOORDP2UIPROC glad_glMultiTexCoordP2ui; +#define glMultiTexCoordP2ui glad_glMultiTexCoordP2ui +typedef void (APIENTRYP PFNGLMULTITEXCOORDP2UIVPROC)(GLenum texture, GLenum type, const GLuint *coords); +GLAPI PFNGLMULTITEXCOORDP2UIVPROC glad_glMultiTexCoordP2uiv; +#define glMultiTexCoordP2uiv glad_glMultiTexCoordP2uiv +typedef void (APIENTRYP PFNGLMULTITEXCOORDP3UIPROC)(GLenum texture, GLenum type, GLuint coords); +GLAPI PFNGLMULTITEXCOORDP3UIPROC glad_glMultiTexCoordP3ui; +#define glMultiTexCoordP3ui glad_glMultiTexCoordP3ui +typedef void (APIENTRYP PFNGLMULTITEXCOORDP3UIVPROC)(GLenum texture, GLenum type, const GLuint *coords); +GLAPI PFNGLMULTITEXCOORDP3UIVPROC glad_glMultiTexCoordP3uiv; +#define glMultiTexCoordP3uiv glad_glMultiTexCoordP3uiv +typedef void (APIENTRYP PFNGLMULTITEXCOORDP4UIPROC)(GLenum texture, GLenum type, GLuint coords); +GLAPI PFNGLMULTITEXCOORDP4UIPROC glad_glMultiTexCoordP4ui; +#define glMultiTexCoordP4ui glad_glMultiTexCoordP4ui +typedef void (APIENTRYP PFNGLMULTITEXCOORDP4UIVPROC)(GLenum texture, GLenum type, const GLuint *coords); +GLAPI PFNGLMULTITEXCOORDP4UIVPROC glad_glMultiTexCoordP4uiv; +#define glMultiTexCoordP4uiv glad_glMultiTexCoordP4uiv +typedef void (APIENTRYP PFNGLNORMALP3UIPROC)(GLenum type, GLuint coords); +GLAPI PFNGLNORMALP3UIPROC glad_glNormalP3ui; +#define glNormalP3ui glad_glNormalP3ui +typedef void (APIENTRYP PFNGLNORMALP3UIVPROC)(GLenum type, const GLuint *coords); +GLAPI PFNGLNORMALP3UIVPROC glad_glNormalP3uiv; +#define glNormalP3uiv glad_glNormalP3uiv +typedef void (APIENTRYP PFNGLCOLORP3UIPROC)(GLenum type, GLuint color); +GLAPI PFNGLCOLORP3UIPROC glad_glColorP3ui; +#define glColorP3ui glad_glColorP3ui +typedef void (APIENTRYP PFNGLCOLORP3UIVPROC)(GLenum type, const GLuint *color); +GLAPI PFNGLCOLORP3UIVPROC glad_glColorP3uiv; +#define glColorP3uiv glad_glColorP3uiv +typedef void (APIENTRYP PFNGLCOLORP4UIPROC)(GLenum type, GLuint color); +GLAPI PFNGLCOLORP4UIPROC glad_glColorP4ui; +#define glColorP4ui glad_glColorP4ui +typedef void (APIENTRYP PFNGLCOLORP4UIVPROC)(GLenum type, const GLuint *color); +GLAPI PFNGLCOLORP4UIVPROC glad_glColorP4uiv; +#define glColorP4uiv glad_glColorP4uiv +typedef void (APIENTRYP PFNGLSECONDARYCOLORP3UIPROC)(GLenum type, GLuint color); +GLAPI PFNGLSECONDARYCOLORP3UIPROC glad_glSecondaryColorP3ui; +#define glSecondaryColorP3ui glad_glSecondaryColorP3ui +typedef void (APIENTRYP PFNGLSECONDARYCOLORP3UIVPROC)(GLenum type, const GLuint *color); +GLAPI PFNGLSECONDARYCOLORP3UIVPROC glad_glSecondaryColorP3uiv; +#define glSecondaryColorP3uiv glad_glSecondaryColorP3uiv +#endif +#ifndef GL_VERSION_4_0 +#define GL_VERSION_4_0 1 +GLAPI int GLAD_GL_VERSION_4_0; +typedef void (APIENTRYP PFNGLMINSAMPLESHADINGPROC)(GLfloat value); +GLAPI PFNGLMINSAMPLESHADINGPROC glad_glMinSampleShading; +#define glMinSampleShading glad_glMinSampleShading +typedef void (APIENTRYP PFNGLBLENDEQUATIONIPROC)(GLuint buf, GLenum mode); +GLAPI PFNGLBLENDEQUATIONIPROC glad_glBlendEquationi; +#define glBlendEquationi glad_glBlendEquationi +typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEIPROC)(GLuint buf, GLenum modeRGB, GLenum modeAlpha); +GLAPI PFNGLBLENDEQUATIONSEPARATEIPROC glad_glBlendEquationSeparatei; +#define glBlendEquationSeparatei glad_glBlendEquationSeparatei +typedef void (APIENTRYP PFNGLBLENDFUNCIPROC)(GLuint buf, GLenum src, GLenum dst); +GLAPI PFNGLBLENDFUNCIPROC glad_glBlendFunci; +#define glBlendFunci glad_glBlendFunci +typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEIPROC)(GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha); +GLAPI PFNGLBLENDFUNCSEPARATEIPROC glad_glBlendFuncSeparatei; +#define glBlendFuncSeparatei glad_glBlendFuncSeparatei +typedef void (APIENTRYP PFNGLDRAWARRAYSINDIRECTPROC)(GLenum mode, const void *indirect); +GLAPI PFNGLDRAWARRAYSINDIRECTPROC glad_glDrawArraysIndirect; +#define glDrawArraysIndirect glad_glDrawArraysIndirect +typedef void (APIENTRYP PFNGLDRAWELEMENTSINDIRECTPROC)(GLenum mode, GLenum type, const void *indirect); +GLAPI PFNGLDRAWELEMENTSINDIRECTPROC glad_glDrawElementsIndirect; +#define glDrawElementsIndirect glad_glDrawElementsIndirect +typedef void (APIENTRYP PFNGLUNIFORM1DPROC)(GLint location, GLdouble x); +GLAPI PFNGLUNIFORM1DPROC glad_glUniform1d; +#define glUniform1d glad_glUniform1d +typedef void (APIENTRYP PFNGLUNIFORM2DPROC)(GLint location, GLdouble x, GLdouble y); +GLAPI PFNGLUNIFORM2DPROC glad_glUniform2d; +#define glUniform2d glad_glUniform2d +typedef void (APIENTRYP PFNGLUNIFORM3DPROC)(GLint location, GLdouble x, GLdouble y, GLdouble z); +GLAPI PFNGLUNIFORM3DPROC glad_glUniform3d; +#define glUniform3d glad_glUniform3d +typedef void (APIENTRYP PFNGLUNIFORM4DPROC)(GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w); +GLAPI PFNGLUNIFORM4DPROC glad_glUniform4d; +#define glUniform4d glad_glUniform4d +typedef void (APIENTRYP PFNGLUNIFORM1DVPROC)(GLint location, GLsizei count, const GLdouble *value); +GLAPI PFNGLUNIFORM1DVPROC glad_glUniform1dv; +#define glUniform1dv glad_glUniform1dv +typedef void (APIENTRYP PFNGLUNIFORM2DVPROC)(GLint location, GLsizei count, const GLdouble *value); +GLAPI PFNGLUNIFORM2DVPROC glad_glUniform2dv; +#define glUniform2dv glad_glUniform2dv +typedef void (APIENTRYP PFNGLUNIFORM3DVPROC)(GLint location, GLsizei count, const GLdouble *value); +GLAPI PFNGLUNIFORM3DVPROC glad_glUniform3dv; +#define glUniform3dv glad_glUniform3dv +typedef void (APIENTRYP PFNGLUNIFORM4DVPROC)(GLint location, GLsizei count, const GLdouble *value); +GLAPI PFNGLUNIFORM4DVPROC glad_glUniform4dv; +#define glUniform4dv glad_glUniform4dv +typedef void (APIENTRYP PFNGLUNIFORMMATRIX2DVPROC)(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); +GLAPI PFNGLUNIFORMMATRIX2DVPROC glad_glUniformMatrix2dv; +#define glUniformMatrix2dv glad_glUniformMatrix2dv +typedef void (APIENTRYP PFNGLUNIFORMMATRIX3DVPROC)(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); +GLAPI PFNGLUNIFORMMATRIX3DVPROC glad_glUniformMatrix3dv; +#define glUniformMatrix3dv glad_glUniformMatrix3dv +typedef void (APIENTRYP PFNGLUNIFORMMATRIX4DVPROC)(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); +GLAPI PFNGLUNIFORMMATRIX4DVPROC glad_glUniformMatrix4dv; +#define glUniformMatrix4dv glad_glUniformMatrix4dv +typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X3DVPROC)(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); +GLAPI PFNGLUNIFORMMATRIX2X3DVPROC glad_glUniformMatrix2x3dv; +#define glUniformMatrix2x3dv glad_glUniformMatrix2x3dv +typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X4DVPROC)(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); +GLAPI PFNGLUNIFORMMATRIX2X4DVPROC glad_glUniformMatrix2x4dv; +#define glUniformMatrix2x4dv glad_glUniformMatrix2x4dv +typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X2DVPROC)(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); +GLAPI PFNGLUNIFORMMATRIX3X2DVPROC glad_glUniformMatrix3x2dv; +#define glUniformMatrix3x2dv glad_glUniformMatrix3x2dv +typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X4DVPROC)(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); +GLAPI PFNGLUNIFORMMATRIX3X4DVPROC glad_glUniformMatrix3x4dv; +#define glUniformMatrix3x4dv glad_glUniformMatrix3x4dv +typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X2DVPROC)(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); +GLAPI PFNGLUNIFORMMATRIX4X2DVPROC glad_glUniformMatrix4x2dv; +#define glUniformMatrix4x2dv glad_glUniformMatrix4x2dv +typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X3DVPROC)(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); +GLAPI PFNGLUNIFORMMATRIX4X3DVPROC glad_glUniformMatrix4x3dv; +#define glUniformMatrix4x3dv glad_glUniformMatrix4x3dv +typedef void (APIENTRYP PFNGLGETUNIFORMDVPROC)(GLuint program, GLint location, GLdouble *params); +GLAPI PFNGLGETUNIFORMDVPROC glad_glGetUniformdv; +#define glGetUniformdv glad_glGetUniformdv +typedef GLint (APIENTRYP PFNGLGETSUBROUTINEUNIFORMLOCATIONPROC)(GLuint program, GLenum shadertype, const GLchar *name); +GLAPI PFNGLGETSUBROUTINEUNIFORMLOCATIONPROC glad_glGetSubroutineUniformLocation; +#define glGetSubroutineUniformLocation glad_glGetSubroutineUniformLocation +typedef GLuint (APIENTRYP PFNGLGETSUBROUTINEINDEXPROC)(GLuint program, GLenum shadertype, const GLchar *name); +GLAPI PFNGLGETSUBROUTINEINDEXPROC glad_glGetSubroutineIndex; +#define glGetSubroutineIndex glad_glGetSubroutineIndex +typedef void (APIENTRYP PFNGLGETACTIVESUBROUTINEUNIFORMIVPROC)(GLuint program, GLenum shadertype, GLuint index, GLenum pname, GLint *values); +GLAPI PFNGLGETACTIVESUBROUTINEUNIFORMIVPROC glad_glGetActiveSubroutineUniformiv; +#define glGetActiveSubroutineUniformiv glad_glGetActiveSubroutineUniformiv +typedef void (APIENTRYP PFNGLGETACTIVESUBROUTINEUNIFORMNAMEPROC)(GLuint program, GLenum shadertype, GLuint index, GLsizei bufSize, GLsizei *length, GLchar *name); +GLAPI PFNGLGETACTIVESUBROUTINEUNIFORMNAMEPROC glad_glGetActiveSubroutineUniformName; +#define glGetActiveSubroutineUniformName glad_glGetActiveSubroutineUniformName +typedef void (APIENTRYP PFNGLGETACTIVESUBROUTINENAMEPROC)(GLuint program, GLenum shadertype, GLuint index, GLsizei bufSize, GLsizei *length, GLchar *name); +GLAPI PFNGLGETACTIVESUBROUTINENAMEPROC glad_glGetActiveSubroutineName; +#define glGetActiveSubroutineName glad_glGetActiveSubroutineName +typedef void (APIENTRYP PFNGLUNIFORMSUBROUTINESUIVPROC)(GLenum shadertype, GLsizei count, const GLuint *indices); +GLAPI PFNGLUNIFORMSUBROUTINESUIVPROC glad_glUniformSubroutinesuiv; +#define glUniformSubroutinesuiv glad_glUniformSubroutinesuiv +typedef void (APIENTRYP PFNGLGETUNIFORMSUBROUTINEUIVPROC)(GLenum shadertype, GLint location, GLuint *params); +GLAPI PFNGLGETUNIFORMSUBROUTINEUIVPROC glad_glGetUniformSubroutineuiv; +#define glGetUniformSubroutineuiv glad_glGetUniformSubroutineuiv +typedef void (APIENTRYP PFNGLGETPROGRAMSTAGEIVPROC)(GLuint program, GLenum shadertype, GLenum pname, GLint *values); +GLAPI PFNGLGETPROGRAMSTAGEIVPROC glad_glGetProgramStageiv; +#define glGetProgramStageiv glad_glGetProgramStageiv +typedef void (APIENTRYP PFNGLPATCHPARAMETERIPROC)(GLenum pname, GLint value); +GLAPI PFNGLPATCHPARAMETERIPROC glad_glPatchParameteri; +#define glPatchParameteri glad_glPatchParameteri +typedef void (APIENTRYP PFNGLPATCHPARAMETERFVPROC)(GLenum pname, const GLfloat *values); +GLAPI PFNGLPATCHPARAMETERFVPROC glad_glPatchParameterfv; +#define glPatchParameterfv glad_glPatchParameterfv +typedef void (APIENTRYP PFNGLBINDTRANSFORMFEEDBACKPROC)(GLenum target, GLuint id); +GLAPI PFNGLBINDTRANSFORMFEEDBACKPROC glad_glBindTransformFeedback; +#define glBindTransformFeedback glad_glBindTransformFeedback +typedef void (APIENTRYP PFNGLDELETETRANSFORMFEEDBACKSPROC)(GLsizei n, const GLuint *ids); +GLAPI PFNGLDELETETRANSFORMFEEDBACKSPROC glad_glDeleteTransformFeedbacks; +#define glDeleteTransformFeedbacks glad_glDeleteTransformFeedbacks +typedef void (APIENTRYP PFNGLGENTRANSFORMFEEDBACKSPROC)(GLsizei n, GLuint *ids); +GLAPI PFNGLGENTRANSFORMFEEDBACKSPROC glad_glGenTransformFeedbacks; +#define glGenTransformFeedbacks glad_glGenTransformFeedbacks +typedef GLboolean (APIENTRYP PFNGLISTRANSFORMFEEDBACKPROC)(GLuint id); +GLAPI PFNGLISTRANSFORMFEEDBACKPROC glad_glIsTransformFeedback; +#define glIsTransformFeedback glad_glIsTransformFeedback +typedef void (APIENTRYP PFNGLPAUSETRANSFORMFEEDBACKPROC)(void); +GLAPI PFNGLPAUSETRANSFORMFEEDBACKPROC glad_glPauseTransformFeedback; +#define glPauseTransformFeedback glad_glPauseTransformFeedback +typedef void (APIENTRYP PFNGLRESUMETRANSFORMFEEDBACKPROC)(void); +GLAPI PFNGLRESUMETRANSFORMFEEDBACKPROC glad_glResumeTransformFeedback; +#define glResumeTransformFeedback glad_glResumeTransformFeedback +typedef void (APIENTRYP PFNGLDRAWTRANSFORMFEEDBACKPROC)(GLenum mode, GLuint id); +GLAPI PFNGLDRAWTRANSFORMFEEDBACKPROC glad_glDrawTransformFeedback; +#define glDrawTransformFeedback glad_glDrawTransformFeedback +typedef void (APIENTRYP PFNGLDRAWTRANSFORMFEEDBACKSTREAMPROC)(GLenum mode, GLuint id, GLuint stream); +GLAPI PFNGLDRAWTRANSFORMFEEDBACKSTREAMPROC glad_glDrawTransformFeedbackStream; +#define glDrawTransformFeedbackStream glad_glDrawTransformFeedbackStream +typedef void (APIENTRYP PFNGLBEGINQUERYINDEXEDPROC)(GLenum target, GLuint index, GLuint id); +GLAPI PFNGLBEGINQUERYINDEXEDPROC glad_glBeginQueryIndexed; +#define glBeginQueryIndexed glad_glBeginQueryIndexed +typedef void (APIENTRYP PFNGLENDQUERYINDEXEDPROC)(GLenum target, GLuint index); +GLAPI PFNGLENDQUERYINDEXEDPROC glad_glEndQueryIndexed; +#define glEndQueryIndexed glad_glEndQueryIndexed +typedef void (APIENTRYP PFNGLGETQUERYINDEXEDIVPROC)(GLenum target, GLuint index, GLenum pname, GLint *params); +GLAPI PFNGLGETQUERYINDEXEDIVPROC glad_glGetQueryIndexediv; +#define glGetQueryIndexediv glad_glGetQueryIndexediv +#endif +#ifndef GL_VERSION_4_1 +#define GL_VERSION_4_1 1 +GLAPI int GLAD_GL_VERSION_4_1; +typedef void (APIENTRYP PFNGLRELEASESHADERCOMPILERPROC)(void); +GLAPI PFNGLRELEASESHADERCOMPILERPROC glad_glReleaseShaderCompiler; +#define glReleaseShaderCompiler glad_glReleaseShaderCompiler +typedef void (APIENTRYP PFNGLSHADERBINARYPROC)(GLsizei count, const GLuint *shaders, GLenum binaryFormat, const void *binary, GLsizei length); +GLAPI PFNGLSHADERBINARYPROC glad_glShaderBinary; +#define glShaderBinary glad_glShaderBinary +typedef void (APIENTRYP PFNGLGETSHADERPRECISIONFORMATPROC)(GLenum shadertype, GLenum precisiontype, GLint *range, GLint *precision); +GLAPI PFNGLGETSHADERPRECISIONFORMATPROC glad_glGetShaderPrecisionFormat; +#define glGetShaderPrecisionFormat glad_glGetShaderPrecisionFormat +typedef void (APIENTRYP PFNGLDEPTHRANGEFPROC)(GLfloat n, GLfloat f); +GLAPI PFNGLDEPTHRANGEFPROC glad_glDepthRangef; +#define glDepthRangef glad_glDepthRangef +typedef void (APIENTRYP PFNGLCLEARDEPTHFPROC)(GLfloat d); +GLAPI PFNGLCLEARDEPTHFPROC glad_glClearDepthf; +#define glClearDepthf glad_glClearDepthf +typedef void (APIENTRYP PFNGLGETPROGRAMBINARYPROC)(GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, void *binary); +GLAPI PFNGLGETPROGRAMBINARYPROC glad_glGetProgramBinary; +#define glGetProgramBinary glad_glGetProgramBinary +typedef void (APIENTRYP PFNGLPROGRAMBINARYPROC)(GLuint program, GLenum binaryFormat, const void *binary, GLsizei length); +GLAPI PFNGLPROGRAMBINARYPROC glad_glProgramBinary; +#define glProgramBinary glad_glProgramBinary +typedef void (APIENTRYP PFNGLPROGRAMPARAMETERIPROC)(GLuint program, GLenum pname, GLint value); +GLAPI PFNGLPROGRAMPARAMETERIPROC glad_glProgramParameteri; +#define glProgramParameteri glad_glProgramParameteri +typedef void (APIENTRYP PFNGLUSEPROGRAMSTAGESPROC)(GLuint pipeline, GLbitfield stages, GLuint program); +GLAPI PFNGLUSEPROGRAMSTAGESPROC glad_glUseProgramStages; +#define glUseProgramStages glad_glUseProgramStages +typedef void (APIENTRYP PFNGLACTIVESHADERPROGRAMPROC)(GLuint pipeline, GLuint program); +GLAPI PFNGLACTIVESHADERPROGRAMPROC glad_glActiveShaderProgram; +#define glActiveShaderProgram glad_glActiveShaderProgram +typedef GLuint (APIENTRYP PFNGLCREATESHADERPROGRAMVPROC)(GLenum type, GLsizei count, const GLchar *const*strings); +GLAPI PFNGLCREATESHADERPROGRAMVPROC glad_glCreateShaderProgramv; +#define glCreateShaderProgramv glad_glCreateShaderProgramv +typedef void (APIENTRYP PFNGLBINDPROGRAMPIPELINEPROC)(GLuint pipeline); +GLAPI PFNGLBINDPROGRAMPIPELINEPROC glad_glBindProgramPipeline; +#define glBindProgramPipeline glad_glBindProgramPipeline +typedef void (APIENTRYP PFNGLDELETEPROGRAMPIPELINESPROC)(GLsizei n, const GLuint *pipelines); +GLAPI PFNGLDELETEPROGRAMPIPELINESPROC glad_glDeleteProgramPipelines; +#define glDeleteProgramPipelines glad_glDeleteProgramPipelines +typedef void (APIENTRYP PFNGLGENPROGRAMPIPELINESPROC)(GLsizei n, GLuint *pipelines); +GLAPI PFNGLGENPROGRAMPIPELINESPROC glad_glGenProgramPipelines; +#define glGenProgramPipelines glad_glGenProgramPipelines +typedef GLboolean (APIENTRYP PFNGLISPROGRAMPIPELINEPROC)(GLuint pipeline); +GLAPI PFNGLISPROGRAMPIPELINEPROC glad_glIsProgramPipeline; +#define glIsProgramPipeline glad_glIsProgramPipeline +typedef void (APIENTRYP PFNGLGETPROGRAMPIPELINEIVPROC)(GLuint pipeline, GLenum pname, GLint *params); +GLAPI PFNGLGETPROGRAMPIPELINEIVPROC glad_glGetProgramPipelineiv; +#define glGetProgramPipelineiv glad_glGetProgramPipelineiv +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1IPROC)(GLuint program, GLint location, GLint v0); +GLAPI PFNGLPROGRAMUNIFORM1IPROC glad_glProgramUniform1i; +#define glProgramUniform1i glad_glProgramUniform1i +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1IVPROC)(GLuint program, GLint location, GLsizei count, const GLint *value); +GLAPI PFNGLPROGRAMUNIFORM1IVPROC glad_glProgramUniform1iv; +#define glProgramUniform1iv glad_glProgramUniform1iv +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1FPROC)(GLuint program, GLint location, GLfloat v0); +GLAPI PFNGLPROGRAMUNIFORM1FPROC glad_glProgramUniform1f; +#define glProgramUniform1f glad_glProgramUniform1f +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1FVPROC)(GLuint program, GLint location, GLsizei count, const GLfloat *value); +GLAPI PFNGLPROGRAMUNIFORM1FVPROC glad_glProgramUniform1fv; +#define glProgramUniform1fv glad_glProgramUniform1fv +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1DPROC)(GLuint program, GLint location, GLdouble v0); +GLAPI PFNGLPROGRAMUNIFORM1DPROC glad_glProgramUniform1d; +#define glProgramUniform1d glad_glProgramUniform1d +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1DVPROC)(GLuint program, GLint location, GLsizei count, const GLdouble *value); +GLAPI PFNGLPROGRAMUNIFORM1DVPROC glad_glProgramUniform1dv; +#define glProgramUniform1dv glad_glProgramUniform1dv +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UIPROC)(GLuint program, GLint location, GLuint v0); +GLAPI PFNGLPROGRAMUNIFORM1UIPROC glad_glProgramUniform1ui; +#define glProgramUniform1ui glad_glProgramUniform1ui +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UIVPROC)(GLuint program, GLint location, GLsizei count, const GLuint *value); +GLAPI PFNGLPROGRAMUNIFORM1UIVPROC glad_glProgramUniform1uiv; +#define glProgramUniform1uiv glad_glProgramUniform1uiv +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2IPROC)(GLuint program, GLint location, GLint v0, GLint v1); +GLAPI PFNGLPROGRAMUNIFORM2IPROC glad_glProgramUniform2i; +#define glProgramUniform2i glad_glProgramUniform2i +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2IVPROC)(GLuint program, GLint location, GLsizei count, const GLint *value); +GLAPI PFNGLPROGRAMUNIFORM2IVPROC glad_glProgramUniform2iv; +#define glProgramUniform2iv glad_glProgramUniform2iv +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2FPROC)(GLuint program, GLint location, GLfloat v0, GLfloat v1); +GLAPI PFNGLPROGRAMUNIFORM2FPROC glad_glProgramUniform2f; +#define glProgramUniform2f glad_glProgramUniform2f +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2FVPROC)(GLuint program, GLint location, GLsizei count, const GLfloat *value); +GLAPI PFNGLPROGRAMUNIFORM2FVPROC glad_glProgramUniform2fv; +#define glProgramUniform2fv glad_glProgramUniform2fv +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2DPROC)(GLuint program, GLint location, GLdouble v0, GLdouble v1); +GLAPI PFNGLPROGRAMUNIFORM2DPROC glad_glProgramUniform2d; +#define glProgramUniform2d glad_glProgramUniform2d +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2DVPROC)(GLuint program, GLint location, GLsizei count, const GLdouble *value); +GLAPI PFNGLPROGRAMUNIFORM2DVPROC glad_glProgramUniform2dv; +#define glProgramUniform2dv glad_glProgramUniform2dv +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UIPROC)(GLuint program, GLint location, GLuint v0, GLuint v1); +GLAPI PFNGLPROGRAMUNIFORM2UIPROC glad_glProgramUniform2ui; +#define glProgramUniform2ui glad_glProgramUniform2ui +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UIVPROC)(GLuint program, GLint location, GLsizei count, const GLuint *value); +GLAPI PFNGLPROGRAMUNIFORM2UIVPROC glad_glProgramUniform2uiv; +#define glProgramUniform2uiv glad_glProgramUniform2uiv +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3IPROC)(GLuint program, GLint location, GLint v0, GLint v1, GLint v2); +GLAPI PFNGLPROGRAMUNIFORM3IPROC glad_glProgramUniform3i; +#define glProgramUniform3i glad_glProgramUniform3i +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3IVPROC)(GLuint program, GLint location, GLsizei count, const GLint *value); +GLAPI PFNGLPROGRAMUNIFORM3IVPROC glad_glProgramUniform3iv; +#define glProgramUniform3iv glad_glProgramUniform3iv +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3FPROC)(GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2); +GLAPI PFNGLPROGRAMUNIFORM3FPROC glad_glProgramUniform3f; +#define glProgramUniform3f glad_glProgramUniform3f +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3FVPROC)(GLuint program, GLint location, GLsizei count, const GLfloat *value); +GLAPI PFNGLPROGRAMUNIFORM3FVPROC glad_glProgramUniform3fv; +#define glProgramUniform3fv glad_glProgramUniform3fv +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3DPROC)(GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2); +GLAPI PFNGLPROGRAMUNIFORM3DPROC glad_glProgramUniform3d; +#define glProgramUniform3d glad_glProgramUniform3d +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3DVPROC)(GLuint program, GLint location, GLsizei count, const GLdouble *value); +GLAPI PFNGLPROGRAMUNIFORM3DVPROC glad_glProgramUniform3dv; +#define glProgramUniform3dv glad_glProgramUniform3dv +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UIPROC)(GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2); +GLAPI PFNGLPROGRAMUNIFORM3UIPROC glad_glProgramUniform3ui; +#define glProgramUniform3ui glad_glProgramUniform3ui +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UIVPROC)(GLuint program, GLint location, GLsizei count, const GLuint *value); +GLAPI PFNGLPROGRAMUNIFORM3UIVPROC glad_glProgramUniform3uiv; +#define glProgramUniform3uiv glad_glProgramUniform3uiv +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4IPROC)(GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3); +GLAPI PFNGLPROGRAMUNIFORM4IPROC glad_glProgramUniform4i; +#define glProgramUniform4i glad_glProgramUniform4i +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4IVPROC)(GLuint program, GLint location, GLsizei count, const GLint *value); +GLAPI PFNGLPROGRAMUNIFORM4IVPROC glad_glProgramUniform4iv; +#define glProgramUniform4iv glad_glProgramUniform4iv +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4FPROC)(GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3); +GLAPI PFNGLPROGRAMUNIFORM4FPROC glad_glProgramUniform4f; +#define glProgramUniform4f glad_glProgramUniform4f +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4FVPROC)(GLuint program, GLint location, GLsizei count, const GLfloat *value); +GLAPI PFNGLPROGRAMUNIFORM4FVPROC glad_glProgramUniform4fv; +#define glProgramUniform4fv glad_glProgramUniform4fv +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4DPROC)(GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2, GLdouble v3); +GLAPI PFNGLPROGRAMUNIFORM4DPROC glad_glProgramUniform4d; +#define glProgramUniform4d glad_glProgramUniform4d +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4DVPROC)(GLuint program, GLint location, GLsizei count, const GLdouble *value); +GLAPI PFNGLPROGRAMUNIFORM4DVPROC glad_glProgramUniform4dv; +#define glProgramUniform4dv glad_glProgramUniform4dv +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UIPROC)(GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3); +GLAPI PFNGLPROGRAMUNIFORM4UIPROC glad_glProgramUniform4ui; +#define glProgramUniform4ui glad_glProgramUniform4ui +typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UIVPROC)(GLuint program, GLint location, GLsizei count, const GLuint *value); +GLAPI PFNGLPROGRAMUNIFORM4UIVPROC glad_glProgramUniform4uiv; +#define glProgramUniform4uiv glad_glProgramUniform4uiv +typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2FVPROC)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); +GLAPI PFNGLPROGRAMUNIFORMMATRIX2FVPROC glad_glProgramUniformMatrix2fv; +#define glProgramUniformMatrix2fv glad_glProgramUniformMatrix2fv +typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3FVPROC)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); +GLAPI PFNGLPROGRAMUNIFORMMATRIX3FVPROC glad_glProgramUniformMatrix3fv; +#define glProgramUniformMatrix3fv glad_glProgramUniformMatrix3fv +typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4FVPROC)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); +GLAPI PFNGLPROGRAMUNIFORMMATRIX4FVPROC glad_glProgramUniformMatrix4fv; +#define glProgramUniformMatrix4fv glad_glProgramUniformMatrix4fv +typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2DVPROC)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); +GLAPI PFNGLPROGRAMUNIFORMMATRIX2DVPROC glad_glProgramUniformMatrix2dv; +#define glProgramUniformMatrix2dv glad_glProgramUniformMatrix2dv +typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3DVPROC)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); +GLAPI PFNGLPROGRAMUNIFORMMATRIX3DVPROC glad_glProgramUniformMatrix3dv; +#define glProgramUniformMatrix3dv glad_glProgramUniformMatrix3dv +typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4DVPROC)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); +GLAPI PFNGLPROGRAMUNIFORMMATRIX4DVPROC glad_glProgramUniformMatrix4dv; +#define glProgramUniformMatrix4dv glad_glProgramUniformMatrix4dv +typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X3FVPROC)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); +GLAPI PFNGLPROGRAMUNIFORMMATRIX2X3FVPROC glad_glProgramUniformMatrix2x3fv; +#define glProgramUniformMatrix2x3fv glad_glProgramUniformMatrix2x3fv +typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X2FVPROC)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); +GLAPI PFNGLPROGRAMUNIFORMMATRIX3X2FVPROC glad_glProgramUniformMatrix3x2fv; +#define glProgramUniformMatrix3x2fv glad_glProgramUniformMatrix3x2fv +typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X4FVPROC)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); +GLAPI PFNGLPROGRAMUNIFORMMATRIX2X4FVPROC glad_glProgramUniformMatrix2x4fv; +#define glProgramUniformMatrix2x4fv glad_glProgramUniformMatrix2x4fv +typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X2FVPROC)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); +GLAPI PFNGLPROGRAMUNIFORMMATRIX4X2FVPROC glad_glProgramUniformMatrix4x2fv; +#define glProgramUniformMatrix4x2fv glad_glProgramUniformMatrix4x2fv +typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X4FVPROC)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); +GLAPI PFNGLPROGRAMUNIFORMMATRIX3X4FVPROC glad_glProgramUniformMatrix3x4fv; +#define glProgramUniformMatrix3x4fv glad_glProgramUniformMatrix3x4fv +typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X3FVPROC)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); +GLAPI PFNGLPROGRAMUNIFORMMATRIX4X3FVPROC glad_glProgramUniformMatrix4x3fv; +#define glProgramUniformMatrix4x3fv glad_glProgramUniformMatrix4x3fv +typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X3DVPROC)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); +GLAPI PFNGLPROGRAMUNIFORMMATRIX2X3DVPROC glad_glProgramUniformMatrix2x3dv; +#define glProgramUniformMatrix2x3dv glad_glProgramUniformMatrix2x3dv +typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X2DVPROC)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); +GLAPI PFNGLPROGRAMUNIFORMMATRIX3X2DVPROC glad_glProgramUniformMatrix3x2dv; +#define glProgramUniformMatrix3x2dv glad_glProgramUniformMatrix3x2dv +typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X4DVPROC)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); +GLAPI PFNGLPROGRAMUNIFORMMATRIX2X4DVPROC glad_glProgramUniformMatrix2x4dv; +#define glProgramUniformMatrix2x4dv glad_glProgramUniformMatrix2x4dv +typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X2DVPROC)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); +GLAPI PFNGLPROGRAMUNIFORMMATRIX4X2DVPROC glad_glProgramUniformMatrix4x2dv; +#define glProgramUniformMatrix4x2dv glad_glProgramUniformMatrix4x2dv +typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X4DVPROC)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); +GLAPI PFNGLPROGRAMUNIFORMMATRIX3X4DVPROC glad_glProgramUniformMatrix3x4dv; +#define glProgramUniformMatrix3x4dv glad_glProgramUniformMatrix3x4dv +typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X3DVPROC)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); +GLAPI PFNGLPROGRAMUNIFORMMATRIX4X3DVPROC glad_glProgramUniformMatrix4x3dv; +#define glProgramUniformMatrix4x3dv glad_glProgramUniformMatrix4x3dv +typedef void (APIENTRYP PFNGLVALIDATEPROGRAMPIPELINEPROC)(GLuint pipeline); +GLAPI PFNGLVALIDATEPROGRAMPIPELINEPROC glad_glValidateProgramPipeline; +#define glValidateProgramPipeline glad_glValidateProgramPipeline +typedef void (APIENTRYP PFNGLGETPROGRAMPIPELINEINFOLOGPROC)(GLuint pipeline, GLsizei bufSize, GLsizei *length, GLchar *infoLog); +GLAPI PFNGLGETPROGRAMPIPELINEINFOLOGPROC glad_glGetProgramPipelineInfoLog; +#define glGetProgramPipelineInfoLog glad_glGetProgramPipelineInfoLog +typedef void (APIENTRYP PFNGLVERTEXATTRIBL1DPROC)(GLuint index, GLdouble x); +GLAPI PFNGLVERTEXATTRIBL1DPROC glad_glVertexAttribL1d; +#define glVertexAttribL1d glad_glVertexAttribL1d +typedef void (APIENTRYP PFNGLVERTEXATTRIBL2DPROC)(GLuint index, GLdouble x, GLdouble y); +GLAPI PFNGLVERTEXATTRIBL2DPROC glad_glVertexAttribL2d; +#define glVertexAttribL2d glad_glVertexAttribL2d +typedef void (APIENTRYP PFNGLVERTEXATTRIBL3DPROC)(GLuint index, GLdouble x, GLdouble y, GLdouble z); +GLAPI PFNGLVERTEXATTRIBL3DPROC glad_glVertexAttribL3d; +#define glVertexAttribL3d glad_glVertexAttribL3d +typedef void (APIENTRYP PFNGLVERTEXATTRIBL4DPROC)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); +GLAPI PFNGLVERTEXATTRIBL4DPROC glad_glVertexAttribL4d; +#define glVertexAttribL4d glad_glVertexAttribL4d +typedef void (APIENTRYP PFNGLVERTEXATTRIBL1DVPROC)(GLuint index, const GLdouble *v); +GLAPI PFNGLVERTEXATTRIBL1DVPROC glad_glVertexAttribL1dv; +#define glVertexAttribL1dv glad_glVertexAttribL1dv +typedef void (APIENTRYP PFNGLVERTEXATTRIBL2DVPROC)(GLuint index, const GLdouble *v); +GLAPI PFNGLVERTEXATTRIBL2DVPROC glad_glVertexAttribL2dv; +#define glVertexAttribL2dv glad_glVertexAttribL2dv +typedef void (APIENTRYP PFNGLVERTEXATTRIBL3DVPROC)(GLuint index, const GLdouble *v); +GLAPI PFNGLVERTEXATTRIBL3DVPROC glad_glVertexAttribL3dv; +#define glVertexAttribL3dv glad_glVertexAttribL3dv +typedef void (APIENTRYP PFNGLVERTEXATTRIBL4DVPROC)(GLuint index, const GLdouble *v); +GLAPI PFNGLVERTEXATTRIBL4DVPROC glad_glVertexAttribL4dv; +#define glVertexAttribL4dv glad_glVertexAttribL4dv +typedef void (APIENTRYP PFNGLVERTEXATTRIBLPOINTERPROC)(GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer); +GLAPI PFNGLVERTEXATTRIBLPOINTERPROC glad_glVertexAttribLPointer; +#define glVertexAttribLPointer glad_glVertexAttribLPointer +typedef void (APIENTRYP PFNGLGETVERTEXATTRIBLDVPROC)(GLuint index, GLenum pname, GLdouble *params); +GLAPI PFNGLGETVERTEXATTRIBLDVPROC glad_glGetVertexAttribLdv; +#define glGetVertexAttribLdv glad_glGetVertexAttribLdv +typedef void (APIENTRYP PFNGLVIEWPORTARRAYVPROC)(GLuint first, GLsizei count, const GLfloat *v); +GLAPI PFNGLVIEWPORTARRAYVPROC glad_glViewportArrayv; +#define glViewportArrayv glad_glViewportArrayv +typedef void (APIENTRYP PFNGLVIEWPORTINDEXEDFPROC)(GLuint index, GLfloat x, GLfloat y, GLfloat w, GLfloat h); +GLAPI PFNGLVIEWPORTINDEXEDFPROC glad_glViewportIndexedf; +#define glViewportIndexedf glad_glViewportIndexedf +typedef void (APIENTRYP PFNGLVIEWPORTINDEXEDFVPROC)(GLuint index, const GLfloat *v); +GLAPI PFNGLVIEWPORTINDEXEDFVPROC glad_glViewportIndexedfv; +#define glViewportIndexedfv glad_glViewportIndexedfv +typedef void (APIENTRYP PFNGLSCISSORARRAYVPROC)(GLuint first, GLsizei count, const GLint *v); +GLAPI PFNGLSCISSORARRAYVPROC glad_glScissorArrayv; +#define glScissorArrayv glad_glScissorArrayv +typedef void (APIENTRYP PFNGLSCISSORINDEXEDPROC)(GLuint index, GLint left, GLint bottom, GLsizei width, GLsizei height); +GLAPI PFNGLSCISSORINDEXEDPROC glad_glScissorIndexed; +#define glScissorIndexed glad_glScissorIndexed +typedef void (APIENTRYP PFNGLSCISSORINDEXEDVPROC)(GLuint index, const GLint *v); +GLAPI PFNGLSCISSORINDEXEDVPROC glad_glScissorIndexedv; +#define glScissorIndexedv glad_glScissorIndexedv +typedef void (APIENTRYP PFNGLDEPTHRANGEARRAYVPROC)(GLuint first, GLsizei count, const GLdouble *v); +GLAPI PFNGLDEPTHRANGEARRAYVPROC glad_glDepthRangeArrayv; +#define glDepthRangeArrayv glad_glDepthRangeArrayv +typedef void (APIENTRYP PFNGLDEPTHRANGEINDEXEDPROC)(GLuint index, GLdouble n, GLdouble f); +GLAPI PFNGLDEPTHRANGEINDEXEDPROC glad_glDepthRangeIndexed; +#define glDepthRangeIndexed glad_glDepthRangeIndexed +typedef void (APIENTRYP PFNGLGETFLOATI_VPROC)(GLenum target, GLuint index, GLfloat *data); +GLAPI PFNGLGETFLOATI_VPROC glad_glGetFloati_v; +#define glGetFloati_v glad_glGetFloati_v +typedef void (APIENTRYP PFNGLGETDOUBLEI_VPROC)(GLenum target, GLuint index, GLdouble *data); +GLAPI PFNGLGETDOUBLEI_VPROC glad_glGetDoublei_v; +#define glGetDoublei_v glad_glGetDoublei_v +#endif +#ifndef GL_VERSION_4_2 +#define GL_VERSION_4_2 1 +GLAPI int GLAD_GL_VERSION_4_2; +typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDBASEINSTANCEPROC)(GLenum mode, GLint first, GLsizei count, GLsizei instancecount, GLuint baseinstance); +GLAPI PFNGLDRAWARRAYSINSTANCEDBASEINSTANCEPROC glad_glDrawArraysInstancedBaseInstance; +#define glDrawArraysInstancedBaseInstance glad_glDrawArraysInstancedBaseInstance +typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDBASEINSTANCEPROC)(GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLuint baseinstance); +GLAPI PFNGLDRAWELEMENTSINSTANCEDBASEINSTANCEPROC glad_glDrawElementsInstancedBaseInstance; +#define glDrawElementsInstancedBaseInstance glad_glDrawElementsInstancedBaseInstance +typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXBASEINSTANCEPROC)(GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLint basevertex, GLuint baseinstance); +GLAPI PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXBASEINSTANCEPROC glad_glDrawElementsInstancedBaseVertexBaseInstance; +#define glDrawElementsInstancedBaseVertexBaseInstance glad_glDrawElementsInstancedBaseVertexBaseInstance +typedef void (APIENTRYP PFNGLGETINTERNALFORMATIVPROC)(GLenum target, GLenum internalformat, GLenum pname, GLsizei count, GLint *params); +GLAPI PFNGLGETINTERNALFORMATIVPROC glad_glGetInternalformativ; +#define glGetInternalformativ glad_glGetInternalformativ +typedef void (APIENTRYP PFNGLGETACTIVEATOMICCOUNTERBUFFERIVPROC)(GLuint program, GLuint bufferIndex, GLenum pname, GLint *params); +GLAPI PFNGLGETACTIVEATOMICCOUNTERBUFFERIVPROC glad_glGetActiveAtomicCounterBufferiv; +#define glGetActiveAtomicCounterBufferiv glad_glGetActiveAtomicCounterBufferiv +typedef void (APIENTRYP PFNGLBINDIMAGETEXTUREPROC)(GLuint unit, GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum access, GLenum format); +GLAPI PFNGLBINDIMAGETEXTUREPROC glad_glBindImageTexture; +#define glBindImageTexture glad_glBindImageTexture +typedef void (APIENTRYP PFNGLMEMORYBARRIERPROC)(GLbitfield barriers); +GLAPI PFNGLMEMORYBARRIERPROC glad_glMemoryBarrier; +#define glMemoryBarrier glad_glMemoryBarrier +typedef void (APIENTRYP PFNGLTEXSTORAGE1DPROC)(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width); +GLAPI PFNGLTEXSTORAGE1DPROC glad_glTexStorage1D; +#define glTexStorage1D glad_glTexStorage1D +typedef void (APIENTRYP PFNGLTEXSTORAGE2DPROC)(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height); +GLAPI PFNGLTEXSTORAGE2DPROC glad_glTexStorage2D; +#define glTexStorage2D glad_glTexStorage2D +typedef void (APIENTRYP PFNGLTEXSTORAGE3DPROC)(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth); +GLAPI PFNGLTEXSTORAGE3DPROC glad_glTexStorage3D; +#define glTexStorage3D glad_glTexStorage3D +typedef void (APIENTRYP PFNGLDRAWTRANSFORMFEEDBACKINSTANCEDPROC)(GLenum mode, GLuint id, GLsizei instancecount); +GLAPI PFNGLDRAWTRANSFORMFEEDBACKINSTANCEDPROC glad_glDrawTransformFeedbackInstanced; +#define glDrawTransformFeedbackInstanced glad_glDrawTransformFeedbackInstanced +typedef void (APIENTRYP PFNGLDRAWTRANSFORMFEEDBACKSTREAMINSTANCEDPROC)(GLenum mode, GLuint id, GLuint stream, GLsizei instancecount); +GLAPI PFNGLDRAWTRANSFORMFEEDBACKSTREAMINSTANCEDPROC glad_glDrawTransformFeedbackStreamInstanced; +#define glDrawTransformFeedbackStreamInstanced glad_glDrawTransformFeedbackStreamInstanced +#endif +#ifndef GL_VERSION_4_3 +#define GL_VERSION_4_3 1 +GLAPI int GLAD_GL_VERSION_4_3; +typedef void (APIENTRYP PFNGLCLEARBUFFERDATAPROC)(GLenum target, GLenum internalformat, GLenum format, GLenum type, const void *data); +GLAPI PFNGLCLEARBUFFERDATAPROC glad_glClearBufferData; +#define glClearBufferData glad_glClearBufferData +typedef void (APIENTRYP PFNGLCLEARBUFFERSUBDATAPROC)(GLenum target, GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum type, const void *data); +GLAPI PFNGLCLEARBUFFERSUBDATAPROC glad_glClearBufferSubData; +#define glClearBufferSubData glad_glClearBufferSubData +typedef void (APIENTRYP PFNGLDISPATCHCOMPUTEPROC)(GLuint num_groups_x, GLuint num_groups_y, GLuint num_groups_z); +GLAPI PFNGLDISPATCHCOMPUTEPROC glad_glDispatchCompute; +#define glDispatchCompute glad_glDispatchCompute +typedef void (APIENTRYP PFNGLDISPATCHCOMPUTEINDIRECTPROC)(GLintptr indirect); +GLAPI PFNGLDISPATCHCOMPUTEINDIRECTPROC glad_glDispatchComputeIndirect; +#define glDispatchComputeIndirect glad_glDispatchComputeIndirect +typedef void (APIENTRYP PFNGLCOPYIMAGESUBDATAPROC)(GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth); +GLAPI PFNGLCOPYIMAGESUBDATAPROC glad_glCopyImageSubData; +#define glCopyImageSubData glad_glCopyImageSubData +typedef void (APIENTRYP PFNGLFRAMEBUFFERPARAMETERIPROC)(GLenum target, GLenum pname, GLint param); +GLAPI PFNGLFRAMEBUFFERPARAMETERIPROC glad_glFramebufferParameteri; +#define glFramebufferParameteri glad_glFramebufferParameteri +typedef void (APIENTRYP PFNGLGETFRAMEBUFFERPARAMETERIVPROC)(GLenum target, GLenum pname, GLint *params); +GLAPI PFNGLGETFRAMEBUFFERPARAMETERIVPROC glad_glGetFramebufferParameteriv; +#define glGetFramebufferParameteriv glad_glGetFramebufferParameteriv +typedef void (APIENTRYP PFNGLGETINTERNALFORMATI64VPROC)(GLenum target, GLenum internalformat, GLenum pname, GLsizei count, GLint64 *params); +GLAPI PFNGLGETINTERNALFORMATI64VPROC glad_glGetInternalformati64v; +#define glGetInternalformati64v glad_glGetInternalformati64v +typedef void (APIENTRYP PFNGLINVALIDATETEXSUBIMAGEPROC)(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth); +GLAPI PFNGLINVALIDATETEXSUBIMAGEPROC glad_glInvalidateTexSubImage; +#define glInvalidateTexSubImage glad_glInvalidateTexSubImage +typedef void (APIENTRYP PFNGLINVALIDATETEXIMAGEPROC)(GLuint texture, GLint level); +GLAPI PFNGLINVALIDATETEXIMAGEPROC glad_glInvalidateTexImage; +#define glInvalidateTexImage glad_glInvalidateTexImage +typedef void (APIENTRYP PFNGLINVALIDATEBUFFERSUBDATAPROC)(GLuint buffer, GLintptr offset, GLsizeiptr length); +GLAPI PFNGLINVALIDATEBUFFERSUBDATAPROC glad_glInvalidateBufferSubData; +#define glInvalidateBufferSubData glad_glInvalidateBufferSubData +typedef void (APIENTRYP PFNGLINVALIDATEBUFFERDATAPROC)(GLuint buffer); +GLAPI PFNGLINVALIDATEBUFFERDATAPROC glad_glInvalidateBufferData; +#define glInvalidateBufferData glad_glInvalidateBufferData +typedef void (APIENTRYP PFNGLINVALIDATEFRAMEBUFFERPROC)(GLenum target, GLsizei numAttachments, const GLenum *attachments); +GLAPI PFNGLINVALIDATEFRAMEBUFFERPROC glad_glInvalidateFramebuffer; +#define glInvalidateFramebuffer glad_glInvalidateFramebuffer +typedef void (APIENTRYP PFNGLINVALIDATESUBFRAMEBUFFERPROC)(GLenum target, GLsizei numAttachments, const GLenum *attachments, GLint x, GLint y, GLsizei width, GLsizei height); +GLAPI PFNGLINVALIDATESUBFRAMEBUFFERPROC glad_glInvalidateSubFramebuffer; +#define glInvalidateSubFramebuffer glad_glInvalidateSubFramebuffer +typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSINDIRECTPROC)(GLenum mode, const void *indirect, GLsizei drawcount, GLsizei stride); +GLAPI PFNGLMULTIDRAWARRAYSINDIRECTPROC glad_glMultiDrawArraysIndirect; +#define glMultiDrawArraysIndirect glad_glMultiDrawArraysIndirect +typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSINDIRECTPROC)(GLenum mode, GLenum type, const void *indirect, GLsizei drawcount, GLsizei stride); +GLAPI PFNGLMULTIDRAWELEMENTSINDIRECTPROC glad_glMultiDrawElementsIndirect; +#define glMultiDrawElementsIndirect glad_glMultiDrawElementsIndirect +typedef void (APIENTRYP PFNGLGETPROGRAMINTERFACEIVPROC)(GLuint program, GLenum programInterface, GLenum pname, GLint *params); +GLAPI PFNGLGETPROGRAMINTERFACEIVPROC glad_glGetProgramInterfaceiv; +#define glGetProgramInterfaceiv glad_glGetProgramInterfaceiv +typedef GLuint (APIENTRYP PFNGLGETPROGRAMRESOURCEINDEXPROC)(GLuint program, GLenum programInterface, const GLchar *name); +GLAPI PFNGLGETPROGRAMRESOURCEINDEXPROC glad_glGetProgramResourceIndex; +#define glGetProgramResourceIndex glad_glGetProgramResourceIndex +typedef void (APIENTRYP PFNGLGETPROGRAMRESOURCENAMEPROC)(GLuint program, GLenum programInterface, GLuint index, GLsizei bufSize, GLsizei *length, GLchar *name); +GLAPI PFNGLGETPROGRAMRESOURCENAMEPROC glad_glGetProgramResourceName; +#define glGetProgramResourceName glad_glGetProgramResourceName +typedef void (APIENTRYP PFNGLGETPROGRAMRESOURCEIVPROC)(GLuint program, GLenum programInterface, GLuint index, GLsizei propCount, const GLenum *props, GLsizei count, GLsizei *length, GLint *params); +GLAPI PFNGLGETPROGRAMRESOURCEIVPROC glad_glGetProgramResourceiv; +#define glGetProgramResourceiv glad_glGetProgramResourceiv +typedef GLint (APIENTRYP PFNGLGETPROGRAMRESOURCELOCATIONPROC)(GLuint program, GLenum programInterface, const GLchar *name); +GLAPI PFNGLGETPROGRAMRESOURCELOCATIONPROC glad_glGetProgramResourceLocation; +#define glGetProgramResourceLocation glad_glGetProgramResourceLocation +typedef GLint (APIENTRYP PFNGLGETPROGRAMRESOURCELOCATIONINDEXPROC)(GLuint program, GLenum programInterface, const GLchar *name); +GLAPI PFNGLGETPROGRAMRESOURCELOCATIONINDEXPROC glad_glGetProgramResourceLocationIndex; +#define glGetProgramResourceLocationIndex glad_glGetProgramResourceLocationIndex +typedef void (APIENTRYP PFNGLSHADERSTORAGEBLOCKBINDINGPROC)(GLuint program, GLuint storageBlockIndex, GLuint storageBlockBinding); +GLAPI PFNGLSHADERSTORAGEBLOCKBINDINGPROC glad_glShaderStorageBlockBinding; +#define glShaderStorageBlockBinding glad_glShaderStorageBlockBinding +typedef void (APIENTRYP PFNGLTEXBUFFERRANGEPROC)(GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size); +GLAPI PFNGLTEXBUFFERRANGEPROC glad_glTexBufferRange; +#define glTexBufferRange glad_glTexBufferRange +typedef void (APIENTRYP PFNGLTEXSTORAGE2DMULTISAMPLEPROC)(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations); +GLAPI PFNGLTEXSTORAGE2DMULTISAMPLEPROC glad_glTexStorage2DMultisample; +#define glTexStorage2DMultisample glad_glTexStorage2DMultisample +typedef void (APIENTRYP PFNGLTEXSTORAGE3DMULTISAMPLEPROC)(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations); +GLAPI PFNGLTEXSTORAGE3DMULTISAMPLEPROC glad_glTexStorage3DMultisample; +#define glTexStorage3DMultisample glad_glTexStorage3DMultisample +typedef void (APIENTRYP PFNGLTEXTUREVIEWPROC)(GLuint texture, GLenum target, GLuint origtexture, GLenum internalformat, GLuint minlevel, GLuint numlevels, GLuint minlayer, GLuint numlayers); +GLAPI PFNGLTEXTUREVIEWPROC glad_glTextureView; +#define glTextureView glad_glTextureView +typedef void (APIENTRYP PFNGLBINDVERTEXBUFFERPROC)(GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride); +GLAPI PFNGLBINDVERTEXBUFFERPROC glad_glBindVertexBuffer; +#define glBindVertexBuffer glad_glBindVertexBuffer +typedef void (APIENTRYP PFNGLVERTEXATTRIBFORMATPROC)(GLuint attribindex, GLint size, GLenum type, GLboolean normalized, GLuint relativeoffset); +GLAPI PFNGLVERTEXATTRIBFORMATPROC glad_glVertexAttribFormat; +#define glVertexAttribFormat glad_glVertexAttribFormat +typedef void (APIENTRYP PFNGLVERTEXATTRIBIFORMATPROC)(GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset); +GLAPI PFNGLVERTEXATTRIBIFORMATPROC glad_glVertexAttribIFormat; +#define glVertexAttribIFormat glad_glVertexAttribIFormat +typedef void (APIENTRYP PFNGLVERTEXATTRIBLFORMATPROC)(GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset); +GLAPI PFNGLVERTEXATTRIBLFORMATPROC glad_glVertexAttribLFormat; +#define glVertexAttribLFormat glad_glVertexAttribLFormat +typedef void (APIENTRYP PFNGLVERTEXATTRIBBINDINGPROC)(GLuint attribindex, GLuint bindingindex); +GLAPI PFNGLVERTEXATTRIBBINDINGPROC glad_glVertexAttribBinding; +#define glVertexAttribBinding glad_glVertexAttribBinding +typedef void (APIENTRYP PFNGLVERTEXBINDINGDIVISORPROC)(GLuint bindingindex, GLuint divisor); +GLAPI PFNGLVERTEXBINDINGDIVISORPROC glad_glVertexBindingDivisor; +#define glVertexBindingDivisor glad_glVertexBindingDivisor +typedef void (APIENTRYP PFNGLDEBUGMESSAGECONTROLPROC)(GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled); +GLAPI PFNGLDEBUGMESSAGECONTROLPROC glad_glDebugMessageControl; +#define glDebugMessageControl glad_glDebugMessageControl +typedef void (APIENTRYP PFNGLDEBUGMESSAGEINSERTPROC)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf); +GLAPI PFNGLDEBUGMESSAGEINSERTPROC glad_glDebugMessageInsert; +#define glDebugMessageInsert glad_glDebugMessageInsert +typedef void (APIENTRYP PFNGLDEBUGMESSAGECALLBACKPROC)(GLDEBUGPROC callback, const void *userParam); +GLAPI PFNGLDEBUGMESSAGECALLBACKPROC glad_glDebugMessageCallback; +#define glDebugMessageCallback glad_glDebugMessageCallback +typedef GLuint (APIENTRYP PFNGLGETDEBUGMESSAGELOGPROC)(GLuint count, GLsizei bufSize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog); +GLAPI PFNGLGETDEBUGMESSAGELOGPROC glad_glGetDebugMessageLog; +#define glGetDebugMessageLog glad_glGetDebugMessageLog +typedef void (APIENTRYP PFNGLPUSHDEBUGGROUPPROC)(GLenum source, GLuint id, GLsizei length, const GLchar *message); +GLAPI PFNGLPUSHDEBUGGROUPPROC glad_glPushDebugGroup; +#define glPushDebugGroup glad_glPushDebugGroup +typedef void (APIENTRYP PFNGLPOPDEBUGGROUPPROC)(void); +GLAPI PFNGLPOPDEBUGGROUPPROC glad_glPopDebugGroup; +#define glPopDebugGroup glad_glPopDebugGroup +typedef void (APIENTRYP PFNGLOBJECTLABELPROC)(GLenum identifier, GLuint name, GLsizei length, const GLchar *label); +GLAPI PFNGLOBJECTLABELPROC glad_glObjectLabel; +#define glObjectLabel glad_glObjectLabel +typedef void (APIENTRYP PFNGLGETOBJECTLABELPROC)(GLenum identifier, GLuint name, GLsizei bufSize, GLsizei *length, GLchar *label); +GLAPI PFNGLGETOBJECTLABELPROC glad_glGetObjectLabel; +#define glGetObjectLabel glad_glGetObjectLabel +typedef void (APIENTRYP PFNGLOBJECTPTRLABELPROC)(const void *ptr, GLsizei length, const GLchar *label); +GLAPI PFNGLOBJECTPTRLABELPROC glad_glObjectPtrLabel; +#define glObjectPtrLabel glad_glObjectPtrLabel +typedef void (APIENTRYP PFNGLGETOBJECTPTRLABELPROC)(const void *ptr, GLsizei bufSize, GLsizei *length, GLchar *label); +GLAPI PFNGLGETOBJECTPTRLABELPROC glad_glGetObjectPtrLabel; +#define glGetObjectPtrLabel glad_glGetObjectPtrLabel +#endif +#ifndef GL_VERSION_4_4 +#define GL_VERSION_4_4 1 +GLAPI int GLAD_GL_VERSION_4_4; +typedef void (APIENTRYP PFNGLBUFFERSTORAGEPROC)(GLenum target, GLsizeiptr size, const void *data, GLbitfield flags); +GLAPI PFNGLBUFFERSTORAGEPROC glad_glBufferStorage; +#define glBufferStorage glad_glBufferStorage +typedef void (APIENTRYP PFNGLCLEARTEXIMAGEPROC)(GLuint texture, GLint level, GLenum format, GLenum type, const void *data); +GLAPI PFNGLCLEARTEXIMAGEPROC glad_glClearTexImage; +#define glClearTexImage glad_glClearTexImage +typedef void (APIENTRYP PFNGLCLEARTEXSUBIMAGEPROC)(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *data); +GLAPI PFNGLCLEARTEXSUBIMAGEPROC glad_glClearTexSubImage; +#define glClearTexSubImage glad_glClearTexSubImage +typedef void (APIENTRYP PFNGLBINDBUFFERSBASEPROC)(GLenum target, GLuint first, GLsizei count, const GLuint *buffers); +GLAPI PFNGLBINDBUFFERSBASEPROC glad_glBindBuffersBase; +#define glBindBuffersBase glad_glBindBuffersBase +typedef void (APIENTRYP PFNGLBINDBUFFERSRANGEPROC)(GLenum target, GLuint first, GLsizei count, const GLuint *buffers, const GLintptr *offsets, const GLsizeiptr *sizes); +GLAPI PFNGLBINDBUFFERSRANGEPROC glad_glBindBuffersRange; +#define glBindBuffersRange glad_glBindBuffersRange +typedef void (APIENTRYP PFNGLBINDTEXTURESPROC)(GLuint first, GLsizei count, const GLuint *textures); +GLAPI PFNGLBINDTEXTURESPROC glad_glBindTextures; +#define glBindTextures glad_glBindTextures +typedef void (APIENTRYP PFNGLBINDSAMPLERSPROC)(GLuint first, GLsizei count, const GLuint *samplers); +GLAPI PFNGLBINDSAMPLERSPROC glad_glBindSamplers; +#define glBindSamplers glad_glBindSamplers +typedef void (APIENTRYP PFNGLBINDIMAGETEXTURESPROC)(GLuint first, GLsizei count, const GLuint *textures); +GLAPI PFNGLBINDIMAGETEXTURESPROC glad_glBindImageTextures; +#define glBindImageTextures glad_glBindImageTextures +typedef void (APIENTRYP PFNGLBINDVERTEXBUFFERSPROC)(GLuint first, GLsizei count, const GLuint *buffers, const GLintptr *offsets, const GLsizei *strides); +GLAPI PFNGLBINDVERTEXBUFFERSPROC glad_glBindVertexBuffers; +#define glBindVertexBuffers glad_glBindVertexBuffers +#endif +#ifndef GL_VERSION_4_5 +#define GL_VERSION_4_5 1 +GLAPI int GLAD_GL_VERSION_4_5; +typedef void (APIENTRYP PFNGLCLIPCONTROLPROC)(GLenum origin, GLenum depth); +GLAPI PFNGLCLIPCONTROLPROC glad_glClipControl; +#define glClipControl glad_glClipControl +typedef void (APIENTRYP PFNGLCREATETRANSFORMFEEDBACKSPROC)(GLsizei n, GLuint *ids); +GLAPI PFNGLCREATETRANSFORMFEEDBACKSPROC glad_glCreateTransformFeedbacks; +#define glCreateTransformFeedbacks glad_glCreateTransformFeedbacks +typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKBUFFERBASEPROC)(GLuint xfb, GLuint index, GLuint buffer); +GLAPI PFNGLTRANSFORMFEEDBACKBUFFERBASEPROC glad_glTransformFeedbackBufferBase; +#define glTransformFeedbackBufferBase glad_glTransformFeedbackBufferBase +typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKBUFFERRANGEPROC)(GLuint xfb, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size); +GLAPI PFNGLTRANSFORMFEEDBACKBUFFERRANGEPROC glad_glTransformFeedbackBufferRange; +#define glTransformFeedbackBufferRange glad_glTransformFeedbackBufferRange +typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKIVPROC)(GLuint xfb, GLenum pname, GLint *param); +GLAPI PFNGLGETTRANSFORMFEEDBACKIVPROC glad_glGetTransformFeedbackiv; +#define glGetTransformFeedbackiv glad_glGetTransformFeedbackiv +typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKI_VPROC)(GLuint xfb, GLenum pname, GLuint index, GLint *param); +GLAPI PFNGLGETTRANSFORMFEEDBACKI_VPROC glad_glGetTransformFeedbacki_v; +#define glGetTransformFeedbacki_v glad_glGetTransformFeedbacki_v +typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKI64_VPROC)(GLuint xfb, GLenum pname, GLuint index, GLint64 *param); +GLAPI PFNGLGETTRANSFORMFEEDBACKI64_VPROC glad_glGetTransformFeedbacki64_v; +#define glGetTransformFeedbacki64_v glad_glGetTransformFeedbacki64_v +typedef void (APIENTRYP PFNGLCREATEBUFFERSPROC)(GLsizei n, GLuint *buffers); +GLAPI PFNGLCREATEBUFFERSPROC glad_glCreateBuffers; +#define glCreateBuffers glad_glCreateBuffers +typedef void (APIENTRYP PFNGLNAMEDBUFFERSTORAGEPROC)(GLuint buffer, GLsizeiptr size, const void *data, GLbitfield flags); +GLAPI PFNGLNAMEDBUFFERSTORAGEPROC glad_glNamedBufferStorage; +#define glNamedBufferStorage glad_glNamedBufferStorage +typedef void (APIENTRYP PFNGLNAMEDBUFFERDATAPROC)(GLuint buffer, GLsizeiptr size, const void *data, GLenum usage); +GLAPI PFNGLNAMEDBUFFERDATAPROC glad_glNamedBufferData; +#define glNamedBufferData glad_glNamedBufferData +typedef void (APIENTRYP PFNGLNAMEDBUFFERSUBDATAPROC)(GLuint buffer, GLintptr offset, GLsizeiptr size, const void *data); +GLAPI PFNGLNAMEDBUFFERSUBDATAPROC glad_glNamedBufferSubData; +#define glNamedBufferSubData glad_glNamedBufferSubData +typedef void (APIENTRYP PFNGLCOPYNAMEDBUFFERSUBDATAPROC)(GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size); +GLAPI PFNGLCOPYNAMEDBUFFERSUBDATAPROC glad_glCopyNamedBufferSubData; +#define glCopyNamedBufferSubData glad_glCopyNamedBufferSubData +typedef void (APIENTRYP PFNGLCLEARNAMEDBUFFERDATAPROC)(GLuint buffer, GLenum internalformat, GLenum format, GLenum type, const void *data); +GLAPI PFNGLCLEARNAMEDBUFFERDATAPROC glad_glClearNamedBufferData; +#define glClearNamedBufferData glad_glClearNamedBufferData +typedef void (APIENTRYP PFNGLCLEARNAMEDBUFFERSUBDATAPROC)(GLuint buffer, GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum type, const void *data); +GLAPI PFNGLCLEARNAMEDBUFFERSUBDATAPROC glad_glClearNamedBufferSubData; +#define glClearNamedBufferSubData glad_glClearNamedBufferSubData +typedef void * (APIENTRYP PFNGLMAPNAMEDBUFFERPROC)(GLuint buffer, GLenum access); +GLAPI PFNGLMAPNAMEDBUFFERPROC glad_glMapNamedBuffer; +#define glMapNamedBuffer glad_glMapNamedBuffer +typedef void * (APIENTRYP PFNGLMAPNAMEDBUFFERRANGEPROC)(GLuint buffer, GLintptr offset, GLsizeiptr length, GLbitfield access); +GLAPI PFNGLMAPNAMEDBUFFERRANGEPROC glad_glMapNamedBufferRange; +#define glMapNamedBufferRange glad_glMapNamedBufferRange +typedef GLboolean (APIENTRYP PFNGLUNMAPNAMEDBUFFERPROC)(GLuint buffer); +GLAPI PFNGLUNMAPNAMEDBUFFERPROC glad_glUnmapNamedBuffer; +#define glUnmapNamedBuffer glad_glUnmapNamedBuffer +typedef void (APIENTRYP PFNGLFLUSHMAPPEDNAMEDBUFFERRANGEPROC)(GLuint buffer, GLintptr offset, GLsizeiptr length); +GLAPI PFNGLFLUSHMAPPEDNAMEDBUFFERRANGEPROC glad_glFlushMappedNamedBufferRange; +#define glFlushMappedNamedBufferRange glad_glFlushMappedNamedBufferRange +typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPARAMETERIVPROC)(GLuint buffer, GLenum pname, GLint *params); +GLAPI PFNGLGETNAMEDBUFFERPARAMETERIVPROC glad_glGetNamedBufferParameteriv; +#define glGetNamedBufferParameteriv glad_glGetNamedBufferParameteriv +typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPARAMETERI64VPROC)(GLuint buffer, GLenum pname, GLint64 *params); +GLAPI PFNGLGETNAMEDBUFFERPARAMETERI64VPROC glad_glGetNamedBufferParameteri64v; +#define glGetNamedBufferParameteri64v glad_glGetNamedBufferParameteri64v +typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPOINTERVPROC)(GLuint buffer, GLenum pname, void **params); +GLAPI PFNGLGETNAMEDBUFFERPOINTERVPROC glad_glGetNamedBufferPointerv; +#define glGetNamedBufferPointerv glad_glGetNamedBufferPointerv +typedef void (APIENTRYP PFNGLGETNAMEDBUFFERSUBDATAPROC)(GLuint buffer, GLintptr offset, GLsizeiptr size, void *data); +GLAPI PFNGLGETNAMEDBUFFERSUBDATAPROC glad_glGetNamedBufferSubData; +#define glGetNamedBufferSubData glad_glGetNamedBufferSubData +typedef void (APIENTRYP PFNGLCREATEFRAMEBUFFERSPROC)(GLsizei n, GLuint *framebuffers); +GLAPI PFNGLCREATEFRAMEBUFFERSPROC glad_glCreateFramebuffers; +#define glCreateFramebuffers glad_glCreateFramebuffers +typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERRENDERBUFFERPROC)(GLuint framebuffer, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); +GLAPI PFNGLNAMEDFRAMEBUFFERRENDERBUFFERPROC glad_glNamedFramebufferRenderbuffer; +#define glNamedFramebufferRenderbuffer glad_glNamedFramebufferRenderbuffer +typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERPARAMETERIPROC)(GLuint framebuffer, GLenum pname, GLint param); +GLAPI PFNGLNAMEDFRAMEBUFFERPARAMETERIPROC glad_glNamedFramebufferParameteri; +#define glNamedFramebufferParameteri glad_glNamedFramebufferParameteri +typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTUREPROC)(GLuint framebuffer, GLenum attachment, GLuint texture, GLint level); +GLAPI PFNGLNAMEDFRAMEBUFFERTEXTUREPROC glad_glNamedFramebufferTexture; +#define glNamedFramebufferTexture glad_glNamedFramebufferTexture +typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTURELAYERPROC)(GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLint layer); +GLAPI PFNGLNAMEDFRAMEBUFFERTEXTURELAYERPROC glad_glNamedFramebufferTextureLayer; +#define glNamedFramebufferTextureLayer glad_glNamedFramebufferTextureLayer +typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERDRAWBUFFERPROC)(GLuint framebuffer, GLenum buf); +GLAPI PFNGLNAMEDFRAMEBUFFERDRAWBUFFERPROC glad_glNamedFramebufferDrawBuffer; +#define glNamedFramebufferDrawBuffer glad_glNamedFramebufferDrawBuffer +typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERDRAWBUFFERSPROC)(GLuint framebuffer, GLsizei n, const GLenum *bufs); +GLAPI PFNGLNAMEDFRAMEBUFFERDRAWBUFFERSPROC glad_glNamedFramebufferDrawBuffers; +#define glNamedFramebufferDrawBuffers glad_glNamedFramebufferDrawBuffers +typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERREADBUFFERPROC)(GLuint framebuffer, GLenum src); +GLAPI PFNGLNAMEDFRAMEBUFFERREADBUFFERPROC glad_glNamedFramebufferReadBuffer; +#define glNamedFramebufferReadBuffer glad_glNamedFramebufferReadBuffer +typedef void (APIENTRYP PFNGLINVALIDATENAMEDFRAMEBUFFERDATAPROC)(GLuint framebuffer, GLsizei numAttachments, const GLenum *attachments); +GLAPI PFNGLINVALIDATENAMEDFRAMEBUFFERDATAPROC glad_glInvalidateNamedFramebufferData; +#define glInvalidateNamedFramebufferData glad_glInvalidateNamedFramebufferData +typedef void (APIENTRYP PFNGLINVALIDATENAMEDFRAMEBUFFERSUBDATAPROC)(GLuint framebuffer, GLsizei numAttachments, const GLenum *attachments, GLint x, GLint y, GLsizei width, GLsizei height); +GLAPI PFNGLINVALIDATENAMEDFRAMEBUFFERSUBDATAPROC glad_glInvalidateNamedFramebufferSubData; +#define glInvalidateNamedFramebufferSubData glad_glInvalidateNamedFramebufferSubData +typedef void (APIENTRYP PFNGLCLEARNAMEDFRAMEBUFFERIVPROC)(GLuint framebuffer, GLenum buffer, GLint drawbuffer, const GLint *value); +GLAPI PFNGLCLEARNAMEDFRAMEBUFFERIVPROC glad_glClearNamedFramebufferiv; +#define glClearNamedFramebufferiv glad_glClearNamedFramebufferiv +typedef void (APIENTRYP PFNGLCLEARNAMEDFRAMEBUFFERUIVPROC)(GLuint framebuffer, GLenum buffer, GLint drawbuffer, const GLuint *value); +GLAPI PFNGLCLEARNAMEDFRAMEBUFFERUIVPROC glad_glClearNamedFramebufferuiv; +#define glClearNamedFramebufferuiv glad_glClearNamedFramebufferuiv +typedef void (APIENTRYP PFNGLCLEARNAMEDFRAMEBUFFERFVPROC)(GLuint framebuffer, GLenum buffer, GLint drawbuffer, const GLfloat *value); +GLAPI PFNGLCLEARNAMEDFRAMEBUFFERFVPROC glad_glClearNamedFramebufferfv; +#define glClearNamedFramebufferfv glad_glClearNamedFramebufferfv +typedef void (APIENTRYP PFNGLCLEARNAMEDFRAMEBUFFERFIPROC)(GLuint framebuffer, GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil); +GLAPI PFNGLCLEARNAMEDFRAMEBUFFERFIPROC glad_glClearNamedFramebufferfi; +#define glClearNamedFramebufferfi glad_glClearNamedFramebufferfi +typedef void (APIENTRYP PFNGLBLITNAMEDFRAMEBUFFERPROC)(GLuint readFramebuffer, GLuint drawFramebuffer, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); +GLAPI PFNGLBLITNAMEDFRAMEBUFFERPROC glad_glBlitNamedFramebuffer; +#define glBlitNamedFramebuffer glad_glBlitNamedFramebuffer +typedef GLenum (APIENTRYP PFNGLCHECKNAMEDFRAMEBUFFERSTATUSPROC)(GLuint framebuffer, GLenum target); +GLAPI PFNGLCHECKNAMEDFRAMEBUFFERSTATUSPROC glad_glCheckNamedFramebufferStatus; +#define glCheckNamedFramebufferStatus glad_glCheckNamedFramebufferStatus +typedef void (APIENTRYP PFNGLGETNAMEDFRAMEBUFFERPARAMETERIVPROC)(GLuint framebuffer, GLenum pname, GLint *param); +GLAPI PFNGLGETNAMEDFRAMEBUFFERPARAMETERIVPROC glad_glGetNamedFramebufferParameteriv; +#define glGetNamedFramebufferParameteriv glad_glGetNamedFramebufferParameteriv +typedef void (APIENTRYP PFNGLGETNAMEDFRAMEBUFFERATTACHMENTPARAMETERIVPROC)(GLuint framebuffer, GLenum attachment, GLenum pname, GLint *params); +GLAPI PFNGLGETNAMEDFRAMEBUFFERATTACHMENTPARAMETERIVPROC glad_glGetNamedFramebufferAttachmentParameteriv; +#define glGetNamedFramebufferAttachmentParameteriv glad_glGetNamedFramebufferAttachmentParameteriv +typedef void (APIENTRYP PFNGLCREATERENDERBUFFERSPROC)(GLsizei n, GLuint *renderbuffers); +GLAPI PFNGLCREATERENDERBUFFERSPROC glad_glCreateRenderbuffers; +#define glCreateRenderbuffers glad_glCreateRenderbuffers +typedef void (APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEPROC)(GLuint renderbuffer, GLenum internalformat, GLsizei width, GLsizei height); +GLAPI PFNGLNAMEDRENDERBUFFERSTORAGEPROC glad_glNamedRenderbufferStorage; +#define glNamedRenderbufferStorage glad_glNamedRenderbufferStorage +typedef void (APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLEPROC)(GLuint renderbuffer, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); +GLAPI PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLEPROC glad_glNamedRenderbufferStorageMultisample; +#define glNamedRenderbufferStorageMultisample glad_glNamedRenderbufferStorageMultisample +typedef void (APIENTRYP PFNGLGETNAMEDRENDERBUFFERPARAMETERIVPROC)(GLuint renderbuffer, GLenum pname, GLint *params); +GLAPI PFNGLGETNAMEDRENDERBUFFERPARAMETERIVPROC glad_glGetNamedRenderbufferParameteriv; +#define glGetNamedRenderbufferParameteriv glad_glGetNamedRenderbufferParameteriv +typedef void (APIENTRYP PFNGLCREATETEXTURESPROC)(GLenum target, GLsizei n, GLuint *textures); +GLAPI PFNGLCREATETEXTURESPROC glad_glCreateTextures; +#define glCreateTextures glad_glCreateTextures +typedef void (APIENTRYP PFNGLTEXTUREBUFFERPROC)(GLuint texture, GLenum internalformat, GLuint buffer); +GLAPI PFNGLTEXTUREBUFFERPROC glad_glTextureBuffer; +#define glTextureBuffer glad_glTextureBuffer +typedef void (APIENTRYP PFNGLTEXTUREBUFFERRANGEPROC)(GLuint texture, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size); +GLAPI PFNGLTEXTUREBUFFERRANGEPROC glad_glTextureBufferRange; +#define glTextureBufferRange glad_glTextureBufferRange +typedef void (APIENTRYP PFNGLTEXTURESTORAGE1DPROC)(GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width); +GLAPI PFNGLTEXTURESTORAGE1DPROC glad_glTextureStorage1D; +#define glTextureStorage1D glad_glTextureStorage1D +typedef void (APIENTRYP PFNGLTEXTURESTORAGE2DPROC)(GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height); +GLAPI PFNGLTEXTURESTORAGE2DPROC glad_glTextureStorage2D; +#define glTextureStorage2D glad_glTextureStorage2D +typedef void (APIENTRYP PFNGLTEXTURESTORAGE3DPROC)(GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth); +GLAPI PFNGLTEXTURESTORAGE3DPROC glad_glTextureStorage3D; +#define glTextureStorage3D glad_glTextureStorage3D +typedef void (APIENTRYP PFNGLTEXTURESTORAGE2DMULTISAMPLEPROC)(GLuint texture, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations); +GLAPI PFNGLTEXTURESTORAGE2DMULTISAMPLEPROC glad_glTextureStorage2DMultisample; +#define glTextureStorage2DMultisample glad_glTextureStorage2DMultisample +typedef void (APIENTRYP PFNGLTEXTURESTORAGE3DMULTISAMPLEPROC)(GLuint texture, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations); +GLAPI PFNGLTEXTURESTORAGE3DMULTISAMPLEPROC glad_glTextureStorage3DMultisample; +#define glTextureStorage3DMultisample glad_glTextureStorage3DMultisample +typedef void (APIENTRYP PFNGLTEXTURESUBIMAGE1DPROC)(GLuint texture, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void *pixels); +GLAPI PFNGLTEXTURESUBIMAGE1DPROC glad_glTextureSubImage1D; +#define glTextureSubImage1D glad_glTextureSubImage1D +typedef void (APIENTRYP PFNGLTEXTURESUBIMAGE2DPROC)(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels); +GLAPI PFNGLTEXTURESUBIMAGE2DPROC glad_glTextureSubImage2D; +#define glTextureSubImage2D glad_glTextureSubImage2D +typedef void (APIENTRYP PFNGLTEXTURESUBIMAGE3DPROC)(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels); +GLAPI PFNGLTEXTURESUBIMAGE3DPROC glad_glTextureSubImage3D; +#define glTextureSubImage3D glad_glTextureSubImage3D +typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTURESUBIMAGE1DPROC)(GLuint texture, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *data); +GLAPI PFNGLCOMPRESSEDTEXTURESUBIMAGE1DPROC glad_glCompressedTextureSubImage1D; +#define glCompressedTextureSubImage1D glad_glCompressedTextureSubImage1D +typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTURESUBIMAGE2DPROC)(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data); +GLAPI PFNGLCOMPRESSEDTEXTURESUBIMAGE2DPROC glad_glCompressedTextureSubImage2D; +#define glCompressedTextureSubImage2D glad_glCompressedTextureSubImage2D +typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTURESUBIMAGE3DPROC)(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data); +GLAPI PFNGLCOMPRESSEDTEXTURESUBIMAGE3DPROC glad_glCompressedTextureSubImage3D; +#define glCompressedTextureSubImage3D glad_glCompressedTextureSubImage3D +typedef void (APIENTRYP PFNGLCOPYTEXTURESUBIMAGE1DPROC)(GLuint texture, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width); +GLAPI PFNGLCOPYTEXTURESUBIMAGE1DPROC glad_glCopyTextureSubImage1D; +#define glCopyTextureSubImage1D glad_glCopyTextureSubImage1D +typedef void (APIENTRYP PFNGLCOPYTEXTURESUBIMAGE2DPROC)(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height); +GLAPI PFNGLCOPYTEXTURESUBIMAGE2DPROC glad_glCopyTextureSubImage2D; +#define glCopyTextureSubImage2D glad_glCopyTextureSubImage2D +typedef void (APIENTRYP PFNGLCOPYTEXTURESUBIMAGE3DPROC)(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); +GLAPI PFNGLCOPYTEXTURESUBIMAGE3DPROC glad_glCopyTextureSubImage3D; +#define glCopyTextureSubImage3D glad_glCopyTextureSubImage3D +typedef void (APIENTRYP PFNGLTEXTUREPARAMETERFPROC)(GLuint texture, GLenum pname, GLfloat param); +GLAPI PFNGLTEXTUREPARAMETERFPROC glad_glTextureParameterf; +#define glTextureParameterf glad_glTextureParameterf +typedef void (APIENTRYP PFNGLTEXTUREPARAMETERFVPROC)(GLuint texture, GLenum pname, const GLfloat *param); +GLAPI PFNGLTEXTUREPARAMETERFVPROC glad_glTextureParameterfv; +#define glTextureParameterfv glad_glTextureParameterfv +typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIPROC)(GLuint texture, GLenum pname, GLint param); +GLAPI PFNGLTEXTUREPARAMETERIPROC glad_glTextureParameteri; +#define glTextureParameteri glad_glTextureParameteri +typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIIVPROC)(GLuint texture, GLenum pname, const GLint *params); +GLAPI PFNGLTEXTUREPARAMETERIIVPROC glad_glTextureParameterIiv; +#define glTextureParameterIiv glad_glTextureParameterIiv +typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIUIVPROC)(GLuint texture, GLenum pname, const GLuint *params); +GLAPI PFNGLTEXTUREPARAMETERIUIVPROC glad_glTextureParameterIuiv; +#define glTextureParameterIuiv glad_glTextureParameterIuiv +typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIVPROC)(GLuint texture, GLenum pname, const GLint *param); +GLAPI PFNGLTEXTUREPARAMETERIVPROC glad_glTextureParameteriv; +#define glTextureParameteriv glad_glTextureParameteriv +typedef void (APIENTRYP PFNGLGENERATETEXTUREMIPMAPPROC)(GLuint texture); +GLAPI PFNGLGENERATETEXTUREMIPMAPPROC glad_glGenerateTextureMipmap; +#define glGenerateTextureMipmap glad_glGenerateTextureMipmap +typedef void (APIENTRYP PFNGLBINDTEXTUREUNITPROC)(GLuint unit, GLuint texture); +GLAPI PFNGLBINDTEXTUREUNITPROC glad_glBindTextureUnit; +#define glBindTextureUnit glad_glBindTextureUnit +typedef void (APIENTRYP PFNGLGETTEXTUREIMAGEPROC)(GLuint texture, GLint level, GLenum format, GLenum type, GLsizei bufSize, void *pixels); +GLAPI PFNGLGETTEXTUREIMAGEPROC glad_glGetTextureImage; +#define glGetTextureImage glad_glGetTextureImage +typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXTUREIMAGEPROC)(GLuint texture, GLint level, GLsizei bufSize, void *pixels); +GLAPI PFNGLGETCOMPRESSEDTEXTUREIMAGEPROC glad_glGetCompressedTextureImage; +#define glGetCompressedTextureImage glad_glGetCompressedTextureImage +typedef void (APIENTRYP PFNGLGETTEXTURELEVELPARAMETERFVPROC)(GLuint texture, GLint level, GLenum pname, GLfloat *params); +GLAPI PFNGLGETTEXTURELEVELPARAMETERFVPROC glad_glGetTextureLevelParameterfv; +#define glGetTextureLevelParameterfv glad_glGetTextureLevelParameterfv +typedef void (APIENTRYP PFNGLGETTEXTURELEVELPARAMETERIVPROC)(GLuint texture, GLint level, GLenum pname, GLint *params); +GLAPI PFNGLGETTEXTURELEVELPARAMETERIVPROC glad_glGetTextureLevelParameteriv; +#define glGetTextureLevelParameteriv glad_glGetTextureLevelParameteriv +typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERFVPROC)(GLuint texture, GLenum pname, GLfloat *params); +GLAPI PFNGLGETTEXTUREPARAMETERFVPROC glad_glGetTextureParameterfv; +#define glGetTextureParameterfv glad_glGetTextureParameterfv +typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERIIVPROC)(GLuint texture, GLenum pname, GLint *params); +GLAPI PFNGLGETTEXTUREPARAMETERIIVPROC glad_glGetTextureParameterIiv; +#define glGetTextureParameterIiv glad_glGetTextureParameterIiv +typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERIUIVPROC)(GLuint texture, GLenum pname, GLuint *params); +GLAPI PFNGLGETTEXTUREPARAMETERIUIVPROC glad_glGetTextureParameterIuiv; +#define glGetTextureParameterIuiv glad_glGetTextureParameterIuiv +typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERIVPROC)(GLuint texture, GLenum pname, GLint *params); +GLAPI PFNGLGETTEXTUREPARAMETERIVPROC glad_glGetTextureParameteriv; +#define glGetTextureParameteriv glad_glGetTextureParameteriv +typedef void (APIENTRYP PFNGLCREATEVERTEXARRAYSPROC)(GLsizei n, GLuint *arrays); +GLAPI PFNGLCREATEVERTEXARRAYSPROC glad_glCreateVertexArrays; +#define glCreateVertexArrays glad_glCreateVertexArrays +typedef void (APIENTRYP PFNGLDISABLEVERTEXARRAYATTRIBPROC)(GLuint vaobj, GLuint index); +GLAPI PFNGLDISABLEVERTEXARRAYATTRIBPROC glad_glDisableVertexArrayAttrib; +#define glDisableVertexArrayAttrib glad_glDisableVertexArrayAttrib +typedef void (APIENTRYP PFNGLENABLEVERTEXARRAYATTRIBPROC)(GLuint vaobj, GLuint index); +GLAPI PFNGLENABLEVERTEXARRAYATTRIBPROC glad_glEnableVertexArrayAttrib; +#define glEnableVertexArrayAttrib glad_glEnableVertexArrayAttrib +typedef void (APIENTRYP PFNGLVERTEXARRAYELEMENTBUFFERPROC)(GLuint vaobj, GLuint buffer); +GLAPI PFNGLVERTEXARRAYELEMENTBUFFERPROC glad_glVertexArrayElementBuffer; +#define glVertexArrayElementBuffer glad_glVertexArrayElementBuffer +typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXBUFFERPROC)(GLuint vaobj, GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride); +GLAPI PFNGLVERTEXARRAYVERTEXBUFFERPROC glad_glVertexArrayVertexBuffer; +#define glVertexArrayVertexBuffer glad_glVertexArrayVertexBuffer +typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXBUFFERSPROC)(GLuint vaobj, GLuint first, GLsizei count, const GLuint *buffers, const GLintptr *offsets, const GLsizei *strides); +GLAPI PFNGLVERTEXARRAYVERTEXBUFFERSPROC glad_glVertexArrayVertexBuffers; +#define glVertexArrayVertexBuffers glad_glVertexArrayVertexBuffers +typedef void (APIENTRYP PFNGLVERTEXARRAYATTRIBBINDINGPROC)(GLuint vaobj, GLuint attribindex, GLuint bindingindex); +GLAPI PFNGLVERTEXARRAYATTRIBBINDINGPROC glad_glVertexArrayAttribBinding; +#define glVertexArrayAttribBinding glad_glVertexArrayAttribBinding +typedef void (APIENTRYP PFNGLVERTEXARRAYATTRIBFORMATPROC)(GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLboolean normalized, GLuint relativeoffset); +GLAPI PFNGLVERTEXARRAYATTRIBFORMATPROC glad_glVertexArrayAttribFormat; +#define glVertexArrayAttribFormat glad_glVertexArrayAttribFormat +typedef void (APIENTRYP PFNGLVERTEXARRAYATTRIBIFORMATPROC)(GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset); +GLAPI PFNGLVERTEXARRAYATTRIBIFORMATPROC glad_glVertexArrayAttribIFormat; +#define glVertexArrayAttribIFormat glad_glVertexArrayAttribIFormat +typedef void (APIENTRYP PFNGLVERTEXARRAYATTRIBLFORMATPROC)(GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset); +GLAPI PFNGLVERTEXARRAYATTRIBLFORMATPROC glad_glVertexArrayAttribLFormat; +#define glVertexArrayAttribLFormat glad_glVertexArrayAttribLFormat +typedef void (APIENTRYP PFNGLVERTEXARRAYBINDINGDIVISORPROC)(GLuint vaobj, GLuint bindingindex, GLuint divisor); +GLAPI PFNGLVERTEXARRAYBINDINGDIVISORPROC glad_glVertexArrayBindingDivisor; +#define glVertexArrayBindingDivisor glad_glVertexArrayBindingDivisor +typedef void (APIENTRYP PFNGLGETVERTEXARRAYIVPROC)(GLuint vaobj, GLenum pname, GLint *param); +GLAPI PFNGLGETVERTEXARRAYIVPROC glad_glGetVertexArrayiv; +#define glGetVertexArrayiv glad_glGetVertexArrayiv +typedef void (APIENTRYP PFNGLGETVERTEXARRAYINDEXEDIVPROC)(GLuint vaobj, GLuint index, GLenum pname, GLint *param); +GLAPI PFNGLGETVERTEXARRAYINDEXEDIVPROC glad_glGetVertexArrayIndexediv; +#define glGetVertexArrayIndexediv glad_glGetVertexArrayIndexediv +typedef void (APIENTRYP PFNGLGETVERTEXARRAYINDEXED64IVPROC)(GLuint vaobj, GLuint index, GLenum pname, GLint64 *param); +GLAPI PFNGLGETVERTEXARRAYINDEXED64IVPROC glad_glGetVertexArrayIndexed64iv; +#define glGetVertexArrayIndexed64iv glad_glGetVertexArrayIndexed64iv +typedef void (APIENTRYP PFNGLCREATESAMPLERSPROC)(GLsizei n, GLuint *samplers); +GLAPI PFNGLCREATESAMPLERSPROC glad_glCreateSamplers; +#define glCreateSamplers glad_glCreateSamplers +typedef void (APIENTRYP PFNGLCREATEPROGRAMPIPELINESPROC)(GLsizei n, GLuint *pipelines); +GLAPI PFNGLCREATEPROGRAMPIPELINESPROC glad_glCreateProgramPipelines; +#define glCreateProgramPipelines glad_glCreateProgramPipelines +typedef void (APIENTRYP PFNGLCREATEQUERIESPROC)(GLenum target, GLsizei n, GLuint *ids); +GLAPI PFNGLCREATEQUERIESPROC glad_glCreateQueries; +#define glCreateQueries glad_glCreateQueries +typedef void (APIENTRYP PFNGLGETQUERYBUFFEROBJECTI64VPROC)(GLuint id, GLuint buffer, GLenum pname, GLintptr offset); +GLAPI PFNGLGETQUERYBUFFEROBJECTI64VPROC glad_glGetQueryBufferObjecti64v; +#define glGetQueryBufferObjecti64v glad_glGetQueryBufferObjecti64v +typedef void (APIENTRYP PFNGLGETQUERYBUFFEROBJECTIVPROC)(GLuint id, GLuint buffer, GLenum pname, GLintptr offset); +GLAPI PFNGLGETQUERYBUFFEROBJECTIVPROC glad_glGetQueryBufferObjectiv; +#define glGetQueryBufferObjectiv glad_glGetQueryBufferObjectiv +typedef void (APIENTRYP PFNGLGETQUERYBUFFEROBJECTUI64VPROC)(GLuint id, GLuint buffer, GLenum pname, GLintptr offset); +GLAPI PFNGLGETQUERYBUFFEROBJECTUI64VPROC glad_glGetQueryBufferObjectui64v; +#define glGetQueryBufferObjectui64v glad_glGetQueryBufferObjectui64v +typedef void (APIENTRYP PFNGLGETQUERYBUFFEROBJECTUIVPROC)(GLuint id, GLuint buffer, GLenum pname, GLintptr offset); +GLAPI PFNGLGETQUERYBUFFEROBJECTUIVPROC glad_glGetQueryBufferObjectuiv; +#define glGetQueryBufferObjectuiv glad_glGetQueryBufferObjectuiv +typedef void (APIENTRYP PFNGLMEMORYBARRIERBYREGIONPROC)(GLbitfield barriers); +GLAPI PFNGLMEMORYBARRIERBYREGIONPROC glad_glMemoryBarrierByRegion; +#define glMemoryBarrierByRegion glad_glMemoryBarrierByRegion +typedef void (APIENTRYP PFNGLGETTEXTURESUBIMAGEPROC)(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, GLsizei bufSize, void *pixels); +GLAPI PFNGLGETTEXTURESUBIMAGEPROC glad_glGetTextureSubImage; +#define glGetTextureSubImage glad_glGetTextureSubImage +typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXTURESUBIMAGEPROC)(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLsizei bufSize, void *pixels); +GLAPI PFNGLGETCOMPRESSEDTEXTURESUBIMAGEPROC glad_glGetCompressedTextureSubImage; +#define glGetCompressedTextureSubImage glad_glGetCompressedTextureSubImage +typedef GLenum (APIENTRYP PFNGLGETGRAPHICSRESETSTATUSPROC)(void); +GLAPI PFNGLGETGRAPHICSRESETSTATUSPROC glad_glGetGraphicsResetStatus; +#define glGetGraphicsResetStatus glad_glGetGraphicsResetStatus +typedef void (APIENTRYP PFNGLGETNCOMPRESSEDTEXIMAGEPROC)(GLenum target, GLint lod, GLsizei bufSize, void *pixels); +GLAPI PFNGLGETNCOMPRESSEDTEXIMAGEPROC glad_glGetnCompressedTexImage; +#define glGetnCompressedTexImage glad_glGetnCompressedTexImage +typedef void (APIENTRYP PFNGLGETNTEXIMAGEPROC)(GLenum target, GLint level, GLenum format, GLenum type, GLsizei bufSize, void *pixels); +GLAPI PFNGLGETNTEXIMAGEPROC glad_glGetnTexImage; +#define glGetnTexImage glad_glGetnTexImage +typedef void (APIENTRYP PFNGLGETNUNIFORMDVPROC)(GLuint program, GLint location, GLsizei bufSize, GLdouble *params); +GLAPI PFNGLGETNUNIFORMDVPROC glad_glGetnUniformdv; +#define glGetnUniformdv glad_glGetnUniformdv +typedef void (APIENTRYP PFNGLGETNUNIFORMFVPROC)(GLuint program, GLint location, GLsizei bufSize, GLfloat *params); +GLAPI PFNGLGETNUNIFORMFVPROC glad_glGetnUniformfv; +#define glGetnUniformfv glad_glGetnUniformfv +typedef void (APIENTRYP PFNGLGETNUNIFORMIVPROC)(GLuint program, GLint location, GLsizei bufSize, GLint *params); +GLAPI PFNGLGETNUNIFORMIVPROC glad_glGetnUniformiv; +#define glGetnUniformiv glad_glGetnUniformiv +typedef void (APIENTRYP PFNGLGETNUNIFORMUIVPROC)(GLuint program, GLint location, GLsizei bufSize, GLuint *params); +GLAPI PFNGLGETNUNIFORMUIVPROC glad_glGetnUniformuiv; +#define glGetnUniformuiv glad_glGetnUniformuiv +typedef void (APIENTRYP PFNGLREADNPIXELSPROC)(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void *data); +GLAPI PFNGLREADNPIXELSPROC glad_glReadnPixels; +#define glReadnPixels glad_glReadnPixels +typedef void (APIENTRYP PFNGLGETNMAPDVPROC)(GLenum target, GLenum query, GLsizei bufSize, GLdouble *v); +GLAPI PFNGLGETNMAPDVPROC glad_glGetnMapdv; +#define glGetnMapdv glad_glGetnMapdv +typedef void (APIENTRYP PFNGLGETNMAPFVPROC)(GLenum target, GLenum query, GLsizei bufSize, GLfloat *v); +GLAPI PFNGLGETNMAPFVPROC glad_glGetnMapfv; +#define glGetnMapfv glad_glGetnMapfv +typedef void (APIENTRYP PFNGLGETNMAPIVPROC)(GLenum target, GLenum query, GLsizei bufSize, GLint *v); +GLAPI PFNGLGETNMAPIVPROC glad_glGetnMapiv; +#define glGetnMapiv glad_glGetnMapiv +typedef void (APIENTRYP PFNGLGETNPIXELMAPFVPROC)(GLenum map, GLsizei bufSize, GLfloat *values); +GLAPI PFNGLGETNPIXELMAPFVPROC glad_glGetnPixelMapfv; +#define glGetnPixelMapfv glad_glGetnPixelMapfv +typedef void (APIENTRYP PFNGLGETNPIXELMAPUIVPROC)(GLenum map, GLsizei bufSize, GLuint *values); +GLAPI PFNGLGETNPIXELMAPUIVPROC glad_glGetnPixelMapuiv; +#define glGetnPixelMapuiv glad_glGetnPixelMapuiv +typedef void (APIENTRYP PFNGLGETNPIXELMAPUSVPROC)(GLenum map, GLsizei bufSize, GLushort *values); +GLAPI PFNGLGETNPIXELMAPUSVPROC glad_glGetnPixelMapusv; +#define glGetnPixelMapusv glad_glGetnPixelMapusv +typedef void (APIENTRYP PFNGLGETNPOLYGONSTIPPLEPROC)(GLsizei bufSize, GLubyte *pattern); +GLAPI PFNGLGETNPOLYGONSTIPPLEPROC glad_glGetnPolygonStipple; +#define glGetnPolygonStipple glad_glGetnPolygonStipple +typedef void (APIENTRYP PFNGLGETNCOLORTABLEPROC)(GLenum target, GLenum format, GLenum type, GLsizei bufSize, void *table); +GLAPI PFNGLGETNCOLORTABLEPROC glad_glGetnColorTable; +#define glGetnColorTable glad_glGetnColorTable +typedef void (APIENTRYP PFNGLGETNCONVOLUTIONFILTERPROC)(GLenum target, GLenum format, GLenum type, GLsizei bufSize, void *image); +GLAPI PFNGLGETNCONVOLUTIONFILTERPROC glad_glGetnConvolutionFilter; +#define glGetnConvolutionFilter glad_glGetnConvolutionFilter +typedef void (APIENTRYP PFNGLGETNSEPARABLEFILTERPROC)(GLenum target, GLenum format, GLenum type, GLsizei rowBufSize, void *row, GLsizei columnBufSize, void *column, void *span); +GLAPI PFNGLGETNSEPARABLEFILTERPROC glad_glGetnSeparableFilter; +#define glGetnSeparableFilter glad_glGetnSeparableFilter +typedef void (APIENTRYP PFNGLGETNHISTOGRAMPROC)(GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, void *values); +GLAPI PFNGLGETNHISTOGRAMPROC glad_glGetnHistogram; +#define glGetnHistogram glad_glGetnHistogram +typedef void (APIENTRYP PFNGLGETNMINMAXPROC)(GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, void *values); +GLAPI PFNGLGETNMINMAXPROC glad_glGetnMinmax; +#define glGetnMinmax glad_glGetnMinmax +typedef void (APIENTRYP PFNGLTEXTUREBARRIERPROC)(void); +GLAPI PFNGLTEXTUREBARRIERPROC glad_glTextureBarrier; +#define glTextureBarrier glad_glTextureBarrier +#endif +#ifndef GL_VERSION_4_6 +#define GL_VERSION_4_6 1 +GLAPI int GLAD_GL_VERSION_4_6; +typedef void (APIENTRYP PFNGLSPECIALIZESHADERPROC)(GLuint shader, const GLchar *pEntryPoint, GLuint numSpecializationConstants, const GLuint *pConstantIndex, const GLuint *pConstantValue); +GLAPI PFNGLSPECIALIZESHADERPROC glad_glSpecializeShader; +#define glSpecializeShader glad_glSpecializeShader +typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSINDIRECTCOUNTPROC)(GLenum mode, const void *indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride); +GLAPI PFNGLMULTIDRAWARRAYSINDIRECTCOUNTPROC glad_glMultiDrawArraysIndirectCount; +#define glMultiDrawArraysIndirectCount glad_glMultiDrawArraysIndirectCount +typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSINDIRECTCOUNTPROC)(GLenum mode, GLenum type, const void *indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride); +GLAPI PFNGLMULTIDRAWELEMENTSINDIRECTCOUNTPROC glad_glMultiDrawElementsIndirectCount; +#define glMultiDrawElementsIndirectCount glad_glMultiDrawElementsIndirectCount +typedef void (APIENTRYP PFNGLPOLYGONOFFSETCLAMPPROC)(GLfloat factor, GLfloat units, GLfloat clamp); +GLAPI PFNGLPOLYGONOFFSETCLAMPPROC glad_glPolygonOffsetClamp; +#define glPolygonOffsetClamp glad_glPolygonOffsetClamp +#endif +#define GL_COMPRESSED_RED_RGTC1_EXT 0x8DBB +#define GL_COMPRESSED_SIGNED_RED_RGTC1_EXT 0x8DBC +#define GL_COMPRESSED_RED_GREEN_RGTC2_EXT 0x8DBD +#define GL_COMPRESSED_SIGNED_RED_GREEN_RGTC2_EXT 0x8DBE +#define GL_COMPRESSED_RGB_S3TC_DXT1_EXT 0x83F0 +#define GL_COMPRESSED_RGBA_S3TC_DXT1_EXT 0x83F1 +#define GL_COMPRESSED_RGBA_S3TC_DXT3_EXT 0x83F2 +#define GL_COMPRESSED_RGBA_S3TC_DXT5_EXT 0x83F3 +#define GL_TEXTURE_MAX_ANISOTROPY_EXT 0x84FE +#define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF +#ifndef GL_EXT_texture_compression_rgtc +#define GL_EXT_texture_compression_rgtc 1 +GLAPI int GLAD_GL_EXT_texture_compression_rgtc; +#endif +#ifndef GL_EXT_texture_compression_s3tc +#define GL_EXT_texture_compression_s3tc 1 +GLAPI int GLAD_GL_EXT_texture_compression_s3tc; +#endif +#ifndef GL_EXT_texture_filter_anisotropic +#define GL_EXT_texture_filter_anisotropic 1 +GLAPI int GLAD_GL_EXT_texture_filter_anisotropic; +#endif + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/src/CRE/Glitter/animation.cpp b/src/CRE/Glitter/animation.cpp index ca06c68c..16bb5366 100644 --- a/src/CRE/Glitter/animation.cpp +++ b/src/CRE/Glitter/animation.cpp @@ -29,4 +29,18 @@ namespace Glitter { } } #endif + + Animation& Animation::operator=(const Animation& anim) { + for (Curve*& i : curves) + delete i; + curves.clear(); + + curves.reserve(anim.curves.size()); + for (Curve* i : anim.curves) { + Curve* curv = new Curve(i->version > 0x01 ? Glitter::X : Glitter::F2); + *curv = *i; + curves.push_back(curv); + } + return *this; + } } diff --git a/src/CRE/Glitter/curve.cpp b/src/CRE/Glitter/curve.cpp index fd7c6e0e..0af3678b 100644 --- a/src/CRE/Glitter/curve.cpp +++ b/src/CRE/Glitter/curve.cpp @@ -123,8 +123,8 @@ namespace Glitter { if (key_type == KEY_CONSTANT) return F2RandomizeKey(GLT_VAL, curr, random); - float_t df = frame - (float_t)curr->frame; - float_t t = df / (float_t)(next->frame - curr->frame); + float_t df = (float_t)(next->frame - curr->frame); + float_t t = (frame - (float_t)curr->frame) / df; float_t val; if (key_type == KEY_HERMITE) { float_t t_1 = t - 1.0f; @@ -132,7 +132,7 @@ namespace Glitter { float_t curr_val = F2RandomizeKey(GLT_VAL, curr, random); val = F2RandomizeKey(GLT_VAL, curr, random); val += t * t * (3.0f - 2.0f * t) * (next_val - curr_val) - + (t_1 * curr->tangent2 + t * next->tangent1) * df * t_1; + + (t_1 * curr->tangent2 + t * next->tangent1) * t_1 * df; } else { float_t curr_val = F2RandomizeKey(GLT_VAL, curr, random); @@ -597,7 +597,7 @@ namespace Glitter { float_t curr_val = XRandomizeKey(curr, random); val = XRandomizeKey(curr, random); val += t * t * (3.0f - 2.0f * t) * (next_val - curr_val) - + (t_1 * curr->tangent2 + t * next->tangent1) * df * t_1; + + (t_1 * curr->tangent2 + t * next->tangent1) * t_1 * df; } else { float_t curr_val = XRandomizeKey(curr, random); diff --git a/src/CRE/Glitter/effect.cpp b/src/CRE/Glitter/effect.cpp index ed00a1ed..48a903d4 100644 --- a/src/CRE/Glitter/effect.cpp +++ b/src/CRE/Glitter/effect.cpp @@ -20,6 +20,7 @@ namespace Glitter { color = { 0xFF, 0xFF, 0xFF, 0xFF }; name_hash = GLT_VAL != Glitter::FT ? hash_murmurhash_empty : hash_fnv1a64m_empty; + ext_anim_is_x = GLT_VAL == Glitter::X; } Effect::Effect(GLT) : data(GLT_VAL) { @@ -29,5 +30,38 @@ namespace Glitter { Effect::~Effect() { for (Emitter*& i : emitters) delete i; + + if (data.ext_anim) + free(data.ext_anim); + } + + Effect& Effect::operator=(const Effect& eff) { + if (data.ext_anim) + free(data.ext_anim); + + data = eff.data; + version = eff.version; + + if (eff.data.ext_anim) + if (!data.ext_anim_is_x) { + data.ext_anim = force_malloc_s(Effect::ExtAnim, 1); + *data.ext_anim = *eff.data.ext_anim; + } + else { + data.ext_anim_x = force_malloc_s(Effect::ExtAnimX, 1); + *data.ext_anim_x = *eff.data.ext_anim_x; + } + + for (Emitter*& i : emitters) + delete i; + emitters.clear(); + + emitters.reserve(eff.emitters.size()); + for (Emitter* i : eff.emitters) { + Emitter* emit = new Emitter(i->version > 0x02 ? Glitter::X : Glitter::F2); + *emit = *i; + emitters.push_back(emit); + } + return *this; } } diff --git a/src/CRE/Glitter/effect_group.cpp b/src/CRE/Glitter/effect_group.cpp index ff0a38ef..89e8760c 100644 --- a/src/CRE/Glitter/effect_group.cpp +++ b/src/CRE/Glitter/effect_group.cpp @@ -59,9 +59,8 @@ namespace Glitter { obj* obj = &set->obj_data[i]; for (uint32_t j = 0; j < obj->num_material; j++) { obj_material* mat = &obj->material_array[j].material; - if (!memcmp(&mat->color.emission, &vec3_null, sizeof(vec3)) - && mat->color.emission.w == 1.0f) - mat->color.emission = vec4_identity; + if (*(vec3*)&mat->color.emission == 0.0f && mat->color.emission.w == 1.0f) + mat->color.emission = 1.0f; } } } @@ -124,34 +123,3 @@ namespace Glitter { } #endif } - -/* -#include "effect_group.hpp" -#include "../../KKdLib/database/object.h" -#include "../../KKdLib/database/texture.h" -#include "../../KKdLib/io/path.hpp" -#include "../../KKdLib/obj.h" -#include "../../KKdLib/farc.h" -#include "../../KKdLib/obj.h" -#include "../../KKdLib/str_utils.hpp" -#include "../data.h" -#include "../object.h" -#include "effect.hpp" -#include "scene.hpp" -#include "texture.hpp" - -bool EffectGroup::ParseFile(f2_struct* st, object_database* obj_db) { - for (f2_struct& i : st->sub_structs) { - if (!i.header.data_size) - continue; - - if (i.header.signature == reverse_endianness_uint32_t('EFCT') - && !glitter_effect_parse_file(this, &i, &effects, obj_db)) - return false; - else if (i.header.signature == reverse_endianness_uint32_t('DVRS') - && !glitter_texture_hashes_unpack_file(this, &i)) - return false; - } - return true; -} -*/ \ No newline at end of file diff --git a/src/CRE/Glitter/effect_inst.cpp b/src/CRE/Glitter/effect_inst.cpp index 6bf1af52..02a384dc 100644 --- a/src/CRE/Glitter/effect_inst.cpp +++ b/src/CRE/Glitter/effect_inst.cpp @@ -13,7 +13,7 @@ namespace Glitter { size_t id, float_t emission, bool appear_now) : data(GLT_VAL) { effect = eff; data = eff->data; - color = vec4_identity; + color = 1.0f; scale_all = 1.0f; this->id = id; translation = eff->translation; @@ -25,8 +25,8 @@ namespace Glitter { flags = (EffectInstFlag)0; random = 0; req_frame = 0.0f; - ext_color = vec4_null; - ext_anim_scale = vec3_null; + ext_color = 0.0f; + ext_anim_scale = 0.0f; some_scale = -1.0f; if (appear_now) @@ -39,6 +39,17 @@ namespace Glitter { } + bool EffectInst::GetExtAnimScale(vec3* ext_anim_scale, float_t* some_scale) { + if (!(flags & EFFECT_INST_HAS_EXT_ANIM_SCALE)) + return false; + + if (ext_anim_scale) + *ext_anim_scale = this->ext_anim_scale; + if (some_scale) + *some_scale = this->some_scale; + return true; + } + void EffectInst::SetExtColor(bool set, float_t r, float_t g, float_t b, float_t a) { ext_color.x = r; ext_color.y = g; @@ -97,7 +108,7 @@ namespace Glitter { object_is_hrc = false; mesh_name = 0; mat = mat4_identity; - translation = vec3_null; + translation = 0.0f; } F2EffectInst::ExtAnim::~ExtAnim() { @@ -185,21 +196,16 @@ namespace Glitter { GetValue(GLT_VAL); mat4 mat; - if (GetExtAnimMat(&mat)) { - vec3 trans = translation; - mat4_translate_mult(&mat, trans.x, trans.y, trans.z, &mat); - } - else { - vec3 trans = translation; - mat4_translate(trans.x, trans.y, trans.z, &mat); - } + if (GetExtAnimMat(&mat)) + mat4_translate_mult(&mat, &translation, &mat); + else + mat4_translate(&translation, &mat); vec3 rot = rotation; - vec3 scale; - vec3_mult_scalar(this->scale, scale_all, scale); + vec3 scale = this->scale * scale_all; - mat4_rotate_mult(&mat, rot.x, rot.y, rot.z, &mat); - mat4_scale_rot(&mat, scale.x, scale.y, scale.z, &this->mat); + mat4_rotate_mult(&mat, &rot, &mat); + mat4_scale_rot(&mat, &scale, &this->mat); for (F2EmitterInst*& i : emitters) if (i) @@ -293,15 +299,13 @@ namespace Glitter { GetValue(GLT_VAL); mat4 mat; - vec3 trans = translation; - mat4_translate(trans.x, trans.y, trans.z, &mat); + mat4_translate(&translation, &mat); vec3 rot = rotation; - vec3 scale; - vec3_mult_scalar(this->scale, scale_all, scale); + vec3 scale = this->scale * scale_all; - mat4_rotate_mult(&mat, rot.x, rot.y, rot.z, &mat); - mat4_scale_rot(&mat, scale.x, scale.y, scale.z, &mat); + mat4_rotate_mult(&mat, &rot, &mat); + mat4_scale_rot(&mat, &scale, &mat); for (F2EmitterInst*& i : emitters) if (i) i->CtrlInit(GPM_VAL, GLT_VAL, this, delta_frame); @@ -333,13 +337,12 @@ namespace Glitter { vec3 trans = translation; vec3 rot = rotation; - vec3 scale; - vec3_mult_scalar(this->scale, scale_all, scale); + vec3 scale = this->scale * scale_all; mat4 mat; - mat4_translate(trans.x, trans.y, trans.z, &mat); - mat4_rotate_mult(&mat, rot.x, rot.y, rot.z, &mat); - mat4_scale_rot(&mat, scale.x, scale.y, scale.z, &mat); + mat4_translate(&trans, &mat); + mat4_rotate_mult(&mat, &rot, &mat); + mat4_scale_rot(&mat, &scale, &mat); this->mat = mat; for (F2EmitterInst*& i : emitters) @@ -375,7 +378,7 @@ namespace Glitter { vec3 scale; mat4_get_scale(&mat, &scale); - vec3_sub_scalar(scale, 1.0f, ext_anim_scale); + ext_anim_scale = scale - 1.0f; ext_anim_scale.z = 0.0f; enum_or(flags, EFFECT_INST_HAS_EXT_ANIM_SCALE); @@ -425,7 +428,7 @@ namespace Glitter { vec3 scale; mat4_get_scale(&mat, &scale); - vec3_sub_scalar(scale, 1.0f, ext_anim_scale); + ext_anim_scale = scale - 1.0f; ext_anim_scale.z = 0.0f; enum_or(flags, EFFECT_INST_HAS_EXT_ANIM_SCALE); } @@ -489,8 +492,7 @@ namespace Glitter { if (!(flags & EFFECT_INST_HAS_EXT_ANIM_TRANS) || !ext_anim) return false; - vec3 trans = ext_anim->translation; - mat4_translate_mult(&ext_anim->mat, trans.x, trans.y, trans.z, mat); + mat4_translate_mult(&ext_anim->mat, &ext_anim->translation, mat); return true; } @@ -600,7 +602,7 @@ namespace Glitter { instance_id = 0; mesh_name = 0; mat = mat4_identity; - translation = vec3_null; + translation = 0.0f; } XEffectInst::ExtAnim::~ExtAnim() { @@ -709,7 +711,7 @@ namespace Glitter { GetValue(); - vec3 rot = rotation; + vec3& rot = rotation; mat4 mat; if (GetExtAnimMat(&mat)) { @@ -717,25 +719,22 @@ namespace Glitter { mat4_clear_trans(&mat_rot, &mat_rot); mat_rot_eff_rot = mat_rot; - mat4_rotate_mult(&mat_rot, rot.x, rot.y, rot.z, &mat_rot); + mat4_rotate_mult(&mat_rot, &rot, &mat_rot); - vec3 trans = translation; - mat4_translate_mult(&mat, trans.x, trans.y, trans.z, &mat); + mat4_translate_mult(&mat, &translation, &mat); } else { mat_rot = mat4_identity; mat_rot_eff_rot = mat4_identity; - mat4_rotate(rot.x, rot.y, rot.z, &mat_rot); + mat4_rotate(&rot, &mat_rot); - vec3 trans = translation; - mat4_translate(trans.x, trans.y, trans.z, &mat); + mat4_translate(&translation, &mat); } - vec3 scale; - vec3_mult_scalar(this->scale, scale_all, scale); + vec3 scale = this->scale * scale_all; - mat4_rotate_mult(&mat, rot.x, rot.y, rot.z, &mat); - mat4_scale_rot(&mat, scale.x, scale.y, scale.z, &this->mat); + mat4_rotate_mult(&mat, &rot, &mat); + mat4_scale_rot(&mat, &scale, &this->mat); for (XEmitterInst*& i : emitters) if (i) @@ -842,13 +841,12 @@ namespace Glitter { vec3 trans = translation; vec3 rot = rotation; - vec3 scale; - vec3_mult_scalar(this->scale, scale_all, scale); + vec3 scale = this->scale * scale_all; mat4 mat; - mat4_translate(trans.x, trans.y, trans.z, &mat); - mat4_rotate_mult(&mat, rot.x, rot.y, rot.z, &mat); - mat4_scale_rot(&mat, scale.x, scale.y, scale.z, &mat); + mat4_translate(&trans, &mat); + mat4_rotate_mult(&mat, &rot, &mat); + mat4_scale_rot(&mat, &scale, &mat); for (XEmitterInst*& i : emitters) if (i) i->CtrlInit(this, delta_frame); @@ -880,13 +878,12 @@ namespace Glitter { vec3 trans = translation; vec3 rot = rotation; - vec3 scale; - vec3_mult_scalar(this->scale, scale_all, scale); + vec3 scale = this->scale * scale_all; mat4 mat; - mat4_translate(trans.x, trans.y, trans.z, &mat); - mat4_rotate_mult(&mat, rot.x, rot.y, rot.z, &mat); - mat4_scale_rot(&mat, scale.x, scale.y, scale.z, &mat); + mat4_translate(&trans, &mat); + mat4_rotate_mult(&mat, &rot, &mat); + mat4_scale_rot(&mat, &scale, &mat); this->mat = mat; for (XEmitterInst*& i : emitters) @@ -928,11 +925,11 @@ namespace Glitter { vec3 scale; mat4_get_scale(mat, &scale); - vec3_sub_scalar(scale, 1.0f, ext_anim_scale); + ext_anim_scale = scale - 1.0f; ext_anim_scale.z = 0.0f; enum_or(flags, EFFECT_INST_HAS_EXT_ANIM_SCALE); - if (rob_chr->data.field_0 & 0x01 || ~data.ext_anim_x->flags & EFFECT_EXT_ANIM_NO_DRAW_IF_NO_DATA) + if (rob_chr->get_visibility() || !(data.ext_anim_x->flags & EFFECT_EXT_ANIM_NO_DRAW_IF_NO_DATA)) set_flags = true; else set_flags = false; @@ -977,7 +974,7 @@ namespace Glitter { vec3 scale; mat4_get_scale(mat, &scale); - vec3_sub_scalar(scale, 1.0f, ext_anim_scale); + ext_anim_scale = scale - 1.0f; ext_anim_scale.z = 0.0f; enum_or(flags, EFFECT_INST_HAS_EXT_ANIM_SCALE); } @@ -1025,8 +1022,7 @@ namespace Glitter { if (!(flags & EFFECT_INST_HAS_EXT_ANIM_TRANS) || !ext_anim) return false; - vec3 trans = ext_anim->translation; - mat4_translate_mult(&ext_anim->mat, trans.x, trans.y, trans.z, mat); + mat4_translate_mult(&ext_anim->mat, &ext_anim->translation, mat); return true; } diff --git a/src/CRE/Glitter/emitter.cpp b/src/CRE/Glitter/emitter.cpp index 81f8e5f3..8bb8ce18 100644 --- a/src/CRE/Glitter/emitter.cpp +++ b/src/CRE/Glitter/emitter.cpp @@ -39,4 +39,21 @@ namespace Glitter { for (Particle*& i : particles) delete i; } + + Emitter& Emitter::operator=(const Emitter& emit) { + data = emit.data; + version = emit.version; + + for (Particle*& i : particles) + delete i; + particles.clear(); + + particles.reserve(emit.particles.size()); + for (Particle* i : emit.particles) { + Particle* ptcl = new Particle(i->version > 0x03 ? Glitter::X : Glitter::F2); + *ptcl = *i; + particles.push_back(ptcl); + } + return *this; + } } diff --git a/src/CRE/Glitter/emitter_inst.cpp b/src/CRE/Glitter/emitter_inst.cpp index 14edc753..979963d3 100644 --- a/src/CRE/Glitter/emitter_inst.cpp +++ b/src/CRE/Glitter/emitter_inst.cpp @@ -104,9 +104,7 @@ namespace Glitter { frame -= data.loop_end_time - data.loop_start_time; GetValue(GLT_VAL); - vec3 rotation_add; - vec3_mult_scalar(data.rotation_add, delta_frame, rotation_add); - vec3_add(rotation, rotation_add, rotation); + rotation += data.rotation_add * delta_frame; CtrlMat(GPM_VAL, GLT_VAL, eff_inst); } @@ -127,17 +125,14 @@ namespace Glitter { return; GetValue(GLT_VAL); - vec3 rotation_add; - vec3_mult_scalar(data.rotation_add, delta_frame, rotation_add); - vec3_add(rotation, rotation_add, rotation); + rotation += data.rotation_add * delta_frame; CtrlMat(GPM_VAL, GLT_VAL, eff_inst); } void F2EmitterInst::CtrlMat(GPM, GLT, F2EffectInst* eff_inst) { vec3 trans = translation; vec3 rot = rotation; - vec3 scale; - vec3_mult_scalar(this->scale, scale_all, scale); + vec3 scale = this->scale * scale_all; bool mult = true; mat4 dir_mat; @@ -165,13 +160,14 @@ namespace Glitter { } mat4 mat; - mat4_translate_mult(&eff_inst->mat, trans.x, trans.y, trans.z, &mat); + mat4_translate_mult(&eff_inst->mat, &trans, &mat); mat4_normalize_rotation(&mat, &mat); if (mult) mat4_mult(&dir_mat, &mat, &mat); - mat4_rotate_mult(&mat, rot.x, rot.y, rot.z, &mat); + mat4_rotate_mult(&mat, &rot, &mat); mat4_clear_trans(&mat, &mat_rot); - mat4_scale_rot(&mat, scale.x, scale.y, scale.z, &this->mat); + mat4_scale_rot(&mat, &scale, &mat); + this->mat = mat; } void F2EmitterInst::Emit(GPM, GLT, float_t delta_frame, float_t emission) { @@ -304,14 +300,11 @@ namespace Glitter { return true; } - void F2EmitterInst::InitMesh(GLT, int32_t index, vec3& scale, + void F2EmitterInst::InitMesh(GLT, int32_t index, const vec3& scale, vec3& position, vec3& direction, Random* random) { switch (data.type) { case EMITTER_BOX: { - vec3 dir; - vec3_mult(data.box.size, scale, dir); - vec3_mult_scalar(dir, 0.5f, dir); - random->F2GetVec3(GLT_VAL, dir, position); + position = random->F2GetVec3(GLT_VAL, data.box.size * scale * 0.5f); } break; case EMITTER_CYLINDER: { float_t radius = data.cylinder.radius * scale.x; @@ -333,7 +326,7 @@ namespace Glitter { direction = dir; else if (data.cylinder.direction == EMITTER_EMISSION_DIRECTION_INWARD) { const vec3 reverse_xz_dir = { -0.0f, 0.0f, -0.0f }; - vec3_xor(dir, reverse_xz_dir, direction); + direction = dir ^ reverse_xz_dir; } } break; case EMITTER_SPHERE: { @@ -349,11 +342,11 @@ namespace Glitter { dir.y = sinf(latitude); dir.z = cosf(longitude) * cosf(latitude); - vec3_mult_scalar(dir, radius, position); + position = dir * radius; if (data.sphere.direction == EMITTER_EMISSION_DIRECTION_OUTWARD) direction = dir; else if (data.sphere.direction == EMITTER_EMISSION_DIRECTION_INWARD) - vec3_negate(dir, direction); + direction = -dir; } break; case EMITTER_POLYGON: { float_t radius = data.polygon.size * scale.x; @@ -381,76 +374,6 @@ namespace Glitter { i->Reset(); } - void XEmitterInst::InitMesh(int32_t index, vec3& scale, - vec3& position, vec3& direction, Random* random) { - switch (emitter->data.type) { - case EMITTER_BOX: { - vec3 dir; - vec3_mult(data.box.size, scale, dir); - vec3_mult_scalar(dir, 0.5f, dir); - random->XGetVec3(dir, position); - } break; - case EMITTER_CYLINDER: { - float_t radius = data.cylinder.radius * scale.x; - if (!data.cylinder.on_edge) - radius = random->XGetFloat(0.0f, radius); - - float_t angle = random->XGetFloat(data.cylinder.start_angle, data.cylinder.end_angle); - - vec3 dir; - dir.x = cosf(angle); - dir.y = 0.0f; - dir.z = sinf(angle); - - position.x = dir.x * radius; - position.y = random->XGetFloat(data.cylinder.height * scale.y * 0.5f); - position.z = dir.z * radius; - - if (data.cylinder.direction == EMITTER_EMISSION_DIRECTION_OUTWARD) - direction = dir; - else if (data.cylinder.direction == EMITTER_EMISSION_DIRECTION_INWARD) { - const vec3 reverse_xz_dir = { -0.0f, 0.0f, -0.0f }; - vec3_xor(dir, reverse_xz_dir, direction); - } - } break; - case EMITTER_SPHERE: { - float_t radius = data.sphere.radius * scale.x; - if (!data.sphere.on_edge) - radius = random->XGetFloat(0.0f, radius); - - float_t longitude = random->XGetFloat(data.sphere.longitude * 0.5f); - float_t latitude = (float_t)M_PI_2 - random->XGetFloat(0.0f, data.sphere.latitude); - - vec3 dir; - dir.x = sinf(longitude) * cosf(latitude); - dir.y = sinf(latitude); - dir.z = cosf(longitude) * cosf(latitude); - - vec3_mult_scalar(dir, radius, position); - if (data.sphere.direction == EMITTER_EMISSION_DIRECTION_OUTWARD) - direction = dir; - else if (data.sphere.direction == EMITTER_EMISSION_DIRECTION_INWARD) - vec3_negate(dir, direction); - } break; - case EMITTER_POLYGON: { - float_t radius = data.polygon.size * scale.x; - float_t angle = ((float_t)index * 360.0f - / (float_t)data.polygon.count + 90.0f) * DEG_TO_RAD_FLOAT; - - vec3 dir; - dir.x = cosf(angle); - dir.y = 0.0f; - dir.z = sinf(angle); - - vec3_mult_scalar(dir, radius, position); - if (data.sphere.direction == EMITTER_EMISSION_DIRECTION_OUTWARD) - direction = dir; - else if (data.sphere.direction == EMITTER_EMISSION_DIRECTION_INWARD) - vec3_negate(dir, direction); - } break; - } - } - XEmitterInst::XEmitterInst(Emitter* emit, XEffectInst* eff_inst, float_t emission) : EmitterInst(emit, &eff_inst->random_shared) { counter = 0; @@ -548,11 +471,9 @@ namespace Glitter { GetValue(); - vec3 rotation_add; - vec3_mult_scalar(data.rotation_add, delta_frame, rotation_add); - vec3_add(rotation, rotation_add, rotation); + rotation += data.rotation_add * delta_frame; - vec3 trans_prev = vec3_null; + vec3 trans_prev = {}; bool has_dist = false; if (data.timer == EMITTER_TIMER_BY_DISTANCE && flags & EMITTER_INST_HAS_DISTANCE) { mat4_get_translation(&mat, &trans_prev); @@ -561,11 +482,10 @@ namespace Glitter { vec3 trans = translation; vec3 rot = rotation; - vec3 scale; - vec3_mult_scalar(this->scale, scale_all, scale); + vec3 scale = this->scale * scale_all; mat4 mat = eff_inst->mat; - mat4_translate_mult(&mat, trans.x, trans.y, trans.z, &mat); + mat4_translate_mult(&mat, &trans, &mat); mat4 mat_rot; if (data.direction == DIRECTION_EFFECT_ROTATION) { mat4_normalize_rotation(&mat, &mat); @@ -610,19 +530,16 @@ namespace Glitter { mat4_mult(&dir_mat, &mat_rot, &mat_rot); } - mat4_rotate_mult(&mat, rot.x, rot.y, rot.z, &mat); - mat4_rotate_mult(&mat_rot, rot.x, rot.y, rot.z, &mat_rot); - mat4_scale_rot(&mat, scale.x, scale.y, scale.z, &mat); + mat4_rotate_mult(&mat, &rot, &mat); + mat4_rotate_mult(&mat_rot, &rot, &mat_rot); + mat4_scale_rot(&mat, &scale, &mat); this->mat = mat; this->mat_rot = mat_rot; if (has_dist) { vec3 trans; mat4_get_translation(&mat, &trans); - - float_t trans_dist; - vec3_distance(trans, trans_prev, trans_dist); - emission_timer -= trans_dist; + emission_timer -= vec3::distance(trans, trans_prev); } if (~flags & EMITTER_INST_HAS_DISTANCE) @@ -660,9 +577,8 @@ namespace Glitter { GetValue(); - vec3 rotation_add; - vec3_mult_scalar(data.rotation_add, delta_frame, rotation_add); - vec3_add(rotation, rotation_add, rotation); + rotation += data.rotation_add * delta_frame; + if (data.timer == EMITTER_TIMER_BY_DISTANCE && flags & EMITTER_INST_HAS_DISTANCE) { vec3 trans_prev; mat4 mat; @@ -677,16 +593,14 @@ namespace Glitter { vec3 trans = translation; vec3 rot = rotation; mat = eff_inst->mat; - mat4_translate_mult(&mat, trans.x, trans.y, trans.z, &mat); - mat4_rotate_mult(&mat, rot.x, rot.y, rot.z, &mat); - mat4_rotate_mult(&mat_rot, rot.x, rot.y, rot.z, &mat_rot); + mat4_translate_mult(&mat, &trans, &mat); + mat4_rotate_mult(&mat, &rot, &mat); + mat4_rotate_mult(&mat_rot, &rot, &mat_rot); this->mat = mat; this->mat_rot = mat_rot; - float_t trans_dist; mat4_get_translation(&mat, &trans); - vec3_distance(trans, trans_prev, trans_dist); - emission_timer -= trans_dist; + emission_timer -= vec3::distance(trans, trans_prev); } enum_or(flags, EMITTER_INST_HAS_DISTANCE); } @@ -694,11 +608,10 @@ namespace Glitter { void XEmitterInst::CtrlMat(GPM, XEffectInst* eff_inst) { vec3 trans = translation; vec3 rot = rotation; - vec3 scale; - vec3_mult_scalar(this->scale, scale_all, scale); + vec3 scale = this->scale * scale_all; mat4 mat = eff_inst->mat; - mat4_translate_mult(&mat, trans.x, trans.y, trans.z, &mat); + mat4_translate_mult(&mat, &trans, &mat); mat4 mat_rot; if (data.direction == DIRECTION_EFFECT_ROTATION) { mat4_normalize_rotation(&mat, &mat); @@ -734,9 +647,9 @@ namespace Glitter { mat4_mult(&dir_mat, &mat_rot, &mat_rot); } - mat4_rotate_mult(&mat, rot.x, rot.y, rot.z, &mat); - mat4_rotate_mult(&mat_rot, rot.x, rot.y, rot.z, &mat_rot); - mat4_scale_rot(&mat, scale.x, scale.y, scale.z, &mat); + mat4_rotate_mult(&mat, &rot, &mat); + mat4_rotate_mult(&mat_rot, &rot, &mat_rot); + mat4_scale_rot(&mat, &scale, &mat); this->mat = mat; this->mat_rot = mat_rot; } @@ -887,6 +800,73 @@ namespace Glitter { return true; } + void XEmitterInst::InitMesh(int32_t index, const vec3& scale, + vec3& position, vec3& direction, Random* random) { + switch (emitter->data.type) { + case EMITTER_BOX: { + position = random->XGetVec3(data.box.size * scale * 0.5f); + } break; + case EMITTER_CYLINDER: { + float_t radius = data.cylinder.radius * scale.x; + if (!data.cylinder.on_edge) + radius = random->XGetFloat(0.0f, radius); + + float_t angle = random->XGetFloat(data.cylinder.start_angle, data.cylinder.end_angle); + + vec3 dir; + dir.x = cosf(angle); + dir.y = 0.0f; + dir.z = sinf(angle); + + position.x = dir.x * radius; + position.y = random->XGetFloat(data.cylinder.height * scale.y * 0.5f); + position.z = dir.z * radius; + + if (data.cylinder.direction == EMITTER_EMISSION_DIRECTION_OUTWARD) + direction = dir; + else if (data.cylinder.direction == EMITTER_EMISSION_DIRECTION_INWARD) { + const vec3 reverse_xz_dir = { -0.0f, 0.0f, -0.0f }; + direction = dir ^ reverse_xz_dir; + } + } break; + case EMITTER_SPHERE: { + float_t radius = data.sphere.radius * scale.x; + if (!data.sphere.on_edge) + radius = random->XGetFloat(0.0f, radius); + + float_t longitude = random->XGetFloat(data.sphere.longitude * 0.5f); + float_t latitude = (float_t)M_PI_2 - random->XGetFloat(0.0f, data.sphere.latitude); + + vec3 dir; + dir.x = sinf(longitude) * cosf(latitude); + dir.y = sinf(latitude); + dir.z = cosf(longitude) * cosf(latitude); + + position = dir * radius; + if (data.sphere.direction == EMITTER_EMISSION_DIRECTION_OUTWARD) + direction = dir; + else if (data.sphere.direction == EMITTER_EMISSION_DIRECTION_INWARD) + direction = -dir; + } break; + case EMITTER_POLYGON: { + float_t radius = data.polygon.size * scale.x; + float_t angle = ((float_t)index * 360.0f + / (float_t)data.polygon.count + 90.0f) * DEG_TO_RAD_FLOAT; + + vec3 dir; + dir.x = cosf(angle); + dir.y = 0.0f; + dir.z = sinf(angle); + + position = dir * radius; + if (data.sphere.direction == EMITTER_EMISSION_DIRECTION_OUTWARD) + direction = dir; + else if (data.sphere.direction == EMITTER_EMISSION_DIRECTION_INWARD) + direction = -dir; + } break; + } + } + uint8_t XEmitterInst::RandomGetStep() { step = (step + 2) % 60; return step; diff --git a/src/CRE/Glitter/file_reader.cpp b/src/CRE/Glitter/file_reader.cpp index 1ed51067..d7c368ae 100644 --- a/src/CRE/Glitter/file_reader.cpp +++ b/src/CRE/Glitter/file_reader.cpp @@ -834,7 +834,7 @@ namespace Glitter { int32_t efct_version, bool big_endian, object_database* obj_db) { eff->version = efct_version; if (type == Glitter::X) { - eff->scale = vec3_identity; + eff->scale = 1.0f; eff->data.start_time = 0; eff->data.ext_anim_x = 0; eff->data.flags = (EffectFlag)0; @@ -1010,7 +1010,7 @@ namespace Glitter { } } else { - eff->scale = vec3_identity; + eff->scale = 1.0f; eff->data.start_time = 0; eff->data.ext_anim = 0; eff->data.flags = (EffectFlag)0; @@ -1532,8 +1532,8 @@ namespace Glitter { d += 256; if (ptcl->version == 4) { - vec3_mult_scalar(ptcl->data.direction, 10.0f, ptcl->data.direction); - vec3_mult_scalar(ptcl->data.direction_random, 10.0f, ptcl->data.direction_random); + ptcl->data.direction *= 10.0f; + ptcl->data.direction_random *= 10.0f; } if (ptcl->data.emission >= min_emission) diff --git a/src/CRE/Glitter/file_writer.cpp b/src/CRE/Glitter/file_writer.cpp index a0848e59..d10a9ce0 100644 --- a/src/CRE/Glitter/file_writer.cpp +++ b/src/CRE/Glitter/file_writer.cpp @@ -1249,37 +1249,52 @@ namespace Glitter { farc f; { - f2_struct st; - if (fr.UnparseDivaEffect(eff_group, &st, big_endian)) { - f.add_file(); - farc_file& ff_drs = f.files.back(); - st.write(&ff_drs.data, &ff_drs.size); - ff_drs.name = std::string(file) + ".dve"; - } - } - - { - f2_struct st; - if (fr.UnparseDivaResource(eff_group, &st)) { - f.add_file(); - farc_file& ff_dve = f.files.back(); - st.write(&ff_dve.data, &ff_dve.size); - ff_dve.name = std::string(file) + ".drs"; - } - else + size_t file_len = utf8_length(file); + char* temp = force_malloc_s(char, file_len + 5); + if (!temp) return; - } - if (fr.type == Glitter::FT) { - f2_struct st; - if (fr.UnparseDivaList(eff_group, &st, big_endian)) { - f.add_file(); - farc_file& ff_lst = f.files.back(); - st.write(&ff_lst.data, &ff_lst.size); - ff_lst.name = std::string(file) + ".lst"; + memcpy(temp, file, file_len); + temp[file_len] = 0; + + { + f2_struct dve_st; + if (fr.UnparseDivaEffect(eff_group, &dve_st, big_endian)) { + memcpy(&temp[file_len], ".dve", 4); + temp[file_len + 4] = 0; + farc_file* ff_dve = f.add_file(temp); + dve_st.write(&ff_dve->data, &ff_dve->size); + } + else { + free(temp); + return; + } } - else - return; + + { + f2_struct drs_st; + if (fr.UnparseDivaResource(eff_group, &drs_st)) { + memcpy(&temp[file_len], ".drs", 4); + temp[file_len + 4] = 0; + farc_file* ff_drs = f.add_file(temp); + drs_st.write(&ff_drs->data, &ff_drs->size); + } + } + + if (fr.type == Glitter::FT) { + f2_struct lst_st; + if (fr.UnparseDivaList(eff_group, &lst_st, big_endian)) { + memcpy(&temp[file_len], ".lst", 4); + temp[file_len + 4] = 0; + farc_file* ff_lst = f.add_file(temp); + lst_st.write(&ff_lst->data, &ff_lst->size); + } + else { + free(temp); + return; + } + } + free(temp); } farc_compress_mode mode; diff --git a/src/CRE/Glitter/glitter.hpp b/src/CRE/Glitter/glitter.hpp index 4835df84..0d4ffa3d 100644 --- a/src/CRE/Glitter/glitter.hpp +++ b/src/CRE/Glitter/glitter.hpp @@ -5,7 +5,6 @@ #pragma once -#include #include #include #include "../../KKdLib/database/object.hpp" @@ -482,6 +481,8 @@ namespace Glitter { #if defined(CRE_DEV) || defined(ReDIVA_DEV) void AddValue(GLT, float_t val, CurveTypeFlags flags); #endif + + Animation& operator=(const Animation& anim); }; struct Buffer { @@ -560,6 +561,8 @@ namespace Glitter { ItemBase(); virtual ~ItemBase(); + + ItemBase& operator=(const ItemBase& item_base); }; class Node : public ItemBase { @@ -571,6 +574,8 @@ namespace Glitter { Node(); virtual ~Node() override; + + Node& operator=(const Node& node); }; class Effect : public Node { @@ -614,6 +619,7 @@ namespace Glitter { int32_t life_time; int32_t start_time; vec4u8 color; + bool ext_anim_is_x; union { Effect::ExtAnim * ext_anim; Effect::ExtAnimX* ext_anim_x; @@ -631,6 +637,8 @@ namespace Glitter { Effect(GLT); virtual ~Effect() override; + + Effect& operator=(const Effect& eff); }; struct EffectGroup { @@ -673,7 +681,7 @@ namespace Glitter { float_t F2GetFloat(GLT, float_t min, float_t max); int32_t F2GetInt(GLT, int32_t value); int32_t F2GetInt(GLT, int32_t min, int32_t max); - void F2GetVec3(GLT, vec3& src, vec3& dst); + vec3 F2GetVec3(GLT, const vec3& value); void F2StepValue(); int32_t GetValue(); void SetValue(int32_t value); @@ -681,7 +689,7 @@ namespace Glitter { float_t XGetFloat(float_t min, float_t max); int32_t XGetInt(int32_t value); int32_t XGetInt(int32_t min, int32_t max); - void XGetVec3(vec3& src, vec3& dst); + vec3 XGetVec3(const vec3& value); void XReset(); void XSetStep(uint8_t step); void XStepValue(); @@ -746,9 +754,9 @@ namespace Glitter { size_t GetDispCount(ParticleType type); static void CalcDispLocusSetPivot(Pivot pivot, - float_t w, float_t* v00, float_t* v01); + float_t w, float_t& v00, float_t& v01); static void CalcDispQuadSetPivot(Pivot pivot, - float_t w, float_t h, float_t* v00, float_t* v01, float_t* v10, float_t* v11); + float_t w, float_t h, float_t& v00, float_t& v01, float_t& v10, float_t& v11); }; class F2RenderScene : public RenderScene { @@ -831,6 +839,7 @@ namespace Glitter { virtual bool HasEnded(bool a2) = 0; virtual void Reset(GPM, GLT, float_t emission) = 0; + bool GetExtAnimScale(vec3* ext_anim_scale, float_t* some_scale); void SetExtColor(bool set, float_t r, float_t g, float_t b, float_t a); static int32_t GetExtAnimBoneIndex(GPM, EffectExtAnimCharaNode node); @@ -1009,6 +1018,8 @@ namespace Glitter { Emitter(GLT); virtual ~Emitter() override; + + Emitter& operator=(const Emitter& emit); }; class EmitterInst { @@ -1051,7 +1062,7 @@ namespace Glitter { void Free(GPM, GLT, float_t emission, bool free); void GetValue(GLT); bool HasEnded(bool a2); - void InitMesh(GLT, int32_t index, vec3& scale, + void InitMesh(GLT, int32_t index, const vec3& scale, vec3& position, vec3& direction, Random* random); void Reset(); }; @@ -1074,7 +1085,7 @@ namespace Glitter { void Free(float_t emission, bool free); void GetValue(); bool HasEnded(bool a2); - void InitMesh(int32_t index, vec3& scale, + void InitMesh(int32_t index, const vec3& scale, vec3& position, vec3& direction, Random* random); uint8_t RandomGetStep(); void RandomStepValue(); @@ -1288,6 +1299,7 @@ namespace Glitter { void EmitParticle(GPM, GLT, RenderElement* rend_elem, F2EmitterInst* emit_inst, F2ParticleInst::Data* ptcl_inst_data, int32_t index, Random* random); void GetColor(RenderElement* rend_elem); + bool GetExtAnimScale(vec3* ext_anim_scale, float_t* some_scale); void GetExtColor(float_t& r, float_t& g, float_t& b, float_t& a); bool GetValue(GLT, RenderElement* rend_elem, float_t frame, Random* random); void Free(bool free); @@ -1325,6 +1337,7 @@ namespace Glitter { void EmitParticle(RenderElement* rend_elem, XEmitterInst* emit_inst, XParticleInst::Data* ptcl_inst_data, int32_t index, uint8_t step, Random* random); void GetColor(RenderElement* rend_elem, float_t color_scale); + bool GetExtAnimScale(vec3* ext_anim_scale, float_t* some_scale); void GetExtColor(float_t& r, float_t& g, float_t& b, float_t& a); bool GetValue(RenderElement* rend_elem, float_t frame, Random* random, float_t* color_scale); void Free(bool free); @@ -1412,6 +1425,8 @@ namespace Glitter { vec3 scale; vec3 rotation; vec3 rotation_add; + float_t rot_z_cos; + float_t rot_z_sin; float_t scale_all; vec2 uv_scroll; vec2 uv_scroll_2nd; @@ -1595,4 +1610,3 @@ namespace Glitter { extern bool glt_particle_manager_free_task(); extern void glt_particle_manager_free(); } - diff --git a/src/CRE/Glitter/item_base.cpp b/src/CRE/Glitter/item_base.cpp index be7f64fb..eb679d96 100644 --- a/src/CRE/Glitter/item_base.cpp +++ b/src/CRE/Glitter/item_base.cpp @@ -13,4 +13,10 @@ namespace Glitter { ItemBase::~ItemBase() { } + + ItemBase& ItemBase::operator=(const ItemBase& item_base) { + name.assign(item_base.name); + animation = item_base.animation; + return *this; + } } diff --git a/src/CRE/Glitter/node.cpp b/src/CRE/Glitter/node.cpp index 62b28a68..6d27c562 100644 --- a/src/CRE/Glitter/node.cpp +++ b/src/CRE/Glitter/node.cpp @@ -7,11 +7,19 @@ namespace Glitter { Node::Node() : translation(), rotation() { - scale = vec3_identity; + scale = 1.0f; scale_all = 1.0f; } Node::~Node() { } + + Node& Node::operator=(const Node& node) { + translation = node.translation; + rotation = node.rotation; + scale = node.scale; + scale_all = node.scale_all; + return *this; + } } diff --git a/src/CRE/Glitter/particle.cpp b/src/CRE/Glitter/particle.cpp index 60c474aa..35a68c01 100644 --- a/src/CRE/Glitter/particle.cpp +++ b/src/CRE/Glitter/particle.cpp @@ -19,15 +19,15 @@ namespace Glitter { Particle::Particle(GLT) : data() { version = GLT_VAL == Glitter::X ? 0x05 : 0x03; data.pivot = PIVOT_MIDDLE_CENTER; - data.scale = vec3_identity; + data.scale = 1.0f; data.reflection_coeff = 1.0f; - data.color = vec4_identity; + data.color = 1.0f; data.uv_index = 0; data.uv_index_start = 0; data.uv_index_end = 1; data.uv_scroll_add_scale = 1.0f; data.uv_scroll_2nd_add_scale = 1.0f; - data.split_uv = vec2_identity; + data.split_uv = 1.0f; data.split_u = 1; data.split_v = 1; data.sub_flags = PARTICLE_SUB_USE_CURVE; diff --git a/src/CRE/Glitter/particle_inst.cpp b/src/CRE/Glitter/particle_inst.cpp index 0b42e0a5..13c2e3ff 100644 --- a/src/CRE/Glitter/particle_inst.cpp +++ b/src/CRE/Glitter/particle_inst.cpp @@ -106,30 +106,24 @@ namespace Glitter { float_t delta_time = delta_frame * (float_t)(1.0 / 60.0); float_t diff_time = time - rend_elem->rebound_time - delta_time; - vec3 acceleration; - vec3_mult_scalar(rend_elem->acceleration, delta_time * (delta_time * 0.5f + diff_time), acceleration); - float_t speed = rend_elem->deceleration * delta_time * (delta_time * 0.5f - diff_time) + rend_elem->speed; - if (speed >= 0.01f) { - vec3 direction; - vec3_mult_scalar(rend_elem->direction, speed * delta_time, direction); - vec3_add(acceleration, direction, acceleration); - } + vec3 acceleration = rend_elem->acceleration * (delta_time * (delta_time * 0.5f + diff_time)); + float_t speed = rend_elem->deceleration * (delta_time * (delta_time * 0.5f - diff_time)) + rend_elem->speed; + if (speed >= 0.01f) + acceleration += rend_elem->direction * (speed * delta_time); - vec3_add(rend_elem->translation, acceleration, rend_elem->translation); - vec3_add(rend_elem->base_translation, acceleration, rend_elem->base_translation); + rend_elem->translation += acceleration; + rend_elem->base_translation += acceleration; if (data.data.flags & PARTICLE_REBOUND_PLANE && rend_elem->translation_prev.y > data.data.rebound_plane_y && rend_elem->translation.y <= data.data.rebound_plane_y) { - float_t reflection_coeff = random->F2GetFloat(GLT_VAL, - data.data.reflection_coeff_random) + data.data.reflection_coeff; + float_t reflection_coeff = (random->F2GetFloat(GLT_VAL, + data.data.reflection_coeff_random) + data.data.reflection_coeff) * 60.0f; rend_elem->rebound_time = time; - vec3 direction; - vec3_sub(rend_elem->translation, rend_elem->translation_prev, direction); - vec3_mult_scalar(direction, reflection_coeff * 60.0f, direction); + vec3 direction = rend_elem->translation - rend_elem->translation_prev; const vec3 reverse_y_dir = { 0.0f, -0.0f, 0.0f }; - vec3_xor(direction, reverse_y_dir, rend_elem->direction); + rend_elem->direction = (direction * reflection_coeff) ^ reverse_y_dir; rend_elem->translation.y = rend_elem->translation_prev.y; } @@ -184,7 +178,7 @@ namespace Glitter { rend_elem->random = random->F2GetInt(GLT_VAL, Random::F2GetMax(GLT_VAL)); rend_elem->frame = 0.0f; rend_elem->rebound_time = 0.0f; - rend_elem->uv = vec2_null; + rend_elem->uv = 0.0f; rend_elem->uv_index = ptcl_inst_data->data.uv_index; rend_elem->fade_in_frames = 0.0f; @@ -208,13 +202,15 @@ namespace Glitter { rend_elem->rotation_add.x = 0.0f; rend_elem->rotation_add.y = 0.0f; } + rend_elem->rot_z_cos = 1.0f; + rend_elem->rot_z_sin = 0.0f; rend_elem->rotation.z = random->F2GetFloat(GLT_VAL, ptcl_inst_data->data.rotation_random.z) + ptcl_inst_data->data.rotation.z; rend_elem->rotation_add.z = random->F2GetFloat(GLT_VAL, ptcl_inst_data->data.rotation_add_random.z) + ptcl_inst_data->data.rotation_add.z; - rend_elem->uv_scroll = vec2_null; - rend_elem->uv_scroll_2nd = vec2_null; - rend_elem->scale = vec3_identity; + rend_elem->uv_scroll = 0.0f; + rend_elem->uv_scroll_2nd = 0.0f; + rend_elem->scale = 1.0f; rend_elem->scale_all = 1.0f; rend_elem->frame_step_uv = (float_t)ptcl_inst_data->data.frame_step_uv; @@ -250,20 +246,14 @@ namespace Glitter { || ptcl_inst_data->data.draw_type == DIRECTION_EMITTER_ROTATION) { switch (emit_inst->data.type) { case EMITTER_CYLINDER: - if (emit_inst->data.cylinder.direction != EMITTER_EMISSION_DIRECTION_NONE) { - float_t length; - vec3_length(rend_elem->direction, length); - copy_mat = length <= 0.000001f; - } + if (emit_inst->data.cylinder.direction != EMITTER_EMISSION_DIRECTION_NONE) + copy_mat = vec3::length(rend_elem->direction) <= 0.000001f; else copy_mat = true; break; case EMITTER_SPHERE: - if (emit_inst->data.sphere.direction != EMITTER_EMISSION_DIRECTION_NONE) { - float_t length; - vec3_length(rend_elem->direction, length); - copy_mat = length <= 0.000001f; - } + if (emit_inst->data.sphere.direction != EMITTER_EMISSION_DIRECTION_NONE) + copy_mat = vec3::length(rend_elem->direction) <= 0.000001f; else copy_mat = true; break; @@ -322,6 +312,15 @@ namespace Glitter { rend_elem->disp = false; } + bool F2ParticleInst::GetExtAnimScale(vec3* ext_anim_scale, float_t* some_scale) { + if (data.effect) + return data.effect->GetExtAnimScale(ext_anim_scale, some_scale); + else if (data.parent && data.parent->data.effect) + return data.parent->data.effect->GetExtAnimScale(ext_anim_scale, some_scale); + else + return false; + } + void F2ParticleInst::GetExtColor(float_t& r, float_t& g, float_t& b, float_t& a) { if (data.effect) data.effect->GetExtColor(r, g, b, a); @@ -332,7 +331,7 @@ namespace Glitter { bool F2ParticleInst::GetValue(GLT, RenderElement* rend_elem, float_t frame, Random* random) { float_t value = 0.0f; bool has_translation = false; - vec3 translation = vec3_null; + vec3 translation = 0.0f; Animation* anim = &particle->animation; size_t length = anim->curves.size(); @@ -402,7 +401,7 @@ namespace Glitter { } if (data.data.flags & PARTICLE_ROTATE_BY_EMITTER || has_translation) { - vec3_add(translation, rend_elem->base_translation, translation); + translation += rend_elem->base_translation; if (data.data.flags & PARTICLE_ROTATE_BY_EMITTER) mat4_mult_vec3_trans(&rend_elem->mat, &translation, &translation); rend_elem->translation = translation; @@ -561,32 +560,25 @@ namespace Glitter { float_t speed = rend_elem->speed * delta_frame; diff_time = max_def(diff_time, 0.0f) * (float_t)(1.0 / 60.0); - vec3 acceleration; - vec3_mult_scalar(rend_elem->acceleration, - (diff_time + (float_t)(1.0 / 7200.0)) * delta_frame, acceleration); - if (speed > 0.0f) { - vec3 direction; - vec3_mult_scalar(rend_elem->direction, speed, direction); - vec3_add(acceleration, direction, acceleration); - } + vec3 acceleration = rend_elem->acceleration * ((diff_time + (float_t)(1.0 / 7200.0)) * delta_frame); + if (speed > 0.0f) + acceleration += rend_elem->direction * speed; - vec3_add(rend_elem->translation, acceleration, rend_elem->translation); - vec3_add(rend_elem->base_translation, acceleration, rend_elem->base_translation); + rend_elem->translation += acceleration; + rend_elem->base_translation += acceleration; if (data.data.flags & PARTICLE_REBOUND_PLANE && rend_elem->translation_prev.y > data.data.rebound_plane_y && rend_elem->translation.y <= data.data.rebound_plane_y) { - float_t reflection_coeff = random->XGetFloat( - data.data.reflection_coeff_random) + data.data.reflection_coeff; + float_t reflection_coeff = (random->XGetFloat( + data.data.reflection_coeff_random) + data.data.reflection_coeff) / rend_elem->speed; rend_elem->rebound_time = time; - vec3 direction; - vec3_sub(rend_elem->translation, rend_elem->translation_prev, direction); + vec3 direction = rend_elem->translation - rend_elem->translation_prev; if (delta_frame > 0.0f) - vec3_div_scalar(direction, delta_frame, direction); - vec3_mult_scalar(direction, reflection_coeff / rend_elem->speed, direction); + direction /= delta_frame; const vec3 reverse_y_dir = { 0.0f, -0.0f, 0.0f }; - vec3_xor(direction, reverse_y_dir, rend_elem->direction); + rend_elem->direction = (direction * reflection_coeff) ^ reverse_y_dir; rend_elem->translation.y = rend_elem->translation_prev.y; } @@ -642,7 +634,7 @@ namespace Glitter { rend_elem->random = random->GetValue(); rend_elem->frame = 0.0f; rend_elem->rebound_time = 0.0f; - rend_elem->uv = vec2_null; + rend_elem->uv = 0.0f; rend_elem->uv_index = ptcl_inst_data->data.uv_index; rend_elem->step = step; @@ -681,13 +673,15 @@ namespace Glitter { rend_elem->rotation_add.x = 0.0f; rend_elem->rotation_add.y = 0.0f; } + rend_elem->rot_z_cos = 1.0f; + rend_elem->rot_z_sin = 0.0f; rend_elem->rotation.z = random->XGetFloat(ptcl_inst_data->data.rotation_random.z) + ptcl_inst_data->data.rotation.z; rend_elem->rotation_add.z = random->XGetFloat(ptcl_inst_data->data.rotation_add_random.z) + ptcl_inst_data->data.rotation_add.z; - rend_elem->uv_scroll = vec2_null; - rend_elem->uv_scroll_2nd = vec2_null; - rend_elem->scale = vec3_identity; + rend_elem->uv_scroll = 0.0f; + rend_elem->uv_scroll_2nd = 0.0f; + rend_elem->scale = 1.0f; rend_elem->scale_all = 1.0f; rend_elem->frame_step_uv = (float_t)ptcl_inst_data->data.frame_step_uv; @@ -725,20 +719,14 @@ namespace Glitter { || ptcl_inst_data->data.draw_type == DIRECTION_EMITTER_ROTATION) { switch (emit_inst->data.type) { case EMITTER_CYLINDER: - if (emit_inst->data.cylinder.direction != EMITTER_EMISSION_DIRECTION_NONE) { - float_t length; - vec3_length(rend_elem->direction, length); - copy_mat = length <= 0.000001f; - } + if (emit_inst->data.cylinder.direction != EMITTER_EMISSION_DIRECTION_NONE) + copy_mat = vec3::length(rend_elem->direction) <= 0.000001f; else copy_mat = true; break; case EMITTER_SPHERE: - if (emit_inst->data.sphere.direction != EMITTER_EMISSION_DIRECTION_NONE) { - float_t length; - vec3_length(rend_elem->direction, length); - copy_mat = length <= 0.000001f; - } + if (emit_inst->data.sphere.direction != EMITTER_EMISSION_DIRECTION_NONE) + copy_mat = vec3::length(rend_elem->direction) <= 0.000001f; else copy_mat = true; break; @@ -806,6 +794,15 @@ namespace Glitter { rend_elem->disp = false; } + bool XParticleInst::GetExtAnimScale(vec3* ext_anim_scale, float_t* some_scale) { + if (data.effect) + return data.effect->GetExtAnimScale(ext_anim_scale, some_scale); + else if (data.parent && data.parent->data.effect) + return data.parent->data.effect->GetExtAnimScale(ext_anim_scale, some_scale); + else + return false; + } + void XParticleInst::GetExtColor(float_t& r, float_t& g, float_t& b, float_t& a) { if (data.effect) data.effect->GetExtColor(r, g, b, a); @@ -815,7 +812,7 @@ namespace Glitter { bool XParticleInst::GetValue(RenderElement* rend_elem, float_t frame, Random* random, float_t* color_scale) { float_t value = 0.0f; - vec3 translation = vec3_null; + vec3 translation = 0.0f; bool has_translation = false; Animation* anim = &particle->animation; @@ -910,7 +907,7 @@ namespace Glitter { } if (data.data.flags & PARTICLE_ROTATE_BY_EMITTER || has_translation) { - vec3_add(translation, rend_elem->base_translation, translation); + translation += rend_elem->base_translation; if (data.data.flags & PARTICLE_ROTATE_BY_EMITTER) mat4_mult_vec3_trans(&rend_elem->mat, &translation, &translation); rend_elem->translation = translation; diff --git a/src/CRE/Glitter/random.cpp b/src/CRE/Glitter/random.cpp index 3d01923c..d0a8c329 100644 --- a/src/CRE/Glitter/random.cpp +++ b/src/CRE/Glitter/random.cpp @@ -1298,26 +1298,22 @@ namespace Glitter { return val % (max - min) + min; } - void Random::F2GetVec3(GLT, vec3& src, vec3& dst) { + vec3 Random::F2GetVec3(GLT, const vec3& value) { vec3 val; switch (GLT_VAL) { default: case Glitter::FT: - val.x = *(float_t*)&full_float_table[value++ % 0x1000]; - val.y = *(float_t*)&full_float_table[value++ % 0x1000]; - val.z = *(float_t*)&full_float_table[value++ % 0x1000]; + val.x = *(float_t*)&full_float_table[this->value++ % 0x1000]; + val.y = *(float_t*)&full_float_table[this->value++ % 0x1000]; + val.z = *(float_t*)&full_float_table[this->value++ % 0x1000]; break; case Glitter::F2: - val.x = *(float_t*)&short_float_table[value++ % 0x100]; - val.y = *(float_t*)&short_float_table[value++ % 0x100]; - val.z = *(float_t*)&short_float_table[value++ % 0x100]; + val.x = *(float_t*)&short_float_table[this->value++ % 0x100]; + val.y = *(float_t*)&short_float_table[this->value++ % 0x100]; + val.z = *(float_t*)&short_float_table[this->value++ % 0x100]; break; } - - vec3 t; - vec3_add(src, src, t); - vec3_mult(val, t, val); - vec3_sub(val, src, dst); + return val * (value + value) - value; } void Random::F2StepValue() { @@ -1358,19 +1354,15 @@ namespace Glitter { return val % (max - min) + min; } - void Random::XGetVec3(vec3& src, vec3& dst) { + vec3 Random::XGetVec3(const vec3& value) { vec3 val; - val.x = *(float_t*)&x_float_table[value % 0x169]; - value += step; - val.y = *(float_t*)&x_float_table[value % 0x169]; - value += step; - val.z = *(float_t*)&x_float_table[value % 0x169]; - value += step; - - vec3 t; - vec3_add(src, src, t); - vec3_mult(val, t, val); - vec3_sub(val, src, dst); + val.x = *(float_t*)&x_float_table[this->value % 0x169]; + this->value += step; + val.y = *(float_t*)&x_float_table[this->value % 0x169]; + this->value += step; + val.z = *(float_t*)&x_float_table[this->value % 0x169]; + this->value += step; + return val * (value + value) - value; } void Random::XReset() { diff --git a/src/CRE/Glitter/render_element.cpp b/src/CRE/Glitter/render_element.cpp index 745f1c52..b8a60f9c 100644 --- a/src/CRE/Glitter/render_element.cpp +++ b/src/CRE/Glitter/render_element.cpp @@ -6,8 +6,8 @@ #include "glitter.hpp" namespace Glitter { - RenderElement::RenderElement() : alive(), uv_index(), disp(), frame(), life_time(), - rebound_time(), frame_step_uv(), base_speed(), speed(), deceleration(), + RenderElement::RenderElement() : alive(), uv_index(), disp(), frame(), life_time(), rebound_time(), + frame_step_uv(), base_speed(), speed(), deceleration(), rot_z_cos(), rot_z_sin(), scale_all(), fade_out_frames(), fade_in_frames(), locus_history(), random(), step() { } @@ -39,31 +39,29 @@ namespace Glitter { void RenderElement::InitMesh(GLT, F2EmitterInst* emit_inst, F2ParticleInst::Data* ptcl_inst_data, int32_t index, Random* random) { if (ptcl_inst_data->data.flags & (PARTICLE_EMITTER_LOCAL | PARTICLE_ROTATE_BY_EMITTER)) - base_translation = vec3_null; + base_translation = 0.0f; else mat4_get_translation(&emit_inst->mat, &base_translation); vec3 direction = ptcl_inst_data->data.direction; vec3 scale; if (ptcl_inst_data->data.flags & PARTICLE_EMITTER_LOCAL) - scale = vec3_identity; + scale = 1.0f; else - vec3_mult_scalar(emit_inst->scale, emit_inst->scale_all, scale); + scale = emit_inst->scale * emit_inst->scale_all; - vec3 position = vec3_null; + vec3 position = 0.0f; emit_inst->InitMesh(GLT_VAL, index, scale, position, direction, random); if (~ptcl_inst_data->data.flags & PARTICLE_EMITTER_LOCAL) mat4_mult_vec3(&emit_inst->mat_rot, &position, &position); - vec3_add(base_translation, position, base_translation); + base_translation += position; translation = base_translation; translation_prev = base_translation; - vec3 direction_random; - random->F2GetVec3(GLT_VAL, ptcl_inst_data->data.direction_random, direction_random); - vec3_add(direction, direction_random, direction); - vec3_normalize(direction, direction); + direction = vec3::normalize(direction + + random->F2GetVec3(GLT_VAL, ptcl_inst_data->data.direction_random)); if (~ptcl_inst_data->data.flags & PARTICLE_EMITTER_LOCAL) mat4_mult_vec3(&emit_inst->mat_rot, &direction, &direction); @@ -77,40 +75,36 @@ namespace Glitter { this->speed = speed * 60.0f; this->deceleration = max_def(deceleration * 60.0f, 0.0f); - vec3 acceleration; - random->F2GetVec3(GLT_VAL, ptcl_inst_data->data.acceleration_random, acceleration); - vec3_add(acceleration, ptcl_inst_data->data.acceleration, acceleration); - vec3_add(acceleration, ptcl_inst_data->data.gravity, this->acceleration); + this->acceleration = ptcl_inst_data->data.acceleration + ptcl_inst_data->data.gravity + + random->F2GetVec3(GLT_VAL, ptcl_inst_data->data.acceleration_random); } void RenderElement::InitMesh(XEmitterInst* emit_inst, XParticleInst::Data* ptcl_inst_data, int32_t index, Random* random) { if (ptcl_inst_data->data.flags & (PARTICLE_EMITTER_LOCAL | PARTICLE_ROTATE_BY_EMITTER)) - base_translation = vec3_null; + base_translation = 0.0f; else mat4_get_translation(&emit_inst->mat, &base_translation); vec3 direction = ptcl_inst_data->data.direction; vec3 scale; if (ptcl_inst_data->data.flags & PARTICLE_EMITTER_LOCAL) - scale = vec3_identity; + scale = 1.0f; else - vec3_mult_scalar(emit_inst->scale, emit_inst->scale_all, scale); + scale = emit_inst->scale * emit_inst->scale_all; - vec3 position = vec3_null; + vec3 position = 0.0f; emit_inst->InitMesh(index, scale, position, direction, random); if (~ptcl_inst_data->data.flags & PARTICLE_EMITTER_LOCAL) mat4_mult_vec3(&emit_inst->mat_rot, &position, &position); - vec3_add(base_translation, position, base_translation); + base_translation += position; translation = base_translation; translation_prev = base_translation; - vec3 direction_random; - random->XGetVec3(ptcl_inst_data->data.direction_random, direction_random); - vec3_add(direction, direction_random, direction); - vec3_normalize(direction, direction); + direction = vec3::normalize(direction + + random->XGetVec3(ptcl_inst_data->data.direction_random)); if (~ptcl_inst_data->data.flags & PARTICLE_EMITTER_LOCAL) mat4_mult_vec3(&emit_inst->mat_rot, &direction, &direction); @@ -125,9 +119,7 @@ namespace Glitter { this->speed = speed; this->deceleration = max_def(deceleration, 0.0f); - vec3 acceleration; - random->XGetVec3(ptcl_inst_data->data.acceleration_random, acceleration); - vec3_add(acceleration, ptcl_inst_data->data.acceleration, acceleration); - vec3_add(acceleration, ptcl_inst_data->data.gravity, this->acceleration); + this->acceleration = ptcl_inst_data->data.acceleration + ptcl_inst_data->data.gravity + + random->XGetVec3(ptcl_inst_data->data.acceleration_random); } } diff --git a/src/CRE/Glitter/render_group.cpp b/src/CRE/Glitter/render_group.cpp index 23a8d965..dd5609ac 100644 --- a/src/CRE/Glitter/render_group.cpp +++ b/src/CRE/Glitter/render_group.cpp @@ -12,7 +12,7 @@ namespace Glitter { elements(), max_count(), random_ptr(), disp_type(), fog_type(), vao(), vbo(), ebo() { split_u = 1; split_v = 1; - split_uv = vec2_identity; + split_uv = 1.0f; mat = mat4_identity; mat_rot = mat4_identity; mat_draw = mat4_identity; @@ -80,38 +80,49 @@ namespace Glitter { bool is_quad = a1->data.data.type == PARTICLE_QUAD; glGenVertexArrays(1, &vao); - gl_state_bind_vertex_array(vao); + gl_state_bind_vertex_array(vao, true); glGenBuffers(1, &vbo); - gl_state_bind_array_buffer(vbo); - glBufferData(GL_ARRAY_BUFFER, (GLsizeiptr)(sizeof(Buffer) * max_count), 0, GL_DYNAMIC_DRAW); + gl_state_bind_array_buffer(vbo, true); + + static const GLsizei buffer_size = sizeof(Buffer); + + if (GLAD_GL_VERSION_4_4) + glBufferStorage(GL_ARRAY_BUFFER, + (GLsizeiptr)(buffer_size * max_count), 0, GL_DYNAMIC_STORAGE_BIT | GL_MAP_WRITE_BIT); + else + glBufferData(GL_ARRAY_BUFFER, + (GLsizeiptr)(buffer_size * max_count), 0, GL_DYNAMIC_DRAW); if (is_quad) { - size_t count = max_count / 4 * 6; - int32_t* ebo_data = force_malloc_s(int32_t, count); - for (size_t i = 0, j = 0; i < count; i += 6, j += 4) { - ebo_data[i] = (int32_t)j; - ebo_data[i + 1] = (int32_t)(j + 1); - ebo_data[i + 2] = (int32_t)(j + 2); - ebo_data[i + 3] = (int32_t)(j + 0); - ebo_data[i + 4] = (int32_t)(j + 2); - ebo_data[i + 5] = (int32_t)(j + 3); + size_t count = max_count / 4 * 5; + uint32_t* ebo_data = force_malloc_s(uint32_t, count - 1); + for (size_t i = 0, j = 0, k = count / 5 - 1; i < count; i += 5, j += 4, k--) { + ebo_data[i + 0] = (uint32_t)(j + 0); + ebo_data[i + 1] = (uint32_t)(j + 1); + ebo_data[i + 2] = (uint32_t)(j + 3); + ebo_data[i + 3] = (uint32_t)(j + 2); + if (k) + ebo_data[i + 4] = 0xFFFFFFFF; } glGenBuffers(1, &ebo); - gl_state_bind_element_array_buffer(ebo); - glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(int32_t) * count, ebo_data, GL_STATIC_DRAW); + gl_state_bind_element_array_buffer(ebo, true); + if (GLAD_GL_VERSION_4_4) + glBufferStorage(GL_ELEMENT_ARRAY_BUFFER, + (GLsizeiptr)(sizeof(uint32_t) * (count - 1)), ebo_data, 0); + else + glBufferData(GL_ELEMENT_ARRAY_BUFFER, + (GLsizeiptr)(sizeof(uint32_t) * (count - 1)), ebo_data, GL_STATIC_DRAW); free_def(ebo_data); } - static const GLsizei buffer_size = sizeof(Buffer); - glEnableVertexAttribArray(0); glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, buffer_size, (void*)offsetof(Buffer, position)); // Pos glEnableVertexAttribArray(3); glVertexAttribPointer(3, 4, GL_FLOAT, GL_FALSE, buffer_size, - (void*)offsetof(Buffer, color)); // Color + (void*)offsetof(Buffer, color)); // Color0 glEnableVertexAttribArray(8); glVertexAttribPointer(8, 2, GL_FLOAT, GL_FALSE, buffer_size, (void*)offsetof(Buffer, uv)); // TexCoord0 @@ -230,6 +241,16 @@ namespace Glitter { if (particle->data.data.sub_flags & PARTICLE_SUB_USE_CURVE) disp = particle->GetValue(GLT_VAL, rend_elem, rend_elem->frame, random_ptr); + if (particle->data.data.draw_type == DIRECTION_PARTICLE_ROTATION + || fabsf(rend_elem->rotation.z) <= 0.000001f) { + rend_elem->rot_z_cos = 1.0f; + rend_elem->rot_z_sin = 0.0f; + } + else { + rend_elem->rot_z_cos = cosf(rend_elem->rotation.z); + rend_elem->rot_z_sin = sinf(rend_elem->rotation.z); + } + if (disp) particle->GetColor(rend_elem); @@ -306,29 +327,9 @@ namespace Glitter { } bool F2RenderGroup::GetExtAnimScale(vec3* ext_anim_scale, float_t* some_scale) { - if (!particle) - return false; - - F2EffectInst* effect_inst; - if (particle->data.effect) - effect_inst = particle->data.effect; - else { - if (!particle->data.parent) - return false; - - effect_inst = particle->data.parent->data.effect; - if (!effect_inst) - return false; - } - - if (~effect_inst->flags & EFFECT_INST_HAS_EXT_ANIM_SCALE) - return false; - - if (ext_anim_scale) - *ext_anim_scale = effect_inst->ext_anim_scale; - if (some_scale) - *some_scale = effect_inst->some_scale; - return true; + if (particle) + particle->GetExtAnimScale(ext_anim_scale, some_scale); + return false; } mat4 F2RenderGroup::RotateToEmitPosition(F2RenderGroup* rend_group, @@ -338,9 +339,9 @@ namespace Glitter { vec2 = rend_elem->translation; else { mat4_get_translation(&rend_group->mat, &vec2); - vec3_sub(vec2, rend_elem->translation, vec2); + vec2 -= rend_elem->translation; } - vec3_normalize(vec2, vec2); + vec2 = vec3::normalize(vec2); mat4 mat; if (fabsf(vec2.y) >= 0.000001f) { @@ -359,14 +360,12 @@ namespace Glitter { mat4 F2RenderGroup::RotateToPrevPosition(F2RenderGroup* rend_group, RenderElement* rend_elem, vec3* vec) { - vec3 vec2; - vec3_sub(rend_elem->translation, rend_elem->translation_prev, vec2); + vec3 vec2 = rend_elem->translation - rend_elem->translation_prev; - float_t length; - vec3_length_squared(vec2, length); - if (length < 0.000001f) - vec2 = rend_elem->translation; - vec3_normalize(vec2, vec2); + if (vec3::length_squared(vec2) < 0.000001f) + vec2 = vec3::normalize(rend_elem->translation); + else + vec2 = vec3::normalize(vec2); mat4 mat; mat4_rotate_z((float_t)M_PI, &mat); @@ -421,60 +420,66 @@ namespace Glitter { } memset(elements, 0, sizeof(RenderElement) * count); - if (!max_count) + if (!max_count || a1->data.data.type == PARTICLE_MESH) return; bool is_quad = a1->data.data.type == PARTICLE_QUAD; - bool is_mesh = a1->data.data.type == PARTICLE_MESH; - if (!is_mesh) { - glGenVertexArrays(1, &vao); - gl_state_bind_vertex_array(vao); + glGenVertexArrays(1, &vao); + gl_state_bind_vertex_array(vao, true); - glGenBuffers(1, &vbo); - gl_state_bind_array_buffer(vbo); - glBufferData(GL_ARRAY_BUFFER, (GLsizeiptr)(sizeof(Buffer) * max_count), 0, GL_DYNAMIC_DRAW); - } + glGenBuffers(1, &vbo); + gl_state_bind_array_buffer(vbo, true); + + static const GLsizei buffer_size = sizeof(Buffer); + + if (GLAD_GL_VERSION_4_4) + glBufferStorage(GL_ARRAY_BUFFER, + (GLsizeiptr)(buffer_size * max_count), 0, GL_DYNAMIC_STORAGE_BIT | GL_MAP_WRITE_BIT); + else + glBufferData(GL_ARRAY_BUFFER, + (GLsizeiptr)(buffer_size * max_count), 0, GL_DYNAMIC_DRAW); if (is_quad) { - size_t count = max_count / 4 * 6; - int32_t* ebo_data = force_malloc_s(int32_t, count); - for (size_t i = 0, j = 0; i < count; i += 6, j += 4) { - ebo_data[i] = (int32_t)j; - ebo_data[i + 1] = (int32_t)(j + 1); - ebo_data[i + 2] = (int32_t)(j + 2); - ebo_data[i + 3] = (int32_t)(j + 0); - ebo_data[i + 4] = (int32_t)(j + 2); - ebo_data[i + 5] = (int32_t)(j + 3); + size_t count = max_count / 4 * 5; + uint32_t* ebo_data = force_malloc_s(uint32_t, count - 1); + for (size_t i = 0, j = 0, k = count / 5 - 1; i < count; i += 5, j += 4, k--) { + ebo_data[i + 0] = (uint32_t)(j + 0); + ebo_data[i + 1] = (uint32_t)(j + 1); + ebo_data[i + 2] = (uint32_t)(j + 3); + ebo_data[i + 3] = (uint32_t)(j + 2); + if (k) + ebo_data[i + 4] = 0xFFFFFFFF; } glGenBuffers(1, &ebo); - gl_state_bind_element_array_buffer(ebo); - glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(int32_t) * count, ebo_data, GL_STATIC_DRAW); + gl_state_bind_element_array_buffer(ebo, true); + if (GLAD_GL_VERSION_4_4) + glBufferStorage(GL_ELEMENT_ARRAY_BUFFER, + (GLsizeiptr)(sizeof(uint32_t) * (count - 1)), ebo_data, 0); + else + glBufferData(GL_ELEMENT_ARRAY_BUFFER, + (GLsizeiptr)(sizeof(uint32_t) * (count - 1)), ebo_data, GL_STATIC_DRAW); free_def(ebo_data); } - if (!is_mesh) { - static const GLsizei buffer_size = sizeof(Buffer); + glEnableVertexAttribArray(0); + glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, buffer_size, + (void*)offsetof(Buffer, position)); // Pos + glEnableVertexAttribArray(3); + glVertexAttribPointer(3, 4, GL_FLOAT, GL_FALSE, buffer_size, + (void*)offsetof(Buffer, color)); // Color0 + glEnableVertexAttribArray(8); + glVertexAttribPointer(8, 2, GL_FLOAT, GL_FALSE, buffer_size, + (void*)offsetof(Buffer, uv)); // TexCoord0 + glEnableVertexAttribArray(9); + glVertexAttribPointer(9, 2, GL_FLOAT, GL_FALSE, buffer_size, + (void*)offsetof(Buffer, uv)); // TexCoord1 - glEnableVertexAttribArray(0); - glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, buffer_size, - (void*)offsetof(Buffer, position)); // Pos - glEnableVertexAttribArray(3); - glVertexAttribPointer(3, 4, GL_FLOAT, GL_FALSE, buffer_size, - (void*)offsetof(Buffer, color)); // Color - glEnableVertexAttribArray(8); - glVertexAttribPointer(8, 2, GL_FLOAT, GL_FALSE, buffer_size, - (void*)offsetof(Buffer, uv)); // TexCoord0 - glEnableVertexAttribArray(9); - glVertexAttribPointer(9, 2, GL_FLOAT, GL_FALSE, buffer_size, - (void*)offsetof(Buffer, uv)); // TexCoord1 - - gl_state_bind_array_buffer(0); - gl_state_bind_vertex_array(0); - if (is_quad) - gl_state_bind_element_array_buffer(0); - } + gl_state_bind_array_buffer(0); + gl_state_bind_vertex_array(0); + if (is_quad) + gl_state_bind_element_array_buffer(0); if (!is_quad) draw_list.reserve(count); @@ -603,6 +608,16 @@ namespace Glitter { if (particle->data.data.sub_flags & PARTICLE_SUB_USE_CURVE) disp = particle->GetValue(rend_elem, rend_elem->frame, random_ptr, &color_scale); + if (particle->data.data.draw_type == DIRECTION_PARTICLE_ROTATION + || fabsf(rend_elem->rotation.z) <= 0.000001f) { + rend_elem->rot_z_cos = 1.0f; + rend_elem->rot_z_sin = 0.0f; + } + else { + rend_elem->rot_z_cos = cosf(rend_elem->rotation.z); + rend_elem->rot_z_sin = sinf(rend_elem->rotation.z); + } + if (disp) particle->GetColor(rend_elem, color_scale); @@ -686,39 +701,19 @@ namespace Glitter { if (particle) { Glitter::EmitterInst* emit_inst = particle->data.emitter; if (emit_inst) { - vec3_mult_scalar(emit_inst->scale, emit_inst->scale_all, emitter_scale); + emitter_scale = emit_inst->scale * emit_inst->scale_all; return emitter_scale.x > 0.000001f || emitter_scale.y > 0.000001f || emitter_scale.z > 0.000001f; } } - emitter_scale = vec3_identity; + emitter_scale = 1.0f; return false; } bool XRenderGroup::GetExtAnimScale(vec3* ext_anim_scale, float_t* some_scale) { - if (!particle) - return false; - - XEffectInst* effect_inst; - if (particle->data.effect) - effect_inst = particle->data.effect; - else { - if (!particle->data.parent) - return false; - - effect_inst = particle->data.parent->data.effect; - if (!effect_inst) - return false; - } - - if (~effect_inst->flags & EFFECT_INST_HAS_EXT_ANIM_SCALE) - return false; - - if (ext_anim_scale) - *ext_anim_scale = effect_inst->ext_anim_scale; - if (some_scale) - *some_scale = effect_inst->some_scale; - return true; + if (particle) + particle->GetExtAnimScale(ext_anim_scale, some_scale); + return false; } bool XRenderGroup::HasEnded() { @@ -731,13 +726,12 @@ namespace Glitter { RenderElement* rend_elem, vec3* vec, vec3* trans) { vec3 vec2; mat4_get_translation(&rend_group->mat, &vec2); - vec3_sub(vec2, *trans, vec2); + vec2 -= *trans; - float_t length; - vec3_length_squared(vec2, length); - if (length < 0.000001f) + if (vec3::length_squared(vec2) < 0.000001f) vec2 = { 0.0f, 1.0f, 0.0f }; - vec3_normalize(vec2, vec2); + else + vec2 = vec3::normalize(vec2); vec3 vec1 = *vec; @@ -752,14 +746,12 @@ namespace Glitter { mat4 XRenderGroup::RotateMeshToPrevPosition(XRenderGroup* rend_group, RenderElement* rend_elem, vec3* vec, vec3* trans) { - vec3 vec2; - vec3_sub(rend_elem->translation, rend_elem->translation_prev, vec2); + vec3 vec2 = rend_elem->translation - rend_elem->translation_prev; - float_t length; - vec3_length_squared(vec2, length); - if (length < 0.000001f) - vec2 = rend_elem->base_direction; - vec3_normalize(vec2, vec2); + if (vec3::length_squared(vec2) < 0.000001f) + vec2 = vec3::normalize(rend_elem->base_direction); + else + vec2 = vec3::normalize(vec2); vec3 vec1 = *vec; @@ -776,13 +768,12 @@ namespace Glitter { RenderElement* rend_elem, vec3* vec) { vec3 vec2; mat4_get_translation(&rend_elem->mat, &vec2); - vec3_sub(vec2, rend_elem->translation, vec2); + vec2 -= rend_elem->translation; - float_t length; - vec3_length_squared(vec2, length); - if (length < 0.000001f) + if (vec3::length_squared(vec2) < 0.000001f) vec2 = { 0.0f, 1.0f, 0.0f }; - vec3_normalize(vec2, vec2); + else + vec3::normalize(vec2); vec3 vec1 = *vec; @@ -797,14 +788,12 @@ namespace Glitter { mat4 XRenderGroup::RotateToPrevPosition(XRenderGroup* rend_group, RenderElement* rend_elem, vec3* vec) { - vec3 vec2; - vec3_sub(rend_elem->translation, rend_elem->translation_prev, vec2); + vec3 vec2 = rend_elem->translation - rend_elem->translation_prev; - float_t length; - vec3_length_squared(vec2, length); - if (length < 0.000001f) - vec2 = rend_elem->base_direction; - vec3_normalize(vec2, vec2); + if (vec3::length_squared(vec2) < 0.000001f) + vec2 = vec3::normalize(rend_elem->base_direction); + else + vec2 = vec3::normalize(vec2); vec3 vec1 = *vec; diff --git a/src/CRE/Glitter/render_scene.cpp b/src/CRE/Glitter/render_scene.cpp index 7750db58..511983e7 100644 --- a/src/CRE/Glitter/render_scene.cpp +++ b/src/CRE/Glitter/render_scene.cpp @@ -54,87 +54,87 @@ namespace Glitter { } void RenderScene::CalcDispLocusSetPivot(Pivot pivot, - float_t w, float_t* v00, float_t* v01) { + float_t w, float_t& v00, float_t& v01) { switch (pivot) { case PIVOT_TOP_LEFT: case PIVOT_MIDDLE_LEFT: case PIVOT_BOTTOM_LEFT: - *v00 = 0.0f; - *v01 = w; + v00 = 0.0f; + v01 = w; break; case PIVOT_TOP_CENTER: case PIVOT_MIDDLE_CENTER: case PIVOT_BOTTOM_CENTER: default: - *v00 = w * -0.5f; - *v01 = w * 0.5f; + v00 = w * -0.5f; + v01 = w * 0.5f; break; case PIVOT_TOP_RIGHT: case PIVOT_MIDDLE_RIGHT: case PIVOT_BOTTOM_RIGHT: - *v00 = -w; - *v01 = 0.0f; + v00 = -w; + v01 = 0.0f; break; } } void RenderScene::CalcDispQuadSetPivot(Pivot pivot, - float_t w, float_t h, float_t* v00, float_t* v01, float_t* v10, float_t* v11) { + float_t w, float_t h, float_t& v00, float_t& v01, float_t& v10, float_t& v11) { switch (pivot) { case PIVOT_TOP_LEFT: - *v00 = 0.0f; - *v01 = w; - *v10 = -h; - *v11 = 0.0f; + v00 = 0.0f; + v01 = w; + v10 = -h; + v11 = 0.0f; break; case PIVOT_TOP_CENTER: - *v00 = w * -0.5f; - *v01 = w * 0.5f; - *v10 = -h; - *v11 = 0.0f; + v00 = w * -0.5f; + v01 = w * 0.5f; + v10 = -h; + v11 = 0.0f; break; case PIVOT_TOP_RIGHT: - *v00 = -w; - *v01 = 0.0f; - *v10 = -h; - *v11 = 0.0f; + v00 = -w; + v01 = 0.0f; + v10 = -h; + v11 = 0.0f; break; case PIVOT_MIDDLE_LEFT: - *v00 = 0.0f; - *v01 = w; - *v10 = h * -0.5f; - *v11 = h * 0.5f; + v00 = 0.0f; + v01 = w; + v10 = h * -0.5f; + v11 = h * 0.5f; break; case PIVOT_MIDDLE_CENTER: default: - *v00 = w * -0.5f; - *v01 = w * 0.5f; - *v10 = h * -0.5f; - *v11 = h * 0.5f; + v00 = w * -0.5f; + v01 = w * 0.5f; + v10 = h * -0.5f; + v11 = h * 0.5f; break; case PIVOT_MIDDLE_RIGHT: - *v00 = -w; - *v01 = 0.0f; - *v10 = h * -0.5f; - *v11 = h * 0.5f; + v00 = -w; + v01 = 0.0f; + v10 = h * -0.5f; + v11 = h * 0.5f; break; case PIVOT_BOTTOM_LEFT: - *v00 = 0.0f; - *v01 = w; - *v10 = 0.0f; - *v11 = h; + v00 = 0.0f; + v01 = w; + v10 = 0.0f; + v11 = h; break; case PIVOT_BOTTOM_CENTER: - *v00 = w * -0.5f; - *v01 = w * 0.5f; - *v10 = 0.0f; - *v11 = h; + v00 = w * -0.5f; + v01 = w * 0.5f; + v10 = 0.0f; + v11 = h; break; case PIVOT_BOTTOM_RIGHT: - *v00 = -w; - *v01 = 0.0f; - *v10 = 0.0f; - *v11 = h; + v00 = -w; + v01 = 0.0f; + v10 = 0.0f; + v11 = h; break; } } @@ -173,10 +173,10 @@ namespace Glitter { return; bool has_scale = false; - vec3 scale = vec3_null; + vec3 scale = 0.0f; if (rend_group->flags & PARTICLE_EMITTER_LOCAL) { mat4_get_scale(&rend_group->mat, &scale); - vec3_sub(scale, vec3_identity, scale); + scale -= 1.0f; if (!(has_scale |= fabsf(scale.x) > 0.000001f ? true : false)) scale.x = 0.0f; if (!(has_scale |= fabsf(scale.y) > 0.000001f ? true : false)) @@ -188,8 +188,20 @@ namespace Glitter { else rend_group->mat_draw = mat4_identity; - gl_state_bind_array_buffer(rend_group->vbo); - Buffer* buf = (Buffer*)glMapBuffer(GL_ARRAY_BUFFER, GL_WRITE_ONLY); + Buffer* buf; + if (GLAD_GL_VERSION_4_5) + buf = (Buffer*)glMapNamedBuffer(rend_group->vbo, GL_WRITE_ONLY); + else { + gl_state_bind_array_buffer(rend_group->vbo); + buf = (Buffer*)glMapBuffer(GL_ARRAY_BUFFER, GL_WRITE_ONLY); + } + + if (!buf) { + if (!GLAD_GL_VERSION_4_5) + gl_state_bind_array_buffer(0); + return; + } + elem = rend_group->elements; size_t disp = 0; rend_group->draw_list.clear(); @@ -205,12 +217,9 @@ namespace Glitter { size_t j = 0; if (has_scale) for (LocusHistory::Data& hist_data : hist->data) { - vec3 pos = hist_data.translation; - vec3 pos_diff; - vec3_sub(pos, elem->base_translation, pos_diff); - vec3_mult(pos_diff, scale, pos_diff); - vec3_add(pos, pos_diff, buf->position); - buf->uv = vec2_null; + vec3& pos = hist_data.translation; + buf->position = pos + (pos - elem->base_translation) * scale; + buf->uv = 0.0f; buf->color = hist_data.color; j++; buf++; @@ -218,7 +227,7 @@ namespace Glitter { else for (LocusHistory::Data& hist_data : hist->data) { buf->position = hist_data.translation; - buf->uv = vec2_null; + buf->uv = 0.0f; buf->color = hist_data.color; j++; buf++; @@ -231,8 +240,13 @@ namespace Glitter { } } rend_group->disp = disp; - glUnmapBuffer(GL_ARRAY_BUFFER); - gl_state_bind_array_buffer(0); + + if (GLAD_GL_VERSION_4_5) + glUnmapNamedBuffer(rend_group->vbo); + else { + glUnmapBuffer(GL_ARRAY_BUFFER); + gl_state_bind_array_buffer(0); + } } void F2RenderScene::CalcDispLocus(GPM, F2RenderGroup* rend_group) { @@ -267,13 +281,13 @@ namespace Glitter { rend_group->mat_draw = mat4_identity; bool has_scale = false; - vec3 scale = vec3_null; + vec3 scale = 0.0f; mat3 model_mat; if (rend_group->flags & PARTICLE_EMITTER_LOCAL) { mat4_get_scale(&rend_group->mat, &scale); if (rend_group->flags & PARTICLE_SCALE) x_vec.x = scale.x; - vec3_sub(scale, vec3_identity, scale); + scale -= 1.0f; if (!(has_scale |= fabsf(scale.x) > 0.000001f ? true : false)) scale.x = 0.0f; if (!(has_scale |= fabsf(scale.y) > 0.000001f ? true : false)) @@ -282,18 +296,31 @@ namespace Glitter { scale.z = 0.0f; mat4_mult_vec3(&rend_group->mat_rot, &scale, &scale); - mat4 mat; - mat4_normalize_rotation(&rend_group->mat, &mat); - mat3_from_mat4(&mat, &model_mat); + mat3_from_mat4(&rend_group->mat, &model_mat); + mat3_normalize_rotation(&model_mat, &model_mat); } else model_mat = mat3_identity; mat3_mult_vec(&GPM_VAL->cam.inv_view_mat3, &x_vec, &x_vec); - gl_state_bind_array_buffer(rend_group->vbo); - Buffer* buf = (Buffer*)glMapBuffer(GL_ARRAY_BUFFER, GL_WRITE_ONLY); + Buffer* buf; + if (GLAD_GL_VERSION_4_5) + buf = (Buffer*)glMapNamedBuffer(rend_group->vbo, GL_WRITE_ONLY); + else { + gl_state_bind_array_buffer(rend_group->vbo); + buf = (Buffer*)glMapBuffer(GL_ARRAY_BUFFER, GL_WRITE_ONLY); + } + + if (!buf) { + if (!GLAD_GL_VERSION_4_5) + gl_state_bind_array_buffer(0); + return; + } + elem = rend_group->elements; + vec2 split_uv = rend_group->split_uv; + Pivot pivot = rend_group->pivot; size_t disp = 0; rend_group->draw_list.clear(); for (size_t i = rend_group->ctrl, index = 0; i > 0; elem++) { @@ -306,37 +333,32 @@ namespace Glitter { continue; float_t uv_u = elem->uv.x + elem->uv_scroll.x; - float_t uv_u_2nd = elem->uv.x + elem->uv_scroll.x + rend_group->split_uv.x; - float_t uv_v_2nd = elem->uv.y + elem->uv_scroll.y + rend_group->split_uv.y; - float_t uv_v_scale = rend_group->split_uv.y / (float_t)(hist->data.size() - 1); + float_t uv_u_2nd = elem->uv.x + elem->uv_scroll.x + split_uv.x; + float_t uv_v_2nd = elem->uv.y + elem->uv_scroll.y + split_uv.y; + float_t uv_v_scale = split_uv.y / (float_t)(hist->data.size() - 1); uv_v_2nd = 1.0f - uv_v_2nd; - size_t len = elem->locus_history->data.size(); size_t j = 0; if (has_scale) for (LocusHistory::Data& hist_data : hist->data) { vec3 pos = hist_data.translation; - vec3 pos_diff; - vec3_sub(pos, elem->base_translation, pos_diff); - vec3_mult(pos_diff, scale, pos_diff); + vec3 pos_diff = (pos - elem->base_translation) * scale; mat3_mult_vec(&model_mat, &pos_diff, &pos_diff); - vec3_add(pos, pos_diff, pos); + pos += pos_diff; float_t v00; float_t v01; - CalcDispLocusSetPivot(rend_group->pivot, + CalcDispLocusSetPivot(pivot, hist_data.scale * elem->scale.x * elem->scale_all, - &v00, &v01); + v00, v01); - vec3_mult_scalar(x_vec, v00, buf[0].position); - vec3_add(buf[0].position, pos, buf[0].position); + buf[0].position = pos + x_vec * v00; buf[0].uv.x = uv_u; buf[0].uv.y = uv_v_2nd + (float_t)j * uv_v_scale; buf[0].color = hist_data.color; - vec3_mult_scalar(x_vec, v01, buf[1].position); - vec3_add(buf[1].position, pos, buf[1].position); + buf[1].position = pos + x_vec * v01; buf[1].uv.x = uv_u_2nd; buf[1].uv.y = uv_v_2nd + (float_t)j * uv_v_scale; buf[1].color = hist_data.color; @@ -349,18 +371,16 @@ namespace Glitter { float_t v00; float_t v01; - CalcDispLocusSetPivot(rend_group->pivot, + CalcDispLocusSetPivot(pivot, hist_data.scale * elem->scale.x * elem->scale_all, - &v00, &v01); + v00, v01); - vec3_mult_scalar(x_vec, v00, buf[0].position); - vec3_add(buf[0].position, pos, buf[0].position); + buf[0].position = pos + x_vec * v00; buf[0].uv.x = uv_u; buf[0].uv.y = uv_v_2nd + (float_t)j * uv_v_scale; buf[0].color = hist_data.color; - vec3_mult_scalar(x_vec, v01, buf[1].position); - vec3_add(buf[1].position, pos, buf[1].position); + buf[1].position = pos + x_vec * v01; buf[1].uv.x = uv_u_2nd; buf[1].uv.y = uv_v_2nd + (float_t)j * uv_v_scale; buf[1].color = hist_data.color; @@ -375,8 +395,13 @@ namespace Glitter { } } rend_group->disp = disp; - glUnmapBuffer(GL_ARRAY_BUFFER); - gl_state_bind_array_buffer(0); + + if (GLAD_GL_VERSION_4_5) + glUnmapNamedBuffer(rend_group->vbo); + else { + glUnmapBuffer(GL_ARRAY_BUFFER); + gl_state_bind_array_buffer(0); + } } void F2RenderScene::CalcDispQuad(GPM, F2RenderGroup* rend_group) { @@ -479,10 +504,24 @@ namespace Glitter { vec3 scale; mat4_get_scale(model_mat, &scale); - gl_state_bind_array_buffer(rend_group->vbo); - Buffer* buf = (Buffer*)glMapBuffer(GL_ARRAY_BUFFER, GL_WRITE_ONLY); + Buffer* buf; + if (GLAD_GL_VERSION_4_5) + buf = (Buffer*)glMapNamedBuffer(rend_group->vbo, GL_WRITE_ONLY); + else { + gl_state_bind_array_buffer(rend_group->vbo); + buf = (Buffer*)glMapBuffer(GL_ARRAY_BUFFER, GL_WRITE_ONLY); + } + + if (!buf) { + if (!GLAD_GL_VERSION_4_5) + gl_state_bind_array_buffer(0); + return; + } + bool use_scale = rend_group->flags & PARTICLE_SCALE ? true : false; RenderElement* elem = rend_group->elements; + vec2 split_uv = rend_group->split_uv; + Pivot pivot = rend_group->pivot; size_t disp = 0; for (size_t i = rend_group->ctrl, j_max = 1024; i > 0; i -= j_max) { j_max = min_def(i, j_max); @@ -494,10 +533,7 @@ namespace Glitter { if (!elem->disp) continue; - vec2 scale_particle; - vec2_mult(*(vec2*)&elem->scale, elem->scale_particle, scale_particle); - vec2_mult_scalar(scale_particle, elem->scale_all, scale_particle); - + vec2 scale_particle = *(vec2*)&elem->scale * elem->scale_particle * elem->scale_all; if (fabsf(scale_particle.x) < 0.000001f || fabsf(scale_particle.y) < 0.000001f) continue; @@ -507,9 +543,9 @@ namespace Glitter { float_t v01; float_t v10; float_t v11; - CalcDispQuadSetPivot(rend_group->pivot, + CalcDispQuadSetPivot(pivot, scale_particle.x, scale_particle.y, - &v00, &v01, &v10, &v11); + v00, v01, v10, v11); vec2 pos_add[4]; vec2 uv_add[4]; @@ -520,18 +556,17 @@ namespace Glitter { pos_add[1].x = v00; pos_add[1].y = v10; uv_add[1].x = 0.0f; - uv_add[1].y = rend_group->split_uv.y; + uv_add[1].y = split_uv.y; pos_add[2].x = v01; pos_add[2].y = v10; - uv_add[2].x = rend_group->split_uv.x; - uv_add[2].y = rend_group->split_uv.y; + uv_add[2].x = split_uv.x; + uv_add[2].y = split_uv.y; pos_add[3].x = v01; pos_add[3].y = v11; - uv_add[3].x = rend_group->split_uv.x; + uv_add[3].x = split_uv.x; uv_add[3].y = 0.0f; - vec2 base_uv; - vec2_add(elem->uv_scroll, elem->uv, base_uv); + vec2 uv = elem->uv + elem->uv_scroll; mat4 mat = rotate_func(rend_group, elem, &up_vec); mat4_clear_trans(&mat, &mat); @@ -544,31 +579,30 @@ namespace Glitter { mat4_mult_vec3(&mat, &y_vec_base, &y_vec); if (use_scale) { - vec3_mult(x_vec, scale, x_vec); - vec3_mult(y_vec, scale, y_vec); + x_vec *= scale; + y_vec *= scale; } - float_t rot_z_cos = cosf(elem->rotation.z); - float_t rot_z_sin = sinf(elem->rotation.z); + float_t rot_z_cos = elem->rot_z_cos; + float_t rot_z_sin = elem->rot_z_sin; for (int32_t k = 0; k < 4; k++, buf++) { - vec3 x_vec_rot; - vec3_mult_scalar(x_vec, pos_add[k].x * rot_z_cos - pos_add[k].y * rot_z_sin, x_vec_rot); - vec3 y_vec_rot; - vec3_mult_scalar(y_vec, pos_add[k].x * rot_z_sin + pos_add[k].y * rot_z_cos, y_vec_rot); - - vec3 pos_add_rot; - vec3_add(x_vec_rot, y_vec_rot, pos_add_rot); - vec3_add(pos, pos_add_rot, buf->position); - - vec2_add(base_uv, uv_add[k], buf->uv); + vec3 x_vec_rot = x_vec * (pos_add[k].x * rot_z_cos - pos_add[k].y * rot_z_sin); + vec3 y_vec_rot = y_vec * (pos_add[k].x * rot_z_sin + pos_add[k].y * rot_z_cos); + buf->position = pos + (x_vec_rot + y_vec_rot); + buf->uv = uv + uv_add[k]; buf->color = elem->color; } disp++; } } rend_group->disp = disp; - glUnmapBuffer(GL_ARRAY_BUFFER); - gl_state_bind_array_buffer(0); + + if (GLAD_GL_VERSION_4_5) + glUnmapNamedBuffer(rend_group->vbo); + else { + glUnmapBuffer(GL_ARRAY_BUFFER); + gl_state_bind_array_buffer(0); + } } void F2RenderScene::CalcDispQuadNormal(GPM, @@ -580,12 +614,12 @@ namespace Glitter { vec3 x_vec = { 1.0f, 0.0f, 0.0f }; vec3 y_vec = { 0.0f, 1.0f, 0.0f }; bool use_z_offset = false; - vec3 dist_to_cam = vec3_null; + vec3 dist_to_cam = 0.0f; mat4 z_offset_inv_mat = mat4_identity; if (fabsf(rend_group->z_offset) > 0.000001f) { use_z_offset = true; mat4_get_translation(model_mat, &dist_to_cam); - vec3_sub(GPM_VAL->cam.view_point, dist_to_cam, dist_to_cam); + dist_to_cam = GPM_VAL->cam.view_point - dist_to_cam; if (rend_group->flags & PARTICLE_EMITTER_LOCAL) { mat4_normalize_rotation(model_mat, &z_offset_inv_mat); mat4_inverse(&z_offset_inv_mat, &z_offset_inv_mat); @@ -594,14 +628,14 @@ namespace Glitter { bool has_scale = false; bool emitter_local = false; - vec3 scale = vec3_null; + vec3 scale = 0.0f; if (rend_group->flags & PARTICLE_EMITTER_LOCAL) { mat4_get_scale(model_mat, &scale); if (rend_group->flags & PARTICLE_SCALE) { x_vec.x = scale.x; y_vec.y = scale.y; } - vec3_sub(scale, vec3_identity, scale); + scale -= 1.0f; if (!(has_scale |= fabsf(scale.x) > 0.000001f ? true : false)) scale.x = 0.0f; if (!(has_scale |= fabsf(scale.y) > 0.000001f ? true : false)) @@ -618,7 +652,7 @@ namespace Glitter { if (some_scale <= 0.0f) some_scale = 1.0f; - vec2_add_scalar(*(vec2*)&ext_anim_scale, some_scale, *(vec2*)&ext_anim_scale); + ext_anim_scale += some_scale; x_vec.x *= ext_anim_scale.x; y_vec.y *= ext_anim_scale.y; } @@ -633,9 +667,24 @@ namespace Glitter { mat4_mult_vec3(&inv_model_mat, &x_vec, &x_vec); mat4_mult_vec3(&inv_model_mat, &y_vec, &y_vec); - gl_state_bind_array_buffer(rend_group->vbo); - Buffer* buf = (Buffer*)glMapBuffer(GL_ARRAY_BUFFER, GL_WRITE_ONLY); + Buffer* buf; + if (GLAD_GL_VERSION_4_5) + buf = (Buffer*)glMapNamedBuffer(rend_group->vbo, GL_WRITE_ONLY); + else { + gl_state_bind_array_buffer(rend_group->vbo); + buf = (Buffer*)glMapBuffer(GL_ARRAY_BUFFER, GL_WRITE_ONLY); + } + + if (!buf) { + if (!GLAD_GL_VERSION_4_5) + gl_state_bind_array_buffer(0); + return; + } + RenderElement* elem = rend_group->elements; + vec2 split_uv = rend_group->split_uv; + Pivot pivot = rend_group->pivot; + float_t z_offset = rend_group->z_offset; size_t disp = 0; if (rend_group->draw_type == DIRECTION_PARTICLE_ROTATION) for (size_t i = rend_group->ctrl, j_max = 1024; i > 0; i -= j_max) { @@ -648,29 +697,24 @@ namespace Glitter { if (!elem->disp) continue; - vec2 scale_particle; - vec2_mult(*(vec2*)&elem->scale, elem->scale_particle, scale_particle); - vec2_mult_scalar(scale_particle, elem->scale_all, scale_particle); - + vec2 scale_particle = *(vec2*)&elem->scale * elem->scale_particle * elem->scale_all; if (fabsf(scale_particle.x) < 0.000001f || fabsf(scale_particle.y) < 0.000001f) continue; vec3 pos = elem->translation; if (has_scale) { - vec3 pos_diff; - vec3_sub(pos, elem->base_translation, pos_diff); - vec3_mult(pos_diff, scale, pos_diff); + vec3 pos_diff = (pos - elem->base_translation) * scale; mat4_mult_vec3(&inv_model_mat, &pos_diff, &pos_diff); - vec3_add(pos, pos_diff, pos); + pos += pos_diff; } float_t v00; float_t v01; float_t v11; float_t v10; - CalcDispQuadSetPivot(rend_group->pivot, + CalcDispQuadSetPivot(pivot, scale_particle.x, scale_particle.y, - &v00, &v01, &v10, &v11); + v00, v01, v10, v11); vec2 pos_add[4]; vec2 uv_add[4]; @@ -681,40 +725,35 @@ namespace Glitter { pos_add[1].x = v00; pos_add[1].y = v10; uv_add[1].x = 0.0f; - uv_add[1].y = rend_group->split_uv.y; + uv_add[1].y = split_uv.y; pos_add[2].x = v01; pos_add[2].y = v10; - uv_add[2].x = rend_group->split_uv.x; - uv_add[2].y = rend_group->split_uv.y; + uv_add[2].x = split_uv.x; + uv_add[2].y = split_uv.y; pos_add[3].x = v01; pos_add[3].y = v11; - uv_add[3].x = rend_group->split_uv.x; + uv_add[3].x = split_uv.x; uv_add[3].y = 0.0f; - vec2 base_uv; - vec2_add(elem->uv_scroll, elem->uv, base_uv); - if (use_z_offset) { - vec3 z_offset_dir; - vec3_sub(dist_to_cam, pos, z_offset_dir); - vec3_normalize(z_offset_dir, z_offset_dir); + vec2 uv = elem->uv + elem->uv_scroll; + if (use_z_offset) { + vec3 z_offset_dir = vec3::normalize(dist_to_cam - pos); if (emitter_local) mat4_mult_vec3(&z_offset_inv_mat, &z_offset_dir, &z_offset_dir); - - vec3_mult_scalar(z_offset_dir, rend_group->z_offset, z_offset_dir); - vec3_add(pos, z_offset_dir, pos); + pos += z_offset_dir * z_offset; } mat3 ptc_rot; mat3_rotate(elem->rotation.x, elem->rotation.y, elem->rotation.z, &ptc_rot); for (int32_t k = 0; k < 4; k++, buf++) { - vec3 x_vec_rot; - x_vec_rot.x = x_vec.x * pos_add[k].x; - x_vec_rot.y = y_vec.y * pos_add[k].y; - x_vec_rot.z = 0.0f; - mat3_mult_vec(&ptc_rot, &x_vec_rot, &x_vec_rot); - vec3_add(x_vec_rot, pos, buf->position); - vec2_add(base_uv, uv_add[k], buf->uv); + vec3 xy_vec_rot; + xy_vec_rot.x = x_vec.x * pos_add[k].x; + xy_vec_rot.y = y_vec.y * pos_add[k].y; + xy_vec_rot.z = 0.0f; + mat3_mult_vec(&ptc_rot, &xy_vec_rot, &xy_vec_rot); + buf->position = pos + xy_vec_rot; + buf->uv = uv + uv_add[k]; buf->color = elem->color; } disp++; @@ -731,10 +770,7 @@ namespace Glitter { if (!elem->disp) continue; - vec2 scale_particle; - vec2_mult(*(vec2*)&elem->scale, elem->scale_particle, scale_particle); - vec2_mult_scalar(scale_particle, elem->scale_all, scale_particle); - + vec2 scale_particle = *(vec2*)&elem->scale * elem->scale_particle * elem->scale_all; if (fabsf(scale_particle.x) < 0.000001f || fabsf(scale_particle.y) < 0.000001f) continue; @@ -751,9 +787,9 @@ namespace Glitter { float_t v01; float_t v11; float_t v10; - CalcDispQuadSetPivot(rend_group->pivot, + CalcDispQuadSetPivot(pivot, scale_particle.x, scale_particle.y, - &v00, &v01, &v10, &v11); + v00, v01, v10, v11); vec2 pos_add[4]; vec2 uv_add[4]; @@ -764,48 +800,45 @@ namespace Glitter { pos_add[1].x = v00; pos_add[1].y = v10; uv_add[1].x = 0.0f; - uv_add[1].y = rend_group->split_uv.y; + uv_add[1].y = split_uv.y; pos_add[2].x = v01; pos_add[2].y = v10; - uv_add[2].x = rend_group->split_uv.x; - uv_add[2].y = rend_group->split_uv.y; + uv_add[2].x = split_uv.x; + uv_add[2].y = split_uv.y; pos_add[3].x = v01; pos_add[3].y = v11; - uv_add[3].x = rend_group->split_uv.x; + uv_add[3].x = split_uv.x; uv_add[3].y = 0.0f; - vec2 base_uv; - vec2_add(elem->uv_scroll, elem->uv, base_uv); - if (use_z_offset) { - vec3 z_offset_dir; - vec3_sub(dist_to_cam, pos, z_offset_dir); - vec3_normalize(z_offset_dir, z_offset_dir); + vec2 uv = elem->uv + elem->uv_scroll; + if (use_z_offset) { + vec3 z_offset_dir = vec3::normalize(dist_to_cam - pos); if (emitter_local) mat4_mult_vec3(&z_offset_inv_mat, &z_offset_dir, &z_offset_dir); - - vec3_mult_scalar(z_offset_dir, rend_group->z_offset, z_offset_dir); - vec3_add(pos, z_offset_dir, pos); + pos += z_offset_dir * z_offset; } - float_t rot_z_cos = cosf(elem->rotation.z); - float_t rot_z_sin = sinf(elem->rotation.z); + float_t rot_z_cos = elem->rot_z_cos; + float_t rot_z_sin = elem->rot_z_sin; for (int32_t k = 0; k < 4; k++, buf++) { - vec3 x_vec_rot; - vec3_mult_scalar(x_vec, rot_z_cos * pos_add[k].x - rot_z_sin * pos_add[k].y, x_vec_rot); - vec3 y_vec_rot; - vec3_mult_scalar(y_vec, rot_z_sin * pos_add[k].x + rot_z_cos * pos_add[k].y, y_vec_rot); - vec3_add(x_vec_rot, y_vec_rot, x_vec_rot); - vec3_add(x_vec_rot, pos, buf->position); - vec2_add(base_uv, uv_add[k], buf->uv); + vec3 x_vec_rot = x_vec * (rot_z_cos * pos_add[k].x - rot_z_sin * pos_add[k].y); + vec3 y_vec_rot = y_vec * (rot_z_sin * pos_add[k].x + rot_z_cos * pos_add[k].y); + buf->position = pos + (x_vec_rot + y_vec_rot); + buf->uv = uv + uv_add[k]; buf->color = elem->color; } disp++; } } rend_group->disp = disp; - glUnmapBuffer(GL_ARRAY_BUFFER); - gl_state_bind_array_buffer(0); + + if (GLAD_GL_VERSION_4_5) + glUnmapNamedBuffer(rend_group->vbo); + else { + glUnmapBuffer(GL_ARRAY_BUFFER); + gl_state_bind_array_buffer(0); + } } void F2RenderScene::Ctrl(GLT, float_t delta_frame) { @@ -889,6 +922,9 @@ namespace Glitter { return; } + if (!rend_group->vao) + return; + rend_group->disp = 0; switch (rend_group->type) { case PARTICLE_QUAD: @@ -1013,13 +1049,17 @@ namespace Glitter { shaders_ft.state_matrix_set_mvp(rend_group->mat_draw, GPM_VAL->cam.view, GPM_VAL->cam.projection); shaders_ft.state_matrix_set_texture(0, mat4_identity); shaders_ft.state_matrix_set_texture(1, mat4_identity); - shaders_ft.env_vert_set(3, vec4_identity); + shaders_ft.env_vert_set(3, 1.0f); shaders_ft.set(SHADER_FT_GLITTER_PT); switch (rend_group->type) { case PARTICLE_QUAD: { gl_state_bind_vertex_array(rend_group->vao); - shaders_ft.draw_elements(GL_TRIANGLES, (GLsizei)(6 * rend_group->disp), GL_UNSIGNED_INT, 0); + shaders_ft.enable_primitive_restart(); + shaders_ft.set_primitive_restart_index(0xFFFFFFFF); + shaders_ft.draw_elements(GL_TRIANGLE_STRIP, (GLsizei)(5 * rend_group->disp - 1), GL_UNSIGNED_INT, 0); + shaders_ft.disable_primitive_restart(); + gl_state_bind_vertex_array(0); } break; case PARTICLE_LINE: @@ -1128,7 +1168,7 @@ namespace Glitter { return; bool has_scale = false; - vec3 scale = vec3_null; + vec3 scale = 0.0f; if (rend_group->flags & PARTICLE_EMITTER_LOCAL) { rend_group->GetEmitterScale(scale); if (!(has_scale |= fabsf(scale.x) > 0.000001f ? true : false)) @@ -1142,8 +1182,20 @@ namespace Glitter { else rend_group->mat_draw = mat4_identity; - gl_state_bind_array_buffer(rend_group->vbo); - Buffer* buf = (Buffer*)glMapBuffer(GL_ARRAY_BUFFER, GL_WRITE_ONLY); + Buffer* buf; + if (GLAD_GL_VERSION_4_5) + buf = (Buffer*)glMapNamedBuffer(rend_group->vbo, GL_WRITE_ONLY); + else { + gl_state_bind_array_buffer(rend_group->vbo); + buf = (Buffer*)glMapBuffer(GL_ARRAY_BUFFER, GL_WRITE_ONLY); + } + + if (!buf) { + if (!GLAD_GL_VERSION_4_5) + gl_state_bind_array_buffer(0); + return; + } + elem = rend_group->elements; size_t disp = 0; rend_group->draw_list.clear(); @@ -1159,12 +1211,9 @@ namespace Glitter { size_t j = 0; if (has_scale) for (LocusHistory::Data& hist_data : hist->data) { - vec3 pos = hist_data.translation; - vec3 pos_diff; - vec3_sub(pos, elem->base_translation, pos_diff); - vec3_mult(pos_diff, scale, pos_diff); - vec3_add(pos, pos_diff, buf->position); - buf->uv = vec2_null; + vec3& pos = hist_data.translation; + buf->position = pos + (pos - elem->base_translation) * scale; + buf->uv = 0.0f; buf->color = hist_data.color; j++; buf++; @@ -1172,7 +1221,7 @@ namespace Glitter { else for (LocusHistory::Data& hist_data : hist->data) { buf->position = hist_data.translation; - buf->uv = vec2_null; + buf->uv = 0.0f; buf->color = hist_data.color; j++; buf++; @@ -1185,8 +1234,13 @@ namespace Glitter { } } rend_group->disp = disp; - glUnmapBuffer(GL_ARRAY_BUFFER); - gl_state_bind_array_buffer(0); + + if (GLAD_GL_VERSION_4_5) + glUnmapNamedBuffer(rend_group->vbo); + else { + glUnmapBuffer(GL_ARRAY_BUFFER); + gl_state_bind_array_buffer(0); + } } void XRenderScene::CalcDispLocus(GPM, XRenderGroup* rend_group) { @@ -1221,12 +1275,12 @@ namespace Glitter { mat3 model_mat; bool has_scale = false; - vec3 scale = vec3_null; + vec3 scale = 0.0f; if (rend_group->flags & PARTICLE_EMITTER_LOCAL) { mat4_get_scale(&rend_group->mat, &scale); if (rend_group->flags & PARTICLE_SCALE) x_vec.x = scale.x; - vec3_sub(scale, vec3_identity, scale); + scale -= 1.0f; if (!(has_scale |= fabsf(scale.x) > 0.000001f ? true : false)) scale.x = 0.0f; if (!(has_scale |= fabsf(scale.y) > 0.000001f ? true : false)) @@ -1242,9 +1296,23 @@ namespace Glitter { mat3_mult_vec(&GPM_VAL->cam.inv_view_mat3, &x_vec, &x_vec); - gl_state_bind_array_buffer(rend_group->vbo); - Buffer* buf = (Buffer*)glMapBuffer(GL_ARRAY_BUFFER, GL_WRITE_ONLY); + Buffer* buf; + if (GLAD_GL_VERSION_4_5) + buf = (Buffer*)glMapNamedBuffer(rend_group->vbo, GL_WRITE_ONLY); + else { + gl_state_bind_array_buffer(rend_group->vbo); + buf = (Buffer*)glMapBuffer(GL_ARRAY_BUFFER, GL_WRITE_ONLY); + } + + if (!buf) { + if (!GLAD_GL_VERSION_4_5) + gl_state_bind_array_buffer(0); + return; + } + elem = rend_group->elements; + vec2 split_uv = rend_group->split_uv; + Pivot pivot = rend_group->pivot; size_t disp = 0; rend_group->draw_list.clear(); for (size_t i = rend_group->ctrl, index = 0; i > 0; elem++) { @@ -1257,9 +1325,9 @@ namespace Glitter { continue; float_t uv_u = elem->uv.x + elem->uv_scroll.x; - float_t uv_u_2nd = elem->uv.x + elem->uv_scroll.x + rend_group->split_uv.x; - float_t uv_v_2nd = elem->uv.y + elem->uv_scroll.y + rend_group->split_uv.y; - float_t uv_v_scale = rend_group->split_uv.y / (float_t)(hist->data.size() - 1); + float_t uv_u_2nd = elem->uv.x + elem->uv_scroll.x + split_uv.x; + float_t uv_v_2nd = elem->uv.y + elem->uv_scroll.y + split_uv.y; + float_t uv_v_scale = split_uv.y / (float_t)(hist->data.size() - 1); uv_v_2nd = 1.0f - uv_v_2nd; @@ -1267,26 +1335,22 @@ namespace Glitter { if (has_scale) for (LocusHistory::Data& hist_data : hist->data) { vec3 pos = hist_data.translation; - vec3 pos_diff; - vec3_sub(pos, elem->base_translation, pos_diff); - vec3_mult(pos_diff, scale, pos_diff); + vec3 pos_diff = (pos - elem->base_translation) * scale; mat3_mult_vec(&model_mat, &pos_diff, &pos_diff); - vec3_add(pos, pos_diff, pos); + pos += pos_diff; float_t v00; float_t v01; - CalcDispLocusSetPivot(rend_group->pivot, + CalcDispLocusSetPivot(pivot, hist_data.scale * elem->scale.x * elem->scale_all, - &v00, &v01); + v00, v01); - vec3_mult_scalar(x_vec, v00, buf[0].position); - vec3_add(buf[0].position, pos, buf[0].position); + buf[0].position = pos + x_vec * v00; buf[0].uv.x = uv_u; buf[0].uv.y = uv_v_2nd + (float_t)j * uv_v_scale; buf[0].color = hist_data.color; - vec3_mult_scalar(x_vec, v01, buf[1].position); - vec3_add(buf[1].position, pos, buf[1].position); + buf[1].position = pos + x_vec * v01; buf[1].uv.x = uv_u_2nd; buf[1].uv.y = uv_v_2nd + (float_t)j * uv_v_scale; buf[1].color = hist_data.color; @@ -1299,18 +1363,16 @@ namespace Glitter { float_t v00; float_t v01; - CalcDispLocusSetPivot(rend_group->pivot, + CalcDispLocusSetPivot(pivot, hist_data.scale * elem->scale.x * elem->scale_all, - &v00, &v01); + v00, v01); - vec3_mult_scalar(x_vec, v00, buf[0].position); - vec3_add(buf[0].position, pos, buf[0].position); + buf[0].position = pos + x_vec * v00; buf[0].uv.x = uv_u; buf[0].uv.y = uv_v_2nd + (float_t)j * uv_v_scale; buf[0].color = hist_data.color; - vec3_mult_scalar(x_vec, v01, buf[1].position); - vec3_add(buf[1].position, pos, buf[1].position); + buf[1].position = pos + x_vec * v01; buf[1].uv.x = uv_u_2nd; buf[1].uv.y = uv_v_2nd + (float_t)j * uv_v_scale; buf[1].color = hist_data.color; @@ -1325,8 +1387,13 @@ namespace Glitter { } } rend_group->disp = disp; - glUnmapBuffer(GL_ARRAY_BUFFER); - gl_state_bind_array_buffer(0); + + if (GLAD_GL_VERSION_4_5) + glUnmapNamedBuffer(rend_group->vbo); + else { + glUnmapBuffer(GL_ARRAY_BUFFER); + gl_state_bind_array_buffer(0); + } } void XRenderScene::CalcDispMesh(GPM, XRenderGroup* rend_group) { @@ -1336,7 +1403,7 @@ namespace Glitter { bool has_scale = false; bool emitter_local = false; - vec3 emit_scale = vec3_null; + vec3 emit_scale = 0.0f; mat4 model_mat; mat4 view_mat; mat4 inv_view_mat; @@ -1437,16 +1504,14 @@ namespace Glitter { float_t some_scale = 0.0f; if (rend_group->GetExtAnimScale(&ext_anim_scale, &some_scale)) { if (!has_scale) { - emit_scale = vec3_identity; + emit_scale = 1.0f; has_scale = true; } - if (some_scale >= 0.0f) { - vec3_add_scalar(ext_anim_scale, some_scale, ext_anim_scale); - vec3_mult(emit_scale, ext_anim_scale, emit_scale); - } + if (some_scale >= 0.0f) + emit_scale *= ext_anim_scale + some_scale; else - vec3_add(emit_scale, ext_anim_scale, emit_scale); + emit_scale += ext_anim_scale; } object_data* object_data = &rctx_ptr->object_data; @@ -1466,10 +1531,9 @@ namespace Glitter { vec3 trans = elem->translation; vec3 rot = elem->rotation; - vec3 scale; - vec3_mult_scalar(elem->scale, elem->scale_all, scale); + vec3 scale = elem->scale * elem->scale_all; if (has_scale) - vec3_mult(scale, emit_scale, scale); + scale *= emit_scale; if (emitter_local) mat4_mult_vec3_trans(&model_mat, &trans, &trans); @@ -1490,8 +1554,8 @@ namespace Glitter { mat = dir_mat; mat4_set_translation(&mat, &trans); - mat4_rotate_mult(&mat, rot.x, rot.y, rot.z, &mat); - mat4_scale_rot(&mat, scale.x, scale.y, scale.z, &mat); + mat4_rotate_mult(&mat, &rot, &mat); + mat4_scale_rot(&mat, &scale, &mat); vec3 uv_scroll; @@ -1616,14 +1680,28 @@ namespace Glitter { } bool use_scale = false; - vec3 scale = vec3_identity; + vec3 scale = 1.0f; if (rend_group->flags & PARTICLE_EMITTER_LOCAL && rend_group->GetEmitterScale(scale)) use_scale = rend_group->flags & PARTICLE_SCALE ? true : false; - gl_state_bind_array_buffer(rend_group->vbo); - Buffer* buf = (Buffer*)glMapBuffer(GL_ARRAY_BUFFER, GL_WRITE_ONLY); + Buffer* buf; + if (GLAD_GL_VERSION_4_5) + buf = (Buffer*)glMapNamedBuffer(rend_group->vbo, GL_WRITE_ONLY); + else { + gl_state_bind_array_buffer(rend_group->vbo); + buf = (Buffer*)glMapBuffer(GL_ARRAY_BUFFER, GL_WRITE_ONLY); + } + + if (!buf) { + if (!GLAD_GL_VERSION_4_5) + gl_state_bind_array_buffer(0); + return; + } + RenderElement* elem = rend_group->elements; + vec2 split_uv = rend_group->split_uv; + Pivot pivot = rend_group->pivot; size_t disp = 0; for (size_t i = rend_group->ctrl, j_max = 1024; i > 0; i -= j_max) { j_max = min_def(i, j_max); @@ -1635,25 +1713,21 @@ namespace Glitter { if (!elem->disp) continue; - vec2 scale_particle; - vec2_mult(*(vec2*)&elem->scale, elem->scale_particle, scale_particle); - vec2_mult_scalar(scale_particle, elem->scale_all, scale_particle); - + vec2 scale_particle = *(vec2*)&elem->scale * elem->scale_particle * elem->scale_all; if (fabsf(scale_particle.x) < 0.000001f || fabsf(scale_particle.y) < 0.000001f) continue; vec3 pos = elem->translation; - if (use_scale) - vec3_mult(pos, scale, pos); + pos *= scale; float_t v00; float_t v01; float_t v10; float_t v11; - CalcDispQuadSetPivot(rend_group->pivot, + CalcDispQuadSetPivot(pivot, scale_particle.x, scale_particle.y, - &v00, &v01, &v10, &v11); + v00, v01, v10, v11); vec2 pos_add[4]; vec2 uv_add[4]; @@ -1664,18 +1738,17 @@ namespace Glitter { pos_add[1].x = v00; pos_add[1].y = v10; uv_add[1].x = 0.0f; - uv_add[1].y = rend_group->split_uv.y; + uv_add[1].y = split_uv.y; pos_add[2].x = v01; pos_add[2].y = v10; - uv_add[2].x = rend_group->split_uv.x; - uv_add[2].y = rend_group->split_uv.y; + uv_add[2].x = split_uv.x; + uv_add[2].y = split_uv.y; pos_add[3].x = v01; pos_add[3].y = v11; - uv_add[3].x = rend_group->split_uv.x; + uv_add[3].x = split_uv.x; uv_add[3].y = 0.0f; - vec2 base_uv; - vec2_add(elem->uv_scroll, elem->uv, base_uv); + vec2 uv = elem->uv + elem->uv_scroll; mat4 mat = rotate_func(rend_group, elem, &up_vec); vec3 x_vec; @@ -1684,31 +1757,30 @@ namespace Glitter { mat4_mult_vec3(&mat, &y_vec_base, &y_vec); if (use_scale) { - vec3_mult(x_vec, scale, x_vec); - vec3_mult(y_vec, scale, y_vec); + x_vec *= scale; + y_vec *= scale; } - float_t rot_z_cos = cosf(elem->rotation.z); - float_t rot_z_sin = sinf(elem->rotation.z); + float_t rot_z_cos = elem->rot_z_cos; + float_t rot_z_sin = elem->rot_z_sin; for (int32_t k = 0; k < 4; k++, buf++) { - vec3 x_vec_rot; - vec3_mult_scalar(x_vec, pos_add[k].x * rot_z_cos - pos_add[k].y * rot_z_sin, x_vec_rot); - vec3 y_vec_rot; - vec3_mult_scalar(y_vec, pos_add[k].x * rot_z_sin + pos_add[k].y * rot_z_cos, y_vec_rot); - - vec3 pos_add_rot; - vec3_add(x_vec_rot, y_vec_rot, pos_add_rot); - vec3_add(pos, pos_add_rot, buf->position); - - vec2_add(base_uv, uv_add[k], buf->uv); + vec3 x_vec_rot = x_vec * (pos_add[k].x * rot_z_cos - pos_add[k].y * rot_z_sin); + vec3 y_vec_rot = y_vec * (pos_add[k].x * rot_z_sin + pos_add[k].y * rot_z_cos); + buf->position = pos + (x_vec_rot + y_vec_rot); + buf->uv = uv + uv_add[k]; buf->color = elem->color; } disp++; } } rend_group->disp = disp; - glUnmapBuffer(GL_ARRAY_BUFFER); - gl_state_bind_array_buffer(0); + + if (GLAD_GL_VERSION_4_5) + glUnmapNamedBuffer(rend_group->vbo); + else { + glUnmapBuffer(GL_ARRAY_BUFFER); + gl_state_bind_array_buffer(0); + } } void XRenderScene::CalcDispQuadNormal(XRenderGroup* rend_group, mat4* model_mat, mat4* dir_mat) { @@ -1719,12 +1791,12 @@ namespace Glitter { vec3 x_vec = { 1.0f, 0.0f, 0.0f }; vec3 y_vec = { 0.0f, 1.0f, 0.0f }; bool use_z_offset = false; - vec3 dist_to_cam = vec3_null; + vec3 dist_to_cam = 0.0f; mat4 z_offset_inv_mat = mat4_identity; if (fabsf(rend_group->z_offset) > 0.000001f) { use_z_offset = true; mat4_get_translation(model_mat, &dist_to_cam); - vec3_sub(GPM_VAL->cam.view_point, dist_to_cam, dist_to_cam); + dist_to_cam = GPM_VAL->cam.view_point - dist_to_cam; if (rend_group->flags & PARTICLE_EMITTER_LOCAL) { mat4_normalize_rotation(model_mat, &z_offset_inv_mat); mat4_inverse(&z_offset_inv_mat, &z_offset_inv_mat); @@ -1733,7 +1805,7 @@ namespace Glitter { bool has_scale = false; bool emitter_local = false; - vec3 scale = vec3_null; + vec3 scale = 0.0f; if (rend_group->flags & PARTICLE_EMITTER_LOCAL) { rend_group->GetEmitterScale(scale); if (rend_group->flags & PARTICLE_SCALE) { @@ -1755,7 +1827,7 @@ namespace Glitter { if (some_scale <= 0.0f) some_scale = 1.0f; - vec2_add_scalar(*(vec2*)&ext_anim_scale, some_scale, *(vec2*)&ext_anim_scale); + ext_anim_scale += some_scale; x_vec.x *= ext_anim_scale.x; y_vec.y *= ext_anim_scale.y; } @@ -1770,9 +1842,24 @@ namespace Glitter { mat4_mult_vec3(&inv_model_mat, &x_vec, &x_vec); mat4_mult_vec3(&inv_model_mat, &y_vec, &y_vec); - gl_state_bind_array_buffer(rend_group->vbo); - Buffer* buf = (Buffer*)glMapBuffer(GL_ARRAY_BUFFER, GL_WRITE_ONLY); + Buffer* buf; + if (GLAD_GL_VERSION_4_5) + buf = (Buffer*)glMapNamedBuffer(rend_group->vbo, GL_WRITE_ONLY); + else { + gl_state_bind_array_buffer(rend_group->vbo); + buf = (Buffer*)glMapBuffer(GL_ARRAY_BUFFER, GL_WRITE_ONLY); + } + + if (!buf) { + if (!GLAD_GL_VERSION_4_5) + gl_state_bind_array_buffer(0); + return; + } + RenderElement* elem = rend_group->elements; + vec2 split_uv = rend_group->split_uv; + Pivot pivot = rend_group->pivot; + float_t z_offset = rend_group->z_offset; size_t disp = 0; if (rend_group->draw_type == DIRECTION_PARTICLE_ROTATION) for (size_t i = rend_group->ctrl, j_max = 1024; i > 0; i -= j_max) { @@ -1785,24 +1872,21 @@ namespace Glitter { if (!elem->disp) continue; - vec2 scale_particle; - vec2_mult(*(vec2*)&elem->scale, elem->scale_particle, scale_particle); - vec2_mult_scalar(scale_particle, elem->scale_all, scale_particle); - + vec2 scale_particle = *(vec2*)&elem->scale * elem->scale_particle * elem->scale_all; if (fabsf(scale_particle.x) < 0.000001f || fabsf(scale_particle.y) < 0.000001f) continue; vec3 pos = elem->translation; if (has_scale) - vec3_mult(pos, scale, pos); + pos *= scale; float_t v00; float_t v01; float_t v11; float_t v10; - CalcDispQuadSetPivot(rend_group->pivot, + CalcDispQuadSetPivot(pivot, scale_particle.x, scale_particle.y, - &v00, &v01, &v10, &v11); + v00, v01, v10, v11); vec2 pos_add[4]; vec2 uv_add[4]; @@ -1813,40 +1897,35 @@ namespace Glitter { pos_add[1].x = v00; pos_add[1].y = v10; uv_add[1].x = 0.0f; - uv_add[1].y = rend_group->split_uv.y; + uv_add[1].y = split_uv.y; pos_add[2].x = v01; pos_add[2].y = v10; - uv_add[2].x = rend_group->split_uv.x; - uv_add[2].y = rend_group->split_uv.y; + uv_add[2].x = split_uv.x; + uv_add[2].y = split_uv.y; pos_add[3].x = v01; pos_add[3].y = v11; - uv_add[3].x = rend_group->split_uv.x; + uv_add[3].x = split_uv.x; uv_add[3].y = 0.0f; - vec2 base_uv; - vec2_add(elem->uv_scroll, elem->uv, base_uv); - if (use_z_offset) { - vec3 z_offset_dir; - vec3_sub(dist_to_cam, pos, z_offset_dir); - vec3_normalize(z_offset_dir, z_offset_dir); + vec2 uv = elem->uv + elem->uv_scroll; + if (use_z_offset) { + vec3 z_offset_dir = vec3::normalize(dist_to_cam - pos); if (emitter_local) mat4_mult_vec3(&z_offset_inv_mat, &z_offset_dir, &z_offset_dir); - - vec3_mult_scalar(z_offset_dir, rend_group->z_offset, z_offset_dir); - vec3_add(pos, z_offset_dir, pos); + pos += z_offset_dir * z_offset; } mat3 ptc_rot; mat3_rotate(elem->rotation.x, elem->rotation.y, elem->rotation.z, &ptc_rot); for (int32_t k = 0; k < 4; k++, buf++) { - vec3 x_vec_rot; - x_vec_rot.x = x_vec.x * pos_add[k].x; - x_vec_rot.y = y_vec.y * pos_add[k].y; - x_vec_rot.z = 0.0f; - mat3_mult_vec(&ptc_rot, &x_vec_rot, &x_vec_rot); - vec3_add(x_vec_rot, pos, buf->position); - vec2_add(base_uv, uv_add[k], buf->uv); + vec3 xy_vec_rot; + xy_vec_rot.x = x_vec.x * pos_add[k].x; + xy_vec_rot.y = y_vec.y * pos_add[k].y; + xy_vec_rot.z = 0.0f; + mat3_mult_vec(&ptc_rot, &xy_vec_rot, &xy_vec_rot); + buf->position = pos + xy_vec_rot; + buf->uv = uv + uv_add[k]; buf->color = elem->color; } disp++; @@ -1863,24 +1942,21 @@ namespace Glitter { if (!elem->disp) continue; - vec2 scale_particle; - vec2_mult(*(vec2*)&elem->scale, elem->scale_particle, scale_particle); - vec2_mult_scalar(scale_particle, elem->scale_all, scale_particle); - + vec2 scale_particle = *(vec2*)&elem->scale * elem->scale_particle * elem->scale_all; if (fabsf(scale_particle.x) < 0.000001f || fabsf(scale_particle.y) < 0.000001f) continue; vec3 pos = elem->translation; if (has_scale) - vec3_mult(pos, scale, pos); + pos *= scale; float_t v00; float_t v01; float_t v11; float_t v10; - CalcDispQuadSetPivot(rend_group->pivot, + CalcDispQuadSetPivot(pivot, scale_particle.x, scale_particle.y, - &v00, &v01, &v10, &v11); + v00, v01, v10, v11); vec2 pos_add[4]; vec2 uv_add[4]; @@ -1891,48 +1967,45 @@ namespace Glitter { pos_add[1].x = v00; pos_add[1].y = v10; uv_add[1].x = 0.0f; - uv_add[1].y = rend_group->split_uv.y; + uv_add[1].y = split_uv.y; pos_add[2].x = v01; pos_add[2].y = v10; - uv_add[2].x = rend_group->split_uv.x; - uv_add[2].y = rend_group->split_uv.y; + uv_add[2].x = split_uv.x; + uv_add[2].y = split_uv.y; pos_add[3].x = v01; pos_add[3].y = v11; - uv_add[3].x = rend_group->split_uv.x; + uv_add[3].x = split_uv.x; uv_add[3].y = 0.0f; - vec2 base_uv; - vec2_add(elem->uv_scroll, elem->uv, base_uv); - if (use_z_offset) { - vec3 z_offset_dir; - vec3_sub(dist_to_cam, pos, z_offset_dir); - vec3_normalize(z_offset_dir, z_offset_dir); + vec2 uv = elem->uv + elem->uv_scroll; + if (use_z_offset) { + vec3 z_offset_dir = vec3::normalize(dist_to_cam - pos); if (emitter_local) mat4_mult_vec3(&z_offset_inv_mat, &z_offset_dir, &z_offset_dir); - - vec3_mult_scalar(z_offset_dir, rend_group->z_offset, z_offset_dir); - vec3_add(pos, z_offset_dir, pos); + pos += z_offset_dir * z_offset; } - float_t rot_z_cos = cosf(elem->rotation.z); - float_t rot_z_sin = sinf(elem->rotation.z); + float_t rot_z_cos = elem->rot_z_cos; + float_t rot_z_sin = elem->rot_z_sin; for (int32_t k = 0; k < 4; k++, buf++) { - vec3 x_vec_rot; - vec3_mult_scalar(x_vec, rot_z_cos * pos_add[k].x - rot_z_sin * pos_add[k].y, x_vec_rot); - vec3 y_vec_rot; - vec3_mult_scalar(y_vec, rot_z_sin * pos_add[k].x + rot_z_cos * pos_add[k].y, y_vec_rot); - vec3_add(x_vec_rot, y_vec_rot, x_vec_rot); - vec3_add(x_vec_rot, pos, buf->position); - vec2_add(base_uv, uv_add[k], buf->uv); + vec3 x_vec_rot = x_vec * (rot_z_cos * pos_add[k].x - rot_z_sin * pos_add[k].y); + vec3 y_vec_rot = y_vec * (rot_z_sin * pos_add[k].x + rot_z_cos * pos_add[k].y); + buf->position = pos + (x_vec_rot + y_vec_rot); + buf->uv = uv + uv_add[k]; buf->color = elem->color; } disp++; } } rend_group->disp = disp; - glUnmapBuffer(GL_ARRAY_BUFFER); - gl_state_bind_array_buffer(0); + + if (GLAD_GL_VERSION_4_5) + glUnmapNamedBuffer(rend_group->vbo); + else { + glUnmapBuffer(GL_ARRAY_BUFFER); + gl_state_bind_array_buffer(0); + } } bool XRenderScene::CanDisp(DispType disp_type, bool a3) { @@ -2024,6 +2097,9 @@ namespace Glitter { return; } + if (!rend_group->vao) + return; + rend_group->disp = 0; switch (rend_group->type) { case PARTICLE_QUAD: @@ -2130,13 +2206,16 @@ namespace Glitter { shaders_ft.state_matrix_set_mvp(rend_group->mat_draw, GPM_VAL->cam.view, GPM_VAL->cam.projection); shaders_ft.state_matrix_set_texture(0, mat4_identity); shaders_ft.state_matrix_set_texture(1, mat4_identity); - shaders_ft.env_vert_set(3, vec4_identity); + shaders_ft.env_vert_set(3, 1.0f); shaders_ft.set(SHADER_FT_GLITTER_PT); switch (rend_group->type) { case PARTICLE_QUAD: { gl_state_bind_vertex_array(rend_group->vao); - shaders_ft.draw_elements(GL_TRIANGLES, (GLsizei)(6 * rend_group->disp), GL_UNSIGNED_INT, 0); + shaders_ft.enable_primitive_restart(); + shaders_ft.set_primitive_restart_index(0xFFFFFFFF); + shaders_ft.draw_elements(GL_TRIANGLE_STRIP, (GLsizei)(5 * rend_group->disp - 1), GL_UNSIGNED_INT, 0); + shaders_ft.disable_primitive_restart(); gl_state_bind_vertex_array(0); } break; case PARTICLE_LINE: diff --git a/src/CRE/auth_3d.cpp b/src/CRE/auth_3d.cpp index cf04badb..3b6ce5b5 100644 --- a/src/CRE/auth_3d.cpp +++ b/src/CRE/auth_3d.cpp @@ -17,6 +17,8 @@ #include "draw_task.hpp" #include "object.hpp" #include "pv_db.hpp" +#include "task_effect.hpp" +#include "sound.hpp" #include "stage.hpp" namespace auth_3d_detail { @@ -29,6 +31,14 @@ namespace auth_3d_detail { virtual bool Ctrl() override; virtual void Disp() override; }; + + class FrameRateTimeStop : public FrameRateControl { + public: + FrameRateTimeStop(); + virtual ~FrameRateTimeStop() override; + + virtual float_t GetDeltaFrame() override; + }; } typedef a3da_ambient auth_3d_ambient_file; @@ -68,7 +78,6 @@ static void auth_3d_key_load(auth_3d* auth, auth_3d_key* k, auth_3d_key_file* kf static void auth_3d_rgba_load(auth_3d* auth, auth_3d_rgba* rgba, auth_3d_rgba_file* rgbaf); static void auth_3d_vec3_load(auth_3d* auth, auth_3d_vec3* vec, auth_3d_vec3_file* vecf); static void auth_3d_model_transform_load(auth_3d* auth, auth_3d_model_transform* mt, auth_3d_model_transform_file* mtf); -static void auth_3d_model_transform_set_mat(auth_3d_model_transform* mt, const mat4* parent_mat); static int32_t auth_3d_get_auth_3d_object_index_by_object_info(auth_3d* auth, object_info obj_info, int32_t instance); @@ -83,82 +92,59 @@ static void auth_3d_read_file(auth_3d* auth, auth_3d_database* auth_3d_db); static void auth_3d_read_file_modern(auth_3d* auth); static void auth_3d_set_material_list(auth_3d* auth, render_context* rctx); -static void auth_3d_ambient_ctrl(auth_3d_ambient* a, float_t frame); static void auth_3d_ambient_load(auth_3d* auth, auth_3d_ambient* a, auth_3d_ambient_file* af); static void auth_3d_ambient_set(auth_3d_ambient* a, render_context* rctx); -static void auth_3d_camera_auxiliary_ctrl(auth_3d_camera_auxiliary* ca, float_t frame); static void auth_3d_camera_auxiliary_load(auth_3d* auth, auth_3d_camera_auxiliary_file* caf); static void auth_3d_camera_auxiliary_restore_prev_value(auth_3d_camera_auxiliary* ca, render_context* rctx); static void auth_3d_camera_auxiliary_set(auth_3d_camera_auxiliary* ca, render_context* rctx); -static void auth_3d_camera_root_ctrl(auth_3d_camera_root* cr, float_t frame, mat4* mat, render_context* rctx); +static float_t auth_3d_camera_root_calc_frame(auth_3d_camera_root* cr, float_t frame, render_context* rctx); static void auth_3d_camera_root_load(auth_3d* auth, auth_3d_camera_root* cr, auth_3d_camera_root_file* crf); static void auth_3d_camera_root_view_point_load(auth_3d* auth, auth_3d_camera_root_view_point* crvp, auth_3d_camera_root_view_point_file* crvpf); -static void auth_3d_chara_ctrl(auth_3d_chara* c, float_t frame); static void auth_3d_chara_disp(auth_3d_chara* c, mat4* parent_mat, render_context* rctx); static void auth_3d_chara_load(auth_3d* auth, auth_3d_chara* c, auth_3d_chara_file* cf); -static void auth_3d_curve_ctrl(auth_3d_curve* c, float_t frame); static void auth_3d_curve_load(auth_3d* auth, auth_3d_curve* c, auth_3d_curve_file* cf); -static void auth_3d_dof_ctrl(auth_3d_dof* d, float_t frame); static void auth_3d_dof_load(auth_3d* auth, auth_3d_dof* d, auth_3d_dof_file* df); static void auth_3d_dof_restore_prev_value(auth_3d_dof* d, render_context* rctx); static void auth_3d_dof_set(auth_3d_dof* d, render_context* rctx); -static void auth_3d_event_load(auth_3d* auth, auth_3d_event* e, auth_3d_event_file* ef); -static void auth_3d_fog_ctrl(auth_3d_fog* f, float_t frame); +static auth_3d_detail::Event* auth_3d_event_load(auth_3d * auth, auth_3d_event_file * ef); +static const char* auth_3d_event_type_string(auth_3d_detail::Event::Type type); static void auth_3d_fog_load(auth_3d* auth, auth_3d_fog* e, auth_3d_fog_file* ff); static void auth_3d_fog_restore_prev_value(auth_3d_fog* f, render_context* rctx); static void auth_3d_fog_set(auth_3d_fog* f, render_context* rctx); -static void auth_3d_light_ctrl(auth_3d_light* l, float_t frame); static void auth_3d_light_load(auth_3d* auth, auth_3d_light* a, auth_3d_light_file* lf); static void auth_3d_light_restore_prev_value(auth_3d_light* l, render_context* rctx); static void auth_3d_light_set(auth_3d_light* l, render_context* rctx); -static void auth_3d_m_object_hrc_ctrl(auth_3d_m_object_hrc* moh, float_t frame); static void auth_3d_m_object_hrc_disp(auth_3d_m_object_hrc* moh, auth_3d* auth, render_context* rctx); static void auth_3d_m_object_hrc_get_mat(auth_3d_m_object_hrc* moh, mat4* mat); static void auth_3d_m_object_hrc_load(auth_3d* auth, auth_3d_m_object_hrc* moh, auth_3d_m_object_hrc_file* mohf, object_database* obj_db); -static void auth_3d_m_object_hrc_list_ctrl(auth_3d_m_object_hrc* moh, mat4* parent_mat); static void auth_3d_m_object_hrc_nodes_mat_mult(auth_3d_m_object_hrc* moh); -static void auth_3d_material_list_ctrl(auth_3d_material_list* ml, float_t frame); static void auth_3d_material_list_load(auth_3d* auth, auth_3d_material_list* ml, auth_3d_material_list_file* mlf); -static void auth_3d_object_ctrl(auth_3d_object* o, float_t frame); static void auth_3d_object_disp(auth_3d_object* o, auth_3d* auth, render_context* rctx); static void auth_3d_object_load(auth_3d* auth, auth_3d_object* o, auth_3d_object_file* of, object_database* obj_db, texture_database* tex_db); -static void auth_3d_object_curve_ctrl(auth_3d_object_curve* oc, float_t frame); static void auth_3d_object_curve_load(auth_3d* auth, auth_3d_object_curve* curve, std::string& name, float_t frame_offset); -static void auth_3d_object_list_ctrl(auth_3d_object* o, mat4* parent_mat); -static void auth_3d_object_hrc_ctrl(auth_3d_object_hrc* oh, float_t frame); static void auth_3d_object_hrc_disp(auth_3d_object_hrc* oh, auth_3d* auth, render_context* rctx); static void auth_3d_object_hrc_load(auth_3d* auth, auth_3d_object_hrc* oh, auth_3d_object_hrc_file* ohf, object_database* obj_db); static bool auth_3d_object_hrc_replace_chara(auth_3d_object_hrc* oh, chara_index src_chara, chara_index dst_chara, object_database* obj_db); -static void auth_3d_object_hrc_list_ctrl(auth_3d_object_hrc* oh, mat4* mat); -static void auth_3d_object_hrc_nodes_mat_mult(auth_3d_object_hrc* oh, mat4* mat); +static void auth_3d_object_hrc_nodes_mat_mult(auth_3d_object_hrc* oh, const mat4* mat); static void auth_3d_object_instance_load(auth_3d* auth, auth_3d_object_instance* oi, auth_3d_object_instance_file* oif, auth_3d_m_object_hrc* moh, object_database* obj_db); -static void auth_3d_object_model_transform_ctrl(auth_3d_object_model_transform* obj_mt, float_t frame); static void auth_3d_object_model_transform_load(auth_3d* auth, auth_3d_object_model_transform* omt, auth_3d_model_transform_file* mtf); -static void auth_3d_object_model_transform_mat_mult(auth_3d_object_model_transform* obj_mt, mat4* mat); -static void auth_3d_object_model_transform_set_mat_inner(auth_3d_object_model_transform* obj_mt); static void auth_3d_object_node_load(auth_3d* auth, auth_3d_object_node* on, auth_3d_object_node_file* onf); -static void auth_3d_object_texture_pattern_ctrl( - auth_3d_object_texture_pattern* otp, float_t frame); static void auth_3d_object_texture_pattern_load(auth_3d* auth, auth_3d_object_texture_pattern* otp, auth_3d_object_texture_pattern_file* otpf, texture_database* tex_db); -static void auth_3d_object_texture_transform_ctrl( - auth_3d_object_texture_transform* ott, float_t frame); static void auth_3d_object_texture_transform_load(auth_3d* auth, auth_3d_object_texture_transform* ott, auth_3d_object_texture_transform_file* ottf, texture_database* tex_db); static void auth_3d_play_control_load(auth_3d* auth, auth_3d_play_control_file* pcf); -static void auth_3d_point_ctrl(auth_3d_point* p, float_t frame); static void auth_3d_point_disp(auth_3d_point* p, mat4* parent_mat, render_context* rctx); static void auth_3d_point_load(auth_3d* auth, auth_3d_point* p, auth_3d_point_file* pf); -static void auth_3d_post_process_ctrl(auth_3d_post_process* pp, float_t frame); static void auth_3d_post_process_load(auth_3d* auth, auth_3d_post_process* pp, auth_3d_post_process_file* ppf); static void auth_3d_post_process_restore_prev_value(auth_3d_post_process* pp, render_context* rctx); static void auth_3d_post_process_set(auth_3d_post_process* pp, render_context* rctx); @@ -197,6 +183,8 @@ static void auth_3d_uid_file_modern_unload(auth_3d_uid_file_modern* uid_file); static void auth_3d_uid_file_unload_file(auth_3d_uid_file* uid_file); static void auth_3d_uid_file_modern_unload_file(auth_3d_uid_file_modern* uid_file); +static size_t auth_3d_time_event_radix_index_func_time(auth_3d_time_event* data, size_t index); + static void Auth3dTestTask__SetAuth3dId(Auth3dTestTask* tt); static void Auth3dTestTask__SetStage(Auth3dTestTask* tt); @@ -205,12 +193,13 @@ auth_3d_detail::TaskAuth3d* task_auth_3d; Auth3dTestTask* auth_3d_test_task; static int16_t auth_3d_load_counter; +static auth_3d_detail::FrameRateTimeStop frame_rate_time_stop; extern render_context* rctx_ptr; -auth_3d::auth_3d() : uid(), id(), mat(), enable(), camera_root_update(), visible(), repeat(), -ended(), left_right_reverse(), once(), alpha(), chara_id(), shadow(), frame_rate(), frame(), -req_frame(), max_frame(), frame_changed(), frame_offset(), last_frame(), paused() { +auth_3d::auth_3d() : uid(), id(), mat(), enable(), camera_root_update(), visible(), repeat(), ended(), +left_right_reverse(), once(), alpha(), chara_id(), chara_item(), shadow(), frame_rate(), frame(), +req_frame(), max_frame(), frame_changed(), frame_offset(), last_frame(), paused(), event_time_next() { hash = hash_murmurhash_empty; src_chara = CHARA_MAX; dst_chara = CHARA_MAX; @@ -265,8 +254,9 @@ void auth_3d::ctrl(render_context* rctx) { if (t) l_len = t - l_str; - uid_file->name = ff->name.substr(0, l_len); - uid_file->file_name = ff->name; + uid_file->name.assign(ff->name.c_str(), l_len); + uid_file->file_name.assign(ff->name); + file_name.assign(ff->name); load(&a, uid_file->obj_db, uid_file->tex_db); hash = uid_file->hash; frame = 0.0f; @@ -277,75 +267,109 @@ void auth_3d::ctrl(render_context* rctx) { if (state != 2 || !enable) return; + int32_t event_flags = 0; bool set = false; while (true) { if (frame_changed) { frame_changed = false; + if (req_frame < frame) { + event_time_next = event_time.data(); + event_flags |= 0x02; + } + else + event_flags |= 0x04; frame = req_frame; ended = false; if (max_frame >= 0.0f && frame >= max_frame) max_frame = -1.0f; } else if (!paused) { + event_flags |= 0x01; frame += frame_rate->GetDeltaFrame(); if (max_frame >= 0.0f && frame > max_frame) frame = max_frame; } + float_t frame = this->frame; for (auth_3d_point& i : point) - auth_3d_point_ctrl(&i, frame); + i.interpolate(frame); for (auth_3d_curve& i : curve) - auth_3d_curve_ctrl(&i, frame); + i.interpolate(frame); for (auth_3d_chara& i : chara) - auth_3d_chara_ctrl(&i, frame); + i.interpolate(frame); for (auth_3d_material_list& i : material_list) - auth_3d_material_list_ctrl(&i, frame); + i.interpolate(frame); for (auth_3d_object& i : object) - auth_3d_object_ctrl(&i, frame); + i.interpolate(frame); for (auth_3d_object*& i : object_list) - auth_3d_object_list_ctrl(i, &mat); + i->list_ctrl(&mat); for (auth_3d_object_hrc& i : object_hrc) - auth_3d_object_hrc_ctrl(&i, frame); + i.interpolate(frame); for (auth_3d_object_hrc*& i : object_hrc_list) - auth_3d_object_hrc_list_ctrl(i, &mat); + i->list_ctrl(&mat); for (auth_3d_m_object_hrc& i : m_object_hrc) - auth_3d_m_object_hrc_ctrl(&i, frame); + i.interpolate(frame); for (auth_3d_m_object_hrc*& i : m_object_hrc_list) - auth_3d_m_object_hrc_list_ctrl(i, &mat); + i->list_ctrl(&mat); for (auth_3d_ambient& i : ambient) { - auth_3d_ambient_ctrl(&i, frame); + i.interpolate(frame); auth_3d_ambient_set(&i, rctx); } for (auth_3d_light& i : light) { - auth_3d_light_ctrl(&i, frame); + i.interpolate(frame); auth_3d_light_set(&i, rctx); } for (auth_3d_fog& i : fog) { - auth_3d_fog_ctrl(&i, frame); + i.interpolate(frame); auth_3d_fog_set(&i, rctx); } - auth_3d_post_process_ctrl(&post_process, frame); + post_process.interpolate(frame); auth_3d_post_process_set(&post_process, rctx); - auth_3d_camera_auxiliary_ctrl(&camera_auxiliary, frame); + auth_3d_time_event* i_event = event_time_next; + auth_3d_time_event* i_event_end = event_time.data() + event_time.size(); + for (; i_event != i_event_end && frame >= i_event->frame; i_event++) { + auth_3d_detail::Event* e = event[i_event->event_index]; + if (!i_event->type) { + printf_debug(" [%s]: [%s][%s]\n", + auth_3d_event_type_string(e->type), e->ref.c_str(), e->param1.c_str()); + e->Begin(this, event_flags, rctx); + e->active = true; + } + else if (i_event->type) { + printf_debug(" [%s]: [%s][%s]\n", + auth_3d_event_type_string(e->type), e->ref.c_str(), e->param1.c_str()); + if (e->active) { + e->active = false; + e->End(this, event_flags, rctx); + } + } + } + event_time_next = i_event; + + for (auth_3d_detail::Event*& i : event) + if (i->active) + i->Ctrl(this, event_flags, rctx); + + camera_auxiliary.interpolate(frame); auth_3d_camera_auxiliary_set(&camera_auxiliary, rctx); if (camera_root_update) for (auth_3d_camera_root& i : camera_root) { - auth_3d_camera_root_ctrl(&i, frame, &mat, rctx); + i.interpolate(auth_3d_camera_root_calc_frame(&i, frame, rctx)); vec3 interest = i.interest_value; vec3 view_point = i.view_point_value; @@ -369,7 +393,7 @@ void auth_3d::ctrl(render_context* rctx) { break; } - auth_3d_dof_ctrl(&dof, frame); + dof.interpolate(frame); auth_3d_dof_set(&dof, rctx); if (set || !repeat || last_frame > frame) @@ -410,6 +434,10 @@ void auth_3d::disp(render_context* rctx) { for (auth_3d_m_object_hrc*& i : m_object_hrc_list) auth_3d_m_object_hrc_disp(i, this, rctx); + for (auth_3d_detail::Event*& i : event) + if (i->active) + i->Disp(this, &mat, rctx); + rctx->object_data.set_material_list(0, 0); } @@ -432,91 +460,93 @@ void auth_3d::load(a3da* auth_file, auth_3d_dof_load(this, &dof, &auth_file->dof); auth_3d_post_process_load(this, &post_process, &auth_file->post_process); - if (auth_file->ambient.size() > 0) { + if (auth_file->ambient.size()) { size_t ambient_index = 0; ambient.resize(auth_file->ambient.size()); for (auth_3d_ambient_file& i : auth_file->ambient) auth_3d_ambient_load(this, &ambient[ambient_index++], &i); } - if (auth_file->auth_2d.size() > 0) { + if (auth_file->auth_2d.size()) { size_t auth_2d_index = 0; auth_2d.resize(auth_file->auth_2d.size()); for (std::string& i : auth_file->auth_2d) auth_2d[auth_2d_index++] = i; } - if (auth_file->camera_root.size() > 0) { + if (auth_file->camera_root.size()) { size_t camera_root_index = 0; camera_root.resize(auth_file->camera_root.size()); for (auth_3d_camera_root_file& i : auth_file->camera_root) auth_3d_camera_root_load(this, &camera_root[camera_root_index++], &i); } - if (auth_file->chara.size() > 0) { + if (auth_file->chara.size()) { size_t chara_index = 0; chara.resize(auth_file->chara.size()); for (auth_3d_chara_file& i : auth_file->chara) auth_3d_chara_load(this, &chara[chara_index++], &i); } - if (auth_file->curve.size() > 0) { + if (auth_file->curve.size()) { size_t curve_index = 0; curve.resize(auth_file->curve.size()); for (auth_3d_curve_file& i : auth_file->curve) auth_3d_curve_load(this, &curve[curve_index++], &i); } - if (auth_file->event.size() > 0) { - size_t event_index = 0; - event.resize(auth_file->event.size()); - for (auth_3d_event_file& i : auth_file->event) - auth_3d_event_load(this, &event[event_index++], &i); + if (auth_file->event.size()) { + event.reserve(auth_file->event.size()); + for (auth_3d_event_file& i : auth_file->event) { + auth_3d_detail::Event* e = auth_3d_event_load(this, &i); + if (e) + event.push_back(e); + } } - if (auth_file->fog.size() > 0) { + if (auth_file->fog.size()) { size_t fog_index = 0; fog.resize(auth_file->fog.size()); for (auth_3d_fog_file& i : auth_file->fog) auth_3d_fog_load(this, &fog[fog_index++], &i); } - if (auth_file->light.size() > 0) { + if (auth_file->light.size()) { size_t light_index = 0; light.resize(auth_file->light.size()); for (auth_3d_light_file& i : auth_file->light) auth_3d_light_load(this, &light[light_index++], &i); } - if (auth_file->m_object_hrc.size() > 0) { + if (auth_file->m_object_hrc.size()) { size_t m_object_hrc_index = 0; m_object_hrc.resize(auth_file->m_object_hrc.size()); for (auth_3d_m_object_hrc_file& i : auth_file->m_object_hrc) auth_3d_m_object_hrc_load(this, &m_object_hrc[m_object_hrc_index++], &i, obj_db); } - if (auth_file->material_list.size() > 0) { + if (auth_file->material_list.size()) { size_t material_list_index = 0; material_list.resize(auth_file->material_list.size()); for (auth_3d_material_list_file& i : auth_file->material_list) auth_3d_material_list_load(this, &material_list[material_list_index++], &i); } - if (auth_file->motion.size() > 0) { + if (auth_file->motion.size()) { size_t motion_index = 0; motion.resize(auth_file->motion.size()); for (std::string& i : auth_file->motion) motion[motion_index++] = i; } - if (auth_file->object.size() > 0) { + if (auth_file->object.size()) { size_t object_index = 0; object.resize(auth_file->object.size()); for (auth_3d_object_file& i : auth_file->object) auth_3d_object_load(this, &object[object_index++], &i, obj_db, tex_db); } - if (auth_file->object_hrc.size() > 0) { + if (auth_file->object_hrc.size()) { size_t object_hrc_index = 0; object_hrc.resize(auth_file->object_hrc.size()); for (auth_3d_object_hrc_file& i : auth_file->object_hrc) @@ -526,14 +556,14 @@ void auth_3d::load(a3da* auth_file, auth_3d_object_hrc_replace_chara(&i, (chara_index)src_chara, (chara_index)dst_chara, obj_db); } - if (auth_file->point.size() > 0) { + if (auth_file->point.size()) { size_t point_index = 0; point.resize(auth_file->point.size()); for (auth_3d_point_file& i : auth_file->point) auth_3d_point_load(this, &point[point_index++], &i); } - if (auth_file->m_object_hrc_list.size() > 0) { + if (auth_file->m_object_hrc_list.size()) { size_t m_object_hrc_list_index = 0; m_object_hrc_list.resize(auth_file->m_object_hrc_list.size()); for (std::string& i : auth_file->m_object_hrc_list) @@ -545,7 +575,7 @@ void auth_3d::load(a3da* auth_file, m_object_hrc_list.resize(m_object_hrc_list_index); } - if (auth_file->object_list.size() > 0) { + if (auth_file->object_list.size()) { size_t object_list_index = 0; object_list.resize(auth_file->object_list.size()); for (std::string& i : auth_file->object_list) @@ -557,7 +587,7 @@ void auth_3d::load(a3da* auth_file, object_list.resize(object_list_index); } - if (auth_file->object_hrc_list.size() > 0) { + if (auth_file->object_hrc_list.size()) { size_t object_hrc_list_index = 0; object_hrc_list.resize(auth_file->object_hrc_list.size()); for (std::string& i : auth_file->object_hrc_list) @@ -569,9 +599,7 @@ void auth_3d::load(a3da* auth_file, object_hrc_list.resize(object_hrc_list_index); } - if (object.size() > 0) { - std::vector* vo = &object; - std::vector* voh = &object_hrc; + if (object.size()) { for (auth_3d_object& i : object) { if (!i.parent_name.size()) continue; @@ -581,14 +609,10 @@ void auth_3d::load(a3da* auth_file, if (i.parent_name.compare(j.name)) continue; - for (auth_3d_object_node& k : j.node) { - if (i.parent_node.compare(k.name)) - continue; - - int32_t node_index = (int32_t)(&k - j.node.data()); - j.childer_object_parent_node.push_back(node_index); + int32_t node_index = j.get_node_index(i.parent_node.c_str()); + if (node_index > -1) { + j.children_object_parent_node.push_back(node_index); j.children_object.push_back(&i); - break; } break; } @@ -603,7 +627,7 @@ void auth_3d::load(a3da* auth_file, } } - if (object_hrc.size() > 0) { + if (object_hrc.size()) { for (auth_3d_object_hrc& i : object_hrc) { if (!i.parent_name.size()) continue; @@ -613,14 +637,10 @@ void auth_3d::load(a3da* auth_file, if (i.parent_name.compare(j.name)) continue; - for (auth_3d_object_node& k : j.node) { - if (i.parent_node.compare(k.name)) - continue; - - int32_t node_index = (int32_t)(&k - j.node.data()); - j.childer_object_hrc_parent_node.push_back(node_index); + int32_t node_index = j.get_node_index(i.parent_node.c_str()); + if (node_index > -1) { + j.children_object_hrc_parent_node.push_back(node_index); j.children_object_hrc.push_back(&i); - break; } break; } @@ -635,7 +655,28 @@ void auth_3d::load(a3da* auth_file, } } - file_name = auth_file->_file_name; + if (event.size()) { + for (auth_3d_detail::Event*& i : event) + if (i) + i->Load(this); + + size_t event_index = 0; + event_time.clear(); + event_time.shrink_to_fit(); + event_time.reserve(event.size() * 2); + for (auth_3d_detail::Event*& i : event) { + event_time.push_back({ i->begin, 0, event_index }); + event_time.push_back({ i->end , 1, event_index }); + event_index++; + } + + radix_sort_custom(event_time.data(), event_time.size(), sizeof(auth_3d_time_event), + sizeof(float_t), (radix_index_func)auth_3d_time_event_radix_index_func_time); + + event_time_next = event_time.data(); + } + + file_name.assign(auth_file->_file_name); } void auth_3d::load_from_farc(farc* f, const char* file, @@ -672,6 +713,7 @@ void auth_3d::reset() { alpha = 1.0f; draw_task_flags = DRAW_TASK_ALPHA_ORDER_1; chara_id = -1; + chara_item = false; shadow = false; src_chara = CHARA_MAX; dst_chara = CHARA_MAX; @@ -695,8 +737,16 @@ void auth_3d::reset() { curve.clear(); curve.shrink_to_fit(); dof.reset(); + for (auth_3d_detail::Event*& i : event) + if (i) { + delete i; + i = 0; + } event.clear(); event.shrink_to_fit(); + event_time.clear(); + event_time.shrink_to_fit(); + event_time_next = 0; fog.clear(); fog.shrink_to_fit(); light.clear(); @@ -756,6 +806,314 @@ void auth_3d::unload(render_context* rctx) { reset(); } +namespace auth_3d_detail { + Event::Event(a3da_event* e) { + active = false; + switch (e->type) { + case A3DA_EVENT_MISC: + default: + type = Event::Type::MISC; + case A3DA_EVENT_FILT: + type = Event::Type::FILT; + case A3DA_EVENT_FX: + type = Event::Type::FX; + case A3DA_EVENT_SND: + type = Event::Type::SND; + case A3DA_EVENT_MOT: + type = Event::Type::MOT; + case A3DA_EVENT_A2D: + type = Event::Type::A2D; + } + name.assign(e->name); + begin = e->begin; + end = e->end; + param1.assign(e->param1); + ref.assign(e->ref); + index = -1; + } + + Event::~Event() { + + } + + void Event::Load(auth_3d* auth) { + + } + + void Event::Begin(auth_3d* auth, int32_t flags, render_context* rctx) { + + } + + void Event::End(auth_3d* auth, int32_t flags, render_context* rctx) { + + } + + void Event::Ctrl(auth_3d* auth, int32_t flags, render_context* rctx) { + + } + + void Event::Disp(auth_3d* auth, const mat4* mat, render_context* rctx) { + + } + + EventA2d::EventA2d(a3da_event* e) : Event(e) { + + } + + EventA2d::~EventA2d() { + + } + + void EventA2d::Begin(auth_3d* auth, int32_t flags, render_context* rctx) { + + } + + void EventA2d::End(auth_3d* auth, int32_t flags, render_context* rctx) { + + } + + void EventA2d::Ctrl(auth_3d* auth, int32_t flags, render_context* rctx) { + + } + + void EventA2d::Disp(auth_3d* auth, const mat4* mat, render_context* rctx) { + + } + + EventFX::EventFX(a3da_event* e) : Event(e) { + + } + + EventFX::~EventFX() { + + } + + void EventFX::Load(auth_3d* auth) { + if (param1.compare("DOWN") && param1.compare("KABEHIT1") && param1.compare("PAPER1")) + return; + + index = -1; + for (auth_3d_point& i : auth->point) + if (!i.name.compare(ref)) { + index = &i - auth->point.data(); + break; + } + } + + void EventFX::Begin(auth_3d* auth, int32_t flags, render_context* rctx) { + printf_debug(" [FX]: %s\n", param1.c_str()); + } + + void EventFX::Ctrl(auth_3d* auth, int32_t flags, render_context* rctx) { + if (index >= auth->point.size() || auth->frame < begin || auth->frame >= end || param1.compare("PAPER1")) + return; + + auth_3d_point& point = auth->point[index]; + vec3 trans = point.model_transform.translation_value; + if (auth->left_right_reverse) + trans.x = -trans.x; + + mat4_mult_vec3_trans(&auth->mat, &trans, &trans); + particle_event_data event; + event.type = 1.0f; + event.count = point.model_transform.scale_value.x * 100.0f; + event.size = point.model_transform.scale_value.z; + event.trans = trans; + event.force = point.model_transform.scale_value.y; + task_effect_parent_event(TASK_EFFECT_PARTICLE, 1, &event); + } + + EventFXSmoothCut::EventFXSmoothCut(a3da_event* e) : Event(e), cam() { + + } + + EventFXSmoothCut::~EventFXSmoothCut() { + + } + + void EventFXSmoothCut::Load(auth_3d* auth) { + if (!ref.compare("CAM")) { + cam = true; + return; + } + + index = -1; + for (auth_3d_point& i : auth->point) + if (!i.name.compare(ref)) { + index = &i - auth->point.data(); + break; + } + } + + void EventFXSmoothCut::Begin(auth_3d* auth, int32_t flags, render_context* rctx) { + if (cam || !auth->chara.size() || index >= auth->chara.size()) + return; + + int32_t chr_index = auth->chara[index].index; + rob_chara* rob_chr = rob_chara_array_get(chr_index); + if (rob_chr) + rob_chr->field_C = true; + } + + void EventFXSmoothCut::End(auth_3d* auth, int32_t flags, render_context* rctx) { + + } + + void EventFXSmoothCut::Disp(auth_3d* auth, const mat4* mat, render_context* rctx) { + + } + + EventFilterFade::EventFilterFade(a3da_event* e) : Event(e) { + type = Type::FADE_NONE; + } + + EventFilterFade::~EventFilterFade() { + + } + + void EventFilterFade::Begin(auth_3d* auth, int32_t flags, render_context* rctx) { + + } + + void EventFilterFade::End(auth_3d* auth, int32_t flags, render_context* rctx) { + switch (type) { + case EventFilterFade::Type::FADE_OUT: + case EventFilterFade::Type::FADE_IN: + break; + default: + return; + } + + rctx->post_process.tone_map->set_scene_fade_color(0.0f); + rctx->post_process.tone_map->set_scene_fade_alpha(0.0f); + rctx->post_process.tone_map->set_scene_fade_blend_func(0); + } + + void EventFilterFade::Disp(auth_3d* auth, const mat4* mat, render_context* rctx) { + switch (type) { + case EventFilterFade::Type::FADE_OUT: + case EventFilterFade::Type::FADE_IN: + break; + default: + return; + } + + float_t t = (auth->frame - begin) / (end - begin); + + float_t alpha; + if (type == EventFilterFade::Type::FADE_IN) + alpha = t; + else + alpha = 1.0f - t; + + rctx->post_process.tone_map->set_scene_fade_color(color); + rctx->post_process.tone_map->set_scene_fade_alpha(alpha); + } + + EventFilterTimeStop::EventFilterTimeStop(a3da_event* e) : Event(e) { + + } + + EventFilterTimeStop::~EventFilterTimeStop() { + + } + + void EventFilterTimeStop::Begin(auth_3d* auth, int32_t flags, render_context* rctx) { + for (auth_3d_chara& i : auth->chara) { + rob_chara* rob_chr = rob_chara_array_get(i.index); + if (rob_chr) + rob_chr->item_equip->disable_update = true; + } + task_effect_parent_set_frame_rate_control(&frame_rate_time_stop); + } + + void EventFilterTimeStop::End(auth_3d* auth, int32_t flags, render_context* rctx) { + for (auth_3d_chara& i : auth->chara) { + rob_chara* rob_chr = rob_chara_array_get(i.index); + if (rob_chr) + rob_chr->item_equip->disable_update = true; + } + task_effect_parent_set_frame_rate_control(&sys_frame_rate); + } + + void EventFilterTimeStop::Disp(auth_3d* auth, const mat4* mat, render_context* rctx) { + + } + + EventMot::EventMot(a3da_event* e) : Event(e) { + + } + + EventMot::~EventMot() { + + } + + void EventMot::Load(auth_3d* auth) { + index = -1; + for (auth_3d_chara& i : auth->chara) + if (!i.name.compare(ref)) { + index = &i - auth->chara.data(); + break; + } + } + + void EventMot::Begin(auth_3d* auth, int32_t flags, render_context* rctx) { + + } + + void EventMot::End(auth_3d* auth, int32_t flags, render_context* rctx) { + + } + + void EventMot::Ctrl(auth_3d* auth, int32_t flags, render_context* rctx) { + + } + + void EventMot::Disp(auth_3d* auth, const mat4* mat, render_context* rctx) { + + } + + EventSnd::EventSnd(a3da_event* e) : Event(e) { + field_190 = param1.find("zz", 0, 2) == 0; + } + + EventSnd::~EventSnd() { + + } + + void EventSnd::Load(auth_3d* auth) { + + } + + static void sub_140532980(int32_t chara_id, const char* name) { + + } + + void EventSnd::Begin(auth_3d* auth, int32_t flags, render_context* rctx) { + float_t frame = auth->frame; + if (begin > frame || frame >= end || ((flags & 0x02) && fabsf(frame - begin) > 0.1f)) + return; + + int32_t index = -1; + if (auth->chara.size()) + index = auth->chara.front().index; + + if (index >= 0 && index < ROB_CHARA_COUNT) + sub_140532980(index, param1.c_str()); + else if (sound_work_has_property(param1.c_str())) + sound_work_play_se(1, param1.c_str(), 1.0f); + } + + void EventSnd::End(auth_3d* auth, int32_t flags, render_context* rctx) { + + } + + void EventSnd::Disp(auth_3d* auth, const mat4* mat, render_context* rctx) { + + } + +} + auth_3d_key::auth_3d_key() : type(), value(), max_frame(), ep_type_pre(), ep_type_post(), frame_delta(), value_delta(), length(), keys(), frame(), value_interp(), value_init() { reset(); @@ -842,6 +1200,24 @@ inline void auth_3d_key::reset() { value_init = 0.0f; } +auth_3d_key& auth_3d_key::operator=(const auth_3d_key& k) { + type = k.type; + value = k.value; + max_frame = k.max_frame; + ep_type_pre = k.ep_type_pre; + ep_type_post = k.ep_type_post; + frame_delta = k.frame_delta; + value_delta = k.value_delta; + keys_vec.assign(k.keys_vec.begin(), k.keys_vec.end()); + length = k.length; + keys = keys_vec.data(); + + frame = k.frame; + value_interp = k.value_interp; + value_init = k.value_init; + return *this; +} + auth_3d_rgba::auth_3d_rgba() : flags(), value() { reset(); } @@ -870,7 +1246,7 @@ void auth_3d_rgba::reset() { g.reset(); b.reset(); a.reset(); - value = vec4_null; + value = 0.0f; } auth_3d_vec3::auth_3d_vec3() { @@ -919,12 +1295,19 @@ void auth_3d_model_transform::reset() { rotation.reset(); translation.reset(); visibility.reset(); - scale_value = vec3_null; - rotation_value = vec3_null; - translation_value = vec3_null; + scale_value = 0.0f; + rotation_value = 0.0f; + translation_value = 0.0f; visible = false; } +void auth_3d_model_transform::set_mat(const mat4* parent_mat) { + mat4 mat; + mat4_translate_mult(parent_mat, &translation_value, &mat); + mat4_rotate_mult(&mat, &rotation_value, &mat); + mat4_scale_rot(&mat, &scale_value, &this->mat); +} + auth_3d_ambient::auth_3d_ambient() : flags() { reset(); } @@ -933,6 +1316,14 @@ auth_3d_ambient::~auth_3d_ambient() { reset(); } +void auth_3d_ambient::interpolate(float_t frame) { + if (flags & AUTH_3D_AMBIENT_LIGHT_DIFFUSE) + light_diffuse.interpolate(frame); + + if (flags & AUTH_3D_AMBIENT_LIGHT_DIFFUSE) + rim_light_diffuse.interpolate(frame); +} + void auth_3d_ambient::reset() { flags = (auth_3d_ambient_flags)0; light_diffuse.reset(); @@ -950,6 +1341,21 @@ auth_3d_camera_auxiliary::~auth_3d_camera_auxiliary() { reset(); } +void auth_3d_camera_auxiliary::interpolate(float_t frame) { + if (flags & AUTH_3D_CAMERA_AUXILIARY_AUTO_EXPOSURE) + auto_exposure_value = auto_exposure.interpolate(frame); + if (flags & AUTH_3D_CAMERA_AUXILIARY_EXPOSURE) + exposure_value = exposure.interpolate(frame); + if (flags & AUTH_3D_CAMERA_AUXILIARY_EXPOSURE_RATE) + exposure_rate_value = exposure_rate.interpolate(frame); + if (flags & AUTH_3D_CAMERA_AUXILIARY_GAMMA) + gamma_value = gamma.interpolate(frame); + if (flags & AUTH_3D_CAMERA_AUXILIARY_GAMMA_RATE) + gamma_rate_value = gamma_rate.interpolate(frame); + if (flags & AUTH_3D_CAMERA_AUXILIARY_SATURATE) + saturate_value = saturate.interpolate(frame); +} + void auth_3d_camera_auxiliary::reset() { flags = (auth_3d_camera_auxiliary_flags)0; auto_exposure.reset(); @@ -971,14 +1377,43 @@ interest_value(), roll_value(), view_point_value() { reset(); } +void auth_3d_camera_root::interpolate(float_t frame) { + model_transform.interpolate(frame); + model_transform.set_mat(&mat4_identity); + + mat4& cr_mat = model_transform.mat; + + vec3 _view_point = view_point.model_transform.translation.interpolate(frame); + mat4_mult_vec3_trans(&cr_mat, &_view_point, &view_point_value); + + vec3 _interest = interest.translation.interpolate(frame); + mat4_mult_vec3_trans(&cr_mat, &_interest, &interest_value); + + float_t fov; + if (view_point.flags & AUTH_3D_CAMERA_ROOT_VIEW_POINT_FOV) { + fov = view_point.fov.interpolate(frame); + if (view_point.fov_is_horizontal) + fov = atanf(tanf(fov * 0.5f) / view_point.aspect) * 2.0f; + } + else { + float_t camera_aperture_h = view_point.camera_aperture_h; + float_t focal_lenth = view_point.focal_length.interpolate(frame); + fov = atanf((camera_aperture_h * 25.4f) * 0.5f / focal_lenth) * 2.0f; + } + fov_value = fov; + + if (view_point.flags & AUTH_3D_CAMERA_ROOT_VIEW_POINT_ROLL) + roll_value = view_point.roll.interpolate(frame); +} + void auth_3d_camera_root::reset() { interest.reset(); model_transform.reset(); view_point.reset(); fov_value = 0.0f; - interest_value = vec3_null; + interest_value = 0.0f; roll_value = 0.0f; - view_point_value = vec3_null; + view_point_value = 0.0f; } auth_3d_camera_root::~auth_3d_camera_root() { @@ -1006,7 +1441,7 @@ void auth_3d_camera_root_view_point::reset() { roll.reset(); } -auth_3d_chara::auth_3d_chara() { +auth_3d_chara::auth_3d_chara() : index() { reset(); } @@ -1014,10 +1449,15 @@ auth_3d_chara::~auth_3d_chara() { reset(); } +void auth_3d_chara::interpolate(float_t frame) { + model_transform.interpolate(frame); +} + void auth_3d_chara::reset() { model_transform.reset(); name.clear(); name.shrink_to_fit(); + index = -1; } auth_3d_curve::auth_3d_curve() : value() { @@ -1028,6 +1468,10 @@ auth_3d_curve::~auth_3d_curve() { reset(); } +void auth_3d_curve::interpolate(float_t frame) { + value = curve.interpolate(frame); +} + void auth_3d_curve::reset() { curve.reset(); name.clear(); @@ -1043,35 +1487,18 @@ auth_3d_dof::~auth_3d_dof() { reset(); } +void auth_3d_dof::interpolate(float_t frame) { + if (!has_dof) + return; + + model_transform.interpolate(frame); +} + void auth_3d_dof::reset() { has_dof = false; model_transform.reset(); } -auth_3d_event::auth_3d_event() : begin(), clip_begin(), -clip_end(), end(), time_ref_scale(), type() { - reset(); -} - -auth_3d_event::~auth_3d_event() { - reset(); -} - -void auth_3d_event::reset() { - begin = 0.0f; - clip_begin = 0.0f; - clip_end = 0.0f; - end = 0.0f; - name.clear(); - name.shrink_to_fit(); - param_1.clear(); - param_1.shrink_to_fit(); - ref.clear(); - ref.shrink_to_fit(); - time_ref_scale = 0.0f; - type = (auth_3d_event_type)0; -} - auth_3d_fog::auth_3d_fog() : flags(), flags_init(), id(), density_value(), end_value(), start_value(), color_init(), density_init(), end_init(), start_init() { reset(); @@ -1081,6 +1508,17 @@ auth_3d_fog::~auth_3d_fog() { reset(); } +void auth_3d_fog::interpolate(float_t frame) { + if (flags & AUTH_3D_FOG_DENSITY) + density_value = density.interpolate(frame); + if (flags & AUTH_3D_FOG_START) + start_value = start.interpolate(frame); + if (flags & AUTH_3D_FOG_END) + end_value = end.interpolate(frame); + if (flags & AUTH_3D_FOG_COLOR) + color.interpolate(frame); +} + void auth_3d_fog::reset() { flags = (auth_3d_fog_flags)0; flags_init = (auth_3d_fog_flags)0; @@ -1094,7 +1532,7 @@ void auth_3d_fog::reset() { end_value = 0.0f; start_value = 0.0f; - color_init = vec4_null; + color_init = 0.0f; density_init = 0.0f; end_init = 0.0f; start_init = 0.0f; @@ -1111,6 +1549,35 @@ auth_3d_light::~auth_3d_light() { reset(); } +void auth_3d_light::interpolate(float_t frame) { + if (flags & AUTH_3D_LIGHT_AMBIENT) + ambient.interpolate(frame); + if (flags & AUTH_3D_LIGHT_CONE_ANGLE) + cone_angle_value = cone_angle.interpolate(frame); + if (flags & AUTH_3D_LIGHT_CONSTANT) + constant_value = constant.interpolate(frame); + if (flags & AUTH_3D_LIGHT_DIFFUSE) + diffuse.interpolate(frame); + if (flags & AUTH_3D_LIGHT_DROP_OFF) + drop_off_value = drop_off.interpolate(frame); + if (flags & AUTH_3D_LIGHT_FAR) + far_value = _far.interpolate(frame); + if (flags & AUTH_3D_LIGHT_INTENSITY) + intensity_value = intensity.interpolate(frame); + if (flags & AUTH_3D_LIGHT_LINEAR) + linear_value = linear.interpolate(frame); + if (flags & AUTH_3D_LIGHT_POSITION) + position.interpolate(frame); + if (flags & AUTH_3D_LIGHT_QUADRATIC) + quadratic_value = quadratic.interpolate(frame); + if (flags & AUTH_3D_LIGHT_SPECULAR) + specular.interpolate(frame); + if (flags & AUTH_3D_LIGHT_SPOT_DIRECTION) + spot_direction.interpolate(frame); + if (flags & AUTH_3D_LIGHT_TONE_CURVE) + tone_curve.interpolate(frame); +} + void auth_3d_light::reset() { flags = (auth_3d_light_flags)0; flags_init = (auth_3d_light_flags)0; @@ -1137,16 +1604,16 @@ void auth_3d_light::reset() { intensity_value = 0.0f; linear_value = 0.0f; quadratic_value = 0.0f; - ambient_init = vec4_null; + ambient_init = 0.0f; cone_angle_init = 0.0f; constant_init = 0.0f; - diffuse_init = vec4_null; + diffuse_init = 0.0f; drop_off_init = 0.0f; far_init = 0.0f; intensity_init = 0.0f; linear_init = 0.0f; quadratic_init = 0.0f; - specular_init = vec4_null; + specular_init = 0.0f; tone_curve_init = {}; } @@ -1158,6 +1625,39 @@ auth_3d_m_object_hrc::~auth_3d_m_object_hrc() { reset(); } +void auth_3d_m_object_hrc::interpolate(float_t frame) { + model_transform.interpolate(frame); + for (auth_3d_object_instance& i : instance) + i.interpolate(frame); + for (auth_3d_object_node& i : node) + i.interpolate(frame); +} + +void auth_3d_m_object_hrc::list_ctrl(const mat4* parent_mat) { + //if (!model_transform.visible) + // return; + + auth_3d_object_node* node = this->node.data(); + + auth_3d_m_object_hrc_nodes_mat_mult(this); + + this->model_transform.mat_mult(parent_mat); + + mat4& mat = this->model_transform.mat; + + for (auth_3d_object_instance& i : this->instance) { + //if (!i.model_transform.visible) + // continue; + + i.model_transform.mat_mult(&mat); + int32_t* object_bone_indices = i.object_bone_indices.data(); + size_t object_bone_indices_count = i.object_bone_indices.size(); + mat4* mats = i.mats.data(); + for (size_t j = 0; j < object_bone_indices_count; j++) + mats[j] = node[object_bone_indices[j]].model_transform.mat; + } +} + void auth_3d_m_object_hrc::reset() { for (auth_3d_object_instance& i : instance) i.reset(); @@ -1180,6 +1680,15 @@ auth_3d_material_list::~auth_3d_material_list() { reset(); } +void auth_3d_material_list::interpolate(float_t frame) { + if (flags & AUTH_3D_MATERIAL_LIST_BLEND_COLOR) + blend_color.interpolate(frame); + if (flags & AUTH_3D_MATERIAL_LIST_GLOW_INTENSITY) + glow_intensity_value = glow_intensity.interpolate(frame); + if (flags & AUTH_3D_MATERIAL_LIST_INCANDESCENCE) + incandescence.interpolate(frame); +} + void auth_3d_material_list::reset() { flags = (auth_3d_material_list_flags)0; blend_color.reset(); @@ -1198,13 +1707,33 @@ auth_3d_object::~auth_3d_object() { reset(); } -void auth_3d_object::reset() { +void auth_3d_object::interpolate(float_t frame) { + model_transform.interpolate(frame); + pattern.interpolate(frame); + morph.interpolate(frame); + for (auth_3d_object_texture_pattern& i : texture_pattern) + i.interpolate(frame); + for (auth_3d_object_texture_transform& i : texture_transform) + i.interpolate(frame); +} + +void auth_3d_object::list_ctrl(const mat4* parent_mat) { + //if (!model_transform.visible) + // return; + + model_transform.set_mat(parent_mat); + + mat4& mat = model_transform.mat; + for (auth_3d_object*& i : children_object) - i = 0; + i->list_ctrl(&mat); + for (auth_3d_object_hrc*& i : children_object_hrc) + i->list_ctrl(&mat); +} + +void auth_3d_object::reset() { children_object.clear(); children_object.shrink_to_fit(); - for (auth_3d_object_hrc*& i : children_object_hrc) - i = 0; children_object_hrc.clear(); children_object_hrc.shrink_to_fit(); model_transform.reset(); @@ -1240,6 +1769,19 @@ auth_3d_object_curve::~auth_3d_object_curve() { reset(); } +void auth_3d_object_curve::interpolate(float_t frame) { + auth_3d_curve* c = curve; + if (!c) + return; + + if (frame_offset != 0.0f) { + frame += frame_offset; + if (frame >= c->curve.max_frame) + frame -= c->curve.max_frame; + } + value = c->curve.interpolate(frame); +} + void auth_3d_object_curve::reset() { curve = 0; name.clear(); @@ -1257,19 +1799,50 @@ auth_3d_object_hrc::~auth_3d_object_hrc() { reset(); } +int32_t auth_3d_object_hrc::get_node_index(const char* node) { + for (auth_3d_object_node& i : this->node) + if (!i.name.compare(node)) + return (int32_t)(&i - this->node.data()); + return -1; +} + +void auth_3d_object_hrc::interpolate(float_t frame) { + for (auth_3d_object_node& i : node) + i.interpolate(frame); +} + +void auth_3d_object_hrc::list_ctrl(const mat4* mat) { + //if (node.size() < 1 || !node.front().model_transform.visible) + // return; + + auth_3d_object_hrc_nodes_mat_mult(this, mat); + + auth_3d_object_node* node = this->node.data(); + + int32_t* children_object_parent_node = this->children_object_parent_node.data(); + auth_3d_object** children_object = this->children_object.data(); + size_t children_object_count = this->children_object.size(); + for (size_t i = 0; i < children_object_count; i++) + children_object[i]->list_ctrl( + &node[children_object_parent_node[i]].model_transform.mat); + + int32_t* children_object_hrc_parent_node = this->children_object_hrc_parent_node.data(); + auth_3d_object_hrc** children_object_hrc = this->children_object_hrc.data(); + size_t children_object_hrc_count = this->children_object_hrc.size(); + for (size_t i = 0; i < children_object_hrc_count; i++) + children_object_hrc[i]->list_ctrl( + &node[children_object_hrc_parent_node[i]].model_transform.mat); +} + void auth_3d_object_hrc::reset() { - for (auth_3d_object*& i : children_object) - i = 0; children_object.clear(); children_object.shrink_to_fit(); - for (auth_3d_object_hrc*& i : children_object_hrc) - i = 0; children_object_hrc.clear(); children_object_hrc.shrink_to_fit(); - childer_object_hrc_parent_node.clear(); - childer_object_hrc_parent_node.shrink_to_fit(); - childer_object_parent_node.clear(); - childer_object_parent_node .shrink_to_fit(); + children_object_parent_node.clear(); + children_object_parent_node .shrink_to_fit(); + children_object_hrc_parent_node.clear(); + children_object_hrc_parent_node.shrink_to_fit(); mats.clear(); mats.shrink_to_fit(); name.clear(); @@ -1299,6 +1872,10 @@ auth_3d_object_instance::~auth_3d_object_instance() { reset(); } +void auth_3d_object_instance::interpolate(float_t frame) { + model_transform.interpolate(frame); +} + void auth_3d_object_instance::reset() { mats.clear(); mats.shrink_to_fit(); @@ -1324,6 +1901,36 @@ auth_3d_object_model_transform::~auth_3d_object_model_transform() { reset(); } +void auth_3d_object_model_transform::interpolate(float_t frame) { + if (frame != this->frame || has_rotation) { + translation_value = translation.interpolate(frame); + rotation_value = rotation.interpolate(frame); + + if (has_scale) + scale_value = scale.interpolate(frame); + + if (has_visibility) + visible = visibility.interpolate(frame) >= 0.99900001f; + + mat4_rotate(&rotation_value, &mat_rot); + this->frame = frame; + has_rotation = false; + has_translation = false; + } + + if (has_translation && !has_rotation) + return; + + mat4 mat; + mat4_translate(&translation_value, &mat); + + mat4_mult(&mat_rot, &mat, &mat); + if (has_scale) + mat4_scale_rot(&mat, &scale_value, &mat); + mat_inner = mat; + has_translation = true; +} + void auth_3d_object_model_transform::reset() { mat = mat4_identity; mat_inner = mat4_identity; @@ -1332,9 +1939,9 @@ void auth_3d_object_model_transform::reset() { rotation.reset(); scale.reset(); visibility.reset(); - translation_value = vec3_null; - rotation_value = vec3_null; - scale_value = vec3_identity; + translation_value = 0.0f; + rotation_value = 0.0f; + scale_value = 1.0f; visible = true; frame = -1.0f; has_rotation = false; @@ -1352,10 +1959,14 @@ auth_3d_object_node::~auth_3d_object_node() { reset(); } +void auth_3d_object_node::interpolate(float_t frame) { + model_transform.interpolate(frame); +} + void auth_3d_object_node::reset() { flags = (auth_3d_object_node_flags)0; bone_id = -1; - joint_orient = vec3_null; + joint_orient = 0.0f; joint_orient_mat = mat4_identity; mat = 0; model_transform.reset(); @@ -1372,6 +1983,10 @@ auth_3d_object_texture_pattern::~auth_3d_object_texture_pattern() { reset(); } +void auth_3d_object_texture_pattern::interpolate(float_t frame) { + pattern.interpolate(frame); +} + void auth_3d_object_texture_pattern::reset() { name.clear(); name.shrink_to_fit(); @@ -1387,6 +2002,86 @@ auth_3d_object_texture_transform::~auth_3d_object_texture_transform() { reset(); } +void auth_3d_object_texture_transform::interpolate(float_t frame) { + int32_t flags = this->flags; + + vec3 scale = 1.0f; + vec3 repeat = 1.0f; + vec3 rotate = 0.0f; + vec3 translate_frame = 0.0f; + + if (flags & AUTH_3D_OBJECT_TEXTURE_TRANSFORM_COVERAGE_U && this->coverage_u.max_frame > 0.0f) { + float_t coverage_u = this->coverage_u.interpolate(frame); + if (fabsf(coverage_u) > 0.000001f) + scale.x = 1.0f / coverage_u; + } + + if (flags & AUTH_3D_OBJECT_TEXTURE_TRANSFORM_COVERAGE_V && this->coverage_v.max_frame > 0.0f) { + float_t coverage_v = this->coverage_v.interpolate(frame); + if (fabsf(coverage_v) > 0.000001f) + scale.y = 1.0f / coverage_v; + } + + if (flags & AUTH_3D_OBJECT_TEXTURE_TRANSFORM_REPEAT_U && this->repeat_u.max_frame > 0.0f) { + float_t value = this->repeat_u.interpolate(frame); + if (fabsf(value) > 0.000001f) + repeat.x = value; + } + + if (flags & AUTH_3D_OBJECT_TEXTURE_TRANSFORM_REPEAT_V && this->repeat_v.max_frame > 0.0f) { + float_t value = this->repeat_v.interpolate(frame); + if (fabsf(value) > 0.000001f) + repeat.y = value; + } + + if (flags & AUTH_3D_OBJECT_TEXTURE_TRANSFORM_ROTATE_FRAME) + rotate.z = this->rotate_frame.interpolate(frame); + + if (flags & AUTH_3D_OBJECT_TEXTURE_TRANSFORM_ROTATE) + rotate.z += this->rotate.interpolate(frame); + + float_t translate_frame_u; + if (flags & AUTH_3D_OBJECT_TEXTURE_TRANSFORM_TRANSLATE_FRAME_U) + translate_frame_u = -this->translate_frame_u.interpolate(frame); + else + translate_frame_u = 0.0f; + + float_t offset_u; + if (flags & AUTH_3D_OBJECT_TEXTURE_TRANSFORM_OFFSET_U) + offset_u = this->offset_u.interpolate(frame); + else + offset_u = 0.0f; + + translate_frame.x = (translate_frame_u + offset_u) * repeat.x; + + float_t translate_frame_v; + if (flags & AUTH_3D_OBJECT_TEXTURE_TRANSFORM_TRANSLATE_FRAME_V) + translate_frame_v = -this->translate_frame_v.interpolate(frame); + else + translate_frame_v = 0.0f; + + float_t offset_v; + if (flags & AUTH_3D_OBJECT_TEXTURE_TRANSFORM_OFFSET_V) + offset_v = this->offset_v.interpolate(frame); + else + offset_v = 0.0f; + + translate_frame.y = (translate_frame_v + offset_v) * repeat.y; + + mat4 mat; + mat4_translate(&translate_frame, &mat); + mat4_scale_rot(&mat, &scale, &mat); + + mat4_translate_mult(&mat, 1.0f, 1.0f, 0.0f, &mat); + mat4_scale_rot(&mat, &repeat, &mat); + mat4_translate_mult(&mat, -1.0f, -1.0f, 0.0f, &mat); + + mat4_translate_mult(&mat, 0.5f, 0.5f, 0.0f, &mat); + mat4_rotate_z_mult(&mat, rotate.z, &mat); + mat4_translate_mult(&mat, -0.5f, -0.5f, 0.0f, &mat); + this->mat = mat; +} + void auth_3d_object_texture_transform::reset() { flags = (auth_3d_object_texture_transform_flags)0; coverage_u.reset(); @@ -1431,6 +2126,10 @@ auth_3d_point::~auth_3d_point() { reset(); } +void auth_3d_point::interpolate(float_t frame) { + model_transform.interpolate(frame); +} + void auth_3d_point::reset() { model_transform.reset(); name.clear(); @@ -1447,6 +2146,21 @@ auth_3d_post_process::~auth_3d_post_process() { reset(); } +void auth_3d_post_process::interpolate(float_t frame) { + if (flags & AUTH_3D_POST_PROCESS_INTENSITY) + intensity.interpolate(frame); + if (flags & AUTH_3D_POST_PROCESS_LENS_FLARE) + lens_flare_value = lens_flare.interpolate(frame); + if (flags & AUTH_3D_POST_PROCESS_LENS_SHAFT) + lens_shaft_value = lens_shaft.interpolate(frame); + if (flags & AUTH_3D_POST_PROCESS_LENS_GHOST) + lens_ghost_value = lens_ghost.interpolate(frame); + if (flags & AUTH_3D_POST_PROCESS_RADIUS) + radius.interpolate(frame); + if (flags & AUTH_3D_POST_PROCESS_SCENE_FADE) + scene_fade.interpolate(frame); +} + void auth_3d_post_process::reset() { flags = (auth_3d_post_process_flags)0; flags_init = (auth_3d_post_process_flags)0; @@ -1459,12 +2173,12 @@ void auth_3d_post_process::reset() { lens_flare_value = 1.0f; lens_ghost_value = 1.0f; lens_shaft_value = 1.0f; - intensity_init = vec3_null; + intensity_init = 0.0f; lens_flare_init = 1.0f; lens_ghost_init = 1.0f; lens_shaft_init = 1.0f; - radius_init = vec3_null; - scene_fade_init = vec4_null; + radius_init = 0.0f; + scene_fade_init = 0.0f; } auth_3d_farc::auth_3d_farc() : load_count(), name(), state(), farc(), data(), size() { @@ -1530,7 +2244,7 @@ Auth3dTestTask::Auth3dTestTask() { field_32A = true; stage_index = -1; load_stage_index = 0; - trans_value = vec3_null; + trans_value = 0.0f; rot_y_value = 0.0f; field_388 = false; field_38C = 0; @@ -1565,17 +2279,20 @@ bool Auth3dTestTask::Init() { field_32A = true; stage_index = -1; load_stage_index = 0; - trans_value = vec3_null; + trans_value = 0.0f; rot_y_value = 0.0f; field_390 = true; field_394 = 0; - category = {}; - load_category = {}; - obj_sets = {}; + category.clear(); + category.shrink_to_fit(); + load_category.clear(); + load_category.shrink_to_fit(); + obj_sets.clear(); + obj_sets.shrink_to_fit(); rctx_ptr->draw_pass.shadow_ptr->self_shadow = true; clear_color = { 0x99, 0x99, 0x99, 0x00 }; - task_stage_load("A3D_STAGE"); + task_stage_load_task("A3D_STAGE"); object_storage_load_set(aft_data, aft_obj_db, effcmn_obj_set); return true; } @@ -1600,7 +2317,7 @@ bool Auth3dTestTask::Ctrl() { if (auth_3d_data_check_id_not_empty(&auth_3d_id)) { mat4 mat; - mat4_translate(trans_value.x, trans_value.y, trans_value.z, &mat); + mat4_translate(&trans_value, &mat); mat4_rotate_y_mult(&mat, rot_y_value * DEG_TO_RAD_FLOAT, &mat); auth_3d_data_set_mat(&auth_3d_id, &mat); } @@ -1610,15 +2327,19 @@ bool Auth3dTestTask::Ctrl() { bool Auth3dTestTask::Dest() { auth_3d_data_unload_id(auth_3d_id, rctx_ptr); object_storage_unload_set(effcmn_obj_set); - task_stage_unload(); + task_stage_unload_task(); clear_color = color_black; rctx_ptr->draw_pass.shadow_ptr->self_shadow = true; if (category.size()) auth_3d_data_unload_category(category.c_str()); - category = {}; - load_category = {}; + category.clear(); + category.shrink_to_fit(); + load_category.clear(); + load_category.shrink_to_fit(); for (uint32_t& i : obj_sets) object_storage_unload_set(i); + obj_sets.clear(); + obj_sets.shrink_to_fit(); return true; } @@ -1980,7 +2701,7 @@ void auth_3d_data_load_auth_3d_db(auth_3d_database* auth_3d_db) { size_t cat_index = 0; for (auth_3d_farc& i : auth_3d_data->farcs) - i.name = auth_3d_db->category[cat_index++].name; + i.name.assign(auth_3d_db->category[cat_index++].name); auth_3d_data->uid_files.clear(); auth_3d_data->uid_files.resize(auth_3d_db->uid.size()); @@ -2006,10 +2727,12 @@ int32_t auth_3d_data_load_hash(uint32_t hash, void* data, object_database* obj_d auth_3d_uid_file_modern* uid_file = &elem->second; uid_file->load_count = 0; uid_file->hash = hash; - uid_file->file_name = {}; + uid_file->file_name.clear(); + uid_file->file_name.shrink_to_fit(); uid_file->state = 0; - uid_file->name = {}; - uid_file->farc = {}; + uid_file->name.clear(); + uid_file->name.shrink_to_fit(); + uid_file->farc = 0; uid_file->data = data; uid_file->obj_db = obj_db; uid_file->tex_db = tex_db; @@ -2086,6 +2809,14 @@ void auth_3d_data_set_chara_id(int32_t* id, int32_t value) { } } +void auth_3d_data_set_chara_item(int32_t* id, bool value) { + if (*id >= 0 && ((*id & 0x7FFF) < AUTH_3D_DATA_COUNT)) { + auth_3d* auth = &auth_3d_data->data[*id & 0x7FFF]; + if (auth->id == *id) + auth->chara_item = value; + } +} + void auth_3d_data_set_draw_task_flags_alpha(int32_t* id, draw_task_flags draw_task_flags, float_t alpha) { if (*id >= 0 && ((*id & 0x7FFF) < AUTH_3D_DATA_COUNT)) { auth_3d* auth = &auth_3d_data->data[*id & 0x7FFF]; @@ -2131,7 +2862,7 @@ void auth_3d_data_set_left_right_reverse(int32_t* id, bool value) { } } -void auth_3d_data_set_mat(int32_t* id, mat4* value) { +void auth_3d_data_set_mat(int32_t* id, const mat4* value) { if (*id >= 0 && ((*id & 0x7FFF) < AUTH_3D_DATA_COUNT)) { auth_3d* auth = &auth_3d_data->data[*id & 0x7FFF]; if (auth->id == *id) @@ -2265,28 +2996,41 @@ void task_auth_3d_free() { } } -auth_3d_detail::TaskAuth3d::TaskAuth3d() { +namespace auth_3d_detail { + TaskAuth3d::TaskAuth3d() { -} + } -auth_3d_detail::TaskAuth3d:: ~TaskAuth3d() { + TaskAuth3d:: ~TaskAuth3d() { -} + } -bool auth_3d_detail::TaskAuth3d::Init() { - return auth_3d_data_struct_init(auth_3d_data, rctx_ptr); -} + bool TaskAuth3d::Init() { + return auth_3d_data_struct_init(auth_3d_data, rctx_ptr); + } -bool auth_3d_detail::TaskAuth3d::Ctrl() { - return auth_3d_data_struct_ctrl(auth_3d_data, rctx_ptr); -} + bool TaskAuth3d::Ctrl() { + return auth_3d_data_struct_ctrl(auth_3d_data, rctx_ptr); + } -void auth_3d_detail::TaskAuth3d::Disp() { - auth_3d_data_struct_disp(auth_3d_data, rctx_ptr); + void TaskAuth3d::Disp() { + auth_3d_data_struct_disp(auth_3d_data, rctx_ptr); + } + + FrameRateTimeStop::FrameRateTimeStop() { + + } + + FrameRateTimeStop::~FrameRateTimeStop() { + + } + + float_t FrameRateTimeStop::GetDeltaFrame() { + return 0.0f; + } } static void a3da_msgpack_read(const char* path, const char* file, a3da* auth_file) { - if (!path_check_directory_exists(path)) return; @@ -2450,12 +3194,10 @@ static float_t auth_3d_interpolate_value(auth_3d_key_type type, else return curr_key->value; case AUTH_3D_KEY_HERMITE: - if (curr_key->frame < next_key->frame) { - float_t df = next_key->frame - curr_key->frame; + if (curr_key->frame < next_key->frame) return interpolate_chs_value(curr_key->value, next_key->value, curr_key->tangent2, next_key->tangent1, curr_key->frame, next_key->frame, frame); - } else return curr_key->value; case AUTH_3D_KEY_HOLD: @@ -2522,7 +3264,7 @@ static void auth_3d_key_load(auth_3d* auth, auth_3d_key* k, auth_3d_key_file* kf } if (length > 1) { - k->keys_vec = kf->keys; + k->keys_vec.assign(kf->keys.begin(), kf->keys.end()); k->length = length; k->keys = k->keys_vec.data(); @@ -2537,7 +3279,7 @@ static void auth_3d_key_load(auth_3d* auth, auth_3d_key* k, auth_3d_key_file* kf } } else if (length == 1) { - float_t value = kf->keys[0].value; + float_t value = kf->keys.front().value; k->type = value != 0.0f ? AUTH_3D_KEY_STATIC : AUTH_3D_KEY_NONE; k->value = value; } @@ -2582,15 +3324,6 @@ static void auth_3d_model_transform_load(auth_3d* auth, auth_3d_model_transform* auth_3d_key_load(auth, &mt->visibility, &mtf->visibility); } -static void auth_3d_model_transform_set_mat(auth_3d_model_transform* mt, const mat4* parent_mat) { - mat4 mat; - mat4_translate_mult(parent_mat, mt->translation_value.x, - mt->translation_value.y, mt->translation_value.z, &mat); - mat4_rotate_mult(&mat, mt->rotation_value.x, mt->rotation_value.y, mt->rotation_value.z, &mat); - mat4_scale_rot(&mat, mt->scale_value.x, mt->scale_value.y, mt->scale_value.z, &mat); - mt->mat = mat; -} - static int32_t auth_3d_get_auth_3d_object_index_by_object_info(auth_3d* auth, object_info obj_info, int32_t instance) { int32_t obj_instance = 0; @@ -2731,21 +3464,13 @@ static void auth_3d_set_material_list(auth_3d* auth, render_context* rctx) { object_data->set_material_list(mat_list_count, mat_list); } -static void auth_3d_ambient_ctrl(auth_3d_ambient* a, float_t frame) { - if (a->flags & AUTH_3D_AMBIENT_LIGHT_DIFFUSE) - a->light_diffuse.interpolate(frame); - - if (a->flags & AUTH_3D_AMBIENT_LIGHT_DIFFUSE) - a->rim_light_diffuse.interpolate(frame); -} - static void auth_3d_ambient_load(auth_3d* auth, auth_3d_ambient* a, auth_3d_ambient_file* af) { if (af->flags & A3DA_AMBIENT_LIGHT_DIFFUSE) { auth_3d_rgba_load(auth, &a->light_diffuse, &af->light_diffuse); enum_or(a->flags, AUTH_3D_AMBIENT_LIGHT_DIFFUSE); } - a->name = af->name; + a->name.assign(af->name); if (af->flags & A3DA_AMBIENT_LIGHT_DIFFUSE) { auth_3d_rgba_load(auth, &a->rim_light_diffuse, &af->rim_light_diffuse); @@ -2757,21 +3482,6 @@ static void auth_3d_ambient_set(auth_3d_ambient* a, render_context* rctx) { } -void auth_3d_camera_auxiliary_ctrl(auth_3d_camera_auxiliary* ca, float_t frame) { - if (ca->flags & AUTH_3D_CAMERA_AUXILIARY_AUTO_EXPOSURE) - ca->auto_exposure_value = ca->auto_exposure.interpolate(frame); - if (ca->flags & AUTH_3D_CAMERA_AUXILIARY_EXPOSURE) - ca->exposure_value = ca->exposure.interpolate(frame); - if (ca->flags & AUTH_3D_CAMERA_AUXILIARY_EXPOSURE_RATE) - ca->exposure_rate_value = ca->exposure_rate.interpolate(frame); - if (ca->flags & AUTH_3D_CAMERA_AUXILIARY_GAMMA) - ca->gamma_value = ca->gamma.interpolate(frame); - if (ca->flags & AUTH_3D_CAMERA_AUXILIARY_GAMMA_RATE) - ca->gamma_rate_value = ca->gamma_rate.interpolate(frame); - if (ca->flags & AUTH_3D_CAMERA_AUXILIARY_SATURATE) - ca->saturate_value = ca->saturate.interpolate(frame); -} - static void auth_3d_camera_auxiliary_load(auth_3d* auth, auth_3d_camera_auxiliary_file* caf) { auth_3d_camera_auxiliary* ca = &auth->camera_auxiliary; @@ -2836,8 +3546,7 @@ static void auth_3d_camera_auxiliary_set(auth_3d_camera_auxiliary* ca, render_co tm->set_saturate_coeff(ca->saturate_value); } -static void auth_3d_camera_root_ctrl(auth_3d_camera_root* cr, - float_t frame, mat4* mat, render_context* rctx) { +static float_t auth_3d_camera_root_calc_frame(auth_3d_camera_root* cr, float_t frame, render_context* rctx) { camera* cam = rctx->camera; if (auth_3d_key_detect_fast_change(&cr->view_point.model_transform.translation.x, frame, 0.3f) || auth_3d_key_detect_fast_change(&cr->view_point.model_transform.translation.y, frame, 0.3f) @@ -2861,33 +3570,7 @@ static void auth_3d_camera_root_ctrl(auth_3d_camera_root* cr, cam->set_fast_change_hist0(true); } } - - cr->model_transform.interpolate(frame); - auth_3d_model_transform_set_mat(&cr->model_transform, &mat4_identity); - - mat4& cr_mat = cr->model_transform.mat; - - vec3 view_point = cr->view_point.model_transform.translation.interpolate(frame); - mat4_mult_vec3_trans(&cr_mat, &view_point, &cr->view_point_value); - - vec3 interest = cr->interest.translation.interpolate(frame); - mat4_mult_vec3_trans(&cr_mat, &interest, &cr->interest_value); - - float_t fov; - if (cr->view_point.flags & AUTH_3D_CAMERA_ROOT_VIEW_POINT_FOV) { - fov = cr->view_point.fov.interpolate(frame); - if (cr->view_point.fov_is_horizontal) - fov = atanf(tanf(fov * 0.5f) / cr->view_point.aspect) * 2.0f; - } - else { - float_t camera_aperture_h = cr->view_point.camera_aperture_h; - float_t focal_lenth = cr->view_point.focal_length.interpolate(frame); - fov = atanf((camera_aperture_h * 25.4f) * 0.5f / focal_lenth) * 2.0f; - } - cr->fov_value = fov; - - if (cr->view_point.flags & AUTH_3D_CAMERA_ROOT_VIEW_POINT_ROLL) - cr->roll_value = cr->view_point.roll.interpolate(frame); + return frame; } static void auth_3d_camera_root_load(auth_3d* auth, auth_3d_camera_root* cr, auth_3d_camera_root_file* crf) { @@ -2919,33 +3602,18 @@ static void auth_3d_camera_root_view_point_load(auth_3d* auth, auth_3d_camera_ro } } -static void auth_3d_chara_ctrl(auth_3d_chara* c, float_t frame) { - c->model_transform.interpolate(frame); -} - static void auth_3d_chara_disp(auth_3d_chara* c, mat4* parent_mat, render_context* rctx) { } static void auth_3d_chara_load(auth_3d* auth, auth_3d_chara* c, auth_3d_chara_file* cf) { auth_3d_model_transform_load(auth, &c->model_transform, &cf->model_transform); - c->name = cf->name; -} - -static void auth_3d_curve_ctrl(auth_3d_curve* c, float_t frame) { - c->value = c->curve.interpolate(frame); + c->name.assign(cf->name); } static void auth_3d_curve_load(auth_3d* auth, auth_3d_curve* c, auth_3d_curve_file* cf) { auth_3d_key_load(auth, &c->curve, &cf->curve); - c->name = cf->name; -} - -static void auth_3d_dof_ctrl(auth_3d_dof* d, float_t frame) { - if (!d->has_dof) - return; - - d->model_transform.interpolate(frame); + c->name.assign(cf->name); } static void auth_3d_dof_load(auth_3d* auth, auth_3d_dof* d, auth_3d_dof_file* df) { @@ -2980,41 +3648,59 @@ static void auth_3d_dof_set(auth_3d_dof* d, render_context* rctx) { rctx->post_process.dof->set_dof_pv(&pv); } -static void auth_3d_event_load(auth_3d* auth, auth_3d_event* e, auth_3d_event_file* ef) { - e->begin = ef->begin; - e->clip_begin = ef->clip_begin; - e->clip_end = ef->clip_end; - e->end = ef->end; - e->name = ef->name; - e->param_1 = ef->param_1; - e->ref = ef->ref; - e->time_ref_scale = ef->time_ref_scale; +static auth_3d_detail::Event* auth_3d_event_load(auth_3d* auth, auth_3d_event_file* ef) { + auth_3d_detail::Event* e = 0; switch (ef->type) { case A3DA_EVENT_MISC: default: - e->type = AUTH_3D_EVENT_MISC; - case A3DA_EVENT_FILT: - e->type = AUTH_3D_EVENT_FILT; - case A3DA_EVENT_FX: - e->type = AUTH_3D_EVENT_FX; - case A3DA_EVENT_SND: - e->type = AUTH_3D_EVENT_SND; - case A3DA_EVENT_MOT: - e->type = AUTH_3D_EVENT_MOT; - case A3DA_EVENT_A2D: - e->type = AUTH_3D_EVENT_A2D; + e = new auth_3d_detail::Event(ef); + break; + case A3DA_EVENT_FILT: { + if (!ef->param1.compare("WHITEIN") || !ef->param1.compare("WHITEOUT") + || !ef->param1.compare("FADEIN") || !ef->param1.compare("FADEOUT")) + e = new auth_3d_detail::EventFilterFade(ef); + else if (!ef->param1.compare("TIMESTOP")) + e = new auth_3d_detail::EventFilterTimeStop(ef); + else + e = new auth_3d_detail::Event(ef); + break; } + case A3DA_EVENT_FX: + if (!ef->param1.compare("SMOOTH")) + e = new auth_3d_detail::EventFXSmoothCut(ef); + else + e = new auth_3d_detail::EventFX(ef); + break; + case A3DA_EVENT_SND: + e = new auth_3d_detail::EventSnd(ef); + break; + case A3DA_EVENT_MOT: + e = new auth_3d_detail::EventMot(ef); + break; + case A3DA_EVENT_A2D: + e = new auth_3d_detail::EventA2d(ef); + break; + } + return e; } -static void auth_3d_fog_ctrl(auth_3d_fog* f, float_t frame) { - if (f->flags & AUTH_3D_FOG_DENSITY) - f->density_value = f->density.interpolate(frame); - if (f->flags & AUTH_3D_FOG_START) - f->start_value = f->start.interpolate(frame); - if (f->flags & AUTH_3D_FOG_END) - f->end_value = f->end.interpolate(frame); - if (f->flags & AUTH_3D_FOG_COLOR) - f->color.interpolate(frame); +static const char* auth_3d_event_type_string(auth_3d_detail::Event::Type type) { + switch (type) { + case auth_3d_detail::Event::Type::MISC: + return "MISC"; + case auth_3d_detail::Event::Type::FILT: + return "FLT"; + case auth_3d_detail::Event::Type::FX: + return "FX"; + case auth_3d_detail::Event::Type::SND: + return "SND"; + case auth_3d_detail::Event::Type::MOT: + return "MOT"; + case auth_3d_detail::Event::Type::A2D: + return "A2D"; + default: + return "(unknown)"; + } } static void auth_3d_fog_load(auth_3d* auth, auth_3d_fog* f, auth_3d_fog_file* ff) { @@ -3105,36 +3791,6 @@ static void auth_3d_fog_set(auth_3d_fog* f, render_context* rctx) { } } -static void auth_3d_light_ctrl(auth_3d_light* l, float_t frame) { - if (l->flags & AUTH_3D_LIGHT_AMBIENT) - l->ambient.interpolate(frame); - if (l->flags & AUTH_3D_LIGHT_CONE_ANGLE) - l->cone_angle_value = l->cone_angle.interpolate(frame); - if (l->flags & AUTH_3D_LIGHT_CONSTANT) - l->constant_value = l->constant.interpolate(frame); - if (l->flags & AUTH_3D_LIGHT_DIFFUSE) - l->diffuse.interpolate(frame); - if (l->flags & AUTH_3D_LIGHT_DROP_OFF) - l->drop_off_value = l->drop_off.interpolate(frame); - if (l->flags & AUTH_3D_LIGHT_FAR) - l->far_value = l->_far.interpolate(frame); - if (l->flags & AUTH_3D_LIGHT_INTENSITY) - l->intensity_value = l->intensity.interpolate(frame); - if (l->flags & AUTH_3D_LIGHT_LINEAR) - l->linear_value = l->linear.interpolate(frame); - if (l->flags & AUTH_3D_LIGHT_POSITION) - l->position.interpolate(frame); - if (l->flags & AUTH_3D_LIGHT_QUADRATIC) - l->quadratic_value = l->quadratic.interpolate(frame); - if (l->flags & AUTH_3D_LIGHT_SPECULAR) - l->specular.interpolate(frame); - if (l->flags & AUTH_3D_LIGHT_SPOT_DIRECTION) - l->spot_direction.interpolate(frame); - if (l->flags & AUTH_3D_LIGHT_TONE_CURVE) - l->tone_curve.interpolate(frame); - -} - static void auth_3d_light_load(auth_3d* auth, auth_3d_light* l, auth_3d_light_file* lf) { if (lf->flags & A3DA_LIGHT_AMBIENT) { auth_3d_rgba_load(auth, &l->ambient, &lf->ambient); @@ -3203,7 +3859,7 @@ static void auth_3d_light_load(auth_3d* auth, auth_3d_light* l, auth_3d_light_fi enum_or(l->flags, AUTH_3D_LIGHT_TONE_CURVE); } - l->type = lf->type; + l->type.assign(lf->type); } static void auth_3d_light_restore_prev_value(auth_3d_light* l, render_context* rctx) { @@ -3310,22 +3966,7 @@ static void auth_3d_m_object_hrc_get_mat(auth_3d_m_object_hrc* moh, mat4* mat) { return; } - *mat = moh->node[0].model_transform.mat; -} - -static void auth_3d_m_object_hrc_ctrl(auth_3d_m_object_hrc* moh, float_t frame) { - auth_3d_object_model_transform_ctrl(&moh->model_transform, frame); - auth_3d_object_model_transform_set_mat_inner(&moh->model_transform); - - for (auth_3d_object_instance& i : moh->instance) { - auth_3d_object_model_transform_ctrl(&i.model_transform, frame); - auth_3d_object_model_transform_set_mat_inner(&i.model_transform); - } - - for (auth_3d_object_node& i : moh->node) { - auth_3d_object_model_transform_ctrl(&i.model_transform, frame); - auth_3d_object_model_transform_set_mat_inner(&i.model_transform); - } + *mat = moh->node.front().model_transform.mat; } static void auth_3d_m_object_hrc_disp(auth_3d_m_object_hrc* moh, auth_3d* auth, render_context* rctx) { @@ -3370,7 +4011,7 @@ static void auth_3d_m_object_hrc_disp(auth_3d_m_object_hrc* moh, auth_3d* auth, shad->field_1D0[shadow_type].push_back(pos); } - if (i.mats.size() > 0) + if (i.mats.size()) draw_task_add_draw_object_by_object_info_object_skin(rctx, i.object_info, 0, 0, auth->alpha, i.mats.data(), 0, 0, &i.model_transform.mat); } @@ -3388,7 +4029,7 @@ static void auth_3d_m_object_hrc_load(auth_3d* auth, auth_3d_m_object_hrc* moh, &moh->node[node_index++], &i); auth_3d_object_model_transform_load(auth, &moh->model_transform, &mohf->model_transform); - moh->name = mohf->name; + moh->name.assign(mohf->name); size_t instance_index = 0; moh->instance.resize(mohf->instance.size()); @@ -3397,56 +4038,740 @@ static void auth_3d_m_object_hrc_load(auth_3d* auth, auth_3d_m_object_hrc* moh, &moh->instance[instance_index++], &i, moh, obj_db); } -static void auth_3d_m_object_hrc_list_ctrl(auth_3d_m_object_hrc* moh, mat4* parent_mat) { - //if (!moh->model_transform.visible) - // return; - - auth_3d_object_node* node = moh->node.data(); - size_t instance_count = moh->instance.size(); - - auth_3d_m_object_hrc_nodes_mat_mult(moh); - - auth_3d_object_model_transform_mat_mult(&moh->model_transform, parent_mat); - - mat4& mat = moh->model_transform.mat; - - for (auth_3d_object_instance& i : moh->instance) { - //if (!i.model_transform.visible) - // continue; - - auth_3d_object_model_transform_mat_mult(&i.model_transform, &mat); - int32_t* object_bone_indices = i.object_bone_indices.data(); - size_t object_bone_indices_count = i.object_bone_indices.size(); - mat4* mats = i.mats.data(); - for (size_t j = 0; j < object_bone_indices_count; j++) - mats[j] = node[object_bone_indices[j]].model_transform.mat; - } -} - static void auth_3d_m_object_hrc_nodes_mat_mult(auth_3d_m_object_hrc* moh) { auth_3d_object_node* node = moh->node.data(); for (auth_3d_object_node& i : moh->node) if (i.parent >= 0) - auth_3d_object_model_transform_mat_mult( - &i.model_transform, &node[i.parent].model_transform.mat); + i.model_transform.mat_mult(&node[i.parent].model_transform.mat); else i.model_transform.mat = i.model_transform.mat_inner; } -static void auth_3d_material_list_ctrl(auth_3d_material_list* ml, float_t frame) { - if (ml->flags & AUTH_3D_MATERIAL_LIST_BLEND_COLOR) - ml->blend_color.interpolate(frame); - if (ml->flags & AUTH_3D_MATERIAL_LIST_GLOW_INTENSITY) - ml->glow_intensity_value = ml->glow_intensity.interpolate(frame); - if (ml->flags & AUTH_3D_MATERIAL_LIST_INCANDESCENCE) - ml->incandescence.interpolate(frame); -} - static void auth_3d_material_list_load(auth_3d* auth, auth_3d_material_list* ml, auth_3d_material_list_file* mlf) { + //int32_t ident[24] = {}; if (mlf->flags & A3DA_MATERIAL_LIST_BLEND_COLOR) { auth_3d_rgba_load(auth, &ml->blend_color, &mlf->blend_color); enum_or(ml->flags, AUTH_3D_MATERIAL_LIST_BLEND_COLOR); + + /*auth_3d_key& r = ml->blend_color.r; + auth_3d_key& g = ml->blend_color.g; + auth_3d_key& b = ml->blend_color.b; + auth_3d_key& a = ml->blend_color.a; + + switch (r.type) { + case AUTH_3D_KEY_NONE: + case AUTH_3D_KEY_STATIC: + switch (g.type) { + case AUTH_3D_KEY_NONE: + case AUTH_3D_KEY_STATIC: + case AUTH_3D_KEY_LINEAR: + case AUTH_3D_KEY_HERMITE: + case AUTH_3D_KEY_HOLD: + ident[0] = 1; + ident[6] = 1; + break; + } + break; + case AUTH_3D_KEY_LINEAR: + case AUTH_3D_KEY_HERMITE: + case AUTH_3D_KEY_HOLD: + switch (g.type) { + case AUTH_3D_KEY_NONE: + case AUTH_3D_KEY_STATIC: + ident[0] = 1; + ident[6] = 1; + break; + case AUTH_3D_KEY_LINEAR: + case AUTH_3D_KEY_HERMITE: + case AUTH_3D_KEY_HOLD: + if (r.length == g.length) { + ident[0] = 1; + + kft3* keys1 = r.keys; + kft3* keys2 = g.keys; + size_t length = r.length; + for (size_t i = 0; i < length; i++) + if (*(uint32_t*)&keys1[i].frame != *(uint32_t*)&keys2[i].frame) { + ident[0] = 0; + break; + } + + if (ident[0]) { + ident[6] = 1; + + for (size_t i = 0; i < length; i++) + if (*(uint64_t*)&keys1[i].tangent1 != *(uint64_t*)&keys2[i].tangent1) { + ident[6] = 0; + break; + } + } + } + else if (r.length > g.length) { + if (g.type == AUTH_3D_KEY_LINEAR) { + kft3* keys1 = r.keys; + kft3* keys2 = g.keys; + size_t keys1_length = r.length; + size_t keys2_length = g.length; + + for (size_t i = 0; i < keys1_length; i++) { + float_t frame = keys1[i].frame; + bool found = false; + for (size_t j = 0; j < keys2_length && i < keys1_length; j++) + if (frame == keys2[j].frame) { + found = true; + break; + } + + if (!found) + if (frame <= keys2[0].frame || frame >= keys2[keys2_length - 1].frame) { + ident[0] = 1; + ident[6] = 1; + } + else + for (size_t j = 0; j + 1 < keys2_length && i < keys1_length; j++) + if (frame >= keys2[j].frame && keys2[j + 1].frame) { + if (*(uint32_t*)&keys2[j].value == *(uint32_t*)&keys2[j + 1].value) { + ident[0] = 1; + ident[6] = 1; + } + break; + } + } + } + } + else if (r.length < g.length) { + if (r.type == AUTH_3D_KEY_LINEAR) { + kft3* keys1 = g.keys; + kft3* keys2 = r.keys; + size_t keys1_length = g.length; + size_t keys2_length = r.length; + + for (size_t i = 0; i < keys1_length; i++) { + float_t frame = keys1[i].frame; + bool found = false; + for (size_t j = 0; j < keys2_length && i < keys1_length; j++) + if (frame == keys2[j].frame) { + found = true; + break; + } + + if (!found) + if (frame <= keys2[0].frame || frame >= keys2[keys2_length - 1].frame) { + ident[0] = 1; + ident[6] = 1; + } + else + for (size_t j = 0; j + 1 < keys2_length && i < keys1_length; j++) + if (frame >= keys2[j].frame && keys2[j + 1].frame) { + if (*(uint32_t*)&keys2[j].value == *(uint32_t*)&keys2[j + 1].value) { + ident[0] = 1; + ident[6] = 1; + } + break; + } + } + } + } + break; + } + break; + } + + switch (r.type) { + case AUTH_3D_KEY_NONE: + case AUTH_3D_KEY_STATIC: + switch (b.type) { + case AUTH_3D_KEY_NONE: + case AUTH_3D_KEY_STATIC: + case AUTH_3D_KEY_LINEAR: + case AUTH_3D_KEY_HERMITE: + case AUTH_3D_KEY_HOLD: + ident[1] = 1; + ident[7] = 1; + break; + } + break; + case AUTH_3D_KEY_LINEAR: + case AUTH_3D_KEY_HERMITE: + case AUTH_3D_KEY_HOLD: + switch (b.type) { + case AUTH_3D_KEY_NONE: + case AUTH_3D_KEY_STATIC: + ident[1] = 1; + ident[7] = 1; + break; + case AUTH_3D_KEY_LINEAR: + case AUTH_3D_KEY_HERMITE: + case AUTH_3D_KEY_HOLD: + if (r.length == b.length) { + ident[1] = 1; + + kft3* keys1 = r.keys; + kft3* keys2 = b.keys; + size_t length = r.length; + for (size_t i = 0; i < length; i++) + if (*(uint32_t*)&keys1[i].frame != *(uint32_t*)&keys2[i].frame) { + ident[1] = 0; + break; + } + + if (ident[1]) { + ident[7] = 1; + + for (size_t i = 0; i < length; i++) + if (*(uint64_t*)&keys1[i].tangent1 != *(uint64_t*)&keys2[i].tangent1) { + ident[7] = 0; + break; + } + } + } + else if (r.length > b.length) { + if (b.type == AUTH_3D_KEY_LINEAR) { + kft3* keys1 = r.keys; + kft3* keys2 = b.keys; + size_t keys1_length = r.length; + size_t keys2_length = b.length; + + for (size_t i = 0; i < keys1_length; i++) { + float_t frame = keys1[i].frame; + bool found = false; + for (size_t j = 0; j < keys2_length && i < keys1_length; j++) + if (frame == keys2[j].frame) { + found = true; + break; + } + + if (!found) + if (frame <= keys2[0].frame || frame >= keys2[keys2_length - 1].frame) { + ident[1] = 1; + ident[7] = 1; + } + else + for (size_t j = 0; j + 1 < keys2_length && i < keys1_length; j++) + if (frame >= keys2[j].frame && keys2[j + 1].frame) { + if (*(uint32_t*)&keys2[j].value == *(uint32_t*)&keys2[j + 1].value) { + ident[1] = 1; + ident[7] = 1; + } + break; + } + } + } + } + else if (r.length < b.length) { + if (r.type == AUTH_3D_KEY_LINEAR) { + kft3* keys1 = b.keys; + kft3* keys2 = r.keys; + size_t keys1_length = b.length; + size_t keys2_length = r.length; + + for (size_t i = 0; i < keys1_length; i++) { + float_t frame = keys1[i].frame; + bool found = false; + for (size_t j = 0; j < keys2_length && i < keys1_length; j++) + if (frame == keys2[j].frame) { + found = true; + break; + } + + if (!found) + if (frame <= keys2[0].frame || frame >= keys2[keys2_length - 1].frame) { + ident[1] = 1; + ident[7] = 1; + } + else + for (size_t j = 0; j + 1 < keys2_length && i < keys1_length; j++) + if (frame >= keys2[j].frame && keys2[j + 1].frame) { + if (*(uint32_t*)&keys2[j].value == *(uint32_t*)&keys2[j + 1].value) { + ident[1] = 1; + ident[7] = 1; + } + break; + } + } + } + } + break; + } + break; + } + + switch (r.type) { + case AUTH_3D_KEY_NONE: + case AUTH_3D_KEY_STATIC: + switch (a.type) { + case AUTH_3D_KEY_NONE: + case AUTH_3D_KEY_STATIC: + case AUTH_3D_KEY_LINEAR: + case AUTH_3D_KEY_HERMITE: + case AUTH_3D_KEY_HOLD: + ident[2] = 1; + ident[8] = 1; + break; + } + break; + case AUTH_3D_KEY_LINEAR: + case AUTH_3D_KEY_HERMITE: + case AUTH_3D_KEY_HOLD: + switch (a.type) { + case AUTH_3D_KEY_NONE: + case AUTH_3D_KEY_STATIC: + ident[2] = 1; + ident[8] = 1; + break; + case AUTH_3D_KEY_LINEAR: + case AUTH_3D_KEY_HERMITE: + case AUTH_3D_KEY_HOLD: + if (r.length == a.length) { + ident[2] = 1; + + kft3* keys1 = r.keys; + kft3* keys2 = a.keys; + size_t length = r.length; + for (size_t i = 0; i < length; i++) + if (*(uint32_t*)&keys1[i].frame != *(uint32_t*)&keys2[i].frame) { + ident[2] = 0; + break; + } + + if (ident[2]) { + ident[8] = 1; + + for (size_t i = 0; i < length; i++) + if (*(uint64_t*)&keys1[i].tangent1 != *(uint64_t*)&keys2[i].tangent1) { + ident[8] = 0; + break; + } + } + } + else if (r.length > a.length) { + if (a.type == AUTH_3D_KEY_LINEAR) { + kft3* keys1 = r.keys; + kft3* keys2 = a.keys; + size_t keys1_length = r.length; + size_t keys2_length = a.length; + + for (size_t i = 0; i < keys1_length; i++) { + float_t frame = keys1[i].frame; + bool found = false; + for (size_t j = 0; j < keys2_length && i < keys1_length; j++) + if (frame == keys2[j].frame) { + found = true; + break; + } + + if (!found) + if (frame <= keys2[0].frame || frame >= keys2[keys2_length - 1].frame) { + ident[2] = 1; + ident[8] = 1; + } + else + for (size_t j = 0; j + 1 < keys2_length && i < keys1_length; j++) + if (frame >= keys2[j].frame && keys2[j + 1].frame) { + if (*(uint32_t*)&keys2[j].value == *(uint32_t*)&keys2[j + 1].value) { + ident[2] = 1; + ident[8] = 1; + } + break; + } + } + } + } + else if (r.length < a.length) { + if (r.type == AUTH_3D_KEY_LINEAR) { + kft3* keys1 = a.keys; + kft3* keys2 = r.keys; + size_t keys1_length = a.length; + size_t keys2_length = r.length; + + for (size_t i = 0; i < keys1_length; i++) { + float_t frame = keys1[i].frame; + bool found = false; + for (size_t j = 0; j < keys2_length && i < keys1_length; j++) + if (frame == keys2[j].frame) { + found = true; + break; + } + + if (!found) + if (frame <= keys2[0].frame || frame >= keys2[keys2_length - 1].frame) { + ident[2] = 1; + ident[8] = 1; + } + else + for (size_t j = 0; j + 1 < keys2_length && i < keys1_length; j++) + if (frame >= keys2[j].frame && keys2[j + 1].frame) { + if (*(uint32_t*)&keys2[j].value == *(uint32_t*)&keys2[j + 1].value) { + ident[2] = 1; + ident[8] = 1; + } + break; + } + } + } + } + break; + } + break; + } + + switch (g.type) { + case AUTH_3D_KEY_NONE: + case AUTH_3D_KEY_STATIC: + switch (b.type) { + case AUTH_3D_KEY_NONE: + case AUTH_3D_KEY_STATIC: + case AUTH_3D_KEY_LINEAR: + case AUTH_3D_KEY_HERMITE: + case AUTH_3D_KEY_HOLD: + ident[3] = 1; + ident[9] = 1; + break; + } + break; + case AUTH_3D_KEY_LINEAR: + case AUTH_3D_KEY_HERMITE: + case AUTH_3D_KEY_HOLD: + switch (b.type) { + case AUTH_3D_KEY_NONE: + case AUTH_3D_KEY_STATIC: + ident[3] = 1; + ident[9] = 1; + break; + case AUTH_3D_KEY_LINEAR: + case AUTH_3D_KEY_HERMITE: + case AUTH_3D_KEY_HOLD: + if (g.length == b.length) { + ident[3] = 1; + + kft3* keys1 = g.keys; + kft3* keys2 = b.keys; + size_t length = g.length; + for (size_t i = 0; i < length; i++) + if (*(uint32_t*)&keys1[i].frame != *(uint32_t*)&keys2[i].frame) { + ident[3] = 0; + break; + } + + if (ident[3]) { + ident[9] = 1; + + for (size_t i = 0; i < length; i++) + if (*(uint64_t*)&keys1[i].tangent1 != *(uint64_t*)&keys2[i].tangent1) { + ident[9] = 0; + break; + } + } + } + else if (g.length > b.length) { + if (b.type == AUTH_3D_KEY_LINEAR) { + kft3* keys1 = g.keys; + kft3* keys2 = b.keys; + size_t keys1_length = g.length; + size_t keys2_length = b.length; + + for (size_t i = 0; i < keys1_length; i++) { + float_t frame = keys1[i].frame; + bool found = false; + for (size_t j = 0; j < keys2_length && i < keys1_length; j++) + if (frame == keys2[j].frame) { + found = true; + break; + } + + if (!found) + if (frame <= keys2[0].frame || frame >= keys2[keys2_length - 1].frame) { + ident[3] = 1; + ident[9] = 1; + } + else + for (size_t j = 0; j + 1 < keys2_length && i < keys1_length; j++) + if (frame >= keys2[j].frame && keys2[j + 1].frame) { + if (*(uint32_t*)&keys2[j].value == *(uint32_t*)&keys2[j + 1].value) { + ident[3] = 1; + ident[9] = 1; + } + break; + } + } + } + } + else if (g.length < b.length) { + if (g.type == AUTH_3D_KEY_LINEAR) { + kft3* keys1 = b.keys; + kft3* keys2 = g.keys; + size_t keys1_length = b.length; + size_t keys2_length = g.length; + + for (size_t i = 0; i < keys1_length; i++) { + float_t frame = keys1[i].frame; + bool found = false; + for (size_t j = 0; j < keys2_length && i < keys1_length; j++) + if (frame == keys2[j].frame) { + found = true; + break; + } + + if (!found) + if (frame <= keys2[0].frame || frame >= keys2[keys2_length - 1].frame) { + ident[3] = 1; + ident[9] = 1; + } + else + for (size_t j = 0; j + 1 < keys2_length && i < keys1_length; j++) + if (frame >= keys2[j].frame && keys2[j + 1].frame) { + if (*(uint32_t*)&keys2[j].value == *(uint32_t*)&keys2[j + 1].value) { + ident[3] = 1; + ident[9] = 1; + } + break; + } + } + } + } + break; + } + break; + } + + switch (g.type) { + case AUTH_3D_KEY_NONE: + case AUTH_3D_KEY_STATIC: + switch (a.type) { + case AUTH_3D_KEY_NONE: + case AUTH_3D_KEY_STATIC: + case AUTH_3D_KEY_LINEAR: + case AUTH_3D_KEY_HERMITE: + case AUTH_3D_KEY_HOLD: + ident[4] = 1; + ident[10] = 1; + break; + } + break; + case AUTH_3D_KEY_LINEAR: + case AUTH_3D_KEY_HERMITE: + case AUTH_3D_KEY_HOLD: + switch (a.type) { + case AUTH_3D_KEY_NONE: + case AUTH_3D_KEY_STATIC: + ident[4] = 1; + ident[10] = 1; + break; + case AUTH_3D_KEY_LINEAR: + case AUTH_3D_KEY_HERMITE: + case AUTH_3D_KEY_HOLD: + if (g.length == a.length) { + ident[4] = 1; + + kft3* keys1 = g.keys; + kft3* keys2 = a.keys; + size_t length = g.length; + for (size_t i = 0; i < length; i++) + if (*(uint32_t*)&keys1[i].frame != *(uint32_t*)&keys2[i].frame) { + ident[4] = 0; + break; + } + + if (ident[4]) { + ident[10] = 1; + + for (size_t i = 0; i < length; i++) + if (*(uint64_t*)&keys1[i].tangent1 != *(uint64_t*)&keys2[i].tangent1) { + ident[10] = 0; + break; + } + } + } + else if (g.length > a.length) { + if (a.type == AUTH_3D_KEY_LINEAR) { + kft3* keys1 = g.keys; + kft3* keys2 = a.keys; + size_t keys1_length = g.length; + size_t keys2_length = a.length; + + for (size_t i = 0; i < keys1_length; i++) { + float_t frame = keys1[i].frame; + bool found = false; + for (size_t j = 0; j < keys2_length && i < keys1_length; j++) + if (frame == keys2[j].frame) { + found = true; + break; + } + + if (!found) + if (frame <= keys2[0].frame || frame >= keys2[keys2_length - 1].frame) { + ident[4] = 1; + ident[10] = 1; + } + else + for (size_t j = 0; j + 1 < keys2_length && i < keys1_length; j++) + if (frame >= keys2[j].frame && keys2[j + 1].frame) { + if (*(uint32_t*)&keys2[j].value == *(uint32_t*)&keys2[j + 1].value) { + ident[4] = 1; + ident[10] = 1; + } + break; + } + } + } + } + else if (g.length < a.length) { + if (g.type == AUTH_3D_KEY_LINEAR) { + kft3* keys1 = a.keys; + kft3* keys2 = g.keys; + size_t keys1_length = a.length; + size_t keys2_length = g.length; + + for (size_t i = 0; i < keys1_length; i++) { + float_t frame = keys1[i].frame; + bool found = false; + for (size_t j = 0; j < keys2_length && i < keys1_length; j++) + if (frame == keys2[j].frame) { + found = true; + break; + } + + if (!found) + if (frame <= keys2[0].frame || frame >= keys2[keys2_length - 1].frame) { + ident[4] = 1; + ident[10] = 1; + } + else + for (size_t j = 0; j + 1 < keys2_length && i < keys1_length; j++) + if (frame >= keys2[j].frame && keys2[j + 1].frame) { + if (*(uint32_t*)&keys2[j].value == *(uint32_t*)&keys2[j + 1].value) { + ident[4] = 1; + ident[10] = 1; + } + break; + } + } + } + } + break; + } + break; + } + + switch (b.type) { + case AUTH_3D_KEY_NONE: + case AUTH_3D_KEY_STATIC: + switch (a.type) { + case AUTH_3D_KEY_NONE: + case AUTH_3D_KEY_STATIC: + case AUTH_3D_KEY_LINEAR: + case AUTH_3D_KEY_HERMITE: + case AUTH_3D_KEY_HOLD: + ident[5] = 1; + ident[11] = 1; + break; + } + break; + case AUTH_3D_KEY_LINEAR: + case AUTH_3D_KEY_HERMITE: + case AUTH_3D_KEY_HOLD: + switch (a.type) { + case AUTH_3D_KEY_NONE: + case AUTH_3D_KEY_STATIC: + ident[5] = 1; + ident[11] = 1; + break; + case AUTH_3D_KEY_LINEAR: + case AUTH_3D_KEY_HERMITE: + case AUTH_3D_KEY_HOLD: + if (b.length == a.length) { + ident[5] = 1; + + kft3* keys1 = b.keys; + kft3* keys2 = a.keys; + size_t length = b.length; + for (size_t i = 0; i < length; i++) + if (*(uint32_t*)&keys1[i].frame != *(uint32_t*)&keys2[i].frame) { + ident[5] = 0; + break; + } + + if (ident[5]) { + ident[11] = 1; + + for (size_t i = 0; i < length; i++) + if (*(uint64_t*)&keys1[i].tangent1 != *(uint64_t*)&keys2[i].tangent1) { + ident[11] = 0; + break; + } + } + } + else if (b.length > a.length) { + if (a.type == AUTH_3D_KEY_LINEAR) { + kft3* keys1 = b.keys; + kft3* keys2 = a.keys; + size_t keys1_length = b.length; + size_t keys2_length = a.length; + + for (size_t i = 0; i < keys1_length; i++) { + float_t frame = keys1[i].frame; + bool found = false; + for (size_t j = 0; j < keys2_length && i < keys1_length; j++) + if (frame == keys2[j].frame) { + found = true; + break; + } + + if (!found) + if (frame <= keys2[0].frame || frame >= keys2[keys2_length - 1].frame) { + ident[5] = 1; + ident[11] = 1; + } + else + for (size_t j = 0; j + 1 < keys2_length && i < keys1_length; j++) + if (frame >= keys2[j].frame && keys2[j + 1].frame) { + if (*(uint32_t*)&keys2[j].value == *(uint32_t*)&keys2[j + 1].value) { + ident[5] = 1; + ident[11] = 1; + } + break; + } + } + } + } + else if (b.length < a.length) { + if (b.type == AUTH_3D_KEY_LINEAR) { + kft3* keys1 = a.keys; + kft3* keys2 = b.keys; + size_t keys1_length = a.length; + size_t keys2_length = b.length; + + for (size_t i = 0; i < keys1_length; i++) { + float_t frame = keys1[i].frame; + bool found = false; + for (size_t j = 0; j < keys2_length && i < keys1_length; j++) + if (frame == keys2[j].frame) { + found = true; + break; + } + + if (!found) + if (frame <= keys2[0].frame || frame >= keys2[keys2_length - 1].frame) { + ident[5] = 1; + ident[11] = 1; + } + else + for (size_t j = 0; j + 1 < keys2_length && i < keys1_length; j++) + if (frame >= keys2[j].frame && keys2[j + 1].frame) { + if (*(uint32_t*)&keys2[j].value == *(uint32_t*)&keys2[j + 1].value) { + ident[5] = 1; + ident[11] = 1; + } + break; + } + } + } + } + break; + } + break; + }*/ } if (mlf->flags & A3DA_MATERIAL_LIST_GLOW_INTENSITY) { @@ -3457,50 +4782,771 @@ static void auth_3d_material_list_load(auth_3d* auth, auth_3d_material_list* ml, if (mlf->flags & A3DA_MATERIAL_LIST_INCANDESCENCE) { auth_3d_rgba_load(auth, &ml->incandescence, &mlf->incandescence); enum_or(ml->flags, AUTH_3D_MATERIAL_LIST_INCANDESCENCE); + + /*auth_3d_key& r = ml->incandescence.r; + auth_3d_key& g = ml->incandescence.g; + auth_3d_key& b = ml->incandescence.b; + auth_3d_key& a = ml->incandescence.a; + + switch (r.type) { + case AUTH_3D_KEY_NONE: + case AUTH_3D_KEY_STATIC: + switch (g.type) { + case AUTH_3D_KEY_NONE: + case AUTH_3D_KEY_STATIC: + case AUTH_3D_KEY_LINEAR: + case AUTH_3D_KEY_HERMITE: + case AUTH_3D_KEY_HOLD: + ident[12] = 1; + ident[18] = 1; + break; + } + break; + case AUTH_3D_KEY_LINEAR: + case AUTH_3D_KEY_HERMITE: + case AUTH_3D_KEY_HOLD: + switch (g.type) { + case AUTH_3D_KEY_NONE: + case AUTH_3D_KEY_STATIC: + ident[12] = 1; + ident[18] = 1; + break; + case AUTH_3D_KEY_LINEAR: + case AUTH_3D_KEY_HERMITE: + case AUTH_3D_KEY_HOLD: + if (r.length == g.length) { + ident[12] = 1; + + kft3* keys1 = r.keys; + kft3* keys2 = g.keys; + size_t length = r.length; + for (size_t i = 0; i < length; i++) + if (*(uint32_t*)&keys1[i].frame != *(uint32_t*)&keys2[i].frame) { + ident[12] = 0; + break; + } + + if (ident[12]) { + ident[18] = 1; + + for (size_t i = 0; i < length; i++) + if (*(uint64_t*)&keys1[i].tangent1 != *(uint64_t*)&keys2[i].tangent1) { + ident[18] = 0; + break; + } + } + } + else if (b.length > a.length) { + if (a.type == AUTH_3D_KEY_LINEAR) { + kft3* keys1 = b.keys; + kft3* keys2 = a.keys; + size_t keys1_length = b.length; + size_t keys2_length = a.length; + + for (size_t i = 0; i < keys1_length; i++) { + float_t frame = keys1[i].frame; + bool found = false; + for (size_t j = 0; j < keys2_length && i < keys1_length; j++) + if (frame == keys2[j].frame) { + found = true; + break; + } + + if (!found) + if (frame <= keys2[0].frame || frame >= keys2[keys2_length - 1].frame) { + ident[12] = 1; + ident[18] = 1; + } + else + for (size_t j = 0; j + 1 < keys2_length && i < keys1_length; j++) + if (frame >= keys2[j].frame && keys2[j + 1].frame) { + if (*(uint32_t*)&keys2[j].value == *(uint32_t*)&keys2[j + 1].value) { + ident[12] = 1; + ident[18] = 1; + } + break; + } + } + } + } + else if (b.length < a.length) { + if (b.type == AUTH_3D_KEY_LINEAR) { + kft3* keys1 = a.keys; + kft3* keys2 = b.keys; + size_t keys1_length = a.length; + size_t keys2_length = b.length; + + for (size_t i = 0; i < keys1_length; i++) { + float_t frame = keys1[i].frame; + bool found = false; + for (size_t j = 0; j < keys2_length && i < keys1_length; j++) + if (frame == keys2[j].frame) { + found = true; + break; + } + + if (!found) + if (frame <= keys2[0].frame || frame >= keys2[keys2_length - 1].frame) { + ident[12] = 1; + ident[18] = 1; + } + else + for (size_t j = 0; j + 1 < keys2_length && i < keys1_length; j++) + if (frame >= keys2[j].frame && keys2[j + 1].frame) { + if (*(uint32_t*)&keys2[j].value == *(uint32_t*)&keys2[j + 1].value) { + ident[12] = 1; + ident[18] = 1; + } + break; + } + } + } + } + break; + } + break; + } + + switch (r.type) { + case AUTH_3D_KEY_NONE: + case AUTH_3D_KEY_STATIC: + switch (b.type) { + case AUTH_3D_KEY_NONE: + case AUTH_3D_KEY_STATIC: + case AUTH_3D_KEY_LINEAR: + case AUTH_3D_KEY_HERMITE: + case AUTH_3D_KEY_HOLD: + ident[13] = 1; + ident[19] = 1; + break; + } + break; + case AUTH_3D_KEY_LINEAR: + case AUTH_3D_KEY_HERMITE: + case AUTH_3D_KEY_HOLD: + switch (b.type) { + case AUTH_3D_KEY_NONE: + case AUTH_3D_KEY_STATIC: + ident[13] = 1; + ident[19] = 1; + break; + case AUTH_3D_KEY_LINEAR: + case AUTH_3D_KEY_HERMITE: + case AUTH_3D_KEY_HOLD: + if (r.length == b.length) { + ident[13] = 1; + + kft3* keys1 = r.keys; + kft3* keys2 = b.keys; + size_t length = r.length; + for (size_t i = 0; i < length; i++) + if (*(uint32_t*)&keys1[i].frame != *(uint32_t*)&keys2[i].frame) { + ident[13] = 0; + break; + } + + if (ident[13]) { + ident[19] = 1; + + for (size_t i = 0; i < length; i++) + if (*(uint64_t*)&keys1[i].tangent1 != *(uint64_t*)&keys2[i].tangent1) { + ident[19] = 0; + break; + } + } + } + else if (r.length > b.length) { + if (b.type == AUTH_3D_KEY_LINEAR) { + kft3* keys1 = r.keys; + kft3* keys2 = b.keys; + size_t keys1_length = r.length; + size_t keys2_length = b.length; + + for (size_t i = 0; i < keys1_length; i++) { + float_t frame = keys1[i].frame; + bool found = false; + for (size_t j = 0; j < keys2_length && i < keys1_length; j++) + if (frame == keys2[j].frame) { + found = true; + break; + } + + if (!found) + if (frame <= keys2[0].frame || frame >= keys2[keys2_length - 1].frame) { + ident[13] = 1; + ident[19] = 1; + } + else + for (size_t j = 0; j + 1 < keys2_length && i < keys1_length; j++) + if (frame >= keys2[j].frame && keys2[j + 1].frame) { + if (*(uint32_t*)&keys2[j].value == *(uint32_t*)&keys2[j + 1].value) { + ident[13] = 1; + ident[19] = 1; + } + break; + } + } + } + } + else if (r.length < b.length) { + if (r.type == AUTH_3D_KEY_LINEAR) { + kft3* keys1 = b.keys; + kft3* keys2 = r.keys; + size_t keys1_length = b.length; + size_t keys2_length = r.length; + + for (size_t i = 0; i < keys1_length; i++) { + float_t frame = keys1[i].frame; + bool found = false; + for (size_t j = 0; j < keys2_length && i < keys1_length; j++) + if (frame == keys2[j].frame) { + found = true; + break; + } + + if (!found) + if (frame <= keys2[0].frame || frame >= keys2[keys2_length - 1].frame) { + ident[13] = 1; + ident[19] = 1; + } + else + for (size_t j = 0; j + 1 < keys2_length && i < keys1_length; j++) + if (frame >= keys2[j].frame && keys2[j + 1].frame) { + if (*(uint32_t*)&keys2[j].value == *(uint32_t*)&keys2[j + 1].value) { + ident[13] = 1; + ident[19] = 1; + } + break; + } + } + } + } + break; + } + break; + } + + switch (r.type) { + case AUTH_3D_KEY_NONE: + case AUTH_3D_KEY_STATIC: + switch (a.type) { + case AUTH_3D_KEY_NONE: + case AUTH_3D_KEY_STATIC: + case AUTH_3D_KEY_LINEAR: + case AUTH_3D_KEY_HERMITE: + case AUTH_3D_KEY_HOLD: + ident[14] = 1; + ident[20] = 1; + break; + } + break; + case AUTH_3D_KEY_LINEAR: + case AUTH_3D_KEY_HERMITE: + case AUTH_3D_KEY_HOLD: + switch (a.type) { + case AUTH_3D_KEY_NONE: + case AUTH_3D_KEY_STATIC: + ident[14] = 1; + ident[20] = 1; + break; + case AUTH_3D_KEY_LINEAR: + case AUTH_3D_KEY_HERMITE: + case AUTH_3D_KEY_HOLD: + if (r.length == a.length) { + ident[14] = 1; + + kft3* keys1 = r.keys; + kft3* keys2 = a.keys; + size_t length = r.length; + for (size_t i = 0; i < length; i++) + if (*(uint32_t*)&keys1[i].frame != *(uint32_t*)&keys2[i].frame) { + ident[14] = 0; + break; + } + + if (ident[14]) { + ident[20] = 1; + + for (size_t i = 0; i < length; i++) + if (*(uint64_t*)&keys1[i].tangent1 != *(uint64_t*)&keys2[i].tangent1) { + ident[20] = 0; + break; + } + } + } + else if (r.length > a.length) { + if (a.type == AUTH_3D_KEY_LINEAR) { + kft3* keys1 = r.keys; + kft3* keys2 = a.keys; + size_t keys1_length = r.length; + size_t keys2_length = a.length; + + for (size_t i = 0; i < keys1_length; i++) { + float_t frame = keys1[i].frame; + bool found = false; + for (size_t j = 0; j < keys2_length && i < keys1_length; j++) + if (frame == keys2[j].frame) { + found = true; + break; + } + + if (!found) + if (frame <= keys2[0].frame || frame >= keys2[keys2_length - 1].frame) { + ident[14] = 1; + ident[20] = 1; + } + else + for (size_t j = 0; j + 1 < keys2_length && i < keys1_length; j++) + if (frame >= keys2[j].frame && keys2[j + 1].frame) { + if (*(uint32_t*)&keys2[j].value == *(uint32_t*)&keys2[j + 1].value) { + ident[14] = 1; + ident[20] = 1; + } + break; + } + } + } + } + else if (r.length < a.length) { + if (b.type == AUTH_3D_KEY_LINEAR) { + kft3* keys1 = a.keys; + kft3* keys2 = r.keys; + size_t keys1_length = a.length; + size_t keys2_length = r.length; + + for (size_t i = 0; i < keys1_length; i++) { + float_t frame = keys1[i].frame; + bool found = false; + for (size_t j = 0; j < keys2_length && i < keys1_length; j++) + if (frame == keys2[j].frame) { + found = true; + break; + } + + if (!found) + if (frame <= keys2[0].frame || frame >= keys2[keys2_length - 1].frame) { + ident[14] = 1; + ident[20] = 1; + } + else + for (size_t j = 0; j + 1 < keys2_length && i < keys1_length; j++) + if (frame >= keys2[j].frame && keys2[j + 1].frame) { + if (*(uint32_t*)&keys2[j].value == *(uint32_t*)&keys2[j + 1].value) { + ident[14] = 1; + ident[20] = 1; + } + break; + } + } + } + } + break; + } + break; + } + + switch (g.type) { + case AUTH_3D_KEY_NONE: + case AUTH_3D_KEY_STATIC: + switch (b.type) { + case AUTH_3D_KEY_NONE: + case AUTH_3D_KEY_STATIC: + ident[15] = 1; + ident[21] = 1; + break; + } + break; + case AUTH_3D_KEY_LINEAR: + case AUTH_3D_KEY_HERMITE: + case AUTH_3D_KEY_HOLD: + switch (b.type) { + case AUTH_3D_KEY_NONE: + case AUTH_3D_KEY_STATIC: + ident[15] = 1; + ident[21] = 1; + break; + case AUTH_3D_KEY_LINEAR: + case AUTH_3D_KEY_HERMITE: + case AUTH_3D_KEY_HOLD: + if (g.length == b.length) { + ident[15] = 1; + + kft3* keys1 = g.keys; + kft3* keys2 = b.keys; + size_t length = g.length; + for (size_t i = 0; i < length; i++) + if (*(uint32_t*)&keys1[i].frame != *(uint32_t*)&keys2[i].frame) { + ident[15] = 0; + break; + } + + if (ident[15]) { + ident[21] = 1; + + for (size_t i = 0; i < length; i++) + if (*(uint64_t*)&keys1[i].tangent1 != *(uint64_t*)&keys2[i].tangent1) { + ident[21] = 0; + break; + } + } + } + else if (g.length > b.length) { + if (b.type == AUTH_3D_KEY_LINEAR) { + kft3* keys1 = g.keys; + kft3* keys2 = b.keys; + size_t keys1_length = g.length; + size_t keys2_length = b.length; + + for (size_t i = 0; i < keys1_length; i++) { + float_t frame = keys1[i].frame; + bool found = false; + for (size_t j = 0; j < keys2_length && i < keys1_length; j++) + if (frame == keys2[j].frame) { + found = true; + break; + } + + if (!found) + if (frame <= keys2[0].frame || frame >= keys2[keys2_length - 1].frame) { + ident[15] = 1; + ident[21] = 1; + } + else + for (size_t j = 0; j + 1 < keys2_length && i < keys1_length; j++) + if (frame >= keys2[j].frame && keys2[j + 1].frame) { + if (*(uint32_t*)&keys2[j].value == *(uint32_t*)&keys2[j + 1].value) { + ident[15] = 1; + ident[21] = 1; + } + break; + } + } + } + } + else if (g.length < b.length) { + if (g.type == AUTH_3D_KEY_LINEAR) { + kft3* keys1 = b.keys; + kft3* keys2 = g.keys; + size_t keys1_length = b.length; + size_t keys2_length = g.length; + + for (size_t i = 0; i < keys1_length; i++) { + float_t frame = keys1[i].frame; + bool found = false; + for (size_t j = 0; j < keys2_length && i < keys1_length; j++) + if (frame == keys2[j].frame) { + found = true; + break; + } + + if (!found) + if (frame <= keys2[0].frame || frame >= keys2[keys2_length - 1].frame) { + ident[15] = 1; + ident[21] = 1; + } + else + for (size_t j = 0; j + 1 < keys2_length && i < keys1_length; j++) + if (frame >= keys2[j].frame && keys2[j + 1].frame) { + if (*(uint32_t*)&keys2[j].value == *(uint32_t*)&keys2[j + 1].value) { + ident[15] = 1; + ident[21] = 1; + } + break; + } + } + } + } + break; + } + break; + } + + switch (g.type) { + case AUTH_3D_KEY_NONE: + case AUTH_3D_KEY_STATIC: + switch (a.type) { + case AUTH_3D_KEY_NONE: + case AUTH_3D_KEY_STATIC: + ident[16] = 1; + ident[22] = 1; + break; + } + break; + case AUTH_3D_KEY_LINEAR: + case AUTH_3D_KEY_HERMITE: + case AUTH_3D_KEY_HOLD: + switch (a.type) { + case AUTH_3D_KEY_NONE: + case AUTH_3D_KEY_STATIC: + ident[16] = 1; + ident[22] = 1; + break; + case AUTH_3D_KEY_LINEAR: + case AUTH_3D_KEY_HERMITE: + case AUTH_3D_KEY_HOLD: + if (g.length == a.length) { + ident[16] = 1; + + kft3* keys1 = g.keys; + kft3* keys2 = a.keys; + size_t length = g.length; + for (size_t i = 0; i < length; i++) + if (*(uint32_t*)&keys1[i].frame != *(uint32_t*)&keys2[i].frame) { + ident[16] = 0; + break; + } + + if (ident[16]) { + ident[22] = 1; + + for (size_t i = 0; i < length; i++) + if (*(uint64_t*)&keys1[i].tangent1 != *(uint64_t*)&keys2[i].tangent1) { + ident[22] = 0; + break; + } + } + } + else if (g.length > a.length) { + if (a.type == AUTH_3D_KEY_LINEAR) { + kft3* keys1 = g.keys; + kft3* keys2 = a.keys; + size_t keys1_length = g.length; + size_t keys2_length = a.length; + + for (size_t i = 0; i < keys1_length; i++) { + float_t frame = keys1[i].frame; + bool found = false; + for (size_t j = 0; j < keys2_length && i < keys1_length; j++) + if (frame == keys2[j].frame) { + found = true; + break; + } + + if (!found) + if (frame <= keys2[0].frame || frame >= keys2[keys2_length - 1].frame) { + ident[16] = 1; + ident[22] = 1; + } + else + for (size_t j = 0; j + 1 < keys2_length && i < keys1_length; j++) + if (frame >= keys2[j].frame && keys2[j + 1].frame) { + if (*(uint32_t*)&keys2[j].value == *(uint32_t*)&keys2[j + 1].value) { + ident[16] = 1; + ident[22] = 1; + } + break; + } + } + } + } + else if (g.length < a.length) { + if (g.type == AUTH_3D_KEY_LINEAR) { + kft3* keys1 = a.keys; + kft3* keys2 = g.keys; + size_t keys1_length = a.length; + size_t keys2_length = g.length; + + for (size_t i = 0; i < keys1_length; i++) { + float_t frame = keys1[i].frame; + bool found = false; + for (size_t j = 0; j < keys2_length && i < keys1_length; j++) + if (frame == keys2[j].frame) { + found = true; + break; + } + + if (!found) + if (frame <= keys2[0].frame || frame >= keys2[keys2_length - 1].frame) { + ident[16] = 1; + ident[22] = 1; + } + else + for (size_t j = 0; j + 1 < keys2_length && i < keys1_length; j++) + if (frame >= keys2[j].frame && keys2[j + 1].frame) { + if (*(uint32_t*)&keys2[j].value == *(uint32_t*)&keys2[j + 1].value) { + ident[16] = 1; + ident[22] = 1; + } + break; + } + } + } + } + break; + } + break; + } + + switch (b.type) { + case AUTH_3D_KEY_NONE: + case AUTH_3D_KEY_STATIC: + switch (a.type) { + case AUTH_3D_KEY_NONE: + case AUTH_3D_KEY_STATIC: + case AUTH_3D_KEY_LINEAR: + case AUTH_3D_KEY_HERMITE: + case AUTH_3D_KEY_HOLD: + ident[17] = 1; + ident[23] = 1; + break; + } + break; + case AUTH_3D_KEY_LINEAR: + case AUTH_3D_KEY_HERMITE: + case AUTH_3D_KEY_HOLD: + switch (a.type) { + case AUTH_3D_KEY_NONE: + case AUTH_3D_KEY_STATIC: + ident[17] = 1; + ident[23] = 1; + break; + case AUTH_3D_KEY_LINEAR: + case AUTH_3D_KEY_HERMITE: + case AUTH_3D_KEY_HOLD: + if (b.length == a.length) { + ident[17] = 1; + + kft3* keys1 = b.keys; + kft3* keys2 = a.keys; + size_t length = b.length; + for (size_t i = 0; i < length; i++) + if (*(uint32_t*)&keys1[i].frame != *(uint32_t*)&keys2[i].frame) { + ident[17] = 0; + break; + } + + if (ident[17]) { + ident[23] = 1; + + for (size_t i = 0; i < length; i++) + if (*(uint64_t*)&keys1[i].tangent1 != *(uint64_t*)&keys2[i].tangent1) { + ident[23] = 0; + break; + } + } + } + else if (b.length > a.length) { + if (a.type == AUTH_3D_KEY_LINEAR) { + kft3* keys1 = b.keys; + kft3* keys2 = a.keys; + size_t keys1_length = b.length; + size_t keys2_length = a.length; + + for (size_t i = 0; i < keys1_length; i++) { + float_t frame = keys1[i].frame; + bool found = false; + for (size_t j = 0; j < keys2_length && i < keys1_length; j++) + if (frame == keys2[j].frame) { + found = true; + break; + } + + if (!found) + if (frame <= keys2[0].frame || frame >= keys2[keys2_length - 1].frame) { + ident[17] = 1; + ident[23] = 1; + } + else + for (size_t j = 0; j + 1 < keys2_length && i < keys1_length; j++) + if (frame >= keys2[j].frame && keys2[j + 1].frame) { + if (*(uint32_t*)&keys2[j].value == *(uint32_t*)&keys2[j + 1].value) { + ident[17] = 1; + ident[23] = 1; + } + break; + } + } + } + } + else if (b.length < a.length) { + if (b.type == AUTH_3D_KEY_LINEAR) { + kft3* keys1 = a.keys; + kft3* keys2 = b.keys; + size_t keys1_length = a.length; + size_t keys2_length = b.length; + + for (size_t i = 0; i < keys1_length; i++) { + float_t frame = keys1[i].frame; + bool found = false; + for (size_t j = 0; j < keys2_length && i < keys1_length; j++) + if (frame == keys2[j].frame) { + found = true; + break; + } + + if (!found) + if (frame <= keys2[0].frame || frame >= keys2[keys2_length - 1].frame) { + ident[17] = 1; + ident[23] = 1; + } + else + for (size_t j = 0; j + 1 < keys2_length && i < keys1_length; j++) + if (frame >= keys2[j].frame && keys2[j + 1].frame) { + if (*(uint32_t*)&keys2[j].value == *(uint32_t*)&keys2[j + 1].value) { + ident[17] = 1; + ident[23] = 1; + } + break; + } + } + } + } + break; + } + break; + }*/ } - ml->name = mlf->name; - ml->hash = hash_string_murmurhash(ml->name); -} + /*OutputDebugStringA(auth->file_name.c_str()); + OutputDebugStringA("\n"); + OutputDebugStringA(mlf->name.c_str()); + OutputDebugStringA("\n"); -static void auth_3d_material_list_set(auth_3d_material_list* ml) { - vec4 blend_color = vec4_identity; if (ml->flags & AUTH_3D_MATERIAL_LIST_BLEND_COLOR) { - if (ml->blend_color.flags & AUTH_3D_RGBA_R) - blend_color.x = ml->blend_color.value.x; - if (ml->blend_color.flags & AUTH_3D_RGBA_G) - blend_color.y = ml->blend_color.value.y; - if (ml->blend_color.flags & AUTH_3D_RGBA_B) - blend_color.z = ml->blend_color.value.z; - if (ml->blend_color.flags & AUTH_3D_RGBA_A) - blend_color.w = ml->blend_color.value.w; + if ((ident[0] || ident[1] || ident[2] || ident[4] || ident[5] || ident[6]) + && (!ident[0] || !ident[1] || !ident[2] || !ident[4] || !ident[5] || !ident[6])) + OutputDebugStringA("A\n"); + if (!(ident[0] || ident[1] || ident[2] || ident[3] || ident[4] || ident[5])) + OutputDebugStringA("B\n"); + if (ident[0] || ident[1] || ident[2] || ident[3] || ident[4] || ident[5]) { + if ((ident[6] || ident[7] || ident[8] || ident[9] || ident[10] || ident[11]) + && (!ident[6] || !ident[7] || !ident[8] || !ident[9] || !ident[10] || !ident[11])) + OutputDebugStringA("C\n"); + if (!(ident[6] || ident[7] || ident[8] || ident[9] || ident[10] || ident[11])) + OutputDebugStringA("D\n"); + } } - float_t glow_intensity = 1.0f; - if (ml->flags & AUTH_3D_MATERIAL_LIST_GLOW_INTENSITY) - glow_intensity = ml->glow_intensity_value; - - vec4 incandescence = vec4_identity; if (ml->flags & AUTH_3D_MATERIAL_LIST_INCANDESCENCE) { - if (ml->incandescence.flags & AUTH_3D_RGBA_R) - incandescence.x = ml->incandescence.value.x; - if (ml->incandescence.flags & AUTH_3D_RGBA_G) - incandescence.y = ml->incandescence.value.y; - if (ml->incandescence.flags & AUTH_3D_RGBA_B) - incandescence.z = ml->incandescence.value.z; - if (ml->incandescence.flags & AUTH_3D_RGBA_A) - incandescence.w = ml->incandescence.value.w; - } -} + if ((ident[12] || ident[13] || ident[14] || ident[15] || ident[16] || ident[17]) + && (!ident[12] || !ident[13] || !ident[14] || !ident[15] || !ident[16] || !ident[17])) + OutputDebugStringA("E\n"); + if (!(ident[12] || ident[13] || ident[14] || ident[15] || ident[16] || ident[17])) + OutputDebugStringA("F\n"); + if (ident[12] || ident[13] || ident[14] || ident[15] || ident[16] || ident[17]) { + if ((ident[18] || ident[19] || ident[20] || ident[21] || ident[22] || ident[23]) + && (!ident[18] || !ident[19] || !ident[20] || !ident[21] || !ident[22] || !ident[23])) + OutputDebugStringA("G\n"); + if (!(ident[18] || ident[19] || ident[20] || ident[21] || ident[22] || ident[23])) + OutputDebugStringA("H\n"); + } + }*/ -static void auth_3d_object_ctrl(auth_3d_object* o, float_t frame) { - o->model_transform.interpolate(frame); - auth_3d_object_curve_ctrl(&o->pattern, frame); - auth_3d_object_curve_ctrl(&o->morph, frame); - for (auth_3d_object_texture_pattern& i : o->texture_pattern) - auth_3d_object_texture_pattern_ctrl(&i, frame); - for (auth_3d_object_texture_transform& i : o->texture_transform) - auth_3d_object_texture_transform_ctrl(&i, frame); + ml->name.assign(mlf->name); + ml->hash = hash_string_murmurhash(ml->name); + + /*char buf[0x200]; + sprintf_s(buf, sizeof(buf), "\n%d %d %d %d %d %d %d %d %d %d %d %d\n" + "%d %d %d %d %d %d %d %d %d %d %d %d\n\n", + ident[0], ident[1], ident[2], + ident[3], ident[4], ident[5], + ident[6], ident[7], ident[8], + ident[9], ident[10], ident[11], + ident[12], ident[13], ident[14], + ident[15], ident[16], ident[17], + ident[18], ident[19], ident[20], + ident[21], ident[22], ident[23]); + OutputDebugStringA(buf);*/ } static void auth_3d_object_disp(auth_3d_object* o, auth_3d* auth, render_context* rctx) { @@ -3526,7 +5572,9 @@ static void auth_3d_object_disp(auth_3d_object* o, auth_3d* auth, render_context rob_chara* rob_chr = rob_chara_array_get(auth->chara_id); mat4 m; mat4_mult(&rob_chr->data.miku_rot.field_6C, - &rob_chr->data.adjust_data.mat, &m); + auth->chara_item + ? &rob_chr->data.adjust_data.item_mat + : &rob_chr->data.adjust_data.mat, &m); mat4_mult(&m, &mat, &mat); object_data->set_shadow_type(auth->chara_id ? SHADOW_STAGE : SHADOW_CHARA); } @@ -3643,9 +5691,9 @@ static void auth_3d_object_load(auth_3d* auth, auth_3d_object* o, auth_3d_object_file* of, object_database* obj_db, texture_database* tex_db) { auth_3d_model_transform_load(auth, &o->model_transform, &of->model_transform); auth_3d_object_curve_load(auth, &o->morph, of->morph, of->morph_offset); - o->name = of->name; - o->parent_name = of->parent_name; - o->parent_node = of->parent_node; + o->name.assign(of->name); + o->parent_name.assign(of->parent_name); + o->parent_node.assign(of->parent_node); auth_3d_object_curve_load(auth, &o->pattern, of->pattern, of->pattern_offset); size_t texture_pattern_index = 0; @@ -3660,7 +5708,7 @@ static void auth_3d_object_load(auth_3d* auth, auth_3d_object* o, auth_3d_object_texture_transform_load(auth, &o->texture_transform[texture_transform_index++], &i, tex_db); - o->uid_name = of->uid_name; + o->uid_name.assign(of->uid_name); o->reflect = strstr(o->uid_name.c_str(), "_REFLECT") ? true : false; o->refract = strstr(o->uid_name.c_str(), "_REFRACT") ? true : false; @@ -3669,23 +5717,10 @@ static void auth_3d_object_load(auth_3d* auth, auth_3d_object* o, o->object_hash = hash_string_murmurhash(o->uid_name); } -static void auth_3d_object_curve_ctrl(auth_3d_object_curve* oc, float_t frame) { - auth_3d_curve* c = oc->curve; - if (!c) - return; - - if (oc->frame_offset != 0.0f) { - frame += oc->frame_offset; - if (frame >= c->curve.max_frame) - frame -= c->curve.max_frame; - } - oc->value = c->curve.interpolate(frame); -} - static void auth_3d_object_curve_load(auth_3d* auth, auth_3d_object_curve* oc, std::string& name, float_t frame_offset) { oc->curve = 0; - oc->name = name; + oc->name.assign(name); oc->frame_offset = 0.0f; oc->value = 0.0f; @@ -3697,27 +5732,8 @@ static void auth_3d_object_curve_load(auth_3d* auth, auth_3d_object_curve* oc, } } -static void auth_3d_object_list_ctrl(auth_3d_object* o, mat4* parent_mat) { - //if (!o->model_transform.visible) - // return; - - auth_3d_model_transform_set_mat(&o->model_transform, parent_mat); - - mat4& mat = o->model_transform.mat; - - for (auth_3d_object*& i : o->children_object) - auth_3d_object_list_ctrl(i, &mat); - for (auth_3d_object_hrc*& i : o->children_object_hrc) - auth_3d_object_hrc_list_ctrl(i, &mat); -} - -static void auth_3d_object_hrc_ctrl(auth_3d_object_hrc* oh, float_t frame) { - for (auth_3d_object_node& i : oh->node) - auth_3d_object_model_transform_ctrl(&i.model_transform, frame); -} - static void auth_3d_object_hrc_disp(auth_3d_object_hrc* oh, auth_3d* auth, render_context* rctx) { - if (!auth->visible || !oh->node[0].model_transform.visible) + if (!auth->visible || !oh->node.front().model_transform.visible) return; object_data* object_data = &rctx->object_data; @@ -3742,7 +5758,9 @@ static void auth_3d_object_hrc_disp(auth_3d_object_hrc* oh, auth_3d* auth, rende if (rob_chara_pv_data_array_check_chara_id(auth->chara_id)) { rob_chara* rob_chr = rob_chara_array_get(auth->chara_id); mat4_mult(&rob_chr->data.miku_rot.field_6C, - &rob_chr->data.adjust_data.mat, &mat); + auth->chara_item + ? &rob_chr->data.adjust_data.item_mat + : &rob_chr->data.adjust_data.mat, &mat); if (auth->chara_id) object_data->set_shadow_type(SHADOW_STAGE); } @@ -3750,7 +5768,7 @@ static void auth_3d_object_hrc_disp(auth_3d_object_hrc* oh, auth_3d* auth, rende else if (flags & DRAW_TASK_SHADOW) { object_data->set_shadow_type(SHADOW_STAGE); - mat4* m = &oh->node[0].model_transform.mat; + mat4* m = &oh->node.front().model_transform.mat; for (auth_3d_object_node& i : oh->node) if (i.mat) { m = i.mat; @@ -3765,7 +5783,7 @@ static void auth_3d_object_hrc_disp(auth_3d_object_hrc* oh, auth_3d* auth, rende } } - if (oh->mats.size() > 0) + if (oh->mats.size()) draw_task_add_draw_object_by_object_info_object_skin(rctx, oh->object_info, 0, 0, auth->alpha, oh->mats.data(), 0, 0, &mat); @@ -3781,7 +5799,7 @@ static void auth_3d_object_hrc_disp(auth_3d_object_hrc* oh, auth_3d* auth, rende static void auth_3d_object_hrc_load(auth_3d* auth, auth_3d_object_hrc* oh, auth_3d_object_hrc_file* ohf, object_database* obj_db) { - oh->name = ohf->name; + oh->name.assign(ohf->name); size_t node_index = 0; oh->node.resize(ohf->node.size()); @@ -3789,10 +5807,10 @@ static void auth_3d_object_hrc_load(auth_3d* auth, auth_3d_object_hrc* oh, auth_3d_object_node_load(auth, &oh->node[node_index++], &i); - oh->parent_name = ohf->parent_name; - oh->parent_node = ohf->parent_node; + oh->parent_name.assign(ohf->parent_name); + oh->parent_node.assign(ohf->parent_node); oh->shadow = ohf->shadow; - oh->uid_name = ohf->uid_name; + oh->uid_name.assign(ohf->uid_name); oh->reflect = strstr(oh->uid_name.c_str(), "_REFLECT") ? true : false; oh->refract = strstr(oh->uid_name.c_str(), "_REFRACT") ? true : false; @@ -3804,15 +5822,15 @@ static void auth_3d_object_hrc_load(auth_3d* auth, auth_3d_object_hrc* oh, if (!skin) return; - oh->mats.resize(skin->bones_count); + oh->mats.resize(skin->num_bone); mat4* mats = oh->mats.data(); for (auth_3d_object_node& i : oh->node) { i.bone_id = -1; uint64_t name_hash = hash_string_fnv1a64m(i.name); - for (uint32_t j = 0; j < skin->bones_count; j++) - if (hash_utf8_fnv1a64m(skin->bones[j].name) == name_hash) { - i.bone_id = skin->bones[j].id; + for (uint32_t j = 0; j < skin->num_bone; j++) + if (hash_utf8_fnv1a64m(skin->bone_array[j].name) == name_hash) { + i.bone_id = skin->bone_array[j].id; break; } @@ -3832,7 +5850,7 @@ static bool auth_3d_object_hrc_replace_chara(auth_3d_object_hrc* oh, std::string uid_name = oh->uid_name; size_t pos = uid_name.find(src_chara_str); if (pos != -1) - uid_name = uid_name.replace(pos, src_chara_str.size(), dst_chara_str); + uid_name.assign(uid_name.replace(pos, src_chara_str.size(), dst_chara_str)); object_info obj_info = obj_db->get_object_info(uid_name.c_str()); if (obj_info.not_null()) { @@ -3842,29 +5860,8 @@ static bool auth_3d_object_hrc_replace_chara(auth_3d_object_hrc* oh, return false; } -static void auth_3d_object_hrc_list_ctrl(auth_3d_object_hrc* oh, mat4* mat) { - //if (oh->node.size() < 1 || !oh->node[0].model_transform.visible) - // return; - - auth_3d_object_hrc_nodes_mat_mult(oh, mat); - - int32_t* childer_object_parent_node = oh->childer_object_parent_node.data(); - size_t children_object_count = oh->children_object.size(); - for (size_t i = 0; i < children_object_count; i++) - auth_3d_object_list_ctrl(oh->children_object[i], - &oh->node[childer_object_parent_node[i]].model_transform.mat); - - int32_t* childer_object_hrc_parent_node = oh->childer_object_hrc_parent_node.data(); - size_t children_object_hrc_count = oh->children_object_hrc.size(); - for (size_t i = 0; i < children_object_hrc_count; i++) - auth_3d_object_hrc_list_ctrl(oh->children_object_hrc[i], - &oh->node[childer_object_hrc_parent_node[i]].model_transform.mat); -} - -static void auth_3d_object_hrc_nodes_mat_mult(auth_3d_object_hrc* oh, mat4* mat) { +static void auth_3d_object_hrc_nodes_mat_mult(auth_3d_object_hrc* oh, const mat4* mat) { for (auth_3d_object_node& i : oh->node) { - auth_3d_object_model_transform_set_mat_inner(&i.model_transform); - mat4 m; if (i.parent >= 0) m = oh->node[i.parent].model_transform.mat; @@ -3872,7 +5869,7 @@ static void auth_3d_object_hrc_nodes_mat_mult(auth_3d_object_hrc* oh, mat4* mat) m = *mat; mat4_mult(&i.joint_orient_mat, &m, &m); - auth_3d_object_model_transform_mat_mult(&i.model_transform, &m); + i.model_transform.mat_mult(&m); if (i.mat) *i.mat = i.model_transform.mat; @@ -3882,9 +5879,9 @@ static void auth_3d_object_hrc_nodes_mat_mult(auth_3d_object_hrc* oh, mat4* mat) static void auth_3d_object_instance_load(auth_3d* auth, auth_3d_object_instance* oi, auth_3d_object_instance_file* oif, auth_3d_m_object_hrc* moh, object_database* obj_db) { auth_3d_object_model_transform_load(auth, &oi->model_transform, &oif->model_transform); - oi->name = oif->name; + oi->name.assign(oif->name); oi->shadow = oif->shadow; - oi->uid_name = oif->uid_name; + oi->uid_name.assign(oif->uid_name); oi->object_info = obj_db->get_object_info(oi->uid_name.c_str()); oi->object_hash = hash_string_murmurhash(oi->uid_name); @@ -3893,17 +5890,17 @@ static void auth_3d_object_instance_load(auth_3d* auth, auth_3d_object_instance* if (!skin) return; - oi->object_bone_indices.resize(skin->bones_count); + oi->object_bone_indices.resize(skin->num_bone); int32_t* object_bone_indices = oi->object_bone_indices.data(); - oi->mats.resize(skin->bones_count); + oi->mats.resize(skin->num_bone); mat4* mats = oi->mats.data(); - for (uint32_t i = 0; i < skin->bones_count; i++) { - uint64_t name_hash = hash_utf8_fnv1a64m(skin->bones[i].name); + for (uint32_t i = 0; i < skin->num_bone; i++) { + uint64_t name_hash = hash_utf8_fnv1a64m(skin->bone_array[i].name); for (auth_3d_object_node& j : moh->node) if (hash_string_fnv1a64m(j.name) == name_hash) { - int32_t bone_id = skin->bones[i].id; + int32_t bone_id = skin->bone_array[i].id; if (~bone_id & 0x8000) object_bone_indices[bone_id] = (int32_t)(&j - moh->node.data()); break; @@ -3911,34 +5908,14 @@ static void auth_3d_object_instance_load(auth_3d* auth, auth_3d_object_instance* } } -static void auth_3d_object_model_transform_ctrl(auth_3d_object_model_transform* obj_mt, float_t frame) { - if (frame == obj_mt->frame && !obj_mt->has_rotation) - return; - - obj_mt->translation_value = obj_mt->translation.interpolate(frame); - obj_mt->rotation_value = obj_mt->rotation.interpolate(frame); - - if (obj_mt->has_scale) - obj_mt->scale_value = obj_mt->scale.interpolate(frame); - - if (obj_mt->has_visibility) - obj_mt->visible = obj_mt->visibility.interpolate(frame) >= 0.99900001f; - - vec3& rotation = obj_mt->rotation_value; - mat4_rotate(rotation.x, rotation.y, rotation.z, &obj_mt->mat_rot); - obj_mt->frame = frame; - obj_mt->has_rotation = false; - obj_mt->has_translation = false; -} - static void auth_3d_object_model_transform_load(auth_3d* auth, auth_3d_object_model_transform* omt, auth_3d_model_transform_file* mtf) { omt->mat = mat4_identity; omt->mat_inner = mat4_identity; omt->mat_rot = mat4_identity; - omt->translation_value = vec3_null; - omt->rotation_value = vec3_null; - omt->scale_value = vec3_identity; + omt->translation_value = 0.0f; + omt->rotation_value = 0.0f; + omt->scale_value = 1.0f; omt->visible = false; omt->frame = -1.0f; omt->has_rotation = false; @@ -3955,7 +5932,7 @@ static void auth_3d_object_model_transform_load(auth_3d* auth, && omt->scale.y.type == AUTH_3D_KEY_STATIC && fabsf(1.0f - omt->scale.y.value) <= 0.000001f && omt->scale.z.type == AUTH_3D_KEY_STATIC && fabsf(1.0f - omt->scale.z.value) <= 0.000001f) { omt->has_scale = false; - omt->scale_value = vec3_identity; + omt->scale_value = 1.0f; } else omt->has_scale = true; @@ -3968,139 +5945,34 @@ static void auth_3d_object_model_transform_load(auth_3d* auth, omt->has_visibility = true; } -static void auth_3d_object_model_transform_mat_mult(auth_3d_object_model_transform* obj_mt, mat4* mat) { - mat4_mult(&obj_mt->mat_inner, mat, &obj_mt->mat); -} - -static void auth_3d_object_model_transform_set_mat_inner(auth_3d_object_model_transform* obj_mt) { - if (obj_mt->has_translation && !obj_mt->has_rotation) - return; - - mat4 mat; - vec3& translation = obj_mt->translation_value; - mat4_translate(translation.x, translation.y, translation.z, &mat); - - mat4_mult(&obj_mt->mat_rot, &mat, &mat); - if (obj_mt->has_scale) { - vec3 scale = obj_mt->scale_value; - mat4_scale_rot(&mat, scale.x, scale.y, scale.z, &mat); - } - obj_mt->mat_inner = mat; - obj_mt->has_translation = true; +void auth_3d_object_model_transform::mat_mult(const mat4* mat) { + mat4_mult(&this->mat_inner, mat, &this->mat); } static void auth_3d_object_node_load(auth_3d* auth, auth_3d_object_node* on, auth_3d_object_node_file* onf) { if (onf->flags & A3DA_OBJECT_NODE_JOINT_ORIENT) { - vec3& rot = onf->joint_orient; - on->joint_orient = rot; - mat4 mat; - mat4_rotate(rot.x, rot.y, rot.z, &on->joint_orient_mat); + on->joint_orient = onf->joint_orient; + mat4_rotate(&on->joint_orient, &on->joint_orient_mat); enum_or(on->flags, AUTH_3D_OBJECT_NODE_JOINT_ORIENT); } else { - on->joint_orient = vec3_null; + on->joint_orient = 0.0f; on->joint_orient_mat = mat4_identity; } auth_3d_object_model_transform_load(auth, &on->model_transform, &onf->model_transform); - on->name = onf->name; + on->name.assign(onf->name); on->parent = onf->parent; } -static void auth_3d_object_texture_pattern_ctrl( - auth_3d_object_texture_pattern* otp, float_t frame) { - auth_3d_object_curve_ctrl(&otp->pattern, frame); -} - static void auth_3d_object_texture_pattern_load(auth_3d* auth, auth_3d_object_texture_pattern* otp, auth_3d_object_texture_pattern_file* otpf, texture_database* tex_db) { - otp->name = otpf->name; + otp->name.assign(otpf->name); auth_3d_object_curve_load(auth, &otp->pattern, otpf->pattern, otpf->pattern_offset); otp->texture_id = tex_db->get_texture_id(otp->name.c_str()); } -static void auth_3d_object_texture_transform_ctrl( - auth_3d_object_texture_transform* ott, float_t frame) { - int32_t flags = ott->flags; - - vec3 scale = vec3_identity; - vec3 repeat = vec3_identity; - vec3 rotate = vec3_null; - vec3 translate_frame = vec3_null; - - if (flags & AUTH_3D_OBJECT_TEXTURE_TRANSFORM_COVERAGE_U && ott->coverage_u.max_frame > 0.0f) { - float_t coverage_u = ott->coverage_u.interpolate(frame); - if (fabsf(coverage_u) > 0.000001f) - scale.x = 1.0f / coverage_u; - } - - if (flags & AUTH_3D_OBJECT_TEXTURE_TRANSFORM_COVERAGE_V && ott->coverage_v.max_frame > 0.0f) { - float_t coverage_v = ott->coverage_v.interpolate(frame); - if (fabsf(coverage_v) > 0.000001f) - scale.y = 1.0f / coverage_v; - } - - if (flags & AUTH_3D_OBJECT_TEXTURE_TRANSFORM_REPEAT_U && ott->repeat_u.max_frame > 0.0f) { - float_t value = ott->repeat_u.interpolate(frame); - if (fabsf(value) > 0.000001f) - repeat.x = value; - } - - if (flags & AUTH_3D_OBJECT_TEXTURE_TRANSFORM_REPEAT_V && ott->repeat_v.max_frame > 0.0f) { - float_t value = ott->repeat_v.interpolate(frame); - if (fabsf(value) > 0.000001f) - repeat.y = value; - } - - if (flags & AUTH_3D_OBJECT_TEXTURE_TRANSFORM_ROTATE_FRAME) - rotate.z = ott->rotate_frame.interpolate(frame); - - if (flags & AUTH_3D_OBJECT_TEXTURE_TRANSFORM_ROTATE) - rotate.z += ott->rotate.interpolate(frame); - - float_t translate_frame_u; - if (flags & AUTH_3D_OBJECT_TEXTURE_TRANSFORM_TRANSLATE_FRAME_U) - translate_frame_u = -ott->translate_frame_u.interpolate(frame); - else - translate_frame_u = 0.0f; - - float_t offset_u; - if (flags & AUTH_3D_OBJECT_TEXTURE_TRANSFORM_OFFSET_U) - offset_u = ott->offset_u.interpolate(frame); - else - offset_u = 0.0f; - - translate_frame.x = (translate_frame_u + offset_u) * repeat.x; - - float_t translate_frame_v; - if (flags & AUTH_3D_OBJECT_TEXTURE_TRANSFORM_TRANSLATE_FRAME_V) - translate_frame_v = -ott->translate_frame_v.interpolate(frame); - else - translate_frame_v = 0.0f; - - float_t offset_v; - if (flags & AUTH_3D_OBJECT_TEXTURE_TRANSFORM_OFFSET_V) - offset_v = ott->offset_v.interpolate(frame); - else - offset_v = 0.0f; - - translate_frame.y = (translate_frame_v + offset_v) * repeat.y; - - mat4 mat; - mat4_translate(translate_frame.x, translate_frame.y, translate_frame.z, &mat); - mat4_scale_rot(&mat, scale.x, scale.y, scale.z, &mat); - - mat4_translate_mult(&mat, 1.0f, 1.0f, 0.0f, &mat); - mat4_scale_rot(&mat, repeat.x, repeat.y, repeat.z, &mat); - mat4_translate_mult(&mat, -1.0f, -1.0f, 0.0f, &mat); - - mat4_translate_mult(&mat, 0.5f, 0.5f, 0.0f, &mat); - mat4_rotate_z_mult(&mat, rotate.z, &mat); - mat4_translate_mult(&mat, -0.5f, -0.5f, 0.0f, &mat); - ott->mat = mat; -} - static void auth_3d_object_texture_transform_load(auth_3d* auth, auth_3d_object_texture_transform* ott, auth_3d_object_texture_transform_file* ottf, texture_database* tex_db) { if (ottf->flags & A3DA_OBJECT_TEXTURE_TRANSFORM_COVERAGE_U) { @@ -4113,7 +5985,7 @@ static void auth_3d_object_texture_transform_load(auth_3d* auth, auth_3d_object_ enum_or(ott->flags, AUTH_3D_OBJECT_TEXTURE_TRANSFORM_COVERAGE_V); } - ott->name = ottf->name; + ott->name.assign(ottf->name); if (ottf->flags & A3DA_OBJECT_TEXTURE_TRANSFORM_OFFSET_U) { auth_3d_key_load(auth, &ott->offset_u, &ottf->offset_u); @@ -4178,32 +6050,13 @@ static void auth_3d_play_control_load(auth_3d* auth, auth_3d_play_control_file* pc->size = pcf->size; } -static void auth_3d_point_ctrl(auth_3d_point* p, float_t frame) { - p->model_transform.interpolate(frame); -} - static void auth_3d_point_disp(auth_3d_point* p, mat4* parent_mat, render_context* rctx) { } static void auth_3d_point_load(auth_3d* auth, auth_3d_point* p, auth_3d_point_file* pf) { auth_3d_model_transform_load(auth, &p->model_transform, &pf->model_transform); - p->name = pf->name; -} - -static void auth_3d_post_process_ctrl(auth_3d_post_process* pp, float_t frame) { - if (pp->flags & AUTH_3D_POST_PROCESS_INTENSITY) - pp->intensity.interpolate(frame); - if (pp->flags & AUTH_3D_POST_PROCESS_LENS_FLARE) - pp->lens_flare_value = pp->lens_flare.interpolate(frame); - if (pp->flags & AUTH_3D_POST_PROCESS_LENS_SHAFT) - pp->lens_shaft_value = pp->lens_shaft.interpolate(frame); - if (pp->flags & AUTH_3D_POST_PROCESS_LENS_GHOST) - pp->lens_ghost_value = pp->lens_ghost.interpolate(frame); - if (pp->flags & AUTH_3D_POST_PROCESS_RADIUS) - pp->radius.interpolate(frame); - if (pp->flags & AUTH_3D_POST_PROCESS_SCENE_FADE) - pp->scene_fade.interpolate(frame); + p->name.assign(pf->name); } static void auth_3d_post_process_load(auth_3d* auth, auth_3d_post_process* pp, auth_3d_post_process_file* ppf) { @@ -4399,7 +6252,7 @@ static void auth_3d_data_struct_load_category(auth_3d_data_struct* auth_3d_data, if (elem == auth_3d_data->farcs_modern.end()) { elem = auth_3d_data->farcs_modern.insert({ category_hash, {} }).first; auth_3d_farc* a3da_farc = &elem->second; - a3da_farc->name = category_name; + a3da_farc->name.assign(category_name); } auth_3d_farc* a3da_farc = &elem->second; @@ -4476,10 +6329,15 @@ static void auth_3d_farc_read_file(auth_3d_farc* a3da_farc, const char* mdata_di } a3da_farc->state = 1; - a3da_farc->path = "rom/auth_3d/"; - if (mdata_dir && *mdata_dir) - a3da_farc->path += mdata_dir; - a3da_farc->file = a3da_farc->name + ".farc"; + + if (mdata_dir && *mdata_dir) { + a3da_farc->path.assign(mdata_dir); + a3da_farc->path.append("rom/auth_3d/"); + } + else + a3da_farc->path.assign("rom/auth_3d/"); + a3da_farc->file.assign(a3da_farc->name); + a3da_farc->file.append(".farc"); if (a3da_farc->file_handler.read_file(&data_list[DATA_AFT], a3da_farc->path.c_str(), a3da_farc->file.c_str())) @@ -4496,8 +6354,9 @@ static void auth_3d_farc_read_file_modern(auth_3d_farc* a3da_farc, void* data) { } a3da_farc->state = 1; - a3da_farc->path = "root+/auth_3d/"; - a3da_farc->file = a3da_farc->name + ".farc"; + a3da_farc->path.assign("root+/auth_3d/"); + a3da_farc->file.assign(a3da_farc->name); + a3da_farc->file.append(".farc"); if (a3da_farc->file_handler.read_file(data, a3da_farc->path.c_str(), hash_string_murmurhash(a3da_farc->name), ".farc")) @@ -4556,7 +6415,8 @@ static void auth_3d_uid_file_load_file(auth_3d_uid_file* uid_file, auth_3d_datab return; uid_file->name = db_uid->name.c_str(); - uid_file->file_name = db_uid->name + ".a3da"; + uid_file->file_name.assign(db_uid->name); + uid_file->file_name.append(".a3da"); auth_3d_farc* farc = auth_3d_data_struct_get_farc(auth_3d_data, db_uid->category.c_str()); uid_file->farc = farc; if (farc) { @@ -4583,7 +6443,7 @@ static void auth_3d_uid_file_modern_load_file(auth_3d_uid_file_modern* uid_file) if (!farc) return; - uid_file->file_name = farc->farc->get_file_name(uid_file->hash); + uid_file->file_name.assign(farc->farc->get_file_name(uid_file->hash)); uid_file->farc = farc; if (farc) { @@ -4617,12 +6477,17 @@ static void auth_3d_uid_file_unload_file(auth_3d_uid_file* uid_file) { static void auth_3d_uid_file_modern_unload_file(auth_3d_uid_file_modern* uid_file) { if (uid_file->state == 1 || uid_file->state == 2) auth_3d_farc_unload(uid_file->farc); - uid_file->name = {}; + uid_file->name.clear(); + uid_file->name.shrink_to_fit(); uid_file->farc = 0; uid_file->state = 0; auth_3d_data->uid_files_modern.erase(uid_file->hash); } +static size_t auth_3d_time_event_radix_index_func_time(auth_3d_time_event* data, size_t index) { + return *(uint32_t*)&data[index].frame; +} + static void Auth3dTestTask__SetAuth3dId(Auth3dTestTask* tt) { if (task_stage_check_not_loaded() || tt->auth_3d_uid == -1 || !tt->load_category.size() || tt->auth_3d_uid == auth_3d_data_get_uid(&tt->auth_3d_id)) @@ -4636,7 +6501,7 @@ static void Auth3dTestTask__SetAuth3dId(Auth3dTestTask* tt) { tt->obj_sets.clear(); } auth_3d_data_load_category(tt->load_category.c_str()); - tt->category = tt->load_category; + tt->category.assign(tt->load_category); if (tt->window.obj_link) tt->field_394 = 1; } diff --git a/src/CRE/auth_3d.hpp b/src/CRE/auth_3d.hpp index bed7522b..99ac23fc 100644 --- a/src/CRE/auth_3d.hpp +++ b/src/CRE/auth_3d.hpp @@ -48,21 +48,6 @@ enum auth_3d_ep_type { AUTH_3D_EP_CYCLE_OFFSET = 3, }; // Pre/Post Infinity -enum auth_3d_event_type { - AUTH_3D_EVENT_MISC = 0x00, - AUTH_3D_EVENT_FILT = 0x01, - AUTH_3D_EVENT_FX = 0x02, - AUTH_3D_EVENT_SND = 0x03, - AUTH_3D_EVENT_MOT = 0x04, - AUTH_3D_EVENT_A2D = 0x05, -}; - -enum auth_3d_event_filter_fade_type { - AUTH_3D_EVENT_FILTER_FADE_NONE = -1, - AUTH_3D_EVENT_FILTER_FADE_OUT = 0, - AUTH_3D_EVENT_FILTER_FADE_IN = 1, -}; - enum auth_3d_fog_flags { AUTH_3D_FOG_COLOR = 0x01, AUTH_3D_FOG_DENSITY = 0x02, @@ -156,6 +141,7 @@ enum auth_3d_rgba_flags { AUTH_3D_RGBA_A = 0x08, }; +struct auth_3d; struct auth_3d_ambient; struct auth_3d_camera_auxiliary; struct auth_3d_camera_root; @@ -184,6 +170,128 @@ struct auth_3d_post_process; struct auth_3d_rgba; struct auth_3d_vec3; +namespace auth_3d_detail { + class Event { + public: + enum Type { + MISC = 0x00, + FILT = 0x01, + FX = 0x02, + SND = 0x03, + MOT = 0x04, + A2D = 0x05, + }; + + bool active; + Type type; + std::string name; + float_t begin; + float_t end; + std::string param1; + std::string ref; + size_t index; + + Event(a3da_event* e); + virtual ~Event(); + + virtual void Load(auth_3d* auth); + virtual void Begin(auth_3d* auth, int32_t flags, render_context* rctx); + virtual void End(auth_3d* auth, int32_t flags, render_context* rctx); + virtual void Ctrl(auth_3d* auth, int32_t flags, render_context* rctx); + virtual void Disp(auth_3d* auth, const mat4* mat, render_context* rctx); + }; + + struct EventA2d : public Event { + public: + //std::pair aet_init_data; + + EventA2d(a3da_event* e); + virtual ~EventA2d(); + + virtual void Begin(auth_3d* auth, int32_t flags, render_context* rctx) override; + virtual void End(auth_3d* auth, int32_t flags, render_context* rctx) override; + virtual void Ctrl(auth_3d* auth, int32_t flags, render_context* rctx) override; + virtual void Disp(auth_3d* auth, const mat4* mat, render_context* rctx) override; + }; + + struct EventFX : public Event { + public: + EventFX(a3da_event* e); + virtual ~EventFX(); + + virtual void Load(auth_3d* auth) override; + virtual void Begin(auth_3d* auth, int32_t flags, render_context* rctx) override; + virtual void Ctrl(auth_3d* auth, int32_t flags, render_context* rctx) override; + }; + + struct EventFXSmoothCut : public Event { + public: + bool cam; + + EventFXSmoothCut(a3da_event* e); + virtual ~EventFXSmoothCut(); + + virtual void Load(auth_3d* auth) override; + virtual void Begin(auth_3d* auth, int32_t flags, render_context* rctx) override; + virtual void End(auth_3d* auth, int32_t flags, render_context* rctx) override; + virtual void Disp(auth_3d* auth, const mat4* mat, render_context* rctx) override; + }; + + struct EventFilterFade : public Event { + public: + enum Type { + FADE_NONE = -1, + FADE_OUT = 0, + FADE_IN = 1, + }; + + Type type; + vec3 color; + + EventFilterFade(a3da_event* e); + virtual ~EventFilterFade(); + + virtual void Begin(auth_3d* auth, int32_t flags, render_context* rctx) override; + virtual void End(auth_3d* auth, int32_t flags, render_context* rctx) override; + virtual void Disp(auth_3d* auth, const mat4* mat, render_context* rctx) override; + }; + + struct EventFilterTimeStop : public Event { + public: + EventFilterTimeStop(a3da_event* e); + virtual ~EventFilterTimeStop(); + + virtual void Begin(auth_3d* auth, int32_t flags, render_context* rctx) override; + virtual void End(auth_3d* auth, int32_t flags, render_context* rctx) override; + virtual void Disp(auth_3d* auth, const mat4* mat, render_context* rctx) override; + }; + + struct EventMot : public Event { + public: + EventMot(a3da_event* e); + virtual ~EventMot(); + + virtual void Load(auth_3d* auth) override; + virtual void Begin(auth_3d* auth, int32_t flags, render_context* rctx) override; + virtual void End(auth_3d* auth, int32_t flags, render_context* rctx) override; + virtual void Ctrl(auth_3d* auth, int32_t flags, render_context* rctx) override; + virtual void Disp(auth_3d* auth, const mat4* mat, render_context* rctx) override; + }; + + struct EventSnd : public Event { + public: + bool field_190; + + EventSnd(a3da_event* e); + virtual ~EventSnd(); + + virtual void Load(auth_3d* auth) override; + virtual void Begin(auth_3d* auth, int32_t flags, render_context* rctx) override; + virtual void End(auth_3d* auth, int32_t flags, render_context* rctx) override; + virtual void Disp(auth_3d* auth, const mat4* mat, render_context* rctx) override; + }; +} + struct auth_3d_key { auth_3d_key_type type; float_t value; @@ -205,6 +313,8 @@ struct auth_3d_key { float_t interpolate(float_t frame); void reset(); + + auth_3d_key& operator=(const auth_3d_key& k); }; struct auth_3d_rgba { @@ -252,6 +362,7 @@ struct auth_3d_model_transform { void interpolate(float_t frame); void reset(); + void set_mat(const mat4* parent_mat); }; struct auth_3d_ambient { @@ -263,6 +374,7 @@ struct auth_3d_ambient { auth_3d_ambient(); ~auth_3d_ambient(); + void interpolate(float_t frame); void reset(); }; @@ -285,6 +397,7 @@ struct auth_3d_camera_auxiliary { auth_3d_camera_auxiliary(); ~auth_3d_camera_auxiliary(); + void interpolate(float_t frame); void reset(); }; @@ -318,16 +431,19 @@ struct auth_3d_camera_root { auth_3d_camera_root(); ~auth_3d_camera_root(); + void interpolate(float_t frame); void reset(); }; struct auth_3d_chara { auth_3d_model_transform model_transform; std::string name; + int32_t index; auth_3d_chara(); ~auth_3d_chara(); + void interpolate(float_t frame); void reset(); }; @@ -339,6 +455,7 @@ struct auth_3d_curve { auth_3d_curve(); ~auth_3d_curve(); + void interpolate(float_t frame); void reset(); }; @@ -349,23 +466,7 @@ struct auth_3d_dof { auth_3d_dof(); ~auth_3d_dof(); - void reset(); -}; - -struct auth_3d_event { - float_t begin; - float_t clip_begin; - float_t clip_end; - float_t end; - std::string name; - std::string param_1; - std::string ref; - float_t time_ref_scale; - auth_3d_event_type type; - - auth_3d_event(); - ~auth_3d_event(); - + void interpolate(float_t frame); void reset(); }; @@ -390,6 +491,7 @@ struct auth_3d_fog { auth_3d_fog(); ~auth_3d_fog(); + void interpolate(float_t frame); void reset(); }; @@ -435,6 +537,7 @@ struct auth_3d_light { auth_3d_light(); ~auth_3d_light(); + void interpolate(float_t frame); void reset(); }; @@ -460,6 +563,8 @@ struct auth_3d_object_model_transform { auth_3d_object_model_transform(); ~auth_3d_object_model_transform(); + void interpolate(float_t frame); + void mat_mult(const mat4* mat); void reset(); }; @@ -472,6 +577,8 @@ struct auth_3d_m_object_hrc { auth_3d_m_object_hrc(); ~auth_3d_m_object_hrc(); + void interpolate(float_t frame); + void list_ctrl(const mat4* parent_mat); void reset(); }; @@ -488,6 +595,7 @@ struct auth_3d_material_list { auth_3d_material_list(); ~auth_3d_material_list(); + void interpolate(float_t frame); void reset(); }; @@ -500,6 +608,7 @@ struct auth_3d_object_curve { auth_3d_object_curve(); ~auth_3d_object_curve(); + void interpolate(float_t frame); void reset(); }; @@ -523,14 +632,16 @@ struct auth_3d_object { auth_3d_object(); ~auth_3d_object(); + void interpolate(float_t frame); + void list_ctrl(const mat4* parent_mat); void reset(); }; struct auth_3d_object_hrc { std::vector children_object; std::vector children_object_hrc; - std::vector childer_object_hrc_parent_node; - std::vector childer_object_parent_node; + std::vector children_object_parent_node; + std::vector children_object_hrc_parent_node; std::vector mats; std::string name; std::vector node; @@ -546,6 +657,9 @@ struct auth_3d_object_hrc { auth_3d_object_hrc(); ~auth_3d_object_hrc(); + int32_t get_node_index(const char* node); + void interpolate(float_t frame); + void list_ctrl(const mat4* parent_mat); void reset(); }; @@ -562,6 +676,7 @@ struct auth_3d_object_instance { auth_3d_object_instance(); ~auth_3d_object_instance(); + void interpolate(float_t frame); void reset(); }; @@ -578,6 +693,7 @@ struct auth_3d_object_node { auth_3d_object_node(); ~auth_3d_object_node(); + void interpolate(float_t frame); void reset(); }; @@ -589,6 +705,7 @@ struct auth_3d_object_texture_pattern { auth_3d_object_texture_pattern(); ~auth_3d_object_texture_pattern(); + void interpolate(float_t frame); void reset(); }; @@ -611,6 +728,7 @@ struct auth_3d_object_texture_transform { auth_3d_object_texture_transform(); ~auth_3d_object_texture_transform(); + void interpolate(float_t frame); void reset(); }; @@ -635,6 +753,7 @@ struct auth_3d_point { auth_3d_point(); ~auth_3d_point(); + void interpolate(float_t frame); void reset(); }; @@ -662,9 +781,16 @@ struct auth_3d_post_process { auth_3d_post_process(); ~auth_3d_post_process(); + void interpolate(float_t frame); void reset(); }; +struct auth_3d_time_event { + float_t frame; + int32_t type; + size_t event_index; +}; + struct auth_3d { int32_t uid; int32_t id; @@ -679,6 +805,7 @@ struct auth_3d { float_t alpha; draw_task_flags draw_task_flags; int32_t chara_id; + bool chara_item; bool shadow; int32_t src_chara; int32_t dst_chara; @@ -698,7 +825,9 @@ struct auth_3d { std::vector chara; std::vector curve; auth_3d_dof dof; - std::vector event; + std::vector event; + std::vector event_time; + auth_3d_time_event* event_time_next; std::vector fog; std::vector light; std::vector m_object_hrc; @@ -833,11 +962,11 @@ public: } window; Auth3dTestTask(); - virtual ~Auth3dTestTask(); + virtual ~Auth3dTestTask() override; - virtual bool Init(); - virtual bool Ctrl(); - virtual bool Dest(); + virtual bool Init() override; + virtual bool Ctrl() override; + virtual bool Dest() override; }; extern auth_3d_data_struct* auth_3d_data; @@ -880,12 +1009,13 @@ extern void auth_3d_data_read_file(int32_t* id, auth_3d_database* auth_3d_db); extern void auth_3d_data_read_file_modern(int32_t* id); extern void auth_3d_data_set_camera_root_update(int32_t* id, bool value); extern void auth_3d_data_set_chara_id(int32_t* id, int32_t value); +extern void auth_3d_data_set_chara_item(int32_t* id, bool value); extern void auth_3d_data_set_draw_task_flags_alpha(int32_t* id, draw_task_flags draw_task_flags, float_t alpha); extern void auth_3d_data_set_enable(int32_t* id, bool value); extern void auth_3d_data_set_frame_rate(int32_t* id, FrameRateControl* value); extern void auth_3d_data_set_last_frame(int32_t* id, float_t value); extern void auth_3d_data_set_left_right_reverse(int32_t* id, bool value); -extern void auth_3d_data_set_mat(int32_t* id, mat4* value); +extern void auth_3d_data_set_mat(int32_t* id, const mat4* value); extern void auth_3d_data_set_max_frame(int32_t* id, float_t value); extern void auth_3d_data_set_paused(int32_t* id, bool value); extern void auth_3d_data_set_repeat(int32_t* id, bool value); diff --git a/src/CRE/camera.cpp b/src/CRE/camera.cpp index 158275ee..cff57764 100644 --- a/src/CRE/camera.cpp +++ b/src/CRE/camera.cpp @@ -54,7 +54,7 @@ void camera::initialize(double_t aspect, int32_t render_width, set_roll(0.0); set_fov(32.2673416137695); camera_calculate_forward(this); - set_position(vec3_null); + set_position(0.0f); update(); } @@ -147,14 +147,14 @@ void camera::get_view_point(vec3& value) { } void camera::set_view_point(const vec3& value) { - if (memcmp(&value, &view_point, sizeof(vec3))) { + if (value != view_point) { view_point = value; changed_view = true; } } void camera::set_view_point(const vec3&& value) { - if (memcmp(&value, &view_point, sizeof(vec3))) { + if (value != view_point) { view_point = value; changed_view = true; } @@ -165,14 +165,14 @@ void camera::get_interest(vec3& value) { } void camera::set_interest(const vec3& value) { - if (memcmp(&value, &interest, sizeof(vec3))) { + if (value != interest) { interest = value; changed_view = true; } } void camera::set_interest(const vec3&& value) { - if (memcmp(&value, &interest, sizeof(vec3))) { + if (value != interest) { interest = value; changed_view = true; } @@ -222,7 +222,7 @@ void camera::reset() { fast_change_hist0 = false; fast_change_hist1 = false; camera_calculate_forward(this); - set_position(vec3_null); + set_position(0.0f); update_data(); } @@ -264,9 +264,9 @@ void camera::set(const vec3& view_point, const vec3& interest, _fov = fov; mat4 cam; - mat4_translate(trans.x, trans.y, trans.z, &cam); - mat4_rotate_mult(&cam, rot.x, rot.y, rot.z, &cam); - mat4_scale_rot(&cam, scale.x, scale.y, scale.z, &cam); + mat4_translate(&trans, &cam); + mat4_rotate_mult(&cam, &rot, &cam); + mat4_scale_rot(&cam, &scale, &cam); mat4_mult_vec3_trans(&cam, &_vp, &_vp); mat4_mult_vec3_trans(&cam, &_int, &_int); @@ -404,7 +404,7 @@ static void camera_calculate_view(camera* c) { mat4_rotate_z(rotation.z, &c->view); mat4_rotate_x_mult(&c->view, rotation.x, &c->view); mat4_rotate_y_mult(&c->view, rotation.y, &c->view); - mat4_translate_mult(&c->view, view_point.x, view_point.y, view_point.z, &c->view); + mat4_translate_mult(&c->view, &view_point, &c->view); mat4_inverse(&c->view, &c->inv_view); mat3_from_mat4(&c->view, &c->view_mat3); diff --git a/src/CRE/clear_color.cpp b/src/CRE/clear_color.cpp index d050e83c..3a330b17 100644 --- a/src/CRE/clear_color.cpp +++ b/src/CRE/clear_color.cpp @@ -23,3 +23,13 @@ const vec4u8 color_grey = { 0x7F, 0x7F, 0x7F, 0xFF }; vec4u8 clear_color; bool set_clear_color; + +vec4 get_clear_color() { + if (!set_clear_color) + return 0.0f; + + vec4 _clear_color; + vec4u8_to_vec4(clear_color, _clear_color); + return _clear_color * (float_t)(1.0 / 255.0); +} + diff --git a/src/CRE/clear_color.hpp b/src/CRE/clear_color.hpp index 0c25621d..16b44636 100644 --- a/src/CRE/clear_color.hpp +++ b/src/CRE/clear_color.hpp @@ -26,3 +26,5 @@ extern const vec4u8 color_grey; extern vec4u8 clear_color; extern bool set_clear_color; + +extern vec4 get_clear_color(); diff --git a/src/CRE/data.hpp b/src/CRE/data.hpp index 4a668a2c..d56e79b3 100644 --- a/src/CRE/data.hpp +++ b/src/CRE/data.hpp @@ -104,7 +104,7 @@ struct data_struct { #endif data_struct(); - virtual ~data_struct(); + ~data_struct(); bool check_directory_exists(const char* dir); bool check_file_exists(const char* path); diff --git a/src/CRE/draw_object.cpp b/src/CRE/draw_object.cpp index 062939ec..0f0567b3 100644 --- a/src/CRE/draw_object.cpp +++ b/src/CRE/draw_object.cpp @@ -37,6 +37,10 @@ texture_data_struct::texture_data_struct() : field_0() { void draw_object_draw(render_context* rctx, draw_object* draw, mat4* model, void(*draw_object_func)(render_context* rctx, draw_object* draw), int32_t show_vector) { + GLuint vao = rctx->object_data.get_vertex_array(draw); + if (!vao) + return; + if (draw->mats) { mat4* mats = draw->mats; if (draw->mat_count == 2) @@ -66,7 +70,7 @@ void draw_object_draw(render_context* rctx, draw_object* draw, mat4* model, if (!show_vector) { - gl_state_bind_vertex_array(rctx->object_data.get_vertex_array(draw)); + gl_state_bind_vertex_array(vao); draw_object_func(rctx, draw); } uniform_value[U_BONE_MAT] = 0; @@ -75,21 +79,23 @@ void draw_object_draw(render_context* rctx, draw_object* draw, mat4* model, void draw_object_draw_default(render_context* rctx, draw_object* draw) { if (draw->set_blend_color) { shaders_ft.env_vert_set(3, draw->blend_color); - shaders_ft.env_vert_set(4, vec4_null); + shaders_ft.env_vert_set(4, 0.0f); } if (!draw->draw_object_func) draw_object_vertex_attrib_set_default(draw); draw_object_material_set_default(rctx, draw, rctx->draw_state.shader); + + obj_sub_mesh* sub_mesh = draw->sub_mesh; if (!draw->instances_count) obj_sub_mesh_draw(rctx, - draw->sub_mesh->primitive_type, - draw->sub_mesh->indices_count, - draw->sub_mesh->first_index, - draw->sub_mesh->last_index, - draw->sub_mesh->index_format, - draw->sub_mesh->indices_offset); + sub_mesh->primitive_type, + sub_mesh->num_index, + sub_mesh->first_index, + sub_mesh->last_index, + sub_mesh->index_format, + sub_mesh->index_offset); else { mat4 mat; for (int32_t i = 0; i < draw->instances_count; i++) { @@ -99,12 +105,12 @@ void draw_object_draw_default(render_context* rctx, draw_object* draw) { glVertexAttrib4fv(14, (const GLfloat*)&mat.row2); glVertexAttrib4fv(15, (const GLfloat*)&mat.row3); obj_sub_mesh_draw(rctx, - draw->sub_mesh->primitive_type, - draw->sub_mesh->indices_count, - draw->sub_mesh->first_index, - draw->sub_mesh->last_index, - draw->sub_mesh->index_format, - draw->sub_mesh->indices_offset); + sub_mesh->primitive_type, + sub_mesh->num_index, + sub_mesh->first_index, + sub_mesh->last_index, + sub_mesh->index_format, + sub_mesh->index_offset); } } @@ -113,8 +119,8 @@ void draw_object_draw_default(render_context* rctx, draw_object* draw) { draw_object_vertex_attrib_reset_default(draw); if (draw->set_blend_color) { - shaders_ft.env_vert_set(3, vec4_identity); - shaders_ft.env_vert_set(4, vec4_null); + shaders_ft.env_vert_set(3, 1.0f); + shaders_ft.env_vert_set(4, 0.0f); } rctx->draw_state.stats.object_draw_count++; @@ -174,11 +180,11 @@ void draw_object_draw_reflect(render_context* rctx, draw_object* draw) { if (sub_mesh->index_format != OBJ_INDEX_U8) obj_sub_mesh_draw(rctx, sub_mesh->primitive_type, - sub_mesh->indices_count, + sub_mesh->num_index, sub_mesh->first_index, sub_mesh->last_index, sub_mesh->index_format, - sub_mesh->indices_offset); + sub_mesh->index_offset); draw_object_material_reset_reflect(); draw_object_vertex_attrib_reset_reflect(draw); @@ -195,11 +201,11 @@ void draw_object_draw_reflect_reflect_map(render_context* rctx, draw_object* dra if (sub_mesh->index_format != OBJ_INDEX_U8) obj_sub_mesh_draw(rctx, sub_mesh->primitive_type, - sub_mesh->indices_count, + sub_mesh->num_index, sub_mesh->first_index, sub_mesh->last_index, sub_mesh->index_format, - sub_mesh->indices_offset); + sub_mesh->index_offset); draw_object_material_reset_reflect(); draw_object_vertex_attrib_reset_reflect(draw); @@ -287,11 +293,11 @@ void draw_object_draw_translucent(render_context* rctx, draw_object* draw) { if (sub_mesh->index_format != OBJ_INDEX_U8) obj_sub_mesh_draw(rctx, sub_mesh->primitive_type, - sub_mesh->indices_count, + sub_mesh->num_index, sub_mesh->first_index, sub_mesh->last_index, sub_mesh->index_format, - sub_mesh->indices_offset); + sub_mesh->index_offset); if (tex_id != -1) gl_state_active_bind_texture_2d(tex_index, 0); @@ -362,11 +368,11 @@ void obj_sub_mesh_draw(render_context* rctx, obj_primitive_type primitive_type, }; if (primitive_type == OBJ_PRIMITIVE_TRIANGLE_STRIP && index_format == OBJ_INDEX_U16) { - gl_state_enable_primitive_restart(); - glPrimitiveRestartIndex(0xFFFF); + shaders_ft.enable_primitive_restart(); + shaders_ft.set_primitive_restart_index(0xFFFF); shaders_ft.draw_range_elements(GL_TRIANGLE_STRIP, start, end, count, GL_UNSIGNED_SHORT, (void*)indices); - gl_state_disable_primitive_restart(); + shaders_ft.disable_primitive_restart(); } else shaders_ft.draw_elements(mesh_draw_mode[primitive_type], @@ -543,28 +549,32 @@ static void draw_object_material_set_default(render_context* rctx, draw_object* continue; } - if (tex_type == OBJ_MATERIAL_TEXTURE_ENVIRONMENT_CUBE) + if (tex_type == OBJ_MATERIAL_TEXTURE_ENVIRONMENT_CUBE) { gl_state_active_bind_texture_cube_map(tex_index, tex_id); + gl_state_bind_sampler(tex_index, 0); + } else { gl_state_active_bind_texture_2d(tex_index, tex_id); - GLenum wrap_s; + int32_t wrap_s; if (texdata->attrib.m.mirror_u) - wrap_s = GL_MIRRORED_REPEAT; + wrap_s = 2; else if (texdata->attrib.m.repeat_u) - wrap_s = GL_REPEAT; + wrap_s = 1; else - wrap_s = GL_CLAMP_TO_EDGE; + wrap_s = 0; - GLenum wrap_t; + int32_t wrap_t; if (texdata->attrib.m.mirror_v) - wrap_t = GL_MIRRORED_REPEAT; + wrap_t = 2; else if (texdata->attrib.m.repeat_v) - wrap_t = GL_REPEAT; + wrap_t = 1; else - wrap_t = GL_CLAMP_TO_EDGE; + wrap_t = 0; - texture_storage_set_texture_wrap(tex_id, wrap_s, wrap_t); + texture* tex = texture_storage_get_texture(::texture_id(0, texture_id)); + gl_state_bind_sampler(tex_index, rctx->draw_pass.samplers[(wrap_t * 3 + + wrap_s) * 2 + (tex->max_mipmap_level > 0 ? 1 : 0)]); } if (material->material.shader.index == SHADER_FT_SKY) { @@ -764,23 +774,25 @@ static void draw_object_material_set_reflect(render_context* rctx, draw_object* gl_state_active_bind_texture_2d(i, tex_id); - GLenum wrap_s; + int32_t wrap_s; if (texdata->attrib.m.mirror_u) - wrap_s = GL_MIRRORED_REPEAT; + wrap_s = 2; else if (texdata->attrib.m.repeat_u) - wrap_s = GL_REPEAT; + wrap_s = 1; else - wrap_s = GL_CLAMP_TO_EDGE; + wrap_s = 0; - GLenum wrap_t; + int32_t wrap_t; if (texdata->attrib.m.mirror_v) - wrap_t = GL_MIRRORED_REPEAT; + wrap_t = 2; else if (texdata->attrib.m.repeat_v) - wrap_t = GL_REPEAT; + wrap_t = 1; else - wrap_t = GL_CLAMP_TO_EDGE; + wrap_t = 0; - texture_storage_set_texture_wrap(tex_id, wrap_s, wrap_t); + texture* tex = texture_storage_get_texture(::texture_id(0, texture_id)); + gl_state_bind_sampler(i, rctx->draw_pass.samplers[(wrap_t * 3 + + wrap_s) * 2 + (tex->max_mipmap_level > 0 ? 1 : 0)]); } vec4 ambient; @@ -788,9 +800,9 @@ static void draw_object_material_set_reflect(render_context* rctx, draw_object* vec4 emission; vec4 specular; if (material->material.shader.index == -1) { - ambient = vec4_identity; + ambient = 1.0f; diffuse = material->material.color.diffuse; - emission = vec4_identity; + emission = 1.0f; specular = material->material.color.specular; } else { diff --git a/src/CRE/draw_pass.cpp b/src/CRE/draw_pass.cpp index 4cbba764..719c9247 100644 --- a/src/CRE/draw_pass.cpp +++ b/src/CRE/draw_pass.cpp @@ -15,14 +15,9 @@ #include "shader_ft.hpp" #include "shader_glsl.hpp" #include "static_var.hpp" +#include "task_effect.hpp" #include "texture.hpp" -struct draw_preprocess { - int32_t field_0; - void(*draw_func)(void*); - void* data; -}; - struct texture_param { GLint width; GLint height; @@ -39,8 +34,11 @@ static void draw_pass_sss_contour(render_context* rctx, post_process* pp); static void draw_pass_sss_filter(render_context* rctx, sss_data* a1); static void draw_pass_reflect(render_context* rctx, draw_pass* a1); static void draw_pass_refract(render_context* rctx, draw_pass* a1); -static void draw_pass_pre_process(render_context* rctx, draw_pass* a1); +static void draw_pass_preprocess(render_context* rctx, draw_pass* a1); +static void draw_pass_clear(render_context* rctx, draw_pass* a1); +static void draw_pass_pre_sprite(render_context* rctx, draw_pass* a1); static void draw_pass_3d(render_context* rctx, draw_pass* a1); +static void draw_pass_3d_contour(render_context* rctx, draw_pass* a1); static int32_t draw_pass_3d_get_translucent_count(render_context* rctx); static void draw_pass_3d_shadow_reset(render_context* rctx); static void draw_pass_3d_shadow_set(shadow* shad, render_context* rctx); @@ -57,7 +55,7 @@ static void texture_params_restore(texture_param* tex_0_param, extern bool draw_grid_3d; extern shader_glsl* grid_shader; -extern GLuint grid_vbo; +extern GLuint grid_vao; extern size_t grid_vertex_count; extern light_param_data_storage* light_param_data_storage_data; @@ -105,24 +103,13 @@ void draw_pass_main(render_context* rctx) { draw_pass_refract(rctx, &rctx->draw_pass); break; case DRAW_PASS_PRE_PROCESS: - draw_pass_pre_process(rctx, &rctx->draw_pass); + draw_pass_preprocess(rctx, &rctx->draw_pass); + break; + case DRAW_PASS_CLEAR: + draw_pass_clear(rctx, &rctx->draw_pass); break; - case DRAW_PASS_CLEAR: { - rctx->post_process.rend_texture.bind(); - if (set_clear_color) { - vec4 _clear_color; - vec4u8_to_vec4(clear_color, _clear_color); - _clear_color *= (float_t)(1.0 / 255.0); - glClearBufferfv(GL_COLOR, 0, (GLfloat*)&_clear_color); - } - else { - vec4 _clear_color = {}; - glClearBufferfv(GL_COLOR, 0, (GLfloat*)&_clear_color); - } - //sub_140501470(rctx, &rctx->draw_pass); - } break; case DRAW_PASS_PRE_SPRITE: - //sub_140501600(rctx, &rctx->draw_pass); + draw_pass_pre_sprite(rctx, &rctx->draw_pass); break; case DRAW_PASS_3D: draw_pass_3d(rctx, &rctx->draw_pass); @@ -142,6 +129,7 @@ void draw_pass_main(render_context* rctx) { } rctx->object_data.check_vertex_arrays(); gl_state_bind_vertex_array(0); + gl_state_disable_primitive_restart(); } inline static void draw_pass_begin(draw_pass* a1) { @@ -154,9 +142,9 @@ static void draw_pass_shadow(render_context* rctx, draw_pass* a1) { rctx->camera->update_data(); rctx->view_mat = rctx->camera->view; if (rctx->litproj->set(rctx)) { - draw_task_draw_objects_by_type(rctx, DRAW_OBJECT_OPAQUE, 0, 0, true, -1); - draw_task_draw_objects_by_type(rctx, DRAW_OBJECT_TRANSPARENT, 0, 0, true, -1); - draw_task_draw_objects_by_type(rctx, DRAW_OBJECT_TRANSLUCENT, 0, 0, true, -1); + draw_task_draw_objects_by_type(rctx, DRAW_OBJECT_OPAQUE); + draw_task_draw_objects_by_type(rctx, DRAW_OBJECT_TRANSPARENT); + draw_task_draw_objects_by_type(rctx, DRAW_OBJECT_TRANSLUCENT); rctx->draw_state.shader_index = -1; uniform_value[U0A] = 0; @@ -167,12 +155,12 @@ static void draw_pass_shadow(render_context* rctx, draw_pass* a1) { draw_pass_set_camera(rctx->camera); for (int32_t i = LIGHT_SET_MAIN; i < LIGHT_SET_MAX; i++) rctx->light_set[i].data_set(rctx->face, (light_set_id)i); - draw_task_draw_objects_by_type(rctx, DRAW_OBJECT_OPAQUE, 0, 0, true, -1); - draw_task_draw_objects_by_type(rctx, DRAW_OBJECT_TRANSPARENT, 0, 0, true, -1); + draw_task_draw_objects_by_type(rctx, DRAW_OBJECT_OPAQUE); + draw_task_draw_objects_by_type(rctx, DRAW_OBJECT_TRANSPARENT); draw_task_sort(rctx, DRAW_OBJECT_TRANSLUCENT, 1); gl_state_set_blend_func(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); gl_state_enable_blend(); - draw_task_draw_objects_by_type(rctx, DRAW_OBJECT_TRANSLUCENT, 0, 0, true, -1); + draw_task_draw_objects_by_type(rctx, DRAW_OBJECT_TRANSLUCENT); gl_state_disable_blend(); rctx->draw_state.shader_index = -1; gl_state_bind_framebuffer(0); @@ -247,10 +235,10 @@ static void draw_pass_shadow(render_context* rctx, draw_pass* a1) { rctx->draw_state.shader_index = SHADER_FT_SIL; uniform_value[U0A] = 0; - draw_task_draw_objects_by_type(rctx, (draw_object_type)(DRAW_OBJECT_SHADOW_CHARA + v11[i]), 0, 0, 1, -1); + draw_task_draw_objects_by_type(rctx, (draw_object_type)(DRAW_OBJECT_SHADOW_CHARA + v11[i])); if (draw_task_get_count(rctx, (draw_object_type)(DRAW_OBJECT_SHADOW_OBJECT_CHARA + v11[i])) > 0) { glColorMask(a1->field_2F8 != 0 ? GL_TRUE : GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE); - draw_task_draw_objects_by_type(rctx, (draw_object_type)v8, 0, 0, true, -1); + draw_task_draw_objects_by_type(rctx, (draw_object_type)v8); glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); } gl_state_disable_depth_test(); @@ -268,8 +256,9 @@ static void draw_pass_shadow(render_context* rctx, draw_pass* a1) { texture_param tex_params[3]; texture_params_get(v5, &tex_params[0], v7, &tex_params[1], v6, &tex_params[2]); shad->field_8[6].bind(); - uniform_value[U_ESM_FILTER] = 0; - shaders_ft.set(SHADER_FT_ESMFILT); + //uniform_value[U_ESM_FILTER] = 0; + //shaders_ft.set(SHADER_FT_ESMFILT); + shaders_ft.set(SHADER_FT_ESMFILT_MIN); shaders_ft.local_frag_set(0, 1.0f / (float_t)tex_params[1].width, 1.0f / (float_t)tex_params[1].height, 0.0f, 0.0f); gl_state_active_bind_texture_2d(0, v7); @@ -277,8 +266,9 @@ static void draw_pass_shadow(render_context* rctx, draw_pass* a1) { render_texture::draw_custom(&shaders_ft); shad->field_8[5].bind(); - uniform_value[U_ESM_FILTER] = 1; - shaders_ft.set(SHADER_FT_ESMFILT); + //uniform_value[U_ESM_FILTER] = 1; + //shaders_ft.set(SHADER_FT_ESMFILT); + shaders_ft.set(SHADER_FT_ESMFILT_EROSION); shaders_ft.local_frag_set(0, 0.75f / (float_t)tex_params[2].width, 0.75f / (float_t)tex_params[2].height, 0.0f, 0.0f); gl_state_active_bind_texture_2d(0, v6); @@ -298,7 +288,7 @@ static void draw_pass_shadow(render_context* rctx, draw_pass* a1) { texture_params_get(v11, &tex_params[0], v12, &tex_params[1], 0, 0); uniform_value[U_IMAGE_FILTER] = 5; shaders_ft.set(SHADER_FT_IMGFILT); - shaders_ft.local_frag_set(0, vec4_identity); + shaders_ft.local_frag_set(0, 1.0f); shaders_ft.state_matrix_set_texture(0, mat4_identity); shaders_ft.state_matrix_set_texture(1, mat4_identity); shaders_ft.state_matrix_set_texture(2, mat4_identity); @@ -422,13 +412,14 @@ static bool draw_pass_shadow_litproj(render_context* rctx, light_proj* litproj) return false; } + static const vec4 border_color = 0.0f; rctx->draw_state.shader_index = SHADER_FT_LITPROJ; gl_state_active_bind_texture_2d(17, tex->tex); - glTexParameterfv(GL_TEXTURE_2D, GL_TEXTURE_BORDER_COLOR, (GLfloat*)&vec4_null); + glTexParameterfv(GL_TEXTURE_2D, GL_TEXTURE_BORDER_COLOR, (GLfloat*)&border_color); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER); gl_state_active_bind_texture_2d(18, litproj->shadow_texture[0].color_texture->tex); - glTexParameterfv(GL_TEXTURE_2D, GL_TEXTURE_BORDER_COLOR, (GLfloat*)&vec4_null); + glTexParameterfv(GL_TEXTURE_2D, GL_TEXTURE_BORDER_COLOR, (GLfloat*)&border_color); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER); gl_state_active_texture(0); @@ -476,7 +467,7 @@ static void draw_pass_sss(render_context* rctx, draw_pass* a1) { gl_state_enable_depth_test(); gl_state_set_depth_func(GL_LEQUAL); gl_state_set_depth_mask(GL_TRUE); - draw_task_draw_objects_by_type(rctx, DRAW_OBJECT_SSS, 0, 0, 1, -1); + draw_task_draw_objects_by_type(rctx, DRAW_OBJECT_SSS); gl_state_disable_depth_test(); rctx->draw_state.shader_index = -1; draw_pass_3d_shadow_reset(rctx); @@ -494,7 +485,7 @@ static void draw_pass_sss(render_context* rctx, draw_pass* a1) { rctx->draw_state.shader_index = SHADER_FT_SSS_SKIN; gl_state_enable_depth_test(); gl_state_set_depth_mask(GL_TRUE); - draw_task_draw_objects_by_type(rctx, DRAW_OBJECT_SSS, 1, 0, 1, -1); + draw_task_draw_objects_by_type(rctx, DRAW_OBJECT_SSS, 1); gl_state_disable_depth_test(); rctx->draw_state.shader_index = -1; gl_state_bind_framebuffer(0); @@ -508,9 +499,9 @@ static void draw_pass_sss(render_context* rctx, draw_pass* a1) { static void draw_pass_sss_contour(render_context* rctx, post_process* pp) { pp->sss_contour_texture.bind(); - shaders_ft.state_matrix_set_modelview(0, mat4_identity, false); - shaders_ft.state_matrix_set_projection(mat4_identity, true); + shaders_ft.state_matrix_set_mvp(mat4_identity, mat4_identity); gl_state_enable_depth_test(); + gl_state_set_depth_func(GL_ALWAYS); gl_state_set_depth_mask(GL_TRUE); glViewport(0, 0, pp->render_width, pp->render_height); gl_state_active_bind_texture_2d(0, pp->rend_texture.color_texture->tex); @@ -532,7 +523,7 @@ static void draw_pass_sss_contour(render_context* rctx, post_process* pp) { vec3 direction = cam->interest - cam->view_point; float_t length = vec3::length(direction); float_t v7 = direction.y; - if (length != 0.0) + if (length != 0.0f) v7 /= length; float_t v9 = fabsf(v7) - 0.1f; @@ -548,8 +539,7 @@ static void draw_pass_sss_filter_calc_coef(double_t a1, size_t a2, double_t a3, if (a2 > 8) return; - vec4 params[64]; - memset(params, 0, sizeof(vec4) * 64); + vec4 params[64] = {}; for (size_t i = a4; i; i--) { float_t* v20 = (float_t*)params; @@ -599,8 +589,8 @@ static void draw_pass_sss_filter(render_context* rctx, sss_data* a1) { vec3 view_point = rctx->camera->view_point; vec3 chara_position[2]; - chara_position[0] = vec3_null; - chara_position[1] = vec3_null; + chara_position[0] = 0.0f; + chara_position[1] = 0.0f; float_t chara_distance[2]; for (int32_t i = 0; i < 2; i++) { chara_position[i] = interest; @@ -645,12 +635,11 @@ static void draw_pass_sss_filter(render_context* rctx, sss_data* a1) { shaders_ft.env_frag_set(25, v33, 0.0f, 0.0f, 0.0f); - shaders_ft.state_matrix_set_projection(mat4_identity, false); - shaders_ft.state_matrix_set_modelview(0, mat4_identity, true); + shaders_ft.state_matrix_set_mvp(mat4_identity, mat4_identity); gl_state_active_texture(0); if (a1->npr_contour) { - a1->textures->bind(); + a1->textures[0].bind(); glViewport(0, 0, 640, 360); post_process* pp = &rctx->post_process; gl_state_bind_texture_2d(pp->rend_texture.color_texture->tex); @@ -663,12 +652,14 @@ static void draw_pass_sss_filter(render_context* rctx, sss_data* a1) { a1->textures[2].bind(); glViewport(0, 0, 320, 180); gl_state_bind_texture_2d(a1->textures[0].color_texture->tex); - uniform_value[U_SSS_FILTER] = 0; - shaders_ft.set(SHADER_FT_SSS_FILT); + //uniform_value[U_SSS_FILTER] = 0; + //shaders_ft.set(SHADER_FT_SSS_FILT); + shaders_ft.set(SHADER_FT_SSS_FILT_MIN); render_texture::draw_params(&shaders_ft, 640, 360, 1.0f, 1.0f, 1.0f, 1.0f, 0.0f); a1->textures[1].bind(); - uniform_value[U_SSS_FILTER] = 3; - shaders_ft.set(SHADER_FT_SSS_FILT); + //uniform_value[U_SSS_FILTER] = 3; + //shaders_ft.set(SHADER_FT_SSS_FILT); + shaders_ft.set(SHADER_FT_SSS_FILT_GAUSS_2D); shaders_ft.local_frag_set(1, 5.0f, 0.0f, 0.0f, 0.0f); double_t a5[3]; @@ -697,7 +688,7 @@ static void draw_pass_sss_filter(render_context* rctx, sss_data* a1) { } static void draw_pass_reflect(render_context* rctx, draw_pass* a1) { - render_texture& reflect_texture = rctx->draw_pass.reflect_texture; + render_texture& reflect_texture = rctx->draw_pass.get_render_texture(0); reflect_texture.bind(); if (draw_task_get_count(rctx, DRAW_OBJECT_REFLECT_OPAQUE) || draw_task_get_count(rctx, DRAW_OBJECT_REFLECT_TRANSPARENT) @@ -729,19 +720,19 @@ static void draw_pass_reflect(render_context* rctx, draw_pass* a1) { gl_state_enable_depth_test(); gl_state_set_depth_func(GL_LEQUAL); gl_state_set_depth_mask(GL_TRUE); - draw_task_draw_objects_by_type(rctx, DRAW_OBJECT_REFLECT_OPAQUE, 0, 0, a1->field_31D, -1); + draw_task_draw_objects_by_type(rctx, DRAW_OBJECT_REFLECT_OPAQUE, 0, 0, a1->field_31D); if (a1->reflect_type == STAGE_DATA_REFLECT_REFLECT_MAP) { gl_state_enable_blend(); gl_state_set_blend_func(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); gl_state_set_blend_equation(GL_FUNC_ADD); - draw_task_draw_objects_by_type(rctx, DRAW_OBJECT_REFLECT_TRANSLUCENT, 0, 0, 1, -1); + draw_task_draw_objects_by_type(rctx, DRAW_OBJECT_REFLECT_TRANSLUCENT); gl_state_disable_blend(); } if (a1->reflect_type == STAGE_DATA_REFLECT_REFLECT_MAP) { uniform_value[U_REFLECT] = a1->field_31E; uniform_value[U_CLIP_PLANE] = clip_plane.data[0]; - draw_task_draw_objects_by_type(rctx, DRAW_OBJECT_REFLECT_CHARA_OPAQUE, 0, 0, 1, -1); + draw_task_draw_objects_by_type(rctx, DRAW_OBJECT_REFLECT_CHARA_OPAQUE); } gl_state_disable_depth_test(); uniform_value[U_REFLECT] = 0; @@ -762,7 +753,7 @@ static void draw_pass_reflect(render_context* rctx, draw_pass* a1) { } static void draw_pass_refract(render_context* rctx, draw_pass* a1) { - render_texture& refract_texture = rctx->draw_pass.refract_texture; + render_texture& refract_texture = rctx->draw_pass.get_render_texture(1); refract_texture.bind(); if (draw_task_get_count(rctx, DRAW_OBJECT_REFRACT_OPAQUE) || draw_task_get_count(rctx, DRAW_OBJECT_REFRACT_TRANSPARENT) @@ -787,30 +778,111 @@ static void draw_pass_refract(render_context* rctx, draw_pass* a1) { gl_state_enable_depth_test(); gl_state_set_depth_func(GL_LEQUAL); gl_state_set_depth_mask(GL_TRUE); - draw_task_draw_objects_by_type(rctx, DRAW_OBJECT_REFRACT_OPAQUE, 0, 0, 1, -1); - draw_task_draw_objects_by_type(rctx, DRAW_OBJECT_REFRACT_TRANSPARENT, 0, 0, 1, -1); - draw_task_draw_objects_by_type(rctx, DRAW_OBJECT_REFRACT_TRANSLUCENT, 0, 0, 1, -1); + draw_task_draw_objects_by_type(rctx, DRAW_OBJECT_REFRACT_OPAQUE); + draw_task_draw_objects_by_type(rctx, DRAW_OBJECT_REFRACT_TRANSPARENT); + draw_task_draw_objects_by_type(rctx, DRAW_OBJECT_REFRACT_TRANSLUCENT); gl_state_disable_depth_test(); rctx->draw_state.shader_index = -1; } else { vec4 clear_color; glGetFloatv(GL_COLOR_CLEAR_VALUE, (GLfloat*)&clear_color); - glClearColor(0.0, 0.0, 0.0, 0.0); + glClearColor(0.0f, 0.0f, 0.0f, 0.0f); glClear(GL_COLOR_BUFFER_BIT); glClearColor(clear_color.x, clear_color.y, clear_color.z, clear_color.w); } } -static void draw_pass_pre_process(render_context* rctx, draw_pass* a1) { +static void draw_pass_preprocess(render_context* rctx, draw_pass* a1) { + for (draw_preprocess& i : a1->preprocess) + if (i.func) + i.func(i.data); +} +void sub_1404A9350(post_process* a1, bool a2) { + if (a2) { + a1->aet_back_texture.bind(); + a1->aet_back = 1; + } + else + a1->rend_texture.bind(); + glViewport(0, 0, a1->render_width, a1->render_height); +} + +static void draw_pass_clear(render_context* rctx, draw_pass* a1) { + if (true/*a1->field_128*/) { + vec4 clear_color = get_clear_color(); + glClearBufferfv(GL_COLOR, 0, (GLfloat*)&clear_color); + glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); + } + + post_process* pp = &rctx->post_process; + if (!a1->sss_data.enable || !a1->sss_data.npr_contour) { + pp->set_render_texture(); + + if (false/*sub_14063FA90(2)*/) { + glClearColor(0.0f, 0.0f, 0.0f, 0.0f); + glClearDepth(1.0f); + glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); + } + else { + vec4 clear_color = get_clear_color(); + glClearColor(clear_color.x, clear_color.y, clear_color.z, clear_color.w); + glClearDepth(1.0f); + if (true/*a1->field_128*/) + glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); + else + glClear(GL_DEPTH_BUFFER_BIT); + } + gl_state_bind_framebuffer(0); + } + else { + if (false/*sub_14063FA90(2)*/) { + pp->set_render_texture(); + + vec4 clear_color = 0.0f; + glClearColor(0.0f, 0.0f, 0.0f, 0.0f); + glClear(GL_COLOR_BUFFER_BIT); + gl_state_bind_framebuffer(0); + } + else if (false/*a1->field_128*/) { + pp->set_render_texture(); + + vec4 clear_color = get_clear_color(); + glClearColor(clear_color.x, clear_color.y, clear_color.z, clear_color.w); + glClear(GL_COLOR_BUFFER_BIT); + gl_state_bind_framebuffer(0); + } + } + glGetError(); +} + +static void draw_pass_pre_sprite(render_context* rctx, draw_pass* a1) { + if (!(false/*sub_14063FA90(2)*/)) + return; + + post_process* pp = &rctx->post_process; + pp->set_render_texture(true); + glClearColor(0.0f, 0.0f, 0.0f, 0.0f); + glClear(GL_COLOR_BUFFER_BIT); + shaders_ft.state_matrix_set_mvp(mat4_identity, rctx->camera->projection_aet_3d); + gl_state_set_depth_mask(GL_FALSE); + gl_state_disable_depth_test(); + gl_state_enable_blend(); + gl_state_disable_cull_face(); + //sub_14063F870(2, 1, pp->aa->mlaa_buffer[1].color_texture->tex); + gl_state_enable_cull_face(); + gl_state_disable_blend(); + gl_state_enable_depth_test(); + gl_state_set_depth_mask(GL_TRUE); + gl_state_bind_framebuffer(0); + glGetError(); } static void draw_pass_3d(render_context* rctx, draw_pass* a1) { rctx->camera->update_data(); rctx->view_mat = rctx->camera->view; - rctx->post_process.rend_texture.bind(); - glViewport(0, 0, rctx->post_process.render_width, rctx->post_process.render_height); + rctx->post_process.set_render_texture(); draw_pass_set_camera(rctx->camera); if (!a1->sss_data.enable || !a1->sss_data.npr_contour || draw_pass_3d_get_translucent_count(rctx)) glClear(GL_DEPTH_BUFFER_BIT); @@ -827,15 +899,18 @@ static void draw_pass_3d(render_context* rctx, draw_pass* a1) { else draw_pass_3d_shadow_reset(rctx); - if (a1->enable[DRAW_PASS_REFLECT] && a1->reflect && a1->reflect_texture.color_texture) { - gl_state_active_bind_texture_2d(15, a1->reflect_texture.color_texture->tex); + if (a1->enable[DRAW_PASS_REFLECT] && a1->reflect) { + render_texture& reflect_texture = a1->get_render_texture(0); + gl_state_active_bind_texture_2d(15, reflect_texture.color_texture->tex); uniform_value[U_WATER_REFLECT] = 1; } else uniform_value[U_WATER_REFLECT] = 0; - if (a1->sss_texture) - gl_state_active_bind_texture_2d(14, a1->sss_texture->tex); + uniform_value[U12] = a1->field_320 ? 1 : 0; + + if (a1->effect_texture) + gl_state_active_bind_texture_2d(14, a1->effect_texture->tex); gl_state_active_bind_texture_2d(16, a1->sss_data.textures[1].color_texture->tex); gl_state_active_texture(0); @@ -854,7 +929,7 @@ static void draw_pass_3d(render_context* rctx, draw_pass* a1) { if (a1->draw_pass_3d[DRAW_PASS_3D_OPAQUE]) { gl_state_enable_depth_test(); gl_state_set_depth_mask(GL_TRUE); - draw_task_draw_objects_by_type(rctx, DRAW_OBJECT_OPAQUE, 0, 0, 1, -1); + draw_task_draw_objects_by_type(rctx, DRAW_OBJECT_OPAQUE); gl_state_disable_depth_test(); } @@ -866,14 +941,17 @@ static void draw_pass_3d(render_context* rctx, draw_pass* a1) { gl_state_enable_depth_test(); gl_state_set_depth_mask(GL_TRUE); if (a1->draw_pass_3d[DRAW_PASS_3D_TRANSPARENT]) - draw_task_draw_objects_by_type(rctx, DRAW_OBJECT_TRANSPARENT, 0, 0, 1, -1); + draw_task_draw_objects_by_type(rctx, DRAW_OBJECT_TRANSPARENT); /*if (rctx->draw_pass.field_120) - draw_task_draw_objects_by_type(rctx, DRAW_OBJECT_TYPE_7, 0, 0, 1, -1);*/ + draw_task_draw_objects_by_type(rctx, DRAW_OBJECT_TYPE_7);*/ rctx->post_process.exposure->get_exposure_chara_data(&rctx->post_process, rctx->camera); - //post_process_draw_lens_flare(a1->post_process); - //draw_stars(&stars); + if (a1->npr_param == 1) + draw_pass_3d_contour(rctx, a1); + + //post_process_draw_lens_flare(pp); + //star_catalog_data.draw(); draw_task_draw_objects_by_type_translucent(rctx, a1->draw_pass_3d[DRAW_PASS_3D_OPAQUE], @@ -883,22 +961,22 @@ static void draw_pass_3d(render_context* rctx, draw_pass* a1) { DRAW_OBJECT_TRANSPARENT_ALPHA_ORDER_3, DRAW_OBJECT_TRANSLUCENT_ALPHA_ORDER_3); - //draw_snow_particle(); - //draw_rain(); - //draw_leaf_particle(); - //draw_particle(); + snow_particle_draw(); + rain_particle_draw(); + leaf_particle_draw(); + particle_draw(); gl_state_disable_depth_test(); gl_state_set_color_mask(GL_TRUE, GL_TRUE, GL_TRUE, GL_FALSE); Glitter::glt_particle_manager->DispScenes(Glitter::DISP_ALPHA); gl_state_set_color_mask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); - if (a1->npr_param == 1) { + /*if (a1->npr_param == 1) { gl_state_set_color_mask(GL_FALSE, GL_FALSE, GL_FALSE, GL_TRUE); glClearColor(0.0f, 0.0f, 0.0f, 0.0f); glClear(GL_COLOR_BUFFER_BIT); gl_state_set_color_mask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); - } + }*/ gl_state_enable_depth_test(); @@ -906,8 +984,8 @@ static void draw_pass_3d(render_context* rctx, draw_pass* a1) { gl_state_enable_blend(); gl_state_set_blend_func(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); gl_state_set_depth_mask(GL_FALSE); - draw_task_draw_objects_by_type(rctx, DRAW_OBJECT_TRANSLUCENT_NO_SHADOW, 0, 0, 1, -1); - draw_task_draw_objects_by_type(rctx, DRAW_OBJECT_TRANSLUCENT, 0, 0, 1, -1); + draw_task_draw_objects_by_type(rctx, DRAW_OBJECT_TRANSLUCENT_NO_SHADOW); + draw_task_draw_objects_by_type(rctx, DRAW_OBJECT_TRANSLUCENT); gl_state_disable_blend(); } @@ -945,10 +1023,10 @@ static void draw_pass_3d(render_context* rctx, draw_pass* a1) { cam->set_fov(32.2673416137695); draw_pass_set_camera(cam); - draw_task_draw_objects_by_type(rctx, DRAW_OBJECT_OPAQUE_LOCAL, 0, 0, 1, -1); - draw_task_draw_objects_by_type(rctx, DRAW_OBJECT_TRANSPARENT_LOCAL, 0, 0, 1, -1); + draw_task_draw_objects_by_type(rctx, DRAW_OBJECT_OPAQUE_LOCAL); + draw_task_draw_objects_by_type(rctx, DRAW_OBJECT_TRANSPARENT_LOCAL); gl_state_enable_blend(); - draw_task_draw_objects_by_type(rctx, DRAW_OBJECT_TRANSLUCENT_LOCAL, 0, 0, 1, -1); + draw_task_draw_objects_by_type(rctx, DRAW_OBJECT_TRANSLUCENT_LOCAL); gl_state_disable_blend(); draw_task_draw_objects_by_type_translucent(rctx, @@ -966,7 +1044,7 @@ static void draw_pass_3d(render_context* rctx, draw_pass* a1) { draw_pass_set_camera(cam); } - if (a1->sss_texture) + if (a1->effect_texture) gl_state_active_bind_texture_2d(14, 0); gl_state_disable_depth_test(); @@ -978,6 +1056,36 @@ static void draw_pass_3d(render_context* rctx, draw_pass* a1) { shader::unbind(); } +static void draw_pass_3d_contour(render_context* rctx, draw_pass* a1) { + render_texture* rt = &rctx->post_process.rend_texture; + render_texture* contour_rt = &rctx->post_process.sss_contour_texture; + + gl_state_enable_blend(); + gl_state_set_blend_func(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + gl_state_set_blend_equation(GL_FUNC_ADD); + gl_state_disable_depth_test(); + + shaders_ft.set(SHADER_FT_CONTOUR_NPR); + shaders_ft.state_matrix_set_mvp(mat4_identity, mat4_identity); + gl_state_active_bind_texture_2d(16, contour_rt->color_texture->tex); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); + gl_state_active_bind_texture_2d(17, contour_rt->depth_texture->tex); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); + gl_state_active_bind_texture_2d(14, rt->depth_texture->tex); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); + render_texture::draw_custom(&shaders_ft); + + draw_pass_set_camera(rctx->camera); + + if (a1->effect_texture) + gl_state_active_bind_texture_2d(14, a1->effect_texture->tex); + gl_state_enable_depth_test(); + gl_state_disable_blend(); +} + static int32_t draw_pass_3d_get_translucent_count(render_context* rctx) { int32_t count = 0; count += draw_task_get_count(rctx, DRAW_OBJECT_OPAQUE_ALPHA_ORDER_1); @@ -1023,9 +1131,7 @@ static void draw_pass_3d_shadow_set(shadow* shad, render_context* rctx) { vec3* interest; vec3* view_point; if (shad->field_2F5) { - v6 = -0.5f; - if (i) - v6 = 0.5f; + v6 = i ? 0.5f : -0.5f; interest = &shad->interest[i]; view_point = &shad->view_point[i]; @@ -1082,8 +1188,8 @@ static void draw_pass_3d_shadow_set(shadow* shad, render_context* rctx) { gl_state_active_bind_texture_2d(6 + i, shad->field_158[1 + i]->color_texture->tex); gl_state_active_texture(0); - shaders_ft.env_frag_set(12, vec4_identity); - shaders_ft.env_frag_set(13, vec4_null); + shaders_ft.env_frag_set(12, 1.0f); + shaders_ft.env_frag_set(13, 0.0f); } } @@ -1093,8 +1199,7 @@ static void draw_pass_show_vector(render_context* rctx, draw_pass* a1) { rctx->camera->update_data(); rctx->view_mat = rctx->camera->view; - rctx->post_process.rend_texture.bind(); - glViewport(0, 0, rctx->post_process.render_width, rctx->post_process.render_height); + rctx->post_process.set_render_texture(); draw_pass_set_camera(rctx->camera); shaders_ft.env_vert_set(20, a1->show_vector_length, a1->show_vector_z_offset, 0.0f, 0.0f); @@ -1103,12 +1208,12 @@ static void draw_pass_show_vector(render_context* rctx, draw_pass* a1) { continue; if (a1->draw_pass_3d[DRAW_PASS_3D_OPAQUE]) - draw_task_draw_objects_by_type(rctx, DRAW_OBJECT_OPAQUE, 0, i, 1, -1); + draw_task_draw_objects_by_type(rctx, DRAW_OBJECT_OPAQUE, 0, i, true); if (a1->draw_pass_3d[DRAW_PASS_3D_TRANSPARENT]) - draw_task_draw_objects_by_type(rctx, DRAW_OBJECT_TRANSPARENT, 0, i, 1, -1); + draw_task_draw_objects_by_type(rctx, DRAW_OBJECT_TRANSPARENT, 0, i, true); if (a1->draw_pass_3d[DRAW_PASS_3D_TRANSLUCENT]) { - draw_task_draw_objects_by_type(rctx, DRAW_OBJECT_TRANSLUCENT_NO_SHADOW, 0, i, 1, -1); - draw_task_draw_objects_by_type(rctx, DRAW_OBJECT_TRANSLUCENT, 0, i, 1, -1); + draw_task_draw_objects_by_type(rctx, DRAW_OBJECT_TRANSLUCENT_NO_SHADOW, 0, i, true); + draw_task_draw_objects_by_type(rctx, DRAW_OBJECT_TRANSLUCENT, 0, i, true); } } } @@ -1129,6 +1234,34 @@ static void draw_pass_post_process(render_context* rctx, draw_pass* a1) { } static void draw_pass_sprite(render_context* rctx, draw_pass* a1) { + post_process* pp = &rctx->post_process; + + if (a1->multisample && a1->multisample_framebuffer) { + glBindFramebuffer(GL_FRAMEBUFFER, a1->multisample_framebuffer); + gl_state_enable_multisample(); + glClearColor(0.0, 0.0, 0.0, 0.0); + glClear(GL_COLOR_BUFFER_BIT); + } + + shaders_ft.state_matrix_set_mvp(mat4_identity, rctx->camera->projection_aet_2d); + + gl_state_disable_depth_test(); + gl_state_enable_blend(); + gl_state_disable_cull_face(); + //sub_14063F870(0, 1, pp->aa->mlaa_buffer[1].color_texture->tex); + gl_state_enable_cull_face(); + gl_state_disable_blend(); + gl_state_enable_depth_test(); + + if (a1->multisample && a1->multisample_framebuffer) { + glBindFramebuffer(GL_FRAMEBUFFER, 0); + gl_state_disable_multisample(); + gl_state_bind_read_framebuffer(a1->multisample_framebuffer); + glBlitFramebuffer(0, 0, pp->sprite_width, pp->sprite_height, + 0, 0, pp->sprite_width, pp->sprite_height, GL_COLOR_BUFFER_BIT, GL_NEAREST); + gl_state_bind_read_framebuffer(0); + } + glGetError(); } inline static void draw_pass_end(draw_pass* pass, draw_pass_type type) { @@ -1153,17 +1286,8 @@ static void draw_pass_3d_grid(render_context* rctx) { grid_shader->use(); grid_shader->set("vp", false, rctx->camera->view_projection); - gl_state_bind_array_buffer(grid_vbo); - glEnableVertexAttribArray(0); - glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, - sizeof(float_t) * 3, (void*)0); // Pos - glEnableVertexAttribArray(1); - glVertexAttribIPointer(1, 1, GL_INT, - sizeof(float_t) * 3, (void*)(sizeof(float_t) * 2)); // Color - gl_state_bind_array_buffer(0); + gl_state_bind_vertex_array(grid_vao); glDrawArrays(GL_LINES, 0, (GLsizei)grid_vertex_count); - glDisableVertexAttribArray(0); - glDisableVertexAttribArray(1); gl_state_use_program(0); gl_state_disable_depth_test(); @@ -1173,13 +1297,14 @@ static void draw_pass_3d_grid(render_context* rctx) { static void draw_pass_set_camera(camera* cam) { cam->update_data(); - shaders_ft.state_matrix_set_modelview(0, cam->view, false); - shaders_ft.state_matrix_set_projection(cam->projection, true); + shaders_ft.state_matrix_set_mvp(cam->view, cam->projection); shaders_ft.state_matrix_set_program(5, cam->view); + double_t fov_horizontal_rad = tan(cam->fov_rad * 0.5); + shaders_ft.env_frag_set(20, - (float_t)(0.5 / (cam->fov_rad * cam->aspect)), - (float_t)(0.5 / cam->fov_rad), + (float_t)(0.5 / (fov_horizontal_rad * cam->aspect)), + (float_t)(0.5 / fov_horizontal_rad), 0.0f, 0.0f); shaders_ft.env_frag_set(32, (float_t)(cam->max_distance / (cam->max_distance - cam->min_distance)), @@ -1225,8 +1350,7 @@ static void texture_params_get(GLuint tex_0, texture_param* tex_0_param, mat4 mat; mat4_ortho(0.0f, (float_t)tex_0_param->width, 0.0f, (float_t)tex_0_param->height, -1.0f, 1.0f, &mat); - shaders_ft.state_matrix_set_projection(mat, false); - shaders_ft.state_matrix_set_modelview(0, mat4_identity, true); + shaders_ft.state_matrix_set_mvp(mat4_identity, mat); glViewport(0, 0, tex_0_param->width, tex_0_param->height); } } diff --git a/src/CRE/draw_task.cpp b/src/CRE/draw_task.cpp index b51fe128..79f53c2a 100644 --- a/src/CRE/draw_task.cpp +++ b/src/CRE/draw_task.cpp @@ -12,12 +12,14 @@ #include "shader_ft.hpp" static void draw_task_add(render_context* rctx, draw_object_type type, draw_task* task); -static void draw_task_object_init(draw_task* task, object_data* object_data, mat4* mat, +static void draw_task_preprocess_init(draw_task* task, const mat4* mat, + void(*func)(render_context* rctx, void* data), void* data); +static void draw_task_object_init(draw_task* task, object_data* object_data, const mat4* mat, float_t bounding_radius, obj_sub_mesh* sub_mesh, obj_mesh* mesh, obj_material_data* material, std::vector* textures, int32_t mat_count, mat4* mats, GLuint array_buffer, GLuint element_array_buffer, vec4* blend_color, vec4* emission, int32_t morph_array_buffer, int32_t instances_count, mat4* instances_mat, void(*draw_object_func)(draw_object*)); -static void draw_task_object_translucent_init(draw_task* task, mat4* mat, +static void draw_task_object_translucent_init(draw_task* task, const mat4* mat, draw_task_object_translucent* object); static int draw_task_sort_quicksort_compare0(void const* src1, void const* src2); static int draw_task_sort_quicksort_compare1(void const* src1, void const* src2); @@ -41,7 +43,7 @@ void draw_task_draw_objects_by_type(render_context* rctx, draw_object_type type, gl_state_active_bind_texture_2d(i, 0); gl_state_active_texture(0); gl_state_set_blend_func(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - glPrimitiveRestartIndex(0xFFFF); + gl_state_set_primitive_restart_index(0xFFFF); uniform_value_reset(); gl_state_get(); @@ -241,17 +243,17 @@ void draw_task_draw_objects_by_type_translucent(render_context* rctx, bool opaqu GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT, GL_NEAREST); if (opaque_enable && draw_task_get_count(rctx, opaque)) - draw_task_draw_objects_by_type(rctx, opaque, 0, 0, 1, alpha); + draw_task_draw_objects_by_type(rctx, opaque, 0, 0, true, alpha); if (transparent_enable && draw_task_get_count(rctx, transparent)) - draw_task_draw_objects_by_type(rctx, transparent, 0, 0, 1, alpha); + draw_task_draw_objects_by_type(rctx, transparent, 0, 0, true, alpha); if (translucent_enable && draw_task_get_count(rctx, translucent)) { gl_state_enable_blend(); - draw_task_draw_objects_by_type(rctx, translucent, 0, 0, 1, alpha); + draw_task_draw_objects_by_type(rctx, translucent, 0, 0, true, alpha); gl_state_disable_blend(); } pp->buf_texture.bind(); - render_texture::shader_set_glsl(&pp->alpha_layer_shader); + pp->alpha_layer_shader.use(); gl_state_active_bind_texture_2d(0, pp->alpha_layer_texture.color_texture->tex); gl_state_active_bind_texture_2d(1, pp->rend_texture.color_texture->tex); glUniform1f(0, (float_t)(alpha * (1.0 / 255.0))); @@ -269,7 +271,7 @@ inline int32_t draw_task_get_count(render_context* rctx, draw_object_type type) } bool draw_task_add_draw_object(render_context* rctx, obj* object, - obj_mesh_vertex_buffer* obj_vertex_buf, obj_mesh_index_buffer* obj_index_buf, mat4* mat, + obj_mesh_vertex_buffer* obj_vertex_buf, obj_mesh_index_buffer* obj_index_buf, const mat4* mat, std::vector* textures, vec4* blend_color, mat4* bone_mat, obj* object_morph, obj_mesh_vertex_buffer* obj_morph_vertex_buf, int32_t instances_count, mat4* instances_mat, void(*draw_object_func)(draw_object*), bool enable_bone_mat, bool local) { @@ -357,22 +359,22 @@ bool draw_task_add_draw_object(render_context* rctx, obj* object, } object_data->passed.submesh_array++; - int32_t bone_indices_count = sub_mesh->bone_indices_count; - uint16_t* bone_indices = sub_mesh->bone_indices; + int32_t num_bone_index = sub_mesh->num_bone_index; + uint16_t* bone_index = sub_mesh->bone_index_array; mat4* mats; - if (bone_indices_count && enable_bone_mat) { - mats = object_data->buffer.add_mat4(bone_indices_count); + if (num_bone_index && enable_bone_mat) { + mats = object_data->buffer.add_mat4(num_bone_index); if (bone_mat) - for (int32_t k = 0; k < bone_indices_count; k++) - mats[k] = bone_mat[*bone_indices++]; + for (int32_t k = 0; k < num_bone_index; k++, bone_index++) + mats[k] = bone_mat[*bone_index]; else - for (int32_t k = 0; k < bone_indices_count; k++) + for (int32_t k = 0; k < num_bone_index; k++) mats[k] = mat4_identity; } else { mats = 0; - bone_indices_count = 0; + num_bone_index = 0; } obj_material_data* material = &object->material_array[sub_mesh->material_index]; @@ -401,8 +403,8 @@ bool draw_task_add_draw_object(render_context* rctx, obj* object, break; } - vec4 _blend_color = vec4_identity; - vec4 _emission = vec4_null; + vec4 _blend_color = 1.0f; + vec4 _emission = 0.0f; if (mat_list) { bool has_blend_color = false; @@ -464,7 +466,7 @@ bool draw_task_add_draw_object(render_context* rctx, obj* object, } draw_task_object_init(task, object_data, mat, object->bounding_sphere.radius, sub_mesh, - mesh, material, textures, bone_indices_count, mats, array_buffer, element_array_buffer, + mesh, material, textures, num_bone_index, mats, array_buffer, element_array_buffer, &_blend_color, &_emission, morph_array_buffer, instances_count, instances_mat, draw_object_func); if (draw_task_flags & DRAW_TASK_SHADOW_OBJECT) { @@ -627,8 +629,9 @@ bool draw_task_add_draw_object(render_context* rctx, obj* object, return true; } -inline void draw_task_add_draw_object_by_obj(render_context* rctx, mat4* mat, obj* obj, std::vector* textures, - obj_mesh_vertex_buffer* obj_vert_buf, obj_mesh_index_buffer* obj_index_buf, mat4* bone_mat, float_t alpha) { +inline void draw_task_add_draw_object_by_obj(render_context* rctx, const mat4* mat, + obj* obj, std::vector* textures, obj_mesh_vertex_buffer* obj_vert_buf, + obj_mesh_index_buffer* obj_index_buf, mat4* bone_mat, float_t alpha) { if (!obj) return; @@ -639,14 +642,14 @@ inline void draw_task_add_draw_object_by_obj(render_context* rctx, mat4* mat, ob bone_mat, 0, 0, 0, 0, 0, !!bone_mat); } -inline bool draw_task_add_draw_object_by_object_info(render_context* rctx, mat4* mat, +inline bool draw_task_add_draw_object_by_object_info(render_context* rctx, const mat4* mat, object_info obj_info, mat4* bone_mat) { - vec4 blend_color = vec4_identity; + vec4 blend_color = 1.0f; return draw_task_add_draw_object_by_object_info(rctx, mat, obj_info, &blend_color, bone_mat, 0, 0, 0, true); } -bool draw_task_add_draw_object_by_object_info(render_context* rctx, mat4* mat, +bool draw_task_add_draw_object_by_object_info(render_context* rctx, const mat4* mat, object_info obj_info, vec4* blend_color, mat4* bone_mat, int32_t instances_count, mat4* instances_mat, void(*draw_object_func)(draw_object*), bool enable_bone_mat, bool local) { if (obj_info.id == -1 && obj_info.set_id == -1) @@ -673,22 +676,22 @@ bool draw_task_add_draw_object_by_object_info(render_context* rctx, mat4* mat, instances_count, instances_mat, draw_object_func, enable_bone_mat, local); } -inline bool draw_task_add_draw_object_by_object_info(render_context* rctx, mat4* mat, +inline bool draw_task_add_draw_object_by_object_info(render_context* rctx, const mat4* mat, object_info obj_info, float_t alpha, mat4* bone_mat) { - vec4 blend_color = vec4_identity; + vec4 blend_color = 1.0f; blend_color.w = alpha; return draw_task_add_draw_object_by_object_info(rctx, mat, obj_info, &blend_color, bone_mat, 0, 0, 0, true); } -inline bool draw_task_add_draw_object_by_object_info(render_context* rctx, mat4* mat, +inline bool draw_task_add_draw_object_by_object_info(render_context* rctx, const mat4* mat, object_info obj_info, float_t r, float_t g, float_t b, float_t a, mat4* bone_mat, bool local) { vec4 blend_color = { r, g, b, a }; return draw_task_add_draw_object_by_object_info(rctx, mat, obj_info, &blend_color, bone_mat, 0, 0, 0, true, local); } -inline bool draw_task_add_draw_object_by_object_info(render_context* rctx, mat4* mat, +inline bool draw_task_add_draw_object_by_object_info(render_context* rctx, const mat4* mat, object_info obj_info, vec4* blend_color, mat4* bone_mat, bool local) { return draw_task_add_draw_object_by_object_info(rctx, mat, obj_info, blend_color, 0, 0, 0, 0, false, local); @@ -696,7 +699,7 @@ inline bool draw_task_add_draw_object_by_object_info(render_context* rctx, mat4* void draw_task_add_draw_object_by_object_info_object_skin(render_context* rctx, object_info obj_info, std::vector* texture_pattern, texture_data_struct* texture_data, float_t alpha, - mat4* matrices, mat4* ex_data_matrices, mat4* mat, mat4* global_mat) { + mat4* matrices, mat4* ex_data_matrices, const mat4* mat, mat4* global_mat) { obj_skin* skin = object_storage_get_obj_skin(obj_info); if (!skin) return; @@ -753,6 +756,16 @@ void draw_task_add_draw_object_by_object_info_object_skin(render_context* rctx, } } +void draw_task_add_draw_preprocess(render_context* rctx, const mat4* mat, + void(*func)(render_context* rctx, void* data), void* data, draw_object_type type) { + object_data* object_data = &rctx->object_data; + draw_task* task = object_data->buffer.add_draw_task(DRAW_TASK_OBJECT_PREPROCESS); + if (task) { + draw_task_preprocess_init(task, mat, func, data); + draw_task_add(rctx, type, task); + } +} + void draw_task_sort(render_context* rctx, draw_object_type type, int32_t compare_func) { std::vector& vec = rctx->object_data.draw_task_array[type]; if (vec.size() < 1) @@ -771,16 +784,16 @@ void draw_task_sort(render_context* rctx, draw_object_type type, int32_t compare model_mat_face_camera_position(&rctx->camera->view, &mat, &mat); obj_sub_mesh* sub_mesh = task->data.object.sub_mesh; - if (task->data.object.mat_count < 1 || !sub_mesh->bone_indices_count) + if (task->data.object.mat_count < 1 || !sub_mesh->num_bone_index) mat4_mult_vec3_trans(&mat, &sub_mesh->bounding_sphere.center, ¢er); else { - vec3 center_sum = vec3_null; - for (uint32_t j = 0; j < sub_mesh->bone_indices_count; j++) { + vec3 center_sum = 0.0f; + for (uint32_t j = 0; j < sub_mesh->num_bone_index; j++) { center = sub_mesh->bounding_sphere.center; mat4_mult_vec3_trans(&task->data.object.mats[j], ¢er, ¢er); center_sum += center; } - center_sum *= 1.0f / (float_t)sub_mesh->bone_indices_count; + center_sum *= 1.0f / (float_t)sub_mesh->num_bone_index; } task->bounding_radius = task->data.object.mesh->bounding_sphere.radius; } @@ -806,7 +819,7 @@ void draw_task_sort(render_context* rctx, draw_object_type type, int32_t compare } int32_t obj_axis_aligned_bounding_box_check_visibility( - obj_axis_aligned_bounding_box* aabb, camera* cam, mat4* mat) { + obj_axis_aligned_bounding_box* aabb, camera* cam, const mat4* mat) { vec3 points[8]; points[0] = aabb->center + (aabb->size ^ vec3( 0.0f, 0.0f, 0.0f)); points[1] = aabb->center + (aabb->size ^ vec3(-0.0f, -0.0f, -0.0f)); @@ -849,7 +862,7 @@ int32_t obj_axis_aligned_bounding_box_check_visibility( } int32_t object_bounding_sphere_check_visibility(obj_bounding_sphere* sphere, - object_data* object_data, camera* cam, mat4* mat) { + object_data* object_data, camera* cam, const mat4* mat) { if (object_data->object_bounding_sphere_check_func) return object_data->object_bounding_sphere_check_func(sphere, cam); @@ -889,7 +902,15 @@ inline static void draw_task_add(render_context* rctx, draw_object_type type, dr rctx->object_data.draw_task_array[type].push_back(task); } -inline static void draw_task_object_init(draw_task* task, object_data* object_data, mat4* mat, +inline static void draw_task_preprocess_init(draw_task* task, const mat4* mat, + void(*func)(render_context* rctx, void* data), void* data) { + task->type = DRAW_TASK_OBJECT_PREPROCESS; + task->mat = *mat; + task->data.preprocess.func = func; + task->data.preprocess.data = data; +} + +inline static void draw_task_object_init(draw_task* task, object_data* object_data, const mat4* mat, float_t bounding_radius, obj_sub_mesh* sub_mesh, obj_mesh* mesh, obj_material_data* material, std::vector* textures, int32_t mat_count, mat4* mats, GLuint array_buffer, GLuint element_array_buffer, vec4* blend_color, vec4* emission, int32_t morph_array_buffer, @@ -917,13 +938,13 @@ inline static void draw_task_object_init(draw_task* task, object_data* object_da for (int32_t i = 0; i < object_data->texture_transform_count && i < TEXTURE_TRANSFORM_COUNT; i++) draw->texture_transform_array[i] = object_data->texture_transform_array[i]; - if (blend_color && memcmp(blend_color, &vec4_identity, sizeof(vec4))) { + if (blend_color && *blend_color != 1.0f) { draw->set_blend_color = true; draw->blend_color = *blend_color; } else { draw->set_blend_color = false; - draw->blend_color = vec4_identity; + draw->blend_color = 1.0f; } draw->emission = *emission; @@ -943,7 +964,7 @@ inline static void draw_task_object_init(draw_task* task, object_data* object_da object_data->add_vertex_array(&task->data.object); } -inline static void draw_task_object_translucent_init(draw_task* task, mat4* mat, +inline static void draw_task_object_translucent_init(draw_task* task, const mat4* mat, draw_task_object_translucent* object) { task->type = DRAW_TASK_OBJECT_TRANSLUCENT; task->mat = *mat; diff --git a/src/CRE/draw_task.hpp b/src/CRE/draw_task.hpp index 42e67c95..0559b328 100644 --- a/src/CRE/draw_task.hpp +++ b/src/CRE/draw_task.hpp @@ -12,34 +12,37 @@ #include "draw_primitive.hpp" extern void draw_task_draw_objects_by_type(render_context* rctx, draw_object_type type, - int32_t a2, int32_t a3, bool a4, int32_t alpha); + int32_t a2 = 0, int32_t a3 = 0, bool a4 = true, int32_t alpha = -1); extern void draw_task_draw_objects_by_type_translucent(render_context* rctx, bool opaque_enable, bool transparent_enable, bool translucent_enable, draw_object_type opaque, draw_object_type transparent, draw_object_type translucent); extern int32_t draw_task_get_count(render_context* rctx, draw_object_type type); extern bool draw_task_add_draw_object(render_context* rctx, obj* object, - obj_mesh_vertex_buffer* obj_vertex_buf, obj_mesh_index_buffer* obj_index_buf, mat4* mat, + obj_mesh_vertex_buffer* obj_vertex_buf, obj_mesh_index_buffer* obj_index_buf, const mat4* mat, std::vector* textures, vec4* blend_color, mat4* bone_mat, obj* object_morph, obj_mesh_vertex_buffer* obj_morph_vertex_buf, int32_t instances_count, mat4* instances_mat, void(*draw_object_func)(draw_object*), bool enable_bone_mat, bool local = false); -extern void draw_task_add_draw_object_by_obj(render_context* rctx, mat4* mat, obj* obj, std::vector* textures, - obj_mesh_vertex_buffer* obj_vert_buf, obj_mesh_index_buffer* obj_index_buf, mat4* bone_mat, float_t alpha); -extern bool draw_task_add_draw_object_by_object_info(render_context* rctx, mat4* mat, +extern void draw_task_add_draw_object_by_obj(render_context* rctx, const mat4* mat, + obj* obj, std::vector* textures, obj_mesh_vertex_buffer* obj_vert_buf, + obj_mesh_index_buffer* obj_index_buf, mat4* bone_mat, float_t alpha); +extern bool draw_task_add_draw_object_by_object_info(render_context* rctx, const mat4* mat, object_info obj_info, mat4* bone_mat = 0); -extern bool draw_task_add_draw_object_by_object_info(render_context* rctx, mat4* mat, +extern bool draw_task_add_draw_object_by_object_info(render_context* rctx, const mat4* mat, object_info obj_info, vec4* blend_color, mat4* bone_mat, int32_t instances_count, mat4* instances_mat, void(*draw_object_func)(draw_object*), bool enable_bone_mat, bool local = false); -extern bool draw_task_add_draw_object_by_object_info(render_context* rctx, mat4* mat, +extern bool draw_task_add_draw_object_by_object_info(render_context* rctx, const mat4* mat, object_info obj_info, float_t alpha, mat4* bone_mat = 0); -extern bool draw_task_add_draw_object_by_object_info(render_context* rctx, mat4* mat, +extern bool draw_task_add_draw_object_by_object_info(render_context* rctx, const mat4* mat, object_info obj_info, float_t r, float_t g, float_t b, float_t a, mat4* bone_mat = 0, bool local = false); -extern bool draw_task_add_draw_object_by_object_info(render_context* rctx, mat4* mat, +extern bool draw_task_add_draw_object_by_object_info(render_context* rctx, const mat4* mat, object_info obj_info, vec4* blend_color, mat4* bone_mat = 0, bool local = false); extern void draw_task_add_draw_object_by_object_info_object_skin(render_context* rctx, object_info obj_info, std::vector* texture_pattern, texture_data_struct* texture_data, float_t alpha, - mat4* matrices, mat4* ex_data_matrices, mat4* mat, mat4* global_mat); + mat4* matrices, mat4* ex_data_matrices, const mat4* mat, mat4* global_mat); +extern void draw_task_add_draw_preprocess(render_context* rctx, const mat4* mat, + void(*func)(render_context* rctx, void* data), void* data, draw_object_type type); extern void draw_task_sort(render_context* rctx, draw_object_type type, int32_t compare_func); extern int32_t obj_axis_aligned_bounding_box_check_visibility( - obj_axis_aligned_bounding_box* aabb, camera* cam, mat4* mat); + obj_axis_aligned_bounding_box* aabb, camera* cam, const mat4* mat); extern int32_t object_bounding_sphere_check_visibility(obj_bounding_sphere* sphere, - object_data* object_data, camera* cam, mat4* mat); + object_data* object_data, camera* cam, const mat4* mat); diff --git a/src/CRE/file_handler.cpp b/src/CRE/file_handler.cpp index b054a684..36a64120 100644 --- a/src/CRE/file_handler.cpp +++ b/src/CRE/file_handler.cpp @@ -16,7 +16,7 @@ struct farc_read_handler { farc* farc; farc_read_handler(); - virtual ~farc_read_handler(); + ~farc_read_handler(); size_t get_file_size(std::string& file); bool read(std::string& file_path, bool cache); @@ -41,7 +41,7 @@ struct file_handler_storage { int32_t field_74; file_handler_storage(); - virtual ~file_handler_storage(); + ~file_handler_storage(); }; file_handler_storage* file_handler_storage_data; @@ -203,17 +203,19 @@ void file_handler_storage_ctrl() { { std::unique_lock u_lock(file_handler_storage_data->mtx); - if (!file_handler_storage_data->deque.size()) { - for (file_handler*& i : file_handler_storage_data->list) + std::list& list = file_handler_storage_data->list; + std::deque& deque = file_handler_storage_data->deque; + if (!deque.size()) { + for (file_handler*& i : list) if (i->not_ready && !i->reading) { { std::unique_lock u_lock(i->mtx); i->count++; } - file_handler_storage_data->deque.push_back(i); + deque.push_back(i); } - if (file_handler_storage_data->deque.size()) + if (deque.size()) file_handler_storage_data->cnd.notify_all(); } } @@ -293,12 +295,12 @@ static bool file_handler_load_farc_file(void* data, const char* dir, const char* } static void file_handler_storage_ctrl_list() { - for (std::list::iterator i = file_handler_storage_data->list.begin(); - i != file_handler_storage_data->list.end();) { - file_handler* pfhndl = i._Ptr->_Myval; + std::list& list = file_handler_storage_data->list; + for (std::list::iterator i = list.begin(); i != list.end();) { + file_handler* pfhndl = *i; if (pfhndl->count == 1) { pfhndl->free_data_lock(); - i = file_handler_storage_data->list.erase(i); + i = list.erase(i); } else { if (!pfhndl->not_ready && !pfhndl->callback[0].ready) diff --git a/src/CRE/gl_state.cpp b/src/CRE/gl_state.cpp index c5936bd1..66ec3ae1 100644 --- a/src/CRE/gl_state.cpp +++ b/src/CRE/gl_state.cpp @@ -7,7 +7,7 @@ gl_state_struct gl_state; -inline void gl_state_active_bind_texture_2d(int32_t index, GLuint texture) { +void gl_state_active_bind_texture_2d(int32_t index, GLuint texture) { if (gl_state.texture_binding_2d[index] != texture) { if (gl_state.active_texture_index != index) { glActiveTexture((GLenum)(GL_TEXTURE0 + index)); @@ -19,7 +19,7 @@ inline void gl_state_active_bind_texture_2d(int32_t index, GLuint texture) { } } -inline void gl_state_active_bind_texture_cube_map(int32_t index, GLuint texture) { +void gl_state_active_bind_texture_cube_map(int32_t index, GLuint texture) { if (gl_state.texture_binding_cube_map[index] != texture) { if (gl_state.active_texture_index != index) { glActiveTexture((GLenum)(GL_TEXTURE0 + index)); @@ -31,7 +31,7 @@ inline void gl_state_active_bind_texture_cube_map(int32_t index, GLuint texture) } } -inline void gl_state_active_texture(size_t index) { +void gl_state_active_texture(size_t index) { if (gl_state.active_texture_index != index) { glActiveTexture((GLenum)(GL_TEXTURE0 + index)); gl_state.active_texture = (GLenum)(GL_TEXTURE0 + index); @@ -39,7 +39,7 @@ inline void gl_state_active_texture(size_t index) { } } -inline void gl_state_bind_framebuffer(GLuint framebuffer) { +void gl_state_bind_framebuffer(GLuint framebuffer) { if (gl_state.read_framebuffer_binding != framebuffer || gl_state.draw_framebuffer_binding != framebuffer) { glBindFramebuffer(GL_FRAMEBUFFER, framebuffer); @@ -48,49 +48,46 @@ inline void gl_state_bind_framebuffer(GLuint framebuffer) { } } -inline void gl_state_bind_read_framebuffer(GLuint framebuffer) { +void gl_state_bind_read_framebuffer(GLuint framebuffer) { if (gl_state.read_framebuffer_binding != framebuffer) { glBindFramebuffer(GL_READ_FRAMEBUFFER, framebuffer); gl_state.read_framebuffer_binding = framebuffer; } } -inline void gl_state_bind_draw_framebuffer(GLuint framebuffer) { +void gl_state_bind_draw_framebuffer(GLuint framebuffer) { if (gl_state.draw_framebuffer_binding != framebuffer) { glBindFramebuffer(GL_DRAW_FRAMEBUFFER, framebuffer); gl_state.draw_framebuffer_binding = framebuffer; } } -inline void gl_state_bind_vertex_array(GLuint array) { - if (gl_state.vertex_array_binding != array) { +void gl_state_bind_vertex_array(GLuint array, bool force) { + if (gl_state.vertex_array_binding != array || force) { glBindVertexArray(array); gl_state.vertex_array_binding = array; } } -inline void gl_state_bind_array_buffer(GLuint buffer) { - if (gl_state.array_buffer_binding != buffer) { +void gl_state_bind_array_buffer(GLuint buffer, bool force) { + if (gl_state.array_buffer_binding != buffer || force) { glBindBuffer(GL_ARRAY_BUFFER, buffer); gl_state.array_buffer_binding = buffer; } } -inline void gl_state_bind_element_array_buffer(GLuint buffer) { - if (gl_state.element_array_buffer_binding != buffer) { +void gl_state_bind_element_array_buffer(GLuint buffer, bool force) { + if (gl_state.element_array_buffer_binding != buffer || force) { glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, buffer); gl_state.element_array_buffer_binding = buffer; } } -inline void gl_state_bind_uniform_buffer(GLuint buffer) { - if (gl_state.uniform_buffer_binding[gl_state.uniform_buffer_index] != buffer) { - glBindBuffer(GL_UNIFORM_BUFFER, buffer); - gl_state.uniform_buffer_binding[gl_state.uniform_buffer_index] = buffer; - } +void gl_state_bind_uniform_buffer(GLuint buffer, bool force) { + gl_state_bind_uniform_buffer_base(gl_state.uniform_buffer_index, buffer); } -inline void gl_state_bind_uniform_buffer_base(GLuint index, GLuint buffer) { +void gl_state_bind_uniform_buffer_base(GLuint index, GLuint buffer, bool force) { if (gl_state.uniform_buffer_binding[index] != buffer) { glBindBufferBase(GL_UNIFORM_BUFFER, index, buffer); gl_state.uniform_buffer_binding[index] = buffer; @@ -100,8 +97,8 @@ inline void gl_state_bind_uniform_buffer_base(GLuint index, GLuint buffer) { } } -inline void gl_state_bind_uniform_buffer_range(GLuint index, - GLuint buffer, GLintptr offset, GLsizeiptr size) { +void gl_state_bind_uniform_buffer_range(GLuint index, + GLuint buffer, GLintptr offset, GLsizeiptr size, bool force) { if (gl_state.uniform_buffer_binding[index] != buffer || gl_state.uniform_buffer_offset[index] != offset || gl_state.uniform_buffer_size[index] != size) { @@ -113,14 +110,11 @@ inline void gl_state_bind_uniform_buffer_range(GLuint index, } } -inline void gl_state_bind_shader_storage_buffer(GLuint buffer) { - if (gl_state.shader_storage_buffer_binding[gl_state.shader_storage_buffer_index] != buffer) { - glBindBuffer(GL_SHADER_STORAGE_BUFFER, buffer); - gl_state.shader_storage_buffer_binding[gl_state.shader_storage_buffer_index] = buffer; - } +void gl_state_bind_shader_storage_buffer(GLuint buffer, bool force) { + gl_state_bind_shader_storage_buffer_base(gl_state.shader_storage_buffer_index, buffer); } -inline void gl_state_bind_shader_storage_buffer_base(GLuint index, GLuint buffer) { +void gl_state_bind_shader_storage_buffer_base(GLuint index, GLuint buffer, bool force) { if (gl_state.shader_storage_buffer_binding[index] != buffer) { glBindBufferBase(GL_SHADER_STORAGE_BUFFER, index, buffer); gl_state.shader_storage_buffer_binding[index] = buffer; @@ -130,8 +124,8 @@ inline void gl_state_bind_shader_storage_buffer_base(GLuint index, GLuint buffer } } -inline void gl_state_bind_shader_storage_buffer_range(GLuint index, - GLuint buffer, GLintptr offset, GLsizeiptr size) { +void gl_state_bind_shader_storage_buffer_range(GLuint index, + GLuint buffer, GLintptr offset, GLsizeiptr size, bool force) { if (gl_state.shader_storage_buffer_binding[index] != buffer || gl_state.shader_storage_buffer_offset[index] != offset || gl_state.shader_storage_buffer_size[index] != size) { @@ -143,133 +137,147 @@ inline void gl_state_bind_shader_storage_buffer_range(GLuint index, } } -inline void gl_state_bind_texture_2d(GLuint texture) { +void gl_state_bind_texture_2d(GLuint texture) { if (gl_state.texture_binding_2d[gl_state.active_texture_index] != texture) { glBindTexture(GL_TEXTURE_2D, texture); gl_state.texture_binding_2d[gl_state.active_texture_index] = texture; } } -inline void gl_state_bind_texture_cube_map(GLuint texture) { +void gl_state_bind_texture_cube_map(GLuint texture) { if (gl_state.texture_binding_cube_map[gl_state.active_texture_index] != texture) { glBindTexture(GL_TEXTURE_CUBE_MAP, texture); gl_state.texture_binding_cube_map[gl_state.active_texture_index] = texture; } } -inline void gl_state_bind_sampler(int32_t index, GLuint sampler) { +void gl_state_bind_sampler(int32_t index, GLuint sampler) { if (gl_state.sampler_binding[index] != sampler) { glBindSampler(index, sampler); gl_state.sampler_binding[index] = sampler; } } -inline bool gl_state_check_uniform_buffer_binding() { +bool gl_state_check_uniform_buffer_binding() { return gl_state.uniform_buffer_binding[gl_state.uniform_buffer_index] != 0; } -inline bool gl_state_check_uniform_buffer_binding_base(size_t index) { +bool gl_state_check_uniform_buffer_binding_base(size_t index) { return gl_state.uniform_buffer_binding[index] != 0; } -inline bool gl_state_check_shader_storage_buffer_binding() { +bool gl_state_check_shader_storage_buffer_binding() { return gl_state.shader_storage_buffer_binding[gl_state.shader_storage_buffer_index] != 0; } -inline bool gl_state_check_shader_storage_buffer_binding_base(size_t index) { +bool gl_state_check_shader_storage_buffer_binding_base(size_t index) { return gl_state.shader_storage_buffer_binding[index] != 0; } -inline bool gl_state_check_texture_binding_2d(size_t index) { +bool gl_state_check_texture_binding_2d(size_t index) { return gl_state.texture_binding_2d[index] != 0; } -inline bool gl_state_check_texture_binding_cube_map(size_t index) { +bool gl_state_check_texture_binding_cube_map(size_t index) { return gl_state.texture_binding_cube_map[index] != 0; } -inline bool gl_state_check_sampler_binding(int32_t index, GLuint sampler) { +bool gl_state_check_sampler_binding(int32_t index, GLuint sampler) { return gl_state.sampler_binding[index] != 0; } -inline void gl_state_disable_blend() { +void gl_state_disable_blend() { if (gl_state.blend) { glDisable(GL_BLEND); gl_state.blend = GL_FALSE; } } -inline void gl_state_disable_cull_face() { +void gl_state_disable_cull_face() { if (gl_state.cull_face) { glDisable(GL_CULL_FACE); gl_state.cull_face = GL_FALSE; } } -inline void gl_state_disable_depth_test() { +void gl_state_disable_depth_test() { if (gl_state.depth_test) { glDisable(GL_DEPTH_TEST); gl_state.depth_test = GL_FALSE; } } -inline void gl_state_disable_primitive_restart() { - if (!gl_state.primitive_restart) { +void gl_state_disable_multisample() { + if (gl_state.multisample) { + glDisable(GL_MULTISAMPLE); + gl_state.multisample = GL_FALSE; + } +} + +void gl_state_disable_primitive_restart() { + if (gl_state.primitive_restart) { glDisable(GL_PRIMITIVE_RESTART); gl_state.primitive_restart = GL_FALSE; } } -inline void gl_state_disable_scissor_test() { +void gl_state_disable_scissor_test() { if (gl_state.scissor_test) { glDisable(GL_SCISSOR_TEST); gl_state.scissor_test = GL_FALSE; } } -inline void gl_state_disable_stencil_test() { +void gl_state_disable_stencil_test() { if (gl_state.stencil_test) { glDisable(GL_STENCIL_TEST); gl_state.stencil_test = GL_FALSE; } } -inline void gl_state_enable_blend() { +void gl_state_enable_blend() { if (!gl_state.blend) { glEnable(GL_BLEND); gl_state.blend = GL_TRUE; } } -inline void gl_state_enable_cull_face() { +void gl_state_enable_cull_face() { if (!gl_state.cull_face) { glEnable(GL_CULL_FACE); gl_state.cull_face = GL_TRUE; } } -inline void gl_state_enable_depth_test() { +void gl_state_enable_depth_test() { if (!gl_state.depth_test) { glEnable(GL_DEPTH_TEST); gl_state.depth_test = GL_TRUE; } } -inline void gl_state_enable_primitive_restart() { +void gl_state_enable_multisample() { + if (!gl_state.multisample) { + glEnable(GL_MULTISAMPLE); + gl_state.multisample = GL_TRUE; + } +} + +void gl_state_enable_primitive_restart() { if (!gl_state.primitive_restart) { glEnable(GL_PRIMITIVE_RESTART); gl_state.primitive_restart = GL_TRUE; } } -inline void gl_state_enable_scissor_test() { +void gl_state_enable_scissor_test() { if (!gl_state.scissor_test) { glEnable(GL_SCISSOR_TEST); gl_state.scissor_test = GL_TRUE; } } -inline void gl_state_enable_stencil_test() { +void gl_state_enable_stencil_test() { if (!gl_state.stencil_test) { glEnable(GL_STENCIL_TEST); gl_state.stencil_test = GL_TRUE; @@ -328,7 +336,9 @@ void gl_state_get() { glGetBooleanv(GL_DEPTH_TEST, &gl_state.depth_test); glGetIntegerv(GL_DEPTH_FUNC, (GLint*)&gl_state.depth_func); glGetBooleanv(GL_DEPTH_WRITEMASK, &gl_state.depth_mask); + glGetBooleanv(GL_MULTISAMPLE, &gl_state.multisample); glGetBooleanv(GL_PRIMITIVE_RESTART, &gl_state.primitive_restart); + glGetIntegerv(GL_PRIMITIVE_RESTART_INDEX, (GLint*)&gl_state.primitive_restart_index); glGetBooleanv(GL_SCISSOR_TEST, &gl_state.scissor_test); glGetBooleanv(GL_STENCIL_TEST, &gl_state.stencil_test); glGetIntegerv(GL_STENCIL_WRITEMASK, (GLint*)&gl_state.stencil_mask); @@ -338,17 +348,17 @@ void gl_state_get() { gl_state.polygon_back_face_mode = GL_FILL; } -inline void gl_state_get_all_gl_errors() { +void gl_state_get_all_gl_errors() { GLenum error; while (error = glGetError()) - printf("GL Error: 0x%04X\n", error); + printf_debug("GL Error: 0x%04X\n", error); } -inline GLuint gl_state_get_program() { +GLuint gl_state_get_program() { return gl_state.program; } -inline void gl_state_set_blend_func(GLenum src, GLenum dst) { +void gl_state_set_blend_func(GLenum src, GLenum dst) { if (gl_state.blend_src_rgb != src || gl_state.blend_dst_rgb != dst || gl_state.blend_src_alpha != GL_ONE || gl_state.blend_dst_alpha != GL_ONE_MINUS_SRC_ALPHA) { glBlendFuncSeparate(src, dst, GL_ONE, GL_ONE_MINUS_SRC_ALPHA); @@ -359,7 +369,7 @@ inline void gl_state_set_blend_func(GLenum src, GLenum dst) { } } -inline void gl_state_set_blend_func_separate(GLenum src_rgb, GLenum dst_rgb, +void gl_state_set_blend_func_separate(GLenum src_rgb, GLenum dst_rgb, GLenum src_alpha, GLenum dst_alpha) { if (gl_state.blend_src_rgb != src_rgb || gl_state.blend_dst_rgb != dst_rgb || gl_state.blend_src_alpha != src_alpha || gl_state.blend_dst_alpha != dst_alpha) { @@ -371,7 +381,7 @@ inline void gl_state_set_blend_func_separate(GLenum src_rgb, GLenum dst_rgb, } } -inline void gl_state_set_blend_equation(GLenum mode) { +void gl_state_set_blend_equation(GLenum mode) { if (gl_state.blend_mode_rgb != mode || gl_state.blend_mode_alpha != mode) { glBlendEquationSeparate(mode, mode); gl_state.blend_mode_rgb = mode; @@ -379,7 +389,7 @@ inline void gl_state_set_blend_equation(GLenum mode) { } } -inline void gl_state_set_blend_equation_separate(GLenum mode_rgb, GLenum mode_alpha) { +void gl_state_set_blend_equation_separate(GLenum mode_rgb, GLenum mode_alpha) { if (gl_state.blend_mode_rgb != mode_rgb || gl_state.blend_mode_alpha != mode_alpha) { glBlendEquationSeparate(mode_rgb, mode_alpha); gl_state.blend_mode_rgb = mode_rgb; @@ -387,7 +397,7 @@ inline void gl_state_set_blend_equation_separate(GLenum mode_rgb, GLenum mode_al } } -inline void gl_state_set_color_mask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha) { +void gl_state_set_color_mask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha) { if (gl_state.color_mask[0] != red || gl_state.color_mask[1] != green || gl_state.color_mask[2] != blue || gl_state.color_mask[3] != alpha) { glColorMask(red, green, blue, alpha); @@ -398,28 +408,28 @@ inline void gl_state_set_color_mask(GLboolean red, GLboolean green, GLboolean bl } } -inline void gl_state_set_cull_face_mode(GLenum mode) { +void gl_state_set_cull_face_mode(GLenum mode) { if (gl_state.cull_face_mode != mode) { glCullFace(mode); gl_state.cull_face_mode = mode; } } -inline void gl_state_set_depth_func(GLenum func) { +void gl_state_set_depth_func(GLenum func) { if (gl_state.depth_func != func) { glDepthFunc(func); gl_state.depth_func = func; } } -inline void gl_state_set_depth_mask(GLboolean flag) { +void gl_state_set_depth_mask(GLboolean flag) { if (gl_state.depth_mask != flag) { glDepthMask(flag); gl_state.depth_mask = flag; } } -inline void gl_state_set_polygon_mode(GLenum face, GLenum mode) { +void gl_state_set_polygon_mode(GLenum face, GLenum mode) { switch (face) { case GL_FRONT: if (gl_state.polygon_front_face_mode != mode) { @@ -451,14 +461,21 @@ inline void gl_state_set_polygon_mode(GLenum face, GLenum mode) { } } -inline void gl_state_set_stencil_mask(GLuint mask) { +void gl_state_set_primitive_restart_index(GLuint index) { + if (gl_state.primitive_restart_index != index) { + glPrimitiveRestartIndex(index); + gl_state.primitive_restart_index = index; + } +} + +void gl_state_set_stencil_mask(GLuint mask) { if (gl_state.stencil_mask != mask) { glStencilMask(mask); gl_state.stencil_mask = mask; } } -inline void gl_state_use_program(GLuint program) { +void gl_state_use_program(GLuint program) { if (gl_state.program != program) { glUseProgram(program); gl_state.program = program; diff --git a/src/CRE/gl_state.hpp b/src/CRE/gl_state.hpp index f4814bbf..9d975085 100644 --- a/src/CRE/gl_state.hpp +++ b/src/CRE/gl_state.hpp @@ -43,7 +43,9 @@ struct gl_state_struct { GLboolean depth_mask; GLenum polygon_front_face_mode; GLenum polygon_back_face_mode; + GLboolean multisample; GLboolean primitive_restart; + GLuint primitive_restart_index; GLboolean scissor_test; GLboolean stencil_test; GLuint stencil_mask; @@ -57,17 +59,17 @@ extern void gl_state_active_texture(size_t index); extern void gl_state_bind_framebuffer(GLuint framebuffer); extern void gl_state_bind_read_framebuffer(GLuint framebuffer); extern void gl_state_bind_draw_framebuffer(GLuint framebuffer); -extern void gl_state_bind_vertex_array(GLuint array); -extern void gl_state_bind_array_buffer(GLuint buffer); -extern void gl_state_bind_element_array_buffer(GLuint buffer); -extern void gl_state_bind_uniform_buffer(GLuint buffer); -extern void gl_state_bind_uniform_buffer_base(GLuint index, GLuint buffer); +extern void gl_state_bind_vertex_array(GLuint array, bool force = false); +extern void gl_state_bind_array_buffer(GLuint buffer, bool force = false); +extern void gl_state_bind_element_array_buffer(GLuint buffer, bool force = false); +extern void gl_state_bind_uniform_buffer(GLuint buffer, bool force = false); +extern void gl_state_bind_uniform_buffer_base(GLuint index, GLuint buffer, bool force = false); extern void gl_state_bind_uniform_buffer_range(GLuint index, - GLuint buffer, GLintptr offset, GLsizeiptr size); -extern void gl_state_bind_shader_storage_buffer(GLuint buffer); -extern void gl_state_bind_shader_storage_buffer_base(GLuint index, GLuint buffer); + GLuint buffer, GLintptr offset, GLsizeiptr size, bool force = false); +extern void gl_state_bind_shader_storage_buffer(GLuint buffer, bool force = false); +extern void gl_state_bind_shader_storage_buffer_base(GLuint index, GLuint buffer, bool force = false); extern void gl_state_bind_shader_storage_buffer_range(GLuint index, - GLuint buffer, GLintptr offset, GLsizeiptr size); + GLuint buffer, GLintptr offset, GLsizeiptr size, bool force = false); extern void gl_state_bind_texture_2d(GLuint texture); extern void gl_state_bind_texture_cube_map(GLuint texture); extern void gl_state_bind_sampler(int32_t index, GLuint sampler); @@ -81,12 +83,14 @@ extern bool gl_state_check_sampler_binding(int32_t index, GLuint sampler); extern void gl_state_disable_blend(); extern void gl_state_disable_cull_face(); extern void gl_state_disable_depth_test(); +extern void gl_state_disable_multisample(); extern void gl_state_disable_primitive_restart(); extern void gl_state_disable_scissor_test(); extern void gl_state_disable_stencil_test(); extern void gl_state_enable_blend(); extern void gl_state_enable_cull_face(); extern void gl_state_enable_depth_test(); +extern void gl_state_enable_multisample(); extern void gl_state_enable_primitive_restart(); extern void gl_state_enable_scissor_test(); extern void gl_state_enable_stencil_test(); @@ -103,5 +107,6 @@ extern void gl_state_set_cull_face_mode(GLenum mode); extern void gl_state_set_depth_func(GLenum func); extern void gl_state_set_depth_mask(GLboolean flag); extern void gl_state_set_polygon_mode(GLenum face, GLenum mode); +extern void gl_state_set_primitive_restart_index(GLuint index); extern void gl_state_set_stencil_mask(GLuint mask); extern void gl_state_use_program(GLuint program); diff --git a/src/CRE/item_table.cpp b/src/CRE/item_table.cpp index 8e7d17ea..9024ee8b 100644 --- a/src/CRE/item_table.cpp +++ b/src/CRE/item_table.cpp @@ -60,7 +60,9 @@ bool item_table_array_load_file(void* data, const char* path, const char* file, if (t) file_len = t - file; - std::string s = path + std::string(file, file_len); + std::string s; + s.assign(path); + s.append(file, file_len); return item_table_array_read((data_struct*)data, s.c_str()); } diff --git a/src/CRE/light_param.cpp b/src/CRE/light_param.cpp index 3b860155..ead9e9af 100644 --- a/src/CRE/light_param.cpp +++ b/src/CRE/light_param.cpp @@ -10,16 +10,16 @@ static void light_param_data_get_stage_name_string(std::string* str, int32_t stage_index); static int32_t light_param_data_load_file(light_param_data* a1, p_file_handler* a2); -static void light_param_data_load_file_pv_cut(std::map* tree, +static void light_param_data_load_file_pv_cut(std::map& tree, farc* f, light_param_data* default_light_param, int32_t pv_id); static void light_param_data_load_pv_cut_file_names(light_param_data* light_param, int32_t cut_id, std::string* name); static void light_param_data_load_stage_file_names(light_param_data* light_param, std::string* name); static void light_param_data_set(light_param_data* a1, light_param_data_storage* storage, light_param_data_storage_flags flags = LIGHT_PARAM_DATA_STORAGE_ALL); static void light_param_storage_free_file_handlers(light_param_data_storage* a1); -static void light_param_storage_load_stages(light_param_data_storage* a1, std::vector* stage_indices); +static void light_param_storage_load_stages(light_param_data_storage* a1, std::vector& stage_indices); static void light_param_storage_load_stages(light_param_data_storage* a1, - std::vector* stage_hashes, stage_database* stage_data); + std::vector& stage_hashes, stage_database* stage_data); static int32_t light_param_storage_load_file(light_param_data_storage* a1, bool read_now); static void light_param_storage_reset(light_param_data_storage* a1); static void light_param_storage_set_default_light_param(light_param_data_storage* a1, int32_t stage_index); @@ -88,21 +88,21 @@ int32_t light_param_data_storage_data_load_file() { void light_param_data_storage_data_load_stage(int32_t stage_index) { std::vector stage_indices = { stage_index }; - light_param_storage_load_stages(light_param_data_storage_data, &stage_indices); + light_param_storage_load_stages(light_param_data_storage_data, stage_indices); } void light_param_data_storage_data_load_stage( uint32_t stage_hash, stage_database* stage_data) { std::vector stage_hashes = { stage_hash }; - light_param_storage_load_stages(light_param_data_storage_data, &stage_hashes, stage_data); + light_param_storage_load_stages(light_param_data_storage_data, stage_hashes, stage_data); } -void light_param_data_storage_data_load_stages(std::vector* stage_indices) { +void light_param_data_storage_data_load_stages(std::vector& stage_indices) { light_param_storage_load_stages(light_param_data_storage_data, stage_indices); } void light_param_data_storage_data_load_stages( - std::vector* stage_hashes, stage_database* stage_data) { + std::vector& stage_hashes, stage_database* stage_data) { light_param_storage_load_stages(light_param_data_storage_data, stage_hashes, stage_data); } @@ -193,7 +193,7 @@ static int32_t light_param_storage_load_file(light_param_data_storage* a1, bool farc a1a; a1a.read(a1->farc_file_handler.get_data(), a1->farc_file_handler.get_size(), true); if (a1a.files.size()) - light_param_data_load_file_pv_cut(&a1->pv_cut, &a1a, &a1->default_light_param, a1->pv_id); + light_param_data_load_file_pv_cut(a1->pv_cut, &a1a, &a1->default_light_param, a1->pv_id); a1->state = 0; return 0; } @@ -202,13 +202,11 @@ static int32_t light_param_storage_load_file(light_param_data_storage* a1, bool static void light_param_data_get_stage_name_string(std::string* str, int32_t stage_index) { str->clear(); - str->shrink_to_fit(); data_struct* aft_data = &data_list[DATA_AFT]; stage_database* aft_stage_data = &aft_data->data_ft.stage_data; - const char* stage_name = stage_index < aft_stage_data->stage_data.size() - ? aft_stage_data->stage_data[stage_index].name.c_str() : 0; + const char* stage_name = aft_stage_data->get_stage_name(stage_index); if (!stage_name) return; @@ -216,40 +214,23 @@ static void light_param_data_get_stage_name_string(std::string* str, int32_t sta if (length <= 3) return; - stage_name += 3; - length -= 3; - - char* s = force_malloc_s(char, length + 1); - for (size_t i = 0; i < length; i++) { - char c = stage_name[i]; - if (c == '_') { + for (size_t i = 3; i < length; i++) + if (stage_name[i] == '_') { length = i; break; } - if (c > 0x40 && c < 0x5B) + str->assign(stage_name + 3, length - 3); + for (char& c : *str) + if (c >= 'A' && c <= 'Z') c += 0x20; - s[i] = c; - } - s[length] = '\0'; - - *str = std::string(s, length); - free_def(s); } static void light_param_data_get_stage_name_string(std::string* str, uint32_t stage_hash, stage_database* stage_data) { str->clear(); - str->shrink_to_fit(); - const char* stage_name = 0; - for (stage_data_modern& i : stage_data->stage_modern) { - if (i.hash != stage_hash) - continue; - - stage_name = i.name.c_str(); - break; - } + const char* stage_name = stage_data->get_stage_name_modern(stage_hash); if (!stage_name) return; @@ -257,25 +238,16 @@ static void light_param_data_get_stage_name_string(std::string* str, if (length <= 3) return; - stage_name += 3; - length -= 3; - - char* s = force_malloc_s(char, length + 1); - for (size_t i = 0; i < length; i++) { - char c = stage_name[i]; - if (c == '_') { + for (size_t i = 3; i < length; i++) + if (stage_name[i] == '_') { length = i; break; } - if (c > 0x40 && c < 0x5B) + str->assign(stage_name + 3, length - 3); + for (char& c : *str) + if (c >= 'A' && c <= 'Z') c += 0x20; - s[i] = c; - } - s[length] = '\0'; - - *str = std::string(s, length); - free_def(s); } static int32_t light_param_data_load_file(light_param_data* a1, p_file_handler* a2) { @@ -313,7 +285,7 @@ static int32_t light_param_data_load_file(light_param_data* a1, p_file_handler* | a1->glow.ready | a1->wind.ready | a1->face.ready) ? 1 : 0; } -static void light_param_data_load_file_pv_cut(std::map* tree, +static void light_param_data_load_file_pv_cut(std::map& tree, farc* f, light_param_data* default_light_param, int32_t pv_id) { char buf[0x100]; @@ -414,12 +386,12 @@ static void light_param_data_load_file_pv_cut(std::map::iterator elem = tree->find(cut_id); + std::map::iterator elem = tree.find(cut_id); light_param_data* light_param; - if (elem != tree->end()) + if (elem != tree.end()) light_param = &elem->second; else { - light_param = &tree->insert({ cut_id, *default_light_param }).first->second; + light_param = &tree.insert({ cut_id, *default_light_param }).first->second; light_param->ibl.ready = false; light_param->light.ready = false; light_param->fog.ready = false; @@ -538,7 +510,7 @@ static void light_param_storage_free_file_handlers(light_param_data_storage* a1) a1->farc_file_handler.free_data(); } -static void light_param_storage_load_stages(light_param_data_storage* a1, std::vector* stage_indices) { +static void light_param_storage_load_stages(light_param_data_storage* a1, std::vector& stage_indices) { if (a1->state) for (int32_t i = 0; i < 6; ++i) if (a1->file_handlers[i].check_not_ready()) @@ -547,7 +519,7 @@ static void light_param_storage_load_stages(light_param_data_storage* a1, std::v a1->stage_index = -1; a1->stage.clear(); - for (int32_t& i : *stage_indices) { + for (int32_t& i : stage_indices) { std::string name; light_param_data_get_stage_name_string(&name, i); if (!name.size()) @@ -568,7 +540,7 @@ static void light_param_storage_load_stages(light_param_data_storage* a1, std::v } static void light_param_storage_load_stages(light_param_data_storage* a1, - std::vector* stage_hashes, stage_database* stage_data) { + std::vector& stage_hashes, stage_database* stage_data) { if (a1->state) for (int32_t i = 0; i < 6; ++i) if (a1->file_handlers[i].check_not_ready()) @@ -577,7 +549,7 @@ static void light_param_storage_load_stages(light_param_data_storage* a1, a1->stage_index = -1; a1->stage.clear(); - for (uint32_t& i : *stage_hashes) { + for (uint32_t& i : stage_hashes) { std::string name; light_param_data_get_stage_name_string(&name, i, stage_data); if (!name.size()) diff --git a/src/CRE/light_param.hpp b/src/CRE/light_param.hpp index 76871fe8..8948c280 100644 --- a/src/CRE/light_param.hpp +++ b/src/CRE/light_param.hpp @@ -5,7 +5,6 @@ #pragma once -#include #include #include "../KKdLib/default.hpp" #include "../KKdLib/farc.hpp" @@ -74,9 +73,9 @@ extern int32_t light_param_data_storage_data_get_stage_index(); extern int32_t light_param_data_storage_data_load_file(); extern void light_param_data_storage_data_load_stage(int32_t stage_index); extern void light_param_data_storage_data_load_stage(uint32_t stage_hash, stage_database* stage_data); -extern void light_param_data_storage_data_load_stages(std::vector* stage_indices); +extern void light_param_data_storage_data_load_stages(std::vector& stage_indices); extern void light_param_data_storage_data_load_stages( - std::vector* stage_hashes, stage_database* stage_data); + std::vector& stage_hashes, stage_database* stage_data); extern void light_param_data_storage_data_reset(); extern void light_param_data_storage_data_set_default_light_param( light_param_data_storage_flags flags = LIGHT_PARAM_DATA_STORAGE_ALL); diff --git a/src/CRE/light_param/face.cpp b/src/CRE/light_param/face.cpp index 417b015a..248ef5c5 100644 --- a/src/CRE/light_param/face.cpp +++ b/src/CRE/light_param/face.cpp @@ -8,8 +8,8 @@ face::face() { offset = 1.0f; scale = 0.35f; - position = vec3_null; - direction = vec3_null; + position = 0.0f; + direction = 0.0f; } float_t face::get_offset() { diff --git a/src/CRE/light_param/light.cpp b/src/CRE/light_param/light.cpp index 5aef63e9..67392754 100644 --- a/src/CRE/light_param/light.cpp +++ b/src/CRE/light_param/light.cpp @@ -443,9 +443,9 @@ void light_set::data_set(face& face, light_set_id id) { shaders_ft.env_frag_set(35, specular); } else { - shaders_ft.env_frag_set(33, vec4_null); - shaders_ft.env_frag_set(34, vec4_null); - shaders_ft.env_frag_set(35, vec4_null); + shaders_ft.env_frag_set(33, 0.0f); + shaders_ft.env_frag_set(34, 0.0f); + shaders_ft.env_frag_set(35, 0.0f); } if (lights[LIGHT_TONE_CURVE].get_type() == LIGHT_PARALLEL) { diff --git a/src/CRE/light_param/wind.cpp b/src/CRE/light_param/wind.cpp index b696f03c..a685b106 100644 --- a/src/CRE/light_param/wind.cpp +++ b/src/CRE/light_param/wind.cpp @@ -73,7 +73,7 @@ void wind::set_bias(float_t value) { void wind::reset() { strength = 0.0f; frame = 0.0f; - wind_direction = vec3_null; + wind_direction = 0.0f; } static float_t wind_apply_spc(wind* w, float_t frame) { @@ -92,7 +92,7 @@ static void wind_ctrl(wind* w) { mat4 mat = mat4_identity; mat4_rotate_y_mult(&mat, w->rot_y * DEG_TO_RAD_FLOAT, &mat); mat4_rotate_z_mult(&mat, w->rot_z * DEG_TO_RAD_FLOAT, &mat); - vec3 wind_direction = vec3_null; + vec3 wind_direction = 0.0f; wind_direction.x = value; mat4_mult_vec3(&mat, &wind_direction, &wind_direction); w->wind_direction = wind_direction * w->strength; diff --git a/src/CRE/object.cpp b/src/CRE/object.cpp index 9c308a00..28945fdc 100644 --- a/src/CRE/object.cpp +++ b/src/CRE/object.cpp @@ -5,6 +5,7 @@ #include #include +#include #include #include "object.hpp" #include "data.hpp" @@ -27,15 +28,6 @@ static bool obj_set_handler_load_textures_modern(obj_set_handler* handler, const void* data, size_t size, const char* file, texture_database* tex_db); static bool obj_set_handler_vertex_buffer_load(obj_set_handler* handler); static void obj_set_handler_vertex_buffer_free(obj_set_handler* handler); -static void obj_skin_block_constraint_attach_point_load( - obj_skin_block_constraint_attach_point* attach_point, - obj_skin_block_constraint_attach_point* attach_point_file); -static void obj_skin_block_constraint_up_vector_load( - obj_skin_block_constraint_up_vector* up_vector, - obj_skin_block_constraint_up_vector* up_vector_file); -static void obj_skin_block_node_load(obj_skin_block_node* node, - obj_skin_block_node* node_file); -static void obj_skin_block_node_free(obj_skin_block_node* node); static size_t obj_vertex_format_get_vertex_size(obj_vertex_format format); static size_t obj_vertex_format_get_vertex_size_comp(obj_vertex_format format); @@ -47,23 +39,23 @@ obj_mesh_index_buffer::obj_mesh_index_buffer() : buffer(), size() { } bool obj_mesh_index_buffer::load(obj_mesh& mesh) { - int32_t indices_count = 0; + int32_t num_index = 0; for (uint32_t i = 0; i < mesh.num_submesh; i++) - indices_count += mesh.submesh_array[i].indices_count; + num_index += mesh.submesh_array[i].num_index; - if (!indices_count) { + if (!num_index) { buffer = 0; return true; } - uint16_t* indices = force_malloc_s(uint16_t, indices_count); + uint16_t* indices = force_malloc_s(uint16_t, num_index); uint16_t* _indices = indices; for (uint32_t k = 0; k < mesh.num_submesh; k++) { obj_sub_mesh& sub_mesh = mesh.submesh_array[k]; - int32_t indices_count = sub_mesh.indices_count; - uint32_t* sub_mesh_indices = sub_mesh.indices; - for (int32_t l = 0; l < indices_count; l++) - *_indices++ = (uint16_t)sub_mesh_indices[l]; + uint32_t num_index = sub_mesh.num_index; + uint32_t* index = sub_mesh.index_array; + for (uint32_t l = 0; l < num_index; l++, index++) + *_indices++ = (uint16_t)*index; } _indices = indices; @@ -72,32 +64,31 @@ bool obj_mesh_index_buffer::load(obj_mesh& mesh) { sub_mesh.first_index = 0; sub_mesh.last_index = 0; - sub_mesh.indices_offset = 0; + sub_mesh.index_offset = 0; if (sub_mesh.index_format != OBJ_INDEX_U16) continue; uint16_t first_index = 0xFFFF; uint16_t last_index = 0; - int32_t indices_count = sub_mesh.indices_count; - uint32_t* sub_mesh_indices = sub_mesh.indices; - for (int32_t j = 0; j < indices_count; j++) { + uint32_t num_index = sub_mesh.num_index; + for (uint32_t j = 0; j < num_index; j++) { uint16_t index = *_indices++; if (index == 0xFFFF) continue; - if (index < first_index) + if (first_index > index) first_index = index; - if (index > last_index) + if (last_index < index) last_index = index; } sub_mesh.first_index = first_index; sub_mesh.last_index = last_index; - sub_mesh.indices_offset = (int32_t)(sizeof(uint16_t) * offset); - offset += sub_mesh.indices_count; + sub_mesh.index_offset = (int32_t)(sizeof(uint16_t) * offset); + offset += sub_mesh.num_index; } - bool ret = load_data((size_t)indices_count * sizeof(uint16_t), indices); + bool ret = load_data((size_t)num_index * sizeof(uint16_t), indices); free_def(indices); return ret; } @@ -108,8 +99,11 @@ bool obj_mesh_index_buffer::load_data(size_t size, const void* data) { this->size = (GLsizeiptr)size; glGenBuffers(1, &buffer); - gl_state_bind_element_array_buffer(buffer); - glBufferData(GL_ELEMENT_ARRAY_BUFFER, (GLsizeiptr)size, data, GL_STATIC_DRAW); + gl_state_bind_element_array_buffer(buffer, true); + if (GLAD_GL_VERSION_4_4) + glBufferStorage(GL_ELEMENT_ARRAY_BUFFER, (GLsizeiptr)size, data, 0); + else + glBufferData(GL_ELEMENT_ARRAY_BUFFER, (GLsizeiptr)size, data, GL_STATIC_DRAW); gl_state_bind_element_array_buffer(0); return true; } @@ -143,8 +137,8 @@ GLsizeiptr obj_mesh_vertex_buffer::get_size() { return 0; } -bool obj_mesh_vertex_buffer::load(obj_mesh& mesh) { - if (!mesh.num_vertex || !mesh.vertex) +bool obj_mesh_vertex_buffer::load(obj_mesh& mesh, bool dynamic) { + if (!mesh.num_vertex || !mesh.vertex_array) return false; size_t size_vertex; @@ -156,126 +150,126 @@ bool obj_mesh_vertex_buffer::load(obj_mesh& mesh) { void* vertex = force_malloc(size_vertex * mesh.num_vertex); if (vertex) { obj_vertex_format vertex_format = mesh.vertex_format; - obj_vertex_data* vertex_file = mesh.vertex; + obj_vertex_data* vtx = mesh.vertex_array; int32_t num_vertex = mesh.num_vertex; size_t d = (size_t)vertex; if (!mesh.attrib.m.compressed) { - for (int32_t i = 0; i < num_vertex; i++) { + for (int32_t i = 0; i < num_vertex; i++, vtx++) { if (vertex_format & OBJ_VERTEX_POSITION) { - *(vec3*)d = vertex_file[i].position; + *(vec3*)d = vtx->position; d += 12; } if (vertex_format & OBJ_VERTEX_NORMAL) { - *(vec3*)d = vertex_file[i].normal; + *(vec3*)d = vtx->normal; d += 12; } if (vertex_format & OBJ_VERTEX_TANGENT) { - *(vec4*)d = vertex_file[i].tangent; + *(vec4*)d = vtx->tangent; d += 16; } if (vertex_format & OBJ_VERTEX_BINORMAL) { - *(vec3*)d = vertex_file[i].binormal; + *(vec3*)d = vtx->binormal; d += 12; } if (vertex_format & OBJ_VERTEX_TEXCOORD0) { - *(vec2*)d = vertex_file[i].texcoord0; + *(vec2*)d = vtx->texcoord0; d += 8; } if (vertex_format & OBJ_VERTEX_TEXCOORD1) { - *(vec2*)d = vertex_file[i].texcoord1; + *(vec2*)d = vtx->texcoord1; d += 8; } if (vertex_format & OBJ_VERTEX_TEXCOORD2) { - *(vec2*)d = vertex_file[i].texcoord2; + *(vec2*)d = vtx->texcoord2; d += 8; } if (vertex_format & OBJ_VERTEX_TEXCOORD3) { - *(vec2*)d = vertex_file[i].texcoord3; + *(vec2*)d = vtx->texcoord3; d += 8; } if (vertex_format & OBJ_VERTEX_COLOR0) { - *(vec4*)d = vertex_file[i].color0; + *(vec4*)d = vtx->color0; d += 16; } if (vertex_format & OBJ_VERTEX_COLOR1) { - *(vec4*)d = vertex_file[i].color1; + *(vec4*)d = vtx->color1; d += 16; } if (vertex_format & OBJ_VERTEX_BONE_DATA) { - *(vec4*)d = vertex_file[i].bone_weight; + *(vec4*)d = vtx->bone_weight; d += 16; - *(vec4i*)d = vertex_file[i].bone_index; + *(vec4i*)d = vtx->bone_index; d += 16; } if (vertex_format & OBJ_VERTEX_UNKNOWN) { - *(vec4*)d = vertex_file[i].unknown; + *(vec4*)d = vtx->unknown; d += 16; } } } else { - for (int32_t i = 0; i < num_vertex; i++) { + for (int32_t i = 0; i < num_vertex; i++, vtx++) { if (vertex_format & OBJ_VERTEX_POSITION) { - *(vec3*)d = vertex_file[i].position; + *(vec3*)d = vtx->position; d += 12; } if (vertex_format & OBJ_VERTEX_NORMAL) { - vec3 normal = vertex_file[i].normal * 32727.0f; + vec3 normal = vtx->normal * 32727.0f; vec3_to_vec3i16(normal, *(vec3i16*)d); *(int16_t*)(d + 6) = 0; d += 8; } if (vertex_format & OBJ_VERTEX_TANGENT) { - vec4 tangent = vertex_file[i].tangent * 32727.0f; + vec4 tangent = vtx->tangent * 32727.0f; vec4_to_vec4i16(tangent, *(vec4i16*)d); d += 8; } if (vertex_format & OBJ_VERTEX_TEXCOORD0) { - vec2_to_vec2h(vertex_file[i].texcoord0, *(vec2h*)d); + vec2_to_vec2h(vtx->texcoord0, *(vec2h*)d); d += 4; } if (vertex_format & OBJ_VERTEX_TEXCOORD1) { - vec2_to_vec2h(vertex_file[i].texcoord1, *(vec2h*)d); + vec2_to_vec2h(vtx->texcoord1, *(vec2h*)d); d += 4; } if (vertex_format & OBJ_VERTEX_TEXCOORD2) { - vec2_to_vec2h(vertex_file[i].texcoord2, *(vec2h*)d); + vec2_to_vec2h(vtx->texcoord2, *(vec2h*)d); d += 4; } if (vertex_format & OBJ_VERTEX_TEXCOORD3) { - vec2_to_vec2h(vertex_file[i].texcoord3, *(vec2h*)d); + vec2_to_vec2h(vtx->texcoord3, *(vec2h*)d); d += 4; } if (vertex_format & OBJ_VERTEX_COLOR0) { - vec4 color0 = vertex_file[i].color0; + vec4 color0 = vtx->color0; vec4_to_vec4h(color0, *(vec4h*)d); d += 8; } if (vertex_format & OBJ_VERTEX_BONE_DATA) { - vec4 bone_weight = vertex_file[i].bone_weight * 65535.0f; + vec4 bone_weight = vtx->bone_weight * 65535.0f; vec4_to_vec4u16(bone_weight, *(vec4u16*)d); d += 8; - vec4i bone_index = vertex_file[i].bone_index; + vec4i bone_index = vtx->bone_index; vec4i_to_vec4u16(bone_index, *(vec4u16*)d); d += 8; } @@ -284,12 +278,12 @@ bool obj_mesh_vertex_buffer::load(obj_mesh& mesh) { } mesh.size_vertex = (int32_t)size_vertex; - bool ret = load_data(size_vertex * mesh.num_vertex, vertex, mesh.attrib.m.double_buffer ? 2 : 1); + bool ret = load_data(size_vertex * mesh.num_vertex, vertex, mesh.attrib.m.double_buffer ? 2 : 1, dynamic); free_def(vertex); return ret; } -bool obj_mesh_vertex_buffer::load_data(size_t size, const void* data, int32_t count) { +bool obj_mesh_vertex_buffer::load_data(size_t size, const void* data, int32_t count, bool dynamic) { if (!size || count > 3) return false; @@ -298,8 +292,13 @@ bool obj_mesh_vertex_buffer::load_data(size_t size, const void* data, int32_t co glGenBuffers(count, buffers); for (int32_t i = 0; i < count; i++) { - gl_state_bind_array_buffer(buffers[i]); - glBufferData(GL_ARRAY_BUFFER, (GLsizeiptr)size, data, GL_STATIC_DRAW); + gl_state_bind_array_buffer(buffers[i], true); + if (GLAD_GL_VERSION_4_4) + glBufferStorage(GL_ARRAY_BUFFER, + (GLsizeiptr)size, data, dynamic ? GL_DYNAMIC_STORAGE_BIT | GL_MAP_WRITE_BIT : 0); + else + glBufferData(GL_ARRAY_BUFFER, + (GLsizeiptr)size, data, dynamic ? GL_DYNAMIC_DRAW : GL_STATIC_DRAW); } gl_state_bind_array_buffer(0); return true; @@ -380,7 +379,7 @@ obj_set_handler::~obj_set_handler() { obj_set_handler_index_buffer_free(this); obj_set_handler_vertex_buffer_free(this); - delete obj_set; + alloc_handler.reset(); while (tex_file_handler.ptr && tex_file_handler.ptr->count) tex_file_handler.free_data(); while (obj_file_handler.ptr && obj_file_handler.ptr->count) @@ -429,33 +428,33 @@ inline int32_t obj_material_texture_type_get_texture_index( } void obj_skin_set_matrix_buffer(obj_skin* s, mat4* matrices, - mat4* ex_data_matrices, mat4* matrix_buffer, mat4* mat, mat4* global_mat) { - if (!s->bones_count) + mat4* ex_data_matrices, mat4* matrix_buffer, const mat4* mat, const mat4* global_mat) { + if (!s->num_bone) return; if (mat) - for (uint32_t i = 0; i < s->bones_count; i++) { + for (uint32_t i = 0; i < s->num_bone; i++) { mat4 temp; - int32_t bone_id = s->bones[i].id; + int32_t bone_id = s->bone_array[i].id; if (bone_id & 0x8000) mat4_mult(mat, &ex_data_matrices[bone_id & 0x7FFF], &temp); else mat4_mult(mat, &matrices[bone_id], &temp); mat4_mult(&temp, global_mat, &temp); - mat4_mult(&s->bones[i].inv_bind_pose_mat, &temp, &matrix_buffer[i]); + mat4_mult(&s->bone_array[i].inv_bind_pose_mat, &temp, &matrix_buffer[i]); } else - for (uint32_t i = 0; i < s->bones_count; i++) { + for (uint32_t i = 0; i < s->num_bone; i++) { mat4 temp; - int32_t bone_id = s->bones[i].id; + int32_t bone_id = s->bone_array[i].id; if (bone_id & 0x8000) temp = ex_data_matrices[bone_id & 0x7FFF]; else temp = matrices[bone_id]; mat4_mult(&temp, global_mat, &temp); - mat4_mult(&s->bones[i].inv_bind_pose_mat, &temp, &matrix_buffer[i]); + mat4_mult(&s->bone_array[i].inv_bind_pose_mat, &temp, &matrix_buffer[i]); } } @@ -905,17 +904,14 @@ void object_material_msgpack_read(const char* path, const char* set_name, size_t tex_id_num = txp_set->textures.size(); if (set->tex_id_num != tex_id_num) { - uint32_t* tex_id_data = force_malloc_s(uint32_t, tex_id_num); + uint32_t* tex_id_data = handler->alloc_handler->allocate(tex_id_num); memmove(tex_id_data, set->tex_id_data, sizeof(uint32_t) * set->tex_id_num); - free_def(set->tex_id_data); - - memmove(&tex_id_data[set->tex_id_num], ids.data(), sizeof(uint32_t) * (tex_id_num - set->tex_id_num)); - + memmove(&tex_id_data[set->tex_id_num], ids.data(), + sizeof(uint32_t) * (tex_id_num - set->tex_id_num)); set->tex_id_data = tex_id_data; set->tex_id_num = (uint32_t)tex_id_num; handler->tex_num = (uint32_t)tex_id_num; } - } msgpack* replace = msg.read_array("Replace"); @@ -1622,7 +1618,7 @@ inline obj_skin* object_storage_get_obj_skin(object_info obj_info) { for (uint32_t j = 0; j < set->obj_num; j++) if (set->obj_data[j].id == obj_info.id) - return set->obj_data[j].skin_init ? &set->obj_data[j].skin : 0; + return set->obj_data[j].skin; return 0; } @@ -1636,7 +1632,7 @@ inline obj_skin* object_storage_get_obj_skin(object_info obj_info) { for (uint32_t j = 0; j < set->obj_num; j++) if (set->obj_data[j].id == obj_info.id) - return set->obj_data[j].skin_init ? &set->obj_data[j].skin : 0; + return set->obj_data[j].skin; return 0; } return 0; @@ -1829,9 +1825,12 @@ bool object_storage_load_obj_set_check_not_read(uint32_t set_id, if (!data || !size) return false; - obj_set* set = new obj_set; + prj::shared_ptr& alloc = handler->alloc_handler; + alloc = prj::shared_ptr(new alloc_data); + + obj_set* set = alloc->allocate(); handler->obj_set = set; - set->unpack_file(data, size, false); + set->unpack_file(alloc, data, size, false); if (!set->ready) return false; @@ -1940,9 +1939,12 @@ bool object_storage_load_obj_set_check_not_read(uint32_t set_id, handler->name = name; - obj_set* set = new obj_set; + prj::shared_ptr& alloc = handler->alloc_handler; + alloc = prj::shared_ptr(new alloc_data); + + obj_set* set = alloc->allocate(); handler->obj_set = set; - set->unpack_file(osd->data, osd->size, true); + set->unpack_file(alloc, osd->data, osd->size, true); if (!set->ready) return false; @@ -2002,7 +2004,7 @@ inline void object_storage_unload_set(object_database* obj_db, const char* name) handler->load_count = 0; handler->tex_loaded = false; handler->obj_loaded = false; - delete handler->obj_set; + handler->alloc_handler.reset(); handler->obj_set = 0; handler->tex_file_handler.free_data(); handler->obj_file_handler.free_data(); @@ -2034,14 +2036,14 @@ inline void object_storage_unload_set(uint32_t set_id) { handler->load_count = 0; handler->tex_loaded = false; handler->obj_loaded = false; - delete handler->obj_set; + handler->alloc_handler.reset(); handler->obj_set = 0; handler->tex_file_handler.free_data(); handler->obj_file_handler.free_data(); handler->farc_file_handler.free_data(); if (handler->modern) for (auto i = object_storage_data_modern.begin(); i != object_storage_data_modern.end(); i++) - if (i->set_id = set_id) { + if (i->set_id == set_id) { i = object_storage_data_modern.erase(i); break; } @@ -2060,25 +2062,25 @@ static void obj_set_handler_calc_axis_aligned_bounding_box(obj_set_handler* hand for (uint32_t j = 0; j < obj.num_mesh; j++) { obj_mesh& mesh = obj.mesh_array[j]; for (uint32_t k = 0; k < mesh.num_submesh; k++) { - vec3 _min = { 9999999.0f, 9999999.0f, 9999999.0f }; - vec3 _max = { -100000000.0f, -100000000.0f, -100000000.0f }; + vec3 _min = vec3( 9999999.0f, 9999999.0f, 9999999.0f); + vec3 _max = vec3(-100000000.0f, -100000000.0f, -100000000.0f); obj_sub_mesh& sub_mesh = mesh.submesh_array[k]; - uint32_t* indices = (uint32_t*)sub_mesh.indices; - uint32_t indices_count = sub_mesh.indices_count; - obj_vertex_data* vertex = mesh.vertex; + uint32_t* index = sub_mesh.index_array; + uint32_t num_index = sub_mesh.num_index; + obj_vertex_data* vertex_array = mesh.vertex_array; if (sub_mesh.index_format == OBJ_INDEX_U16) - for (uint32_t l = 0; l < indices_count; l++) { - if (indices[l] == 0xFFFFFFFF) + for (uint32_t l = 0; l < num_index; l++, index++) { + if (*index == 0xFFFFFFFF) continue; - vec3 pos = vertex[indices[l]].position; + vec3 pos = vertex_array[*index].position; _min = vec3::min(_min, pos); _max = vec3::max(_max, pos); } else - for (uint32_t l = 0; l < indices_count; l++) { - vec3 pos = vertex[indices[l]].position; + for (uint32_t l = 0; l < num_index; l++, index++) { + vec3 pos = vertex_array[*index].position; _min = vec3::min(_min, pos); _max = vec3::max(_max, pos); } @@ -2236,35 +2238,6 @@ static void obj_set_handler_vertex_buffer_free(obj_set_handler* handler) { handler->vertex_buffer_num = 0; } -inline static void obj_skin_block_constraint_attach_point_load( - obj_skin_block_constraint_attach_point* attach_point, - obj_skin_block_constraint_attach_point* attach_point_file) { - attach_point->affected_by_orientation = attach_point_file->affected_by_orientation; - attach_point->affected_by_scaling = attach_point_file->affected_by_scaling; - attach_point->offset = attach_point_file->offset; -} -inline static void obj_skin_block_constraint_up_vector_load( - obj_skin_block_constraint_up_vector* up_vector, - obj_skin_block_constraint_up_vector* up_vector_file) { - up_vector->active = up_vector_file->active; - up_vector->roll = up_vector_file->roll; - up_vector->affected_axis = up_vector_file->affected_axis; - up_vector->point_at = up_vector_file->point_at; - up_vector->name = str_utils_copy(up_vector_file->name); -} - -inline static void obj_skin_block_node_load(obj_skin_block_node* node, - obj_skin_block_node* node_file) { - node->parent_name = str_utils_copy(node_file->parent_name); - node->position = node_file->position; - node->rotation = node_file->rotation; - node->scale = node_file->scale; -} - -inline static void obj_skin_block_node_free(obj_skin_block_node* node) { - free_def(node->parent_name); -} - inline static size_t obj_vertex_format_get_vertex_size(obj_vertex_format format) { size_t size = 0; if (format & OBJ_VERTEX_POSITION) diff --git a/src/CRE/object.hpp b/src/CRE/object.hpp index 78a28634..4ff29d34 100644 --- a/src/CRE/object.hpp +++ b/src/CRE/object.hpp @@ -44,8 +44,8 @@ struct obj_mesh_vertex_buffer { void cycle_index(); GLuint get_buffer(); GLsizeiptr get_size(); - bool load(obj_mesh& mesh); - bool load_data(size_t size, const void* data, int32_t count); + bool load(obj_mesh& mesh, bool dynamic = false); + bool load_data(size_t size, const void* data, int32_t count, bool dynamic); void unload(); }; @@ -74,6 +74,7 @@ struct obj_set_handler { bool obj_loaded; p_file_handler tex_file_handler; bool tex_loaded; + prj::shared_ptr alloc_handler; obj_set* obj_set; std::vector> obj_id_data; uint32_t tex_num; @@ -99,7 +100,7 @@ extern int32_t obj_material_texture_type_get_texcoord_index( extern int32_t obj_material_texture_type_get_texture_index( obj_material_texture_type type, int32_t base_index); extern void obj_skin_set_matrix_buffer(obj_skin* s, mat4* matrices, - mat4* ex_data_matrices, mat4* matrix_buffer, mat4* global_mat, mat4* mat); + mat4* ex_data_matrices, mat4* matrix_buffer, const mat4* mat, const mat4* global_mat); extern void object_material_msgpack_read(const char* path, const char* set_name, obj_set* obj_set, object_database* obj_db); diff --git a/src/CRE/ogg_vorbis.cpp b/src/CRE/ogg_vorbis.cpp index 6ee54b9d..d1cf07fd 100644 --- a/src/CRE/ogg_vorbis.cpp +++ b/src/CRE/ogg_vorbis.cpp @@ -6,11 +6,31 @@ #include "ogg_vorbis.hpp" #include "../KKdLib/str_utils.hpp" #include "../KKdLib/vec.hpp" +#include "data.hpp" #include +struct ogg_file_handler_storage { + std::mutex mtx; + bool clear; + std::list list; + + ogg_file_handler_storage(); + ~ogg_file_handler_storage(); + + void free_data(); +}; + static int32_t ogg_file_counter = 0; static int32_t ogg_file_handler_counter = 0; +#define OGG_PLAYBACK_DATA_COUNT 6 +static OggPlayback* ogg_playback_data[OGG_PLAYBACK_DATA_COUNT]; + +static int32_t ogg_file_handler_storage_init_count = 0; +static ogg_file_handler_storage* ogg_file_handler_storage_ptr; + +static p_OggFileHandler* ogg_file_handler_storage_get_ogg_file_handler(size_t index); + OggFileBufferChannelData::OggFileBufferChannelData() : left(), right() { } @@ -379,33 +399,6 @@ void OggFileHandler::Ctrl() { duration_dup = _duration; time_dup = _time; } - - int32_t value = ratio_to_db(1.0); - if (!_channel_pairs_count) - _channel_pairs_count = 2; - - if (_channel_pairs_count >= 3 && _channel_pairs_count <= 4) { - for (int32_t i = 0; i < 2; i++) { - SetChannelPairVolumePan(i, 0, 0, value); - SetChannelPairVolumePan(i, 1, 1, value); - SetChannelPairVolumePan(i, 0, 2, -10000); - SetChannelPairVolumePan(i, 1, 3, -10000); - } - - for (int32_t i = _channel_pairs_count - 2; i < _channel_pairs_count; i++) { - SetChannelPairVolumePan(i, 0, 0, -10000); - SetChannelPairVolumePan(i, 1, 1, -10000); - SetChannelPairVolumePan(i, 0, 2, value); - SetChannelPairVolumePan(i, 1, 3, value); - } - } - else - for (int32_t i = 0; i < _channel_pairs_count; i++) { - SetChannelPairVolumePan(i, 0, 0, value); - SetChannelPairVolumePan(i, 1, 1, value); - SetChannelPairVolumePan(i, 0, 2, value); - SetChannelPairVolumePan(i, 1, 3, value); - } } void OggFileHandler::FillBuffer(sound_buffer_data* buffer, size_t samples_count) { @@ -422,6 +415,29 @@ void OggFileHandler::FillBuffer(sound_buffer_data* buffer, size_t samples_count) } } +int32_t OggFileHandler::GetChannelPairsCount() { + std::unique_lock u_lock(dup_mtx); + return channel_pairs_count_dup; +} + +float_t OggFileHandler::GetDuration() { + std::unique_lock u_lock(dup_mtx); + return (float_t)duration_dup; +} + +OggFileHandlerFileState OggFileHandler::GetFileState() { + return (OggFileHandlerFileState)file_state.get(); +} + +OggFileHandlerPauseState OggFileHandler::GetPauseState() { + return (OggFileHandlerPauseState)pause_state.get(); +} + +float_t OggFileHandler::GetTime() { + std::unique_lock u_lock(dup_mtx); + return (float_t)time_dup; +} + void OggFileHandler::OpenFile() { std::unique_lock u_lock(file_mtx); if (file.OpenFile(path.c_str(), time_seek)) { @@ -446,7 +462,7 @@ void OggFileHandler::ReadBuffer(sound_buffer_data* buffer, size_t samples_count) for (int32_t j = 0; j < 2; j++) for (int32_t k = 0; k < 4; k++) ((float_t*)&channel_pair_volume_pan[i][j])[k] - = db_to_ratio(this->channel_pair_volume_pan[i][j][k]); + = db_to_ratio(this->channel_pair_volume_pan[i][j][k]); channel_pair_volume[i] = db_to_ratio(this->channel_pair_volume[i]) * master_volume; } } @@ -475,7 +491,7 @@ void OggFileHandler::ReadBuffer(sound_buffer_data* buffer, size_t samples_count) if (_samples_count) { for (size_t i = _samples_count; i; i--, buffer++, _buffer_data++) { OggFileBufferChannelData* channel_pair = _buffer_data->channel_pair; - vec4 value = vec4_null; + vec4 value = 0.0f; for (size_t j = 0; j < 4; j++, channel_pair++) { value += (channel_pair_volume_pan[j][0] * (channel_pair_volume[j] * channel_pair->left)); value += (channel_pair_volume_pan[j][1] * (channel_pair_volume[j] * channel_pair->right)); @@ -539,9 +555,15 @@ void OggFileHandler::SetFileState(OggFileHandlerFileState state) { Reset(false); } +void OggFileHandler::SetMasterVolume(int32_t value) { + value = clamp_def(value, -10000, 0); + std::unique_lock u_lock(volume_mtx); + master_volume = value; +} + void OggFileHandler::SetPath(std::string& path) { std::unique_lock u_lock(mtx); - file_state.set(1); + file_state.set(OGG_FILE_HANDLER_FILE_STATE_LOADING); playback_state.set(OGG_FILE_HANDLER_PLAYBACK_STATE_PLAY); { @@ -557,6 +579,19 @@ void OggFileHandler::SetPath(std::string&& path) { SetPath(*(std::string*)&path); } +void OggFileHandler::SetPauseState(OggFileHandlerPauseState value) { + pause_state.set(value); +} + +void OggFileHandler::SetPlaybackState(OggFileHandlerPlaybackState value) { + playback_state.set(value); +} + +void OggFileHandler::SetTimeSeek(float_t value) { + std::unique_lock u_lock(file_mtx); + time_seek = value; +} + void OggFileHandler::FillBufferStatic(sound_buffer_data* buffer, size_t samples_count, void* data) { if (data) ((OggFileHandler*)data)->FillBuffer(buffer, samples_count); @@ -564,7 +599,12 @@ void OggFileHandler::FillBufferStatic(sound_buffer_data* buffer, size_t samples_ bool OggFileHandler::LoadFile(void* data, const char* path, const char* file, uint32_t hash) { OggFileHandler* ofh = (OggFileHandler*)data; - ofh->SetPath(std::string(path) + file); + + std::string _path; + _path.assign(path); + _path.append(file); + + ofh->SetPath(_path.c_str()); return true; } @@ -581,3 +621,321 @@ void OggFileHandler::ThreadMain(OggFileHandler* ofh) { ofh->Ctrl(); ofh->thread_state.set(0); } + + +p_OggFileHandler::p_OggFileHandler(OggFileHandler* ptr) { + this->ptr = ptr; +} + +p_OggFileHandler::~p_OggFileHandler() { + if (ptr) { + delete ptr; + ptr = 0; + } + + std::list& list = ogg_file_handler_storage_ptr->list; + for (std::list::iterator i = list.begin(); i != list.end();) + if (*i == this) { + list.erase(i); + break; + } + else + i++; +} + +int32_t p_OggFileHandler::GetChannelPairsCount() { + if (ptr) + return ptr->GetChannelPairsCount(); + return 0; +} + +float_t p_OggFileHandler::GetDuration() { + if (ptr) + return ptr->GetDuration(); + return 0.0f; +} + +OggFileHandlerFileState p_OggFileHandler::GetFileState() { + if (ptr) + return ptr->GetFileState(); + return OGG_FILE_HANDLER_FILE_STATE_MAX; +} + +OggFileHandlerPauseState p_OggFileHandler::GetPauseState() { + if (ptr) + return ptr->GetPauseState(); + return OGG_FILE_HANDLER_PAUSE_STATE_MAX; +} + +float_t p_OggFileHandler::GetTime() { + if (ptr) + return ptr->GetTime(); + return 0.0f; +} + +void p_OggFileHandler::SetChannelPairVolumePan(size_t src_channel_pair, + int32_t src_channel, int32_t dst_channel, int32_t value) { + if (ptr) + ptr->SetChannelPairVolumePan(src_channel_pair, src_channel, dst_channel, value); +} + +void p_OggFileHandler::SetMasterVolume(int32_t value) { + if (ptr) + ptr->SetMasterVolume(value); +} + +void p_OggFileHandler::SetPath(std::string& path) { + if (ptr) + ptr->SetPath(path); +} + +void p_OggFileHandler::SetPath(std::string&& path) { + if (ptr) + ptr->SetPath(path); +} + +void p_OggFileHandler::SetPauseState(OggFileHandlerPauseState value) { + if (ptr) + ptr->SetPauseState(value); +} + +void p_OggFileHandler::SetPlaybackState(OggFileHandlerPlaybackState value) { + if (ptr) + ptr->SetPlaybackState(value); +} + +void p_OggFileHandler::SetTimeSeek(float_t value) { + if (ptr) + ptr->SetTimeSeek(value); +} + +OggPlayback::OggPlayback(size_t index) : state(), ogg_file_handler(), time_seek() { + this->index = index; +} + +OggPlayback::~OggPlayback() { + Reset(); +} + +int32_t OggPlayback::GetChannelPairsCount() { + if (state == 1 && ogg_file_handler) + return ogg_file_handler->GetChannelPairsCount(); + return 0; +} + +float_t OggPlayback::GetDuration() { + if (state == 1 && ogg_file_handler) + return ogg_file_handler->GetDuration(); + return 0.0f; +} + +OggFileHandlerFileState OggPlayback::GetFileState() { + if (state == 1 && ogg_file_handler) + return ogg_file_handler->GetFileState(); + return OGG_FILE_HANDLER_FILE_STATE_MAX; +} + +OggFileHandlerPauseState OggPlayback::GetPauseState() { + if (state == 1 && ogg_file_handler) + return ogg_file_handler->GetPauseState(); + return OGG_FILE_HANDLER_PAUSE_STATE_MAX; +} + +float_t OggPlayback::GetTime() { + if (state == 1 && ogg_file_handler) + return ogg_file_handler->GetTime(); + return 0.0f; +} + +void OggPlayback::Reset() { + if (state == 1) + delete ogg_file_handler; + state = 0; + ogg_file_handler = 0; +} + +void OggPlayback::SetChannelPairVolumePan(size_t src_channel_pair, + int32_t src_channel, int32_t dst_channel, int32_t value) { + if (state != 1 || !ogg_file_handler) + return; + + switch (src_channel) { + case 0: + case 1: + break; + default: + src_channel = 2; + break; + } + + switch (dst_channel) { + case 0: + case 1: + case 2: + case 3: + break; + default: + dst_channel = 4; + break; + } + ogg_file_handler->SetChannelPairVolumePan(src_channel_pair, src_channel, dst_channel, value); +} + +void OggPlayback::SetMasterVolume(int32_t value) { + if (state == 1 && ogg_file_handler) + ogg_file_handler->SetMasterVolume(value); +} + +void OggPlayback::SetPath(std::string& path) { + data_list[DATA_AFT].load_file(this, path.c_str(), OggPlayback::LoadFile); +} + +void OggPlayback::SetPath(std::string&& path) { + SetPath(*(std::string*)&path); +} + +void OggPlayback::SetPauseState(OggFileHandlerPauseState value) { + if (state == 1 && ogg_file_handler) + ogg_file_handler->SetPauseState(value); +} + +void OggPlayback::SetPlaybackState(OggFileHandlerPlaybackState value) { + if (state == 1 && ogg_file_handler) + ogg_file_handler->SetPlaybackState(value); +} + +void OggPlayback::SetTimeSeek(float_t value) { + time_seek = value; +} + +bool OggPlayback::LoadFile(void* data, const char* path, const char* file, uint32_t hash) { + OggPlayback* op = (OggPlayback*)data; + + std::string _path; + _path.assign(path); + _path.append(file); + + if (_path.size() < 4) + return false; + + std::string ext; + ext.assign(_path.c_str() + (_path.size() - 4), 4); + for (char& c : ext) + if (c >= 'A' && c <= 'Z') + c += 0x20; + + if (ext.compare(".ogg")) + return false; + + if (op->state != 1) { + op->Reset(); + op->ogg_file_handler = ogg_file_handler_storage_get_ogg_file_handler(op->index); + } + + if (op->ogg_file_handler) { + op->ogg_file_handler->SetTimeSeek(op->time_seek); + op->ogg_file_handler->SetPath(_path); + op->state = 1; + } + return true; +} + +void OggPlayback::SetChannelPairVolumePan(OggPlayback* op) { + if (!op) + return; + + int32_t value = ratio_to_db(1.0); + + int32_t _channel_pairs_count = op->GetChannelPairsCount(); + if (!_channel_pairs_count) + _channel_pairs_count = 2; + + if (_channel_pairs_count >= 3 && _channel_pairs_count <= 4) { + for (int32_t i = 0; i < 2; i++) { + op->SetChannelPairVolumePan(i, 0, 0, value); + op->SetChannelPairVolumePan(i, 1, 1, value); + op->SetChannelPairVolumePan(i, 0, 2, -10000); + op->SetChannelPairVolumePan(i, 1, 3, -10000); + } + + for (int32_t i = _channel_pairs_count - 2; i < _channel_pairs_count; i++) { + op->SetChannelPairVolumePan(i, 0, 0, -10000); + op->SetChannelPairVolumePan(i, 1, 1, -10000); + op->SetChannelPairVolumePan(i, 0, 2, value); + op->SetChannelPairVolumePan(i, 1, 3, value); + } + } + else + for (int32_t i = 0; i < _channel_pairs_count; i++) { + op->SetChannelPairVolumePan(i, 0, 0, value); + op->SetChannelPairVolumePan(i, 1, 1, value); + op->SetChannelPairVolumePan(i, 0, 2, value); + op->SetChannelPairVolumePan(i, 1, 3, value); + } +} + +void ogg_playback_data_init() { + for (size_t i = 0; i < OGG_PLAYBACK_DATA_COUNT; i++) + ogg_playback_data[i] = new OggPlayback(i); +} + +void ogg_playback_data_free() { + for (size_t i = 0; i < OGG_PLAYBACK_DATA_COUNT; i++) + if (ogg_playback_data[i]) { + delete ogg_playback_data[i]; + ogg_playback_data[i] = 0; + } + + if (ogg_file_handler_storage_ptr) + ogg_file_handler_storage_ptr->free_data(); +} + +OggPlayback* ogg_playback_data_get(size_t index) { + if (index >= 0 && index < OGG_PLAYBACK_DATA_COUNT) + return ogg_playback_data[index]; + return 0; +} + +void ogg_file_handler_storage_init() { + if (!ogg_file_handler_storage_init_count) + ogg_file_handler_storage_ptr = new ogg_file_handler_storage; + ogg_file_handler_storage_init_count++; +} + +void ogg_file_handler_storage_free() { + if (!--ogg_file_handler_storage_init_count) { + delete ogg_file_handler_storage_ptr; + ogg_file_handler_storage_ptr = 0; + } +} + +ogg_file_handler_storage::ogg_file_handler_storage() : clear() { + +} + +ogg_file_handler_storage::~ogg_file_handler_storage() { + free_data(); +} + +void ogg_file_handler_storage::free_data() { + if (clear) + return; + + for (p_OggFileHandler*& i : list) + delete i; + clear = true; +} + +static p_OggFileHandler* ogg_file_handler_storage_get_ogg_file_handler(size_t index) { + OggFileHandler* ofh = new OggFileHandler(index); + if (ofh) { + p_OggFileHandler* pofh = new p_OggFileHandler(ofh); + if (pofh) { + std::unique_lock u_lock(ogg_file_handler_storage_ptr->mtx); + ogg_file_handler_storage_ptr->list.push_back(pofh); + return pofh; + } + delete ofh; + } + return 0; +} diff --git a/src/CRE/ogg_vorbis.hpp b/src/CRE/ogg_vorbis.hpp index 663b9c4e..0e53be2c 100644 --- a/src/CRE/ogg_vorbis.hpp +++ b/src/CRE/ogg_vorbis.hpp @@ -133,6 +133,11 @@ struct OggFileHandler { virtual ~OggFileHandler(); void Ctrl(); + int32_t GetChannelPairsCount(); + float_t GetDuration(); + OggFileHandlerFileState GetFileState(); + OggFileHandlerPauseState GetPauseState(); + float_t GetTime(); void FillBuffer(sound_buffer_data* buffer, size_t samples_count); void OpenFile(); void ReadBuffer(sound_buffer_data* buffer, size_t samples_count); @@ -141,10 +146,70 @@ struct OggFileHandler { void SetChannelPairVolumePan(size_t src_channel_pair, int32_t src_channel, int32_t dst_channel, int32_t value); void SetFileState(OggFileHandlerFileState state); + void SetMasterVolume(int32_t value); void SetPath(std::string& path); void SetPath(std::string&& path); + void SetPauseState(OggFileHandlerPauseState value); + void SetPlaybackState(OggFileHandlerPlaybackState value); + void SetTimeSeek(float_t value); static void FillBufferStatic(sound_buffer_data* buffer, size_t samples_count, void* data); static bool LoadFile(void* data, const char* path, const char* file, uint32_t hash); static void ThreadMain(OggFileHandler* ofh); }; + +struct p_OggFileHandler { + OggFileHandler* ptr; + + p_OggFileHandler(OggFileHandler* ptr); + ~p_OggFileHandler(); + + int32_t GetChannelPairsCount(); + float_t GetDuration(); + OggFileHandlerFileState GetFileState(); + OggFileHandlerPauseState GetPauseState(); + float_t GetTime(); + void SetChannelPairVolumePan(size_t src_channel_pair, + int32_t src_channel, int32_t dst_channel, int32_t value); + void SetMasterVolume(int32_t value); + void SetPath(std::string& path); + void SetPath(std::string&& path); + void SetPauseState(OggFileHandlerPauseState value); + void SetPlaybackState(OggFileHandlerPlaybackState value); + void SetTimeSeek(float_t value); +}; + +struct OggPlayback { + size_t index; + int32_t state; + p_OggFileHandler* ogg_file_handler; + float_t time_seek; + + OggPlayback(size_t index); + ~OggPlayback(); + + int32_t GetChannelPairsCount(); + float_t GetDuration(); + OggFileHandlerFileState GetFileState(); + OggFileHandlerPauseState GetPauseState(); + float_t GetTime(); + void Reset(); + void SetChannelPairVolumePan(size_t src_channel_pair, + int32_t src_channel, int32_t dst_channel, int32_t value); + void SetMasterVolume(int32_t value); + void SetPath(std::string& path); + void SetPath(std::string&& path); + void SetPauseState(OggFileHandlerPauseState value); + void SetPlaybackState(OggFileHandlerPlaybackState value); + void SetTimeSeek(float_t value); + + static bool LoadFile(void* data, const char* path, const char* file, uint32_t hash); + static void SetChannelPairVolumePan(OggPlayback* op); +}; + +extern void ogg_playback_data_init(); +extern void ogg_playback_data_free(); +extern OggPlayback* ogg_playback_data_get(size_t index); + +extern void ogg_file_handler_storage_init(); +extern void ogg_file_handler_storage_free(); diff --git a/src/CRE/post_process.cpp b/src/CRE/post_process.cpp index c1037af5..ad4df8d8 100644 --- a/src/CRE/post_process.cpp +++ b/src/CRE/post_process.cpp @@ -15,9 +15,9 @@ extern bool task_stage_is_modern; -post_process::post_process() : ssaa(), mlaa(), ss_alpha_mask(), render_textures_data(), -movie_textures_data(), lens_flare_texture(), lens_shaft_texture(), lens_ghost_texture(), -lens_flare_count(), lens_flare_pos(), lens_shaft_scale(), lens_shaft_inv_scale(), +post_process::post_process() : ssaa(), mlaa(), ss_alpha_mask(), aet_back_tex(), render_textures_data(), +movie_textures_data(), texture_counter(), lens_flare_texture(), lens_shaft_texture(), +lens_ghost_texture(), lens_flare_count(), lens_flare_pos(), lens_shaft_scale(), lens_shaft_inv_scale(), lens_flare_power(), field_A10(), lens_flare_appear_power(), render_width(), render_height(), view_point(), interest(), view_point_prev(), interest_prev(), reset_exposure(), sprite_width(), sprite_height(), screen_x_offset(), screen_y_offset(), screen_width(), screen_height(), mag_filter() { @@ -94,26 +94,30 @@ sprite_height(), screen_x_offset(), screen_y_offset(), screen_width(), screen_he glSamplerParameteri(samplers[1], GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); const float_t verts_quad[] = { - -1.0f, 1.0f, 0.15f, 0.85f, -1.0f, -1.0f, 0.15f, 0.15f, 1.0f, -1.0f, 0.85f, 0.15f, + -1.0f, 1.0f, 0.15f, 0.85f, 1.0f, 1.0f, 0.85f, 0.85f, }; glGenVertexArrays(1, &query_vao); - glGenBuffers(1, &query_vbo); - glBindBuffer(GL_ARRAY_BUFFER, query_vbo); - glBufferData(GL_ARRAY_BUFFER, sizeof(verts_quad), verts_quad, GL_STATIC_DRAW); - gl_state_bind_vertex_array(query_vao); + + glGenBuffers(1, &query_vbo); + gl_state_bind_array_buffer(query_vbo, true); + if (GLAD_GL_VERSION_4_4) + glBufferStorage(GL_ARRAY_BUFFER, sizeof(verts_quad), verts_quad, 0); + else + glBufferData(GL_ARRAY_BUFFER, sizeof(verts_quad), verts_quad, GL_STATIC_DRAW); + glEnableVertexAttribArray(0); glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 16, (void*)0); // Pos glVertexAttrib4f(3, 1.0f, 1.0f, 1.0f, 1.0f); // Color0 glVertexAttrib4f(4, 1.0f, 1.0f, 1.0f, 1.0f); // Color1 glEnableVertexAttribArray(8); glVertexAttribPointer(8, 2, GL_FLOAT, GL_FALSE, 16, (void*)8); // TexCoord0 + gl_state_bind_array_buffer(0); gl_state_bind_vertex_array(0); - glBindBuffer(GL_ARRAY_BUFFER, 0); shader_glsl_param param = {}; param.name = "Exposure Chara"; @@ -128,6 +132,9 @@ sprite_height(), screen_x_offset(), screen_y_offset(), screen_width(), screen_he } post_process::~post_process() { + if (aet_back_tex) + texture_free(aet_back_tex); + if (aa) { delete aa; aa = 0; @@ -180,15 +187,15 @@ void post_process::apply(camera* cam, texture* light_proj_tex, int32_t npr_param for (int32_t i = 0; i < 8; i++) gl_state_bind_sampler(i, 0); - dof->apply(&rend_texture, samplers, cam); + dof->apply(&rend_texture, &buf_texture, samplers, cam); shaders_ft.state_matrix_set_mvp(mat4_identity, mat4_identity, mat4_identity); blur->get_blur(&rend_texture); exposure->get_exposure(cam, render_width, render_height, reset_exposure, blur->tex[4].color_texture->tex, blur->tex[2].color_texture->tex); - tone_map->apply(&rend_texture, light_proj_tex, 0, - &rend_texture, &buf_texture, &sss_contour_texture, + tone_map->apply(&rend_texture, light_proj_tex, (texture*)(aet_back ? aet_back_tex : 0), + &rend_texture, &buf_texture,/* &sss_contour_texture,*/ blur->tex[0].color_texture->tex, exposure->exposure.color_texture->tex, npr_param); if (mlaa) @@ -210,8 +217,7 @@ void post_process::apply(camera* cam, texture* light_proj_tex, int32_t npr_param gl_state_active_bind_texture_2d(0, rend_texture.color_texture->tex); gl_state_bind_sampler(0, samplers[0]); shaders_ft.set(SHADER_FT_REDUCE); - render_texture::draw_params(&shaders_ft, render_width, - render_height, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f); + render_texture::draw_params(&shaders_ft, render_width, render_height); } fbo::blit(rend_texture.fbos[0], post_texture.fbos[0], @@ -226,8 +232,7 @@ void post_process::apply(camera* cam, texture* light_proj_tex, int32_t npr_param uniform_value[U_ALPHA_MASK] = ss_alpha_mask ? 1 : 0; uniform_value[U_REDUCE] = 0; shaders_ft.set(SHADER_FT_REDUCE); - render_texture::draw_params(&shaders_ft, render_width, - render_height, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f); + render_texture::draw_params(&shaders_ft, render_width, render_height); uniform_value[U_ALPHA_MASK] = 0; } else { @@ -252,8 +257,7 @@ void post_process::apply(camera* cam, texture* light_proj_tex, int32_t npr_param } shaders_ft.set(SHADER_FT_MAGNIFY); - render_texture::draw_params(&shaders_ft, render_width, - render_height, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f); + render_texture::draw_params(&shaders_ft, render_width, render_height); } shader::unbind(); @@ -297,12 +301,14 @@ void post_process::ctrl(camera* cam) { void post_process::draw_query_samples(GLuint query, float_t scale, mat4& mat) { glBeginQuery(GL_SAMPLES_PASSED, query); gl_state_bind_vertex_array(query_vao); + query_shader.use(); query_shader.set("mat", false, mat); query_shader.set("scale", scale); glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); gl_state_bind_vertex_array(0); glEndQuery(GL_SAMPLES_PASSED); } + void post_process::init_fbo(int32_t render_width, int32_t render_height, int32_t sprite_width, int32_t sprite_height, int32_t screen_width, int32_t screen_height) { if (this->render_width == render_width && this->render_height == render_height @@ -317,7 +323,11 @@ void post_process::init_fbo(int32_t render_width, int32_t render_height, tone_map->init_fbo(); rend_texture.init(render_width, render_height, 0, GL_RGBA16F, GL_DEPTH_COMPONENT32F); buf_texture.init(render_width, render_height, 0, GL_RGBA16F, 0); - sss_contour_texture.init(render_width, render_height, 0, GL_RGBA16F, GL_DEPTH_COMPONENT32F); + sss_contour_texture.init(render_width, render_height, 0, GL_RGBA8, GL_DEPTH_COMPONENT32F); + if (aet_back_tex) + texture_free(aet_back_tex); + aet_back_tex = texture_load_tex_2d(texture_id(0x25, texture_counter++), GL_RGBA8, render_width, render_height, 0, 0, false); + aet_back_texture.set_color_depth_textures(aet_back_tex->tex, 0, rend_texture.depth_texture->tex); pre_texture.init(render_width, render_height, 0, GL_RGBA16F, 0); post_texture.init(render_width, render_height, 0, GL_RGBA16F, 0); alpha_layer_texture.init(render_width, render_height, 0, GL_RGBA16F, GL_DEPTH_COMPONENT32F); @@ -355,7 +365,7 @@ int32_t post_process::movie_texture_set(texture* movie_texture) { return -1; movie_textures_data[index] = movie_texture; - movie_textures[index].set_color_depth_textures(movie_texture->tex, 0, 0, false); + movie_textures[index].set_color_depth_textures(movie_texture->tex, 0, 0); return index; } @@ -369,7 +379,7 @@ void post_process::movie_texture_free(texture* movie_texture) { return; movie_textures_data[index] = 0; - movie_textures[index].free_data(); + movie_textures[index].free(); } int32_t post_process::render_texture_set(texture* render_texture, bool task_photo) { @@ -385,7 +395,7 @@ int32_t post_process::render_texture_set(texture* render_texture, bool task_phot return -1; render_textures_data[index] = render_texture; - render_textures[index].set_color_depth_textures(render_texture->tex, 0, 0, false); + render_textures[index].set_color_depth_textures(render_texture->tex, 0, 0); return index; } @@ -402,7 +412,7 @@ void post_process::render_texture_free(texture* render_texture, bool task_photo) return; render_textures_data[index] = 0; - render_textures[index].free_data(); + render_textures[index].free(); } void post_process::reset() { @@ -419,3 +429,13 @@ void post_process::reset() { 0, tone_trans_start, tone_trans_end, TONE_MAP_YCC_EXPONENT); reset_exposure = true; } + +void post_process::set_render_texture(bool aet_back) { + if (aet_back) { + aet_back_texture.bind(); + this->aet_back = 1; + } + else + rend_texture.bind(); + glViewport(0, 0, render_width, render_height); +} diff --git a/src/CRE/post_process.hpp b/src/CRE/post_process.hpp index 10a76389..7dc87ebc 100644 --- a/src/CRE/post_process.hpp +++ b/src/CRE/post_process.hpp @@ -31,6 +31,8 @@ struct post_process { render_texture rend_texture; render_texture buf_texture; render_texture sss_contour_texture; + texture* aet_back_tex; + render_texture aet_back_texture; render_texture pre_texture; render_texture post_texture; render_texture fbo_texture; @@ -40,6 +42,7 @@ struct post_process { render_texture render_textures[16]; texture* movie_textures_data[1]; render_texture movie_textures[1]; + int32_t aet_back; post_process_aa* aa; post_process_blur* blur; post_process_dof* dof; @@ -50,6 +53,7 @@ struct post_process { GLuint query_vao; GLuint query_vbo; shader_glsl alpha_layer_shader; + int32_t texture_counter; GLuint lens_flare_texture; GLuint lens_shaft_texture; GLuint lens_ghost_texture; @@ -90,5 +94,6 @@ struct post_process { int32_t render_texture_set(texture* render_texture, bool task_photo); void render_texture_free(texture* render_texture, bool task_photo); void reset(); + void set_render_texture(bool aet_back = false); }; diff --git a/src/CRE/post_process/aa.cpp b/src/CRE/post_process/aa.cpp index 09a6eb63..29370f85 100644 --- a/src/CRE/post_process/aa.cpp +++ b/src/CRE/post_process/aa.cpp @@ -44,7 +44,7 @@ void post_process_aa::apply_mlaa(render_texture* rt, //shaders_ft.set(SHADER_FT_MLAA); uniform_value[U_ALPHA_MASK] = 0; shaders_ft.set(SHADER_FT_MLAA_EDGE); - render_texture::draw_params(&shaders_ft, width, height, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f); + render_texture::draw_params(&shaders_ft, width, height); mlaa_buffer[1].bind(); gl_state_active_bind_texture_2d(0, mlaa_buffer[0].color_texture->tex); @@ -56,7 +56,7 @@ void post_process_aa::apply_mlaa(render_texture* rt, //shaders_ft.set(SHADER_FT_MLAA); uniform_value[U_MLAA_SEARCH] = 2; shaders_ft.set(SHADER_FT_MLAA_AREA); - render_texture::draw_params(&shaders_ft, width, height, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f); + render_texture::draw_params(&shaders_ft, width, height); buf_rt->bind(); gl_state_active_bind_texture_2d(0, rt->color_texture->tex); @@ -67,7 +67,7 @@ void post_process_aa::apply_mlaa(render_texture* rt, //shaders_ft.set(SHADER_FT_MLAA); uniform_value[U_ALPHA_MASK] = ss_alpha_mask ? 1 : 0; shaders_ft.set(SHADER_FT_MLAA_BLEND); - render_texture::draw_params(&shaders_ft, width, height, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f); + render_texture::draw_params(&shaders_ft, width, height); uniform_value[U_ALPHA_MASK] = 0; gl_state_active_bind_texture_2d(0, 0); gl_state_active_bind_texture_2d(1, 0); diff --git a/src/CRE/post_process/blur.cpp b/src/CRE/post_process/blur.cpp index c86e74da..db97c507 100644 --- a/src/CRE/post_process/blur.cpp +++ b/src/CRE/post_process/blur.cpp @@ -28,7 +28,7 @@ post_process_blur:: ~post_process_blur() { return; for (int32_t i = 0; i < count_down; i++) - tex_down[i].free_data(); + tex_down[i].free(); free_def(tex_down); free_def(height_down); free_def(width_down); @@ -40,21 +40,20 @@ void post_process_blur::get_blur(render_texture* rt) { int32_t i = 0; if (count_down > 0) { uniform_value[U_REDUCE] = 1; - render_texture::shader_set(&shaders_ft, SHADER_FT_REDUCE); + shaders_ft.set(SHADER_FT_REDUCE); for (; i < count_down; i++) { glViewport(0, 0, width_down[i], height_down[i]); tex_down[i].bind(); gl_state_active_bind_texture_2d(0, i ? tex_down[i - 1].color_texture->tex : rt->color_texture->tex); - render_texture::draw_params(&shaders_ft, - width_down[i], height_down[i], 1.0f, 1.0f, 1.0f, 1.0f, 1.0f); + render_texture::draw_params(&shaders_ft, width_down[i], height_down[i]); } i--; } uniform_value[U_REDUCE] = 3; - render_texture::shader_set(&shaders_ft, SHADER_FT_REDUCE); + shaders_ft.set(SHADER_FT_REDUCE); shaders_ft.local_frag_set(2, 1.1f, 1.1f, 1.1f, 0.0f); glViewport(0, 0, 256, 144); @@ -62,10 +61,11 @@ void post_process_blur::get_blur(render_texture* rt) { gl_state_active_bind_texture_2d(0, count_down > 0 ? tex_down[i].color_texture->tex : rt->color_texture->tex); - render_texture::draw_params(&shaders_ft, width, height, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f); + render_texture::draw_params(&shaders_ft, width, height); - uniform_value[U_GAUSS] = 1; - render_texture::shader_set(&shaders_ft, SHADER_FT_GAUSS); + //uniform_value[U_GAUSS] = 1; + //shaders_ft.set(SHADER_FT_GAUSS); + shaders_ft.set(SHADER_FT_GAUSS_CONE); glViewport(0, 0, 256, 144); tex[5].bind(); @@ -74,7 +74,7 @@ void post_process_blur::get_blur(render_texture* rt) { 1.0f, data.intensity.x * 0.5f, data.intensity.y * 0.5f, data.intensity.z * 0.5f, 1.0f); uniform_value[U_REDUCE] = 1; - render_texture::shader_set(&shaders_ft, SHADER_FT_REDUCE); + shaders_ft.set(SHADER_FT_REDUCE); glViewport(0, 0, 128, 72); tex[1].bind(); @@ -82,7 +82,7 @@ void post_process_blur::get_blur(render_texture* rt) { render_texture::draw_params(&shaders_ft, 256, 144, 0.75f, 1.0f, 1.0f, 1.0f, 1.0f); uniform_value[U_REDUCE] = 1; - render_texture::shader_set(&shaders_ft, SHADER_FT_REDUCE); + shaders_ft.set(SHADER_FT_REDUCE); glViewport(0, 0, 64, 36); tex[2].bind(); @@ -90,20 +90,21 @@ void post_process_blur::get_blur(render_texture* rt) { render_texture::draw_params(&shaders_ft, 128, 72, 0.75f, 1.0f, 1.0f, 1.0f, 1.0f); uniform_value[U_REDUCE] = 1; - render_texture::shader_set(&shaders_ft, SHADER_FT_REDUCE); + shaders_ft.set(SHADER_FT_REDUCE); glViewport(0, 0, 32, 18); tex[3].bind(); gl_state_active_bind_texture_2d(0, tex[2].color_texture->tex); render_texture::draw_params(&shaders_ft, 64, 36, 0.75f, 1.0f, 1.0f, 1.0f, 1.0f); - uniform_value[U_EXPOSURE] = 0; - render_texture::shader_set(&shaders_ft, SHADER_FT_EXPOSURE); + //uniform_value[U_EXPOSURE] = 0; + //shaders_ft.set(SHADER_FT_EXPOSURE); + shaders_ft.set(SHADER_FT_EXPOSURE_MINIFY); glViewport(0, 0, 8, 8); tex[4].bind(); gl_state_active_bind_texture_2d(0, tex[3].color_texture->tex); - render_texture::draw_params(&shaders_ft, 32, 18, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f); + render_texture::draw_params(&shaders_ft, 32, 18); vec3 intensity = data.intensity; vec3* gauss = data.gauss; @@ -112,8 +113,9 @@ void post_process_blur::get_blur(render_texture* rt) { for (int32_t i = 0; i < POST_PROCESS_BLUR_GAUSSIAN_KERNEL_SIZE; i++) v[i] = gauss[i] * intensity; - uniform_value[U_GAUSS] = 0; - render_texture::shader_set(&shaders_ft, SHADER_FT_GAUSS); + //uniform_value[U_GAUSS] = 0; + //shaders_ft.set(SHADER_FT_GAUSS); + shaders_ft.set(SHADER_FT_GAUSS_USUAL); shaders_ft.local_frag_set(1, 1.0f, 0.0f, 1.0f, 0.0f); for (int32_t i = 0; i < POST_PROCESS_BLUR_GAUSSIAN_KERNEL_SIZE; i++) shaders_ft.local_frag_set(4ULL + i, v[i].x, v[i].y, v[i].z, 0.0f); @@ -121,7 +123,7 @@ void post_process_blur::get_blur(render_texture* rt) { glViewport(0, 0, 128, 72); tex[0].bind(); gl_state_active_bind_texture_2d(0, tex[1].color_texture->tex); - render_texture::draw_params(&shaders_ft, 128, 72, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f); + render_texture::draw_params(&shaders_ft, 128, 72); fbo::blit(tex[0].fbos[0], tex[1].fbos[0], 0, 0, 128, 72, 0, 0, 128, 72, GL_COLOR_BUFFER_BIT, GL_LINEAR); @@ -129,7 +131,7 @@ void post_process_blur::get_blur(render_texture* rt) { glViewport(0, 0, 64, 36); tex[0].bind(); gl_state_active_bind_texture_2d(0, tex[2].color_texture->tex); - render_texture::draw_params(&shaders_ft, 64, 36, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f); + render_texture::draw_params(&shaders_ft, 64, 36); fbo::blit(tex[0].fbos[0], tex[2].fbos[0], 0, 0, 64, 36, 0, 0, 64, 36, GL_COLOR_BUFFER_BIT, GL_LINEAR); @@ -137,7 +139,7 @@ void post_process_blur::get_blur(render_texture* rt) { glViewport(0, 0, 32, 18); tex[0].bind(); gl_state_active_bind_texture_2d(0, tex[3].color_texture->tex); - render_texture::draw_params(&shaders_ft, 32, 18, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f); + render_texture::draw_params(&shaders_ft, 32, 18); fbo::blit(tex[0].fbos[0], tex[3].fbos[0], 0, 0, 32, 18, 0, 0, 32, 18, GL_COLOR_BUFFER_BIT, GL_LINEAR); @@ -147,7 +149,7 @@ void post_process_blur::get_blur(render_texture* rt) { glViewport(0, 0, 128, 72); tex[0].bind(); gl_state_active_bind_texture_2d(0, tex[1].color_texture->tex); - render_texture::draw_params(&shaders_ft, 128, 72, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f); + render_texture::draw_params(&shaders_ft, 128, 72); fbo::blit(tex[0].fbos[0], tex[1].fbos[0], 0, 0, 128, 72, 0, 0, 128, 72, GL_COLOR_BUFFER_BIT, GL_LINEAR); @@ -155,7 +157,7 @@ void post_process_blur::get_blur(render_texture* rt) { glViewport(0, 0, 64, 36); tex[0].bind(); gl_state_active_bind_texture_2d(0, tex[2].color_texture->tex); - render_texture::draw_params(&shaders_ft, 64, 36, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f); + render_texture::draw_params(&shaders_ft, 64, 36); fbo::blit(tex[0].fbos[0], tex[2].fbos[0], 0, 0, 64, 36, 0, 0, 64, 36, GL_COLOR_BUFFER_BIT, GL_LINEAR); @@ -163,13 +165,13 @@ void post_process_blur::get_blur(render_texture* rt) { glViewport(0, 0, 32, 18); tex[0].bind(); gl_state_active_bind_texture_2d(0, tex[3].color_texture->tex); - render_texture::draw_params(&shaders_ft, 32, 18, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f); + render_texture::draw_params(&shaders_ft, 32, 18); fbo::blit(tex[0].fbos[0], tex[3].fbos[0], 0, 0, 32, 18, 0, 0, 32, 18, GL_COLOR_BUFFER_BIT, GL_LINEAR); uniform_value[U_REDUCE] = 7; - render_texture::shader_set(&shaders_ft, SHADER_FT_REDUCE); + shaders_ft.set(SHADER_FT_REDUCE); glViewport(0, 0, 256, 144); tex[0].bind(); @@ -249,12 +251,8 @@ void post_process_blur::init_fbo(int32_t width, int32_t height) { } void post_process_blur::initialize_data(const vec3& radius, const vec3& intensity) { - data.radius.x = clamp_def(radius.x, 1.0f, 3.0f); - data.radius.y = clamp_def(radius.y, 1.0f, 3.0f); - data.radius.z = clamp_def(radius.z, 1.0f, 3.0f); - data.intensity.x = clamp_def(intensity.x, 0.0f, 2.0f); - data.intensity.y = clamp_def(intensity.y, 0.0f, 2.0f); - data.intensity.z = clamp_def(intensity.z, 0.0f, 2.0f); + data.radius = vec3::clamp(radius, 1.0f, 3.0f); + data.intensity = vec3::clamp(intensity, 0.0f, 2.0f); post_process_blur_radius_calculate(this); } @@ -263,9 +261,7 @@ vec3 post_process_blur::get_intensity() { } void post_process_blur::set_intensity(const vec3& value) { - data.intensity.x = clamp_def(value.x, 0.0f, 2.0f); - data.intensity.y = clamp_def(value.y, 0.0f, 2.0f); - data.intensity.z = clamp_def(value.z, 0.0f, 2.0f); + data.intensity = vec3::clamp(value, 0.0f, 2.0f); } vec3 post_process_blur::get_radius() { @@ -273,11 +269,8 @@ vec3 post_process_blur::get_radius() { } void post_process_blur::set_radius(const vec3& value) { - vec3 temp; - temp.x = clamp_def(value.x, 1.0f, 3.0f); - temp.y = clamp_def(value.y, 1.0f, 3.0f); - temp.z = clamp_def(value.z, 1.0f, 3.0f); - if (memcmp(&temp, &data.radius, sizeof(vec3))) { + vec3 temp = vec3::clamp(value, 1.0f, 3.0f); + if (temp != data.radius) { data.radius = temp; post_process_blur_radius_calculate(this); } diff --git a/src/CRE/post_process/dof.cpp b/src/CRE/post_process/dof.cpp index d3ed1aba..60a73f0e 100644 --- a/src/CRE/post_process/dof.cpp +++ b/src/CRE/post_process/dof.cpp @@ -602,20 +602,20 @@ static const dof_pv dof_pv_default = { namespace renderer { struct DOF3 { static void apply_f2(post_process_dof* dof, render_texture* rt, - GLuint* samplers, GLuint color_texture, GLuint depth_texture, - float_t min_distance, float_t max_distance, float_t fov, float_t focus, - float_t focus_range, float_t fuzzing_range, float_t ratio); + render_texture* buf, GLuint* samplers, GLuint color_texture, + GLuint depth_texture, float_t min_distance, float_t max_distance, float_t fov, + float_t focus, float_t focus_range, float_t fuzzing_range, float_t ratio); static void apply_physical(post_process_dof* dof, render_texture* rt, - GLuint* samplers, GLuint color_texture, GLuint depth_texture, - float_t min_distance, float_t max_distance, float_t focus, - float_t focal_length, float_t fov, float_t f_number); + render_texture* buf, GLuint* samplers, GLuint color_texture, + GLuint depth_texture, float_t min_distance, float_t max_distance, + float_t focus, float_t focal_length, float_t fov, float_t f_number); static void render_tiles(post_process_dof* dof, GLuint* samplers, GLuint depth_texture, bool f2); static void downsample(post_process_dof* dof, GLuint* samplers, GLuint color_texture, GLuint depth_texture, bool f2); static void apply_main_filter(post_process_dof* dof, GLuint* samplers, bool f2); - static void upsample(post_process_dof* dof, render_texture* rt, + static void upsample(post_process_dof* dof, render_texture* rt, render_texture* buf, GLuint* samplers, GLuint color_texture, GLuint depth_texture, bool f2); static void update_data(post_process_dof* dof, float_t min_dist, @@ -650,7 +650,7 @@ post_process_dof::~post_process_dof() { } } -void post_process_dof::apply(render_texture* rt, GLuint* samplers, camera* cam) { +void post_process_dof::apply(render_texture* rt, render_texture* buf, GLuint* samplers, camera* cam) { if (!this) return; @@ -663,13 +663,13 @@ void post_process_dof::apply(render_texture* rt, GLuint* samplers, camera* cam) rob_chara* rob_chr = 0; for (int32_t i = 0; i < ROB_CHARA_COUNT; i++) { rob_chara* rob_chr = rob_chara_array_get(i); - if (~rob_chr->data.field_0 & 0x01) + if (!rob_chr->get_visibility()) continue; mat4 mat; sub_1405163C0(rob_chr, 4, &mat); - vec3 chara_trans = vec3_null; + vec3 chara_trans = 0.0f; mat4_get_translation(&mat, &chara_trans); mat4 view_transpose; @@ -681,14 +681,14 @@ void post_process_dof::apply(render_texture* rt, GLuint* samplers, camera* cam) } focus = max_def(focus, (float_t)cam->min_distance); - renderer::DOF3::apply_physical(this, rt, samplers, + renderer::DOF3::apply_physical(this, rt, buf, samplers, rt->color_texture->tex, rt->depth_texture->tex, (float_t)cam->min_distance, (float_t)cam->max_distance, focus, data.debug.focal_length, (float_t)cam->fov_rad, data.debug.f_number); } else { float_t fuzzing_range = max_def(data.debug.f2.fuzzing_range, 0.01f); - renderer::DOF3::apply_f2(this, rt, samplers, + renderer::DOF3::apply_f2(this, rt, buf, samplers, rt->color_texture->tex, rt->depth_texture->tex, (float_t)cam->min_distance, (float_t)cam->max_distance, (float_t)cam->fov_rad, data.debug.f2.focus, data.debug.f2.focus_range, fuzzing_range, data.debug.f2.ratio); @@ -698,7 +698,7 @@ void post_process_dof::apply(render_texture* rt, GLuint* samplers, camera* cam) } else if (data.pv.enable && data.pv.f2.ratio > 0.0f) { float_t fuzzing_range = max_def(data.pv.f2.fuzzing_range, 0.01f); - renderer::DOF3::apply_f2(this, rt, samplers, + renderer::DOF3::apply_f2(this, rt, buf, samplers, rt->color_texture->tex, rt->depth_texture->tex, (float_t)cam->min_distance, (float_t)cam->max_distance, (float_t)cam->fov_rad, data.pv.f2.focus, data.pv.f2.focus_range, fuzzing_range, data.pv.f2.ratio); @@ -714,20 +714,7 @@ void post_process_dof::init_fbo(int32_t width, int32_t height) { if (!this || (this->width == width && this->height == height)) return; - if (textures[0]) { - glDeleteTextures(6, textures); - textures[0] = 0; - } - - if (ubo[0]) { - glDeleteBuffers(2, ubo); - ubo[0] = 0; - } - - if (vao) { - glDeleteVertexArrays(1, &vao); - vao = 0; - } + post_process_dof_free_fbo(this); this->width = width; this->height = height; @@ -754,14 +741,21 @@ void post_process_dof::init_fbo(int32_t width, int32_t height) { fbo[3].init_data(w2, h2, &textures[4], 2, 0); glGenBuffers(2, ubo); - gl_state_bind_uniform_buffer(ubo[0]); - glBufferData(GL_UNIFORM_BUFFER, sizeof(post_process_dof_shader_data), 0, GL_STREAM_DRAW); + gl_state_bind_uniform_buffer(ubo[0], true); + if (GLAD_GL_VERSION_4_4) + glBufferStorage(GL_UNIFORM_BUFFER, + sizeof(post_process_dof_shader_data), 0, GL_DYNAMIC_STORAGE_BIT); + else + glBufferData(GL_UNIFORM_BUFFER, + sizeof(post_process_dof_shader_data), 0, GL_DYNAMIC_DRAW); - uint8_t data[align_val(sizeof(vec2[49]), sizeof(vec4))]; - memset(data, 0, sizeof(data)); - post_process_dof_calculate_texcoords((vec2*)data, 3.0); - gl_state_bind_uniform_buffer(ubo[1]); - glBufferData(GL_UNIFORM_BUFFER, sizeof(data), data, GL_STATIC_DRAW); + vec2 data[49] = {}; + post_process_dof_calculate_texcoords(data, 3.0f); + gl_state_bind_uniform_buffer(ubo[1], true); + if (GLAD_GL_VERSION_4_4) + glBufferStorage(GL_UNIFORM_BUFFER, sizeof(data), data, 0); + else + glBufferData(GL_UNIFORM_BUFFER, sizeof(data), data, GL_STATIC_DRAW); glGenVertexArrays(1, &vao); } @@ -914,9 +908,7 @@ static GLuint post_process_dof_shader_compile(GLenum type, const char* data) { if (!success) { GLchar* info_log = force_malloc_s(GLchar, 0x10000); glGetShaderInfoLog(shader, 0x10000, 0, info_log); - printf("DOF Shader compile error: "); - printf(info_log); - putchar('\n'); + printf_debug("DOF Shader compile error:\n%s\n", info_log); free_def(info_log); } return shader; @@ -935,9 +927,7 @@ static GLuint post_process_dof_program_link(GLuint vert_shad, GLuint frag_shad) if (!success) { GLchar* info_log = force_malloc_s(GLchar, 0x10000); glGetProgramInfoLog(program, 0x10000, 0, info_log); - printf("DOF shader linking error:\n"); - printf(info_log); - putchar('\n'); + printf_debug("DOF shader linking error:\n%s\n", info_log); free_def(info_log); glDeleteProgram(program); return 0; @@ -952,9 +942,9 @@ static void sub_1405163C0(rob_chara* rob_chr, int32_t a2, mat4* mat) { namespace renderer { void DOF3::apply_f2(post_process_dof* dof, render_texture* rt, - GLuint* samplers, GLuint color_texture, GLuint depth_texture, - float_t min_distance, float_t max_distance, float_t fov, float_t focus, - float_t focus_range, float_t fuzzing_range, float_t ratio) { + render_texture* buf, GLuint* samplers, GLuint color_texture, + GLuint depth_texture, float_t min_distance, float_t max_distance, float_t fov, + float_t focus, float_t focus_range, float_t fuzzing_range, float_t ratio) { gl_state_disable_blend(); gl_state_set_depth_mask(GL_FALSE); gl_state_set_depth_func(GL_ALWAYS); @@ -965,7 +955,7 @@ namespace renderer { render_tiles(dof, samplers, depth_texture, true); downsample(dof, samplers, color_texture, depth_texture, true); apply_main_filter(dof, samplers, true); - upsample(dof, rt, samplers, color_texture, depth_texture, true); + upsample(dof, rt, buf, samplers, color_texture, depth_texture, true); gl_state_use_program(0); for (int32_t i = 0; i < 8; i++) { @@ -976,9 +966,9 @@ namespace renderer { } void DOF3::apply_physical(post_process_dof* dof, render_texture* rt, - GLuint* samplers, GLuint color_texture, GLuint depth_texture, - float_t min_distance, float_t max_distance, float_t focus, - float_t focal_length, float_t fov, float_t f_number) { + render_texture* buf, GLuint* samplers, GLuint color_texture, + GLuint depth_texture, float_t min_distance, float_t max_distance, + float_t focus, float_t focal_length, float_t fov, float_t f_number) { gl_state_disable_blend(); gl_state_set_depth_mask(GL_FALSE); gl_state_set_depth_func(GL_ALWAYS); @@ -989,7 +979,7 @@ namespace renderer { render_tiles(dof, samplers, depth_texture, false); downsample(dof, samplers, color_texture, depth_texture, false); apply_main_filter(dof, samplers, false); - upsample(dof, rt, samplers, color_texture, depth_texture, false); + upsample(dof, rt, buf, samplers, color_texture, depth_texture, false); gl_state_use_program(0); for (int32_t i = 0; i < 8; i++) { @@ -1057,9 +1047,9 @@ namespace renderer { glDrawArrays(GL_TRIANGLE_STRIP, 0, 3); } - void DOF3::upsample(post_process_dof* dof, render_texture* rt, + void DOF3::upsample(post_process_dof* dof, render_texture* rt, render_texture* buf, GLuint* samplers, GLuint color_texture, GLuint depth_texture, bool f2) { - rt->bind(); + buf->bind(); glViewport(0, 0, dof->width, dof->height); if (f2) gl_state_use_program(dof->program[8]); @@ -1078,6 +1068,10 @@ namespace renderer { gl_state_active_bind_texture_2d(4, depth_texture); gl_state_bind_sampler(4, samplers[1]); glDrawArrays(GL_TRIANGLE_STRIP, 0, 3); + + fbo::blit(buf->fbos[0], rt->fbos[0], + 0, 0, buf->color_texture->width, buf->color_texture->height, + 0, 0, rt->color_texture->width, rt->color_texture->height, GL_COLOR_BUFFER_BIT, GL_LINEAR); } void DOF3::update_data(post_process_dof* dof, float_t min_dist, @@ -1102,7 +1096,11 @@ namespace renderer { data.g_depth_params2.z = -4.5f / (fuzzing_range * fuzzing_range); data.g_depth_params2.w = ratio * 8.0f; - gl_state_bind_uniform_buffer(dof->ubo[0]); - glBufferSubData(GL_UNIFORM_BUFFER, 0, sizeof(post_process_dof_shader_data), &data); + if (GLAD_GL_VERSION_4_5) + glNamedBufferSubData(dof->ubo[0], 0, sizeof(post_process_dof_shader_data), &data); + else { + gl_state_bind_uniform_buffer(dof->ubo[0]); + glBufferSubData(GL_UNIFORM_BUFFER, 0, sizeof(post_process_dof_shader_data), &data); + } } } diff --git a/src/CRE/post_process/dof.hpp b/src/CRE/post_process/dof.hpp index c01643bc..6e50c2af 100644 --- a/src/CRE/post_process/dof.hpp +++ b/src/CRE/post_process/dof.hpp @@ -57,7 +57,7 @@ struct post_process_dof { post_process_dof(); virtual ~post_process_dof(); - void apply(render_texture* rt, GLuint* samplers, camera* cam); + void apply(render_texture* rt, render_texture* buf, GLuint* samplers, camera* cam); void init_fbo(int32_t width, int32_t height); void initialize_data(dof_debug* debug, dof_pv* pv); diff --git a/src/CRE/post_process/exposure.cpp b/src/CRE/post_process/exposure.cpp index c5ac1e41..7839c0d1 100644 --- a/src/CRE/post_process/exposure.cpp +++ b/src/CRE/post_process/exposure.cpp @@ -46,7 +46,7 @@ void post_process_exposure::get_exposure(camera* cam, int32_t render_width, float_t v20 = powf(tanf((float_t)(cam->fov_rad * 0.5f)) * 3.4f, 2.0f); for (int32_t i = 0; i < ROB_CHARA_COUNT; i++, v6++) { rob_chara* rob_chr = rob_chara_array_get(i); - if (!rob_chr || ~rob_chr->data.field_0 & 1) + if (!rob_chr || !rob_chr->get_visibility()) continue; vec4 v34 = { 0.05f, 0.0f, -0.04f, 1.0f }; @@ -142,8 +142,9 @@ void post_process_exposure::get_exposure(camera* cam, int32_t render_width, } if (!v2 || reset_exposure) { - uniform_value[U_EXPOSURE] = 1; - render_texture::shader_set(&shaders_ft, SHADER_FT_EXPOSURE); + //uniform_value[U_EXPOSURE] = 1; + //shaders_ft.set(SHADER_FT_EXPOSURE); + shaders_ft.set(SHADER_FT_EXPOSURE_MEASURE); shaders_ft.local_frag_set(1, chara_data[0].field_80, chara_data[1].field_80, @@ -161,8 +162,7 @@ void post_process_exposure::get_exposure(camera* cam, int32_t render_width, exposure_history.bind(); gl_state_active_bind_texture_2d(0, in_tex_0); gl_state_active_bind_texture_2d(1, in_tex_1); - render_texture::draw_params(&shaders_ft, - reset_exposure ? 32 : 1, 1, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f); + render_texture::draw_params(&shaders_ft, reset_exposure ? 32 : 1, 1); exposure_history_counter++; exposure_history_counter %= 32; } @@ -170,7 +170,10 @@ void post_process_exposure::get_exposure(camera* cam, int32_t render_width, glViewport(0, 0, 1, 1); exposure.bind(); gl_state_active_bind_texture_2d(0, exposure_history.color_texture->tex); - render_texture::draw_params(&shaders_ft, 1, 1, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f); + //uniform_value[U_EXPOSURE] = 2; + //shaders_ft.set(SHADER_FT_EXPOSURE); + shaders_ft.set(SHADER_FT_EXPOSURE_AVERAGE); + render_texture::draw_params(&shaders_ft, 1, 1); } void post_process_exposure::get_exposure_chara_data(void* pp, camera* cam) { @@ -178,13 +181,15 @@ void post_process_exposure::get_exposure_chara_data(void* pp, camera* cam) { gl_state_set_color_mask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE); gl_state_set_depth_mask(GL_FALSE); + gl_state_disable_cull_face(); post_process_exposure_chara_data* v3 = chara_data; - int32_t v4 = query_index++ % 3; + int32_t v4 = (query_index + 1) % 3; + query_index = v4; int32_t v7 = (v4 + 2) % 3; for (int32_t i = 0; i < ROB_CHARA_COUNT; i++, v3++) { rob_chara* rob_chr = rob_chara_array_get(i); - if (!rob_chr || ~rob_chr->data.field_0 & 1) + if (!rob_chr || !rob_chr->get_visibility()) continue; float_t max_face_depth = rob_chr->get_max_face_depth(); @@ -213,6 +218,7 @@ void post_process_exposure::get_exposure_chara_data(void* pp, camera* cam) { gl_state_set_color_mask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); gl_state_set_depth_mask(GL_TRUE); + gl_state_enable_cull_face(); } void post_process_exposure::init_fbo() { @@ -224,7 +230,7 @@ void post_process_exposure::init_fbo() { if (!exposure_history.color_texture) exposure_history.init(32, 1, 0, GL_R32F, 0); if (!exposure.color_texture) - exposure.init(1, 1, 0, GL_R32F, 0); + exposure.init(2, 2, 0, GL_R32F, 0); for (int32_t i = 0; i < ROB_CHARA_COUNT; i++) if (!chara_data[i].query[0]) diff --git a/src/CRE/post_process/tone_map.cpp b/src/CRE/post_process/tone_map.cpp index f88d937c..40bc914b 100644 --- a/src/CRE/post_process/tone_map.cpp +++ b/src/CRE/post_process/tone_map.cpp @@ -30,7 +30,7 @@ post_process_tone_map::~post_process_tone_map() { } void post_process_tone_map::apply(render_texture* in_tex, texture* light_proj_tex, texture* back_2d_tex, - render_texture* rt, render_texture* buf_rt, render_texture* contour_rt, + render_texture* rt, render_texture* buf_rt,/* render_texture* contour_rt,*/ GLuint in_tex_0, GLuint in_tex_1, int32_t npr_param) { if (!this) return; @@ -43,16 +43,15 @@ void post_process_tone_map::apply(render_texture* in_tex, texture* light_proj_te if (data.update_tex) { post_process_tone_map_calculate_tex(this); - glBindTexture(GL_TEXTURE_1D, tone_map); - glTexImage1D(GL_TEXTURE_1D, 0, GL_RG16F, - 16 * POST_PROCESS_TONE_MAP_SAT_GAMMA_SAMPLES, 0, GL_RG, GL_FLOAT, data.tex); - glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); - - GLint swizzle[] = { GL_RED, GL_RED, GL_RED, GL_GREEN }; - glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - glTexParameteriv(GL_TEXTURE_1D, GL_TEXTURE_SWIZZLE_RGBA, swizzle); - glBindTexture(GL_TEXTURE_1D, 0); + if (GLAD_GL_VERSION_4_5) + glTextureSubImage2D(tone_map, 0, 0, 0, + 16 * POST_PROCESS_TONE_MAP_SAT_GAMMA_SAMPLES, 1, GL_RG, GL_FLOAT, data.tex); + else { + gl_state_bind_texture_2d(tone_map); + glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, + 16 * POST_PROCESS_TONE_MAP_SAT_GAMMA_SAMPLES, 1, GL_RG, GL_FLOAT, data.tex); + gl_state_bind_texture_2d(0); + } data.update_tex = false; } @@ -63,14 +62,12 @@ void post_process_tone_map::apply(render_texture* in_tex, texture* light_proj_te mat4_scale(1.0f, (float_t)rt->color_texture->height / (float_t)rt->color_texture->width, 1.0f, &lens_shaft_mat); - uniform_value[U16] = 0; uniform_value[U_TONE_MAP] = (int32_t)data.tone_map_method; uniform_value[U_FLARE] = 0; uniform_value[U_SCENE_FADE] = data.scene_fade.w > 0.009999999f ? 1 : 0; uniform_value[U_AET_BACK] = 0; uniform_value[U_LIGHT_PROJ] = 0; - uniform_value[U_NPR] = 0; - uniform_value[U25] = 0; + //uniform_value[U25] = 0; glViewport(0, 0, rt->color_texture->width, rt->color_texture->height); buf_rt->bind(); @@ -86,29 +83,32 @@ void post_process_tone_map::apply(render_texture* in_tex, texture* light_proj_te shaders_ft.local_frag_set(7, shader_data.p_inv_tone); gl_state_active_bind_texture_2d(0, in_tex->color_texture->tex); gl_state_active_bind_texture_2d(1, in_tex_0); - gl_state_active_bind_texture_2d(2, 0); - gl_state_active_texture(2); - glBindTexture(GL_TEXTURE_1D, tone_map); + gl_state_active_bind_texture_2d(2, tone_map); gl_state_active_bind_texture_2d(3, in_tex_1); - if (uniform_value[U_LIGHT_PROJ] && light_proj_tex) - gl_state_active_bind_texture_2d(6, light_proj_tex->tex); - else if (uniform_value[U_AET_BACK] && back_2d_tex) + + if (back_2d_tex) { gl_state_active_bind_texture_2d(6, back_2d_tex->tex); + uniform_value[U_AET_BACK] = 1; + } + + if (light_proj_tex) { + gl_state_active_bind_texture_2d(6, light_proj_tex->tex); + uniform_value[U_LIGHT_PROJ] = 1; + } + if (npr_param == 1) { - gl_state_active_bind_texture_2d(16, contour_rt->color_texture->tex); + /*gl_state_active_bind_texture_2d(16, contour_rt->color_texture->tex); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); gl_state_active_bind_texture_2d(17, contour_rt->depth_texture->tex); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);*/ gl_state_active_bind_texture_2d(14, rt->depth_texture->tex); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); } render_texture::draw_custom(&shaders_ft); - gl_state_active_texture(2); - glBindTexture(GL_TEXTURE_1D, 0); - uniform_value[U16] = 1; + gl_state_active_bind_texture_2d(2, 0); fbo::blit(buf_rt->fbos[0], rt->fbos[0], 0, 0, buf_rt->color_texture->width, buf_rt->color_texture->height, @@ -119,8 +119,34 @@ void post_process_tone_map::init_fbo() { if (!this) return; - if (!tone_map) - glGenTextures(1, &tone_map); + if (!tone_map) { + if (GLAD_GL_VERSION_4_5) { + glCreateTextures(GL_TEXTURE_2D, 1, &tone_map); + + glTextureStorage2D(tone_map, 1, GL_RG16F, 16 * POST_PROCESS_TONE_MAP_SAT_GAMMA_SAMPLES, 1); + glTextureParameteri(tone_map, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + glTextureParameteri(tone_map, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); + + const GLint swizzle[] = { GL_RED, GL_RED, GL_RED, GL_GREEN }; + glTextureParameteri(tone_map, GL_TEXTURE_MIN_FILTER, GL_LINEAR); + glTextureParameteri(tone_map, GL_TEXTURE_MAG_FILTER, GL_LINEAR); + glTextureParameteriv(tone_map, GL_TEXTURE_SWIZZLE_RGBA, swizzle); + } + else { + glGenTextures(1, &tone_map); + + gl_state_bind_texture_2d(tone_map); + glTexStorage2D(GL_TEXTURE_2D, 1, GL_RG16F, 16 * POST_PROCESS_TONE_MAP_SAT_GAMMA_SAMPLES, 1); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); + + const GLint swizzle[] = { GL_RED, GL_RED, GL_RED, GL_GREEN }; + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); + glTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_RGBA, swizzle); + gl_state_bind_texture_2d(0); + } + } } void post_process_tone_map::initialize_data(float_t exposure, bool auto_exposure, @@ -142,17 +168,11 @@ void post_process_tone_map::initialize_data(float_t exposure, bool auto_exposure data.gamma_rate = clamp_def(gamma_rate, 0.5f, 2.0f); data.saturate_power = clamp_def(saturate_power, 1, 6); data.saturate_coeff = clamp_def(saturate_coeff, 0.0f, 1.0f); - data.scene_fade.x = clamp_def(scene_fade_color.x, 0.0f, 1.0f); - data.scene_fade.y = clamp_def(scene_fade_color.y, 0.0f, 1.0f); - data.scene_fade.z = clamp_def(scene_fade_color.z, 0.0f, 1.0f); + *(vec3*)&data.scene_fade.x = vec3::clamp(scene_fade_color, 0.0f, 1.0f); data.scene_fade.w = clamp_def(scene_fade_alpha, 0.0f, 1.0f); data.scene_fade_blend_func = clamp_def(scene_fade_blend_func, 0, 2); - data.tone_trans_start.x = clamp_def(tone_trans_start.x, 0.0f, 1.0f); - data.tone_trans_start.y = clamp_def(tone_trans_start.y, 0.0f, 1.0f); - data.tone_trans_start.z = clamp_def(tone_trans_start.z, 0.0f, 1.0f); - data.tone_trans_end.x = clamp_def(tone_trans_end.x, 0.0f, 1.0f); - data.tone_trans_end.y = clamp_def(tone_trans_end.y, 0.0f, 1.0f); - data.tone_trans_end.z = clamp_def(tone_trans_end.z, 0.0f, 1.0f); + data.tone_trans_start = vec3::clamp(tone_trans_start, 0.0f, 1.0f); + data.tone_trans_end = vec3::clamp(tone_trans_end, 0.0f, 1.0f); data.tone_map_method = clamp_def(tone_map_method, TONE_MAP_YCC_EXPONENT, TONE_MAP_RGB_LINEAR2); data.update_tex = false; data.update = true; @@ -270,12 +290,8 @@ vec4 post_process_tone_map::get_scene_fade() { } void post_process_tone_map::set_scene_fade(const vec4& value) { - vec4 temp; - temp.x = clamp_def(value.x, 0.0f, 1.0f); - temp.y = clamp_def(value.y, 0.0f, 1.0f); - temp.z = clamp_def(value.z, 0.0f, 1.0f); - temp.z = clamp_def(value.w, 0.0f, 1.0f); - if (memcmp(&temp, &data.scene_fade, sizeof(vec4))) { + vec4 temp = vec4::clamp(value, 0.0f, 1.0f); + if (temp != data.scene_fade) { data.scene_fade = temp; data.update = true; } @@ -310,11 +326,8 @@ vec3 post_process_tone_map::get_scene_fade_color() { } void post_process_tone_map::set_scene_fade_color(const vec3& value) { - vec3 temp; - temp.x = clamp_def(value.x, 0.0f, 1.0f); - temp.y = clamp_def(value.y, 0.0f, 1.0f); - temp.z = clamp_def(value.z, 0.0f, 1.0f); - if (memcmp(&temp, &data.scene_fade, sizeof(vec3))) { + vec3 temp = vec3::clamp(value, 0.0f, 1.0f); + if (temp != *(vec3*)&data.scene_fade) { *(vec3*)&data.scene_fade = temp; data.update = true; } @@ -347,11 +360,8 @@ vec3 post_process_tone_map::get_tone_trans_end() { } void post_process_tone_map::set_tone_trans_end(const vec3& value) { - vec3 temp; - temp.x = clamp_def(value.x, 0.0f, 1.0f); - temp.y = clamp_def(value.y, 0.0f, 1.0f); - temp.z = clamp_def(value.z, 0.0f, 1.0f); - if (memcmp(&temp, &data.tone_trans_end, sizeof(vec3))) { + vec3 temp = vec3::clamp(value, 0.0f, 1.0f); + if (temp != data.tone_trans_end) { data.tone_trans_end = temp; data.update = true; } @@ -362,11 +372,8 @@ vec3 post_process_tone_map::get_tone_trans_start() { } void post_process_tone_map::set_tone_trans_start(const vec3& value) { - vec3 temp; - temp.x = clamp_def(value.x, 0.0f, 1.0f); - temp.y = clamp_def(value.y, 0.0f, 1.0f); - temp.z = clamp_def(value.z, 0.0f, 1.0f); - if (memcmp(&temp, &data.tone_trans_start, sizeof(vec3))) { + vec3 temp = vec3::clamp(value, 0.0f, 1.0f); + if (temp != data.tone_trans_start) { data.tone_trans_start = temp; data.update = true; } diff --git a/src/CRE/post_process/tone_map.hpp b/src/CRE/post_process/tone_map.hpp index 79b90dc9..5ba04f32 100644 --- a/src/CRE/post_process/tone_map.hpp +++ b/src/CRE/post_process/tone_map.hpp @@ -56,7 +56,7 @@ struct post_process_tone_map { virtual ~post_process_tone_map(); void apply(render_texture* in_tex, texture* light_proj_tex, texture* back_2d_tex, - render_texture* rt, render_texture* buf_rt, render_texture* contour_rt, + render_texture* rt, render_texture* buf_rt,/* render_texture* contour_rt,*/ GLuint in_tex_0, GLuint in_tex_1, int32_t npr_param); void init_fbo(); void initialize_data(float_t exposure, bool auto_exposure, diff --git a/src/CRE/pv_db.cpp b/src/CRE/pv_db.cpp index f9da3635..f2e4b92b 100644 --- a/src/CRE/pv_db.cpp +++ b/src/CRE/pv_db.cpp @@ -1375,17 +1375,25 @@ namespace pv_db { std::string key; std::string val; - if (kv.read("0.key", key) && kv.read("0.val", val)) - ex_info[0] = { key, val }; + if (kv.read("0.key", key) && kv.read("0.val", val)) { + ex_info[0].first.assign(key); + ex_info[0].second.assign(val); + } - if (kv.read("1.key", key) && kv.read("1.val", val)) - ex_info[1] = { key, val }; + if (kv.read("1.key", key) && kv.read("1.val", val)) { + ex_info[1].first.assign(key); + ex_info[1].second.assign(val); + } - if (kv.read("2.key", key) && kv.read("2.val", val)) - ex_info[2] = { key, val }; + if (kv.read("2.key", key) && kv.read("2.val", val)) { + ex_info[2].first.assign(key); + ex_info[2].second.assign(val); + } - if (kv.read("3.key", key) && kv.read("3.val", val)) - ex_info[3] = { key, val }; + if (kv.read("3.key", key) && kv.read("3.val", val)) { + ex_info[3].first.assign(key); + ex_info[3].second.assign(val); + } kv.close_scope(); } diff --git a/src/CRE/pv_expression.cpp b/src/CRE/pv_expression.cpp index 2a84ec9a..b8681efe 100644 --- a/src/CRE/pv_expression.cpp +++ b/src/CRE/pv_expression.cpp @@ -7,6 +7,7 @@ #include #include "pv_expression.hpp" #include "../KKdLib/hash.hpp" +#include "../KKdLib/str_utils.hpp" #include "rob/rob.hpp" #include "render_context.hpp" @@ -52,7 +53,10 @@ pv_expression_file::~pv_expression_file() { } void pv_expression_file::load_file(pv_expression_file* exp_file, const void* data, size_t size) { - exp_file->data->read(data, size, exp_file->data->modern); + prj::shared_ptr& alloc = exp_file->alloc_handler; + alloc = prj::shared_ptr(new alloc_data); + + exp_file->data->unpack_file(alloc, data, size, exp_file->data->modern); } void pv_expression_array_ctrl(void* rob_chr) { @@ -177,6 +181,7 @@ void pv_expression_file_unload(const char* file) { } i->file_handler.free_data(); + i->alloc_handler.reset(); } delete i; @@ -200,6 +205,7 @@ void pv_expression_file_unload(uint32_t hash) { } i->file_handler.free_data(); + i->alloc_handler.reset(); } pv_expression_file_storage.erase(pv_expression_file_storage.begin() @@ -247,8 +253,8 @@ bool pv_expression::ctrl() { } void pv_expression::face_cl_set_data(float_t frame) { - pv_exp_data* v2 = face_cl_data_curr; - pv_exp_data* v3 = face_cl_data_prev; + pv_exp_data* curr = face_cl_data_curr; + pv_exp_data* prev = face_cl_data_prev; int32_t id = 4; float_t duration = 0.0f; @@ -258,45 +264,45 @@ void pv_expression::face_cl_set_data(float_t frame) { if (face_cl_data_update) { face_cl_data_update = false; - if (v2->type == 1) { - value = v2->value; - id = v2->id; + if (curr->type == 1) { + value = curr->value; + id = curr->id; } - if (v2->type == 1 && frame - v2->frame >= v2->trans) - v3 = v2++; - else if (v3->type == 1) { - id = v3->id; + if (curr->type == 1 && frame - curr->frame >= curr->trans) + prev = curr++; + else if (prev->type == 1) { + id = prev->id; duration = 0.0f; - value = v3->value; + value = prev->value; offset = 0.0f; } } else { - float_t v9 = 1.0f; - if (v3->trans + v3->frame + 1.0f < v2->frame || v2->trans <= 0.0f) - v9 = 0.0f; + float_t _offset = 1.0f; + if (prev->trans + prev->frame + 1.0f < curr->frame || curr->trans <= 0.0f) + _offset = 0.0f; - if (v2->frame + v9 > frame || v2->type != 1) { - face_cl_data_curr = v2; - face_cl_data_prev = v3; + if (curr->frame + _offset > frame || curr->type != 1) { + face_cl_data_curr = curr; + face_cl_data_prev = prev; return; } - value = v2->value; - id = v2->id; + value = curr->value; + id = curr->id; - float_t v10 = frame - v2->frame; - float_t v11 = v2->trans - v10; - if (v11 < 0.0f) { - v11 = 0.0f; - v10 = 0.0f; + offset = frame - curr->frame; + duration = curr->trans - offset; + if (duration < 0.0f) { + duration = 0.0f; + offset = 0.0f; } - duration = (1.0f / frame_speed) * v11; + duration = (1.0f / frame_speed) * duration; if (duration > 0.0f) - offset = (1.0f / frame_speed) * v10; - v3 = v2++; + offset = (1.0f / frame_speed) * offset; + prev = curr++; } if (id != 4 && rob_chr) { @@ -306,37 +312,37 @@ void pv_expression::face_cl_set_data(float_t frame) { rob_chr->set_eyelid_mottbl_motion_from_face(id, duration, value, offset, aft_mot_db); } - face_cl_data_curr = v2; - face_cl_data_prev = v3; + face_cl_data_curr = curr; + face_cl_data_prev = prev; } void pv_expression::face_cl_set_frame(float_t frame) { - pv_exp_data* v2 = face_cl_data_prev; - pv_exp_data* v3 = face_cl_data_curr; + pv_exp_data* curr = face_cl_data_curr; + pv_exp_data* prev = face_cl_data_prev; - if (frame < v2->frame) { - v2 = face_cl_data; - v3 = face_cl_data; + if (frame < prev->frame) { + curr = face_cl_data; + prev = face_cl_data; } bool update = false; - if (frame > v3->frame && v3->type != -1) { - pv_exp_data* v5 = v3 + 1; - while (v5->type != -1 && frame > v5->frame) { - v2 = v3; - v3 = v5++; + if (curr->type != -1 && frame > curr->frame) { + pv_exp_data* next = curr + 1; + while (next->type != -1 && frame > next->frame) { + prev = curr; + curr = next++; update = true; } } - face_cl_data_curr = v3; - face_cl_data_prev = v2; + face_cl_data_curr = curr; + face_cl_data_prev = prev; face_cl_data_update = update; } void pv_expression::face_set_data(float_t frame) { - pv_exp_data* v2 = face_data_curr; - pv_exp_data* v3 = face_data_prev; + pv_exp_data* curr = face_data_curr; + pv_exp_data* prev = face_data_prev; int32_t expression_id = 78; float_t value = 0.0f; @@ -345,45 +351,45 @@ void pv_expression::face_set_data(float_t frame) { if (face_data_update) { face_data_update = false; - if (!v2->type) { - expression_id = v2->id; - value = v2->value; + if (!curr->type) { + expression_id = curr->id; + value = curr->value; } - if (!v2->type && frame - v2->frame >= v2->trans || v3->type) - v3 = v2++; + if (!curr->type && frame - curr->frame >= curr->trans || prev->type) + prev = curr++; else { - expression_id = v3->id; - value = v3->value; + expression_id = prev->id; + value = prev->value; duration = 0.0f; offset = 0.0f; } } else { - float_t v10 = 1.0f; - if (v3->trans + v3->frame + 1.0f < v2->frame || v2->trans <= 0.0f) - v10 = 0.0f; + float_t _offset = 1.0f; + if (prev->trans + prev->frame + 1.0f < curr->frame || curr->trans <= 0.0f) + _offset = 0.0f; - if (v2->frame + v10 > frame || v2->type) { - face_data_prev = v3; - face_data_curr = v2; + if (curr->frame + _offset > frame || curr->type) { + face_data_prev = prev; + face_data_curr = curr; return; } - expression_id = v2->id; - value = v2->value; + expression_id = curr->id; + value = curr->value; - float_t v11 = frame - v2->frame; - float_t v12 = v2->trans - v11; - if (v12 < 0.0f) { - v12 = 0.0f; - v11 = 0.0f; + offset = frame - curr->frame; + duration = curr->trans - offset; + if (duration < 0.0f) { + duration = 0.0f; + offset = 0.0f; } - duration = (1.0f / frame_speed) * v12; + duration = (1.0f / frame_speed) * duration; if (duration > 0.0f) - offset = (1.0f / frame_speed) * v11; - v3 = v2++; + offset = (1.0f / frame_speed) * offset; + prev = curr++; } if (expression_id != 78 && rob_chr) { @@ -395,31 +401,31 @@ void pv_expression::face_set_data(float_t frame) { duration, 0.0f, 1.0f, -1, offset, false, aft_mot_db); } - face_data_prev = v3; - face_data_curr = v2; + face_data_prev = prev; + face_data_curr = curr; } void pv_expression::face_set_frame(float_t frame) { - pv_exp_data* v2 = face_data_prev; - pv_exp_data* v3 = face_data_curr; + pv_exp_data* curr = face_data_curr; + pv_exp_data* prev = face_data_prev; - if (frame < v2->frame) { - v2 = face_data; - v3 = face_data; + if (frame < prev->frame) { + curr = face_data; + prev = face_data; } bool update = false; - if (frame > v3->frame && v3->type != -1) { - pv_exp_data* v5 = v3 + 1; - while (v5->type != -1 && frame > v5->frame) { - v2 = v3; - v3 = v5++; + if (curr->type != -1 && frame > curr->frame) { + pv_exp_data* next = curr + 1; + while (next->type != -1 && frame > next->frame) { + prev = curr; + curr = next++; update = true; } } - face_data_curr = v3; - face_data_prev = v2; + face_data_curr = curr; + face_data_prev = prev; face_data_update = update; } @@ -465,7 +471,7 @@ bool pv_expression::set_motion(uint32_t hash, int32_t motion_id) { return false; pv_exp* exp = pv_exp_file->data; - if (!exp->motion_data.size()) { + if (!exp->motion_num) { reset_data(); return false; } @@ -475,32 +481,35 @@ bool pv_expression::set_motion(uint32_t hash, int32_t motion_id) { const char* motion_name = aft_mot_db->get_motion_name(motion_id); - size_t motion_index = -1; - for (pv_exp_mot& i : exp->motion_data) - if (!i.name.compare(motion_name)) { - motion_index = (&i - exp->motion_data.data()); + pv_exp_mot* mot = 0; + + pv_exp_mot* motion_data = exp->motion_data; + uint32_t motion_num = exp->motion_num; + for (uint32_t i = 0; i < motion_num; i++) + if (!str_utils_compare(motion_data[i].name, motion_name)) { + mot = &motion_data[i]; break; } - if (motion_index == -1) { + if (!mot) { reset_data(); return false; } this->motion_id = motion_id; - pv_exp_data* face_data = exp->motion_data[motion_index].face_data; + pv_exp_data* face_data = mot->face_data; if (this->face_data != face_data) { this->face_data = face_data; - this->face_data_prev = face_data; this->face_data_curr = face_data; + this->face_data_prev = face_data; } - pv_exp_data* face_cl_data = exp->motion_data[motion_index].face_cl_data; + pv_exp_data* face_cl_data = mot->face_cl_data; if (this->face_cl_data != face_cl_data) { this->face_cl_data = face_cl_data; - this->face_cl_data_prev = face_cl_data; this->face_cl_data_curr = face_cl_data; + this->face_cl_data_prev = face_cl_data; if (rob_chr) rob_chr->autoblink_disable(); } diff --git a/src/CRE/pv_expression.hpp b/src/CRE/pv_expression.hpp index c2178a36..7d1b9e59 100644 --- a/src/CRE/pv_expression.hpp +++ b/src/CRE/pv_expression.hpp @@ -12,6 +12,7 @@ struct pv_expression_file { p_file_handler file_handler; pv_exp* data; + prj::shared_ptr alloc_handler; int32_t load_count; uint32_t hash; diff --git a/src/CRE/pv_param.cpp b/src/CRE/pv_param.cpp index 14e4a67d..3787f3ed 100644 --- a/src/CRE/pv_param.cpp +++ b/src/CRE/pv_param.cpp @@ -19,8 +19,8 @@ namespace pv_param { bloom::bloom() { id = -1; - color = vec3_null; - brightpass = vec3_null; + color = 0.0f; + brightpass = 0.0f; range = 0.0f; } @@ -48,7 +48,7 @@ namespace pv_param { saturation = 1.0f; lightness = 1.0f; exposure = 1.0f; - gamma = vec3_identity; + gamma = 1.0f; contrast = 1.0f; } @@ -282,26 +282,26 @@ namespace pv_param { if (!aft_data->check_directory_exists(path.c_str())) return false; - if (aft_data->check_file_exists(path.c_str(), "dof.txt")) - dof_file = path + "dof.txt"; - else { + if (aft_data->check_file_exists(path.c_str(), "dof.txt")) { + dof_file.assign(path); + dof_file.append("dof.txt"); + } + else dof_file.clear(); - dof_file.shrink_to_fit(); - } - if (aft_data->check_file_exists(path.c_str(), "cc.txt")) - cc_file = path + "cc.txt"; - else { + if (aft_data->check_file_exists(path.c_str(), "cc.txt")) { + dof_file.assign(path); + dof_file.append("cc.txt"); + } + else cc_file.clear(); - cc_file.shrink_to_fit(); - } - if (aft_data->check_file_exists(path.c_str(), "bloom.txt")) - bloom_file = path + "bloom.txt"; - else { - bloom_file.clear(); - bloom_file.shrink_to_fit(); + if (aft_data->check_file_exists(path.c_str(), "bloom.txt")) { + dof_file.assign(path); + dof_file.append("bloom.txt"); } + else + bloom_file.clear(); if ((!dof_file.size() || file_data.load_dof_file(dof_file)) && (!cc_file.size() || file_data.load_color_correction_file(cc_file)) @@ -411,11 +411,15 @@ namespace pv_param { } static bool load_text_file(void* data, const char* path, const char* file, uint32_t hash) { - file_stream s; - s.open((std::string(path) + file).c_str(), "rb"); - if (s.check_not_null()) { - *(std::string*)data = s.read_string(s.length); - s.close(); + std::string s; + s.assign(path); + s.append(file); + + file_stream fs; + fs.open(s.c_str(), "rb"); + if (fs.check_not_null()) { + *(std::string*)data = fs.read_string(fs.get_length()); + fs.close(); return true; } return false; @@ -676,6 +680,47 @@ namespace pv_param_task { frame = -1.0f; } + static void get_autofocus_data(float_t distance, float_t fov, float_t& focus, + float_t& focus_range, float_t& fuzzing_range, float_t& ratio) { + float_t v5 = tanf(fov * DEG_TO_RAD_FLOAT * 0.5f); + float_t v6 = distance * 1000.0f; + float_t v7 = 36.0f / (v5 * 2.0f); + v7 *= v7; + + float_t _focus_range = (v6 * 0.36608f * v6) / (v7 - v6 * 0.36608f) * 0.001f; + if (_focus_range >= 0.0f) { + float_t _ratio = (v7 * 20000.0f) / (v6 * 220000.0f + v6 * 11.0f * v6) * 3.0048077f; + + float_t range; + if (_ratio >= 1.0f) { + range = (v6 * 3.6608f * v6) / (v7 - v6 * 3.6608f) * 0.001f; + if (range < 0.2f) + range = 0.2f; + _ratio = 1.0f; + } + else + range = 20.0f; + + if (_focus_range < 0.2f) + _focus_range = 0.2f; + + float_t _fuzzing_range = range - _focus_range; + if (_fuzzing_range < 0.01f) + _fuzzing_range = 0.01f; + + focus = distance; + focus_range = _focus_range; + fuzzing_range = _fuzzing_range; + ratio = _ratio; + } + else { + focus = 0.0f; + focus_range = 0.0f; + fuzzing_range = 0.0f; + ratio = 0.0f; + } + } + #define DOF_FIX 1 void PostProcessCtrlDof::Set() { @@ -693,7 +738,7 @@ namespace pv_param_task { #else if (autofocus) { #endif - vec3 trans = vec3_null; + vec3 trans = 0.0f; rob_chara* rob_chr = rob_chara_array_get(autofocus ? data.data.chara_id : 0); if (rob_chr) { motion_blend_mot* mot = rob_chr->bone_data->motion_loaded.front(); @@ -708,40 +753,9 @@ namespace pv_param_task { cam->get_view_point(view_point); float_t fov = (float_t)cam->get_fov(); - focus = vec3::distance(trans, view_point); + float_t distance = vec3::distance(trans, view_point); - float_t v5 = tanf(fov * DEG_TO_RAD_FLOAT * 0.5f); - float_t v6 = focus * 1000.0f; - float_t v7 = 36.0f / (v5 * 2.0f); - v7 *= v7; - float_t v8 = v6 * 0.36608f * v6 / (v7 - v6 * 0.36608f) * 0.001f; - if (v8 >= 0.0f) { - float_t v9 = v7 - (v6 * 3.6608f); - float_t v10 = 20.0f; - float_t v11 = (v7 * 20000.0f) / (v6 * 220000.0f + v6 * 11.0f * v6); - focus_range = (v8 + v8) * 0.5f; - float_t v13 = (v6 * 3.6608f * v6) / v9 * 0.001f; - if (v11 >= 0.3328f) - v10 = v13; - if (v10 <= 0.2f) - v10 = 0.2f; - if (focus_range <= 0.2f) - focus_range = 0.2f; - if (v11 >= 0.3328f) - ratio = 1.0f; - else - ratio = v11 * 3.004807711f; - - fuzzing_range = v10 - focus_range; - if (fuzzing_range <= 0.01f) - fuzzing_range = 0.01f; - } - else { - focus = 0.0f; - focus_range = 0.0f; - fuzzing_range = 0.0f; - ratio = 0.0f; - } + get_autofocus_data(distance, fov, focus, focus_range, fuzzing_range, ratio); if (autofocus) { data.data.focus = focus; diff --git a/src/CRE/random.cpp b/src/CRE/random.cpp index 6375aedc..1d3c4b4e 100644 --- a/src/CRE/random.cpp +++ b/src/CRE/random.cpp @@ -54,6 +54,16 @@ uint32_t rand_state_array_get_int(uint32_t min, uint32_t max, int32_t id) { return 0; } +void rand_state_array_set_seed(uint32_t seed, int32_t id) { + RandState* rand_state = rand_state_array_get(id); + if (rand_state) + rand_state->mt.seed(seed); +} + +void rand_state_array_4_set_seed_1393939() { + rand_state_array_set_seed(1393939, 4); +} + void rand_state_array_free() { delete[] rand_state_array; } diff --git a/src/CRE/random.hpp b/src/CRE/random.hpp index 597c66e0..2f7fd8b9 100644 --- a/src/CRE/random.hpp +++ b/src/CRE/random.hpp @@ -20,4 +20,6 @@ extern RandState* rand_state_array_get(int32_t id); extern float_t rand_state_array_get_float(int32_t id); extern uint32_t rand_state_array_get_int(int32_t id); extern uint32_t rand_state_array_get_int(uint32_t min, uint32_t max, int32_t id); +extern void rand_state_array_set_seed(uint32_t seed, int32_t id); +extern void rand_state_array_4_set_seed_1393939(); extern void rand_state_array_free(); diff --git a/src/CRE/render_context.cpp b/src/CRE/render_context.cpp index 347f3a1d..f4fc616e 100644 --- a/src/CRE/render_context.cpp +++ b/src/CRE/render_context.cpp @@ -16,13 +16,82 @@ float_t delta_frame_history = 0; int32_t delta_frame_history_int = 0; +static void object_data_get_vertex_attrib_buffer_bindings(draw_object* draw, + int32_t texcoord_array[2], GLuint vertex_attrib_buffer_binding[16]); + static void render_context_light_param_data_ibl_set_diffuse(light_param_ibl_diffuse* diffuse, int32_t level); static void render_context_light_param_data_ibl_set_specular(light_param_ibl_specular* specular); +static const GLuint POSITION_INDEX = 0; +static const GLuint BONE_WEIGHT_INDEX = 1; +static const GLuint NORMAL_INDEX = 2; +static const GLuint COLOR0_INDEX = 3; +static const GLuint COLOR1_INDEX = 4; +static const GLuint MORPH_COLOR_INDEX = 5; +static const GLuint TANGENT_INDEX = 6; +static const GLuint UNKNOWN_INDEX = 7; +static const GLuint TEXCOORD0_INDEX = 8; +static const GLuint TEXCOORD1_INDEX = 9; +static const GLuint MORPH_POSITION_INDEX = 10; +static const GLuint MORPH_NORMAL_INDEX = 11; +static const GLuint MORPH_TANGENT_INDEX = 12; +static const GLuint MORPH_TEXCOORD0_INDEX = 13; +static const GLuint MORPH_TEXCOORD1_INDEX = 14; +static const GLuint BONE_INDEX_INDEX = 15; + +struct struc_189 { + GLenum type; + int32_t width; + int32_t height; + int32_t max_level; + GLenum color_format; + GLenum depth_format; +}; + +static const struc_189 stru_140A24420[] = { + { GL_TEXTURE_2D, 0x200, 0x100, 0, GL_RGBA8, GL_DEPTH_COMPONENT24 }, + { GL_TEXTURE_2D, 0x200, 0x100, 0, GL_RGBA16F, GL_DEPTH_COMPONENT24 }, + { GL_TEXTURE_2D, 0x400, 0x400, 0, GL_RGBA8, GL_ZERO }, + { GL_TEXTURE_2D, 0x400, 0x400, 0, GL_RGBA8, GL_ZERO }, + { GL_TEXTURE_2D, 0x400, 0x400, 0, GL_RGBA8, GL_ZERO }, + { GL_TEXTURE_2D, 0x100, 0x100, 0, GL_RGBA8, GL_ZERO }, + { GL_TEXTURE_2D, 0x100, 0x100, 0, GL_RGBA32F, GL_ZERO }, + { GL_TEXTURE_2D, 0x100, 0x100, 0, GL_RGBA8, GL_ZERO }, +}; + +static const int32_t stru_140A244E0[][3] = { + { 1, 1, 1 }, + { 0, 0, 0 }, + { 6, 6, 6 }, + { 6, 6, 6 }, + { 6, 6, 6 }, + { 2, 2, 2 }, + { 3, 3, 3 }, + { 4, 4, 4 }, + { 5, 5, 5 }, + { 6, 6, 6 }, + { 7, 7, 7 }, +}; + +draw_state_stats::draw_state_stats() : object_draw_count(), object_translucent_draw_count(), +object_reflect_draw_count(), field_C(), field_10(), draw_count(), draw_triangle_count(), field_1C() { + +} + +void draw_state_stats::reset() { + object_draw_count = 0; + object_translucent_draw_count = 0; + object_reflect_draw_count = 0; + field_C = 0; + field_10 = 0; + draw_count = 0; + draw_triangle_count = 0; + field_1C = 0; +} + sss_data::sss_data() : init(), enable(), npr_contour(), param() { init = true; enable = true; - npr_contour = true; param = { 0.0f, 0.0f, 0.0f, 1.0f }; textures[0].init(640, 360, 0, GL_RGBA16F, GL_DEPTH_COMPONENT32F); @@ -35,9 +104,11 @@ sss_data::~sss_data() { } -draw_pass::draw_pass() :enable(), reflect_blur_num(), reflect_blur_filter(), wait_for_gpu(), cpu_time(), gpu_time(), -time(), draw_pass_3d(), reflect_type(), show_vector_flags(), show_vector_length(), show_vector_z_offset(), -field_2F8(), sss_texture(), npr_param(), field_31C(), field_31D(), field_31E(), field_31F(), field_320(), npr() { +draw_pass::draw_pass() : enable(), reflect_blur_num(), reflect_blur_filter(), +wait_for_gpu(), cpu_time(), gpu_time(), time(), draw_pass_3d(), reflect_type(), tex_index(), +multisample_framebuffer(), multisample_renderbuffer(), multisample(), show_vector_flags(), +show_vector_length(), show_vector_z_offset(), field_2F8(), effect_texture(), npr_param(), +field_31C(), field_31D(), field_31E(), field_31F(), field_320(), npr(), samplers() { for (bool& i : enable) i = true; reflect = true; @@ -47,19 +118,162 @@ field_2F8(), sss_texture(), npr_param(), field_31C(), field_31D(), field_31E(), alpha_z_sort = true; for (bool& i : draw_pass_3d) i = true; - reflect_texture.init(512, 256, 0, GL_RGBA16F, GL_DEPTH_COMPONENT32F); - refract_texture.init(512, 256, 0, GL_RGBA8, GL_DEPTH_COMPONENT32F); + shadow_ptr = new ::shadow; if (shadow_ptr) shadow_ptr->init_data(); + + for (int32_t i = 0; i < 8; i++) { + const struc_189* v2 = &stru_140A24420[i]; + if (v2->type != GL_TEXTURE_2D) + continue; + + render_texture& rt = render_textures[i]; + rt.init(v2->width, v2->height, v2->max_level, v2->color_format, v2->depth_format); + rt.bind(); + glClearColor(0.0f, 0.0f, 0.0f, 0.0f); + glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); + } + gl_state_bind_framebuffer(0); + + glCreateSamplers(18, samplers); + for (int32_t i = 0; i < 18; i++) { + GLuint sampler = samplers[i]; + + static const vec4 border_color = 0.0f; + glSamplerParameterfv(sampler, GL_TEXTURE_BORDER_COLOR, (GLfloat*)&border_color); + glSamplerParameteri(sampler, GL_TEXTURE_MIN_FILTER, + i % 2 ? GL_LINEAR_MIPMAP_LINEAR : GL_LINEAR); + glSamplerParameteri(sampler, GL_TEXTURE_MAG_FILTER, GL_LINEAR); + + GLuint wrap_s; + switch (i / 2 % 3) { + case 0: + wrap_s = GL_CLAMP_TO_EDGE; + break; + case 1: + wrap_s = GL_REPEAT; + break; + case 2: + wrap_s = GL_MIRRORED_REPEAT; + break; + } + glSamplerParameteri(sampler, GL_TEXTURE_WRAP_S, wrap_s); + + GLenum wrap_t; + switch (i / 6 % 3) { + case 0: + wrap_t = GL_CLAMP_TO_EDGE; + break; + case 1: + wrap_t = GL_REPEAT; + break; + case 2: + wrap_t = GL_MIRRORED_REPEAT; + break; + } + glSamplerParameteri(sampler, GL_TEXTURE_WRAP_T, wrap_t); + } } draw_pass::~draw_pass() { delete shadow_ptr; + + if (multisample_renderbuffer) { + glDeleteRenderbuffers(1, &multisample_renderbuffer); + multisample_renderbuffer = 0; + } + + if (multisample_framebuffer) { + glDeleteFramebuffers(1, &multisample_framebuffer); + multisample_framebuffer = 0; + } } -draw_state::draw_state() : stats(), stats_prev(), wireframe(), wireframe_overlay(), light(), -self_shadow(), field_45(), use_global_material(), fog_height(), ex_data_mat(), field_68() { +void draw_pass::add_preprocess(int32_t type, void(*func)(void*), void* data) { + preprocess.push_back({ type, func, data }); +} + +void draw_pass::clear_preprocess(int32_t type) { + for (std::list::iterator i = preprocess.begin(); i != preprocess.end(); i++) + if (i->type == type) { + preprocess.erase(i); + break; + } +} + +render_texture& draw_pass::get_render_texture(int32_t index) { + return render_textures[stru_140A244E0[index][tex_index[index]]]; +} + +void draw_pass::resize(int32_t width, int32_t height) { + if (!multisample_framebuffer) + glGenFramebuffers(1, &multisample_framebuffer); + + if (!multisample_renderbuffer) + glGenRenderbuffers(1, &multisample_renderbuffer); + + glBindFramebuffer(GL_FRAMEBUFFER, multisample_framebuffer); + glBindRenderbuffer(GL_RENDERBUFFER, multisample_renderbuffer); + glRenderbufferStorageMultisample(GL_RENDERBUFFER, 8, GL_RGBA8, width, height); + glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER, multisample_renderbuffer); + glDrawBuffer(GL_COLOR_ATTACHMENT0); + glReadBuffer(GL_COLOR_ATTACHMENT0); + glBindFramebuffer(GL_FRAMEBUFFER, 0); + glBindRenderbuffer(GL_RENDERBUFFER, 0); +} + +void draw_pass::set_enable(draw_pass_type type, bool value) { + enable[type] = value; +} + +void draw_pass::set_effect_texture(texture* value) { + effect_texture = value; +} + +void draw_pass::set_multisample(bool value) { + multisample = value; +} + +void draw_pass::set_npr_param(int32_t value) { + npr_param = value; +} + +void draw_pass::set_reflect(bool value) { + reflect = value; +} + +void draw_pass::set_reflect_blur(int32_t reflect_blur_num, blur_filter_mode reflect_blur_filter) { + this->reflect_blur_num = reflect_blur_num; + this->reflect_blur_filter = reflect_blur_filter; +} + +void draw_pass::set_reflect_resolution_mode(reflect_refract_resolution_mode mode) { + tex_index[0] = mode; +} + +void draw_pass::set_reflect_type(stage_data_reflect_type type) { + reflect_type = type; +} + +void draw_pass::set_refract(bool value) { + refract = value; +} + +void draw_pass::set_refract_resolution_mode(reflect_refract_resolution_mode mode) { + tex_index[1] = mode; +} + +void draw_pass::set_shadow_false() { + shadow = false; +} + +void draw_pass::set_shadow_true() { + shadow = true; +} + +draw_state::draw_state() : wireframe(), wireframe_overlay(), light(), self_shadow(), +field_45(), use_global_material(), fog_height(), ex_data_mat(), field_68() { shader = true; shader_index = -1; field_50 = -1; @@ -71,6 +285,10 @@ self_shadow(), field_45(), use_global_material(), fog_height(), ex_data_mat(), f fresnel = 7.0f; } +void draw_state::set_fog_height(bool value) { + fog_height = value; +} + material_list_struct::material_list_struct() : blend_color(), has_blend_color(), emission(), has_emission() { hash = (uint32_t)-1; @@ -120,13 +338,14 @@ bool light_proj::set(render_context* rctx) { if (!this) return false; + static const vec4 color_clear = 1.0f; static const GLfloat depth_clear = 1.0f; shadow_texture[0].bind(); glViewport(0, 0, 2048, 512); gl_state_enable_depth_test(); gl_state_set_depth_mask(GL_TRUE); - glClearBufferfv(GL_COLOR, 0, (float_t*)&vec4_identity); + glClearBufferfv(GL_COLOR, 0, (float_t*)&color_clear); glClearBufferfv(GL_DEPTH, 0, &depth_clear); if (set_mat(rctx, false)) { @@ -140,7 +359,7 @@ bool light_proj::set(render_context* rctx) { draw_texture.color_texture->height); gl_state_enable_depth_test(); gl_state_set_depth_mask(GL_TRUE); - glClearBufferfv(GL_COLOR, 0, (float_t*)&vec4_identity); + glClearBufferfv(GL_COLOR, 0, (float_t*)&color_clear); glClearBufferfv(GL_DEPTH, 0, &depth_clear); } return false; @@ -164,12 +383,12 @@ void light_proj::get_proj_mat(vec3* view_point, vec3* interest, float_t fov, mat else { mat4 proj; mat4_persp(fov, 4.0, 0.1000000014901161, 10.0, &proj); - shaders_ft.state_matrix_set_projection(proj, false); mat4 view; vec3 up = { 0.0f, 1.0f, 0.0f }; mat4_look_at(view_point, interest, &up, &view); - shaders_ft.state_matrix_set_modelview(0, view, true); + + shaders_ft.state_matrix_set_mvp(view, proj); } } @@ -275,10 +494,10 @@ material_list_count(), material_list_array(), object_bounding_sphere_check_func( object_culling = true; object_sort = true; chara_color = true; - texture_color_coeff = vec4_identity; - texture_color_offset = vec4_null; - texture_specular_coeff = vec4_identity; - texture_specular_offset = vec4_null; + texture_color_coeff = 1.0f; + texture_color_offset = 0.0f; + texture_specular_coeff = 1.0f; + texture_specular_offset = 0.0f; } object_data::~object_data() { @@ -294,6 +513,7 @@ void object_data::add_vertex_array(draw_object* draw) { GLuint array_buffer = draw->array_buffer; GLuint morph_array_buffer = draw->morph_array_buffer; + GLuint element_array_buffer = draw->element_array_buffer; int32_t texcoord_array[2] = { -1, -1 }; int32_t color_tex_index = 0; @@ -312,104 +532,135 @@ void object_data::add_vertex_array(draw_object* draw) { color_tex_index++; } - object_data_vertex_array* vertex_array_data = 0; - for (object_data_vertex_array& i : vertex_array_cache) - if (i.alive_time >= 0 && i.array_buffer == array_buffer && i.morph_array_buffer == morph_array_buffer - && !memcmp(i.texcoord_array, texcoord_array, sizeof(texcoord_array))) { - if (!i.vertex_array) { - vertex_array_data = &i; - break; - } - - i.alive_time = 2; - return; - } - - if (!vertex_array_data) - for (object_data_vertex_array& i : vertex_array_cache) - if (i.alive_time <= 0) { - vertex_array_data = &i; - break; - } - - if (!vertex_array_data) { - vertex_array_cache.push_back({}); - vertex_array_data = &vertex_array_cache.back(); - *vertex_array_data = {}; - } - - if (!vertex_array_data->vertex_array) - glGenVertexArrays(1, &vertex_array_data->vertex_array); - - vertex_array_data->array_buffer = array_buffer; - vertex_array_data->morph_array_buffer = morph_array_buffer; - vertex_array_data->alive_time = 2; - memcpy(&vertex_array_data->texcoord_array, texcoord_array, sizeof(texcoord_array)); + GLuint vertex_attrib_buffer_binding[16] = {}; + object_data_get_vertex_attrib_buffer_bindings(draw, + texcoord_array, vertex_attrib_buffer_binding); bool compressed = mesh->attrib.m.compressed; GLsizei size_vertex = (GLsizei)mesh->size_vertex; obj_vertex_format vertex_format = mesh->vertex_format; - gl_state_bind_vertex_array(vertex_array_data->vertex_array); - gl_state_bind_array_buffer(draw->array_buffer); - gl_state_bind_element_array_buffer(draw->element_array_buffer); + object_data_vertex_array* vertex_array = 0; + for (object_data_vertex_array& i : vertex_array_cache) + if (i.alive_time >= 0 && i.array_buffer == array_buffer && i.morph_array_buffer == morph_array_buffer + && i.element_array_buffer == element_array_buffer && i.vertex_format == vertex_format + && i.size_vertex == size_vertex && i.compressed == compressed + && !memcmp(i.vertex_attrib_buffer_binding, + vertex_attrib_buffer_binding, sizeof(vertex_attrib_buffer_binding)) + && !memcmp(i.texcoord_array, texcoord_array, sizeof(texcoord_array))) + if (i.vertex_array) { + i.alive_time = 60; + return; + } + else { + vertex_array = &i; + break; + } + + + if (!vertex_array) + for (object_data_vertex_array& i : vertex_array_cache) + if (i.alive_time <= 0) { + vertex_array = &i; + break; + } + + if (!vertex_array) { + vertex_array_cache.push_back({}); + vertex_array = &vertex_array_cache.back(); + } + + if (!vertex_array->vertex_array) { + glGenVertexArrays(1, &vertex_array->vertex_array); + + gl_state_bind_vertex_array(vertex_array->vertex_array); + glVertexAttrib4f( POSITION_INDEX, 0.0f, 0.0f, 0.0f, 1.0f); + glVertexAttrib4f( BONE_WEIGHT_INDEX, 0.0f, 0.0f, 0.0f, 0.0f); + glVertexAttrib4f( NORMAL_INDEX, 0.0f, 0.0f, 0.0f, 1.0f); + glVertexAttrib4f( COLOR0_INDEX, 1.0f, 1.0f, 1.0f, 1.0f); + glVertexAttrib4f( COLOR1_INDEX, 1.0f, 1.0f, 1.0f, 1.0f); + glVertexAttrib4f( MORPH_COLOR_INDEX, 1.0f, 1.0f, 1.0f, 1.0f); + glVertexAttrib4f( TANGENT_INDEX, 0.0f, 0.0f, 0.0f, 1.0f); + glVertexAttrib4f( UNKNOWN_INDEX, 0.0f, 0.0f, 0.0f, 1.0f); + glVertexAttrib4f( TEXCOORD0_INDEX, 0.0f, 0.0f, 0.0f, 1.0f); + glVertexAttrib4f( TEXCOORD1_INDEX, 0.0f, 0.0f, 0.0f, 1.0f); + glVertexAttrib4f( MORPH_POSITION_INDEX, 0.0f, 0.0f, 0.0f, 1.0f); + glVertexAttrib4f( MORPH_NORMAL_INDEX, 0.0f, 0.0f, 0.0f, 1.0f); + glVertexAttrib4f( MORPH_TANGENT_INDEX, 0.0f, 0.0f, 0.0f, 1.0f); + glVertexAttrib4f(MORPH_TEXCOORD0_INDEX, 0.0f, 0.0f, 0.0f, 1.0f); + glVertexAttrib4f(MORPH_TEXCOORD1_INDEX, 0.0f, 0.0f, 0.0f, 1.0f); + glVertexAttrib4f( BONE_INDEX_INDEX, 0.0f, 0.0f, 0.0f, 0.0f); + } + + vertex_array->array_buffer = array_buffer; + vertex_array->morph_array_buffer = morph_array_buffer; + vertex_array->element_array_buffer = element_array_buffer; + vertex_array->alive_time = 60; + vertex_array->vertex_format = vertex_format; + vertex_array->size_vertex = size_vertex; + vertex_array->compressed = compressed; + memcpy(&vertex_array->texcoord_array, texcoord_array, sizeof(texcoord_array)); + memcpy(&vertex_array->vertex_attrib_buffer_binding, + vertex_attrib_buffer_binding, sizeof(vertex_attrib_buffer_binding)); + + gl_state_bind_vertex_array(vertex_array->vertex_array); + gl_state_bind_array_buffer(array_buffer); + if (element_array_buffer) + gl_state_bind_element_array_buffer(element_array_buffer, true); size_t offset = 0; if (vertex_format & OBJ_VERTEX_POSITION) { - if (!vertex_array_data->vertex_attrib_array[0]) { - glEnableVertexAttribArray(0); - vertex_array_data->vertex_attrib_array[0] = true; + if (!vertex_array->vertex_attrib_array[POSITION_INDEX]) { + glEnableVertexAttribArray(POSITION_INDEX); + vertex_array->vertex_attrib_array[POSITION_INDEX] = true; } - glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, size_vertex, (void*)offset); + glVertexAttribPointer(POSITION_INDEX, 3, GL_FLOAT, GL_FALSE, size_vertex, (void*)offset); offset += 12; } - else if (vertex_array_data->vertex_attrib_array[0]) { - glDisableVertexAttribArray(0); - glVertexAttrib4f(0, 0.0f, 0.0f, 0.0f, 1.0f); - vertex_array_data->vertex_attrib_array[0] = false; + else if (vertex_array->vertex_attrib_array[POSITION_INDEX]) { + glDisableVertexAttribArray(POSITION_INDEX); + vertex_array->vertex_attrib_array[POSITION_INDEX] = false; } if (vertex_format & OBJ_VERTEX_NORMAL) { - if (!vertex_array_data->vertex_attrib_array[2]) { - glEnableVertexAttribArray(2); - vertex_array_data->vertex_attrib_array[2] = true; + if (!vertex_array->vertex_attrib_array[NORMAL_INDEX]) { + glEnableVertexAttribArray(NORMAL_INDEX); + vertex_array->vertex_attrib_array[NORMAL_INDEX] = true; } if (!compressed) { - glVertexAttribPointer(2, 3, GL_FLOAT, GL_FALSE, size_vertex, (void*)offset); + glVertexAttribPointer(NORMAL_INDEX, 3, GL_FLOAT, GL_FALSE, size_vertex, (void*)offset); offset += 12; } else { - glVertexAttribPointer(2, 3, GL_SHORT, GL_TRUE, size_vertex, (void*)offset); + glVertexAttribPointer(NORMAL_INDEX, 3, GL_SHORT, GL_TRUE, size_vertex, (void*)offset); offset += 8; } } - else if (vertex_array_data->vertex_attrib_array[2]) { - glDisableVertexAttribArray(2); - glVertexAttrib4f(2, 0.0f, 0.0f, 0.0f, 1.0f); - vertex_array_data->vertex_attrib_array[2] = false; + else if (vertex_array->vertex_attrib_array[NORMAL_INDEX]) { + glDisableVertexAttribArray(NORMAL_INDEX); + vertex_array->vertex_attrib_array[NORMAL_INDEX] = false; } if (vertex_format & OBJ_VERTEX_TANGENT) { - if (!vertex_array_data->vertex_attrib_array[6]) { - glEnableVertexAttribArray(6); - vertex_array_data->vertex_attrib_array[6] = true; + if (!vertex_array->vertex_attrib_array[TANGENT_INDEX]) { + glEnableVertexAttribArray(TANGENT_INDEX); + vertex_array->vertex_attrib_array[TANGENT_INDEX] = true; } if (!compressed) { - glVertexAttribPointer(6, 4, GL_FLOAT, GL_FALSE, size_vertex, (void*)offset); + glVertexAttribPointer(TANGENT_INDEX, 4, GL_FLOAT, GL_FALSE, size_vertex, (void*)offset); offset += 16; } else { - glVertexAttribPointer(6, 4, GL_SHORT, GL_TRUE, size_vertex, (void*)offset); + glVertexAttribPointer(TANGENT_INDEX, 4, GL_SHORT, GL_TRUE, size_vertex, (void*)offset); offset += 8; } } - else if (vertex_array_data->vertex_attrib_array[6]) { - glDisableVertexAttribArray(6); - glVertexAttrib4f(6, 0.0f, 0.0f, 0.0f, 1.0f); - vertex_array_data->vertex_attrib_array[6] = false; + else if (vertex_array->vertex_attrib_array[TANGENT_INDEX]) { + glDisableVertexAttribArray(TANGENT_INDEX); + vertex_array->vertex_attrib_array[TANGENT_INDEX] = false; } if (!compressed && vertex_format & OBJ_VERTEX_BINORMAL) @@ -418,25 +669,24 @@ void object_data::add_vertex_array(draw_object* draw) { for (int32_t i = 0; i < 2; i++) { int32_t texcoord_index = texcoord_array[i]; if (texcoord_index < 0) { - if (vertex_array_data->vertex_attrib_array[8 + i]) { - glDisableVertexAttribArray(8 + i); - glVertexAttrib4f(8 + i, 0.0f, 0.0f, 0.0f, 1.0f); - vertex_array_data->vertex_attrib_array[8 + i] = false; + if (vertex_array->vertex_attrib_array[TEXCOORD0_INDEX + i]) { + glDisableVertexAttribArray(TEXCOORD0_INDEX + i); + vertex_array->vertex_attrib_array[TEXCOORD0_INDEX + i] = false; } continue; } - if (vertex_format & (OBJ_VERTEX_TEXCOORD0 << i)) { - if (!vertex_array_data->vertex_attrib_array[8 + i]) { - glEnableVertexAttribArray(8 + i); - vertex_array_data->vertex_attrib_array[8 + i] = true; + if (vertex_format & (OBJ_VERTEX_TEXCOORD0 << texcoord_index)) { + if (!vertex_array->vertex_attrib_array[TEXCOORD0_INDEX + i]) { + glEnableVertexAttribArray(TEXCOORD0_INDEX + i); + vertex_array->vertex_attrib_array[TEXCOORD0_INDEX + i] = true; } if (!compressed) - glVertexAttribPointer(8 + i, 2, GL_FLOAT, GL_FALSE, + glVertexAttribPointer(TEXCOORD0_INDEX + i, 2, GL_FLOAT, GL_FALSE, size_vertex, (void*)(offset + 8ULL * texcoord_index)); else - glVertexAttribPointer(8 + i, 2, GL_HALF_FLOAT, GL_FALSE, + glVertexAttribPointer(TEXCOORD0_INDEX + i, 2, GL_HALF_FLOAT, GL_FALSE, size_vertex, (void*)(offset + 4ULL * texcoord_index)); } } @@ -463,191 +713,182 @@ void object_data::add_vertex_array(draw_object* draw) { } if (vertex_format & OBJ_VERTEX_COLOR0) { - if (!vertex_array_data->vertex_attrib_array[3]) { - glEnableVertexAttribArray(3); - vertex_array_data->vertex_attrib_array[3] = true; + if (!vertex_array->vertex_attrib_array[COLOR0_INDEX]) { + glEnableVertexAttribArray(COLOR0_INDEX); + vertex_array->vertex_attrib_array[COLOR0_INDEX] = true; } if (!compressed) { - glVertexAttribPointer(3, 4, GL_FLOAT, GL_FALSE, size_vertex, (void*)offset); + glVertexAttribPointer(COLOR0_INDEX, 4, GL_FLOAT, GL_FALSE, size_vertex, (void*)offset); offset += 16; } else { - glVertexAttribPointer(3, 4, GL_HALF_FLOAT, GL_FALSE, size_vertex, (void*)offset); + glVertexAttribPointer(COLOR0_INDEX, 4, GL_HALF_FLOAT, GL_FALSE, size_vertex, (void*)offset); offset += 8; } } - else if (vertex_array_data->vertex_attrib_array[3]) { - glDisableVertexAttribArray(3); - glVertexAttrib4f(3, 1.0f, 1.0f, 1.0f, 1.0f); - vertex_array_data->vertex_attrib_array[3] = false; + else if (vertex_array->vertex_attrib_array[COLOR0_INDEX]) { + glDisableVertexAttribArray(COLOR0_INDEX); + vertex_array->vertex_attrib_array[COLOR0_INDEX] = false; } if (vertex_format & OBJ_VERTEX_COLOR1) offset += 16; if (vertex_format & OBJ_VERTEX_BONE_DATA) { - if (!vertex_array_data->vertex_attrib_array[1]) { - glEnableVertexAttribArray(1); - vertex_array_data->vertex_attrib_array[1] = true; + if (!vertex_array->vertex_attrib_array[BONE_WEIGHT_INDEX]) { + glEnableVertexAttribArray(BONE_WEIGHT_INDEX); + vertex_array->vertex_attrib_array[BONE_WEIGHT_INDEX] = true; } if (!compressed) { - glVertexAttribPointer(1, 4, GL_FLOAT, GL_FALSE, size_vertex, (void*)offset); + glVertexAttribPointer(BONE_WEIGHT_INDEX, 4, GL_FLOAT, GL_FALSE, size_vertex, (void*)offset); offset += 16; } else { - glVertexAttribPointer(1, 4, GL_UNSIGNED_SHORT, GL_TRUE, size_vertex, (void*)offset); + glVertexAttribPointer(BONE_WEIGHT_INDEX, 4, GL_UNSIGNED_SHORT, GL_TRUE, size_vertex, (void*)offset); offset += 8; } - if (!vertex_array_data->vertex_attrib_array[15]) { - glEnableVertexAttribArray(15); - vertex_array_data->vertex_attrib_array[15] = true; + if (!vertex_array->vertex_attrib_array[BONE_INDEX_INDEX]) { + glEnableVertexAttribArray(BONE_INDEX_INDEX); + vertex_array->vertex_attrib_array[BONE_INDEX_INDEX] = true; } if (!compressed) { - glVertexAttribPointer(15, 4, GL_INT, GL_FALSE, size_vertex, (void*)offset); + glVertexAttribPointer(BONE_INDEX_INDEX, 4, GL_INT, GL_FALSE, size_vertex, (void*)offset); offset += 16; } else { - glVertexAttribPointer(15, 4, GL_UNSIGNED_SHORT, GL_FALSE, size_vertex, (void*)offset); + glVertexAttribPointer(BONE_INDEX_INDEX, 4, GL_UNSIGNED_SHORT, GL_FALSE, size_vertex, (void*)offset); offset += 8; } } else { - if (vertex_array_data->vertex_attrib_array[1]) { - glDisableVertexAttribArray(1); - glVertexAttrib4f(1, 0.0f, 0.0f, 0.0f, 0.0f); - vertex_array_data->vertex_attrib_array[1] = false; + if (vertex_array->vertex_attrib_array[BONE_WEIGHT_INDEX]) { + glDisableVertexAttribArray(BONE_WEIGHT_INDEX); + vertex_array->vertex_attrib_array[BONE_WEIGHT_INDEX] = false; } - if (vertex_array_data->vertex_attrib_array[15]) { - glDisableVertexAttribArray(15); - glVertexAttrib4f(15, 0.0f, 0.0f, 0.0f, 0.0f); - vertex_array_data->vertex_attrib_array[15] = false; + if (vertex_array->vertex_attrib_array[BONE_INDEX_INDEX]) { + glDisableVertexAttribArray(BONE_INDEX_INDEX); + vertex_array->vertex_attrib_array[BONE_INDEX_INDEX] = false; } } if (!compressed && vertex_format & OBJ_VERTEX_UNKNOWN) { - if (!vertex_array_data->vertex_attrib_array[7]) { - glEnableVertexAttribArray(7); - vertex_array_data->vertex_attrib_array[7] = true; + if (!vertex_array->vertex_attrib_array[UNKNOWN_INDEX]) { + glEnableVertexAttribArray(UNKNOWN_INDEX); + vertex_array->vertex_attrib_array[UNKNOWN_INDEX] = true; } - glVertexAttribPointer(7, 4, GL_FLOAT, GL_FALSE, size_vertex, (void*)offset); + glVertexAttribPointer(UNKNOWN_INDEX, 4, GL_FLOAT, GL_FALSE, size_vertex, (void*)offset); offset += 16; } - else if (vertex_array_data->vertex_attrib_array[7]) { - glDisableVertexAttribArray(7); - glVertexAttrib4f(7, 0.0f, 0.0f, 0.0f, 1.0f); - vertex_array_data->vertex_attrib_array[7] = false; + else if (vertex_array->vertex_attrib_array[UNKNOWN_INDEX]) { + glDisableVertexAttribArray(UNKNOWN_INDEX); + vertex_array->vertex_attrib_array[UNKNOWN_INDEX] = false; } - if (draw->morph_array_buffer) { - gl_state_bind_array_buffer(draw->morph_array_buffer); + if (morph_array_buffer) { + gl_state_bind_array_buffer(morph_array_buffer); offset = 0; if (vertex_format & OBJ_VERTEX_POSITION) { - if (!vertex_array_data->vertex_attrib_array[10]) { - glEnableVertexAttribArray(10); - vertex_array_data->vertex_attrib_array[10] = true; + if (!vertex_array->vertex_attrib_array[MORPH_POSITION_INDEX]) { + glEnableVertexAttribArray(MORPH_POSITION_INDEX); + vertex_array->vertex_attrib_array[MORPH_POSITION_INDEX] = true; } - glVertexAttribPointer(10, 3, GL_FLOAT, GL_FALSE, size_vertex, (void*)offset); + glVertexAttribPointer(MORPH_POSITION_INDEX, 3, GL_FLOAT, GL_FALSE, size_vertex, (void*)offset); offset += 12; } - else if (vertex_array_data->vertex_attrib_array[10]) { - glDisableVertexAttribArray(10); - glVertexAttrib4f(10, 0.0f, 0.0f, 0.0f, 1.0f); - vertex_array_data->vertex_attrib_array[10] = false; + else if (vertex_array->vertex_attrib_array[MORPH_POSITION_INDEX]) { + glDisableVertexAttribArray(MORPH_POSITION_INDEX); + vertex_array->vertex_attrib_array[MORPH_POSITION_INDEX] = false; } if (vertex_format & OBJ_VERTEX_NORMAL) { - if (!vertex_array_data->vertex_attrib_array[11]) { - glEnableVertexAttribArray(11); - vertex_array_data->vertex_attrib_array[11] = true; + if (!vertex_array->vertex_attrib_array[MORPH_NORMAL_INDEX]) { + glEnableVertexAttribArray(MORPH_NORMAL_INDEX); + vertex_array->vertex_attrib_array[MORPH_NORMAL_INDEX] = true; } if (!compressed) { - glVertexAttribPointer(11, 3, GL_FLOAT, GL_FALSE, size_vertex, (void*)offset); + glVertexAttribPointer(MORPH_NORMAL_INDEX, 3, GL_FLOAT, GL_FALSE, size_vertex, (void*)offset); offset += 12; } else { - glVertexAttribPointer(11, 3, GL_SHORT, GL_TRUE, size_vertex, (void*)offset); + glVertexAttribPointer(MORPH_NORMAL_INDEX, 3, GL_SHORT, GL_TRUE, size_vertex, (void*)offset); offset += 8; } } - else if (vertex_array_data->vertex_attrib_array[11]) { - glDisableVertexAttribArray(11); - glVertexAttrib4f(11, 0.0f, 0.0f, 0.0f, 1.0f); - vertex_array_data->vertex_attrib_array[11] = false; + else if (vertex_array->vertex_attrib_array[MORPH_NORMAL_INDEX]) { + glDisableVertexAttribArray(MORPH_NORMAL_INDEX); + vertex_array->vertex_attrib_array[MORPH_NORMAL_INDEX] = false; } if (vertex_format & OBJ_VERTEX_TANGENT) { - if (!vertex_array_data->vertex_attrib_array[12]) { - glEnableVertexAttribArray(12); - vertex_array_data->vertex_attrib_array[12] = true; + if (!vertex_array->vertex_attrib_array[MORPH_TANGENT_INDEX]) { + glEnableVertexAttribArray(MORPH_TANGENT_INDEX); + vertex_array->vertex_attrib_array[MORPH_TANGENT_INDEX] = true; } if (!compressed) { - glVertexAttribPointer(12, 4, GL_FLOAT, GL_FALSE, size_vertex, (void*)offset); + glVertexAttribPointer(MORPH_TANGENT_INDEX, 4, GL_FLOAT, GL_FALSE, size_vertex, (void*)offset); offset += 16; } else { - glVertexAttribPointer(12, 4, GL_SHORT, GL_TRUE, size_vertex, (void*)offset); + glVertexAttribPointer(MORPH_TANGENT_INDEX, 4, GL_SHORT, GL_TRUE, size_vertex, (void*)offset); offset += 8; } } - else if (vertex_array_data->vertex_attrib_array[12]) { - glDisableVertexAttribArray(12); - glVertexAttrib4f(12, 0.0f, 0.0f, 0.0f, 1.0f); - vertex_array_data->vertex_attrib_array[12] = false; + else if (vertex_array->vertex_attrib_array[MORPH_TANGENT_INDEX]) { + glDisableVertexAttribArray(MORPH_TANGENT_INDEX); + vertex_array->vertex_attrib_array[MORPH_TANGENT_INDEX] = false; } if (!compressed && vertex_format & OBJ_VERTEX_BINORMAL) offset += 12; if (vertex_format & OBJ_VERTEX_TEXCOORD0) { - if (!vertex_array_data->vertex_attrib_array[13]) { - glEnableVertexAttribArray(13); - vertex_array_data->vertex_attrib_array[13] = true; + if (!vertex_array->vertex_attrib_array[MORPH_TEXCOORD0_INDEX]) { + glEnableVertexAttribArray(MORPH_TEXCOORD0_INDEX); + vertex_array->vertex_attrib_array[MORPH_TEXCOORD0_INDEX] = true; } if (!compressed) { - glVertexAttribPointer(13, 2, GL_FLOAT, GL_FALSE, size_vertex, (void*)offset); + glVertexAttribPointer(MORPH_TEXCOORD0_INDEX, 2, GL_FLOAT, GL_FALSE, size_vertex, (void*)offset); offset += 8; } else { - glVertexAttribPointer(13, 2, GL_HALF_FLOAT, GL_FALSE, size_vertex, (void*)offset); + glVertexAttribPointer(MORPH_TEXCOORD0_INDEX, 2, GL_HALF_FLOAT, GL_FALSE, size_vertex, (void*)offset); offset += 4; } } - else if (vertex_array_data->vertex_attrib_array[13]) { - glDisableVertexAttribArray(13); - glVertexAttrib4f(13, 0.0f, 0.0f, 0.0f, 1.0f); - vertex_array_data->vertex_attrib_array[13] = false; + else if (vertex_array->vertex_attrib_array[MORPH_TEXCOORD0_INDEX]) { + glDisableVertexAttribArray(MORPH_TEXCOORD0_INDEX); + vertex_array->vertex_attrib_array[MORPH_TEXCOORD0_INDEX] = false; } if (vertex_format & OBJ_VERTEX_TEXCOORD1) { - if (!vertex_array_data->vertex_attrib_array[14]) { - glEnableVertexAttribArray(14); - vertex_array_data->vertex_attrib_array[14] = true; + if (!vertex_array->vertex_attrib_array[MORPH_TEXCOORD1_INDEX]) { + glEnableVertexAttribArray(MORPH_TEXCOORD1_INDEX); + vertex_array->vertex_attrib_array[MORPH_TEXCOORD1_INDEX] = true; } if (!compressed) { - glVertexAttribPointer(14, 2, GL_FLOAT, GL_FALSE, size_vertex, (void*)offset); + glVertexAttribPointer(MORPH_TEXCOORD1_INDEX, 2, GL_FLOAT, GL_FALSE, size_vertex, (void*)offset); offset += 8; } else { - glVertexAttribPointer(14, 2, GL_HALF_FLOAT, GL_FALSE, size_vertex, (void*)offset); + glVertexAttribPointer(MORPH_TEXCOORD1_INDEX, 2, GL_HALF_FLOAT, GL_FALSE, size_vertex, (void*)offset); offset += 4; } } - else if (vertex_array_data->vertex_attrib_array[14]) { - glDisableVertexAttribArray(14); - glVertexAttrib4f(14, 0.0f, 0.0f, 0.0f, 1.0f); - vertex_array_data->vertex_attrib_array[14] = false; + else if (vertex_array->vertex_attrib_array[MORPH_TEXCOORD1_INDEX]) { + glDisableVertexAttribArray(MORPH_TEXCOORD1_INDEX); + vertex_array->vertex_attrib_array[MORPH_TEXCOORD1_INDEX] = false; } if (!compressed) { @@ -666,24 +907,23 @@ void object_data::add_vertex_array(draw_object* draw) { if (vertex_format & OBJ_VERTEX_COLOR0) { uniform_value[U_MORPH_COLOR] = 1; - if (!vertex_array_data->vertex_attrib_array[5]) { - glEnableVertexAttribArray(5); - vertex_array_data->vertex_attrib_array[5] = true; + if (!vertex_array->vertex_attrib_array[MORPH_COLOR_INDEX]) { + glEnableVertexAttribArray(MORPH_COLOR_INDEX); + vertex_array->vertex_attrib_array[MORPH_COLOR_INDEX] = true; } if (!compressed) { - glVertexAttribPointer(5, 4, GL_FLOAT, GL_FALSE, size_vertex, (void*)offset); + glVertexAttribPointer(MORPH_COLOR_INDEX, 4, GL_FLOAT, GL_FALSE, size_vertex, (void*)offset); offset += 16; } else { - glVertexAttribPointer(5, 4, GL_HALF_FLOAT, GL_FALSE, size_vertex, (void*)offset); + glVertexAttribPointer(MORPH_COLOR_INDEX, 4, GL_HALF_FLOAT, GL_FALSE, size_vertex, (void*)offset); offset += 8; } } - else if (vertex_array_data->vertex_attrib_array[5]) { - glDisableVertexAttribArray(5); - glVertexAttrib4f(5, 1.0f, 1.0f, 1.0f, 1.0f); - vertex_array_data->vertex_attrib_array[5] = false; + else if (vertex_array->vertex_attrib_array[MORPH_COLOR_INDEX]) { + glDisableVertexAttribArray(MORPH_COLOR_INDEX); + vertex_array->vertex_attrib_array[MORPH_COLOR_INDEX] = false; } if (!compressed) { @@ -702,47 +942,41 @@ void object_data::add_vertex_array(draw_object* draw) { } } else { - if (vertex_array_data->vertex_attrib_array[10]) { - glDisableVertexAttribArray(10); - glVertexAttrib4f(10, 0.0f, 0.0f, 0.0f, 1.0f); - vertex_array_data->vertex_attrib_array[10] = false; + if (vertex_array->vertex_attrib_array[MORPH_POSITION_INDEX]) { + glDisableVertexAttribArray(MORPH_POSITION_INDEX); + vertex_array->vertex_attrib_array[MORPH_POSITION_INDEX] = false; } - if (vertex_array_data->vertex_attrib_array[11]) { - glDisableVertexAttribArray(11); - glVertexAttrib4f(11, 0.0f, 0.0f, 0.0f, 1.0f); - vertex_array_data->vertex_attrib_array[11] = false; + if (vertex_array->vertex_attrib_array[MORPH_NORMAL_INDEX]) { + glDisableVertexAttribArray(MORPH_NORMAL_INDEX); + vertex_array->vertex_attrib_array[MORPH_NORMAL_INDEX] = false; } - if (vertex_array_data->vertex_attrib_array[12]) { - glDisableVertexAttribArray(12); - glVertexAttrib4f(12, 0.0f, 0.0f, 0.0f, 1.0f); - vertex_array_data->vertex_attrib_array[12] = false; + if (vertex_array->vertex_attrib_array[MORPH_TANGENT_INDEX]) { + glDisableVertexAttribArray(MORPH_TANGENT_INDEX); + vertex_array->vertex_attrib_array[MORPH_TANGENT_INDEX] = false; } - if (vertex_array_data->vertex_attrib_array[13]) { - glDisableVertexAttribArray(13); - glVertexAttrib4f(13, 0.0f, 0.0f, 0.0f, 1.0f); - vertex_array_data->vertex_attrib_array[13] = false; + if (vertex_array->vertex_attrib_array[MORPH_TEXCOORD0_INDEX]) { + glDisableVertexAttribArray(MORPH_TEXCOORD0_INDEX); + vertex_array->vertex_attrib_array[MORPH_TEXCOORD0_INDEX] = false; } - if (vertex_array_data->vertex_attrib_array[14]) { - glDisableVertexAttribArray(14); - glVertexAttrib4f(14, 0.0f, 0.0f, 0.0f, 1.0f); - vertex_array_data->vertex_attrib_array[14] = false; + if (vertex_array->vertex_attrib_array[MORPH_TEXCOORD1_INDEX]) { + glDisableVertexAttribArray(MORPH_TEXCOORD1_INDEX); + vertex_array->vertex_attrib_array[MORPH_TEXCOORD1_INDEX] = false; } - if (vertex_array_data->vertex_attrib_array[5]) { - glDisableVertexAttribArray(5); - glVertexAttrib4f(5, 1.0f, 1.0f, 1.0f, 1.0f); - vertex_array_data->vertex_attrib_array[5] = false; + if (vertex_array->vertex_attrib_array[MORPH_COLOR_INDEX]) { + glDisableVertexAttribArray(MORPH_COLOR_INDEX); + vertex_array->vertex_attrib_array[MORPH_COLOR_INDEX] = false; } } gl_state_bind_array_buffer(0); gl_state_bind_vertex_array(0); - gl_state_bind_element_array_buffer(0); - + if (element_array_buffer) + gl_state_bind_element_array_buffer(0); } void object_data::check_vertex_arrays() { @@ -760,6 +994,7 @@ GLuint object_data::get_vertex_array(draw_object* draw) { GLuint array_buffer = draw->array_buffer; GLuint morph_array_buffer = draw->morph_array_buffer; + GLuint element_array_buffer = draw->element_array_buffer; int32_t texcoord_array[2] = { -1, -1 }; int32_t color_tex_index = 0; @@ -778,9 +1013,21 @@ GLuint object_data::get_vertex_array(draw_object* draw) { color_tex_index++; } - object_data_vertex_array* vertex_array_data = 0; + GLuint vertex_attrib_buffer_binding[16] = {}; + object_data_get_vertex_attrib_buffer_bindings(draw, + texcoord_array, vertex_attrib_buffer_binding); + + bool compressed = mesh->attrib.m.compressed; + GLsizei size_vertex = (GLsizei)mesh->size_vertex; + obj_vertex_format vertex_format = mesh->vertex_format; + + object_data_vertex_array* vertex_array = 0; for (object_data_vertex_array& i : vertex_array_cache) if (i.alive_time > 0 && i.array_buffer == array_buffer && i.morph_array_buffer == morph_array_buffer + && i.element_array_buffer == element_array_buffer && i.vertex_format == vertex_format + && i.size_vertex == size_vertex && i.compressed == compressed + && !memcmp(i.vertex_attrib_buffer_binding, + vertex_attrib_buffer_binding, sizeof(vertex_attrib_buffer_binding)) && !memcmp(i.texcoord_array, texcoord_array, sizeof(texcoord_array))) return i.vertex_array; return 0; @@ -850,17 +1097,17 @@ void object_data::reset() { draw_task_flags = (::draw_task_flags)0; field_8 = 0; field_C = 0; - memset(&passed, 0, sizeof(object_data_culling_info)); - memset(&culled, 0, sizeof(object_data_culling_info)); + passed = {}; + culled = {}; texture_pattern_count = 0; memset(texture_pattern_array, 0, sizeof(texture_pattern_array)); texture_transform_count = 0; memset(texture_transform_array, 0, sizeof(texture_transform_array)); - texture_color_coeff = vec4_identity; - texture_color_offset = vec4_null; - texture_specular_coeff = vec4_identity; - texture_specular_offset = vec4_null; + texture_color_coeff = 1.0f; + texture_color_offset = 0.0f; + texture_specular_coeff = 1.0f; + texture_specular_offset = 0.0f; for (std::vector& i : draw_task_array) i.clear(); @@ -1006,17 +1253,15 @@ void render_context::ctrl() { app::TaskWork::Ctrl(); sound_ctrl(); file_handler_storage_ctrl(); - - draw_pass.shadow_ptr->ctrl(this); - draw_state.stats_prev = draw_state.stats; - draw_state.stats = {}; - object_data.reset(); } void render_context::disp() { rctx_ptr = this; + object_data.reset(); + draw_state.stats_prev = draw_state.stats; + draw_state.stats.reset(); app::TaskWork::Disp(); - + draw_pass.shadow_ptr->ctrl(this); post_process.ctrl(camera); draw_pass_main(this); app::TaskWork::Basic(); @@ -1094,10 +1339,10 @@ void render_context::light_param_data_glow_set(light_param_glow* glow) { tone_map->set_auto_exposure(true); tone_map->set_tone_map_method(TONE_MAP_YCC_EXPONENT); tone_map->set_saturate_coeff(1.0f); - tone_map->set_scene_fade(vec4_null); + tone_map->set_scene_fade(0.0f); tone_map->set_scene_fade_blend_func(0); - tone_map->set_tone_trans_start(vec3_null); - tone_map->set_tone_trans_end(vec3_identity); + tone_map->set_tone_trans_start(0.0f); + tone_map->set_tone_trans_end(1.0f); if (glow->has_exposure) tone_map->set_exposure(glow->exposure); @@ -1227,7 +1472,7 @@ field_1A8(), view_point_shared(), interest_shared(), field_2F0() { view_region = 1.2f; range = 1.0f; for (int32_t i = 0; i < 2; i++) { - view_point[i] = vec3_identity; + view_point[i] = 1.0f; field_1C0[i] = 0.0f; field_1C8[i] = 0.0f; field_200[i] = i; @@ -1298,12 +1543,12 @@ void shadow::ctrl(render_context* rctx) { if (count < 3) { for (int32_t i = 0; i < 2; i++) { - field_1A8[i] = vec3_null; + field_1A8[i] = 0.0f; field_1C8[i] = 0.0f; if (!field_2F0[i] || field_1D0[i].size() < 1) continue; - vec3 v7 = vec3_null; + vec3 v7 = 0.0f; for (vec3& j : field_1D0[i]) v7 += j; @@ -1328,8 +1573,8 @@ void shadow::ctrl(render_context* rctx) { } if (field_2EC > 0) { - vec3 view_point = vec3_null; - vec3 interest = vec3_null; + vec3 view_point = 0.0f; + vec3 interest = 0.0f; for (int32_t i = 0; i < 2; i++) { if (!field_2F0[i]) continue; @@ -1346,8 +1591,8 @@ void shadow::ctrl(render_context* rctx) { interest += this->interest[i]; } - view_point_shared = view_point * (1.0f / field_2EC); - interest_shared = interest * (1.0f / field_2EC); + view_point_shared = view_point * (1.0f / (float_t)field_2EC); + interest_shared = interest * (1.0f / (float_t)field_2EC); } float_t v2 = max_def(field_1C8[0], field_1C8[1]); @@ -1393,12 +1638,12 @@ void shadow::ctrl(render_context* rctx) { } for (int32_t i = 0; i < 2; i++) { - field_1A8[i] = vec3_null; + field_1A8[i] = 0.0f; field_1C8[i] = 0.0; if (!field_2F0[i] || field_1D0[i].size() < 1) continue; - vec3 v22 = vec3_null; + vec3 v22 = 0.0f; for (vec3& j : field_1D0[i]) v22 += j; @@ -1437,8 +1682,8 @@ void shadow::ctrl(render_context* rctx) { } } - vec3 view_point = vec3_null; - vec3 interest = vec3_null; + vec3 view_point = 0.0f; + vec3 interest = 0.0f; int32_t count = 0; for (int32_t i = 0; i < 2; i++) { int32_t c = (int32_t)field_1D0[i].size(); @@ -1536,13 +1781,67 @@ int32_t shadow::init_data() { gl_state_bind_texture_2d(field_8[i].color_texture->tex); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER); - glTexParameterfv(GL_TEXTURE_2D, GL_TEXTURE_BORDER_COLOR, (GLfloat*)&vec4_identity); + static const vec4 border_color = 1.0f; + glTexParameterfv(GL_TEXTURE_2D, GL_TEXTURE_BORDER_COLOR, (GLfloat*)&border_color); } gl_state_bind_texture_2d(0); glGetError(); return 0; } +static void object_data_get_vertex_attrib_buffer_bindings(draw_object* draw, + int32_t texcoord_array[2], GLuint vertex_attrib_buffer_binding[16]) { + obj_mesh* mesh = draw->mesh; + obj_sub_mesh* sub_mesh = draw->sub_mesh; + + GLuint array_buffer = draw->array_buffer; + GLuint morph_array_buffer = draw->morph_array_buffer; + + bool compressed = mesh->attrib.m.compressed; + GLsizei size_vertex = (GLsizei)mesh->size_vertex; + obj_vertex_format vertex_format = mesh->vertex_format; + + if (vertex_format & OBJ_VERTEX_POSITION) + vertex_attrib_buffer_binding[POSITION_INDEX] = array_buffer; + if (vertex_format & OBJ_VERTEX_NORMAL) + vertex_attrib_buffer_binding[NORMAL_INDEX] = array_buffer; + if (vertex_format & OBJ_VERTEX_TANGENT) + vertex_attrib_buffer_binding[TANGENT_INDEX] = array_buffer; + + for (int32_t i = 0; i < 2; i++) { + int32_t texcoord_index = texcoord_array[i]; + if (texcoord_index >= 0) + if (vertex_format & (OBJ_VERTEX_TEXCOORD0 << texcoord_index)) + vertex_attrib_buffer_binding[TEXCOORD0_INDEX + i] = array_buffer; + } + + if (vertex_format & OBJ_VERTEX_COLOR0) + vertex_attrib_buffer_binding[COLOR0_INDEX] = array_buffer; + + if (vertex_format & OBJ_VERTEX_BONE_DATA) { + vertex_attrib_buffer_binding[BONE_WEIGHT_INDEX] = array_buffer; + vertex_attrib_buffer_binding[BONE_INDEX_INDEX] = array_buffer; + } + + if (!compressed && vertex_format & OBJ_VERTEX_UNKNOWN) + vertex_attrib_buffer_binding[UNKNOWN_INDEX] = array_buffer; + + if (draw->morph_array_buffer) { + if (vertex_format & OBJ_VERTEX_POSITION) + vertex_attrib_buffer_binding[MORPH_POSITION_INDEX] = morph_array_buffer; + if (vertex_format & OBJ_VERTEX_NORMAL) + vertex_attrib_buffer_binding[MORPH_NORMAL_INDEX] = morph_array_buffer; + if (vertex_format & OBJ_VERTEX_TANGENT) + vertex_attrib_buffer_binding[MORPH_TANGENT_INDEX] = morph_array_buffer; + if (vertex_format & OBJ_VERTEX_TEXCOORD0) + vertex_attrib_buffer_binding[MORPH_TEXCOORD0_INDEX] = morph_array_buffer; + if (vertex_format & OBJ_VERTEX_TEXCOORD1) + vertex_attrib_buffer_binding[MORPH_TEXCOORD1_INDEX] = morph_array_buffer; + if (vertex_format & OBJ_VERTEX_COLOR0) + vertex_attrib_buffer_binding[MORPH_COLOR_INDEX] = morph_array_buffer; + } +} + static void render_context_light_param_data_ibl_set_diffuse(light_param_ibl_diffuse* diffuse, int32_t level) { int32_t size = diffuse->size; size_t data_size = size; diff --git a/src/CRE/render_context.hpp b/src/CRE/render_context.hpp index f737a586..f945454e 100644 --- a/src/CRE/render_context.hpp +++ b/src/CRE/render_context.hpp @@ -27,6 +27,13 @@ #define TEXTURE_PATTERN_COUNT 24 #define TEXTURE_TRANSFORM_COUNT 24 +enum blur_filter_mode { + BLUR_FILTER_4 = 0x00, + BLUR_FILTER_9 = 0x01, + BLUR_FILTER_16 = 0x02, + BLUR_FILTER_32 = 0x03, +}; + enum draw_object_type { DRAW_OBJECT_OPAQUE = 0x00, DRAW_OBJECT_TRANSLUCENT = 0x01, @@ -57,7 +64,7 @@ enum draw_object_type { DRAW_OBJECT_OPAQUE_ALPHA_ORDER_3 = 0x1A, DRAW_OBJECT_TRANSPARENT_ALPHA_ORDER_3 = 0x1B, DRAW_OBJECT_TRANSLUCENT_ALPHA_ORDER_3 = 0x1C, - DRAW_OBJECT_PREPROCESS = 0x1D, + DRAW_OBJECT_PREPROCESS = 0x1D, DRAW_OBJECT_OPAQUE_LOCAL = 0x1E, // X DRAW_OBJECT_TRANSLUCENT_LOCAL = 0x1F, DRAW_OBJECT_TRANSPARENT_LOCAL = 0x20, @@ -109,7 +116,7 @@ enum draw_task_flags : uint32_t { DRAW_TASK_200000 = 0x00200000, DRAW_TASK_400000 = 0x00400000, DRAW_TASK_800000 = 0x00800000, - DRAW_TASK_PREPROCESS = 0x01000000, + DRAW_TASK_PREPROCESS = 0x01000000, DRAW_TASK_2000000 = 0x02000000, DRAW_TASK_4000000 = 0x04000000, DRAW_TASK_8000000 = 0x08000000, @@ -122,7 +129,7 @@ enum draw_task_flags : uint32_t { enum draw_task_type { DRAW_TASK_OBJECT = 0x00, DRAW_TASK_OBJECT_PRIMITIVE = 0x01, - DRAW_TASK_OBJECT_PREPROCESS = 0x02, + DRAW_TASK_OBJECT_PREPROCESS = 0x02, DRAW_TASK_OBJECT_TRANSLUCENT = 0x03, }; @@ -132,13 +139,6 @@ enum reflect_refract_resolution_mode { REFLECT_REFRACT_RESOLUTION_512x512 = 0x02, }; -enum blur_filter_mode { - BLUR_FILTER_4 = 0x00, - BLUR_FILTER_9 = 0x01, - BLUR_FILTER_16 = 0x02, - BLUR_FILTER_32 = 0x03, -}; - enum shadow_type_enum { SHADOW_CHARA = 0x00, SHADOW_STAGE = 0x01, @@ -157,6 +157,10 @@ struct draw_state_stats { int32_t draw_count; int32_t draw_triangle_count; int32_t field_1C; + + draw_state_stats(); + + void reset(); }; struct sss_data { @@ -170,6 +174,12 @@ struct sss_data { ~sss_data(); }; +struct draw_preprocess { + int32_t type; + void(*func)(void*); + void* data; +}; + struct draw_pass { bool enable[DRAW_PASS_MAX]; shadow* shadow_ptr; @@ -186,14 +196,17 @@ struct draw_pass { bool alpha_z_sort; bool draw_pass_3d[DRAW_PASS_3D_MAX]; stage_data_reflect_type reflect_type; - render_texture reflect_texture; - render_texture refract_texture; + int32_t tex_index[11]; + render_texture render_textures[8]; + GLuint multisample_framebuffer; + GLuint multisample_renderbuffer; + bool multisample; int32_t show_vector_flags; float_t show_vector_length; float_t show_vector_z_offset; bool field_2F8; - //std::vector preprocess; - texture* sss_texture; + std::list preprocess; + texture* effect_texture; int32_t npr_param; bool field_31C; bool field_31D; @@ -202,9 +215,27 @@ struct draw_pass { bool field_320; bool npr; sss_data sss_data; + GLuint samplers[18]; draw_pass(); ~draw_pass(); + + void add_preprocess(int32_t type, void(*func)(void*), void* data); + void clear_preprocess(int32_t type); + render_texture& get_render_texture(int32_t index); + void resize(int32_t width, int32_t height); + void set_enable(draw_pass_type type, bool value); + void set_effect_texture(texture* value); + void set_multisample(bool value); + void set_npr_param(int32_t value); + void set_reflect(bool value); + void set_reflect_blur(int32_t reflect_blur_num, blur_filter_mode reflect_blur_filter); + void set_reflect_resolution_mode(reflect_refract_resolution_mode mode); + void set_reflect_type(stage_data_reflect_type type); + void set_refract(bool value); + void set_refract_resolution_mode(reflect_refract_resolution_mode mode); + void set_shadow_false(); + void set_shadow_true(); }; struct draw_state { @@ -230,6 +261,8 @@ struct draw_state { float_t fresnel; draw_state(); + + void set_fog_height(bool value); }; struct material_list_struct { @@ -439,9 +472,14 @@ struct object_data_culling_info { struct object_data_vertex_array { GLuint array_buffer; GLuint morph_array_buffer; + GLuint element_array_buffer; int32_t alive_time; GLuint vertex_array; bool vertex_attrib_array[16]; + obj_vertex_format vertex_format; + GLsizei size_vertex; + bool compressed; + GLuint vertex_attrib_buffer_binding[16]; int32_t texcoord_array[2]; }; diff --git a/src/CRE/render_texture.cpp b/src/CRE/render_texture.cpp index 056c9fc4..38f00a2a 100644 --- a/src/CRE/render_texture.cpp +++ b/src/CRE/render_texture.cpp @@ -8,7 +8,8 @@ #include "texture.hpp" static shader_glsl render_texture_shader; -static GLuint render_texture_vao, render_texture_vbo; +static GLuint render_texture_vao; +static GLuint render_texture_vbo; static bool render_texture_data_initialized; static uint32_t render_texture_counter; @@ -22,7 +23,7 @@ depth_texture(), binding(), max_level(), fbos(), rbo(), field_2C() { } render_texture::~render_texture() { - free_data(); + free(); } int32_t render_texture::bind(int32_t index) { @@ -32,6 +33,7 @@ int32_t render_texture::bind(int32_t index) { gl_state_bind_framebuffer(fbos[index]); if (glCheckFramebufferStatus(GL_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE) return -1; + glGetError(); return 0; } @@ -45,7 +47,7 @@ void render_texture::draw(bool depth) { gl_state_bind_vertex_array(0); } -void render_texture::free_data() { +void render_texture::free() { if (depth_texture) { texture_free(depth_texture); depth_texture = 0; @@ -81,7 +83,7 @@ int32_t render_texture::init(int32_t width, int32_t height, max_level = min_def(max_level, 15); if (max_level < 0) return 0; - free_data(); + free(); GLuint color_texture; if (color_format) { @@ -143,7 +145,6 @@ int32_t render_texture::set_color_depth_textures(GLuint color_texture, return error; } - void render_texture::draw_custom(shader_set_data* set) { gl_state_bind_vertex_array(render_texture_vao); set->draw_arrays(GL_TRIANGLE_STRIP, 0, 3); @@ -170,14 +171,7 @@ void render_texture::draw_params(shader_set_data* set, int32_t width, int32_t he gl_state_bind_vertex_array(0); } -void render_texture::shader_set(shader_set_data* set, uint32_t index) { - if (set && index) - set->set(index); - else - render_texture_shader.use(); -} - -void render_texture::shader_set_glsl(shader_glsl* shader) { +void render_texture::shader_set(shader_glsl* shader) { if (shader) shader->use(); else @@ -185,80 +179,88 @@ void render_texture::shader_set_glsl(shader_glsl* shader) { } void render_texture_data_init() { - if (!render_texture_data_initialized) { - static const char* render_texture_vert_shader = - "#version 430 core\n" - "out VertexData {\n" - " vec2 texcoord;\n" - "} result;\n" - "\n" - "void main() {\n" - " gl_Position.x = -1.0 + float(gl_VertexID / 2) * 4.0;\n" - " gl_Position.y = 1.0 - float(gl_VertexID % 2) * 4.0;\n" - " gl_Position.z = 0.0;\n" - " gl_Position.w = 1.0;\n" - " result.texcoord = gl_Position.xy * 0.5 + 0.5;\n" - "}\n"; + if (render_texture_data_initialized) + return; - static const char* render_texture_frag_shader = - "#version 430 core\n" - "layout(location = 0) out vec4 result;\n" - "\n" - "in VertexData {\n" - " vec2 texcoord;\n" - "} frg;\n" - "\n" - "layout(binding = 0) uniform sampler2D g_color;\n" - "\n" - "void main() {\n" - " result = texture(g_color, frg.texcoord);\n" - "}\n"; + static const char* render_texture_vert_shader = + "#version 430 core\n" + "out VertexData {\n" + " vec2 texcoord;\n" + "} result;\n" + "\n" + "void main() {\n" + " gl_Position.x = -1.0 + float(gl_VertexID / 2) * 4.0;\n" + " gl_Position.y = 1.0 - float(gl_VertexID % 2) * 4.0;\n" + " gl_Position.z = 0.0;\n" + " gl_Position.w = 1.0;\n" + " result.texcoord = gl_Position.xy * 0.5 + 0.5;\n" + "}\n"; - shader_glsl_param param = {}; - param.name = "Render Texture"; - render_texture_shader.load(render_texture_vert_shader, - render_texture_frag_shader, 0, ¶m); + static const char* render_texture_frag_shader = + "#version 430 core\n" + "layout(location = 0) out vec4 result;\n" + "\n" + "in VertexData {\n" + " vec2 texcoord;\n" + "} frg;\n" + "\n" + "layout(binding = 0) uniform sampler2D g_color;\n" + "\n" + "void main() {\n" + " result = texture(g_color, frg.texcoord);\n" + "}\n"; - const float_t verts_quad[] = { - -1.0f, 1.0f, 0.0f, 1.0f, - -1.0f, -3.0f, 0.0f, -1.0f, - 3.0f, 1.0f, 2.0f, 1.0f, - }; + shader_glsl_param param = {}; + param.name = "Render Texture"; + render_texture_shader.load(render_texture_vert_shader, + render_texture_frag_shader, 0, ¶m); - glGenVertexArrays(1, &render_texture_vao); - glGenBuffers(1, &render_texture_vbo); - glBindBuffer(GL_ARRAY_BUFFER, render_texture_vbo); + const float_t verts_quad[] = { + -1.0f, 1.0f, 0.0f, 1.0f, + -1.0f, -3.0f, 0.0f, -1.0f, + 3.0f, 1.0f, 2.0f, 1.0f, + }; + + glGenVertexArrays(1, &render_texture_vao); + gl_state_bind_vertex_array(render_texture_vao, true); + + glGenBuffers(1, &render_texture_vbo); + gl_state_bind_array_buffer(render_texture_vbo, true); + if (GLAD_GL_VERSION_4_4) + glBufferStorage(GL_ARRAY_BUFFER, sizeof(verts_quad), verts_quad, 0); + else glBufferData(GL_ARRAY_BUFFER, sizeof(verts_quad), verts_quad, GL_STATIC_DRAW); - gl_state_bind_vertex_array(render_texture_vao); - glEnableVertexAttribArray(0); - glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 16, (void*)0); // Pos - glVertexAttrib4f(3, 1.0f, 1.0f, 1.0f, 1.0f); // Color0 - glVertexAttrib4f(4, 1.0f, 1.0f, 1.0f, 1.0f); // Color1 - glEnableVertexAttribArray(8); - glVertexAttribPointer(8, 2, GL_FLOAT, GL_FALSE, 16, (void*)8); // TexCoord0 - glEnableVertexAttribArray(9); - glVertexAttribPointer(9, 2, GL_FLOAT, GL_FALSE, 16, (void*)8); // TexCoord1 - glEnableVertexAttribArray(10); - glVertexAttribPointer(10, 2, GL_FLOAT, GL_FALSE, 16, (void*)8); // TexCoord2 - glEnableVertexAttribArray(11); - glVertexAttribPointer(11, 2, GL_FLOAT, GL_FALSE, 16, (void*)8); // TexCoord3 - glEnableVertexAttribArray(12); - glVertexAttribPointer(12, 2, GL_FLOAT, GL_FALSE, 16, (void*)8); // TexCoord4 - glEnableVertexAttribArray(13); - glVertexAttribPointer(13, 2, GL_FLOAT, GL_FALSE, 16, (void*)8); // TexCoord5 - glEnableVertexAttribArray(14); - glVertexAttribPointer(14, 2, GL_FLOAT, GL_FALSE, 16, (void*)8); // TexCoord6 - glEnableVertexAttribArray(15); - glVertexAttribPointer(15, 2, GL_FLOAT, GL_FALSE, 16, (void*)8); // TexCoord7 - gl_state_bind_vertex_array(0); - glBindBuffer(GL_ARRAY_BUFFER, 0); + glEnableVertexAttribArray(0); + glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 16, (void*)0); // Pos + glVertexAttrib4f(3, 1.0f, 1.0f, 1.0f, 1.0f); // Color0 + glVertexAttrib4f(4, 1.0f, 1.0f, 1.0f, 1.0f); // Color1 + glEnableVertexAttribArray(8); + glVertexAttribPointer(8, 2, GL_FLOAT, GL_FALSE, 16, (void*)8); // TexCoord0 + glEnableVertexAttribArray(9); + glVertexAttribPointer(9, 2, GL_FLOAT, GL_FALSE, 16, (void*)8); // TexCoord1 + glEnableVertexAttribArray(10); + glVertexAttribPointer(10, 2, GL_FLOAT, GL_FALSE, 16, (void*)8); // TexCoord2 + glEnableVertexAttribArray(11); + glVertexAttribPointer(11, 2, GL_FLOAT, GL_FALSE, 16, (void*)8); // TexCoord3 + glEnableVertexAttribArray(12); + glVertexAttribPointer(12, 2, GL_FLOAT, GL_FALSE, 16, (void*)8); // TexCoord4 + glEnableVertexAttribArray(13); + glVertexAttribPointer(13, 2, GL_FLOAT, GL_FALSE, 16, (void*)8); // TexCoord5 + glEnableVertexAttribArray(14); + glVertexAttribPointer(14, 2, GL_FLOAT, GL_FALSE, 16, (void*)8); // TexCoord6 + glEnableVertexAttribArray(15); + glVertexAttribPointer(15, 2, GL_FLOAT, GL_FALSE, 16, (void*)8); // TexCoord7 + gl_state_bind_array_buffer(0); + gl_state_bind_vertex_array(0); - render_texture_data_initialized = true; - } + render_texture_data_initialized = true; } void render_texture_data_free() { + if (!render_texture_data_initialized) + return; + render_texture_shader.unload(); glDeleteBuffers(1, &render_texture_vbo); @@ -330,4 +332,4 @@ static int32_t render_texture_framebuffer_set_texture(render_texture* rt, gl_state_bind_framebuffer(0); glGetError(); return ret; -} \ No newline at end of file +} diff --git a/src/CRE/render_texture.hpp b/src/CRE/render_texture.hpp index 9d3d4245..0999df32 100644 --- a/src/CRE/render_texture.hpp +++ b/src/CRE/render_texture.hpp @@ -24,18 +24,17 @@ struct render_texture { int32_t bind(int32_t index = 0); void draw(bool depth = false); - void free_data(); + void free(); int32_t init(int32_t width, int32_t height, int32_t max_level, GLenum color_format, GLenum depth_format); int32_t set_color_depth_textures(GLuint color_texture, - int32_t max_level, GLuint depth_texture, bool stencil); + int32_t max_level, GLuint depth_texture, bool stencil = false); static void draw_custom(shader_set_data* set); static void draw_custom_glsl(); - static void draw_params(shader_set_data* set, int32_t width, int32_t height, - float_t scale, float_t param_x, float_t param_y, float_t param_z, float_t param_w); - static void shader_set(shader_set_data* set, uint32_t index); - static void shader_set_glsl(shader_glsl* shader); + static void draw_params(shader_set_data* set, int32_t width, int32_t height, float_t scale = 1.0f, + float_t param_x = 1.0f, float_t param_y = 1.0f, float_t param_z = 1.0f, float_t param_w = 1.0f); + static void shader_set(shader_glsl* shader); }; extern void render_texture_data_init(); diff --git a/src/CRE/resolution_mode.cpp b/src/CRE/resolution_mode.cpp new file mode 100644 index 00000000..aee855c3 --- /dev/null +++ b/src/CRE/resolution_mode.cpp @@ -0,0 +1,80 @@ +/* + by korenkonder + GitHub/GitLab: korenkonder +*/ + +#include "resolution_mode.hpp" + +const resolution_table_struct resolution_table[] = { + { 320, 240, 0, 0, 0, 320, 225 }, + { 640, 480, 0, 0, 60, 640, 360 }, + { 800, 600, 0, 0, 75, 800, 450 }, + { 1024, 768, 0, 0, 96, 1024, 576 }, + { 1280, 1024, 1, 0, 152, 1280, 720 }, + { 1400, 1050, 0, 0, 131, 1400, 788 }, + { 1600, 1200, 0, 0, 150, 1600, 900 }, + { 800, 480, 2, 0, 15, 800, 450 }, + { 1024, 600, 2, 0, 12, 1024, 576 }, + { 1280, 768, 2, 0, 24, 1280, 720 }, + { 1360, 768, 3, 0, 2, 1360, 765 }, + { 1920, 1200, 2, 0, 60, 1920, 1200 }, + { 2560, 1536, 2, 0, 48, 2560, 1440 }, + { 1280, 720, 3, 0, 0, 1280, 720 }, + { 1920, 1080, 3, 0, 0, 1920, 1080 }, + { 2560, 1440, 3, 0, 0, 2560, 1440 }, + { 480, 272, 3, 0, 0, 480, 272 }, + { 960, 544, 3, 0, 0, 960, 544 }, +}; + +vec2 resolution_mode_get_scale(const resolution_mode dst_mode, const resolution_mode src_mode) { + if (dst_mode == RESOLUTION_MODE_END + || src_mode == RESOLUTION_MODE_END + || dst_mode < RESOLUTION_MODE_QVGA + || src_mode < RESOLUTION_MODE_QVGA + || dst_mode >= RESOLUTION_MODE_END + || src_mode >= RESOLUTION_MODE_END) + return 1.0f; + + float_t scale_x = (float_t)resolution_table[dst_mode].width_full / (float_t)resolution_table[src_mode].width_full; + float_t scale_y = (float_t)resolution_table[dst_mode].height_full / (float_t)resolution_table[src_mode].height_full; + int32_t v9 = resolution_table[src_mode].field_8; + int32_t v10 = resolution_table[dst_mode].field_8; + if (v9 != v10) { + if (!v9 && 10 == 1) + return scale_x; + + if (v9 == 2 || v9 == 3) + switch (v10) { + case 0: + case 1: + case 2: + return scale_x; + } + } + + if (src_mode == RESOLUTION_MODE_qHD && dst_mode != RESOLUTION_MODE_qHD && v10 == 3) + return scale_x; + else + return scale_y; +} + +void resolution_mode_scale_pos(vec2& dst_pos, const resolution_mode dst_mode, + const vec2& src_pos, const resolution_mode src_mode) { + if (dst_mode == RESOLUTION_MODE_END + || src_mode == RESOLUTION_MODE_END + || dst_mode < RESOLUTION_MODE_QVGA + || src_mode < RESOLUTION_MODE_QVGA + || dst_mode >= RESOLUTION_MODE_END + || src_mode >= RESOLUTION_MODE_END) { + dst_pos = src_pos; + return; + } + + const resolution_table_struct* src = &resolution_table[src_mode]; + const resolution_table_struct* dst = &resolution_table[dst_mode]; + + vec2 src_size((float_t)src->width_full, (float_t)src->height_full); + vec2 dst_size((float_t)dst->width_full, (float_t)dst->height_full); + vec2 scale = resolution_mode_get_scale(dst_mode, src_mode); + dst_pos = dst_size * 0.5f + (src_pos - src_size * 0.5f) * scale; +} \ No newline at end of file diff --git a/src/CRE/resolution_mode.hpp b/src/CRE/resolution_mode.hpp new file mode 100644 index 00000000..0ecba4ed --- /dev/null +++ b/src/CRE/resolution_mode.hpp @@ -0,0 +1,58 @@ +/* + by korenkonder + GitHub/GitLab: korenkonder +*/ + +#pragma once + +#include "../KKdLib/default.hpp" +#include "../KKdLib/vec.hpp" + +enum resolution_mode { + RESOLUTION_MODE_QVGA = 0x00, + RESOLUTION_MODE_VGA = 0x01, + RESOLUTION_MODE_SVGA = 0x02, + RESOLUTION_MODE_XGA = 0x03, + RESOLUTION_MODE_SXGA = 0x04, + RESOLUTION_MODE_SXGAPlus = 0x05, + RESOLUTION_MODE_UXGA = 0x06, + RESOLUTION_MODE_WVGA = 0x07, + RESOLUTION_MODE_WSVGA = 0x08, + RESOLUTION_MODE_WXGA = 0x09, + RESOLUTION_MODE_FWXGA = 0x0A, + RESOLUTION_MODE_WUXGA = 0x0B, + RESOLUTION_MODE_WQXGA = 0x0C, + RESOLUTION_MODE_HD = 0x0D, + RESOLUTION_MODE_FHD = 0x0E, + RESOLUTION_MODE_QHD = 0x0F, + RESOLUTION_MODE_WQVGA = 0x10, + RESOLUTION_MODE_qHD = 0x11, + RESOLUTION_MODE_END = 0x12, + RESOLUTION_MODE_13 = 0x13, +}; + +struct resolution_table_struct { + int32_t width_full; + int32_t height_full; + int32_t field_8; + int32_t x_offset; + int32_t y_offset; + int32_t width; + int32_t height; +}; + +struct resolution_struct { + resolution_mode resolution_mode; + int32_t x_offset; + int32_t y_offset; + int32_t width; + int32_t height; + double_t aspect; + int32_t field_20; +}; + +extern const resolution_table_struct resolution_table[]; + +extern vec2 resolution_mode_get_scale(const resolution_mode dst_mode, const resolution_mode src_mode); +extern void resolution_mode_scale_pos(vec2& dst_pos, const resolution_mode dst_mode, + const vec2& src_pos, const resolution_mode src_mode); diff --git a/src/CRE/rob/ex_block.cpp b/src/CRE/rob/ex_block.cpp index 2b6fc7a3..ca523fe7 100644 --- a/src/CRE/rob/ex_block.cpp +++ b/src/CRE/rob/ex_block.cpp @@ -113,7 +113,7 @@ static void sub_14047C750(RobOsage* rob_osg, mat4* mat, vec3* parent_scale, floa static void sub_14047C770(RobOsage* rob_osg, mat4* mat, vec3* parent_scale, float_t step, bool a5); static void sub_14047D620(RobOsage* rob_osg, float_t step); static void sub_14047ECA0(RobOsage* rob_osg, float_t step); -static void sub_14047F990(RobOsage* rob_osg, mat4* a2, vec3* a3, bool a4); +static void sub_14047F990(RobOsage* rob_osg, mat4* a2, vec3* parent_scale, bool a4); static void sub_140480260(RobOsage* rob_osg, mat4* mat, vec3* parent_scale, float_t step, bool v5); static void sub_140482100(struc_476* a1, opd_blend_data* a2, struc_477* a3); static void sub_140482DF0(struc_477* dst, struc_477* src0, struc_477* src1, float_t blend); @@ -201,7 +201,7 @@ void ExNodeBlock::Field_58() { field_59 = false; } -void ExNodeBlock::InitData(bone_node* bone_node, ex_node_type type, +void ExNodeBlock::InitData(bone_node* bone_node, ExNodeType type, const char* name, rob_chara_item_equip_object* itm_eq_obj) { bone_node_ptr = bone_node; this->type = type; @@ -324,17 +324,6 @@ void RobOsageNodeDataNormalRef::GetMat() { } } -skin_param_hinge::skin_param_hinge() { - ymin = -90.0f; - ymax = 90.0f; - zmin = -90.0f; - zmax = 90.0f; -} - -skin_param_hinge::~skin_param_hinge() { - -} - void skin_param_hinge::limit() { ymin = max_def(ymin, -179.0f) * DEG_TO_RAD_FLOAT; ymax = min_def(ymax, 179.0f) * DEG_TO_RAD_FLOAT; @@ -342,14 +331,11 @@ void skin_param_hinge::limit() { zmax = min_def(zmax, 179.0f) * DEG_TO_RAD_FLOAT; } -skin_param_osage_node::skin_param_osage_node() : coli_r(0.0f), weight(1.0f), inertial_cancel(0.0f) { +skin_param_osage_node::skin_param_osage_node() : coli_r(), inertial_cancel() { + weight = 1.0f; hinge.limit(); } -skin_param_osage_node::~skin_param_osage_node() { - -} - RobOsageNodeResetData::RobOsageNodeResetData() : length() { } @@ -400,23 +386,23 @@ RobOsageNode::~RobOsageNode() { void RobOsageNode::Reset() { length = 0.0f; - trans = vec3_null; - trans_orig = vec3_null; - trans_diff = vec3_null; - field_28 = vec3_null; + trans = 0.0f; + trans_orig = 0.0f; + trans_diff = 0.0f; + field_28 = 0.0f; child_length = 0.0f; bone_node_ptr = 0; bone_node_mat = 0; sibling_node = 0; max_distance = 0.0f; - field_94 = vec3_null; - reset_data.trans = vec3_null; - reset_data.trans_diff = vec3_null; - reset_data.rotation = vec3_null; + field_94 = 0.0f; + reset_data.trans = 0.0f; + reset_data.trans_diff = 0.0f; + reset_data.rotation = 0.0f; reset_data.length = 0.0f; field_C8 = 0.0f; field_CC = 1.0f; - external_force = vec3_null; + external_force = 0.0f; force = 1.0f; data.Reset(); data_ptr = &data; @@ -460,33 +446,15 @@ skin_param_osage_root::~skin_param_osage_root() { } -skin_param::skin_param() : friction(1.0f), wind_afc(), air_res(1.0f), rot(), init_rot(), -coli_type(), stiffness(), move_cancel(-0.01f), coli_r(), force(), force_gain(), colli_tgt_osg() { - hinge.limit(); +skin_param::skin_param() : friction(), wind_afc(), air_res(), rot(), init_rot(), +coli_type(), stiffness(), move_cancel(), coli_r(), force(), force_gain(), colli_tgt_osg() { + reset(); } skin_param::~skin_param() { } -void skin_param::reset() { - coli.clear(); - friction = 1.0f; - wind_afc = 0.0f; - air_res = 1.0f; - rot = vec3_null; - init_rot = vec3_null; - coli_type = 0; - stiffness = 0.0f; - move_cancel = -0.01f; - coli_r = 0.0f; - hinge = skin_param_hinge(); - hinge.limit(); - force = 0.0f; - force_gain = 0.0f; - colli_tgt_osg = 0; -} - osage_coli::osage_coli() : type(), radius(), bone0_pos(), bone1_pos(), bone_pos_diff(), bone_pos_diff_length(), bone_pos_diff_length_squared(), field_34() { @@ -528,9 +496,9 @@ void osage_coli::ring_set(osage_coli* coli, if (!vec_skp_root_coli.size()) { coli->type = (skin_param_osage_root_coli_type)0; coli->radius = 0.0f; - coli->bone0_pos = vec3_null; - coli->bone1_pos = vec3_null; - coli->bone_pos_diff = vec3_null; + coli->bone0_pos = 0.0f; + coli->bone1_pos = 0.0f; + coli->bone_pos_diff = 0.0f; coli->bone_pos_diff_length = 0.0f; coli->bone_pos_diff_length_squared = 0.0f; coli->field_34 = 1.0f; @@ -637,10 +605,10 @@ void CLOTH::Reset() { root_count = 0; nodes_count = 0; nodes.clear(); - wind_direction = vec3_null; + wind_direction = 0.0f; field_44 = 0.0f; set_external_force = false; - external_force = vec3_null; + external_force = 0.0f; skin_param.reset(); skin_param_ptr = &skin_param; } @@ -762,7 +730,7 @@ void RobCloth::InitData(size_t root_count, size_t nodes_count, obj_skin_block_cl mesh[i].submesh_array[j].attrib.m.cloth = 1; v27.attrib.m.cloth = 0; v27.bounding_sphere.radius = 1000.0f; - v27.axis_aligned_bounding_box.center = vec3_null; + v27.axis_aligned_bounding_box.center = 0.0f; v27.axis_aligned_bounding_box.size = { 1000.0f, 1000.0f, 1000.0f }; } mesh[i].submesh_array = submesh.arr; @@ -770,14 +738,14 @@ void RobCloth::InitData(size_t root_count, size_t nodes_count, obj_skin_block_cl } this->index_buffer[0] = index_buffer[mesh_name_index]; - if (!vertex_buffer[0].load(mesh[0])) + if (!vertex_buffer[0].load(mesh[0], true)) return; this->index_buffer[1] = {}; if (cls_data->backface_mesh_name && backface_mesh_name_index != -1) this->index_buffer[1] = index_buffer[backface_mesh_name_index]; - if (cls_data->backface_mesh_name && !vertex_buffer[1].load(mesh[1])) + if (cls_data->backface_mesh_name && !vertex_buffer[1].load(mesh[1], true)) return; field_8 = (((field_8 ^ (4 * a7)) & 0x04) ^ field_8) | 0x03; @@ -819,14 +787,20 @@ void RobCloth::InitData(size_t root_count, size_t nodes_count, obj_skin_block_cl v55.trans_orig = root[i].trans; } - uint16_t* mesh_indices = cls_data->mesh_indices; + uint16_t* mesh_index_array = cls_data->mesh_index_array; obj_mesh* mesh = object_storage_get_obj_mesh(itm_eq_obj->obj_info, cls_data->mesh_name); - if (mesh && mesh->vertex_format + obj_vertex_format vertex_format = (obj_vertex_format)0; + obj_vertex_data* vertex_array = 0; + if (mesh) { + vertex_format = mesh->vertex_format; + vertex_array = mesh->vertex_array; + } + + if (mesh && vertex_format & (OBJ_VERTEX_TEXCOORD0 | OBJ_VERTEX_TANGENT | OBJ_VERTEX_NORMAL | OBJ_VERTEX_POSITION)) { - obj_vertex_data* vertex = mesh->vertex; for (size_t i = 0; i < root_count; ++i) - this->root.data()[i].tangent = vertex[mesh_indices[i]].tangent; + this->root.data()[i].tangent = vertex_array[mesh_index_array[i]].tangent; } for (size_t i = 1; i < nodes_count; i++) @@ -858,8 +832,8 @@ void RobCloth::InitData(size_t root_count, size_t nodes_count, obj_skin_block_cl flags |= 0x08; v72.flags = flags; - if (mesh && mesh->vertex_format & OBJ_VERTEX_TEXCOORD0) - v72.texcoord = mesh->vertex[mesh_indices[i * root_count + j]].texcoord0; + if (mesh && vertex_format & OBJ_VERTEX_TEXCOORD0) + v72.texcoord = vertex_array[mesh_index_array[i * root_count + j]].texcoord0; } Init(); @@ -869,8 +843,8 @@ void RobCloth::InitDataParent(obj_skin_block_cloth* cls_data, rob_chara_item_equip_object* itm_eq_obj, bone_database* bone_data) { ResetData(); this->cls_data = cls_data; - InitData(cls_data->root_count, cls_data->nodes_count, cls_data->root, - cls_data->nodes, cls_data->mats, cls_data->field_14, itm_eq_obj, bone_data); + InitData(cls_data->num_root, cls_data->num_node, cls_data->root_array, + cls_data->node_array, cls_data->mat_array, cls_data->field_14, itm_eq_obj, bone_data); } float_t* RobCloth::LoadOpdData(size_t node_index, float_t* opd_data, size_t opd_count) { @@ -900,7 +874,7 @@ void RobCloth::LoadSkinParam(void* kv, const char* name, bone_database* bone_dat void RobCloth::ResetExtrenalForce() { set_external_force = false; - external_force = vec3_null; + external_force = 0.0f; } void RobCloth::SetForceAirRes(float_t force, float_t force_gain, float_t air_res) { @@ -951,8 +925,7 @@ void RobCloth::SetOsagePlayData(std::vector& opd_blend_data) { CLOTHNode& root_node = nodes.data()[j]; vec3 v26 = root_node.trans; mat4 mat = root.data()[j].field_98; - mat4_translate_mult(&mat, root_node.trans_orig.x, - root_node.trans_orig.y, root_node.trans_orig.z, &mat); + mat4_translate_mult(&mat, &root_node.trans_orig, &mat); CLOTHNode* v29 = &nodes.data()[j + root_count]; @@ -992,7 +965,7 @@ void RobCloth::SetOsagePlayData(std::vector& opd_blend_data) { vec3 v85; mat4_mult_vec3_inv_trans(&mat, &v57, &v85); - vec3 rotation = vec3_null; + vec3 rotation = 0.0f; int32_t yz_order = 0; sub_140482FF0(mat, v85, 0, &rotation, yz_order); @@ -1013,8 +986,7 @@ void RobCloth::SetOsagePlayData(std::vector& opd_blend_data) { for (size_t i = 0; i < root_count; i++) { CLOTHNode& root_node = nodes.data()[i]; mat4 mat = root.data()[0].field_98; - mat4_translate_mult(&mat, root_node.trans_orig.x, - root_node.trans_orig.y, root_node.trans_orig.z, &mat); + mat4_translate_mult(&mat, &root_node.trans_orig, &mat); CLOTHNode* v50 = &nodes.data()[i + root_count]; @@ -1068,13 +1040,13 @@ void RobCloth::UpdateDisp() { obj_mesh* backface_mesh = object_storage_get_obj_mesh(itm_eq_obj->obj_info, cls_data->backface_mesh_name); if (cls_data->backface_mesh_name) { UpdateVertexBuffer(mesh, &vertex_buffer[0], nodes.data(), - 1.0f, cls_data->mesh_indices_count, cls_data->mesh_indices, false); + 1.0f, cls_data->num_mesh_index, cls_data->mesh_index_array, false); UpdateVertexBuffer(backface_mesh, &vertex_buffer[1], nodes.data(), - -1.0f, cls_data->backface_mesh_indices_count, cls_data->backface_mesh_indices, false); + -1.0f, cls_data->num_backface_mesh_index, cls_data->backface_mesh_index_array, false); } else UpdateVertexBuffer(mesh, &vertex_buffer[0], nodes.data(), - 1.0, cls_data->backface_mesh_indices_count, cls_data->mesh_indices, true); + 1.0, cls_data->num_mesh_index, cls_data->mesh_index_array, true); } } @@ -1120,11 +1092,21 @@ void RobCloth::UpdateVertexBuffer(obj_mesh* mesh, obj_mesh_vertex_buffer* vertex return; vertex_buffer->cycle_index(); - glBindBuffer(GL_ARRAY_BUFFER, vertex_buffer->get_buffer()); - size_t data = (size_t)glMapBuffer(GL_ARRAY_BUFFER, GL_WRITE_ONLY); - if (!data) { - glBindBuffer(GL_ARRAY_BUFFER, 0); - return; + size_t data; + if (GLAD_GL_VERSION_4_5) { + data = (size_t)glMapNamedBuffer(vertex_buffer->get_buffer(), GL_WRITE_ONLY); + if (!data) { + glUnmapNamedBuffer(vertex_buffer->get_buffer()); + return; + } + } + else { + gl_state_bind_array_buffer(vertex_buffer->get_buffer()); + data = (size_t)glMapBuffer(GL_ARRAY_BUFFER, GL_WRITE_ONLY); + if (!data) { + gl_state_bind_array_buffer(0); + return; + } } if (double_sided) @@ -1139,7 +1121,7 @@ void RobCloth::UpdateVertexBuffer(obj_mesh* mesh, obj_mesh_vertex_buffer* vertex CLOTHNode* node = &nodes[*indices]; *(vec3*)data = node->trans; - vec3_mult_scalar(node->normal, facing, *(vec3*)(data + 0x0C)); + *(vec3*)(data + 0x0C) = node->normal * facing; *(vec3*)(data + 0x18) = node->tangent; *(float_t*)(data + 0x24) = node->tangent_sign; @@ -1155,7 +1137,7 @@ void RobCloth::UpdateVertexBuffer(obj_mesh* mesh, obj_mesh_vertex_buffer* vertex CLOTHNode* node = &nodes[*indices]; *(vec3*)data = node->trans; - vec3_mult_scalar(node->normal, facing, *(vec3*)(data + 0x0C)); + *(vec3*)(data + 0x0C) = node->normal * facing; data += mesh->size_vertex; } @@ -1172,15 +1154,14 @@ void RobCloth::UpdateVertexBuffer(obj_mesh* mesh, obj_mesh_vertex_buffer* vertex *(vec3*)data = node->trans; - vec3 normal; - vec3_mult_scalar(node->normal, 32727.0f * facing, normal); + vec3 normal = node->normal * (32727.0f * facing); vec3_to_vec3i16(normal, *(vec3i16*)(data + 0x0C)); *(int16_t*)(data + 0x12) = 0; vec4 tangent; *(vec3*)&tangent = node->tangent; tangent.w = node->tangent_sign; - vec4_mult_scalar(tangent, 32727.0f, tangent); + tangent *= 32727.0f; vec4_to_vec4i16(tangent, *(vec4i16*)(data + 0x14)); data += mesh->size_vertex; @@ -1196,8 +1177,7 @@ void RobCloth::UpdateVertexBuffer(obj_mesh* mesh, obj_mesh_vertex_buffer* vertex *(vec3*)data = node->trans; - vec3 normal; - vec3_mult_scalar(node->normal, 32727.0f * facing, normal); + vec3 normal = node->normal * (32727.0f * facing); vec3_to_vec3i16(normal, *(vec3i16*)(data + 0x0C)); *(int16_t*)(data + 0x12) = 0; @@ -1209,8 +1189,12 @@ void RobCloth::UpdateVertexBuffer(obj_mesh* mesh, obj_mesh_vertex_buffer* vertex } } - glUnmapBuffer(GL_ARRAY_BUFFER); - glBindBuffer(GL_ARRAY_BUFFER, 0); + if (GLAD_GL_VERSION_4_5) + glUnmapNamedBuffer(vertex_buffer->get_buffer()); + else { + glUnmapBuffer(GL_ARRAY_BUFFER); + gl_state_bind_array_buffer(0); + } } ExClothBlock::ExClothBlock() { @@ -1388,7 +1372,7 @@ RobOsageNode* RobOsage::GetNode(size_t index) { void RobOsage::InitData(obj_skin_block_osage* osg_data, obj_skin_osage_node* osg_nodes, bone_node* ex_data_bone_nodes, obj_skin* skin) { Reset(); - exp_data.set_position_rotation(osg_data->base.position, osg_data->base.rotation); + exp_data.set_position_rotation(osg_data->node.position, osg_data->node.rotation); nodes.clear(); nodes.resize(osg_data->count + 1ULL); @@ -1425,35 +1409,34 @@ void RobOsage::InitData(obj_skin_block_osage* osg_data, obj_skin_osage_node* osg *node.bone_node_ptr->ex_data_mat = mat4_identity; if (osg_data->count) { - obj_skin_osage_node* v23 = osg_data->nodes; + obj_skin_osage_node* node_array = osg_data->node_array; size_t v24 = 0; RobOsageNode* v26 = &nodes.data()[1]; for (size_t i = 0; i < osg_data->count; i++) { - vec3 v27 = vec3_null; - if (v23) - v27 = v23[i].rotation; + vec3 v27 = 0.0f; + if (node_array) + v27 = node_array[i].rotation; mat4 mat; - mat4_rotate(v27.x, v27.y, v27.z, &mat); + mat4_rotate(&v27, &mat); vec3 v49; - v49 = vec3_null; + v49 = 0.0f; v49.x = v26[i].length; mat4_mult_vec3(&mat, &v49, &v26[i].field_94); } } if (osg_data->count) { - obj_skin_osage_node* v23 = osg_data->nodes; RobOsageNode* v26 = &nodes.data()[1]; size_t v33 = 0; for (uint32_t i = 0; i < osg_data->count; i++) { v26[i].mat = mat4_null; - obj_skin_bone* v36 = skin->bones; - for (uint32_t j = 0; j < skin->bones_count; j++, v36++) - if (v36->id == osg_nodes->name_index) { - mat4_inverse_normalized(&skin->bones[j].inv_bind_pose_mat, &v26[i].mat); + obj_skin_bone* bone = skin->bone_array; + for (uint32_t j = 0; j < skin->num_bone; j++, bone++) + if (bone->id == osg_nodes->name_index) { + mat4_inverse_normalized(&bone->inv_bind_pose_mat, &v26[i].mat); break; } @@ -1507,7 +1490,7 @@ void RobOsage::LoadSkinParam(void* kv, const char* name, void RobOsage::Reset() { nodes.clear(); node.Reset(); - wind_direction = vec3_null; + wind_direction = 0.0f; field_1EB4 = 0.0f; yz_order = 0; field_2A0 = true; @@ -1525,14 +1508,14 @@ void RobOsage::Reset() { field_2A4 = 0.0f; field_2A1 = false; set_external_force = false; - external_force = vec3_null; + external_force = 0.0f; parent_mat_ptr = 0; parent_mat = mat4_null; } void RobOsage::ResetExtrenalForce() { set_external_force = false; - external_force = vec3_null; + external_force = 0.0f; } void RobOsage::SetAirRes(float_t air_res) { @@ -1590,7 +1573,7 @@ void RobOsage::SetNodesExternalForce(vec3* external_force, float_t strength) { if (external_force) v4 = *external_force; else - v4 = vec3_null; + v4 = 0.0f; size_t exf = osage_setting.exf; size_t v8 = 0; @@ -1598,18 +1581,18 @@ void RobOsage::SetNodesExternalForce(vec3* external_force, float_t strength) { float_t strength4 = strength * strength * strength * strength; v8 = ((exf - 4) / 4 + 1) * 4; for (size_t v10 = v8 / 4; v10; v10--) - vec3_mult_scalar(v4, strength4, v4); + v4 *= strength4; } if (v8 < exf) for (size_t v12 = exf - v8; v12; v12--) - vec3_mult_scalar(v4, strength, v4); + v4 *= strength; RobOsageNode* i_begin = nodes.data() + 1; RobOsageNode* i_end = nodes.data() + nodes.size(); for (RobOsageNode* i = i_begin; i != i_end; i++) { i->external_force = v4; - vec3_mult_scalar(v4, strength, v4); + v4 *= strength; } } @@ -1690,7 +1673,7 @@ void RobOsage::SetOsagePlayData(mat4* parent_mat, vec3 v86; mat4_mult_vec3_inv_trans(&v87, &v82, &v86); - vec3 rotation = vec3_null; + vec3 rotation = 0.0f; sub_140482FF0(v87, v86, 0, &rotation, yz_order); mat4_set_translation(&v87, &v82); @@ -1723,7 +1706,7 @@ void RobOsage::SetOsagePlayData(mat4* parent_mat, *j->bone_node_ptr->ex_data_mat = v85; if (j->bone_node_mat) { mat4 mat = v85; - mat4_scale_rot(&mat, parent_scale.x, parent_scale.y, parent_scale.z, &mat); + mat4_scale_rot(&mat, &parent_scale, &mat); *j->bone_node_mat = mat; } mat4_translate_mult(&v85, j->field_1B0.field_0.length, 0.0f, 0.0f, &v85); @@ -1736,7 +1719,7 @@ void RobOsage::SetOsagePlayData(mat4* parent_mat, mat4_translate_mult(&v87, node.length * parent_scale.x, 0.0f, 0.0f, &v87); *node.bone_node_ptr->ex_data_mat = v87; - mat4_scale_rot(&v87, parent_scale.x, parent_scale.y, parent_scale.z, &v87); + mat4_scale_rot(&v87, &parent_scale, &v87); *node.bone_node_mat = v87; node.bone_node_ptr->exp_data.parent_scale = parent_scale; } @@ -1868,8 +1851,8 @@ void ExOsageBlock::Field_20() { mat4 mat = *parent_bone_node->ex_data_mat; if (scale.x != 1.0f || scale.y != 1.0f || scale.z != 1.0f) { - vec3_div(vec3_identity, scale, scale); - mat4_scale_rot(&mat, scale.x, scale.y, scale.z, &mat); + vec3_div(1.0f, scale, scale); + mat4_scale_rot(&mat, &scale, &mat); } SetWindDirection(); rob.ColiSet(mats); @@ -2020,9 +2003,9 @@ void ExConstraintBlock::Init() { void ExConstraintBlock::Field_10() { if (bone_node_ptr) { bone_node_expression_data* node_exp_data = &bone_node_ptr->exp_data; - node_exp_data->position = cns_data->base.position; - node_exp_data->rotation = cns_data->base.rotation; - node_exp_data->scale = cns_data->base.scale; + node_exp_data->position = cns_data->node.position; + node_exp_data->rotation = cns_data->node.rotation; + node_exp_data->scale = cns_data->node.scale; } field_59 = false; } @@ -2086,26 +2069,27 @@ void ExConstraintBlock::Calc() { vec3_mult(parent_bone_node->exp_data.parent_scale, node->exp_data.position, pos); mat4 mat; - mat4_translate_mult(parent_bone_node->ex_data_mat, pos.x, pos.y, pos.z, &mat); + mat4_translate_mult(parent_bone_node->ex_data_mat, &pos, &mat); switch (constraint_type) { case OBJ_SKIN_BLOCK_CONSTRAINT_ORIENTATION: { + obj_skin_block_constraint_orientation* orientation = cns_data->orientation; + vec3 trans; mat4_get_translation(&mat, &trans); mat3 rot; mat3_from_mat4(source_node_bone_node->mat, &rot); mat3_normalize_rotation(&rot, &rot); - - vec3 offset = cns_data->orientation.offset; - mat3_rotate_mult(&rot, offset.x, offset.y, offset.z, &rot); - + mat3_rotate_mult(&rot, &orientation->offset, &rot); mat4_from_mat3(&rot, node->mat); mat4_set_translation(node->mat, &trans); } break; case OBJ_SKIN_BLOCK_CONSTRAINT_DIRECTION: { - vec3 align_axis = cns_data->direction.align_axis; - vec3 target_offset = cns_data->direction.target_offset; + obj_skin_block_constraint_direction* direction = cns_data->direction; + + vec3 align_axis = direction->align_axis; + vec3 target_offset = direction->target_offset; mat4_mult_vec3_trans(source_node_bone_node->mat, &target_offset, &target_offset); mat4_mult_vec3_inv_trans(&mat, &target_offset, &target_offset); float_t target_offset_length; @@ -2116,7 +2100,7 @@ void ExConstraintBlock::Calc() { mat4 v59; sub_1401EB410(&v59, &align_axis, &target_offset); if (direction_up_vector_bone_node) { - vec3 affected_axis = cns_data->direction.up_vector.affected_axis; + vec3 affected_axis = direction->up_vector.affected_axis; mat4 v56; mat4_mult(&v59, &mat, &v56); mat4_mult_vec3(&v56, &affected_axis, &affected_axis); @@ -2157,9 +2141,11 @@ void ExConstraintBlock::Calc() { mat4_mult(&v59, &mat, node->mat); } break; case OBJ_SKIN_BLOCK_CONSTRAINT_POSITION: { - vec3 constraining_offset = cns_data->position.constraining_object.offset; - vec3 constrained_offset = cns_data->position.constrained_object.offset; - if (cns_data->position.constraining_object.affected_by_orientation) + obj_skin_block_constraint_position* position = cns_data->position; + + vec3 constraining_offset = position->constraining_object.offset; + vec3 constrained_offset = position->constrained_object.offset; + if (position->constraining_object.affected_by_orientation) mat4_mult_vec3(source_node_bone_node->mat, &constraining_offset, &constraining_offset); vec3 source_node_trans; @@ -2172,15 +2158,14 @@ void ExConstraintBlock::Calc() { mat4_mult_vec3_inv_trans(&mat, &up_vector_trans, &up_vector_trans); mat4 v26; - sub_1401EB410(&v26, &cns_data->position.up_vector.affected_axis, &up_vector_trans); + sub_1401EB410(&v26, &position->up_vector.affected_axis, &up_vector_trans); mat4_mult(&v26, &mat, &mat); } - if (cns_data->position.constrained_object.affected_by_orientation) + if (position->constrained_object.affected_by_orientation) mat4_mult_vec3(&mat, &constrained_offset, &constrained_offset); mat4 constrained_offset_mat; - mat4_translate(constrained_offset.x, constrained_offset.y, - constrained_offset.z, &constrained_offset_mat); + mat4_translate(&constrained_offset, &constrained_offset_mat); mat4_mult(&mat, &constrained_offset_mat, node->mat); } break; case OBJ_SKIN_BLOCK_CONSTRAINT_DISTANCE: @@ -2209,7 +2194,7 @@ void ExConstraintBlock::DataSet() { if (fabsf(parent_scale.z) > 0.000001f) exp_data->position.z /= parent_scale.z; *bone_node_ptr->ex_data_mat = *bone_node_ptr->mat; - mat4_scale_rot(bone_node_ptr->mat, parent_scale.x, parent_scale.y, parent_scale.z, bone_node_ptr->mat); + mat4_scale_rot(bone_node_ptr->mat, &parent_scale, bone_node_ptr->mat); vec3_mult(exp_data->scale, parent_scale, exp_data->parent_scale); } @@ -2228,15 +2213,15 @@ void ExConstraintBlock::InitData(rob_chara_item_equip_object* itm_eq_obj, const char* up_vector_name; if (type == OBJ_SKIN_BLOCK_CONSTRAINT_DIRECTION) { constraint_type = OBJ_SKIN_BLOCK_CONSTRAINT_DIRECTION; - up_vector_name = cns_data->direction.up_vector.name; + up_vector_name = cns_data->direction->up_vector.name; } else if (type == OBJ_SKIN_BLOCK_CONSTRAINT_POSITION) { constraint_type = OBJ_SKIN_BLOCK_CONSTRAINT_POSITION; - up_vector_name = cns_data->position.up_vector.name; + up_vector_name = cns_data->position->up_vector.name; } else if (type == OBJ_SKIN_BLOCK_CONSTRAINT_DISTANCE) { constraint_type = OBJ_SKIN_BLOCK_CONSTRAINT_DISTANCE; - up_vector_name = cns_data->distance.up_vector.name; + up_vector_name = cns_data->distance->up_vector.name; } else if (type == OBJ_SKIN_BLOCK_CONSTRAINT_ORIENTATION) { constraint_type = OBJ_SKIN_BLOCK_CONSTRAINT_ORIENTATION; @@ -2311,9 +2296,9 @@ void ExExpressionBlock::Init() { void ExExpressionBlock::Field_10() { bone_node_expression_data* node_exp_data = &bone_node_ptr->exp_data; - node_exp_data->position = exp_data->base.position; - node_exp_data->rotation = exp_data->base.rotation; - node_exp_data->scale = exp_data->base.scale; + node_exp_data->position = exp_data->node.position; + node_exp_data->rotation = exp_data->node.rotation; + node_exp_data->scale = exp_data->node.scale; field_59 = false; } @@ -2413,9 +2398,9 @@ void ExExpressionBlock::InitData(rob_chara_item_equip_object* itm_eq_obj, name = node->name; item_equip_object = itm_eq_obj; - node->exp_data.position = exp_data->base.position; - node->exp_data.rotation = exp_data->base.rotation; - node->exp_data.scale = exp_data->base.scale; + node->exp_data.position = exp_data->node.position; + node->exp_data.rotation = exp_data->node.rotation; + node->exp_data.scale = exp_data->node.scale; field_3D28 = 0; ex_expression_block_stack* stack_val = stack_data; @@ -2425,7 +2410,7 @@ void ExExpressionBlock::InitData(rob_chara_item_equip_object* itm_eq_obj, } for (int32_t i = 0; i < 9; i++) { - const char* expression = exp_data->expressions[i]; + const char* expression = exp_data->expression_array[i]; if (!expression || str_utils_compare_length(expression, utf8_length(expression), "= ", 2)) break; @@ -2700,7 +2685,7 @@ void skin_param_osage_root_parse(void* kv, const char* name, c->bone0_index = bone_data->get_skeleton_object_bone_index( bone_database_skeleton_type_to_string(BONE_DATABASE_SKELETON_COMMON), bone0_name); - vec3 bone0_pos = vec3_null; + vec3 bone0_pos = 0.0f; if (!_kv->read("bone.0.posx", bone0_pos.x) || !_kv->read("bone.0.posy", bone0_pos.y) || !_kv->read("bone.0.posz", bone0_pos.z)) { @@ -2715,7 +2700,7 @@ void skin_param_osage_root_parse(void* kv, const char* name, c->bone1_index = bone_data->get_skeleton_object_bone_index( bone_database_skeleton_type_to_string(BONE_DATABASE_SKELETON_COMMON), bone1_name); - vec3 bone1_pos = vec3_null; + vec3 bone1_pos = 0.0f; if (!_kv->read("bone.1.posx", bone1_pos.x) || !_kv->read("bone.1.posy", bone1_pos.y) || !_kv->read("bone.1.posz", bone1_pos.z)) { @@ -3118,7 +3103,7 @@ static void sub_140218560(RobCloth* rob_cls, float_t step, bool a3) { if (!a3) { rob_cls->set_external_force = false; - rob_cls->external_force = vec3_null; + rob_cls->external_force = 0.0f; } } } @@ -3224,7 +3209,7 @@ static void sub_140219940(RobCloth* rob_cls) { root_node.tangent_sign = root.tangent.w; root_node.field_1C = root_node.trans; - mat4_translate_mult(&m, root_node.trans_orig.x, root_node.trans_orig.y, root_node.trans_orig.z, &m); + mat4_translate_mult(&m, &root_node.trans_orig, &m); root.field_D8 = m; mat4_inverse(&m, &m); root.field_118 = m; @@ -3444,7 +3429,7 @@ void sub_14021AA60(RobCloth* rob_cls, float_t step, bool a3) { if (v19 > node->trans.y && v19 < 1001.0) { node->trans.y = v19; - node->trans_diff = vec3_null; + node->trans_diff = 0.0f; } mat4 mat = root->field_98; @@ -3518,7 +3503,7 @@ static void sub_14021D480(RobCloth* rob_cls) { if (v10 > node->trans.y && v10 < 1001.0f) node->trans.y = v10; - node->trans_diff = vec3_null; + node->trans_diff = 0.0f; node->field_1C = node->trans; } } @@ -3529,7 +3514,7 @@ static void sub_14021D480(RobCloth* rob_cls) { node = &rob_cls->nodes.data()[root_count]; for (size_t i = 1; i < nodes_count; i++) for (ssize_t j = 0; j < root_count; j++, node++) - node->trans_diff = vec3_null; + node->trans_diff = 0.0f; } static void sub_14021DC60(RobCloth* rob_cls, float_t step) { @@ -3691,7 +3676,7 @@ static void sub_14047C800(RobOsage* rob_osg, mat4* mat, vec3* parent_scale, float_t v96 = ring_height + coli_r; RobOsageNode* v98_begin = rob_osg->nodes.data() + 1; RobOsageNode* v98_end = rob_osg->nodes.data() + rob_osg->nodes.size(); - for (auto v98 = v98_begin; v98 != v98_end; v98++) { + for (RobOsageNode* v98 = v98_begin; v98 != v98_end; v98++) { sub_140482490(v98, step, v25); sub_140482180(v98, v96); } @@ -3741,7 +3726,7 @@ static void sub_14047E1C0(RobOsage* rob_osg, vec3* scale) { for (RobOsageNode* i = i_begin; i != i_end; i++) if (i->data_ptr->normal_ref.field_0) { sub_14053CE30(&i->data_ptr->normal_ref, i->bone_node_mat); - mat4_scale_rot(i->bone_node_mat, scale->x, scale->y, scale->z, i->bone_node_mat); + mat4_scale_rot(i->bone_node_mat, scale, i->bone_node_mat); } } @@ -3765,18 +3750,15 @@ static void sub_14047EE90(RobOsage* rob_osg, mat4* mat) { } static void sub_14047F110(RobOsage* rob_osg, mat4* mat, vec3* parent_scale, bool init_rot) { - vec3 position; - vec3_mult(rob_osg->exp_data.position, *parent_scale, position); - mat4_translate_mult(mat, position.x, position.y, position.z, mat); - - vec3 rotation = rob_osg->exp_data.rotation; - mat4_rotate_mult(mat, rotation.x, rotation.y, rotation.z, mat); + vec3 position = rob_osg->exp_data.position * *parent_scale; + mat4_translate_mult(mat, &position, mat); + mat4_rotate_mult(mat, &rob_osg->exp_data.rotation, mat); skin_param* skin_param = rob_osg->skin_param_ptr; vec3 rot = skin_param->rot; if (init_rot) - vec3_add(rot, skin_param->init_rot, rot); - mat4_rotate_mult(mat, rot.x, rot.y, rot.z, mat); + rot = skin_param->init_rot + rot; + mat4_rotate_mult(mat, &rot, mat); } static void sub_1404803B0(RobOsage* rob_osg, mat4* mat, vec3* parent_scale, bool has_children_node) { @@ -3861,7 +3843,7 @@ static void sub_140482180(RobOsageNode* node, float_t a2) { vec3_normalize(v3, v3); vec3_mult_scalar(v3, node->length, v3); vec3_add(node[-1].trans, v3, node->trans); - node->trans_diff = vec3_null; + node->trans_diff = 0.0f; node->field_C8 += 1.0f; } @@ -3929,9 +3911,9 @@ static int32_t sub_140483B30(vec3* a1, vec3* a2, osage_coli* a3, float_t radius) return 0; } - vec3 v28 = vec3_null; - vec3 v32 = vec3_null; - vec3 v27 = vec3_identity; + vec3 v28 = 0.0f; + vec3 v32 = 0.0f; + vec3 v27 = 1.0f; float_t v16 = 0.0f; for (int32_t i = 0; i < 3; i++) { @@ -4113,7 +4095,7 @@ static int32_t sub_140485220(vec3* a1, float_t& coli_r, osage_coli* a3, float_t* int32_t v8 = 0; while (a3->type) { int32_t v11 = 0; - vec3 v31 = vec3_null; + vec3 v31 = 0.0f; switch (a3->type) { case SKIN_PARAM_OSAGE_ROOT_COLI_TYPE_BALL: v11 = sub_140483DE0(&v31, a1, &a3->bone0_pos, a3->radius + coli_r); @@ -4192,7 +4174,7 @@ static void sub_14047D8C0(RobOsage* rob_osg, mat4* mat, vec3* parent_scale, floa RobOsageNode* v27_begin = rob_osg->nodes.data() + 1; RobOsageNode* v27_end = rob_osg->nodes.data() + rob_osg->nodes.size(); for (RobOsageNode* v27 = v27_begin; v27 != v27_end; v27++) { - vec3 v62 = vec3_null; + vec3 v62 = 0.0f; RobOsageNode* v30_begin = v24->data() + 1; RobOsageNode* v30_end = v24->data() + v24->size(); @@ -4230,7 +4212,7 @@ static void sub_14047D8C0(RobOsage* rob_osg, mat4* mat, vec3* parent_scale, floa if (v35->bone_node_mat) { mat4* v41 = v35->bone_node_mat; - mat4_scale_rot(&v64, parent_scale->x, parent_scale->y, parent_scale->z, v41); + mat4_scale_rot(&v64, parent_scale, v41); } float_t v42 = v35->length * parent_scale->x; @@ -4272,7 +4254,7 @@ static void sub_14047D8C0(RobOsage* rob_osg, mat4* mat, vec3* parent_scale, floa mat4 v65 = *rob_osg->nodes.back().bone_node_ptr->ex_data_mat; mat4_translate_mult(&v65, rob_osg->node.length * parent_scale->x, 0.0f, 0.0f, &v65); *rob_osg->node.bone_node_ptr->ex_data_mat = v65; - mat4_scale_rot(&v65, parent_scale->x, parent_scale->y, parent_scale->z, &v65); + mat4_scale_rot(&v65, parent_scale, &v65); *rob_osg->node.bone_node_mat = v65; rob_osg->node.bone_node_ptr->exp_data.parent_scale = *parent_scale; } @@ -4292,12 +4274,13 @@ static void sub_14047D620(RobOsage* rob_osg, float_t step) { if (step < 0.0f && rob_osg->field_1F0F) return; - vec3 v7 = rob_osg->nodes.data()[0].trans; + std::vector& nodes = rob_osg->nodes; + vec3 v7 = nodes.data()[0].trans; osage_coli* coli = rob_osg->coli; osage_coli* coli_ring = rob_osg->coli_ring; int32_t coli_type = rob_osg->skin_param_ptr->coli_type; - RobOsageNode* i_begin = rob_osg->nodes.data() + 1; - RobOsageNode* i_end = rob_osg->nodes.data() + rob_osg->nodes.size(); + RobOsageNode* i_begin = nodes.data() + 1; + RobOsageNode* i_end = nodes.data() + nodes.size(); for (RobOsageNode* i = i_begin; i != i_end; i++) { RobOsageNodeData* data = i->data_ptr; for (RobOsageNode*& j : data->boc) { @@ -4316,7 +4299,7 @@ static void sub_14047D620(RobOsage* rob_osg, float_t step) { i[-1].field_C8 += v20; } } - rob_osg->nodes.data()[0].trans = v7; + nodes.data()[0].trans = v7; } static void sub_14047ECA0(RobOsage* rob_osg, float_t step) { @@ -4345,18 +4328,18 @@ static void sub_14047ECA0(RobOsage* rob_osg, float_t step) { } } -static void sub_14047F990(RobOsage* rob_osg, mat4* a2, vec3* a3, bool a4) { +static void sub_14047F990(RobOsage* rob_osg, mat4* a2, vec3* parent_scale, bool a4) { if (!rob_osg->nodes.size()) return; vec3 v76; - vec3_mult(rob_osg->exp_data.position, *a3, v76); + vec3_mult(rob_osg->exp_data.position, *parent_scale, v76); mat4_mult_vec3_trans(a2, &v76, &v76); vec3 v74 = v76; RobOsageNode* v12 = &rob_osg->nodes.data()[0]; v12->trans = v76; v12->trans_orig = v76; - v12->trans_diff = vec3_null; + v12->trans_diff = 0.0f; float_t ring_height; RobOsageNode* v14 = &rob_osg->nodes.data()[0]; @@ -4370,14 +4353,14 @@ static void sub_14047F990(RobOsage* rob_osg, mat4* a2, vec3* a3, bool a4) { ring_height = rob_osg->ring.ring_height; mat4 v78 = *a2; - sub_14047F110(rob_osg, &v78, a3, true); + sub_14047F110(rob_osg, &v78, parent_scale, true); vec3 v60 = { 1.0f, 0.0f, 0.0f }; mat4_mult_vec3(&v78, &v60, &v60); osage_coli* coli_ring = rob_osg->coli_ring; osage_coli* coli = rob_osg->coli; float_t v25 = ring_height + coli_r; - float_t v16 = a3->x; + float_t v16 = parent_scale->x; RobOsageNode* i = rob_osg->nodes.data(); RobOsageNode* j_begin = rob_osg->nodes.data() + 1; RobOsageNode* j_end = rob_osg->nodes.data() + rob_osg->nodes.size(); @@ -4401,15 +4384,15 @@ static void sub_14047F990(RobOsage* rob_osg, mat4* a2, vec3* a3, bool a4) { vec3_add(v74, i->trans, v74); } j->trans = v74; - j->trans_diff = vec3_null; + j->trans_diff = 0.0f; vec3 v77; mat4_mult_vec3_inv_trans(&v78, &j->trans, &v77); sub_140482FF0(v78, v77, &j->data_ptr->skp_osg_node.hinge, &j->reset_data.rotation, rob_osg->yz_order); - j->bone_node_ptr->exp_data.parent_scale = *a3; + j->bone_node_ptr->exp_data.parent_scale = *parent_scale; *j->bone_node_ptr->ex_data_mat = v78; if (j->bone_node_mat) - mat4_scale_rot(&v78, a3->x, a3->y, a3->z, j->bone_node_mat); + mat4_scale_rot(&v78, parent_scale, j->bone_node_mat); float_t v55; vec3_distance(j->trans, i->trans, v55); @@ -4425,9 +4408,9 @@ static void sub_14047F990(RobOsage* rob_osg, mat4* a2, vec3* a3, bool a4) { mat4 v79 = *rob_osg->nodes.back().bone_node_ptr->ex_data_mat; mat4_translate_mult(&v79, v16 * rob_osg->node.length, 0.0f, 0.0f, &v79); *rob_osg->node.bone_node_ptr->ex_data_mat = v79; - mat4_scale_rot(&v79, a3->x, a3->y, a3->z, &v79); + mat4_scale_rot(&v79, parent_scale, &v79); *rob_osg->node.bone_node_mat = v79; - rob_osg->node.bone_node_ptr->exp_data.parent_scale = *a3; + rob_osg->node.bone_node_ptr->exp_data.parent_scale = *parent_scale; } } @@ -4436,7 +4419,7 @@ static void sub_140480260(RobOsage* rob_osg, mat4* mat, vec3* parent_scale, floa rob_osg->SetNodesExternalForce(0, 1.0f); rob_osg->SetNodesForce(1.0f); rob_osg->set_external_force = false; - rob_osg->external_force = vec3_null; + rob_osg->external_force = 0.0f; } rob_osg->field_2A0 = true; @@ -4446,9 +4429,9 @@ static void sub_140480260(RobOsage* rob_osg, mat4* mat, vec3* parent_scale, floa rob_osg->osage_reset = false; rob_osg->field_1F0E = false; - for (auto i = rob_osg->nodes.begin(); i != rob_osg->nodes.end(); i++) { - i->field_C8 = 0.0f; - i->field_CC = 1.0f; + for (RobOsageNode& i : rob_osg->nodes) { + i.field_C8 = 0.0f; + i.field_CC = 1.0f; } rob_osg->parent_mat = *rob_osg->parent_mat_ptr; @@ -4660,7 +4643,7 @@ static int32_t sub_140485000(vec3* a1, vec3* a2, skin_param_osage_node* a3, osag int32_t v8 = 0; while (a4->type) { int32_t type = a4->type; - vec3 v21 = vec3_null; + vec3 v21 = 0.0f; switch (a4->type) { case SKIN_PARAM_OSAGE_ROOT_COLI_TYPE_BALL: v8 += sub_140484450(&v21, a1, a2, &a4->bone0_pos, a3->coli_r + a4->radius); diff --git a/src/CRE/rob/rob.cpp b/src/CRE/rob/rob.cpp index 9a027ee1..4c742928 100644 --- a/src/CRE/rob/rob.cpp +++ b/src/CRE/rob/rob.cpp @@ -4,8 +4,11 @@ */ #include "rob.hpp" +#include "../../KKdLib/io/file_stream.hpp" +#include "../../KKdLib/io/json.hpp" #include "../../KKdLib/io/path.hpp" #include "../../KKdLib/key_val.hpp" +#include "../../KKdLib/msgpack.hpp" #include "../../KKdLib/sort.hpp" #include "../../KKdLib/str_utils.hpp" #include "../data.hpp" @@ -221,6 +224,7 @@ struct mothead_func_data { rob_chara* field_18; rob_chara_data* field_20; struc_223* field_28; + bool is_x; }; typedef void(*mothead_func)(mothead_func_data*, void*, const mothead_data*, int32_t, motion_database*); @@ -625,7 +629,6 @@ struct rob_manager_rob_impl { const char* name; }; -static bone_data* bone_data_init(bone_data* bone); static float_t bone_data_limit_angle(float_t angle); static void bone_data_mult_0(bone_data* a1, int32_t skeleton_select); static void bone_data_mult_1(bone_data* a1, mat4* parent_mat, bone_data* a3, bool solve_ik); @@ -647,13 +650,13 @@ static bool check_module_index_is_501(int32_t module_index); static void mot_blend_interpolate(mot_blend* a1, std::vector* bones, std::vector* bone_indices, bone_database_skeleton_type skeleton_type); static void mot_blend_load_motion(mot_blend* a1, int32_t motion_id, motion_database* mot_db); -static void mot_blend_set_duration(mot_blend* a1, float_t duration, float_t step, float_t offset); +static void mot_blend_set_blend_duration(mot_blend* a1, float_t duration, float_t step, float_t offset); static void mot_blend_set_frame(mot_blend* a1, float_t frame); static void mot_key_frame_interpolate(mot* a1, float_t frame, float_t* value, mot_key_set* a4, uint32_t key_set_count, struc_369* a6); static uint32_t mot_load_last_key_calc(uint16_t keys_count); -static bool mot_data_load_file(mot* a1, const mot_data* a2); +static bool mot_load_file(mot* a1, const mot_data* a2); static void mot_key_data_get_key_set_count_by_bone_database_bones(mot_key_data* a1, std::vector* a2); @@ -665,8 +668,6 @@ static void mot_key_data_interpolate(mot_key_data* a1, float_t frame, static const mot_data* mot_key_data_load_file(mot_key_data* a1, int32_t motion_id, motion_database* mot_db); static void mot_key_data_reserve_key_sets(mot_key_data* a1); -static void mot_play_frame_data_set_frame(mot_play_frame_data* a1, float_t frame); - static void mothead_func_0(mothead_func_data* func_data, void* data, const mothead_data* mhd_data, int32_t frame, motion_database* mot_db); static void mothead_func_1(mothead_func_data* func_data, @@ -805,7 +806,7 @@ static void mothead_func_67_sleeve(mothead_func_data* func_data, void* data, const mothead_data* mhd_data, int32_t frame, motion_database* mot_db); static void mothead_func_68(mothead_func_data* func_data, void* data, const mothead_data* mhd_data, int32_t frame, motion_database* mot_db); -static void mothead_func_69(mothead_func_data* func_data, +static void mothead_func_69_motion_max_frame(mothead_func_data* func_data, void* data, const mothead_data* mhd_data, int32_t frame, motion_database* mot_db); static void mothead_func_70(mothead_func_data* func_data, void* data, const mothead_data* mhd_data, int32_t frame, motion_database* mot_db); @@ -830,6 +831,8 @@ static void mothead_func_79_rob_chara_coli_ring(mothead_func_data* func_data, static void mothead_func_80_adjust_get_global_trans(mothead_func_data* func_data, void* data, const mothead_data* mhd_data, int32_t frame, motion_database* mot_db); +static void mothead_mot_msgpack_read(const char* path, const char* set_name, mothead* mhd); // X + static void motion_blend_mot_interpolate(motion_blend_mot* a1); static void motion_blend_mot_load_bone_data(motion_blend_mot* a1, rob_chara_bone_data* a2, PFNMOTIONBONECHECKFUNC bone_check_func, bone_database* bone_data); @@ -864,7 +867,6 @@ static void rob_disp_rob_chara_free(rob_chara* rob_chr); static void rob_motion_modifier_rob_chara_ctrl(rob_chara* rob_chr); -static float_t rob_chara_array_get_data_adjust_scale(int32_t chara_id); static void rob_chara_bone_data_calculate_bones(rob_chara_bone_data* rob_bone_data, std::vector* bones); static void rob_chara_bone_data_eyes_xrot_adjust(rob_chara_bone_data* rob_bone_data, @@ -904,23 +906,23 @@ static void rob_chara_bone_data_motion_blend_mot_list_init(rob_chara_bone_data* static void rob_chara_bone_data_motion_load(rob_chara_bone_data* rob_bone_data, int32_t motion_id, MotionBlendType blend_type, bone_database* bone_data, motion_database* mot_db); static void rob_chara_bone_data_reserve(rob_chara_bone_data* rob_bone_data); -static void rob_chara_bone_data_set_eyelid_anim_duration(rob_chara_bone_data* rob_bone_data, +static void rob_chara_bone_data_set_eyelid_anim_blend_duration(rob_chara_bone_data* rob_bone_data, float_t duration, float_t step, float_t offset); static void rob_chara_bone_data_set_eyelid_frame(rob_chara_bone_data* rob_bone_data, float_t frame); static void rob_chara_bone_data_set_eyelid_play_frame_step(rob_chara_bone_data* rob_bone_data, float_t step); -static void rob_chara_bone_data_set_eyes_anim_duration(rob_chara_bone_data* rob_bone_data, +static void rob_chara_bone_data_set_eyes_anim_blend_duration(rob_chara_bone_data* rob_bone_data, float_t duration, float_t step, float_t offset); static void rob_chara_bone_data_set_eyes_frame(rob_chara_bone_data* rob_bone_data, float_t frame); static void rob_chara_bone_data_set_eyes_play_frame_step(rob_chara_bone_data* rob_bone_data, float_t step); -static void rob_chara_bone_data_set_face_anim_duration(rob_chara_bone_data* rob_bone_data, +static void rob_chara_bone_data_set_face_anim_blend_duration(rob_chara_bone_data* rob_bone_data, float_t duration, float_t step, float_t offset); static void rob_chara_bone_data_set_face_frame(rob_chara_bone_data* rob_bone_data, float_t frame); static void rob_chara_bone_data_set_face_play_frame_step(rob_chara_bone_data* rob_bone_data, float_t step); -static void rob_chara_bone_data_set_hand_l_anim_duration(rob_chara_bone_data* rob_bone_data, +static void rob_chara_bone_data_set_hand_l_anim_blend_duration(rob_chara_bone_data* rob_bone_data, float_t duration, float_t step, float_t offset); static void rob_chara_bone_data_set_hand_l_frame(rob_chara_bone_data* rob_bone_data, float_t frame); static void rob_chara_bone_data_set_hand_l_play_frame_step(rob_chara_bone_data* rob_bone_data, float_t step); -static void rob_chara_bone_data_set_hand_r_anim_duration(rob_chara_bone_data* rob_bone_data, +static void rob_chara_bone_data_set_hand_r_anim_blend_duration(rob_chara_bone_data* rob_bone_data, float_t duration, float_t step, float_t offset); static void rob_chara_bone_data_set_hand_r_frame(rob_chara_bone_data* rob_bone_data, float_t frame); static void rob_chara_bone_data_set_hand_r_play_frame_step(rob_chara_bone_data* rob_bone_data, float_t step); @@ -928,7 +930,7 @@ static void rob_chara_bone_data_set_mats(rob_chara_bone_data* rob_bone_data, std::vector* bones, std::string* motion_bones); static void rob_chara_bone_data_set_motion_duration(rob_chara_bone_data* rob_bone_data, float_t duration, float_t step, float_t offset); -static void rob_chara_bone_data_set_mouth_anim_duration(rob_chara_bone_data* rob_bone_data, +static void rob_chara_bone_data_set_mouth_anim_blend_duration(rob_chara_bone_data* rob_bone_data, float_t duration, float_t step, float_t offset); static void rob_chara_bone_data_set_mouth_frame(rob_chara_bone_data* rob_bone_data, float_t frame); static void rob_chara_bone_data_set_mouth_play_frame_step(rob_chara_bone_data* rob_bone_data, float_t step); @@ -1109,7 +1111,7 @@ static const mothead_func_struct mothead_func_array[] = { { mothead_func_66_osage_step, 0 }, { mothead_func_67_sleeve, 0 }, { mothead_func_68, 0 }, - { mothead_func_69, 0 }, + { mothead_func_69_motion_max_frame, 0 }, { mothead_func_70, 0 }, { mothead_func_71_osage_move_cancel, 0 }, { mothead_func_72, 0 }, @@ -2349,11 +2351,11 @@ static void sub_140509D30(rob_chara* rob_chr) { mat4 mat; for (int32_t i = 0; i < 27; i++) { m = rob_chara_bone_data_get_mats_mat(rob_chr->bone_data, v3->bone_index); - mat4_translate_mult(m, v3->bone_offset.x, v3->bone_offset.y, v3->bone_offset.z, &mat); + mat4_translate_mult(m, &v3->bone_offset, &mat); *v42 = mat; m = rob_chara_bone_data_get_mats_mat(rob_chr->bone_data, v6->bone_index); - mat4_translate_mult(m, v3->bone_offset.x, v3->bone_offset.y, v3->bone_offset.z, &mat); + mat4_translate_mult(m, &v3->bone_offset, &mat); *v43 = mat; float_t chara_scale = rob_chr->data.adjust_data.scale; @@ -2462,51 +2464,14 @@ static void sub_140513EE0(rob_chara_item_equip* rob_itm_eq, rob_osage_parts a2, (rob_osage_parts_bit)(1 << a2), a3); } -static void sub_140419D30(rob_chara_bone_data* rob_bone_data, - float_t frame, float_t step, float_t frame_count) { - mot_play_data* v5 = &rob_bone_data->motion_loaded.front()->mot_play_data; - v5->frame_data.frame = frame; - v5->frame_data.step_prev = v5->frame_data.step; - v5->frame_data.step = step; - v5->frame_data.frame_count = frame_count; - v5->frame_data.last_frame = frame_count - 1.0f; - v5->frame_data.field_14 = -1.0f; - v5->frame_data.field_18 = -1; - v5->frame_data.field_1C = -1; - v5->frame_data.field_20 = 0.0f; - v5->frame_data.field_24 = -1.0f; - v5->frame_data.field_28 = 0; - v5->frame_data.field_2C = -1; - v5->field_30 = 0; - v5->field_34 = 0; - v5->field_38 = 0.0f; - v5->field_40 = 0; - v5->field_48 = 0; -} - -static void sub_14041C650(rob_chara_bone_data* rob_bone_data, int32_t a2) { - rob_bone_data->motion_loaded.front()->mot_play_data.frame_data.field_18 = a2; -} - -static void sub_14041BB50(rob_chara_bone_data* rob_bone_data, int32_t a2) { - rob_bone_data->motion_loaded.front()->mot_play_data.frame_data.field_1C = a2; -} - -static void sub_14041C990(rob_chara_bone_data* rob_bone_data, float_t a2, int32_t a3, float_t a4) { - motion_blend_mot* v4 = rob_bone_data->motion_loaded.front(); - v4->mot_play_data.frame_data.field_20 = a2; - v4->mot_play_data.frame_data.field_24 = a4; - v4->mot_play_data.frame_data.field_2C = a3; -} - static void sub_14041B9D0(rob_chara_bone_data* rob_bone_data) { rob_chara_bone_data_sleeve_adjust& sleeve_adjust = rob_bone_data->sleeve_adjust; sleeve_adjust.enable1 = false; sleeve_adjust.enable2 = false; - sleeve_adjust.field_5C = vec3_null; - sleeve_adjust.field_68 = vec3_null; - sleeve_adjust.field_74 = vec3_null; - sleeve_adjust.field_80 = vec3_null; + sleeve_adjust.field_5C = 0.0f; + sleeve_adjust.field_68 = 0.0f; + sleeve_adjust.field_74 = 0.0f; + sleeve_adjust.field_80 = 0.0f; sleeve_adjust.radius = 1.0f; sleeve_adjust.bones = 0; sleeve_adjust.step = 1.0f; @@ -2754,9 +2719,9 @@ static void mothead_apply2_inner(struc_380* a1, int32_t type, const mothead_data v19->field_0.field_60 = ((int32_t*)v35)[2]; v19->field_0.field_64 = ((int32_t*)v35)[3]; v19->field_0.field_68 = ((int32_t*)v35)[4]; - v19->field_0.field_6C = ((int16_t*)v35)[5]; - v19->field_0.field_70 = (float_t)((int16_t*)v35)[12]; - v19->field_0.field_74 = (float_t)((int16_t*)v35)[13]; + v19->field_0.loop_count = ((int16_t*)v35)[5]; + v19->field_0.loop_begin = (float_t)((int16_t*)v35)[12]; + v19->field_0.loop_end = (float_t)((int16_t*)v35)[13]; } break; case 1: { v19->field_0.field_78 = (float_t)((int16_t*)v35)[0]; @@ -2861,8 +2826,9 @@ static void sub_14053A9C0(struc_223* a1, rob_chara* rob_chr, if (!v7) return; - a1->field_330.field_0.field_0 = v7->data.data(); - a1->field_330.field_0.field_8 = v7->data.data(); + a1->field_330.field_0.current = v7->data.data(); + a1->field_330.field_0.data = v7->data.data(); + a1->field_330.field_0.is_x = v7->is_x; a1->field_7A0 = v7->field_28.data(); a1->motion_set_id = mot_db->get_motion_set_id_by_motion_id(motion_id); a1->field_0.field_10 = v7->field_0; @@ -2923,8 +2889,6 @@ static void sub_14053A9C0(struc_223* a1, rob_chara* rob_chr, } } -static void sub_140539750(struc_223* a1); - void rob_chara::load_motion(int32_t motion_id, bool a3, float_t frame, MotionBlendType blend_type, bone_database* bone_data, motion_database* mot_db) { data.miku_rot.rot_y_int16 = sub_14054FE90(this, false); @@ -2946,7 +2910,7 @@ void rob_chara::load_motion(int32_t motion_id, bool a3, float_t frame, data.motion.field_28 &= 0x2F; data.motion.field_28 |= 0x10; - data.motion.field_2C = 0; + data.motion.loop_index = 0; data.motion.field_30 = 0; rob_chara_data_adjust* parts_adjust = data.motion.parts_adjust; @@ -2955,7 +2919,7 @@ void rob_chara::load_motion(int32_t motion_id, bool a3, float_t frame, data.motion.adjust_global.reset(); - data.adjust_data.offset = vec3_null; + data.adjust_data.offset = 0.0f; data.adjust_data.offset_x = true; data.adjust_data.offset_y = false; data.adjust_data.offset_z = true; @@ -2979,7 +2943,7 @@ void rob_chara::load_motion(int32_t motion_id, bool a3, float_t frame, data.field_1588.field_0.field_30 = data.field_1588.field_0.field_10; data.field_1588.field_0.field_40 = data.field_1588.field_0.field_20; data.field_1588.field_0.field_276 = data.field_1588.field_0.field_274; - sub_140539750(&data.field_1588); + data.field_1588.reset(); sub_14053A9C0(&data.field_1588, this, motion_id, motion_storage_get_mot_data_frame_count(motion_id, mot_db), mot_db); if (data.field_1588.field_0.field_40.field_C & 0x20) @@ -3003,13 +2967,13 @@ void rob_chara::load_motion(int32_t motion_id, bool a3, float_t frame, step = data.motion.step_data.frame; rob_chara_item_equip_set_osage_step(item_equip, step); rob_chara_bone_data_motion_load(this->bone_data, motion_id, blend_type, bone_data, mot_db); - sub_140419D30(this->bone_data, data.motion.step_data.frame, + this->bone_data->set_motion_frame(data.motion.step_data.frame, data.motion.step_data.frame, data.field_1588.field_0.frame_count); - sub_14041C650(this->bone_data, 1); + this->bone_data->set_motion_playback_state(MOT_PLAY_FRAME_DATA_PLAYBACK_FORWARD); if (data.field_1588.field_0.field_58 == 1) { - sub_14041BB50(this->bone_data, 1); - sub_14041C990(this->bone_data, data.field_1588.field_0.field_70, - data.field_1588.field_0.field_6C, -1.0f); + this->bone_data->set_motion_loop_state(MOT_PLAY_FRAME_DATA_LOOP_CONTINUOUS); + this->bone_data->set_motion_loop(data.field_1588.field_0.loop_begin, + data.field_1588.field_0.loop_count, -1.0f); } rob_chara_bone_data_set_rot_y(this->bone_data, (float_t)((double_t)data.field_1588.field_0.field_2B8 * M_PI * (1.0 / 32768.0))); @@ -3064,20 +3028,22 @@ void rob_chara::reset_data(rob_chara_pv_data* pv_data, rob_chara_item_equip_get_parent_bone_nodes(item_equip, rob_chara_bone_data_get_node(this->bone_data, 0), bone_data); type = pv_data->type; - rob_chara_data* chr_data = &data; - chr_data->miku_rot.rot_y_int16 = pv_data->rot_y_int16; - chr_data->miku_rot.field_6 = pv_data->rot_y_int16; - chr_data->adjust_data.scale = chara_size_table_get_value(this->pv_data.chara_size_index); - chr_data->adjust_data.height_adjust = this->pv_data.height_adjust; - chr_data->adjust_data.pos_adjust_y = chara_pos_adjust_y_table_get_value(this->pv_data.chara_size_index); + rob_chara_data* rob_chr_data = &data; + rob_chr_data->miku_rot.rot_y_int16 = pv_data->rot_y_int16; + rob_chr_data->miku_rot.field_6 = pv_data->rot_y_int16; + float_t scale = chara_size_table_get_value(this->pv_data.chara_size_index); + rob_chr_data->adjust_data.scale = scale; + rob_chr_data->adjust_data.item_scale = scale; // X + rob_chr_data->adjust_data.height_adjust = this->pv_data.height_adjust; + rob_chr_data->adjust_data.pos_adjust_y = chara_pos_adjust_y_table_get_value(this->pv_data.chara_size_index); rob_chara_bone_data_eyes_xrot_adjust(this->bone_data, chara_some_data_array, &pv_data->eyes_adjust); rob_chara_bone_data_get_ik_scale(this->bone_data, bone_data); rob_chara_load_default_motion(this, bone_data, mot_db); - chr_data->field_8.field_4.field_0 = 1; - chr_data->field_8.field_4.motion_id = get_rob_cmn_mottbl_motion_id(0); - chr_data->field_8.field_0 = 0; - chr_data->field_8.field_4.field_10 = pv_data->field_5; - load_motion(chr_data->field_8.field_4.motion_id, + rob_chr_data->field_8.field_4.field_0 = 1; + rob_chr_data->field_8.field_4.motion_id = get_rob_cmn_mottbl_motion_id(0); + rob_chr_data->field_8.field_0 = 0; + rob_chr_data->field_8.field_4.field_10 = pv_data->field_5; + load_motion(rob_chr_data->field_8.field_4.motion_id, pv_data->field_5, 0.0f, MOTION_BLEND, bone_data, mot_db); set_parts_disp(ITEM_MAX, true); item_equip->field_DC = 0; @@ -3085,8 +3051,8 @@ void rob_chara::reset_data(rob_chara_pv_data* pv_data, sub_140513C60(item_equip, ITEM_TE_R, false); sub_140513C60(item_equip, ITEM_TE_L, false); object_info head_obj = rob_chara_get_head_object(this, 0); - chr_data->motion.field_150.head_object = head_obj; - chr_data->motion.field_3B0.head_object = head_obj; + rob_chr_data->motion.field_150.head_object = head_obj; + rob_chr_data->motion.field_3B0.head_object = head_obj; set_parts_disp(ITEM_MAX, true); } @@ -3128,6 +3094,7 @@ void rob_chara::set_chara_pos_adjust_y(float_t value) { void rob_chara::set_chara_size(float_t value) { data.adjust_data.scale = value; + data.adjust_data.item_scale = value; // X } static bool sub_14053F290(RobPartialMotion* a1); @@ -3152,19 +3119,19 @@ static void rob_chara_set_eyelid_motion(rob_chara* rob_chr, rob_chara_bone_data_load_eyelid_motion(rob_chr->bone_data, motion->data.motion_id, mot_db); rob_chara_bone_data_set_eyelid_frame(rob_chr->bone_data, motion->data.frame); rob_chara_bone_data_set_eyelid_play_frame_step(rob_chr->bone_data, motion->data.play_frame_step); - rob_chara_bone_data_set_eyelid_anim_duration(rob_chr->bone_data, - motion->data.duration, motion->data.step, motion->data.offset); + rob_chara_bone_data_set_eyelid_anim_blend_duration(rob_chr->bone_data, + motion->data.blend_duration, motion->data.blend_step, motion->data.blend_offset); } static void rob_chara_set_eyes_motion(rob_chara* rob_chr, RobEyesMotion* motion, int32_t type, motion_database* mot_db) { if (type == 1 || type == 2) { - rob_chr->data.motion.field_3B0.eye.data = motion->data; + rob_chr->data.motion.field_3B0.eyes.data = motion->data; if (!(rob_chr->data.motion.field_29 & 0x40)) return; } else { - rob_chr->data.motion.field_150.eye.data = motion->data; + rob_chr->data.motion.field_150.eyes.data = motion->data; if (rob_chr->data.motion.field_29 & 0x40) return; } @@ -3172,8 +3139,8 @@ static void rob_chara_set_eyes_motion(rob_chara* rob_chr, rob_chara_bone_data_load_eyes_motion(rob_chr->bone_data, motion->data.motion_id, mot_db); rob_chara_bone_data_set_eyes_frame(rob_chr->bone_data, motion->data.frame); rob_chara_bone_data_set_eyes_play_frame_step(rob_chr->bone_data, motion->data.play_frame_step); - rob_chara_bone_data_set_eyes_anim_duration(rob_chr->bone_data, - motion->data.duration, motion->data.step, motion->data.offset); + rob_chara_bone_data_set_eyes_anim_blend_duration(rob_chr->bone_data, + motion->data.blend_duration, motion->data.blend_step, motion->data.blend_offset); } static void rob_chara_set_face_motion(rob_chara* rob_chr, @@ -3192,8 +3159,8 @@ static void rob_chara_set_face_motion(rob_chara* rob_chr, rob_chara_bone_data_load_face_motion(rob_chr->bone_data, motion->data.motion_id, mot_db); rob_chara_bone_data_set_face_frame(rob_chr->bone_data, motion->data.frame); rob_chara_bone_data_set_face_play_frame_step(rob_chr->bone_data, motion->data.play_frame_step); - rob_chara_bone_data_set_face_anim_duration(rob_chr->bone_data, - motion->data.duration, motion->data.step, motion->data.offset); + rob_chara_bone_data_set_face_anim_blend_duration(rob_chr->bone_data, + motion->data.blend_duration, motion->data.blend_step, motion->data.blend_offset); } static void rob_chara_set_hand_l_motion(rob_chara* rob_chr, @@ -3217,8 +3184,8 @@ static void rob_chara_set_hand_l_motion(rob_chara* rob_chr, rob_chara_bone_data_load_hand_l_motion(rob_chr->bone_data, motion->data.motion_id, mot_db); rob_chara_bone_data_set_hand_l_frame(rob_chr->bone_data, motion->data.frame); rob_chara_bone_data_set_hand_l_play_frame_step(rob_chr->bone_data, motion->data.play_frame_step); - rob_chara_bone_data_set_hand_l_anim_duration(rob_chr->bone_data, - motion->data.duration, motion->data.step, motion->data.offset); + rob_chara_bone_data_set_hand_l_anim_blend_duration(rob_chr->bone_data, + motion->data.blend_duration, motion->data.blend_step, motion->data.blend_offset); } static void rob_chara_set_hand_r_motion(rob_chara* rob_chr, @@ -3242,8 +3209,8 @@ static void rob_chara_set_hand_r_motion(rob_chara* rob_chr, rob_chara_bone_data_load_hand_r_motion(rob_chr->bone_data, motion->data.motion_id, mot_db); rob_chara_bone_data_set_hand_r_frame(rob_chr->bone_data, motion->data.frame); rob_chara_bone_data_set_hand_r_play_frame_step(rob_chr->bone_data, motion->data.play_frame_step); - rob_chara_bone_data_set_hand_r_anim_duration(rob_chr->bone_data, - motion->data.duration, motion->data.step, motion->data.offset); + rob_chara_bone_data_set_hand_r_anim_blend_duration(rob_chr->bone_data, + motion->data.blend_duration, motion->data.blend_step, motion->data.blend_offset); } static void rob_chara_set_mouth_motion(rob_chara* rob_chr, @@ -3262,8 +3229,8 @@ static void rob_chara_set_mouth_motion(rob_chara* rob_chr, rob_chara_bone_data_load_mouth_motion(rob_chr->bone_data, motion->data.motion_id, mot_db); rob_chara_bone_data_set_mouth_frame(rob_chr->bone_data, motion->data.frame); rob_chara_bone_data_set_mouth_play_frame_step(rob_chr->bone_data, motion->data.play_frame_step); - rob_chara_bone_data_set_mouth_anim_duration(rob_chr->bone_data, - motion->data.duration, motion->data.step, motion->data.offset); + rob_chara_bone_data_set_mouth_anim_blend_duration(rob_chr->bone_data, + motion->data.blend_duration, motion->data.blend_step, motion->data.blend_offset); } static void sub_1405500F0(rob_chara* rob_chr) { @@ -3273,211 +3240,211 @@ static void sub_1405500F0(rob_chara* rob_chr) { return; switch (rob_chr->data.motion.field_150.face.data.mottbl_index) { - case 0x07: - case 0x09: - case 0x0B: - case 0x0D: - case 0x13: - case 0x15: - case 0x19: - case 0x1B: - case 0x1D: - case 0x1F: - case 0x21: - case 0x23: - case 0x25: - case 0x27: - case 0x29: - case 0x2B: - case 0x2D: - case 0x2F: - case 0x31: - case 0x33: - case 0x35: - case 0x37: - case 0x41: - case 0x43: - case 0x45: - case 0x47: - case 0x49: - case 0x4B: - case 0x4D: - case 0x4F: - case 0x51: - case 0x53: - case 0x55: - case 0x57: - case 0x59: - case 0x5B: - case 0x5D: - case 0x5F: - case 0x61: - case 0x63: - case 0x65: - case 0x67: - case 0x69: - case 0x6B: + case 0x07: // FACE_RESET + case 0x09: // FACE_RESET_OLD + case 0x0B: // FACE_SAD + case 0x0D: // FACE_SAD_OLD + case 0x13: // FACE_SURPRISE + case 0x15: // FACE_SURPRISE_OLD + case 0x19: // FACE_ADMIRATION + case 0x1B: // FACE_ADMIRATION_OLD + case 0x1D: // FACE_SMILE + case 0x1F: // FACE_SMILE_OLD + case 0x21: // FACE_SETTLED + case 0x23: // FACE_SETTLED_OLD + case 0x25: // FACE_DAZZLING + case 0x27: // FACE_DAZZLING_OLD + case 0x29: // FACE_LASCIVIOUS + case 0x2B: // FACE_LASCIVIOUS_OLD + case 0x2D: // FACE_STRONG + case 0x2F: // FACE_STRONG_OLD + case 0x31: // FACE_CLARIFYING + case 0x33: // FACE_CLARIFYING_OLD + case 0x35: // FACE_GENTLE + case 0x37: // FACE_GENTLE_OLD + case 0x41: // FACE_NAGASI + case 0x43: // FACE_NAGASI_OLD + case 0x45: // FACE_KIRI + case 0x47: // FACE_KIRI_OLD + case 0x49: // FACE_UTURO + case 0x4B: // FACE_UTURO_OLD + case 0x4D: // FACE_OMOU + case 0x4F: // FACE_OMOU_OLD + case 0x51: // FACE_SETUNA + case 0x53: // FACE_SETUNA_OLD + case 0x55: // FACE_GENKI + case 0x57: // FACE_GENKI_OLD + case 0x59: // FACE_YARU + case 0x5B: // FACE_YARU_OLD + case 0x5D: // FACE_COOL + case 0x5F: // FACE_KOMARIWARAI + case 0x61: // FACE_KUMON + case 0x63: // FACE_KUTSUU + case 0x65: // FACE_NAKI + case 0x67: // FACE_NAYAMI + case 0x69: // FACE_SUPSERIOUS + case 0x6B: // FACE_TSUYOKIWARAI rob_chr->data.motion.field_29 |= 0x01; break; } } void rob_chara::set_eyelid_mottbl_motion_from_face(int32_t a2, - float_t duration, float_t value, float_t offset, motion_database* mot_db) { + float_t blend_duration, float_t value, float_t blend_offset, motion_database* mot_db) { if (!a2) a2 = data.motion.field_150.field_1C0; - RobEyelidMotion v13; + RobEyelidMotion motion; switch (a2) { case 0: case 2: - v13.data = data.motion.field_150.face.data; + motion.data = data.motion.field_150.face.data; break; case 1: value = 1.0f; case 3: { int32_t mottbl_index = data.motion.field_150.face.data.mottbl_index; switch (mottbl_index) { - case 0x07: - case 0x09: - case 0x0B: - case 0x0D: - case 0x0F: - case 0x11: - case 0x13: - case 0x15: - case 0x17: - case 0x19: - case 0x1B: - case 0x1D: - case 0x1F: - case 0x21: - case 0x23: - case 0x25: - case 0x27: - case 0x29: - case 0x2B: - case 0x2D: - case 0x2F: - case 0x31: - case 0x33: - case 0x35: - case 0x37: - case 0x3D: - case 0x3F: - case 0x41: - case 0x43: - case 0x45: - case 0x47: - case 0x49: - case 0x4B: - case 0x4D: - case 0x4F: - case 0x51: - case 0x53: - case 0x55: - case 0x57: - case 0x59: - case 0x5B: - case 0x5D: - case 0x5F: - case 0x61: - case 0x63: - case 0x65: - case 0x67: - case 0x69: - case 0x6B: - case 0x6D: - case 0x6F: - case 0x71: - case 0x73: - case 0x7F: - case 0x81: - case 0xEC: - case 0xEE: - case 0xF0: - case 0xF2: - v13.data.mottbl_index = ++mottbl_index; + case 0x07: // FACE_RESET + case 0x09: // FACE_RESET_OLD + case 0x0B: // FACE_SAD + case 0x0D: // FACE_SAD_OLD + case 0x0F: // FACE_LAUGH + case 0x11: // FACE_LAUGH_OLD + case 0x13: // FACE_SURPRISE + case 0x15: // FACE_SURPRISE_OLD + case 0x17: // FACE_WINK_OLD + case 0x19: // FACE_ADMIRATION + case 0x1B: // FACE_ADMIRATION_OLD + case 0x1D: // FACE_SMILE + case 0x1F: // FACE_SMILE_OLD + case 0x21: // FACE_SETTLED + case 0x23: // FACE_SETTLED_OLD + case 0x25: // FACE_DAZZLING + case 0x27: // FACE_DAZZLING_OLD + case 0x29: // FACE_LASCIVIOUS + case 0x2B: // FACE_LASCIVIOUS_OLD + case 0x2D: // FACE_STRONG + case 0x2F: // FACE_STRONG_OLD + case 0x31: // FACE_CLARIFYING + case 0x33: // FACE_CLARIFYING_OLD + case 0x35: // FACE_GENTLE + case 0x37: // FACE_GENTLE_OLD + case 0x3D: // FACE_CLOSE + case 0x3F: // FACE_CLOSE_OLD + case 0x41: // FACE_NAGASI + case 0x43: // FACE_NAGASI_OLD + case 0x45: // FACE_KIRI + case 0x47: // FACE_KIRI_OLD + case 0x49: // FACE_UTURO + case 0x4B: // FACE_UTURO_OLD + case 0x4D: // FACE_OMOU + case 0x4F: // FACE_OMOU_OLD + case 0x51: // FACE_SETUNA + case 0x53: // FACE_SETUNA_OLD + case 0x55: // FACE_GENKI + case 0x57: // FACE_GENKI_OLD + case 0x59: // FACE_YARU + case 0x5B: // FACE_YARU_OLD + case 0x5D: // FACE_COOL + case 0x5F: // FACE_KOMARIWARAI + case 0x61: // FACE_KUMON + case 0x63: // FACE_KUTSUU + case 0x65: // FACE_NAKI + case 0x67: // FACE_NAYAMI + case 0x69: // FACE_SUPSERIOUS + case 0x6B: // FACE_TSUYOKIWARAI + case 0x6D: // FACE_WINK_L + case 0x6F: // FACE_WINK_R + case 0x71: // FACE_WINKG_L + case 0x73: // FACE_WINKG_R + case 0x7F: // FACE_WINK_OLD + case 0x81: // FACE_NEW_IKARI_OLD + case 0xEC: // FACE_EYEBROW_UP_RIGHT + case 0xEE: // FACE_EYEBROW_UP_LEFT + case 0xF0: // FACE_KOMARIEGAO + case 0xF2: // FACE_KONWAKU + motion.data.mottbl_index = ++mottbl_index; break; } int32_t motion_id = get_rob_cmn_mottbl_motion_id(mottbl_index); - v13.data.motion_id = motion_id; + motion.data.motion_id = motion_id; if (motion_id == -1) { - duration = 0.0f; + blend_duration = 0.0f; a2 = 0; - v13.data = data.motion.field_150.face.data; + motion.data = data.motion.field_150.face.data; } else if (value <= 0.0f) { a2 = 0; - v13.data = data.motion.field_150.face.data; + motion.data = data.motion.field_150.face.data; } else { - v13.data.state = 0; - v13.data.frame_count = motion_storage_get_mot_data_frame_count(motion_id, mot_db); - v13.data.frame = (v13.data.frame_count - 1.0f) * value; + motion.data.state = 0; + motion.data.frame_count = motion_storage_get_mot_data_frame_count(motion_id, mot_db); + motion.data.frame = (motion.data.frame_count - 1.0f) * value; } } break; } - v13.data.offset = offset; - v13.data.duration = duration; + motion.data.blend_offset = blend_offset; + motion.data.blend_duration = blend_duration; data.motion.field_150.field_1C0 = a2; sub_1405500F0(this); data.motion.field_29 &= ~0x02; data.motion.field_150.time = 0.0f; - rob_chara_set_eyelid_motion(this, &v13, 0, mot_db); + rob_chara_set_eyelid_motion(this, &motion, 0, mot_db); } void rob_chara::set_eyelid_mottbl_motion(int32_t type, - int32_t mottbl_index, float_t value, int32_t state, float_t duration, - float_t a7, float_t step, int32_t a9, float_t offset, motion_database* mot_db) { - RobEyelidMotion v13; - v13.data.motion_id = get_rob_cmn_mottbl_motion_id(mottbl_index); - v13.data.mottbl_index = mottbl_index; - v13.data.state = state; - v13.data.play_frame_step = step; - v13.data.duration = duration; - v13.data.offset = offset; - v13.data.field_24 = a7; - if (sub_14053F290(&v13)) { - v13.data.frame_data = &data.motion.frame_data; - v13.data.step_data = &data.motion.step_data; + int32_t mottbl_index, float_t value, int32_t state, float_t blend_duration, + float_t a7, float_t step, int32_t a9, float_t blend_offset, motion_database* mot_db) { + RobEyelidMotion motion; + motion.data.motion_id = get_rob_cmn_mottbl_motion_id(mottbl_index); + motion.data.mottbl_index = mottbl_index; + motion.data.state = state; + motion.data.play_frame_step = step; + motion.data.blend_duration = blend_duration; + motion.data.blend_offset = blend_offset; + motion.data.field_24 = a7; + if (sub_14053F290(&motion)) { + motion.data.frame_data = &data.motion.frame_data; + motion.data.step_data = &data.motion.step_data; } - v13.data.field_38 = a9; - if (v13.data.motion_id != -1) { - v13.data.frame_count = motion_storage_get_mot_data_frame_count(v13.data.motion_id, mot_db); - v13.data.frame = (v13.data.frame_count - 1.0f) * value; + motion.data.field_38 = a9; + if (motion.data.motion_id != -1) { + motion.data.frame_count = motion_storage_get_mot_data_frame_count(motion.data.motion_id, mot_db); + motion.data.frame = (motion.data.frame_count - 1.0f) * value; } if (!type) { data.motion.field_29 &= ~2; data.motion.field_150.time = 0.0f; } - rob_chara_set_eyelid_motion(this, &v13, type, mot_db); + rob_chara_set_eyelid_motion(this, &motion, type, mot_db); } void rob_chara::set_eyes_mottbl_motion(int32_t type, - int32_t mottbl_index, float_t value, int32_t state, float_t duration, - float_t a7, float_t step, int32_t a9, float_t offset, motion_database* mot_db) { - RobEyesMotion v13; - v13.data.motion_id = get_rob_cmn_mottbl_motion_id(mottbl_index); - v13.data.mottbl_index = mottbl_index; - v13.data.state = state; - v13.data.play_frame_step = step; - v13.data.duration = duration; - v13.data.offset = offset; - v13.data.field_24 = a7; - if (sub_14053F290(&v13)) { - v13.data.frame_data = &data.motion.frame_data; - v13.data.step_data = &data.motion.step_data; + int32_t mottbl_index, float_t value, int32_t state, float_t blend_duration, + float_t a7, float_t step, int32_t a9, float_t blend_offset, motion_database* mot_db) { + RobEyesMotion motion; + motion.data.motion_id = get_rob_cmn_mottbl_motion_id(mottbl_index); + motion.data.mottbl_index = mottbl_index; + motion.data.state = state; + motion.data.play_frame_step = step; + motion.data.blend_duration = blend_duration; + motion.data.blend_offset = blend_offset; + motion.data.field_24 = a7; + if (sub_14053F290(&motion)) { + motion.data.frame_data = &data.motion.frame_data; + motion.data.step_data = &data.motion.step_data; } - v13.data.field_38 = a9; - if (v13.data.motion_id != -1) { - v13.data.frame_count = motion_storage_get_mot_data_frame_count(v13.data.motion_id, mot_db); - v13.data.frame = (v13.data.frame_count - 1.0f) * value; + motion.data.field_38 = a9; + if (motion.data.motion_id != -1) { + motion.data.frame_count = motion_storage_get_mot_data_frame_count(motion.data.motion_id, mot_db); + motion.data.frame = (motion.data.frame_count - 1.0f) * value; } - rob_chara_set_eyes_motion(this, &v13, type, mot_db); + rob_chara_set_eyes_motion(this, &motion, type, mot_db); } static void sub_140553970(rob_chara* rob_chr, object_info a2, int32_t type) { @@ -3488,48 +3455,48 @@ static void sub_140553970(rob_chara* rob_chr, object_info a2, int32_t type) { } void rob_chara::set_face_mottbl_motion(int32_t type, - int32_t mottbl_index, float_t value, int32_t state, float_t duration, - float_t a7, float_t step, int32_t a9, float_t offset, bool a11, motion_database* mot_db) { - RobFaceMotion v27; - v27.data.motion_id = get_rob_cmn_mottbl_motion_id(mottbl_index); - v27.data.mottbl_index = mottbl_index; - v27.data.state = state; - v27.data.play_frame_step = step; - v27.data.duration = duration; - v27.data.offset = offset; - v27.data.field_24 = a7; - if (sub_14053F290(&v27)) { - v27.data.frame_data = &data.motion.frame_data; - v27.data.step_data = &data.motion.step_data; + int32_t mottbl_index, float_t value, int32_t state, float_t blend_duration, + float_t a7, float_t step, int32_t a9, float_t blend_offset, bool a11, motion_database* mot_db) { + RobFaceMotion motion; + motion.data.motion_id = get_rob_cmn_mottbl_motion_id(mottbl_index); + motion.data.mottbl_index = mottbl_index; + motion.data.state = state; + motion.data.play_frame_step = step; + motion.data.blend_duration = blend_duration; + motion.data.blend_offset = blend_offset; + motion.data.field_24 = a7; + if (sub_14053F290(&motion)) { + motion.data.frame_data = &data.motion.frame_data; + motion.data.step_data = &data.motion.step_data; } - v27.data.field_38 = a9; - if (v27.data.motion_id != -1) { - v27.data.frame_count = motion_storage_get_mot_data_frame_count(v27.data.motion_id, mot_db); - v27.data.frame = (v27.data.frame_count - 1.0f) * value; + motion.data.field_38 = a9; + if (motion.data.motion_id != -1) { + motion.data.frame_count = motion_storage_get_mot_data_frame_count(motion.data.motion_id, mot_db); + motion.data.frame = (motion.data.frame_count - 1.0f) * value; } - rob_chara_set_face_motion(this, &v27, type, mot_db); + rob_chara_set_face_motion(this, &motion, type, mot_db); int32_t head_object_id = 0; switch (mottbl_index) { - case 57: + case 0x39: // FACE_CRY / Crying (><) head_object_id = 1; break; - case 59: + case 0x3B: // FACE_CRY_OLD head_object_id = 7; break; - case 117: + case 0x75: // FACE_RESET / Crying (><) + Shock head_object_id = 2; break; - case 119: + case 0x77: // FACE_RESET / White-Eyed head_object_id = 3; break; - case 121: + case 0x79: // FACE_RESET / White-Eyed + Shock head_object_id = 4; break; - case 123: + case 0x7B: // FACE_RESET / -.- head_object_id = 5; break; - case 125: + case 0x7D: // FACE_RESET / -o- head_object_id = 6; break; } @@ -3537,57 +3504,54 @@ void rob_chara::set_face_mottbl_motion(int32_t type, object_info v17 = rob_chara_get_head_object(this, head_object_id); if (head_object_id) { sub_140553970(this, v17, type); - duration = 0.0f; + blend_duration = 0.0f; } else if (type == 2) { if (rob_chara_get_object_info(this, ITEM_ATAMA) != v17) { sub_140553970(this, v17, 2); - duration = 0.0f; + blend_duration = 0.0f; } } else if (data.motion.field_150.head_object != v17) { sub_140553970(this, v17, type); - data.motion.field_150.eye.data.duration = 0.0f; - rob_chara_set_eyes_motion(this, &data.motion.field_150.eye, 0, mot_db); - duration = 0.0f; + data.motion.field_150.eyes.data.blend_duration = 0.0f; + rob_chara_set_eyes_motion(this, &data.motion.field_150.eyes, 0, mot_db); + blend_duration = 0.0f; } -#pragma warning(disable:6289) - if (type != 1 || type != 2) { + if (type == 1 || type != 2) { if (a11) - set_eyelid_mottbl_motion_from_face(2, duration, -1.0f, offset, mot_db); + set_eyelid_mottbl_motion_from_face(2, blend_duration, -1.0f, blend_offset, mot_db); else if (data.motion.field_29 & 0x02) { set_eyelid_mottbl_motion_from_face( data.motion.field_150.field_1C0, 3.0f, -1.0f, 0.0f, mot_db); data.motion.field_29 |= 0x02; } else { - float_t v21 = -1.0f; + float_t value = -1.0f; if (data.motion.field_150.field_1C0 == 3) { - float_t v23 = data.motion.field_150.eyelid.data.frame_count - 1.0f; - if (v23 > 0.0f) - v21 = data.motion.field_150.eyelid.data.frame / v23; + float_t frame_count = data.motion.field_150.eyelid.data.frame_count - 1.0f; + if (frame_count > 0.0f) + value = data.motion.field_150.eyelid.data.frame / frame_count; - float_t v25 = bone_data->eyelid.blend.duration; - float_t v26 = bone_data->eyelid.blend.frame; - if (v25 > v26) { - duration = v25 - v26; - offset = 1.0f; + PartialMotionBlendFreeze& blend = bone_data->eyelid.blend; + if (blend.duration > blend.frame) { + blend_duration = blend.duration - blend.frame; + blend_offset = 1.0f; } } - set_eyelid_mottbl_motion_from_face(0, duration, v21, offset, mot_db); + set_eyelid_mottbl_motion_from_face(0, blend_duration, value, blend_offset, mot_db); } } else { - RobEyelidMotion v28; - v28.data = v27.data; - v28.data.duration = duration; - v28.data.offset = offset; + RobEyelidMotion _motion; + _motion.data = motion.data; + _motion.data.blend_duration = blend_duration; + _motion.data.blend_offset = blend_offset; data.motion.field_29 |= 0x80; - rob_chara_set_eyelid_motion(this, &v28, 2, mot_db); + rob_chara_set_eyelid_motion(this, &_motion, 2, mot_db); } -#pragma warning(default:6289) } void rob_chara::set_frame(float_t frame) { @@ -3598,65 +3562,65 @@ void rob_chara::set_frame(float_t frame) { } void rob_chara::set_hand_l_mottbl_motion(int32_t type, - int32_t mottbl_index, float_t value, int32_t state, float_t duration, - float_t a7, float_t step, int32_t a9, float_t offset, motion_database* mot_db) { - RobHandMotion v13; - v13.data.motion_id = get_rob_cmn_mottbl_motion_id(mottbl_index); - v13.data.mottbl_index = mottbl_index; - v13.data.state = state; - v13.data.play_frame_step = step; - v13.data.duration = duration; - v13.data.offset = offset; - v13.data.field_24 = a7; - if (sub_14053F290(&v13)) { - v13.data.frame_data = &data.motion.frame_data; - v13.data.step_data = &data.motion.step_data; + int32_t mottbl_index, float_t value, int32_t state, float_t blend_duration, + float_t a7, float_t step, int32_t a9, float_t blend_offset, motion_database* mot_db) { + RobHandMotion motion; + motion.data.motion_id = get_rob_cmn_mottbl_motion_id(mottbl_index); + motion.data.mottbl_index = mottbl_index; + motion.data.state = state; + motion.data.play_frame_step = step; + motion.data.blend_duration = blend_duration; + motion.data.blend_offset = blend_offset; + motion.data.field_24 = a7; + if (sub_14053F290(&motion)) { + motion.data.frame_data = &data.motion.frame_data; + motion.data.step_data = &data.motion.step_data; } - v13.data.field_38 = a9; - if (v13.data.motion_id != -1) { - v13.data.frame_count = motion_storage_get_mot_data_frame_count(v13.data.motion_id, mot_db); - v13.data.frame = (v13.data.frame_count - 1.0f) * value; + motion.data.field_38 = a9; + if (motion.data.motion_id != -1) { + motion.data.frame_count = motion_storage_get_mot_data_frame_count(motion.data.motion_id, mot_db); + motion.data.frame = (motion.data.frame_count - 1.0f) * value; } - rob_chara_set_hand_l_motion(this, &v13, type, mot_db); + rob_chara_set_hand_l_motion(this, &motion, type, mot_db); } void rob_chara::set_hand_r_mottbl_motion(int32_t type, - int32_t mottbl_index, float_t value, int32_t state, float_t duration, - float_t a7, float_t step, int32_t a9, float_t offset, motion_database* mot_db) { - RobHandMotion v13; - v13.data.motion_id = get_rob_cmn_mottbl_motion_id(mottbl_index); - v13.data.mottbl_index = mottbl_index; - v13.data.state = state; - v13.data.play_frame_step = step; - v13.data.duration = duration; - v13.data.offset = offset; - v13.data.field_24 = a7; - if (sub_14053F290(&v13)) { - v13.data.frame_data = &data.motion.frame_data; - v13.data.step_data = &data.motion.step_data; + int32_t mottbl_index, float_t value, int32_t state, float_t blend_duration, + float_t a7, float_t step, int32_t a9, float_t blend_offset, motion_database* mot_db) { + RobHandMotion motion; + motion.data.motion_id = get_rob_cmn_mottbl_motion_id(mottbl_index); + motion.data.mottbl_index = mottbl_index; + motion.data.state = state; + motion.data.play_frame_step = step; + motion.data.blend_duration = blend_duration; + motion.data.blend_offset = blend_offset; + motion.data.field_24 = a7; + if (sub_14053F290(&motion)) { + motion.data.frame_data = &data.motion.frame_data; + motion.data.step_data = &data.motion.step_data; } - v13.data.field_38 = a9; - if (v13.data.motion_id != -1) { - v13.data.frame_count = motion_storage_get_mot_data_frame_count(v13.data.motion_id, mot_db); - v13.data.frame = (v13.data.frame_count - 1.0f) * value; + motion.data.field_38 = a9; + if (motion.data.motion_id != -1) { + motion.data.frame_count = motion_storage_get_mot_data_frame_count(motion.data.motion_id, mot_db); + motion.data.frame = (motion.data.frame_count - 1.0f) * value; } - rob_chara_set_hand_r_motion(this, &v13, type, mot_db); + rob_chara_set_hand_r_motion(this, &motion, type, mot_db); } bool rob_chara::set_motion_id(int32_t motion_id, - float_t frame, float_t duration, bool a5, bool set_motion_reset_data, + float_t frame, float_t blend_duration, bool a5, bool set_motion_reset_data, MotionBlendType blend_type, bone_database* bone_data, motion_database* mot_db) { if (!a5 && data.motion.motion_id == motion_id) return false; - if (duration <= 0.0f) + if (blend_duration <= 0.0f) blend_type = MOTION_BLEND; load_motion(motion_id, 0, frame, blend_type, bone_data, mot_db); - rob_chara_bone_data_set_motion_duration(this->bone_data, duration, 1.0f, 0.0f); + rob_chara_bone_data_set_motion_duration(this->bone_data, blend_duration, 1.0f, 0.0f); data.motion.field_28 |= 0x80; data.motion.frame_data.last_set_frame = frame; set_motion_skin_param(motion_id, (float_t)(int32_t)frame); - if (duration == 0.0f) { + if (blend_duration == 0.0f) { if (set_motion_reset_data) rob_chara::set_motion_reset_data(motion_id, frame); @@ -3681,26 +3645,26 @@ void rob_chara::set_motion_skin_param(int32_t motion_id, float_t frame) { } void rob_chara::set_mouth_mottbl_motion(int32_t type, - int32_t mottbl_index, float_t value, int32_t state, float_t duration, - float_t a7, float_t step, int32_t a9, float_t offset, motion_database* mot_db) { - RobMouthMotion v13; - v13.data.motion_id = get_rob_cmn_mottbl_motion_id(mottbl_index); - v13.data.mottbl_index = mottbl_index; - v13.data.state = state; - v13.data.play_frame_step = step; - v13.data.duration = duration; - v13.data.offset = offset; - v13.data.field_24 = a7; - if (sub_14053F290(&v13)) { - v13.data.frame_data = &data.motion.frame_data; - v13.data.step_data = &data.motion.step_data; + int32_t mottbl_index, float_t value, int32_t state, float_t blend_duration, + float_t a7, float_t step, int32_t a9, float_t blend_offset, motion_database* mot_db) { + RobMouthMotion motion; + motion.data.motion_id = get_rob_cmn_mottbl_motion_id(mottbl_index); + motion.data.mottbl_index = mottbl_index; + motion.data.state = state; + motion.data.play_frame_step = step; + motion.data.blend_duration = blend_duration; + motion.data.blend_offset = blend_offset; + motion.data.field_24 = a7; + if (sub_14053F290(&motion)) { + motion.data.frame_data = &data.motion.frame_data; + motion.data.step_data = &data.motion.step_data; } - v13.data.field_38 = a9; - if (v13.data.motion_id != -1) { - v13.data.frame_count = motion_storage_get_mot_data_frame_count(v13.data.motion_id, mot_db); - v13.data.frame = (v13.data.frame_count - 1.0f) * value; + motion.data.field_38 = a9; + if (motion.data.motion_id != -1) { + motion.data.frame_count = motion_storage_get_mot_data_frame_count(motion.data.motion_id, mot_db); + motion.data.frame = (motion.data.frame_count - 1.0f) * value; } - rob_chara_set_mouth_motion(this, &v13, type, mot_db); + rob_chara_set_mouth_motion(this, &motion, type, mot_db); } void rob_chara::set_osage_move_cancel(uint8_t id, float_t value) { @@ -3741,10 +3705,14 @@ void rob_chara::set_parts_disp(item_id id, bool disp) { } void rob_chara::set_visibility(bool value) { - data.field_0 &= ~0x01; - data.field_3 &= ~0x01; - data.field_0 |= value ? 0x01 : 0x00; - data.field_3 |= value ? 0x01 : 0x00; + if (value) { + data.field_0 |= 0x01; + data.field_3 |= 0x01; + } + else { + data.field_0 &= ~0x01; + data.field_3 &= ~0x01; + } /*if (rob_chara_check_for_ageageagain_module(chara_index, module_index)) { sub_140543780(chara_id, 1, value); sub_140543780(chara_id, 2, value); @@ -3778,12 +3746,12 @@ static void bone_data_mult_0(bone_data* a1, int32_t skeleton_select) { mat = mat4_identity; if (a1->type == BONE_DATABASE_BONE_POSITION) { - mat4_translate_mult(&mat, a1->trans.x, a1->trans.y, a1->trans.z, &mat); + mat4_translate_mult(&mat, &a1->trans, &mat); a1->rot_mat[0] = mat4_identity; } else if (a1->type == BONE_DATABASE_BONE_TYPE_1) { mat4_mult_vec3_inv_trans(&mat, &a1->trans, &a1->trans); - mat4_translate_mult(&mat, a1->trans.x, a1->trans.y, a1->trans.z, &mat); + mat4_translate_mult(&mat, &a1->trans, &mat); a1->rot_mat[0] = mat4_identity; } else { @@ -3808,7 +3776,7 @@ static void bone_data_mult_0(bone_data* a1, int32_t skeleton_select) { } mat4_rotate_x_mult(&rot_mat, a1->rotation.x, &rot_mat); - mat4_translate_mult(&mat, a1->trans.x, a1->trans.y, a1->trans.z, &mat); + mat4_translate_mult(&mat, &a1->trans, &mat); mat4_mult(&rot_mat, &mat, &mat); a1->rot_mat[0] = rot_mat; } @@ -3829,17 +3797,13 @@ static void bone_data_mult_1(bone_data* a1, mat4* parent_mat, bone_data* a3, boo if (a1->type != BONE_DATABASE_BONE_POSITION_ROTATION) a1->trans = a1->base_translation[1]; - mat4_translate_mult(&mat, a1->trans.x, a1->trans.y, a1->trans.z, &mat); + mat4_translate_mult(&mat, &a1->trans, &mat); if (solve_ik) { - a1->node[0].exp_data.rotation = vec3_null; + a1->node[0].exp_data.rotation = 0.0f; if (!a1->disable_mot_anim) mat4_get_rotation(&a1->rot_mat[0], &a1->node[0].exp_data.rotation); - else if (bone_data_mult_1_exp_data(a1, &a1->node[0].exp_data, a3)) { - vec3 rotation = a1->node[0].exp_data.rotation; - mat4 rot_mat; - mat4_rotate(rotation.x, rotation.y, rotation.z, &rot_mat); - a1->rot_mat[0] = rot_mat; - } + else if (bone_data_mult_1_exp_data(a1, &a1->node[0].exp_data, a3)) + mat4_rotate(&a1->node[0].exp_data.rotation, &a1->rot_mat[0]); else { *a1->node[0].mat = mat; @@ -3859,9 +3823,9 @@ static void bone_data_mult_1(bone_data* a1, mat4* parent_mat, bone_data* a3, boo mat4_mult(&a1->rot_mat[0], &mat, &mat); } else { - mat4_translate_mult(&mat, a1->trans.x, a1->trans.y, a1->trans.z, &mat); + mat4_translate_mult(&mat, &a1->trans, &mat); if (solve_ik) - a1->node[0].exp_data.rotation = vec3_null; + a1->node[0].exp_data.rotation = 0.0f; } *a1->node[0].mat = mat; @@ -3882,7 +3846,7 @@ static void bone_data_mult_1(bone_data* a1, mat4* parent_mat, bone_data* a3, boo if (!solve_ik) return; - a1->node[1].exp_data.position = vec3_null; + a1->node[1].exp_data.position = 0.0f; mat4_get_rotation(&a1->rot_mat[1], &a1->node[1].exp_data.rotation); a1->node[1].exp_data.reset_scale(); a1->node[2].exp_data.set_position_rotation( @@ -3898,7 +3862,7 @@ static void bone_data_mult_1(bone_data* a1, mat4* parent_mat, bone_data* a3, boo if (!solve_ik) return; - a1->node[1].exp_data.position = vec3_null; + a1->node[1].exp_data.position = 0.0f; mat4_get_rotation(&a1->rot_mat[1], &a1->node[1].exp_data.rotation); a1->node[1].exp_data.reset_scale(); a1->node[2].exp_data.position = { a1->ik_segment_length[1], 0.0f, 0.0f }; @@ -4580,12 +4544,12 @@ static void sub_1404119A0(struc_313* a1) { sub_1404122C0(a1, &v5, &v4, &v3); } -static void mot_blend_set_duration(mot_blend* a1, float_t duration, float_t step, float_t offset) { +static void mot_blend_set_blend_duration(mot_blend* a1, float_t duration, float_t step, float_t offset) { a1->blend.SetDuration(duration, step, offset); } static void mot_blend_set_frame(mot_blend* a1, float_t frame) { - mot_play_frame_data_set_frame(&a1->mot_play_data.frame_data, frame); + a1->mot_play_data.frame_data.set_frame(frame); } static void mot_key_frame_interpolate(mot* a1, float_t frame, float_t* value, @@ -4655,7 +4619,8 @@ static void mot_key_frame_interpolate(mot* a1, float_t frame, float_t* value, float_t next_frame = (float_t)frames[key_index]; if (fabsf(next_frame - frame) > 0.000001f && key_index > 0) { float_t curr_frame = (float_t)frames[key_index - 1]; - float_t t = (frame - curr_frame) / (next_frame - curr_frame); + float_t df = frame - curr_frame; + float_t t = df / (next_frame - curr_frame); if (type == MOT_KEY_SET_HERMITE) { values += key_index - 1; float_t p1 = values[0]; @@ -4669,7 +4634,7 @@ static void mot_key_frame_interpolate(mot* a1, float_t frame, float_t* value, float_t t1 = values[1]; float_t t2 = values[3]; float_t t_1 = t - 1.0f; - *value = (t_1 * t1 + t * t2) * t_1 * (frame - curr_frame) + *value = (t_1 * t1 + t * t2) * t_1 * df + (t * 2.0f - 3.0f) * (t * t) * (p1 - p2) + p1; } a4->current_key = (int32_t)key_index; @@ -4710,7 +4675,7 @@ static uint32_t mot_load_last_key_calc(uint16_t keys_count) { return v3 - keys_count; } -static bool mot_data_load_file(mot* a1, const mot_data* a2) { +static bool mot_load_file(mot* a1, const mot_data* a2) { a1->frame_count = 0; if (!a2) return 0; @@ -4784,7 +4749,7 @@ static const mot_data* mot_key_data_load_file(mot_key_data* a1, int32_t motion_i const mot_data* mot_data = motion_storage_get_mot_data(motion_id, mot_db); a1->mot_data = mot_data; if (mot_data) { - a1->skeleton_select = mot_data_load_file(&a1->mot, mot_data); + a1->skeleton_select = mot_load_file(&a1->mot, mot_data); a1->motion_id = motion_id; } else { @@ -4808,14 +4773,6 @@ static void mot_key_data_reserve_key_sets(mot_key_data* a1) { a1->key_sets_ready = true; } -static void mot_play_frame_data_set_frame(mot_play_frame_data* a1, float_t frame) { - float_t v2 = a1->field_14; - a1->frame = frame; - a1->field_28 = false; - if (v2 >= 0.0f && (a1->field_18 == 2 && frame <= v2) || frame >= v2) - a1->field_14 = -1.0f; -} - static void mothead_func_0(mothead_func_data* func_data, void* data, const mothead_data* mhd_data, int32_t frame, motion_database* mot_db) { @@ -5296,16 +5253,28 @@ static int32_t sub_140533440(int32_t a1) { static void mothead_func_32(mothead_func_data* func_data, void* data, const mothead_data* mhd_data, int32_t frame, motion_database* mot_db) { - rob_chara_data* v4 = func_data->rob_chr_data; + rob_chara_data* rob_chr_data = func_data->rob_chr_data; + struc_651& v2 = rob_chr_data->field_1588.field_330; + if (func_data->is_x) { // X + float_t value = ((float_t*)data)[0]; + float_t duration = ((float_t*)data)[1]; + v2.arm_adjust_next_value = value; + v2.arm_adjust_prev_value = rob_chr_data->arm_adjust_scale; + v2.arm_adjust_start_frame = mhd_data->frame; + v2.arm_adjust_duration = max_def(duration, 0.0f); + return; + } + float_t v8 = (float_t)((int16_t*)data)[0]; int32_t v5 = ((int32_t*)data)[1]; float_t v9 = ((float_t*)data)[2]; int32_t v10 = ((int32_t*)data)[3]; - if (v4->motion.field_28 & 0x08) + if (rob_chr_data->motion.field_28 & 0x08) v5 = sub_140533440(v5); - float_t v7 = (float_t)(v4->field_1588.field_0.field_8 - 1.0f) - v4->motion.frame_data.frame; + float_t v7 = (float_t)(rob_chr_data->field_1588.field_0.field_8 - 1.0f) + - rob_chr_data->motion.frame_data.frame; if (v7 >= v8) v7 = v8; @@ -5317,9 +5286,9 @@ static void mothead_func_32(mothead_func_data* func_data, if (!(v5 & (1 << j))) continue; - v4->field_1588.field_330.field_2C[i].field_0[j] = 1; - v4->field_1588.field_330.field_80[i].field_0[j] = v9; - v4->field_1588.field_330.field_1C4[i].field_0[j] = v7; + v2.field_2C[i].field_0[j] = 1; + v2.field_80[i].field_0[j] = v9; + v2.field_1C4[i].field_0[j] = v7; } } } @@ -5437,8 +5406,9 @@ static void mothead_func_49(mothead_func_data* func_data, } -static void rob_chara_set_face_motion_id(rob_chara* rob_chr, int32_t motion_id, float_t frame, - int32_t state, float_t duration, float_t a6, float_t step, int32_t a8, float_t offset, motion_database* mot_db); +static void rob_chara_set_face_motion_id(rob_chara* rob_chr, int32_t motion_id, + float_t frame, int32_t state, float_t blend_duration, float_t a6, + float_t step, int32_t a8, float_t blend_offset, motion_database* mot_db); static void mothead_func_50_set_face_motion_id(mothead_func_data* func_data, void* data, const mothead_data* mhd_data, int32_t frame, motion_database* mot_db) { @@ -5492,10 +5462,12 @@ static void mothead_func_58_set_eyelid_mottbl_motion(mothead_func_data* func_dat ((float_t*)data)[2] * 6.0f, ((float_t*)data)[4], 1.0f, -1, 0.0f, mot_db); } -static void rob_chara_set_eyelid_motion_id(rob_chara* rob_chr, int32_t motion_id, float_t frame, - int32_t state, float_t duration, float_t a6, float_t step, int32_t a8, float_t offset, motion_database* mot_db); -static void rob_chara_set_eyes_motion_id(rob_chara* rob_chr, int32_t motion_id, float_t frame, - int32_t state, float_t duration, float_t a6, float_t step, int32_t a8, float_t offset, motion_database* mot_db); +static void rob_chara_set_eyelid_motion_id(rob_chara* rob_chr, int32_t motion_id, + float_t frame, int32_t state, float_t blend_duration, float_t a6, + float_t step, int32_t a8, float_t blend_offset, motion_database* mot_db); +static void rob_chara_set_eyes_motion_id(rob_chara* rob_chr, int32_t motion_id, + float_t frame, int32_t state, float_t blend_duration, float_t a6, + float_t step, int32_t a8, float_t blend_offset, motion_database* mot_db); static void rob_chara_set_head_object(rob_chara* rob_chr, int32_t head_object_id, motion_database* mot_db) { rob_chr->data.motion.field_150.head_object = rob_chara_get_head_object(rob_chr, head_object_id); @@ -5652,13 +5624,13 @@ static void mothead_func_68(mothead_func_data* func_data, v2->mot_key_data.field_68.field_4 = ((float_t*)data)[0]; } -static void mothead_func_69(mothead_func_data* func_data, +static void mothead_func_69_motion_max_frame(mothead_func_data* func_data, void* data, const mothead_data* mhd_data, int32_t frame, motion_database* mot_db) { - /*float_t v5 = (float_t)((int32_t*)data)[0]; - sub_14041BEF0(func_data->rob_chr->bone_data, v5); - pv_game* v6 = pv_game_data_get(); + float_t max_frame = (float_t)*(int32_t*)data; + func_data->rob_chr->bone_data->set_motion_max_frame(max_frame); + /*pv_game* v6 = pv_game_get(); if (v6) - pv_game::set_data_itmpv_max_frame(v6, func_data->rob_chr->chara_id, v5);*/ + pv_game::set_data_itmpv_max_frame(v6, func_data->rob_chr->chara_id, max_frame);*/ } static void mothead_func_70(mothead_func_data* func_data, @@ -5809,12 +5781,12 @@ static void mothead_func_78(mothead_func_data* func_data, 1, 0, 3, 2, 4, 0, 0, 0 }; - rob_chara_data* v4 = func_data->rob_chr_data; + rob_chara_data* rob_chr_data = func_data->rob_chr_data; uint16_t v5 = ((uint8_t*)data)[2]; - if (v4->motion.field_28 & 8) + if (rob_chr_data->motion.field_28 & 0x08) v5 = word_140A2D430[v5]; - struc_306* v7 = &v4->field_1588.field_330.field_33C[v5]; + struc_306* v7 = &rob_chr_data->field_1588.field_330.field_33C[v5]; int32_t v8 = v7->field_38; int32_t v9 = v7->field_3C; int32_t v10 = v7->field_40; @@ -5828,9 +5800,9 @@ static void mothead_func_78(mothead_func_data* func_data, int32_t v12 = v7->field_34; int32_t v13 = v7->field_44; - v7->field_10 = vec3_null; - v7->field_1C = vec3_null; - v7->field_28 = vec3_null; + v7->field_10 = 0.0f; + v7->field_1C = 0.0f; + v7->field_28 = 0.0f; v7->field_38 = 0; v7->field_34 = 0; v7->field_3C = 0; @@ -5870,6 +5842,179 @@ static void mothead_func_80_adjust_get_global_trans(mothead_func_data* func_data func_data->rob_chr_data->adjust_data.get_global_trans = ((uint8_t*)data)[0]; } +static size_t mothead_data_radix_index_func_frame(mothead_data* data, size_t index) { + return (uint32_t)data[index].frame; +} + +#pragma warning(push) +#pragma warning(disable: 6386) +static void mothead_mot_msgpack_read(const char* path, const char* set_name, mothead* mhd) { // X + char buf[0x200]; + sprintf_s(buf, sizeof(buf), "%s\\%s.json", path, set_name); + if (!path_check_file_exists(buf)) + return; + + msgpack msg; + + file_stream s; + s.open(buf, "rb"); + io_json_read(s, &msg); + s.close(); + + if (msg.type != MSGPACK_ARRAY) + return; + + size_t data_x_size = 0; + msgpack_array* ptr = msg.data.arr; + for (msgpack& i : *ptr) { + msgpack* mot_id = i.read("MotionID"); + msgpack* arr = i.read_array("Array"); + if (!mot_id || !arr) + continue; + + uint32_t motion_id = mot_id->read_uint32_t(); + if ((int32_t)motion_id < mhd->first_mot_id || (int32_t)motion_id > mhd->last_mot_id) + continue; + + mothead_mot* mhdm = mhd->mots[(ssize_t)(int32_t)motion_id - mhd->first_mot_id]; + + msgpack_array* ptr = arr->data.arr; + for (msgpack& j : *ptr) { + msgpack* type = j.read("Type", MSGPACK_STRING); + msgpack* frm = j.read("Frame", MSGPACK_INT32); + msgpack* data = j.read("Data", MSGPACK_MAP); + if (!type || !frm) + continue; + + if (!type->data.str->compare("32") && data) { + if (data->read("Value", MSGPACK_FLOAT32) && data->read("Duration", MSGPACK_FLOAT32)) + data_x_size += 0x08; + } + else if (!type->data.str->compare("RobHandAdjust") && data) { + msgpack* hnd = data->read("Hand", MSGPACK_INT16); + if (hnd) { + int32_t frame = frm->read_int32_t(); + int16_t hand = hnd->read_int16_t(); + for (mothead_data& j : mhdm->data) + if (j.frame == frame && j.type == MOTHEAD_DATA_ROB_HAND_ADJUST + && ((int16_t*)j.data)[0] == hand) { + data_x_size += 0x30; + break; + } + } + } + else if (!type->data.str->compare("RobArmAdjust") && data) { + msgpack* idx = data->read("Index", MSGPACK_INT16); + if (idx) { + int32_t frame = frm->read_int32_t(); + int16_t index = idx->read_int16_t(); + for (mothead_data& j : mhdm->data) + if (j.frame == frame && j.type == MOTHEAD_DATA_ROB_ARM_ADJUST + && ((int16_t*)j.data)[0] == index) { + data_x_size += 0x0C; + break; + } + } + } + } + } + + size_t data_x = (size_t)malloc(data_x_size); + if (!data_x) + return; + + mhd->data_x = (void*)data_x; + + for (msgpack& i : *ptr) { + msgpack* mot_id = i.read("MotionID"); + msgpack* arr = i.read_array("Array"); + if (!mot_id || !arr) + continue; + + uint32_t motion_id = mot_id->read_uint32_t(); + if ((int32_t)motion_id < mhd->first_mot_id || (int32_t)motion_id > mhd->last_mot_id) + continue; + else if (!arr->data.arr->size()) + continue; + + mothead_mot* mhdm = mhd->mots[(ssize_t)(int32_t)motion_id - mhd->first_mot_id]; + + msgpack_array* ptr = arr->data.arr; + for (msgpack& j : *ptr) { + msgpack* type = j.read("Type", MSGPACK_STRING); + msgpack* frm = j.read("Frame", MSGPACK_INT32); + msgpack* data = j.read("Data", MSGPACK_MAP); + if (!type || !frm) + continue; + + int32_t frame = frm->read_int32_t(); + + if (!type->data.str->compare("32") && data) { + mhdm->data.push_back({ MOTHEAD_DATA_TYPE_32, frame, (void*)data_x }); + ((float_t*)data_x)[0] = data->read_float_t("Value"); + ((float_t*)data_x)[1] = data->read_float_t("Duration"); + data_x += 0x08; + } + else if (!type->data.str->compare("RobHandAdjust") && data) { + msgpack* hnd = data->read("Hand", MSGPACK_INT16); + if (hnd) { + int32_t frame = frm->read_int32_t(); + int16_t hand = hnd->read_int16_t(); + for (mothead_data& j : mhdm->data) { + if (j.frame != frame || j.type != MOTHEAD_DATA_ROB_HAND_ADJUST + || ((int16_t*)j.data)[0] != hand) + continue; + + j.data = (void*)data_x; + ((int16_t*)data_x)[0] = hand; + ((int16_t*)data_x)[1] = data->read_int16_t("ScaleSelect"); + ((float_t*)data_x)[1] = data->read_float_t("Duration"); + ((int16_t*)data_x)[4] = data->read_int16_t("Type"); + ((float_t*)data_x)[3] = data->read_float_t("Scale"); + ((float_t*)data_x)[4] = data->read_float_t("RotBlend"); + ((float_t*)data_x)[5] = data->read_float_t("OffsetX"); + ((float_t*)data_x)[6] = data->read_float_t("OffsetY"); + ((float_t*)data_x)[7] = data->read_float_t("OffsetZ"); + ((uint8_t*)data_x)[32] = data->read_bool("EnableScale") ? 0x01 : 0x00; + ((uint8_t*)data_x)[33] = data->read_bool("DisableX") ? 0x01 : 0x00; + ((uint8_t*)data_x)[34] = data->read_bool("DisableY") ? 0x01 : 0x00; + ((uint8_t*)data_x)[35] = data->read_bool("DisableZ") ? 0x01 : 0x00; + ((float_t*)data_x)[9] = data->read_float_t("OffsetBlend"); + ((float_t*)data_x)[10] = data->read_float_t("ArmLength"); + ((int32_t*)data_x)[11] = data->read_int32_t("i2C"); + data_x += 0x30; + break; + } + } + } + else if (!type->data.str->compare("RobArmAdjust") && data) { + msgpack* idx = data->read("Index", MSGPACK_INT16); + if (idx) { + int32_t frame = frm->read_int32_t(); + int16_t index = idx->read_int16_t(); + for (mothead_data& j : mhdm->data) { + if (j.frame != frame || j.type != MOTHEAD_DATA_ROB_ARM_ADJUST + || ((int16_t*)j.data)[0] != index) + continue; + + j.data = (void*)data_x; + ((int16_t*)data_x)[0] = index; + ((float_t*)data_x)[1] = data->read_float_t("Duration"); + ((float_t*)data_x)[2] = data->read_float_t("Value"); + data_x += 0x0C; + break; + } + } + } + } + + radix_sort_custom(mhdm->data.data(), mhdm->data.size(), sizeof(mothead_data), + sizeof(uint32_t), (radix_index_func)mothead_data_radix_index_func_frame); + mhdm->is_x = true; + } +} +#pragma warning(pop) + static void motion_blend_mot_interpolate(motion_blend_mot* a1) { vec3* keyframe_data = (vec3*)a1->mot_key_data.key_set_data.data(); bool reverse = motion_blend_mot_interpolate_get_reverse(&a1->field_4F8.field_0); @@ -5909,8 +6054,8 @@ static void motion_blend_mot_interpolate(motion_blend_mot* a1) { float_t rot_y = a1->bone_data.rot_y; mat4 mat; mat4_rotate_y(rot_y, &mat); - mat4_translate_mult(&mat, global_trans.x, global_trans.y, global_trans.z, &mat); - mat4_rotate_mult(&mat, global_rotation.x, global_rotation.y, global_rotation.z, &mat); + mat4_translate_mult(&mat, &global_trans, &mat); + mat4_rotate_mult(&mat, &global_rotation, &mat); for (bone_data& i : a1->bone_data.bones) switch (i.type) { case BONE_DATABASE_BONE_TYPE_1: @@ -6126,14 +6271,13 @@ static void sub_1401EB1D0(bone_data* a1, int32_t skeleton_select) { } static void sub_140412E10(motion_blend_mot* a1, int32_t skeleton_select) { - for (bone_data& i : a1->bone_data.bones) { + for (bone_data& i : a1->bone_data.bones) if ((1 << (i.motion_bone_index & 0x1F)) & a1->field_0.field_8.bitfield.data()[i.motion_bone_index >> 5]) { sub_1401EB1D0(&i, skeleton_select); if (i.type == BONE_DATABASE_BONE_POSITION_ROTATION && (a1->field_4F8.field_0 & 0x02)) vec3_add(i.trans_prev[skeleton_select], a1->field_4F8.field_90, i.trans_prev[skeleton_select]); } - } } static void sub_140412F20(mot_blend* a1, std::vector* a2) { @@ -6170,15 +6314,19 @@ static void motion_blend_mot_load_file(motion_blend_mot* a1, int32_t motion_id, a1->field_4F8.mat = mat4_identity; } -static void motion_blend_mot_mult_mat(motion_blend_mot* a1, mat4* mat) { - if (mat) { - a1->field_4F8.mat = *mat; - a1->field_4F8.field_8C = true; +static void sub_140414900(struc_308* a1, mat4* a2) { + if (a2) { + a1->field_8C = true; + a1->mat = *a2; } else { - a1->field_4F8.mat = mat4_identity; - a1->field_4F8.field_8C = false; + a1->field_8C = false; + a1->mat = mat4_identity; } +} + +static void motion_blend_mot_mult_mat(motion_blend_mot* a1, mat4* mat) { + sub_140414900(&a1->field_4F8, mat); mat4& m = a1->field_4F8.mat; bone_data* v3 = a1->bone_data.bones.data(); @@ -6276,17 +6424,6 @@ static void rob_base_rob_chara_init(rob_chara* rob_chr) { //sub_14054F830(&rob_chr->rob_touch, rob_chr->pv_data.field_70 != 0); } -static void sub_140414900(struc_308* a1, mat4* a2) { - if (a2) { - a1->field_8C = true; - a1->mat = *a2; - } - else { - a1->field_8C = false; - a1->mat = mat4_identity; - } -} - static mat4* sub_140504E80(rob_chara* rob_chr) { mat4 mat; mat4_rotate_y((float_t)((double_t)rob_chr->data.miku_rot.rot_y_int16 * M_PI * (1.0 / 32768.0)), &mat); @@ -6298,6 +6435,7 @@ static mat4* sub_140504E80(rob_chara* rob_chr) { static void sub_14041DA50(rob_chara_bone_data* rob_bone_data, mat4* mat) { for (bone_node& i : rob_bone_data->nodes) mat4_mult(i.mat, mat, i.mat); + sub_140414900(&rob_bone_data->motion_loaded.front()->field_4F8, mat); } @@ -6511,56 +6649,67 @@ static vec3* rob_chara_bone_data_get_global_trans(rob_chara_bone_data* rob_bone_ } static void rob_chara_data_adjuct_set_trans(rob_chara_adjust_data* rob_chr_adj, - vec3* trans, bool pos_adjust, vec3* global_trans) { + vec3& trans, bool pos_adjust, vec3* global_trans) { float_t scale = rob_chr_adj->scale; + float_t item_scale = rob_chr_adj->item_scale; // X vec3 _offset = rob_chr_adj->offset; if (global_trans) _offset.y += global_trans->y; - vec3 _trans = *trans; - if (rob_chr_adj->height_adjust) + vec3 _trans = trans; + vec3 _item_trans = trans; + if (rob_chr_adj->height_adjust) { _trans.y += rob_chr_adj->pos_adjust_y; + _item_trans.y += rob_chr_adj->pos_adjust_y; // X + } else { - vec3 temp; - vec3_sub(_trans, _offset, temp); - vec3_mult_scalar(temp, scale, temp); - vec3_add(temp, _offset, temp); + vec3 temp = (_trans - _offset) * scale + _offset; + vec3 arm_temp = (_item_trans - _offset) * item_scale + _offset; - if (!rob_chr_adj->offset_x) + if (!rob_chr_adj->offset_x) { _trans.x = temp.x; - if (!rob_chr_adj->offset_y) + _item_trans.x = arm_temp.x; // X + } + + if (!rob_chr_adj->offset_y) { _trans.y = temp.y; - if (!rob_chr_adj->offset_z) + _item_trans.y = arm_temp.y; // X + } + + if (!rob_chr_adj->offset_z) { _trans.z = temp.z; + _item_trans.z = arm_temp.z; // X + } } - if (pos_adjust) - vec3_add(_trans, rob_chr_adj->pos_adjust, _trans); + if (pos_adjust) { + _trans = rob_chr_adj->pos_adjust + _trans; + _item_trans = rob_chr_adj->pos_adjust + _item_trans; //X + } - vec3 v10; - vec3_mult_scalar(*trans, scale, v10); - vec3_sub(_trans, v10, rob_chr_adj->trans); + rob_chr_adj->trans = _trans - trans * scale; + rob_chr_adj->item_trans = _item_trans - trans * item_scale; // X } static void rob_chara_set_data_adjust_mat(rob_chara* rob_chr, - rob_chara_adjust_data* rob_chr_adj, bool pos_adjust) { - vec3 v12; - mat4* v6 = rob_chara_bone_data_get_mats_mat(rob_chr->bone_data, ROB_BONE_N_HARA_CP); - mat4_get_translation(v6, &v12); + rob_chara_adjust_data* rob_chr_adj, bool pos_adjust = true) { + mat4* mat = rob_chara_bone_data_get_mats_mat(rob_chr->bone_data, ROB_BONE_N_HARA_CP); + + vec3 trans; + mat4_get_translation(mat, &trans); + vec3* global_trans = 0; if (rob_chr_adj->get_global_trans) global_trans = rob_chara_bone_data_get_global_trans(rob_chr->bone_data); - rob_chara_data_adjuct_set_trans(rob_chr_adj, &v12, pos_adjust, global_trans); + rob_chara_data_adjuct_set_trans(rob_chr_adj, trans, pos_adjust, global_trans); - mat4 mat; float_t scale = rob_chr_adj->scale; - mat4_scale(scale, scale, scale, &mat); - mat4_set_translation(&mat, &rob_chr_adj->trans); - rob_chr_adj->mat = mat; -} + mat4_scale(scale, scale, scale, &rob_chr_adj->mat); + mat4_set_translation(&rob_chr_adj->mat, &rob_chr_adj->trans); -static void rob_chara_set_data_adjust_mat_pos_adjust_true(rob_chara* rob_chr) { - rob_chara_set_data_adjust_mat(rob_chr, &rob_chr->data.adjust_data, true); + float_t item_scale = rob_chr_adj->item_scale; // X + mat4_scale(item_scale, item_scale, item_scale, &rob_chr_adj->item_mat); + mat4_set_translation(&rob_chr_adj->item_mat, &rob_chr_adj->item_trans); } static void rob_base_rob_chara_ctrl(rob_chara* rob_chr) { @@ -6568,7 +6717,7 @@ static void rob_base_rob_chara_ctrl(rob_chara* rob_chr) { rob_chara_adjust_ctrl(rob_chr); sub_140505B20(rob_chr); //sub_14036D130(7, &rob_chr); - rob_chara_set_data_adjust_mat_pos_adjust_true(rob_chr); + rob_chara_set_data_adjust_mat(rob_chr, &rob_chr->data.adjust_data); } static void sub_140514680(rob_chara* rob_chr) { @@ -6729,17 +6878,17 @@ static void sub_1405077D0(rob_chara* rob_chr, bone_database* bone_data, motion_d static bool sub_140419E90(rob_chara_bone_data* rob_bone_data) { mot_play_data* v2 = &rob_bone_data->motion_loaded.front()->mot_play_data; - if (v2->field_34) - return v2->field_38 <= 0.0f; - else if (v2->frame_data.field_18 == 1) - return v2->frame_data.field_1C > 3 && v2->frame_data.last_frame < v2->frame_data.frame; - else if (v2->frame_data.field_18 == 2) - return v2->frame_data.field_1C > 3 && v2->frame_data.frame < 0.0f; - return false; -} - -static uint8_t sub_14041A0D0(rob_chara_bone_data* rob_bone_data) { - return rob_bone_data->motion_loaded.front()->mot_play_data.frame_data.field_28; + if (v2->loop_frames_enabled) + return v2->loop_frames <= 0.0f; + else if (v2->frame_data.loop_state >= MOT_PLAY_FRAME_DATA_LOOP_ONCE + && v2->frame_data.loop_state <= MOT_PLAY_FRAME_DATA_LOOP_REVERSE) + return false; + else if (v2->frame_data.playback_state == MOT_PLAY_FRAME_DATA_PLAYBACK_FORWARD) + return v2->frame_data.last_frame < v2->frame_data.frame; + else if (v2->frame_data.playback_state == MOT_PLAY_FRAME_DATA_PLAYBACK_BACKWARD) + return v2->frame_data.frame < 0.0f; + else + return false; } static void sub_140505310(rob_chara* rob_chr, bone_database* bone_data, motion_database* mot_db) { @@ -6758,11 +6907,11 @@ static void sub_140505310(rob_chara* rob_chr, bone_database* bone_data, motion_d } break; case 1: { struc_223* v1 = &rob_chr->data.field_1588; - int32_t v3 = rob_chr->data.field_1588.field_0.field_6C; - if (v3 > 0) { + int32_t loop_count = rob_chr->data.field_1588.field_0.loop_count; + if (loop_count > 0) { int32_t motion_id = rob_chr->data.field_1588.field_0.field_64; if (motion_id != -1) { - if (rob_chr->data.motion.field_2C >= v3) { + if (rob_chr->data.motion.loop_index >= loop_count) { int32_t v6 = mothead_storage_get_mot_by_motion_id(motion_id, mot_db)->field_0.field_0; if (!(v6 & 0x80000) && !(v6 & 0x100000)) rob_chr->load_motion(motion_id, !!(rob_chr->data.field_1588.field_0.field_68 & 0x01), @@ -6780,8 +6929,8 @@ static void sub_140505310(rob_chara* rob_chr, bone_database* bone_data, motion_d } rob_chr->data.motion.frame_data.frame = rob_chr->bone_data->get_frame(); - v1->field_330.field_0.field_0 = v1->field_330.field_0.field_8; - rob_chr->data.motion.field_2C++; + v1->field_330.field_0.current = v1->field_330.field_0.data; + rob_chr->data.motion.loop_index++; return; } break; case 2: @@ -6855,6 +7004,10 @@ LABEL_23: static void mothead_apply(struc_223* a1, rob_chara* rob_chr, float_t frame, motion_database* mot_db) { a1->field_330.field_338 = 0; + struc_377& v4 = a1->field_330.field_0; + if (!v4.current) + return; + mothead_func_data v7; v7.rob_chr = rob_chr; v7.rob_chr_data = &rob_chr->data; @@ -6862,43 +7015,58 @@ static void mothead_apply(struc_223* a1, rob_chara* rob_chr, float_t frame, moti v7.field_10 = (rob_chara_data*)((size_t)rob_chr->field_20 + 0x440); else v7.field_10 = 0; - - struc_377* v4 = &a1->field_330.field_0; v7.field_18 = rob_chr; v7.field_28 = &rob_chr->data.field_1588; v7.field_20 = &rob_chr->data; - if (!v4->field_0) - return; + v7.is_x = v4.is_x; // X int32_t frame_int = (int32_t)frame; - while (v4->field_0->frame <= frame_int && v4->field_0->type >= MOTHEAD_DATA_TYPE_0) { - if (v4->field_0->type >= MOTHEAD_DATA_MAX) { - v4->field_0++; + while (v4.current->frame <= frame_int && v4.current->type >= MOTHEAD_DATA_TYPE_0) { + if (v4.current->type >= MOTHEAD_DATA_MAX) { + v4.current++; continue; } - mothead_data_type v4a = v4->field_0->type; - mothead_func func = mothead_func_array[v4a].func; + mothead_data_type type = v4.current->type; + mothead_func func = mothead_func_array[type].func; if (func) { - if (!(mothead_func_array[v4a].flags & 0x01) || frame_int <= 0) - func(&v7, v4->field_0->data, v4->field_0, frame_int, mot_db); + if (!(mothead_func_array[type].flags & 0x01) || frame_int <= 0) + func(&v7, v4.current->data, v4.current, frame_int, mot_db); else { - frame_int -= v4->field_0->frame; + frame_int -= v4.current->frame; if (frame_int <= 1) - func(&v7, v4->field_0->data, v4->field_0, frame_int, mot_db); + func(&v7, v4.current->data, v4.current, frame_int, mot_db); } } - v4->field_0++; + v4.current++; } } static void sub_1405044B0(rob_chara* rob_chr) { + if (rob_chr->data.field_1588.field_330.arm_adjust_duration > 0) { // X + float_t blend = 1.0f; + if (fabsf(rob_chr->data.field_1588.field_330.arm_adjust_duration) > 0.000001f) + blend = (rob_chr->data.motion.frame_data.frame + - (float_t)rob_chr->data.field_1588.field_330.arm_adjust_start_frame) + / rob_chr->data.field_1588.field_330.arm_adjust_duration; + + blend = blend > 0.0f ? min_def(blend, 1.0f) : 0.0f; + if (fabsf(blend - 1.0f) <= 0.000001f ) + rob_chr->data.field_1588.field_330.arm_adjust_duration = -1.0f; + rob_chr->data.arm_adjust_scale = lerp_def(rob_chr->data.field_1588.field_330.arm_adjust_prev_value, + rob_chr->data.field_1588.field_330.arm_adjust_next_value, blend); + + float_t default_scale = chara_size_table_get_value(1); + rob_chr->data.adjust_data.item_scale = default_scale + + (rob_chr->data.adjust_data.scale - default_scale) * rob_chr->data.arm_adjust_scale; + } + float_t v2 = rob_chr->bone_data->ik_scale.ratio0; float_t v4 = v2; if (!rob_chr->data.field_1588.field_330.field_31C) { rob_chr->data.motion.field_138 = v2; rob_chr->data.motion.field_13C = v2; - rob_chr->data.motion.field_140 = vec3_null; + rob_chr->data.motion.field_140 = 0.0f; return; } @@ -6977,7 +7145,7 @@ static void sub_1405044B0(rob_chara* rob_chr) { } static void sub_1405070E0(rob_chara* rob_chr, bone_database* bone_data, motion_database* mot_db) { - if (sub_140419E90(rob_chr->bone_data) || sub_14041A0D0(rob_chr->bone_data)) + if (sub_140419E90(rob_chr->bone_data) || rob_chr->bone_data->get_motion_has_looped()) sub_140505310(rob_chr, bone_data, mot_db); sub_140505980(rob_chr); mothead_apply(&rob_chr->data.field_1588, rob_chr, rob_chr->data.motion.frame_data.frame, mot_db); @@ -7064,25 +7232,26 @@ static bool sub_14053F1B0(RobPartialMotion* a1) { return false; } -static void rob_chara_set_face_motion_id(rob_chara* rob_chr, int32_t motion_id, float_t frame, - int32_t state, float_t duration, float_t a6, float_t step, int32_t a8, float_t offset, motion_database* mot_db) { - RobFaceMotion v12; - v12.data.duration = duration; - v12.data.offset = offset; +static void rob_chara_set_face_motion_id(rob_chara* rob_chr, int32_t motion_id, + float_t frame, int32_t state, float_t blend_duration, float_t a6, + float_t step, int32_t a8, float_t blend_offset, motion_database* mot_db) { + RobFaceMotion motion; + motion.data.blend_duration = blend_duration; + motion.data.blend_offset = blend_offset; if (motion_id != -1) { - v12.data.motion_id = motion_id; - v12.data.state = state; - v12.data.frame = frame; - v12.data.play_frame_step = step; - v12.data.frame_count = motion_storage_get_mot_data_frame_count(motion_id, mot_db); - v12.data.field_24 = a6; - if (sub_14053F290(&v12)) { - v12.data.frame_data = &rob_chr->data.motion.frame_data; - v12.data.step_data = &rob_chr->data.motion.step_data; + motion.data.motion_id = motion_id; + motion.data.state = state; + motion.data.frame = frame; + motion.data.play_frame_step = step; + motion.data.frame_count = motion_storage_get_mot_data_frame_count(motion_id, mot_db); + motion.data.field_24 = a6; + if (sub_14053F290(&motion)) { + motion.data.frame_data = &rob_chr->data.motion.frame_data; + motion.data.step_data = &rob_chr->data.motion.step_data; } - v12.data.field_38 = a8; + motion.data.field_38 = a8; } - rob_chara_set_face_motion(rob_chr, &v12, 0, mot_db); + rob_chara_set_face_motion(rob_chr, &motion, 0, mot_db); } static void sub_1405509D0(rob_chara* rob_chr, motion_database* mot_db) { @@ -7093,25 +7262,26 @@ static void sub_1405509D0(rob_chara* rob_chr, motion_database* mot_db) { static void rob_chara_set_hand_l_motion(rob_chara* rob_chr, RobHandMotion* motion, int32_t type, motion_database* mot_db); -static void sub_140553E30(rob_chara* rob_chr, int32_t motion_id, float_t frame, - int32_t state, float_t duration, float_t a6, float_t step, int32_t a8, float_t offset, motion_database* mot_db) { - RobHandMotion v12; - v12.data.duration = duration; - v12.data.offset = offset; +static void sub_140553E30(rob_chara* rob_chr, int32_t motion_id, + float_t frame, int32_t state, float_t blend_duration, float_t a6, + float_t step, int32_t a8, float_t blend_offset, motion_database* mot_db) { + RobHandMotion motion; + motion.data.blend_duration = blend_duration; + motion.data.blend_offset = blend_offset; if (motion_id != -1) { - v12.data.motion_id = motion_id; - v12.data.state = state; - v12.data.frame = frame; - v12.data.play_frame_step = step; - v12.data.frame_count = motion_storage_get_mot_data_frame_count(motion_id, mot_db); - v12.data.field_24 = a6; - if (sub_14053F290(&v12)) { - v12.data.frame_data = &rob_chr->data.motion.frame_data; - v12.data.step_data = &rob_chr->data.motion.step_data; + motion.data.motion_id = motion_id; + motion.data.state = state; + motion.data.frame = frame; + motion.data.play_frame_step = step; + motion.data.frame_count = motion_storage_get_mot_data_frame_count(motion_id, mot_db); + motion.data.field_24 = a6; + if (sub_14053F290(&motion)) { + motion.data.frame_data = &rob_chr->data.motion.frame_data; + motion.data.step_data = &rob_chr->data.motion.step_data; } - v12.data.field_38 = a8; + motion.data.field_38 = a8; } - rob_chara_set_hand_l_motion(rob_chr, &v12, 0, mot_db); + rob_chara_set_hand_l_motion(rob_chr, &motion, 0, mot_db); } static void sub_140550A40(rob_chara* rob_chr, motion_database* mot_db) { @@ -7122,25 +7292,26 @@ static void sub_140550A40(rob_chara* rob_chr, motion_database* mot_db) { static void rob_chara_set_hand_r_motion(rob_chara* rob_chr, RobHandMotion* motion, int32_t type, motion_database* mot_db); -static void sub_140554370(rob_chara* rob_chr, int32_t motion_id, float_t frame, - int32_t state, float_t duration, float_t a6, float_t step, int32_t a8, float_t offset, motion_database* mot_db) { - RobHandMotion v12; - v12.data.duration = duration; - v12.data.offset = offset; +static void sub_140554370(rob_chara* rob_chr, int32_t motion_id, + float_t frame, int32_t state, float_t blend_duration, float_t a6, + float_t step, int32_t a8, float_t blend_offset, motion_database* mot_db) { + RobHandMotion motion; + motion.data.blend_duration = blend_duration; + motion.data.blend_offset = blend_offset; if (motion_id != -1) { - v12.data.motion_id = motion_id; - v12.data.state = state; - v12.data.frame = frame; - v12.data.play_frame_step = step; - v12.data.frame_count = motion_storage_get_mot_data_frame_count(motion_id, mot_db); - v12.data.field_24 = a6; - if (sub_14053F290(&v12)) { - v12.data.frame_data = &rob_chr->data.motion.frame_data; - v12.data.step_data = &rob_chr->data.motion.step_data; + motion.data.motion_id = motion_id; + motion.data.state = state; + motion.data.frame = frame; + motion.data.play_frame_step = step; + motion.data.frame_count = motion_storage_get_mot_data_frame_count(motion_id, mot_db); + motion.data.field_24 = a6; + if (sub_14053F290(&motion)) { + motion.data.frame_data = &rob_chr->data.motion.frame_data; + motion.data.step_data = &rob_chr->data.motion.step_data; } - v12.data.field_38 = a8; + motion.data.field_38 = a8; } - rob_chara_set_hand_r_motion(rob_chr, &v12, 0, mot_db); + rob_chara_set_hand_r_motion(rob_chr, &motion, 0, mot_db); } static void sub_140550AB0(rob_chara* rob_chr, motion_database* mot_db) { @@ -7151,25 +7322,26 @@ static void sub_140550AB0(rob_chara* rob_chr, motion_database* mot_db) { static void rob_chara_set_mouth_motion(rob_chara* rob_chr, RobMouthMotion* motion, int32_t type, motion_database* mot_db); -static void sub_140554C40(rob_chara* rob_chr, int32_t motion_id, float_t frame, - int32_t state, float_t duration, float_t a6, float_t step, int32_t a8, float_t offset, motion_database* mot_db) { - RobMouthMotion v12; - v12.data.duration = duration; - v12.data.offset = offset; +static void sub_140554C40(rob_chara* rob_chr, int32_t motion_id, + float_t frame, int32_t state, float_t blend_duration, float_t a6, + float_t step, int32_t a8, float_t blend_offset, motion_database* mot_db) { + RobMouthMotion motion; + motion.data.blend_duration = blend_duration; + motion.data.blend_offset = blend_offset; if (motion_id != -1) { - v12.data.motion_id = motion_id; - v12.data.state = state; - v12.data.frame = frame; - v12.data.play_frame_step = step; - v12.data.frame_count = motion_storage_get_mot_data_frame_count(motion_id, mot_db); - v12.data.field_24 = a6; - if (sub_14053F290(&v12)) { - v12.data.frame_data = &rob_chr->data.motion.frame_data; - v12.data.step_data = &rob_chr->data.motion.step_data; + motion.data.motion_id = motion_id; + motion.data.state = state; + motion.data.frame = frame; + motion.data.play_frame_step = step; + motion.data.frame_count = motion_storage_get_mot_data_frame_count(motion_id, mot_db); + motion.data.field_24 = a6; + if (sub_14053F290(&motion)) { + motion.data.frame_data = &rob_chr->data.motion.frame_data; + motion.data.step_data = &rob_chr->data.motion.step_data; } - v12.data.field_38 = a8; + motion.data.field_38 = a8; } - rob_chara_set_mouth_motion(rob_chr, &v12, 0, mot_db); + rob_chara_set_mouth_motion(rob_chr, &motion, 0, mot_db); } static void sub_140550B20(rob_chara* rob_chr, motion_database* mot_db) { @@ -7180,54 +7352,56 @@ static void sub_140550B20(rob_chara* rob_chr, motion_database* mot_db) { static void rob_chara_set_eyes_motion(rob_chara* rob_chr, RobEyesMotion* motion, int32_t type, motion_database* mot_db); -static void rob_chara_set_eyes_motion_id(rob_chara* rob_chr, int32_t motion_id, float_t frame, - int32_t state, float_t duration, float_t a6, float_t step, int32_t a8, float_t offset, motion_database* mot_db) { - RobEyesMotion v12; - v12.data.duration = duration; - v12.data.offset = offset; +static void rob_chara_set_eyes_motion_id(rob_chara* rob_chr, int32_t motion_id, + float_t frame, int32_t state, float_t blend_duration, float_t a6, + float_t step, int32_t a8, float_t blend_offset, motion_database* mot_db) { + RobEyesMotion motion; + motion.data.blend_duration = blend_duration; + motion.data.blend_offset = blend_offset; if (motion_id != -1) { - v12.data.motion_id = motion_id; - v12.data.state = state; - v12.data.frame = frame; - v12.data.play_frame_step = step; - v12.data.frame_count = motion_storage_get_mot_data_frame_count(motion_id, mot_db); - v12.data.field_24 = a6; - if (sub_14053F290(&v12)) { - v12.data.frame_data = &rob_chr->data.motion.frame_data; - v12.data.step_data = &rob_chr->data.motion.step_data; + motion.data.motion_id = motion_id; + motion.data.state = state; + motion.data.frame = frame; + motion.data.play_frame_step = step; + motion.data.frame_count = motion_storage_get_mot_data_frame_count(motion_id, mot_db); + motion.data.field_24 = a6; + if (sub_14053F290(&motion)) { + motion.data.frame_data = &rob_chr->data.motion.frame_data; + motion.data.step_data = &rob_chr->data.motion.step_data; } - v12.data.field_38 = a8; + motion.data.field_38 = a8; } - rob_chara_set_eyes_motion(rob_chr, &v12, 0, mot_db); + rob_chara_set_eyes_motion(rob_chr, &motion, 0, mot_db); } static void sub_140550960(rob_chara* rob_chr, motion_database* mot_db) { - if (sub_14053F1B0(&rob_chr->data.motion.field_150.eye)) + if (sub_14053F1B0(&rob_chr->data.motion.field_150.eyes)) rob_chara_set_eyes_motion_id(rob_chr, -1, 0.0f, -1, 6.0f, 0.0f, 1.0f, -1, 0.0f, mot_db); } static void rob_chara_set_eyelid_motion(rob_chara* rob_chr, RobEyelidMotion* motion, int32_t type, motion_database* mot_db); -static void rob_chara_set_eyelid_motion_id(rob_chara* rob_chr, int32_t motion_id, float_t frame, - int32_t state, float_t duration, float_t a6, float_t step, int32_t a8, float_t offset, motion_database* mot_db) { - RobEyelidMotion v12; - v12.data.duration = duration; - v12.data.offset = offset; +static void rob_chara_set_eyelid_motion_id(rob_chara* rob_chr, int32_t motion_id, + float_t frame, int32_t state, float_t blend_duration, float_t a6, + float_t step, int32_t a8, float_t blend_offset, motion_database* mot_db) { + RobEyelidMotion motion; + motion.data.blend_duration = blend_duration; + motion.data.blend_offset = blend_offset; if (motion_id != -1) { - v12.data.motion_id = motion_id; - v12.data.state = state; - v12.data.frame = frame; - v12.data.play_frame_step = step; - v12.data.frame_count = motion_storage_get_mot_data_frame_count(motion_id, mot_db); - v12.data.field_24 = a6; - if (sub_14053F290(&v12)) { - v12.data.frame_data = &rob_chr->data.motion.frame_data; - v12.data.step_data = &rob_chr->data.motion.step_data; + motion.data.motion_id = motion_id; + motion.data.state = state; + motion.data.frame = frame; + motion.data.play_frame_step = step; + motion.data.frame_count = motion_storage_get_mot_data_frame_count(motion_id, mot_db); + motion.data.field_24 = a6; + if (sub_14053F290(&motion)) { + motion.data.frame_data = &rob_chr->data.motion.frame_data; + motion.data.step_data = &rob_chr->data.motion.step_data; } - v12.data.field_38 = a8; + motion.data.field_38 = a8; } - rob_chara_set_eyelid_motion(rob_chr, &v12, 0, mot_db); + rob_chara_set_eyelid_motion(rob_chr, &motion, 0, mot_db); } static void sub_1405508F0(rob_chara* rob_chr, motion_database* mot_db) { @@ -7236,7 +7410,7 @@ static void sub_1405508F0(rob_chara* rob_chr, motion_database* mot_db) { } static bool sub_1404190E0(rob_chara_bone_data* rob_bone_data) { - return rob_bone_data->eyelid.blend.field_8 || rob_bone_data->eyelid.blend.rot_y; + return rob_bone_data->eyelid.blend.enable || rob_bone_data->eyelid.blend.rot_y; } static void sub_140555F70(rob_chara* rob_chr, motion_database* mot_db) { @@ -7286,13 +7460,13 @@ static void sub_14041CA10(rob_chara_bone_data* rob_bone_data, vec3* a2) { } static void sub_140415400(mot_play_data* a1) { - if (a1->frame_data.field_18 != 3) + if (a1->frame_data.playback_state != MOT_PLAY_FRAME_DATA_PLAYBACK_EXTERNAL) return; - if (a1->field_40) - a1->frame_data.frame = *a1->field_40; - if (a1->field_48) - a1->frame_data.step = *a1->field_48; + if (a1->ext_frame) + a1->frame_data.frame = *a1->ext_frame; + if (a1->ext_step) + a1->frame_data.step = *a1->ext_step; } static void sub_14041DA00(rob_chara_bone_data* rob_bone_data) { @@ -7380,7 +7554,7 @@ static void sub_140504F00(rob_chara* rob_chr) { && !(rob_chr->data.field_1588.field_0.field_20.field_8 & 0x10000000)) return; - vec3 v9 = vec3_null; + vec3 v9 = 0.0f; sub_140419800(rob_chr->bone_data, &v9); float_t v3 = sub_1405503B0(rob_chr) * rob_chr->data.motion.step_data.frame; float_t v4 = sub_1405501F0(rob_chr) * rob_chr->data.motion.step_data.frame; @@ -7455,9 +7629,9 @@ static void sub_140504710(rob_chara* rob_chr, motion_database* mot_db, rob_chara_bone_data_set_mouth_frame(rob_chr->bone_data, v5->data.frame); rob_chara_bone_data_set_mouth_play_frame_step(rob_chr->bone_data, v5->data.play_frame_step); - RobEyesMotion* v6 = &rob_chr->data.motion.field_150.eye; + RobEyesMotion* v6 = &rob_chr->data.motion.field_150.eyes; if (rob_chr->data.motion.field_29 & 0x40) - v6 = &rob_chr->data.motion.field_3B0.eye; + v6 = &rob_chr->data.motion.field_3B0.eyes; sub_14053F2C0(v6); rob_chara_bone_data_set_eyes_frame(rob_chr->bone_data, v6->data.frame); rob_chara_bone_data_set_eyes_play_frame_step(rob_chr->bone_data, v6->data.play_frame_step); @@ -7500,7 +7674,7 @@ static void sub_140504710(rob_chara* rob_chr, motion_database* mot_db, static void sub_140504AC0(rob_chara* rob_chr) { vec3 v4 = rob_chr->data.miku_rot.field_30; - vec3 v20 = vec3_null; + vec3 v20 = 0.0f; if (rob_chr->data.field_0 & 0x02) { vec3_add(v4, rob_chr->data.miku_rot.field_3C, v20); vec3_add(v20, rob_chr->data.field_8.field_B8.field_10, v20); @@ -7534,7 +7708,7 @@ static void sub_140504AC0(rob_chara* rob_chr) { } if (rob_chr->data.field_1588.field_330.field_18 == 3) { - v20 = vec3_null; + v20 = 0.0f; if (rob_chr->data.field_1588.field_330.field_1C >= rob_chr->data.motion.frame_data.frame) v20.y = rob_chr->data.field_1588.field_330.field_20.y; else @@ -7569,7 +7743,7 @@ static void sub_140504AC0(rob_chara* rob_chr) { } rob_chr->data.miku_rot.field_30 = v4; - rob_chr->data.miku_rot.field_3C = vec3_null; + rob_chr->data.miku_rot.field_3C = 0.0f; vec3_add(v20, rob_chr->data.miku_rot.position, rob_chr->data.miku_rot.position); } @@ -7637,18 +7811,6 @@ static void rob_disp_rob_chara_ctrl(rob_chara* rob_chr) { sub_140349C30(v3);*/ } -static MotionBlendType motion_blend_mot_get_type(motion_blend_mot* a1) { - MotionBlend* v1 = a1->blend; - MotionBlendType v2 = MOTION_BLEND; - if (v1 == &a1->cross) - return MOTION_BLEND_CROSS; - if (v1 == &a1->freeze) - return MOTION_BLEND_FREEZE; - if (v1 == &a1->combine) - v2 = MOTION_BLEND_COMBINE; - return v2; -} - static bool sub_140413810(motion_blend_mot* a1) { if (a1->blend && a1->blend->Field_30()) return a1->blend->rot_y; @@ -7665,7 +7827,7 @@ static void rob_disp_rob_chara_ctrl_thread_main(rob_chara* rob_chr) { rob_chara_item_equip_set_opd_blend_data(rob_chr->item_equip, &rob_chr->bone_data->motion_loaded); - vec3 trans = vec3_null; + vec3 trans = 0.0f; rob_chara_get_trans_scale(rob_chr, 0, &trans); rob_chr->item_equip->position = trans; rob_chara_item_equip_ctrl(rob_chr->item_equip); @@ -7678,7 +7840,7 @@ static void rob_disp_rob_chara_ctrl_thread_main(rob_chara* rob_chr) { } static void rob_disp_rob_chara_disp(rob_chara* rob_chr) { - rob_chr->item_equip->texture_color_coeff = vec4_identity; + rob_chr->item_equip->texture_color_coeff = 1.0f; rob_chr->item_equip->mat = rob_chr->data.adjust_data.mat; rob_chara_item_equip_disp(rob_chr->item_equip, rob_chr->chara_id, rctx_ptr); } @@ -7729,8 +7891,8 @@ static void sub_140409B70(struc_258* a1, vec3* a2, mat4* a3, bool a4) { a1->field_198 = 1.0f; } - mat4 mat = *a3; - mat4_inverse(&mat, &mat); + mat4 mat; + mat4_inverse(a3, &mat); vec3 v24; mat4_mult_vec3_trans(&mat, a2, &v24); @@ -8336,6 +8498,9 @@ static void rob_chara_set_hand_adjust(rob_chara* rob_chr, case ROB_CHARA_DATA_HAND_ADJUST_4P: adjust->scale = rob_chara_array_get_data_adjust_scale(3); break; + case ROB_CHARA_DATA_HAND_ADJUST_ITEM: // X + adjust->scale = rob_chr->data.adjust_data.item_scale; + break; } if (adjust->scale_select == 1 && adjust->enable_scale && chara_opposite_chara_same) { @@ -8362,7 +8527,8 @@ static void rob_chara_set_hand_adjust(rob_chara* rob_chr, if (fabsf(prev_scale - scale * adjust->scale_blend) <= 0.000001f || adjust->duration <= adjust->current_time || fabsf(adjust->duration - adjust->current_time) <= 0.000001f) { adjust->current_scale = lerp_def(prev_scale, scale, adjust->scale_blend); - if (fabsf(adjust->current_scale - chara_scale) <= 0.000001f) { + if (fabsf(adjust->current_scale - chara_scale) <= 0.000001f + && adjust->type != ROB_CHARA_DATA_HAND_ADJUST_ITEM) { adjust->current_scale = chara_scale; adjust->enable = false; } @@ -8464,8 +8630,10 @@ static bool sub_14053ACA0(rob_chara* rob_chr, int32_t hand) { float_t adjust_scale = rob_chr->data.motion.hand_adjust[hand].current_scale; rob_chara_adjust_data adjust_data = rob_chr->data.adjust_data; - adjust_data.scale = adjust_scale / chara_scale; - rob_chara_set_data_adjust_mat(rob_chr, &adjust_data, 0); + float_t scale = adjust_scale / chara_scale; + adjust_data.scale = scale; + adjust_data.item_scale = scale; // X + rob_chara_set_data_adjust_mat(rob_chr, &adjust_data, false); int32_t v15 = 0; bool solve_ik = true; @@ -8478,9 +8646,9 @@ static bool sub_14053ACA0(rob_chara* rob_chr, int32_t hand) { solve_ik = false; } - mat4 v40 = *rob_chara_bone_data_get_mats_mat(rob_chr->bone_data, rob_kl_te_bones[hand]); - mat4 v42 = adjust_data.mat; - mat4_mult(&v40, &v42, &v42); + mat4* v40 = rob_chara_bone_data_get_mats_mat(rob_chr->bone_data, rob_kl_te_bones[hand]); + mat4 v42; + mat4_mult(v40, &adjust_data.mat, &v42); vec3 v37; vec3_mult_scalar(rob_chr->data.motion.hand_adjust[hand].offset, 1.0f - chara_scale / adjust_scale, v37); @@ -8488,18 +8656,18 @@ static bool sub_14053ACA0(rob_chara* rob_chr, int32_t hand) { vec3 v38; mat4_mult_vec3_trans(&v42, &v37, &v38); - vec3 v27 = vec3_null; + vec3 v27 = 0.0f; if (rob_chr->data.motion.hand_adjust[hand].disable_x) - v27.x = v40.row3.x - v38.x; + v27.x = v40->row3.x - v38.x; if (rob_chr->data.motion.hand_adjust[hand].disable_y) - v27.y = v40.row3.y - v38.y; + v27.y = v40->row3.y - v38.y; if (rob_chr->data.motion.hand_adjust[hand].disable_z) - v27.z = v40.row3.z - v38.z; + v27.z = v40->row3.z - v38.z; vec3 v39; vec3_add(v38, v27, v39); - vec3 v18 = vec3_null; + vec3 v18 = 0.0f; if (v15 > 0) { mat4_mult_vec3_trans(&v42, &rob_chr->data.motion.hand_adjust[hand].offset, &v38); vec3_add(v38, v27, v18); @@ -8509,12 +8677,12 @@ static bool sub_14053ACA0(rob_chara* rob_chr, int32_t hand) { rob_chr->data.motion.hand_adjust[hand].arm_length, solve_ik); while (v15 > 0) { - mat4 v40 = *rob_chara_bone_data_get_mats_mat(rob_chr->bone_data, rob_kl_te_bones[hand]); - mat4_set_translation(&v40, &v18); + mat4* v40 = rob_chara_bone_data_get_mats_mat(rob_chr->bone_data, rob_kl_te_bones[hand]); + mat4_set_translation(v40, &v18); vec3 v37; vec3_negate(rob_chr->data.motion.hand_adjust[hand].offset, v37); - mat4_mult_vec3_trans(&v40, &v37, &v39); + mat4_mult_vec3_trans(v40, &v37, &v39); if (!--v15) { rotation_blend = 1.0f; solve_ik = true; @@ -8626,10 +8794,8 @@ static bool sub_14053B580(rob_chara* rob_chr, int32_t a2) { mat4* v23 = rob_chara_bone_data_get_mats_mat( (rob_chara_bone_data*)((size_t)rob_chr->field_20 + 0x28), dword_140A2DDD0[v0.field_C]); - vec3& v24 = v0.field_10; - mat4 v49; - mat4_translate_mult(v23, v24.x, v24.y, v24.z, &v49); + mat4_translate_mult(v23, &v0.field_10, &v49); mat4_get_translation(&v49, &v45); } break; @@ -8650,7 +8816,7 @@ static bool sub_14053B580(rob_chara* rob_chr, int32_t a2) { } int32_t v33 = v0.field_0; - vec3 v48 = vec3_null; + vec3 v48 = 0.0f; if (v33 == 0) { vec3_lerp_scalar(v45, v13, v48, v31); } @@ -8851,9 +9017,9 @@ static void sub_1403FA040(vec3* a1, float_t a2, mat4* a3, float_t ymin, } { - vec3 v51 = vec3_null; + vec3 v51 = 0.0f; if (!sub_14040AC40(&v16, &v53, v23, &v51) && !sub_14040AC40(&v16, &v52, v23, &v51)) { - v16 = vec3_null; + v16 = 0.0f; goto LABEL_66; } @@ -8926,8 +9092,8 @@ static void sub_1403FA770(rob_chara_bone_data_sleeve_adjust* a1) { vec3_length(a1->field_5C, v21); float_t v25 = (0.97f * v21 - v21) * a1->step + v21; if (v21 <= 0.001f || v25 <= 0.0f) { - a1->field_5C = vec3_null; - v45 = vec3_null; + a1->field_5C = 0.0f; + v45 = 0.0f; } else { vec3_mult_scalar(a1->field_5C, v25 / v21, a1->field_5C); @@ -8943,8 +9109,8 @@ static void sub_1403FA770(rob_chara_bone_data_sleeve_adjust* a1) { vec3_length(a1->field_68, v22); float_t v31 = (0.97f * v22 - v22) * a1->step + v22; if (v22 <= 0.001f || v31 <= 0.0f) { - a1->field_68 = vec3_null; - v44 = vec3_null; + a1->field_68 = 0.0f; + v44 = 0.0f; } else { vec3_mult_scalar(a1->field_68, v31 / v22, a1->field_68); @@ -9041,7 +9207,7 @@ static void sub_1403F9B20(rob_chara_bone_data_sleeve_adjust* a1, motion_bone_ind vec3_length(*v6, v31); float_t v32 = (0.97f * v31 - v31) * a1->step + v31; if (v31 <= 0.001f || v32 <= 0.0f) { - *v6 = vec3_null; + *v6 = 0.0f; return; } vec3_mult_scalar(*v6, v32 / v31, *v6); @@ -9086,7 +9252,7 @@ static bool sub_14053B530(rob_chara* rob_chr) { } static float_t sub_140406E90(bone_data* a1, bone_data* a2, float_t a3, vec3* a4) { - vec3 v18 = vec3_null; + vec3 v18 = 0.0f; mat4_mult_vec3_trans(a1->node[3].mat, &v18, &v18); *a4 = v18; @@ -9199,7 +9365,7 @@ static void sub_14053B260(rob_chara* rob_chr) { sub_140418810(rob_chr->bone_data, dword_140A2DDB0, dword_140A2DD90); } -static void rob_chara_bone_data_left_hand_scale(rob_chara_bone_data* rob_bone_data, float_t scale) { +static void rob_chara_bone_data_set_left_hand_scale(rob_chara_bone_data* rob_bone_data, float_t scale) { mat4* kl_te_wj_mat = rob_chara_bone_data_get_mats_mat(rob_bone_data, ROB_BONE_KL_TE_L_WJ); if (!kl_te_wj_mat) return; @@ -9229,7 +9395,7 @@ static void rob_chara_bone_data_left_hand_scale(rob_chara_bone_data* rob_bone_da } } -static void rob_chara_bone_data_right_hand_scale(rob_chara_bone_data* rob_bone_data, float_t scale) { +static void rob_chara_bone_data_set_right_hand_scale(rob_chara_bone_data* rob_bone_data, float_t scale) { mat4* kl_te_wj_mat = rob_chara_bone_data_get_mats_mat(rob_bone_data, ROB_BONE_KL_TE_R_WJ); if (!kl_te_wj_mat) return; @@ -9285,16 +9451,10 @@ static void rob_motion_modifier_rob_chara_ctrl(rob_chara* rob_chr) { } if (left_hand_scale > 0.0f) - rob_chara_bone_data_left_hand_scale(rob_chr->bone_data, left_hand_scale); + rob_chara_bone_data_set_left_hand_scale(rob_chr->bone_data, left_hand_scale); if (right_hand_scale > 0.0f) - rob_chara_bone_data_right_hand_scale(rob_chr->bone_data, right_hand_scale); -} - -static float_t rob_chara_array_get_data_adjust_scale(int32_t chara_id) { - if (rob_chara_pv_data_array_check_chara_id(chara_id)) - return rob_chara_array[chara_id].data.adjust_data.scale; - return 1.0f; + rob_chara_bone_data_set_right_hand_scale(rob_chr->bone_data, right_hand_scale); } static void rob_chara_bone_data_calculate_bones(rob_chara_bone_data* rob_bone_data, @@ -9358,7 +9518,7 @@ static void rob_chara_bone_data_get_ik_scale( float_t ratio0 = rob_bone_data->ik_scale.ratio0; v2->field_4F8.field_C0 = ratio0; v2->field_4F8.field_C4 = ratio0; - v2->field_4F8.field_C8 = vec3_null; + v2->field_4F8.field_C8 = 0.0f; } static mat4* rob_chara_bone_data_get_mat(rob_chara_bone_data* rob_bone_data, size_t index) { @@ -9928,7 +10088,7 @@ static void sub_1404198D0(struc_258* a1) { a1->field_48.field_14 = 0.0f; a1->field_48.field_18 = 0.0f; a1->field_48.field_1C = 0.0f; - a1->field_48.field_20 = vec3_null; + a1->field_48.field_20 = 0.0f; a1->field_48.field_2C = 1.0f; a1->field_48.field_30 = 1.0f; a1->field_48.field_34 = -3.8f; @@ -9949,8 +10109,8 @@ static void sub_1404198D0(struc_258* a1) { a1->field_A8 = 0.0f; a1->field_AC = 0.0f; a1->field_B0 = 0.0f; - a1->field_B4 = vec3_null; - a1->field_C0 = vec3_null; + a1->field_B4 = 0.0f; + a1->field_C0 = 0.0f; a1->field_CC = mat4_identity; a1->field_10C = mat4_identity; a1->field_14C = 0; @@ -9967,7 +10127,7 @@ static void sub_1404198D0(struc_258* a1) { a1->field_15C.field_1C = 0; a1->field_15C.field_20 = 0.0f; a1->field_15C.field_24 = 0.0f; - a1->field_184 = vec3_null; + a1->field_184 = 0.0f; a1->field_190 = false; a1->field_191 = false; a1->field_192 = false; @@ -9983,14 +10143,14 @@ static void sub_1404198D0(struc_258* a1) { a1->field_1B0 = 0.0f; a1->field_1B4 = 0; a1->field_1B8 = 0; - a1->field_1BC = vec2_identity; + a1->field_1BC = 1.0f; a1->field_1C4 = 0; a1->field_1C8 = 0; } -static void rob_chara_bone_data_set_eyelid_anim_duration(rob_chara_bone_data* rob_bone_data, +static void rob_chara_bone_data_set_eyelid_anim_blend_duration(rob_chara_bone_data* rob_bone_data, float_t duration, float_t step, float_t offset) { - mot_blend_set_duration(&rob_bone_data->eyelid, duration, step, offset); + mot_blend_set_blend_duration(&rob_bone_data->eyelid, duration, step, offset); } static void rob_chara_bone_data_set_eyelid_frame(rob_chara_bone_data* rob_bone_data, float_t frame) { @@ -10003,9 +10163,9 @@ static void rob_chara_bone_data_set_eyelid_play_frame_step(rob_chara_bone_data* frame_data->step = step; } -static void rob_chara_bone_data_set_eyes_anim_duration(rob_chara_bone_data* rob_bone_data, +static void rob_chara_bone_data_set_eyes_anim_blend_duration(rob_chara_bone_data* rob_bone_data, float_t duration, float_t step, float_t offset) { - mot_blend_set_duration(&rob_bone_data->eyes, duration, step, offset); + mot_blend_set_blend_duration(&rob_bone_data->eyes, duration, step, offset); } static void rob_chara_bone_data_set_eyes_frame(rob_chara_bone_data* rob_bone_data, float_t frame) { @@ -10018,9 +10178,9 @@ static void rob_chara_bone_data_set_eyes_play_frame_step(rob_chara_bone_data* ro frame_data->step = step; } -static void rob_chara_bone_data_set_face_anim_duration(rob_chara_bone_data* rob_bone_data, +static void rob_chara_bone_data_set_face_anim_blend_duration(rob_chara_bone_data* rob_bone_data, float_t duration, float_t step, float_t offset) { - mot_blend_set_duration(&rob_bone_data->face, duration, step, offset); + mot_blend_set_blend_duration(&rob_bone_data->face, duration, step, offset); } static void rob_chara_bone_data_set_face_frame(rob_chara_bone_data* rob_bone_data, float_t frame) { @@ -10033,9 +10193,9 @@ static void rob_chara_bone_data_set_face_play_frame_step(rob_chara_bone_data* ro frame_data->step = step; } -static void rob_chara_bone_data_set_hand_l_anim_duration(rob_chara_bone_data* rob_bone_data, +static void rob_chara_bone_data_set_hand_l_anim_blend_duration(rob_chara_bone_data* rob_bone_data, float_t duration, float_t step, float_t offset) { - mot_blend_set_duration(&rob_bone_data->hand_l, duration, step, offset); + mot_blend_set_blend_duration(&rob_bone_data->hand_l, duration, step, offset); } static void rob_chara_bone_data_set_hand_l_frame(rob_chara_bone_data* rob_bone_data, float_t frame) { @@ -10048,9 +10208,9 @@ static void rob_chara_bone_data_set_hand_l_play_frame_step(rob_chara_bone_data* frame_data->step = step; } -static void rob_chara_bone_data_set_hand_r_anim_duration(rob_chara_bone_data* rob_bone_data, +static void rob_chara_bone_data_set_hand_r_anim_blend_duration(rob_chara_bone_data* rob_bone_data, float_t duration, float_t step, float_t offset) { - mot_blend_set_duration(&rob_bone_data->hand_r, duration, step, offset); + mot_blend_set_blend_duration(&rob_bone_data->hand_r, duration, step, offset); } static void rob_chara_bone_data_set_hand_r_frame(rob_chara_bone_data* rob_bone_data, float_t frame) { @@ -10152,9 +10312,9 @@ static void rob_chara_bone_data_set_motion_duration(rob_chara_bone_data* rob_bon motion_blend_mot_set_duration(rob_bone_data->motion_loaded.front(), duration, step, offset); } -static void rob_chara_bone_data_set_mouth_anim_duration(rob_chara_bone_data* rob_bone_data, +static void rob_chara_bone_data_set_mouth_anim_blend_duration(rob_chara_bone_data* rob_bone_data, float_t duration, float_t step, float_t offset) { - mot_blend_set_duration(&rob_bone_data->mouth, duration, step, offset); + mot_blend_set_blend_duration(&rob_bone_data->mouth, duration, step, offset); } static void rob_chara_bone_data_set_mouth_frame(rob_chara_bone_data* rob_bone_data, float_t frame) { @@ -10201,7 +10361,7 @@ static void sub_14040FBF0(motion_blend_mot* a1, float_t a2) { bone_data* b_kg_hara_y = &a1->bone_data.bones.data()[MOTION_BONE_KG_HARA_Y]; bone_data* b_kl_hara_xz = &a1->bone_data.bones.data()[MOTION_BONE_KL_HARA_XZ]; bone_data* b_kl_hara_etc = &a1->bone_data.bones.data()[MOTION_BONE_KL_HARA_ETC]; - a1->field_4F8.field_90 = vec3_null; + a1->field_4F8.field_90 = 0.0f; mat4 rot_mat = b_n_hara_cp->rot_mat[0]; mat4 mat = b_kg_hara_y->rot_mat[0]; @@ -10279,10 +10439,9 @@ static void sub_140410CB0(mot_blend* a1, std::vector* a2) { if (!a1->blend.rot_y) return; - for (bone_data& i : *a2) { + for (bone_data& i : *a2) if (sub_140410250(&a1->field_0.field_8, i.motion_bone_index)) a1->blend.Blend(&a2->data()[i.motion_bone_index], 0); - } } static void sub_1404182B0(rob_chara_bone_data* rob_bone_data) { @@ -10312,7 +10471,7 @@ static void sub_1404182B0(rob_chara_bone_data* rob_bone_data) { v5++; if (i != i_end) sub_140410B70(*i, &(*v5)->bone_data.bones); - else if (motion_blend_mot_get_type(*i) == MOTION_BLEND_FREEZE) + else if ((*i)->get_type() == MOTION_BLEND_FREEZE) sub_140410B70(*i, 0); } @@ -10360,7 +10519,7 @@ void sub_140506C20(struc_523* a1) { a1->field_4 = 0; a1->field_8 = 0; a1->field_C = 0; - a1->field_10 = vec3_null; + a1->field_10 = 0.0f; a1->field_1C = 0; a1->field_20 = 0; a1->field_24 = 0; @@ -10451,177 +10610,6 @@ static void sub_140505C90(struc_264* a1) { a1->field_1D4 = 0; } -static void sub_140536DD0(struc_223* a1) { - a1->field_0.field_84 = 0; - a1->field_0.field_88 = 0; - a1->field_0.field_8C = 0; - a1->field_0.field_90 = 0; - a1->field_0.field_94 = 0; - a1->field_0.field_96 = 0; - a1->field_0.field_98 = -1; - a1->field_0.field_9C = 0; - a1->field_0.field_A0 = 0; - a1->field_0.field_A4 = 0; - a1->field_0.field_A8 = 0; - a1->field_0.field_B0[0] = { 0, 1.2f, 1.0f }; - a1->field_0.field_B0[1] = { 0, -1.0f, -1.0f }; - a1->field_0.field_B0[2] = { 0, -1.0f, -1.0f }; - a1->field_0.field_B0[3] = { 0, -1.0f, -1.0f }; - a1->field_0.field_B0[4] = { 0, -1.0f, -1.0f }; - a1->field_0.field_B0[5] = { 0, -1.0f, -1.0f }; - a1->field_0.field_B0[6] = { 0, -1.0f, -1.0f }; - a1->field_0.field_B0[7] = { 0, -1.0f, -1.0f }; - a1->field_0.field_B0[8] = { 0, -1.0f, -1.0f }; - a1->field_0.field_B0[9] = { 0, -1.0f, -1.0f }; - a1->field_0.field_B0[10] = { 0, -1.0f, -1.0f }; - a1->field_0.field_B0[11] = { 0, -1.0f, -1.0f }; - a1->field_0.field_B0[12] = { 0, -1.0f, -1.0f }; - a1->field_0.field_B0[13] = { 0, -1.0f, -1.0f }; - a1->field_0.field_B0[14] = { 0, -1.0f, -1.0f }; - a1->field_0.field_B0[15] = { 0, -1.0f, -1.0f }; - a1->field_0.field_B0[16] = { 0, -1.0f, -1.0f }; - a1->field_0.field_B0[17] = { 0, -1.0f, -1.0f }; - a1->field_0.field_B0[18] = { 0, -1.0f, -1.0f }; - a1->field_0.field_B0[19] = { 0, -1.0f, -1.0f }; - a1->field_0.field_B0[20] = { 0, -1.0f, -1.0f }; - a1->field_0.field_B0[21] = { 0, -1.0f, -1.0f }; - a1->field_0.field_B0[22] = { 0, -1.0f, -1.0f }; - a1->field_0.field_B0[23] = { 0, -1.0f, -1.0f }; - a1->field_0.field_B0[24] = { 0, -1.0f, -1.0f }; - a1->field_0.field_B0[25] = { 0, -1.0f, -1.0f }; - a1->field_0.field_260 = 0; - a1->field_0.field_270 = 0; - a1->field_0.field_2B0 = 0; - a1->field_0.field_2D8 = a1->field_0.field_2D0; - a1->field_0.field_310 = 3; - a1->field_0.field_314 = 0; -} - -static void sub_140537110(struc_223* a1) { - a1->field_0.motion_id = -1; - a1->field_0.frame_count = 0.0f; - a1->field_0.field_8 = 0.0f; - a1->field_0.field_C = 0; - sub_140536DD0(a1); - a1->field_0.field_50 = 0; - a1->field_0.field_52 = 0; - a1->field_0.field_54 = 0; - a1->field_0.field_58 = -1; - a1->field_0.field_5C = -1; - a1->field_0.field_60 = 0; - a1->field_0.field_64 = -1; - a1->field_0.field_68 = 0; - a1->field_0.field_6C = -1; - a1->field_0.field_70 = 0.0f; - a1->field_0.field_74 = -1.0f; - a1->field_0.field_78 = 0.0f; - a1->field_0.field_7C = 0.0f; - a1->field_0.field_80 = 0.0f; - a1->field_0.field_1E8 = 0; - a1->field_0.field_1EC = 0.0f; - a1->field_0.field_1F0 = 0.0f; - a1->field_0.field_1F4 = 0.0f; - a1->field_0.field_1F8 = -1.0f; - a1->field_0.field_1FC = 0.0f; - a1->field_0.field_200 = 1.0f; - a1->field_0.field_204 = -1; - a1->field_0.field_208 = 0; - a1->field_0.field_20C = -1; - a1->field_0.field_210 = 0; - a1->field_0.field_218 = -1.0f; - a1->field_0.field_21C = -1.0f; - a1->field_0.field_220 = 0; - a1->field_0.field_228.clear(); - a1->field_0.field_238 = -1; - a1->field_0.field_23C = 0.0f; - a1->field_0.field_240 = 0; - a1->field_0.field_244 = 0; - a1->field_0.field_248 = 0; - a1->field_0.field_250 = 0; - a1->field_0.field_258 = -1.0f; - a1->field_0.field_25C = 0; - a1->field_0.field_268 = 0; - a1->field_0.field_274 = 0; - a1->field_0.field_278 = 0; - a1->field_0.field_27C = -1; - a1->field_0.field_280 = 0; - a1->field_0.field_284 = 0; - a1->field_0.field_288 = 0; - a1->field_0.field_290 = 0; - a1->field_0.field_294 = 0; - a1->field_0.field_298 = 0; - a1->field_0.field_29C = 0.0f; - a1->field_0.field_2A0 = 0; - a1->field_0.field_2A4 = 0.0f; - a1->field_0.field_2A8 = 0.0f; - a1->field_0.field_2AC = 0.0f; - a1->field_0.field_2B8 = 0; - a1->field_0.field_2BC = 0; - a1->field_0.field_2C0 = -1.0f; - a1->field_0.field_2C4 = -1.0f; - a1->field_0.field_2C8 = 0; - a1->field_0.field_2E8 = -1; - a1->field_0.field_2EC = 0; - a1->field_0.field_2F0 = 0; - a1->field_0.field_2F4 = 0; - a1->field_0.field_2FC = -1; - a1->field_0.field_300 = 100; - a1->field_0.field_304 = 1; - a1->field_0.field_308 = 0; - a1->field_0.field_30C = 1.0f; - a1->field_0.field_318 = vec3_null; - a1->field_0.field_324 = 0.05f; - a1->field_0.field_328 = -1.0f; - a1->field_0.iterations = -1; -} - -static void sub_1405335C0(struc_223* a1) { - a1->field_330.field_0.field_0 = 0; - a1->field_330.field_0.field_8 = 0; - a1->field_330.field_10 = 0; - a1->field_330.field_14 = 0; - a1->field_330.field_18 = 0; - a1->field_330.field_1C = 0.0f; - a1->field_330.field_20 = vec3_null; - - for (struc_226& i : a1->field_330.field_2C) - for (int8_t& j : i.field_0) - j = 0; - - for (struc_225& i : a1->field_330.field_80) - for (float_t& j : i.field_0) - j = 1.0f; - - for (struc_224& i : a1->field_330.field_1C4) - for (float_t& j : i.field_0) - j = 0.0f; - - a1->field_330.field_308 = 0; - a1->field_330.field_310 = -1.0f; - a1->field_330.field_314 = -1.0f; - a1->field_330.field_318 = 0; - a1->field_330.field_31C = 0; - a1->field_330.field_320 = 1.0f; - a1->field_330.field_324 = 1.0f; - a1->field_330.field_32C = 0; - a1->field_330.field_330 = -1.0f; - a1->field_330.field_334 = -1.0f; - a1->field_330.field_338 = 0; - a1->field_330.field_33C[0] = { -1, -1.0f, -1.0f }; - a1->field_330.field_33C[1] = { -1, -1.0f, -1.0f }; - a1->field_330.field_33C[2] = { -1, -1.0f, -1.0f }; - a1->field_330.field_33C[3] = { -1, -1.0f, -1.0f }; -} - -static void sub_140539750(struc_223* a1) { - a1->field_0.field_10 = {}; - a1->field_0.field_20 = {}; - sub_140537110(a1); - sub_1405335C0(a1); - a1->field_7A0 = 0; - a1->motion_set_id = -1; -} - static void sub_140505FB0(struc_209* a1) { a1->field_0 = 0; a1->field_4 = 0; @@ -11086,7 +11074,7 @@ static void sub_14052C560(rob_chara_item_cos_data* item_sub_data, return; const char* chara_name = chara_index_get_chara_name(item_sub_data->chara_index); - char buf[0x100]; + char buf[0x200]; for (int32_t i = 0; i < 9; i++) { sprintf_s(buf, sizeof(buf), "%sITM%03d_ATAM_HEAD_%02d_SP__DIVSKN", chara_name, item_no, i); object_info obj_info = obj_db->get_object_info(buf); @@ -11263,8 +11251,8 @@ static void sub_140522F90(rob_chara_item_cos_data* item_cos_data, rob_chara_item vec3 texture_color_coeff = item->data.col[0].col_tone.blend; vec3 texture_color_offset = item->data.col[0].col_tone.offset; - vec3 texture_specular_coeff = vec3_identity; - vec3 texture_specular_offset = vec3_null; + vec3 texture_specular_coeff = 1.0f; + vec3 texture_specular_offset = 0.0f; if (item->data.col.size() > 1) { texture_specular_coeff = item->data.col[1].col_tone.blend; texture_specular_offset = item->data.col[1].col_tone.offset; @@ -11496,15 +11484,12 @@ static void sub_140512C20(rob_chara_item_equip* rob_itm_equip, render_context* r return; mat4_mult(&mat, node->mat, &mat); - glPushMatrix(); - glMultTransposeMatrixf(&mat.row0.x); int32_t tex_pat_count = (int32_t)rob_itm_equip->texture_pattern.size(); if (tex_pat_count) rctx->object_data.set_texture_pattern(tex_pat_count, rob_itm_equip->texture_pattern.data()); draw_task_add_draw_object_by_object_info(rctx, 0, rob_itm_equip->field_D0, 0, 0, 0, 0, 0, false); if (tex_pat_count) rctx->object_data.set_texture_pattern(); - glPopMatrix(); } static void rob_chara_item_equip_add_motion_reset_data(rob_chara_item_equip* rob_itm_equip, @@ -11733,7 +11718,7 @@ static void rob_chara_item_equip_set_opd_blend_data( v11.blend = 0.0f; if (sub_140413810(i)) { - v11.type = motion_blend_mot_get_type(i); + v11.type = i->get_type(); v11.field_C = true; v11.blend = i->blend->blend; } @@ -11987,6 +11972,12 @@ static bool task_rob_load_check_load_req_data() { return true; } +bool rob_chara_array_check_visibility(int32_t chara_id) { + if (rob_chara_pv_data_array_check_chara_id(chara_id)) + return rob_chara_array[chara_id].get_visibility(); + return false; +} + rob_chara* rob_chara_array_get(int32_t chara_id) { if (chara_id < 0 || chara_id >= ROB_CHARA_COUNT) return 0; @@ -11996,6 +11987,16 @@ rob_chara* rob_chara_array_get(int32_t chara_id) { return 0; } +rob_chara_bone_data* rob_chara_array_get_bone_data(int32_t chara_id) { + return rob_chara_array[chara_id].bone_data; +} + +float_t rob_chara_array_get_data_adjust_scale(int32_t chara_id) { + if (rob_chara_pv_data_array_check_chara_id(chara_id)) + return rob_chara_array[chara_id].data.adjust_data.scale; + return 1.0f; +} + rob_chara_item_equip* rob_chara_array_get_item_equip(int32_t chara_id) { return rob_chara_array[chara_id].item_equip; } @@ -12073,12 +12074,12 @@ inline bool rob_chara_pv_data_array_check_chara_id(int32_t chara_id) { } int32_t rob_chara::get_rob_cmn_mottbl_motion_id(int32_t id) { - if (id >= 214 && id <= 223) - return pv_data.motion_face_ids[id - 214]; - else if (id == 224) + if (id >= 0xD6 && id <= 0xDF) + return pv_data.motion_face_ids[id - 0xD6]; + else if (id == 0xE0) return data.motion.motion_id; - else if (id >= 226 && id <= 235) - return pv_data.motion_face_ids[id - 226]; + else if (id >= 0xE2 && id <= 0xEB) + return pv_data.motion_face_ids[id - 0xE2]; int32_t v2 = data.field_8.field_1A4; if (rob_cmn_mottbl_data @@ -12095,6 +12096,10 @@ int32_t rob_chara::get_rob_cmn_mottbl_motion_id(int32_t id) { return -1; } +bool rob_chara::get_visibility() { + return !!(data.field_0 & 0x01); +} + bool task_rob_manager_append_task() { return app::TaskWork::AppendTask(task_rob_manager, "ROB_MANAGER TASK"); } @@ -12114,25 +12119,24 @@ bool task_rob_manager_free_task() { } bone_node_expression_data::bone_node_expression_data() { - position = vec3_null; - rotation = vec3_null; - scale = vec3_identity; - parent_scale = vec3_identity; + position = 0.0f; + rotation = 0.0f; + scale = 1.0f; + parent_scale = 1.0f; } void bone_node_expression_data::mat_set(vec3& parent_scale, mat4& ex_data_mat, mat4& mat) { - vec3 position; - vec3_mult(this->position, parent_scale, position); - mat4_translate_mult(&ex_data_mat, position.x, position.y, position.z, &ex_data_mat); - mat4_rotate_mult(&ex_data_mat, rotation.x, rotation.y, rotation.z, &ex_data_mat); - vec3_mult(scale, parent_scale, this->parent_scale); + vec3 position = this->position * parent_scale; + mat4_translate_mult(&ex_data_mat, &position, &ex_data_mat); + mat4_rotate_mult(&ex_data_mat, &rotation, &ex_data_mat); + this->parent_scale = scale * parent_scale; mat = ex_data_mat; - mat4_scale_rot(&mat, this->parent_scale.x, this->parent_scale.y, this->parent_scale.z, &mat); + mat4_scale_rot(&mat, &this->parent_scale, &mat); } void bone_node_expression_data::reset_scale() { - scale = vec3_identity; - parent_scale = vec3_identity; + scale = 1.0f; + parent_scale = 1.0f; } void bone_node_expression_data::set_position_rotation( @@ -12144,15 +12148,15 @@ void bone_node_expression_data::set_position_rotation( rotation.x = rotation_x; rotation.z = rotation_z; rotation.y = rotation_y; - scale = vec3_identity; - parent_scale = vec3_identity; + scale = 1.0f; + parent_scale = 1.0f; } void bone_node_expression_data::set_position_rotation(vec3& position, vec3& rotation) { this->position = position; this->rotation = rotation; - scale = vec3_identity; - parent_scale = vec3_identity; + scale = 1.0f; + parent_scale = 1.0f; } bone_node::bone_node() : name(), mat(), parent(), ex_data_mat() { @@ -12222,27 +12226,35 @@ bone_data_parent::~bone_data_parent() { } void mot_play_frame_data::reset() { - frame = 0.0f; + frame = -1.0f; step = 1.0f; step_prev = 1.0f; - frame_count = 0; + frame_count = 0.0f; last_frame = -1.0f; - field_14 = -1.0f; - field_18 = -1; - field_1C = -1; - field_20 = 0; - field_24 = -1.0f; - field_28 = 0; - field_2C = -1; + max_frame = -1.0f; + playback_state = MOT_PLAY_FRAME_DATA_PLAYBACK_NONE; + loop_state = MOT_PLAY_FRAME_DATA_LOOP_NONE; + loop_begin = 0.0f; + loop_end = -1.0f; + looped = false; + loop_count = -1; +} + +void mot_play_frame_data::set_frame(float_t frame) { + this->frame = frame; + looped = false; + if (max_frame >= 0.0f && (playback_state == MOT_PLAY_FRAME_DATA_PLAYBACK_BACKWARD + && frame <= max_frame) || frame >= max_frame) + max_frame = -1.0f; } void mot_play_data::reset() { frame_data.reset(); - field_30 = 0; - field_34 = 0; - field_38 = 0; - field_40 = 0; - field_48 = 0; + loop_index = 0; + loop_frames_enabled = false; + loop_frames = 0.0f; + ext_frame = 0; + ext_step = 0; } struc_308::struc_308() : field_0(), field_4(), field_8(), field_8C(), @@ -12250,7 +12262,7 @@ rot_y(), prev_rot_y(), field_BC(), field_BD(), field_C0(), field_C4() { } -MotionBlend::MotionBlend() : field_8(), rot_y(), duration(), frame(), offset(), blend() { +MotionBlend::MotionBlend() : enable(), rot_y(), duration(), frame(), offset(), blend() { step = 1.0f; } @@ -12259,7 +12271,7 @@ MotionBlend::~MotionBlend() { } void MotionBlend::Reset() { - field_8 = false; + enable = false; rot_y = false; duration = 0.0f; frame = 0.0f; @@ -12277,19 +12289,20 @@ void MotionBlend::SetDuration(float_t duration, float_t step, float_t offset) { this->offset = offset; if (duration < 0.0f) { this->duration = 0.0f; - field_8 = false; + enable = false; } else { this->duration = duration; - field_8 = true; + enable = true; } frame = 0.0f; } -MotionBlendCross::MotionBlendCross() : field_20(), field_21(), -rot_y_mat(mat4_identity), field_64(mat4_identity), -field_A4(mat4_identity), field_E4(mat4_identity) { - +MotionBlendCross::MotionBlendCross() : field_20(), field_21() { + rot_y_mat = mat4_identity; + field_64 = mat4_identity; + field_A4 = mat4_identity; + field_E4 = mat4_identity; } MotionBlendCross::~MotionBlendCross() { @@ -12314,7 +12327,7 @@ void MotionBlendCross::Step(struc_400* a2) { field_20 = a2->field_0; field_21 = true; if (duration <= 0.0f || duration <= frame || fabsf(duration - frame) <= 0.000001f) { - field_8 = false; + enable = false; rot_y = false; } else { @@ -12471,7 +12484,7 @@ void MotionBlendFreeze::Step(struc_400* a2) { float_t v8 = field_2C; float_t v9 = v7 - v8; if (v7 < v8 || field_28 <= 0.0f || field_28 <= v9 || fabsf(field_28 - v9) <= 0.000001f) { - field_8 = false; + enable = false; rot_y = false; } else { @@ -12595,7 +12608,7 @@ void PartialMotionBlendFreeze::Field_10(float_t a2, float_t a3, int32_t a4) { void PartialMotionBlendFreeze::Step(struc_400* a1) { if (duration <= 0.0f || duration <= frame || fabsf(duration - frame) <= 0.000001f) { - field_8 = false; + enable = false; rot_y = false; } else { @@ -12669,6 +12682,16 @@ motion_blend_mot::~motion_blend_mot() { } +MotionBlendType motion_blend_mot::get_type() { + if (blend == &cross) + return MOTION_BLEND_CROSS; + if (blend == &freeze) + return MOTION_BLEND_FREEZE; + if (blend == &combine) + return MOTION_BLEND_COMBINE; + return MOTION_BLEND; +} + void motion_blend_mot::reset() { mot_play_data.reset(); field_4F8.field_0 = 0; @@ -12678,14 +12701,14 @@ void motion_blend_mot::reset() { field_4F8.field_8C = false; field_4F8.rot_y = 0.0f; field_4F8.prev_rot_y = 0.0f; - field_4F8.field_90 = vec3_identity; - field_4F8.field_9C = vec3_identity; - field_4F8.field_A8 = vec3_identity; + field_4F8.field_90 = 1.0f; + field_4F8.field_9C = 1.0f; + field_4F8.field_A8 = 1.0f; field_4F8.field_BC = 0; field_4F8.field_BD = 0; field_4F8.field_C0 = 1.0f; field_4F8.field_C4 = 1.0f; - field_4F8.field_C8 = vec3_null; + field_4F8.field_C8 = 0.0f; } rob_chara_bone_data_ik_scale::rob_chara_bone_data_ik_scale() { @@ -12747,10 +12770,10 @@ void rob_chara_bone_data_sleeve_adjust::reset() { radius = 1.0f; bones = 0; step = 1.0f; - field_5C = vec3_null; - field_68 = vec3_null; - field_74 = vec3_null; - field_80 = vec3_null; + field_5C = 0.0f; + field_68 = 0.0f; + field_74 = 0.0f; + field_80 = 0.0f; } rob_chara_bone_data::rob_chara_bone_data() : field_0(), field_1(), object_bone_count(), @@ -12775,6 +12798,10 @@ float_t rob_chara_bone_data::get_frame_count() { return (float_t)motion_loaded.front()->mot_key_data.mot.frame_count; } +bool rob_chara_bone_data::get_motion_has_looped() { + return motion_loaded.front()->mot_play_data.frame_data.looped; +} + void rob_chara_bone_data::reset() { object_bone_count = 0; motion_bone_count = 0; @@ -12806,14 +12833,54 @@ void rob_chara_bone_data::reset() { eyelid.reset(); disable_eye_motion = false; ik_scale = rob_chara_bone_data_ik_scale(); - field_76C[0] = vec3_null; - field_76C[0] = vec3_null; + field_76C[0] = 0.0f; + field_76C[0] = 0.0f; sub_1404198D0(&field_788); sleeve_adjust.reset(); } void rob_chara_bone_data::set_frame(float_t frame) { - mot_play_frame_data_set_frame(&motion_loaded.front()->mot_play_data.frame_data, frame); + motion_loaded.front()->mot_play_data.frame_data.set_frame(frame); +} + +void rob_chara_bone_data::set_motion_frame(float_t frame, float_t step, float_t frame_count) { + mot_play_data* v5 = &motion_loaded.front()->mot_play_data; + v5->frame_data.frame = frame; + v5->frame_data.step_prev = v5->frame_data.step; + v5->frame_data.step = step; + v5->frame_data.frame_count = frame_count; + v5->frame_data.last_frame = frame_count - 1.0f; + v5->frame_data.max_frame = -1.0f; + v5->frame_data.playback_state = MOT_PLAY_FRAME_DATA_PLAYBACK_NONE; + v5->frame_data.loop_state = MOT_PLAY_FRAME_DATA_LOOP_NONE; + v5->frame_data.loop_begin = 0.0f; + v5->frame_data.loop_end = -1.0f; + v5->frame_data.looped = 0; + v5->frame_data.loop_count = -1; + v5->loop_index = 0; + v5->loop_frames_enabled = false; + v5->loop_frames = 0.0f; + v5->ext_frame = 0; + v5->ext_step = 0; +} + +void rob_chara_bone_data::set_motion_loop(float_t loop_begin, int32_t loop_count, float_t loop_end) { + motion_blend_mot* v4 = motion_loaded.front(); + v4->mot_play_data.frame_data.loop_begin = loop_begin; + v4->mot_play_data.frame_data.loop_end = loop_end; + v4->mot_play_data.frame_data.loop_count = loop_count; +} + +void rob_chara_bone_data::set_motion_loop_state(mot_play_frame_data_loop_state value) { + motion_loaded.front()->mot_play_data.frame_data.loop_state = value; +} + +void rob_chara_bone_data::set_motion_max_frame(float_t value) { + motion_loaded.front()->mot_play_data.frame_data.max_frame = value; +} + +void rob_chara_bone_data::set_motion_playback_state(mot_play_frame_data_playback_state value) { + motion_loaded.front()->mot_play_data.frame_data.playback_state = value; } rob_chara_pv_data::rob_chara_pv_data() { @@ -12821,7 +12888,7 @@ rob_chara_pv_data::rob_chara_pv_data() { field_4 = true; field_5 = false; field_6 = false; - field_8 = vec3_null; + field_8 = 0.0f; rot_y_int16 = 0x00; field_16 = 0xC9; sleeve_l = {}; @@ -13003,28 +13070,29 @@ void rob_chara_item_equip_object::init_ex_data_bone_nodes(obj_skin_ex_data* ex_d ex_data_mats.clear(); ex_data_block_mats.clear(); - int32_t count = ex_data->bone_names_count; - ex_data_bone_nodes.resize(count); - ex_data_mats.resize(count); - ex_data_block_mats.resize(count); + uint32_t num_bone_name = ex_data->num_bone_name; + ex_data_bone_nodes.resize(num_bone_name); + ex_data_mats.resize(num_bone_name); + ex_data_block_mats.resize(num_bone_name); bone_node* v4 = ex_data_bone_nodes.data(); mat4* v5 = ex_data_mats.data(); mat4* v8 = ex_data_block_mats.data(); - for (int32_t v10 = 0; v10 < count; v10++) - v4[v10].mat = &v5[v10]; + for (uint32_t i = 0; i < num_bone_name; i++) + v4[i].mat = &v5[i]; - if (ex_data->bone_names) { + if (ex_data->bone_name_array) { ex_bones.clear(); - for (int32_t i = 0; i < count; i++) { + const char** bone_name = ex_data->bone_name_array; + for (uint32_t i = 0; i < num_bone_name; i++, bone_name++) { bone_node* node = &v4[i]; - node->name = ex_data->bone_names[i]; + node->name = *bone_name; node->mat = &v5[i]; *node->mat = mat4_identity; node->ex_data_mat = &v8[i]; *node->ex_data_mat = mat4_identity; - ex_bones.push_back({ ex_data->bone_names[i], i }); + ex_bones.push_back({ *bone_name, i }); } } } @@ -13036,10 +13104,10 @@ void rob_chara_item_equip_object::init_members(size_t index) { mats = 0; texture_pattern.clear(); texture_data.field_0 = -1; - texture_data.texture_color_coeff = vec3_identity; - texture_data.texture_color_offset = vec3_null; - texture_data.texture_specular_coeff = vec3_identity; - texture_data.texture_specular_offset = vec3_null; + texture_data.texture_color_coeff = 1.0f; + texture_data.texture_color_offset = 0.0f; + texture_data.texture_specular_coeff = 1.0f; + texture_data.texture_specular_offset = 0.0f; alpha = 1.0f; draw_task_flags = DRAW_TASK_ALPHA_ORDER_1; null_blocks_data_set = 0; @@ -13059,7 +13127,7 @@ void rob_chara_item_equip_object::init_members(size_t index) { void rob_chara_item_equip_object::load_ex_data(obj_skin_ex_data* ex_data, bone_database* bone_data, void* data, object_database* obj_db) { - if (!ex_data->blocks) + if (!ex_data->block_array) return; std::vector> v129; @@ -13071,102 +13139,106 @@ void rob_chara_item_equip_object::load_ex_data(obj_skin_ex_data* ex_data, size_t osage_count = 0; size_t cloth_count = 0; size_t null_count = 0; - char** bone_names_ptr = ex_data->bone_names; - obj_skin_block* v4 = ex_data->blocks; - for (uint32_t i = 0; i < ex_data->blocks_count; i++, v4++) { - ExNodeBlock* node; - if (v4->type == OBJ_SKIN_BLOCK_CLOTH) { + const char** bone_name_array = ex_data->bone_name_array; + obj_skin_block* block = ex_data->block_array; + uint32_t num_block = ex_data->num_block; + for (uint32_t i = 0; i < num_block; i++, block++) { + ExNodeBlock* ex_node; + switch (block->type) { + case OBJ_SKIN_BLOCK_CLOTH: { if (cloth_count >= 0x08) continue; ExClothBlock* cls = new ExClothBlock; - node = cls; + ex_node = cls; cloth_blocks.push_back(cls); - cls->InitData(this, &v4->cloth, 0, bone_data); + cls->InitData(this, block->cloth, 0, bone_data); cls->index = cloth_count + osage_count; - cls->name = v4->cloth.mesh_name; + cls->name = block->cloth->mesh_name; cloth_count++; - } - else if (v4->type == OBJ_SKIN_BLOCK_CONSTRAINT) { + } break; + case OBJ_SKIN_BLOCK_CONSTRAINT: { if (constraint_count >= 0x40) continue; ExConstraintBlock* cns = new ExConstraintBlock; - node = cns; + ex_node = cns; constraint_blocks.push_back(cns); - cns->InitData(this, &v4->constraint, - bone_names_ptr[v4->constraint.name_index & 0x7FFF], bone_data); + cns->InitData(this, block->constraint, + bone_name_array[block->constraint->name_index & 0x7FFF], bone_data); constraint_count++; - } - else if (v4->type == OBJ_SKIN_BLOCK_EXPRESSION) { + } break; + case OBJ_SKIN_BLOCK_EXPRESSION: { if (expression_count >= 0x50) continue; ExExpressionBlock* exp = new ExExpressionBlock; - node = exp; + ex_node = exp; expression_blocks.push_back(exp); - exp->InitData(this, &v4->expression, - bone_names_ptr[v4->expression.name_index & 0x7FFF], obj_info, index, bone_data); + exp->InitData(this, block->expression, + bone_name_array[block->expression->name_index & 0x7FFF], obj_info, index, bone_data); expression_count++; - } - else if (v4->type == OBJ_SKIN_BLOCK_OSAGE) { + } break; + case OBJ_SKIN_BLOCK_OSAGE: { if (osage_count >= 0x100) continue; ExOsageBlock* osg = new ExOsageBlock; - node = osg; + ex_node = osg; osage_blocks.push_back(osg); - osg->InitData(this, &v4->osage, - bone_names_ptr[v4->osage.external_name_index & 0x7FFF], - &skin_ex_data->osage_nodes[v4->osage.start_index], + osg->InitData(this, block->osage, + bone_name_array[block->osage->external_name_index & 0x7FFF], + &skin_ex_data->osage_node_array[block->osage->start_index], bone_nodes, ex_data_bone_nodes.data(), skin); - osg->sub_1405F3E10(&v4->osage, - &skin_ex_data->osage_nodes[v4->osage.start_index], &v129, &v138); + osg->sub_1405F3E10(block->osage, + &skin_ex_data->osage_node_array[block->osage->start_index], &v129, &v138); osg->index = osage_count; osage_count++; - } - else { + } break; + default: { if (null_count >= 0x4) continue; ExNullBlock* null = new ExNullBlock; - node = null; + ex_node = null; null_blocks.push_back(null); - null->InitData(this, &v4->constraint, - bone_names_ptr[v4->constraint.name_index & 0x7FFF], bone_data); + null->InitData(this, block->constraint, + bone_name_array[block->constraint->name_index & 0x7FFF], bone_data); null_count++; + } break; } - obj_skin_block_node* v54 = &v4->base; + obj_skin_block_node* node = block->node; bone_node_expression_data exp_data; - exp_data.position = v54->position; - exp_data.rotation = v54->rotation; - exp_data.scale = v54->scale; - exp_data.parent_scale = vec3_identity; - node->parent_name = v54->parent_name; + exp_data.position = node->position; + exp_data.rotation = node->rotation; + exp_data.scale = node->scale; + exp_data.parent_scale = 1.0f; + ex_node->parent_name = node->parent_name; - bone_node* parent_bone_node = get_bone_node(v54->parent_name, bone_data); - node->parent_bone_node = parent_bone_node; - if (node->bone_node_ptr) { - node->bone_node_ptr->exp_data = exp_data; - node->bone_node_ptr->parent = parent_bone_node; + bone_node* parent_bone_node = get_bone_node(node->parent_name, bone_data); + ex_node->parent_bone_node = parent_bone_node; + if (ex_node->bone_node_ptr) { + ex_node->bone_node_ptr->exp_data = exp_data; + ex_node->bone_node_ptr->parent = parent_bone_node; } if (parent_bone_node) { auto elem = v138.find(parent_bone_node->name); if (elem != v138.end()) - node->parent_node = elem->second; + ex_node->parent_node = elem->second; } - v138.insert({ node->name, node }); - node_blocks.push_back(node); + v138.insert({ ex_node->name, ex_node }); + node_blocks.push_back(ex_node); } for (ExNodeBlock*& i : node_blocks) { - ExNodeBlock* v86 = i->parent_node; - if (v86) { - v86->has_children_node = true; - if ((v86->type & ~0x03) || v86->type == EX_OSAGE || !v86->field_58) + ExNodeBlock* parent_node = i->parent_node; + if (parent_node) { + parent_node->has_children_node = true; + if ((parent_node->type & ~0x03) || parent_node->type == EX_OSAGE + || !parent_node->field_58) continue; } i->field_58 = true; @@ -13195,9 +13267,9 @@ void rob_chara_item_equip_object::load_ex_data(obj_skin_ex_data* ex_data, } } - if (ex_data->osage_sibling_infos) - for (uint32_t i = 0; i < ex_data->osage_sibling_infos_count; i++) { - obj_skin_osage_sibling_info* sibling_info = &ex_data->osage_sibling_infos[i]; + if (ex_data->osage_sibling_info_array) { + obj_skin_osage_sibling_info* sibling_info = ex_data->osage_sibling_info_array; + for (uint32_t i = 0; i < ex_data->num_osage_sibling_info; i++, sibling_info++) { uint32_t name_index = sibling_info->name_index; uint32_t sibling_name_index = sibling_info->sibling_name_index; @@ -13217,6 +13289,7 @@ void rob_chara_item_equip_object::load_ex_data(obj_skin_ex_data* ex_data, v102->max_distance = sibling_info->max_distance; } } + } if (osage_count || cloth_count) skp_load_file(data, bone_data, obj_db); @@ -13239,13 +13312,16 @@ void rob_chara_item_equip_object::load_object_info_ex_data(object_info object_in ex_data_mats.clear(); clear_ex_data(); obj_skin* skin = object_storage_get_obj_skin(this->obj_info); - if (!skin || !skin->ex_data_init) + if (!skin) return; this->skin = skin; - this->skin_ex_data = &skin->ex_data; - init_ex_data_bone_nodes(&skin->ex_data); - load_ex_data(&skin->ex_data, bone_data, data, obj_db); + if (!skin->ex_data) + return; + + this->skin_ex_data = skin->ex_data; + init_ex_data_bone_nodes(skin->ex_data); + load_ex_data(skin->ex_data, bone_data, data, obj_db); if (osage_reset && osage_blocks.size()) osage_iterations = 60; @@ -13814,15 +13890,6 @@ void RobSubAction::Reset() { data.laugh.Field_8(); } -RobPartialMotion::Data::Data() : motion_id(-1), mottbl_index(6), state(-1), frame(), play_frame_step(1.0f), -frame_count(), duration(), step(1.0f), offset(), field_24(), frame_data(), step_data(), field_38() { - -} - -RobPartialMotion::Data::~Data() { - -} - RobPartialMotion::RobPartialMotion() { } @@ -13840,19 +13907,7 @@ RobFaceMotion::~RobFaceMotion() { } void RobFaceMotion::Reset() { - data.motion_id = -1; - data.mottbl_index = 6; - data.state = -1; - data.frame = 0.0f; - data.play_frame_step = 1.0f; - data.frame_count = 0.0f; - data.duration = 0.0f; - data.step = 1.0f; - data.offset = 1.0f; - data.field_24 = 0.0f; - data.frame_data = 0; - data.step_data = 0; - data.field_38 = -1; + data.Reset(); } RobHandMotion::RobHandMotion() { @@ -13864,19 +13919,7 @@ RobHandMotion::~RobHandMotion() { } void RobHandMotion::Reset() { - data.motion_id = -1; - data.mottbl_index = 6; - data.state = -1; - data.frame = 0.0f; - data.play_frame_step = 1.0f; - data.frame_count = 0.0f; - data.duration = 0.0f; - data.step = 1.0f; - data.offset = 1.0f; - data.field_24 = 0.0f; - data.frame_data = 0; - data.step_data = 0; - data.field_38 = -1; + data.Reset(); } RobMouthMotion::RobMouthMotion() { @@ -13888,19 +13931,7 @@ RobMouthMotion::~RobMouthMotion() { } void RobMouthMotion::Reset() { - data.motion_id = -1; - data.mottbl_index = 6; - data.state = -1; - data.frame = 0.0f; - data.play_frame_step = 1.0f; - data.frame_count = 0.0f; - data.duration = 0.0f; - data.step = 1.0f; - data.offset = 1.0f; - data.field_24 = 0.0f; - data.frame_data = 0; - data.step_data = 0; - data.field_38 = -1; + data.Reset(); } RobEyesMotion::RobEyesMotion() { @@ -13912,19 +13943,7 @@ RobEyesMotion::~RobEyesMotion() { } void RobEyesMotion::Reset() { - data.motion_id = -1; - data.mottbl_index = 6; - data.state = -1; - data.frame = 0.0f; - data.play_frame_step = 1.0f; - data.frame_count = 0.0f; - data.duration = 0.0f; - data.step = 1.0f; - data.offset = 1.0f; - data.field_24 = 0.0f; - data.frame_data = 0; - data.step_data = 0; - data.field_38 = -1; + data.Reset(); } RobEyelidMotion::RobEyelidMotion() { @@ -13936,19 +13955,7 @@ RobEyelidMotion::~RobEyelidMotion() { } void RobEyelidMotion::Reset() { - data.motion_id = -1; - data.mottbl_index = 6; - data.state = -1; - data.frame = 0.0f; - data.play_frame_step = 1.0f; - data.frame_count = 0.0f; - data.duration = 0.0f; - data.step = 1.0f; - data.offset = 1.0f; - data.field_24 = 0.0f; - data.frame_data = 0; - data.step_data = 0; - data.field_38 = -1; + data.Reset(); } struc_405::struc_405() : field_1C0(), time() { @@ -13964,7 +13971,7 @@ void struc_405::Reset() { hand_l.Reset(); hand_r.Reset(); mouth.Reset(); - eye.Reset(); + eyes.Reset(); eyelid.Reset(); head_object = object_info(); hand_l_object = object_info(); @@ -13984,7 +13991,7 @@ void rob_chara_data_adjust::reset() { enable = false; frame = 0.0f; transition_frame = 0.0f; - curr_external_force = vec3_null; + curr_external_force = 0.0f; curr_force = 1.0f; curr_strength = 1.0f; motion_id = -1; @@ -13993,9 +14000,9 @@ void rob_chara_data_adjust::reset() { type = 6; cycle_type = 0; ignore_gravity = true; - external_force = vec3_null; - external_force_cycle_strength = vec3_null; - external_force_cycle = vec3_null; + external_force = 0.0f; + external_force_cycle_strength = 0.0f; + external_force_cycle = 0.0f; cycle = 1.0f; phase = 0.0f; force = 1.0f; @@ -14023,8 +14030,8 @@ void rob_chara_data_hand_adjust::reset() { disable_x = false; disable_y = false; disable_z = false; - offset = vec3_null; - field_30 = vec3_null; + offset = 0.0f; + field_30 = 0.0f; arm_length = 0.0f; field_40 = 0; } @@ -14038,11 +14045,13 @@ void rob_chara_data_arm_adjust::reset() { frame = 0.0f; } -rob_chara_motion::rob_chara_motion() : motion_id(-1), prev_motion_id(-1), frame_data(), step_data(), step(1.0f), -field_24(), field_28(), field_29(), field_2A(), field_2C(), field_30(), field_34(), field_36(), field_38(), -field_B8(), field_138(), field_13C(), field_140(), field_14C(), field_314(), parts_adjust(), -parts_adjust_prev(), adjust_global(), adjust_global_prev(), hand_adjust(), hand_adjust_prev(), arm_adjust() { - +rob_chara_motion::rob_chara_motion() : frame_data(), step_data(), field_24(), field_28(), field_29(), +field_2A(), loop_index(), field_30(), field_34(), field_36(), field_38(), field_B8(), +field_138(), field_13C(), field_140(), field_14C(), field_314(), parts_adjust(), parts_adjust_prev(), +adjust_global(), adjust_global_prev(), hand_adjust(), hand_adjust_prev(), arm_adjust() { + motion_id = -1; + prev_motion_id = -1; + step = 1.0f; } rob_chara_motion::~rob_chara_motion() { @@ -14063,7 +14072,7 @@ void rob_chara_motion::reset() { field_28 = 0; field_29 = 0; field_2A = 0; - field_2C = 0; + loop_index = 0; field_30 = 0; field_34 = 0; field_36 = 0; @@ -14075,7 +14084,7 @@ void rob_chara_motion::reset() { field_138 = 1.0f; field_13C = 1.0f; - field_140 = vec3_null; + field_140 = 0.0f; field_150.Reset(); hand_l.Reset(); hand_r.Reset(); @@ -14109,6 +14118,7 @@ mothead_mot::mothead_mot() { field_0.field_C = 0; field_10 = 0x04; field_12 = 0x04; + is_x = false; // X } mothead_mot::~mothead_mot() { @@ -14119,6 +14129,7 @@ mothead::mothead() { mot_set_id = -1; first_mot_id = 0; last_mot_id = 0; + data_x = 0; // X } mothead::~mothead() { @@ -14127,6 +14138,11 @@ mothead::~mothead() { delete i; i = 0; } + + if (data_x) { // X + free(data_x); + data_x = 0; + } } struc_306::struc_306() : field_0(), frame(), field_8(), field_C(), field_E(), @@ -14142,7 +14158,7 @@ field_34(), field_38(), field_3C(), field_40(), field_44(), field_48() { struc_652::struc_652() : motion_id(), frame_count(), field_8(), field_C(), field_10(), field_20(), field_30(), field_40(), field_50(), field_52(), field_54(), field_58(), field_5C(), field_60(), -field_64(), field_68(), field_6C(), field_70(), field_74(), field_78(), field_7C(), field_80(), +field_64(), field_68(), loop_count(), loop_begin(), loop_end(), field_78(), field_7C(), field_80(), field_84(), field_88(), field_8C(), field_90(), field_94(), field_96(), field_98(), field_9C(), field_A0(), field_A4(), field_A8(), field_B0(), field_1E8(), field_1EC(), field_1F0(), field_1F4(), field_1F8(), field_1FC(), field_200(), field_204(), field_208(), field_20C(), field_210(), field_218(), @@ -14160,12 +14176,180 @@ struc_652::~struc_652() { } +void struc_652::reset() { + motion_id = -1; + frame_count = 0.0f; + field_8 = 0.0f; + field_C = 0; + sub_140536DD0(); + field_50 = 0; + field_52 = 0; + field_54 = 0; + field_58 = -1; + field_5C = -1; + field_60 = 0; + field_64 = -1; + field_68 = 0; + loop_count = -1; + loop_begin = 0.0f; + loop_end = -1.0f; + field_78 = 0.0f; + field_7C = 0.0f; + field_80 = 0.0f; + field_1E8 = 0; + field_1EC = 0.0f; + field_1F0 = 0.0f; + field_1F4 = 0.0f; + field_1F8 = -1.0f; + field_1FC = 0.0f; + field_200 = 1.0f; + field_204 = -1; + field_208 = 0; + field_20C = -1; + field_210 = 0; + field_218 = -1.0f; + field_21C = -1.0f; + field_220 = 0; + field_228.clear(); + field_238 = -1; + field_23C = 0.0f; + field_240 = 0; + field_244 = 0; + field_248 = 0; + field_250 = 0; + field_258 = -1.0f; + field_25C = 0; + field_268 = 0; + field_274 = 0; + field_278 = 0; + field_27C = -1; + field_280 = 0; + field_284 = 0; + field_288 = 0; + field_290 = 0; + field_294 = 0; + field_298 = 0; + field_29C = 0.0f; + field_2A0 = 0; + field_2A4 = 0.0f; + field_2A8 = 0.0f; + field_2AC = 0.0f; + field_2B8 = 0; + field_2BC = 0; + field_2C0 = -1.0f; + field_2C4 = -1.0f; + field_2C8 = 0; + field_2E8 = -1; + field_2EC = 0; + field_2F0 = 0; + field_2F4 = 0; + field_2FC = -1; + field_300 = 100; + field_304 = 1; + field_308 = 0; + field_30C = 1.0f; + field_318 = 0.0f; + field_324 = 0.05f; + field_328 = -1.0f; + iterations = -1; +} + +void struc_652::sub_140536DD0() { + field_84 = 0; + field_88 = 0; + field_8C = 0; + field_90 = 0; + field_94 = 0; + field_96 = 0; + field_98 = -1; + field_9C = 0; + field_A0 = 0; + field_A4 = 0; + field_A8 = 0; + field_B0[0] = { 0, 1.2f, 1.0f }; + field_B0[1] = { 0, -1.0f, -1.0f }; + field_B0[2] = { 0, -1.0f, -1.0f }; + field_B0[3] = { 0, -1.0f, -1.0f }; + field_B0[4] = { 0, -1.0f, -1.0f }; + field_B0[5] = { 0, -1.0f, -1.0f }; + field_B0[6] = { 0, -1.0f, -1.0f }; + field_B0[7] = { 0, -1.0f, -1.0f }; + field_B0[8] = { 0, -1.0f, -1.0f }; + field_B0[9] = { 0, -1.0f, -1.0f }; + field_B0[10] = { 0, -1.0f, -1.0f }; + field_B0[11] = { 0, -1.0f, -1.0f }; + field_B0[12] = { 0, -1.0f, -1.0f }; + field_B0[13] = { 0, -1.0f, -1.0f }; + field_B0[14] = { 0, -1.0f, -1.0f }; + field_B0[15] = { 0, -1.0f, -1.0f }; + field_B0[16] = { 0, -1.0f, -1.0f }; + field_B0[17] = { 0, -1.0f, -1.0f }; + field_B0[18] = { 0, -1.0f, -1.0f }; + field_B0[19] = { 0, -1.0f, -1.0f }; + field_B0[20] = { 0, -1.0f, -1.0f }; + field_B0[21] = { 0, -1.0f, -1.0f }; + field_B0[22] = { 0, -1.0f, -1.0f }; + field_B0[23] = { 0, -1.0f, -1.0f }; + field_B0[24] = { 0, -1.0f, -1.0f }; + field_B0[25] = { 0, -1.0f, -1.0f }; + field_260 = 0; + field_270 = 0; + field_2B0 = 0; + field_2D8 = field_2D0; + field_310 = 3; + field_314 = 0; +} + struc_651::struc_651() : field_0(), field_10(), field_14(), field_18(), field_1C(), field_2C(), -field_80(), field_1C4(), field_308(), field_310(), field_314(), field_318(), field_31C(), +field_80(), field_1C4(), field_308(), arm_adjust_next_value(), arm_adjust_prev_value(), +arm_adjust_start_frame(), arm_adjust_duration(), field_310(), field_314(), field_318(), field_31C(), field_320(), field_324(), field_328(), field_32C(), field_330(), field_334(), field_338() { } +void struc_651::reset() { + field_0.current = 0; + field_0.data = 0; + field_0.is_x = false; // X + field_10 = 0; + field_14 = 0; + field_18 = 0; + field_1C = 0.0f; + field_20 = 0.0f; + + for (struc_226& i : field_2C) + for (int8_t& j : i.field_0) + j = 0; + + for (struc_225& i : field_80) + for (float_t& j : i.field_0) + j = 1.0f; + + for (struc_224& i : field_1C4) + for (float_t& j : i.field_0) + j = 0.0f; + + field_308 = 0; + arm_adjust_next_value = 0.0f; // X + arm_adjust_prev_value = 0.0f; // X + arm_adjust_start_frame = -1; // X + arm_adjust_duration = -1.0f; // X + field_310 = -1.0f; + field_314 = -1.0f; + field_318 = 0; + field_31C = 0; + field_320 = 1.0f; + field_324 = 1.0f; + field_32C = 0; + field_330 = -1.0f; + field_334 = -1.0f; + field_338 = 0; + field_33C[0] = { -1, -1.0f, -1.0f }; + field_33C[1] = { -1, -1.0f, -1.0f }; + field_33C[2] = { -1, -1.0f, -1.0f }; + field_33C[3] = { -1, -1.0f, -1.0f }; +} + struc_223::struc_223() : field_330(), field_7A0(), motion_set_id() { } @@ -14174,6 +14358,15 @@ struc_223::~struc_223() { } +void struc_223::reset() { + field_0.field_10 = {}; + field_0.field_20 = {}; + field_0.reset(); + field_330.reset(); + field_7A0 = 0; + motion_set_id = -1; +} + rob_chara_data_miku_rot::rob_chara_data_miku_rot() : rot_y_int16(), field_2(), field_4(), field_6(), field_8(), field_C(), field_10(), field_14(), field_60(), field_64(), field_68() { reset(); @@ -14188,12 +14381,12 @@ void rob_chara_data_miku_rot::reset() { field_C = 0; field_10 = 0.0f; field_14 = 0; - position = vec3_null; - field_24 = vec3_null; - field_30 = vec3_null; - field_3C = vec3_null; - field_48 = vec3_null; - field_54 = vec3_null; + position = 0.0f; + field_24 = 0.0f; + field_30 = 0.0f; + field_3C = 0.0f; + field_48 = 0.0f; + field_54 = 0.0f; field_60 = 0; field_64 = 0; field_68 = 0; @@ -14210,19 +14403,19 @@ void rob_chara_adjust_data::reset() { scale = 1.0f; height_adjust = false; pos_adjust_y = 0.0f; - pos_adjust = vec3_null; - offset = vec3_null; + pos_adjust = 0.0f; + offset = 0.0f; offset_x = true; offset_y = false; offset_z = true; get_global_trans = false; - mat4 mat; - mat4_translate(trans.x, trans.y, trans.z, &mat); - this->mat = mat; + mat4_translate(&trans, &mat); left_hand_scale = -1.0f; right_hand_scale = -1.0f; left_hand_scale_default = -1.0f; right_hand_scale_default = -1.0f; + mat4_translate(&item_trans, &item_mat); + item_scale = 1.0f; // X } struc_195::struc_195() : scale(), field_1C(), field_20(), field_24() { @@ -14257,8 +14450,8 @@ struc_209::~struc_209() { rob_chara_data::rob_chara_data() : field_0(), field_1(), field_2(), field_3(), field_4(), miku_rot(), adjust_data(), field_3D90(), field_3D94(), field_3D98(), field_3D9A(), field_3D9C(), field_3D9D(), field_3DA0(), -field_3DA4(), field_3DA8(), field_3DB0(), field_3DB8(), field_3DBC(), field_3DC0(), field_3DC4(), -field_3DC8(), field_3DCC(), field_3DD0(), field_3DD4(), field_3DD8(), field_3DDC(), field_3DE0() { +field_3DA4(), field_3DA8(), field_3DB0(), field_3DB8(), field_3DBC(), field_3DC0(), field_3DC4(), field_3DC8(), +field_3DCC(), field_3DD0(), field_3DD4(), field_3DD8(), field_3DDC(), field_3DE0(), arm_adjust_scale() { } @@ -14270,7 +14463,7 @@ void rob_chara_data::reset() { sub_140505C90(&field_8); rob_sub_action.Reset(); motion.reset(); - sub_140539750(&field_1588); + field_1588.reset(); miku_rot.reset(); adjust_data.reset(); sub_140505FB0(&field_1E68); @@ -14293,6 +14486,7 @@ void rob_chara_data::reset() { field_3DD0 = 0; field_3DDC = 0.0f; field_3DE0 = 0; + arm_adjust_scale = 1.0f; } rob_chara::rob_chara() : chara_id(), type(), field_C(), field_D(), @@ -14384,13 +14578,13 @@ inline const mothead_mot* mothead_storage_get_mot_by_motion_id(uint32_t motion_i return &mothead_mot_null; mothead* mhd = elem->second.data; - if (mhd->first_mot_id > (int32_t)motion_id || mhd->last_mot_id < (int32_t)motion_id) + if ((int32_t)motion_id < mhd->first_mot_id || (int32_t)motion_id > mhd->last_mot_id) return &mothead_mot_null; - mothead_mot* sub = mhd->mots[(ssize_t)(int32_t)motion_id - mhd->first_mot_id]; - if (!sub) + mothead_mot* mot = mhd->mots[(ssize_t)(int32_t)motion_id - mhd->first_mot_id]; + if (!mot) return &mothead_mot_null; - return sub; + return mot; } inline void mothead_storage_free() { @@ -14584,7 +14778,8 @@ void MhdFile::LoadFile(const char* path, const char* file, uint32_t set) { } this->set = set; - this->file_path = file_path; + file_path.assign(path); + file_path.append(file); if (file_handler.read_file(&data_list[DATA_AFT], path, file)) file_handler.set_callback_data(0, (PFNFILEHANDLERCALLBACK*)ParseFileParent, this); load_count = 1; @@ -14611,6 +14806,27 @@ mothead* MhdFile::ParseMothead(mothead_file* mhdf, size_t data) { mots++; mot_offsets++; } + + { // X + const char* _file = strrchr(file_path.c_str(), '\\'); + if (!_file) + _file = strrchr(file_path.c_str(), '/'); + + if (_file) { + _file++; + + size_t _file_len; + const char* _file_end = strrchr(_file, '.'); + if (_file_end) + _file_len = _file_end - _file; + else + _file_len = utf8_length(_file); + + std::string file(_file, _file_len); + mothead_mot_msgpack_read("patch\\AFT\\rob", file.c_str(), mhd); + } + } + return mhd; } @@ -15904,7 +16120,8 @@ struc_527::struc_527(rob_chara* rob_chr, int32_t stage_index, uint32_t motion_id type_79 = 0; this->rob_chr = rob_chr; if (rob_chr) { - rob_chr->set_motion_id(motion_id, frame, 0.0f, true, false, MOTION_BLEND_CROSS, bone_data, mot_db); + rob_chr->set_motion_id(motion_id, frame, 0.0f, + true, false, MOTION_BLEND_CROSS, bone_data, mot_db); this->frame = frame; this->motion_id = motion_id; last_frame = rob_chr->bone_data->get_frame_count() - 1.0f; @@ -15966,7 +16183,7 @@ OpdMakeManager::~OpdMakeManager() { bool OpdMakeManager::Init() { mode = 1; - rctx_ptr->draw_pass.enable[DRAW_PASS_3D] = false; + rctx_ptr->draw_pass.set_enable(DRAW_PASS_3D, false); if (path_check_directory_exists("ram/osage_play_data")) RemoveDirectoryA("ram/osage_play_data"); @@ -16132,7 +16349,7 @@ bool OpdMakeManager::Dest() { task_rob_manager_free_task(); } - rctx_ptr->draw_pass.enable[DRAW_PASS_3D] = true; + rctx_ptr->draw_pass.set_enable(DRAW_PASS_3D, true); if (path_check_directory_exists("ram/osage_play_data")) RemoveDirectoryA("ram/osage_play_data"); @@ -16406,7 +16623,7 @@ void PvOsageManager::sub_1404F7BD0(bool not_reset) { motion_database* aft_mot_db = &aft_data->data_ft.mot_db; rob_chara* rob_chr = rob_chara_array_get(chara_id); rob_chr->set_motion_id(rob_chr->get_rob_cmn_mottbl_motion_id(0), - 0.0f, 0.0f, 1, 0, MOTION_BLEND_CROSS, aft_bone_data, aft_mot_db); + 0.0f, 0.0f, true, false, MOTION_BLEND_CROSS, aft_bone_data, aft_mot_db); rob_chr->set_face_mottbl_motion(0, 6, 0.0f, -1, 0.0f, 0.0f, 1.0f, -1, 0.0f, true, aft_mot_db); rob_chr->set_hand_l_mottbl_motion(0, 192, 0.0f, -1, 0.0f, 0.0f, 1.0f, -1, 0.0f, aft_mot_db); rob_chr->set_hand_r_mottbl_motion(0, 192, 0.0f, -1, 0.0f, 0.0f, 1.0f, -1, 0.0f, aft_mot_db); @@ -16554,7 +16771,8 @@ void PvOsageManager::sub_1404F8AA0() { rob_chara* rob_chr = rob_chara_array_get(chara_id); reset_frames_list.clear(); - rob_chr->set_motion_id(motion_id, 0.0f, 0.0f, true, false, MOTION_BLEND_CROSS, aft_bone_data, aft_mot_db); + rob_chr->set_motion_id(motion_id, 0.0f, 0.0f, + true, false, MOTION_BLEND_CROSS, aft_bone_data, aft_mot_db); if (pv) for (pv_db_pv_osage_init& i : pv->osage_init) { int32_t osage_init_motion_id = aft_mot_db->get_motion_id(i.motion.c_str()); @@ -16962,15 +17180,15 @@ void SkinParamManager::sub_14060FBD0() { continue; obj_skin* skin = object_storage_get_obj_skin(v9); - if (!skin || !skin->ex_data_init) + if (!skin || !skin->ex_data) return; - obj_skin_ex_data* ex_data = &skin->ex_data; + obj_skin_ex_data* ex_data = skin->ex_data; int32_t osage_count = 0; int32_t cloth_count = 0; - obj_skin_block* b = ex_data->blocks; - for (int32_t k = ex_data->blocks_count; k; k--, b++) + obj_skin_block* b = ex_data->block_array; + for (int32_t k = ex_data->num_block; k; k--, b++) if (b->type == OBJ_SKIN_BLOCK_OSAGE) osage_count++; else if (b->type == OBJ_SKIN_BLOCK_CLOTH) @@ -17056,12 +17274,12 @@ void SkinParamManager::sub_14060FBD0() { data_struct* aft_data = &data_list[DATA_AFT]; - p_file_handler* v39 = new p_file_handler; + p_file_handler* pfhndl = new p_file_handler; if (v17) - v39->read_file(aft_data, 0, v61.c_str(), v62.c_str(), false); + pfhndl->read_file(aft_data, 0, v61.c_str(), v62.c_str(), false); else - v39->read_file(aft_data, 0, v61.c_str()); - v19->file_handler = v39; + pfhndl->read_file(aft_data, 0, v61.c_str()); + v19->file_handler = pfhndl; field_B8.push_back(v19); } } @@ -17109,7 +17327,7 @@ bool TaskRobBase::Ctrl() { rob_thread_handler->sub_14054E3F0(); for (rob_chara*& i : ctrl_chara) - if (i && i->data.field_3 > -1) + if (i && i->data.field_3 >= 0) rob_base_rob_chara_ctrl(i); for (rob_chara*& i : free_chara) @@ -17172,7 +17390,7 @@ bool TaskRobCollision::Ctrl() { } /*for (rob_chara*& i : ctrl_chara) - if (i && i->data.field_3 > -1) + if (i && i->data.field_3 >= 0) sub_14050EA90(v13);*/ } @@ -17219,11 +17437,11 @@ bool TaskRobDisp::Ctrl() { init_chara.clear(); for (rob_chara*& i : ctrl_chara) - if (i && i->data.field_3 > -1) + if (i && i->data.field_3 >= 0) rob_disp_rob_chara_ctrl(i); for (rob_chara*& i : ctrl_chara) - if (i && i->data.field_3 > -1) + if (i && i->data.field_3 >= 0) rob_thread_handler->AppendRobCharaFunc(i->chara_id, i, rob_disp_rob_chara_ctrl_thread_main); @@ -17268,7 +17486,7 @@ void TaskRobDisp::Disp() { if (pv_osage_manager_array_get_disp(&chara_id)) continue; - if (i->data.field_0 & 1 && i->data.field_3 > -1) + if (i->get_visibility() && i->data.field_3 >= 0) rob_disp_rob_chara_disp(i); } } @@ -17299,8 +17517,8 @@ bool TaskRobInfo::Ctrl() { init_chara.clear(); /*for (rob_chara*& i : ctrl_chara) - if (i && i->data.field_3 > -1) - sub_140518190(i);*/ + if (i && i->data.field_3 >= 0) + rob_chara_ctrl_rob_info(i);*/ free_chara.clear(); return false; @@ -18075,61 +18293,64 @@ bool TaskRobPrepareControl::Init() { static void sub_1404156B0(mot_play_data* a1) { mot_play_frame_data* frame_data = &a1->frame_data; - frame_data->field_28 = 0; - if (a1->field_34 && a1->field_38 >= 0.0f) - a1->field_38 = a1->field_38 - frame_data->step; + frame_data->looped = false; + if (a1->loop_frames_enabled && a1->loop_frames >= 0.0f) + a1->loop_frames -= frame_data->step; - switch (frame_data->field_18) { - case 1: { + switch (frame_data->playback_state) { + case MOT_PLAY_FRAME_DATA_PLAYBACK_FORWARD: { frame_data->frame += frame_data->step; - if (frame_data->field_14 >= 0.0f && frame_data->frame > frame_data->field_14) - frame_data->frame = frame_data->field_14; + if (frame_data->max_frame >= 0.0f && frame_data->frame > frame_data->max_frame) + frame_data->frame = frame_data->max_frame; float_t last_frame = frame_data->last_frame; - switch (frame_data->field_1C) { - case 0: + switch (frame_data->loop_state) { + case MOT_PLAY_FRAME_DATA_LOOP_ONCE: default: frame_data->frame = min_def(frame_data->frame, frame_data->frame_count); break; - case 1: { - if (frame_data->field_24 >= 0.0f && frame_data->field_24 <= last_frame) - last_frame = frame_data->field_24; + case MOT_PLAY_FRAME_DATA_LOOP_CONTINUOUS: { + if (frame_data->loop_end >= 0.0f && frame_data->loop_end <= last_frame) + last_frame = frame_data->loop_end; - if (frame_data->frame >= last_frame) { - if (frame_data->field_2C > 0 && frame_data->field_2C <= a1->field_30) { - frame_data->field_1C = -1; - return; - } + if (frame_data->frame < last_frame) + break; - float_t v21 = frame_data->frame - last_frame; - float_t v22 = last_frame - frame_data->field_20; - if (v21 >= v22 && v22 > 0.0f) - v21 = fmodf(v21, v22); - frame_data->frame = v21 + frame_data->field_20; - frame_data->field_28 = true; - a1->field_30++; + if (frame_data->loop_count > 0 && a1->loop_index >= frame_data->loop_count) { + frame_data->loop_state = MOT_PLAY_FRAME_DATA_LOOP_NONE; + return; } - } break; - case 2: { - if (frame_data->field_24 >= 0.0f && frame_data->field_24 <= last_frame) - last_frame = frame_data->field_24; - if (last_frame < frame_data->frame) { - if (frame_data->field_2C > 0 && frame_data->field_2C <= a1->field_30) { - frame_data->field_1C = -1; - return; - } - frame_data->frame = frame_data->field_20; - frame_data->field_28 = true; - a1->field_30++; - } + float_t frame = frame_data->frame - last_frame; + float_t loop_range = last_frame - frame_data->loop_begin; + if (frame >= loop_range && loop_range > 0.0f) + frame = fmodf(frame, loop_range); + frame_data->frame = frame + frame_data->loop_begin; + frame_data->looped = true; + a1->loop_index++; } break; - case 3: { + case MOT_PLAY_FRAME_DATA_LOOP_RESET: { + if (frame_data->loop_end >= 0.0f && frame_data->loop_end <= last_frame) + last_frame = frame_data->loop_end; + + if (last_frame >= frame_data->frame) + break; + + if (frame_data->loop_count > 0 && a1->loop_index >= frame_data->loop_count) { + frame_data->loop_state = MOT_PLAY_FRAME_DATA_LOOP_NONE; + return; + } + + frame_data->frame = frame_data->loop_begin; + frame_data->looped = true; + a1->loop_index++; + } break; + case MOT_PLAY_FRAME_DATA_LOOP_REVERSE: { if (frame_data->frame <= last_frame) return; - if (frame_data->field_2C > 0 && a1->field_30 <= frame_data->field_2C) { - frame_data->field_1C = -1; + if (frame_data->loop_count > 0 && a1->loop_index <= frame_data->loop_count) { + frame_data->loop_state = MOT_PLAY_FRAME_DATA_LOOP_NONE; return; } @@ -18137,87 +18358,87 @@ static void sub_1404156B0(mot_play_data* a1) { if (frame >= last_frame && last_frame > 0.0f) frame = fmodf(frame, last_frame); frame_data->frame = last_frame - frame; - frame_data->field_18 = 2; - frame_data->field_28 = true; - a1->field_30++; + frame_data->playback_state = MOT_PLAY_FRAME_DATA_PLAYBACK_BACKWARD; + frame_data->looped = true; + a1->loop_index++; } break; } } break; - case 2: { + case MOT_PLAY_FRAME_DATA_PLAYBACK_BACKWARD: { float_t last_frame = frame_data->last_frame; frame_data->frame -= frame_data->step; - float_t v24 = frame_data->frame; - switch (frame_data->field_1C) { - case 0: - default: { - if (v24 < 0.0f) - frame_data->frame = 0.0f; - } break; - case 1: { - float_t v23 = 0.0f; - if (frame_data->field_20 >= 0.0f) - v23 = frame_data->field_20; - if (v24 <= v23) { - if (frame_data->field_2C > 0 && frame_data->field_2C <= a1->field_30) { - frame_data->field_1C = -1; - return; - } + switch (frame_data->loop_state) { + case MOT_PLAY_FRAME_DATA_LOOP_ONCE: + default: + frame_data->frame = max_def(frame_data->frame, 0.0f); + break; + case MOT_PLAY_FRAME_DATA_LOOP_CONTINUOUS: { + float_t loop_begin = 0.0f; + if (frame_data->loop_begin >= 0.0f) + loop_begin = frame_data->loop_begin; - float_t v36 = last_frame; - if (frame_data->field_24 >= 0.0f && frame_data->field_24 <= v36) - v36 = frame_data->field_24; + if (frame_data->frame > loop_begin) + break; - float_t v37 = v36 - v23; - float_t v38 = v23 - v24; - if (v38 >= v37 && v37 > 0.0f) - v38 = fmodf(v38, v37); - frame_data->frame = v36 - v38; - frame_data->field_28 = true; - a1->field_30++; - } - } break; - case 2: { - float_t v23 = 0.0f; - if (frame_data->field_20 >= 0.0f) - v23 = frame_data->field_20; - if (v24 < v23) { - if (frame_data->field_2C > 0 && frame_data->field_2C <= a1->field_30) { - frame_data->field_1C = -1; - return; - } - - float_t v33 = last_frame; - if (frame_data->field_24 >= 0.0f && frame_data->field_24 <= last_frame) - v33 = frame_data->field_24; - frame_data->frame = v33; - frame_data->field_28 = true; - a1->field_30++; - } - } break; - case 3: { - if (v24 >= 0.0f) - return; - - if (frame_data->field_2C > 0 && frame_data->field_2C <= a1->field_30) { - frame_data->field_1C = -1; + if (frame_data->loop_count > 0 && a1->loop_index >= frame_data->loop_count) { + frame_data->loop_state = MOT_PLAY_FRAME_DATA_LOOP_NONE; return; } - float_t v29 = -v24; - if (last_frame > 0.0f && v29 >= last_frame) - v29 = fmodf(v29, last_frame); - frame_data->frame = v29; - frame_data->field_18 = 1; - frame_data->field_28 = true; - a1->field_30++; + if (frame_data->loop_end >= 0.0f && frame_data->loop_end <= last_frame) + last_frame = frame_data->loop_end; + + float_t loop_range = last_frame - loop_begin; + float_t frame = loop_begin - frame_data->frame; + if (frame >= loop_range && loop_range > 0.0f) + frame = fmodf(frame, loop_range); + frame_data->frame = last_frame - frame; + frame_data->looped = true; + a1->loop_index++; + } break; + case MOT_PLAY_FRAME_DATA_LOOP_RESET: { + float_t loop_begin = 0.0f; + if (frame_data->loop_begin >= 0.0f) + loop_begin = frame_data->loop_begin; + + if (frame_data->frame >= loop_begin) + break; + + if (frame_data->loop_count > 0 && a1->loop_index >= frame_data->loop_count) { + frame_data->loop_state = MOT_PLAY_FRAME_DATA_LOOP_NONE; + return; + } + + if (frame_data->loop_end >= 0.0f && frame_data->loop_end <= last_frame) + last_frame = frame_data->loop_end; + frame_data->frame = last_frame; + frame_data->looped = true; + a1->loop_index++; + } break; + case MOT_PLAY_FRAME_DATA_LOOP_REVERSE: { + if (frame_data->frame >= 0.0f) + return; + + if (frame_data->loop_count > 0 && a1->loop_index >= frame_data->loop_count) { + frame_data->loop_state = MOT_PLAY_FRAME_DATA_LOOP_NONE; + return; + } + + float_t frame = -frame_data->frame; + if (last_frame > 0.0f && frame >= last_frame) + frame = fmodf(frame, last_frame); + frame_data->frame = frame; + frame_data->playback_state = MOT_PLAY_FRAME_DATA_PLAYBACK_FORWARD; + frame_data->looped = true; + a1->loop_index++; } break; } } break; - case 3: { - if (a1->field_40) - frame_data->frame = *a1->field_40; - if (a1->field_48) - frame_data->step = *a1->field_48; + case MOT_PLAY_FRAME_DATA_PLAYBACK_EXTERNAL: { + if (a1->ext_frame) + frame_data->frame = *a1->ext_frame; + if (a1->ext_step) + frame_data->step = *a1->ext_step; } break; } } @@ -18303,13 +18524,13 @@ static void sub_140548660(rob_chara* rob_chr) { sub_14053F300(&rob_chr->data.motion.field_150.hand_l); sub_14053F300(&rob_chr->data.motion.field_150.hand_r); sub_14053F300(&rob_chr->data.motion.field_150.mouth); - sub_14053F300(&rob_chr->data.motion.field_150.eye); + sub_14053F300(&rob_chr->data.motion.field_150.eyes); sub_14053F300(&rob_chr->data.motion.field_150.eyelid); sub_14053F300(&rob_chr->data.motion.field_3B0.face); sub_14053F300(&rob_chr->data.motion.field_3B0.hand_l); sub_14053F300(&rob_chr->data.motion.field_3B0.hand_r); sub_14053F300(&rob_chr->data.motion.field_3B0.mouth); - sub_14053F300(&rob_chr->data.motion.field_3B0.eye); + sub_14053F300(&rob_chr->data.motion.field_3B0.eyes); sub_14053F300(&rob_chr->data.motion.field_3B0.eyelid); } diff --git a/src/CRE/rob/rob.hpp b/src/CRE/rob/rob.hpp index a5ba3d54..8b23078b 100644 --- a/src/CRE/rob/rob.hpp +++ b/src/CRE/rob/rob.hpp @@ -25,14 +25,6 @@ enum ex_expression_block_stack_type { EX_EXPRESSION_BLOCK_STACK_OP3 = 0x05, }; -enum ex_node_type { - EX_NONE = 0x00, - EX_OSAGE = 0x01, - EX_EXPRESSION = 0x02, - EX_CONSTRAINT = 0x03, - EX_CLOTH = 0x04, -}; - enum eyes_base_adjust_type { EYES_BASE_ADJUST_NONE = -1, EYES_BASE_ADJUST_DIRECTION = 0x00, @@ -246,6 +238,24 @@ enum mot_bone_index { MOT_BONE_MAX = 0xC9, }; +enum mot_play_frame_data_loop_state { + MOT_PLAY_FRAME_DATA_LOOP_NONE = -1, + MOT_PLAY_FRAME_DATA_LOOP_ONCE = 0x00, + MOT_PLAY_FRAME_DATA_LOOP_CONTINUOUS = 0x01, + MOT_PLAY_FRAME_DATA_LOOP_RESET = 0x02, + MOT_PLAY_FRAME_DATA_LOOP_REVERSE = 0x03, + MOT_PLAY_FRAME_DATA_LOOP_MAX = 0x04, +}; + +enum mot_play_frame_data_playback_state { + MOT_PLAY_FRAME_DATA_PLAYBACK_NONE = -1, + MOT_PLAY_FRAME_DATA_PLAYBACK_STOP = 0x00, + MOT_PLAY_FRAME_DATA_PLAYBACK_FORWARD = 0x01, + MOT_PLAY_FRAME_DATA_PLAYBACK_BACKWARD = 0x02, + MOT_PLAY_FRAME_DATA_PLAYBACK_EXTERNAL = 0x03, + MOT_PLAY_FRAME_DATA_PLAYBACK_MAX = 0x04, +}; + enum mothead_data_type { MOTHEAD_DATA_TYPE_0 = 0x00, MOTHEAD_DATA_TYPE_1 = 0x01, @@ -748,6 +758,11 @@ enum rob_chara_data_hand_adjust_type : uint16_t { ROB_CHARA_DATA_HAND_ADJUST_2P = 0x08, ROB_CHARA_DATA_HAND_ADJUST_3P = 0x09, ROB_CHARA_DATA_HAND_ADJUST_4P = 0x0A, + ROB_CHARA_DATA_HAND_ADJUST_TYPE_11 = 0x0B, // X + ROB_CHARA_DATA_HAND_ADJUST_TYPE_12 = 0x0C, + ROB_CHARA_DATA_HAND_ADJUST_TYPE_13 = 0x0D, + ROB_CHARA_DATA_HAND_ADJUST_TYPE_14 = 0x0E, + ROB_CHARA_DATA_HAND_ADJUST_ITEM = 0x0F, }; enum rob_osage_parts { @@ -793,6 +808,14 @@ enum skin_param_osage_root_coli_type { SKIN_PARAM_OSAGE_ROOT_COLI_TYPE_5 = 0x05, }; +enum ExNodeType { + EX_NONE = 0x00, + EX_OSAGE = 0x01, + EX_EXPRESSION = 0x02, + EX_CONSTRAINT = 0x03, + EX_CLOTH = 0x04, +}; + enum SubActExecType { SUB_ACTION_EXECUTE_NONE = 0, SUB_ACTION_EXECUTE_CRY = 1, @@ -947,24 +970,25 @@ struct mot_play_frame_data { float_t step_prev; float_t frame_count; float_t last_frame; - float_t field_14; - int32_t field_18; - int32_t field_1C; - float_t field_20; - float_t field_24; - bool field_28; - int32_t field_2C; + float_t max_frame; + mot_play_frame_data_playback_state playback_state; + mot_play_frame_data_loop_state loop_state; + float_t loop_begin; + float_t loop_end; + bool looped; + int32_t loop_count; void reset(); + void set_frame(float_t frame); }; struct mot_play_data { mot_play_frame_data frame_data; - int32_t field_30; - bool field_34; - float_t field_38; - float_t* field_40; - float_t* field_48; + int32_t loop_index; + bool loop_frames_enabled; + float_t loop_frames; + float_t* ext_frame; + float_t* ext_step; void reset(); }; @@ -1003,7 +1027,7 @@ struct struc_400 { class MotionBlend { public: - bool field_8; + bool enable; bool rot_y; float_t duration; float_t frame; @@ -1013,6 +1037,7 @@ public: MotionBlend(); virtual ~MotionBlend(); + virtual void Reset(); virtual void Field_10(float_t a2, float_t a3, int32_t a4) = 0; virtual void Step(struc_400*) = 0; @@ -1034,6 +1059,7 @@ public: MotionBlendCross(); virtual ~MotionBlendCross() override; + virtual void Reset() override; virtual void Field_10(float_t a2, float_t a3, int32_t a4) override; virtual void Step(struc_400*) override; @@ -1045,6 +1071,7 @@ class MotionBlendCombine : public MotionBlendCross { public: MotionBlendCombine(); virtual ~MotionBlendCombine() override; + virtual void Step(struc_400*) override; virtual bool Field_30() override; }; @@ -1064,6 +1091,7 @@ public: MotionBlendFreeze(); virtual ~MotionBlendFreeze() override; + virtual void Reset() override; virtual void Field_10(float_t a2, float_t a3, int32_t a4) override; virtual void Step(struc_400*) override; @@ -1075,6 +1103,7 @@ class PartialMotionBlendFreeze : public MotionBlendFreeze { public: PartialMotionBlendFreeze(); virtual ~PartialMotionBlendFreeze() override; + virtual void Reset() override; virtual void Field_10(float_t a2, float_t a3, int32_t a4) override; virtual void Step(struc_400*) override; @@ -1116,6 +1145,7 @@ struct motion_blend_mot { motion_blend_mot(); virtual ~motion_blend_mot(); + MotionBlendType get_type(); void reset(); }; @@ -1295,8 +1325,14 @@ struct rob_chara_bone_data { float_t get_frame(); float_t get_frame_count(); + bool get_motion_has_looped(); void reset(); void set_frame(float_t frame); + void set_motion_frame(float_t frame, float_t step, float_t frame_count); + void set_motion_loop(float_t loop_begin, int32_t loop_count, float_t loop_end); + void set_motion_loop_state(mot_play_frame_data_loop_state value); + void set_motion_max_frame(float_t value); + void set_motion_playback_state(mot_play_frame_data_playback_state value); }; union rob_chara_pv_data_item { @@ -1364,7 +1400,7 @@ struct rob_chara_item_equip_object; class ExNodeBlock { public: bone_node* bone_node_ptr; - ex_node_type type; + ExNodeType type; const char* name; bone_node* parent_bone_node; std::string parent_name; @@ -1376,6 +1412,7 @@ public: ExNodeBlock(); virtual ~ExNodeBlock(); + virtual void Init() = 0; virtual void Field_10() = 0; virtual void Field_18(int32_t stage, bool a3) = 0; @@ -1388,7 +1425,7 @@ public: virtual void Field_50() = 0; virtual void Field_58(); - void InitData(bone_node* bone_node, ex_node_type type, + void InitData(bone_node* bone_node, ExNodeType type, const char* name, rob_chara_item_equip_object* itm_eq_obj); }; @@ -1398,6 +1435,7 @@ public: ExNullBlock(); virtual ~ExNullBlock() override; + virtual void Init() override; virtual void Field_10(); virtual void Field_18(int32_t stage, bool a3) override; @@ -1434,8 +1472,12 @@ struct skin_param_hinge { float_t zmin; float_t zmax; - skin_param_hinge(); - ~skin_param_hinge(); + inline skin_param_hinge() { + ymin = -90.0f; + ymax = 90.0f; + zmin = -90.0f; + zmax = 90.0f; + } void limit(); }; @@ -1447,7 +1489,6 @@ struct skin_param_osage_node { skin_param_hinge hinge; skin_param_osage_node(); - ~skin_param_osage_node(); }; struct RobOsageNodeResetData { @@ -1599,7 +1640,23 @@ struct skin_param { skin_param(); ~skin_param(); - void reset(); + inline void reset() { + coli.clear(); + friction = 1.0f; + wind_afc = 0.0f; + air_res = 1.0f; + rot = 0.0f; + init_rot = 0.0f; + coli_type = 0; + stiffness = 0.0f; + move_cancel = -0.01f; + coli_r = 0.0f; + hinge = skin_param_hinge(); + hinge.limit(); + force = 0.0f; + force_gain = 0.0f; + colli_tgt_osg = 0; + } }; struct osage_coli { @@ -1772,7 +1829,7 @@ struct RobCloth : public CLOTH { CLOTHNode* node, float_t facing, int32_t indices_count, uint16_t* indices, bool double_faced); }; -struct ExClothBlock : public ExNodeBlock { +class ExClothBlock : public ExNodeBlock { public: RobCloth rob; obj_skin_block_cloth* cls_data; @@ -1890,6 +1947,7 @@ public: ExOsageBlock(); virtual ~ExOsageBlock() override; + virtual void Init() override; virtual void Field_10(); virtual void Field_18(int32_t stage, bool a3) override; @@ -1927,6 +1985,7 @@ public: ExConstraintBlock(); virtual ~ExConstraintBlock() override; + virtual void Init() override; virtual void Field_10() override; virtual void Field_18(int32_t stage, bool a3) override; @@ -2004,6 +2063,7 @@ public: ExExpressionBlock(); virtual ~ExExpressionBlock() override; + virtual void Init() override; virtual void Field_10() override; virtual void Field_18(int32_t stage, bool a3) override; @@ -2022,7 +2082,7 @@ public: struct ex_data_name_bone_index { const char* name; - int32_t bone_index; + uint32_t bone_index; }; struct rob_chara_item_equip; @@ -2363,6 +2423,7 @@ public: SubActExec(SubActExecType type); virtual ~SubActExec(); + virtual void Field_8() = 0; virtual void Field_10(SubActParam* param) = 0; virtual void Field_18(rob_chara* rob_chr) = 0; @@ -2373,6 +2434,7 @@ class SubActExecAngry : public SubActExec { public: SubActExecAngry(); virtual ~SubActExecAngry() override; + virtual void Field_8() override; virtual void Field_10(SubActParam* param) override; virtual void Field_18(rob_chara* rob_chr) override; @@ -2387,6 +2449,7 @@ public: SubActExecCountNum(); virtual ~SubActExecCountNum() override; + virtual void Field_8() override; virtual void Field_10(SubActParam* param) override; virtual void Field_18(rob_chara* rob_chr) override; @@ -2397,6 +2460,7 @@ class SubActExecCry : public SubActExec { public: SubActExecCry(); virtual ~SubActExecCry() override; + virtual void Field_8() override; virtual void Field_10(SubActParam* param) override; virtual void Field_18(rob_chara* rob_chr) override; @@ -2408,6 +2472,7 @@ public: int8_t field_10; SubActExecEmbarrassed(); virtual ~SubActExecEmbarrassed() override; + virtual void Field_8() override; virtual void Field_10(SubActParam* param) override; virtual void Field_18(rob_chara* rob_chr) override; @@ -2418,6 +2483,7 @@ class SubActExecLaugh : public SubActExec { public: SubActExecLaugh(); virtual ~SubActExecLaugh() override; + virtual void Field_8() override; virtual void Field_10(SubActParam* param) override; virtual void Field_18(rob_chara* rob_chr) override; @@ -2429,8 +2495,10 @@ public: int32_t field_10; int32_t field_14; int8_t field_18; + SubActExecShakeHand(); virtual ~SubActExecShakeHand() override; + virtual void Field_8() override; virtual void Field_10(SubActParam* param) override; virtual void Field_18(rob_chara* rob_chr) override; @@ -2481,20 +2549,44 @@ public: float_t frame; float_t play_frame_step; float_t frame_count; - float_t duration; - float_t step; - float_t offset; + float_t blend_duration; + float_t blend_step; + float_t blend_offset; float_t field_24; struc_389* frame_data; struc_406* step_data; int32_t field_38; - Data(); - ~Data(); + inline Data() : motion_id(), mottbl_index(), state(), frame(), + play_frame_step(), frame_count(), blend_duration(), blend_step(), + blend_offset(), field_24(), frame_data(), step_data(), field_38() { + Reset(); + } + + inline ~Data() { + + } + + inline void Reset() { + motion_id = -1; + mottbl_index = 6; + state = -1; + frame = 0.0f; + play_frame_step = 1.0f; + frame_count = 0.0f; + blend_duration = 0.0f; + blend_step = 1.0f; + blend_offset = 1.0f; + field_24 = 0.0f; + frame_data = 0; + step_data = 0; + field_38 = -1; + } } data; RobPartialMotion(); virtual ~RobPartialMotion(); + virtual void Reset() = 0; }; @@ -2502,6 +2594,7 @@ class RobFaceMotion : public RobPartialMotion { public: RobFaceMotion(); virtual ~RobFaceMotion() override; + virtual void Reset() override; }; @@ -2509,6 +2602,7 @@ class RobHandMotion : public RobPartialMotion { public: RobHandMotion(); virtual ~RobHandMotion() override; + virtual void Reset() override; }; @@ -2516,6 +2610,7 @@ class RobMouthMotion : public RobPartialMotion { public: RobMouthMotion(); virtual ~RobMouthMotion() override; + virtual void Reset() override; }; @@ -2523,6 +2618,7 @@ class RobEyesMotion : public RobPartialMotion { public: RobEyesMotion(); virtual ~RobEyesMotion() override; + virtual void Reset() override; }; @@ -2530,6 +2626,7 @@ class RobEyelidMotion : public RobPartialMotion { public: RobEyelidMotion(); virtual ~RobEyelidMotion() override; + virtual void Reset() override; }; @@ -2538,7 +2635,7 @@ struct struc_405 { RobHandMotion hand_l; RobHandMotion hand_r; RobMouthMotion mouth; - RobEyesMotion eye; + RobEyesMotion eyes; RobEyelidMotion eyelid; object_info head_object; object_info hand_l_object; @@ -2625,7 +2722,7 @@ struct rob_chara_motion { int8_t field_28; int8_t field_29; int8_t field_2A; - int32_t field_2C; + int32_t loop_index; uint32_t field_30; int16_t field_34; int16_t field_36; @@ -2687,6 +2784,7 @@ struct mothead_mot { std::vector field_18; std::vector data; std::vector field_28; + bool is_x; mothead_mot(); virtual ~mothead_mot(); @@ -2697,6 +2795,7 @@ struct mothead { int32_t first_mot_id; int32_t last_mot_id; std::vector mots; + void* data_x; mothead(); virtual ~mothead(); @@ -2729,8 +2828,9 @@ struct mothead_mot_file { }; struct struc_377 { - const mothead_data* field_0; - const mothead_data* field_8; + const mothead_data* current; + const mothead_data* data; + bool is_x; // X }; struct struc_226 { @@ -2782,9 +2882,9 @@ struct struc_652 { int32_t field_60; int32_t field_64; int32_t field_68; - int32_t field_6C; - float_t field_70; - float_t field_74; + int32_t loop_count; + float_t loop_begin; + float_t loop_end; float_t field_78; float_t field_7C; float_t field_80; @@ -2870,6 +2970,10 @@ struct struc_652 { struc_652(); ~struc_652(); + + void reset(); + + void sub_140536DD0(); }; struct struc_651 { @@ -2883,6 +2987,10 @@ struct struc_651 { struc_225 field_80[3]; struc_224 field_1C4[3]; int64_t field_308; + float_t arm_adjust_next_value; // X + float_t arm_adjust_prev_value; // X + int32_t arm_adjust_start_frame; // X + float_t arm_adjust_duration; // X float_t field_310; float_t field_314; int8_t field_318; @@ -2897,6 +3005,8 @@ struct struc_651 { struc_306 field_33C[4]; struc_651(); + + void reset(); }; struct struc_223 { @@ -2907,6 +3017,8 @@ struct struc_223 { struc_223(); ~struc_223(); + + void reset(); }; struct rob_chara_data_miku_rot { @@ -2950,6 +3062,9 @@ struct rob_chara_adjust_data { float_t right_hand_scale; float_t left_hand_scale_default; float_t right_hand_scale_default; + mat4 item_mat; // X + vec3 item_trans; // X + float_t item_scale; // X rob_chara_adjust_data(); @@ -3141,6 +3256,7 @@ struct rob_chara_data { int32_t field_3DD8; float_t field_3DDC; uint8_t field_3DE0; + float_t arm_adjust_scale; // X rob_chara_data(); ~rob_chara_data(); @@ -3188,6 +3304,7 @@ struct rob_chara { float_t get_frame_count(); float_t get_max_face_depth(); int32_t get_rob_cmn_mottbl_motion_id(int32_t id); + bool get_visibility(); void load_motion(int32_t motion_id, bool a3, float_t frame, MotionBlendType blend_type, bone_database* bone_data, motion_database* mot_db); void reset_data(rob_chara_pv_data* pv_data, @@ -3199,31 +3316,31 @@ struct rob_chara { void set_chara_pos_adjust_y(float_t value); void set_chara_size(float_t value); void set_eyelid_mottbl_motion_from_face(int32_t a2, - float_t duration, float_t value, float_t offset, motion_database* mot_db); + float_t blend_duration, float_t value, float_t blend_offset, motion_database* mot_db); void set_eyelid_mottbl_motion(int32_t type, - int32_t mottbl_index, float_t value, int32_t state, float_t duration, - float_t a7, float_t step, int32_t a9, float_t offset, motion_database* mot_db); + int32_t mottbl_index, float_t value, int32_t state, float_t blend_duration, + float_t a7, float_t step, int32_t a9, float_t blend_offset, motion_database* mot_db); void set_eyes_mottbl_motion(int32_t type, - int32_t mottbl_index, float_t value, int32_t state, float_t duration, - float_t a7, float_t step, int32_t a9, float_t offset, motion_database* mot_db); + int32_t mottbl_index, float_t value, int32_t state, float_t blend_duration, + float_t a7, float_t step, int32_t a9, float_t blend_offset, motion_database* mot_db); void set_face_mottbl_motion(int32_t type, int32_t mottbl_index, - float_t value, int32_t state, float_t duration, float_t a7, - float_t step, int32_t a9, float_t offset, bool a11, motion_database* mot_db); + float_t value, int32_t state, float_t blend_duration, float_t a7, + float_t step, int32_t a9, float_t blend_offset, bool a11, motion_database* mot_db); void set_frame(float_t frame); void set_hand_l_mottbl_motion(int32_t type, int32_t mottbl_index, - float_t value, int32_t state, float_t duration, float_t a7, - float_t step, int32_t a9, float_t offset, motion_database* mot_db); + float_t value, int32_t state, float_t blend_duration, float_t a7, + float_t step, int32_t a9, float_t blend_offset, motion_database* mot_db); void set_hand_r_mottbl_motion(int32_t type, int32_t mottbl_index, - float_t value, int32_t state, float_t duration, float_t a7, - float_t step, int32_t a9, float_t offset, motion_database* mot_db); + float_t value, int32_t state, float_t blend_duration, float_t a7, + float_t step, int32_t a9, float_t blend_offset, motion_database* mot_db); bool set_motion_id(int32_t motion_id, float_t frame, - float_t duration, bool a5, bool set_motion_reset_data, + float_t blend_duration, bool a5, bool set_motion_reset_data, MotionBlendType blend_type, bone_database* bone_data, motion_database* mot_db); void set_motion_reset_data(int32_t motion_id, float_t frame); void set_motion_skin_param(int32_t motion_id, float_t frame); void set_mouth_mottbl_motion(int32_t type, int32_t mottbl_index, - float_t value, int32_t state, float_t duration, float_t a7, - float_t step, int32_t a9, float_t offset, motion_database* mot_db); + float_t value, int32_t state, float_t blend_duration, float_t a7, + float_t step, int32_t a9, float_t blend_offset, motion_database* mot_db); void set_osage_move_cancel(uint8_t id, float_t value); void set_osage_reset(); void set_osage_step(float_t value); @@ -3263,7 +3380,10 @@ extern void rob_free(); extern mat4* rob_chara_bone_data_get_mats_mat(rob_chara_bone_data* rob_bone_data, size_t index); +extern bool rob_chara_array_check_visibility(int32_t chara_id); extern rob_chara* rob_chara_array_get(int32_t chara_id); +extern rob_chara_bone_data* rob_chara_array_get_bone_data(int32_t chara_id); +extern float_t rob_chara_array_get_data_adjust_scale(int32_t chara_id); extern rob_chara_item_equip* rob_chara_array_get_item_equip(int32_t chara_id); extern int32_t rob_chara_array_init_chara_index(chara_index chara_index, rob_chara_pv_data* pv_data, int32_t module_index, bool can_set_default); diff --git a/src/CRE/shader.cpp b/src/CRE/shader.cpp index 5418e797..afcc0433 100644 --- a/src/CRE/shader.cpp +++ b/src/CRE/shader.cpp @@ -22,10 +22,6 @@ static GLuint shader_compile(const char* vert, const char* frag, const char* vp, static GLuint shader_compile_binary(const char* vert, const char* frag, const char* vp, const char* fp, program_binary* bin, GLsizei* buffer_size, void** binary); static bool shader_load_binary_shader(program_binary* bin, GLuint* program); -static bool shader_parse_define(const char* data, int32_t num_uniform, - const int32_t* vp_unival_max, const int32_t* fp_unival_max, - int32_t* uniform_value, char** temp, size_t* temp_size); -static char* shader_parse_include(char* data, farc* f); static void shader_update_data(shader_set_data* set); shader_state_clip::shader_state_clip() { @@ -96,35 +92,51 @@ shader_state::shader_state() { } -shader_data::shader_data() : state_update_data(), state_matrix_update_data(), -env_update_data(), buffer_update_data(), state_ubo(), state_matrix_ubo(), env_ubo(), buffer_ubo() { +shader_data::shader_data() : local(), local_uniform(), state_update_data(), +state_matrix_update_data(), env_update_data(), buffer_update_data(), local_update_data(), +local_uniform_update_data(), state_ubo(), state_matrix_ubo(), env_ubo(), buffer_ubo() { } int32_t shader::bind(shader_set_data* set, uint32_t sub_index) { int32_t sub_shader_index = 0; - if (num_sub < 1) + if (num_sub < 1) { + set->data.local = 0; + set->data.local_uniform = 0; + set->data.local_update_data = 0; + set->data.local_uniform_update_data = 0; return -1; + } for (shader_sub* i = sub; i->sub_index != sub_index; i++) { sub_shader_index++; - if (sub_shader_index >= num_sub) + if (sub_shader_index >= num_sub) { + set->data.local = 0; + set->data.local_uniform = 0; + set->data.local_update_data = 0; + set->data.local_uniform_update_data = 0; return -1; + } } shader_sub* sub_shader = &sub[sub_shader_index]; - if (!sub_shader) + if (!sub_shader) { + set->data.local = 0; + set->data.local_uniform = 0; + set->data.local_update_data = 0; + set->data.local_uniform_update_data = 0; return -1; + } int32_t unival_curr = 1; int32_t unival = 0; - GLint uniform_val[16]; + int32_t uniform_val[SHADER_MAX_UNIFORM_VALUES] = {}; if (num_uniform > 0) { const int32_t* vp_unival_max = sub_shader->vp_unival_max; const int32_t* fp_unival_max = sub_shader->fp_unival_max; int32_t i = 0; - for (i = 0; i < num_uniform && i < 16; i++) { + for (i = 0; i < num_uniform && i < sizeof(uniform_val) / sizeof(int32_t); i++) { int32_t unival_max = use_permut[i] ? max_def(vp_unival_max[i], fp_unival_max[i]) : 0; unival += unival_curr * min_def(uniform_value[(int32_t)use_uniform[i]], unival_max); @@ -133,16 +145,219 @@ int32_t shader::bind(shader_set_data* set, uint32_t sub_index) { int32_t unival_max_glsl = max_def(vp_unival_max[i], fp_unival_max[i]); uniform_val[i] = min_def(uniform_value[use_uniform[i]], unival_max_glsl); } - - for (; i < 16; i++) - uniform_val[i] = 0; } - gl_state_use_program(sub_shader->program[unival]); - glUniform1iv(SHADER_MAX_PROGRAM_LOCAL_PARAMETERS * 2, 16, uniform_val); + shader_sub_shader& shader = sub_shader->shaders[unival]; + + set->data.local = &shader.data; + set->data.local_uniform = &shader.data_uniform; + set->data.local_update_data = shader.data_update; + set->data.local_uniform_update_data = &shader.data_uniform_update; + + gl_state_use_program(shader.program); + if (memcmp(set->data.local_uniform->uniform_val, uniform_val, sizeof(uniform_val))) { + memcpy(set->data.local_uniform->uniform_val, uniform_val, sizeof(uniform_val)); + *set->data.local_uniform_update_data = true; + } return 0; } +bool shader::parse_define(const char* data, int32_t num_uniform, + const int32_t* vp_unival_max, const int32_t* fp_unival_max, + int32_t* uniform_value, char** temp, size_t* temp_size) { + if (!data) + return false; + + const char* def = strstr(data, "//DEF\n"); + if (!def) { + size_t len = utf8_length(data); + if (len + 1 > *temp_size) { + free_def(*temp); + *temp_size = len + 1; + *temp = force_malloc_s(char, *temp_size); + } + + memcpy(*temp, data, len); + (*temp)[len] = 0; + return true; + } + + if (!num_uniform || !vp_unival_max || !fp_unival_max || !uniform_value) { + size_t len_a = def - data; + def += 5; + if (*def == '\n') + def++; + + size_t len_b = utf8_length(def); + size_t len = 0; + len += len_a + len_b; + + if (len + 1 > *temp_size) { + free_def(*temp); + *temp_size = len + 1; + *temp = force_malloc_s(char, *temp_size); + } + + size_t pos = 0; + memcpy(*temp + pos, data, len_a); + pos += len_a; + memcpy(*temp + pos, def, len_b); + pos += len_b; + (*temp)[pos] = 0; + return true; + } + + const int32_t s = min_def(0x100, num_uniform); + + size_t t_len[0x100]; + char t[0x100] = {}; + + for (int32_t i = 0; i < s; i++) { + sprintf_s(t, sizeof(t), "#define _%d %d\n", i, uniform_value[i]); + t_len[i] = utf8_length(t); + } + + size_t len_a = def - data; + def += 5; + size_t len_b = utf8_length(def); + size_t len = 0; + for (int32_t i = 0; i < s; i++) + len += t_len[i]; + if (!len) + def++; + len += len_a + len_b; + + if (len + 1 > *temp_size) { + free_def(*temp); + *temp_size = len + 1; + *temp = force_malloc_s(char, *temp_size); + } + + size_t pos = 0; + memcpy(*temp + pos, data, len_a); + pos += len_a; + for (int32_t i = 0; i < s; i++) { + sprintf_s(t, sizeof(t), "#define _%d %d\n", i, uniform_value[i]); + memcpy(*temp + pos, t, t_len[i]); + pos += t_len[i]; + } + memcpy(*temp + pos, def, len_b); + pos += len_b; + (*temp)[pos] = 0; + return true; +} + +char* shader::parse_include(char* data, farc* f) { + if (!data || !f) + return data; + + char* data_end = data + utf8_length(data); + char* i0 = strstr(data, "#include \""); + char* i1 = i0 ? strstr(i0, "\"\n") : 0; + if (!i0 || !i1) + return data; + + size_t count = 1; + while (i1 && (i0 = strstr(i1, "#include \""))) { + i0 += 10; + i1 = strstr(i0, "\"\n"); + if (i1) + i1 += 1; + count++; + } + + char** temp = force_malloc_s(char*, count); + size_t* temp_len = force_malloc_s(size_t, count); + char** temp_ptr0 = force_malloc_s(char*, count); + char** temp_ptr1 = force_malloc_s(char*, count); + if (!temp || !temp_len || !temp_ptr0 || !temp_ptr1) { + free_def(temp); + free_def(temp_len); + free_def(temp_ptr0); + free_def(temp_ptr1); + return data; + } + + i1 = data; + for (size_t i = 0; i < count; i++) { + temp[i] = 0; + i0 = i1 ? strstr(i1, "#include \"") : 0; + i1 = i0 ? strstr(i0, "\"\n") : 0; + if (!i0 || !i1) + continue; + + temp_ptr0[i] = i0; + temp_ptr1[i] = i1 + 1; + i0 += 10; + size_t s = i1 - i0; + i1 += 2; + char* t = force_malloc_s(char, s + 1); + if (!t) + continue; + + memcpy(t, i0, s); + t[s] = 0; + + farc_file* ff = f->read_file(t); + free_def(t); + if (!ff) + continue; + + t = force_malloc_s(char, ff->size + 1); + if (t) { + memcpy(t, ff->data, ff->size); + t[ff->size] = 0; + } + temp[i] = t; + temp_len[i] = ff->size; + } + + size_t len = data_end - data; + i1 = data; + for (size_t i = 0; i < count; i++) { + i0 = temp_ptr0[i]; + i1 = temp_ptr1[i]; + if (!i0 || !i1) + continue; + + len -= i1 - i0; + len += temp_len[i]; + } + + char* temp_data = force_malloc_s(char, len + 1); + size_t pos = 0; + memcpy(temp_data + pos, data, temp_ptr0[0] - data); + pos += temp_ptr0[0] - data; + for (int32_t i = 0; i < count; i++) { + if (temp[i]) { + size_t s = temp_len[i]; + memcpy(temp_data + pos, temp[i], s); + pos += s; + } + + if (i < count - 1 && temp_ptr1[i]) { + size_t s = temp_ptr0[i + 1] - temp_ptr1[i]; + memcpy(temp_data + pos, temp_ptr1[i], s); + pos += s; + } + else if (temp_ptr1[i]) { + size_t s = data_end - temp_ptr1[i]; + memcpy(temp_data + pos, temp_ptr1[i], s); + pos += s; + } + } + temp_data[pos] = 0; + + free_def(data); + for (size_t i = 0; i < count; i++) + free_def(temp[i]); + free_def(temp); + free_def(temp_len); + free_def(temp_ptr0); + free_def(temp_ptr1); + return temp_data; +} + void shader::unbind() { gl_state_use_program(0); gl_state_bind_uniform_buffer_base(0, 0); @@ -151,10 +366,15 @@ void shader::unbind() { gl_state_bind_uniform_buffer_base(3, 0); } -shader_set_data::shader_set_data() : shaders(), size(), data() { +shader_set_data::shader_set_data() : shaders(), + size(), data(), primitive_restart(), primitive_restart_index() { } +void shader_set_data::disable_primitive_restart() { + primitive_restart = false; +} + void shader_set_data::draw_arrays(GLenum mode, GLint first, GLsizei count) { shader_update_data(this); glDrawArrays(mode, first, count); @@ -172,6 +392,10 @@ void shader_set_data::draw_range_elements(GLenum mode, glDrawRangeElements(mode, start, end, count, type, indices); } +void shader_set_data::enable_primitive_restart() { + primitive_restart = true; +} + int32_t shader_set_data::get_index_by_name(const char* name) { for (size_t i = 0; i < size; i++) if (!str_utils_compare(shaders[i].name, name)) @@ -179,27 +403,28 @@ int32_t shader_set_data::get_index_by_name(const char* name) { return -1; } -void shader_set_data::load(farc* f, bool ignore_cache, bool not_load_cache, +void shader_set_data::load(farc* f, bool ignore_cache, const char* name, const shader_table* shaders_table, const size_t size, const shader_bind_func* bind_func_table, const size_t bind_func_table_size) { if (!this || !f || !shaders_table || !size) return; + wchar_t temp_buf[MAX_PATH]; + if (FAILED(SHGetFolderPathW(0, CSIDL_LOCAL_APPDATA, 0, 0, temp_buf))) + return; + + wcscat_s(temp_buf, sizeof(temp_buf) / sizeof(wchar_t), L"\\ReDIVA"); + CreateDirectoryW(temp_buf, 0); + + wchar_t buf[MAX_PATH]; + swprintf_s(buf, sizeof(buf) / sizeof(wchar_t), L"\\%hs_shader_cache", name); + wcscat_s(temp_buf, sizeof(temp_buf) / sizeof(wchar_t), buf); + bool shader_cache_changed = false; farc shader_cache_farc; - wchar_t temp_buf[MAX_PATH]; - if (!ignore_cache && SUCCEEDED(SHGetFolderPathW(0, CSIDL_LOCAL_APPDATA, 0, 0, temp_buf))) { - wcscat_s(temp_buf, sizeof(temp_buf) / sizeof(wchar_t), L"\\ReDIVA"); - CreateDirectoryW(temp_buf, 0); - - wchar_t buf[MAX_PATH]; - swprintf_s(buf, sizeof(buf) / sizeof(wchar_t), L"\\%hs_shader_cache", name); - wcscat_s(temp_buf, sizeof(temp_buf) / sizeof(wchar_t), buf); - - swprintf_s(buf, sizeof(buf) / sizeof(wchar_t), L"%ls.farc", temp_buf); - if (path_check_file_exists(buf) && !not_load_cache) - shader_cache_farc.read(buf, true, false); - } + swprintf_s(buf, sizeof(buf) / sizeof(wchar_t), L"%ls.farc", temp_buf); + if (!ignore_cache && path_check_file_exists(buf)) + shader_cache_farc.read(buf, true, false); GLsizei buffer_size = 0x20000; void* binary = force_malloc(buffer_size); @@ -284,8 +509,8 @@ void shader_set_data::load(farc* f, bool ignore_cache, bool not_load_cache, } strcat_s(shader_cache_file_name, sizeof(shader_cache_file_name), ".bin"); - vert_data = shader_parse_include(vert_data, f); - frag_data = shader_parse_include(frag_data, f); + vert_data = shader::parse_include(vert_data, f); + frag_data = shader::parse_include(frag_data, f); uint64_t vert_data_hash = hash_utf8_fnv1a64m(vert_data); uint64_t frag_data_hash = hash_utf8_fnv1a64m(frag_data); @@ -293,10 +518,10 @@ void shader_set_data::load(farc* f, bool ignore_cache, bool not_load_cache, program_binary* bin = 0; if (!ignore_cache) { if (!shader_cache_file || !shader_cache_file->data) - /*printf("data error: %s %s\n", vert_file_buf, frag_file_buf)*/; + printf_debug("Shader not compiled: %s %s\n", vert_file_buf, frag_file_buf); else if (vert_data_hash != ((uint64_t*)shader_cache_file->data)[0] || frag_data_hash != ((uint64_t*)shader_cache_file->data)[1]) - /*printf("hash error: %s %s\n", vert_file_buf, frag_file_buf)*/; + printf_debug("Shader hash not equal: %s %s\n", vert_file_buf, frag_file_buf); else bin = (program_binary*)&((uint64_t*)shader_cache_file->data)[2]; } @@ -316,8 +541,8 @@ void shader_set_data::load(farc* f, bool ignore_cache, bool not_load_cache, if (!ignore_cache) program_data_binary.reserve(unival_count); - sub->program = force_malloc_s(GLuint, unival_count); - if (sub->program) { + sub->shaders = force_malloc_s(shader_sub_shader, unival_count); + if (sub->shaders) { char vert_buf[MAX_PATH]; char frag_buf[MAX_PATH]; @@ -354,25 +579,24 @@ void shader_set_data::load(farc* f, bool ignore_cache, bool not_load_cache, frag_buf[frag_buf_pos + l] = (char)('0' + vec_frag[l]); } - if (!bin || !shader_load_binary_shader(bin, &sub->program[k])) { - bool vert_succ = shader_parse_define(vert_data, + if (!bin || !shader_load_binary_shader(bin, &sub->shaders[k].program)) { + bool vert_succ = shader::parse_define(vert_data, num_uniform, vp_unival_max, fp_unival_max, vec_vert.data(), &temp_vert, &temp_vert_size); - bool frag_succ = shader_parse_define(frag_data, + bool frag_succ = shader::parse_define(frag_data, num_uniform, vp_unival_max, fp_unival_max, vec_frag.data(), &temp_frag, &temp_frag_size); - //printf("%s %s\n", vert_buf, frag_buf); if (ignore_cache) - sub->program[k] = shader_compile(vert_succ ? temp_vert : 0, + sub->shaders[k].program = shader_compile(vert_succ ? temp_vert : 0, frag_succ ? temp_frag : 0, vert_buf, frag_buf); else { program_data_binary.push_back({}); - sub->program[k] = shader_compile_binary(vert_succ ? temp_vert : 0, + sub->shaders[k].program = shader_compile_binary(vert_succ ? temp_vert : 0, frag_succ ? temp_frag : 0, vert_buf, frag_buf, &program_data_binary.back(), &buffer_size, &binary); } - shader_cache_changed |= sub->program[k] ? true : false; + shader_cache_changed |= sub->shaders[k].program ? true : false; } else { program_data_binary.push_back({}); @@ -390,8 +614,8 @@ void shader_set_data::load(farc* f, bool ignore_cache, bool not_load_cache, } else { program_data_binary.reserve(1); - sub->program = force_malloc_s(GLuint, 1); - if (sub->program) { + sub->shaders = force_malloc_s(shader_sub_shader, 1); + if (sub->shaders) { char vert_buf[MAX_PATH]; char frag_buf[MAX_PATH]; strcpy_s(vert_buf, sizeof(vert_buf), sub_table->vp); @@ -399,23 +623,22 @@ void shader_set_data::load(farc* f, bool ignore_cache, bool not_load_cache, strcat_s(vert_buf, sizeof(vert_buf), "..vert"); strcat_s(frag_buf, sizeof(vert_buf), "..frag"); - if (!bin || !shader_load_binary_shader(bin, &sub->program[0])) { - bool vert_succ = shader_parse_define(vert_data, + if (!bin || !shader_load_binary_shader(bin, &sub->shaders[0].program)) { + bool vert_succ = shader::parse_define(vert_data, 0, 0, 0, 0, &temp_vert, &temp_vert_size); - bool frag_succ = shader_parse_define(frag_data, + bool frag_succ = shader::parse_define(frag_data, 0, 0, 0, 0, &temp_frag, &temp_frag_size); - //printf("%s %s\n", vert_buf, frag_buf); if (ignore_cache) - sub->program[0] = shader_compile(vert_succ ? temp_vert : 0, + sub->shaders[0].program = shader_compile(vert_succ ? temp_vert : 0, frag_succ ? temp_frag : 0, vert_buf, frag_buf); else { program_data_binary.push_back({}); - sub->program[0] = shader_compile_binary(vert_succ ? temp_vert : 0, + sub->shaders[0].program = shader_compile_binary(vert_succ ? temp_vert : 0, frag_succ ? temp_frag : 0, vert_buf, frag_buf, &program_data_binary.back(), &buffer_size, &binary); } - shader_cache_changed |= sub->program[0] ? true : false; + shader_cache_changed |= sub->shaders[0].program ? true : false; } else { program_data_binary.push_back({}); @@ -432,10 +655,8 @@ void shader_set_data::load(farc* f, bool ignore_cache, bool not_load_cache, } if (!ignore_cache) { - if (!shader_cache_file) { - shader_cache_farc.add_file(shader_cache_file_name); - shader_cache_file = &shader_cache_farc.files.back(); - } + if (!shader_cache_file) + shader_cache_file = shader_cache_farc.add_file(shader_cache_file_name); else free_def(shader_cache_file->data); @@ -474,7 +695,7 @@ void shader_set_data::load(farc* f, bool ignore_cache, bool not_load_cache, vec_frag.clear(); for (size_t j = 0; j < bind_func_table_size; j++) - if (shader->name_index == bind_func_table[j].index) { + if (shader->name_index == bind_func_table[j].name_index) { shader->bind_func = bind_func_table[j].bind_func; break; } @@ -487,25 +708,40 @@ void shader_set_data::load(farc* f, bool ignore_cache, bool not_load_cache, shader_cache_farc.write(temp_buf, FARC_COMPRESS_FArC, false); memset(&data, 0, sizeof(data)); - glGenBuffers(1, &data.state_ubo); - gl_state_bind_uniform_buffer(data.state_ubo); - glBufferData(GL_UNIFORM_BUFFER, sizeof(data.state), (void*)&data.state, GL_DYNAMIC_DRAW); - gl_state_bind_uniform_buffer(0); + if (GLAD_GL_VERSION_4_4) { + glGenBuffers(4, &data.state_ubo); - glGenBuffers(1, &data.state_matrix_ubo); - gl_state_bind_uniform_buffer(data.state_matrix_ubo); - glBufferData(GL_UNIFORM_BUFFER, sizeof(data.state_matrix), (void*)&data.state_matrix, GL_DYNAMIC_DRAW); - gl_state_bind_uniform_buffer(0); + gl_state_bind_uniform_buffer(data.state_ubo, true); + glBufferStorage(GL_UNIFORM_BUFFER, sizeof(data.state), 0, GL_DYNAMIC_STORAGE_BIT); - glGenBuffers(1, &data.env_ubo); - gl_state_bind_uniform_buffer(data.env_ubo); - glBufferData(GL_UNIFORM_BUFFER, sizeof(data.env), (void*)&data.env, GL_DYNAMIC_DRAW); - gl_state_bind_uniform_buffer(0); + gl_state_bind_uniform_buffer(data.state_matrix_ubo, true); + glBufferStorage(GL_UNIFORM_BUFFER, sizeof(data.state_matrix), 0, GL_DYNAMIC_STORAGE_BIT); - glGenBuffers(1, &data.buffer_ubo); - gl_state_bind_uniform_buffer(data.buffer_ubo); - glBufferData(GL_UNIFORM_BUFFER, sizeof(data.buffer), (void*)&data.buffer, GL_DYNAMIC_DRAW); - gl_state_bind_uniform_buffer(0); + gl_state_bind_uniform_buffer(data.env_ubo, true); + glBufferStorage(GL_UNIFORM_BUFFER, sizeof(data.env), 0, GL_DYNAMIC_STORAGE_BIT); + + gl_state_bind_uniform_buffer(data.buffer_ubo, true); + glBufferStorage(GL_UNIFORM_BUFFER, sizeof(data.buffer), 0, GL_DYNAMIC_STORAGE_BIT); + + gl_state_bind_uniform_buffer(0); + } + else { + glGenBuffers(4, &data.state_ubo); + + gl_state_bind_uniform_buffer(data.state_ubo, true); + glBufferData(GL_UNIFORM_BUFFER, sizeof(data.state), 0, GL_DYNAMIC_DRAW); + + gl_state_bind_uniform_buffer(data.state_matrix_ubo, true); + glBufferData(GL_UNIFORM_BUFFER, sizeof(data.state_matrix), 0, GL_DYNAMIC_DRAW); + + gl_state_bind_uniform_buffer(data.env_ubo, true); + glBufferData(GL_UNIFORM_BUFFER, sizeof(data.env), 0, GL_DYNAMIC_DRAW); + + gl_state_bind_uniform_buffer(data.buffer_ubo, true); + glBufferData(GL_UNIFORM_BUFFER, sizeof(data.buffer), 0, GL_DYNAMIC_DRAW); + + gl_state_bind_uniform_buffer(0); + } } void shader_set_data::set(uint32_t index) { @@ -525,11 +761,13 @@ void shader_set_data::set(uint32_t index) { shader::unbind(); } +void shader_set_data::set_primitive_restart_index(GLuint index) { + if (primitive_restart_index != index) + primitive_restart_index = index; +} + void shader_set_data::unload() { - glDeleteBuffers(1, &data.state_ubo); - glDeleteBuffers(1, &data.state_matrix_ubo); - glDeleteBuffers(1, &data.env_ubo); - glDeleteBuffers(1, &data.buffer_ubo); + glDeleteBuffers(4, &data.state_ubo); memset(&data, 0, sizeof(data)); for (size_t i = 0; i < size; i++) { @@ -550,15 +788,15 @@ void shader_set_data::unload() { unival_curr *= unival_max + 1; } - if (sub->program) + if (sub->shaders) for (size_t k = 0; k < unival_count; k++) - glDeleteProgram(sub->program[k]); - free_def(sub->program); + glDeleteProgram(sub->shaders[k].program); + free_def(sub->shaders); } else { - if (sub->program) - glDeleteProgram(sub->program[0]); - free_def(sub->program); + if (sub->shaders) + glDeleteProgram(sub->shaders[0].program); + free_def(sub->shaders); } } free_def(shader->sub); @@ -971,48 +1209,79 @@ void shader_set_data::buffer_set(size_t index, size_t count, const vec4* data) { } void shader_set_data::local_frag_set(size_t index, float_t x, float_t y, float_t z, float_t w) { - if (!this || index >= SHADER_MAX_PROGRAM_LOCAL_PARAMETERS) + if (!this || !this->data.local || !this->data.local_update_data + || index >= SHADER_MAX_PROGRAM_LOCAL_PARAMETERS) return; - glUniform4f((GLint)(index + SHADER_MAX_PROGRAM_LOCAL_PARAMETERS), x, y, z, w); + vec4 data = { x, y, z, w }; + if (!memcmp(&this->data.local->frag[index], &data, sizeof(vec4))) + return; + + this->data.local->frag[index] = data; + this->data.local_update_data[1] = true; } void shader_set_data::local_frag_set(size_t index, const vec4& data) { - if (!this || index >= SHADER_MAX_PROGRAM_LOCAL_PARAMETERS) + if (!this || !this->data.local || !this->data.local_update_data + || index >= SHADER_MAX_PROGRAM_LOCAL_PARAMETERS) return; - glUniform4f((GLint)(index + SHADER_MAX_PROGRAM_LOCAL_PARAMETERS), data.x, data.y, data.z, data.w); + if (!memcmp(&this->data.local->frag[index], &data, sizeof(vec4))) + return; + + this->data.local->frag[index] = data; + this->data.local_update_data[1] = true; } void shader_set_data::local_frag_set(size_t index, size_t count, const vec4* data) { - if (!this || index >= SHADER_MAX_PROGRAM_LOCAL_PARAMETERS + if (!this || !this->data.local || !this->data.local_update_data + || index >= SHADER_MAX_PROGRAM_LOCAL_PARAMETERS || index + count > SHADER_MAX_PROGRAM_LOCAL_PARAMETERS || !data) return; - glUniform4fv((GLint)(index + SHADER_MAX_PROGRAM_LOCAL_PARAMETERS), - (GLsizei)count, (const GLfloat*)data); + if (!memcmp(&this->data.local->frag[index], data, sizeof(vec4) * count)) + return; + + memcpy(&this->data.local->frag[index], data, sizeof(vec4) * count); + this->data.local_update_data[1] = true; } void shader_set_data::local_vert_set(size_t index, float_t x, float_t y, float_t z, float_t w) { - if (!this || index >= SHADER_MAX_PROGRAM_LOCAL_PARAMETERS) + if (!this || !this->data.local || !this->data.local_update_data + || index >= SHADER_MAX_PROGRAM_LOCAL_PARAMETERS) return; - glUniform4f((GLint)index, x, y, z, w); + vec4 data = { x, y, z, w }; + if (!memcmp(&this->data.local->vert[index], &data, sizeof(vec4))) + return; + + this->data.local->vert[index] = data; + this->data.local_update_data[0] = true; } void shader_set_data::local_vert_set(size_t index, const vec4& data) { - if (!this || index >= SHADER_MAX_PROGRAM_LOCAL_PARAMETERS) + if (!this || !this->data.local || !this->data.local_update_data + || index >= SHADER_MAX_PROGRAM_LOCAL_PARAMETERS) return; - glUniform4f((GLint)index, data.x, data.y, data.z, data.w); + if (!memcmp(&this->data.local->vert[index], &data, sizeof(vec4))) + return; + + this->data.local->vert[index] = data; + this->data.local_update_data[0] = true; } void shader_set_data::local_vert_set(size_t index, size_t count, const vec4* data) { - if (!this || index >= SHADER_MAX_PROGRAM_LOCAL_PARAMETERS + if (!this || !this->data.local || !this->data.local_update_data + || index >= SHADER_MAX_PROGRAM_LOCAL_PARAMETERS || index + count > SHADER_MAX_PROGRAM_LOCAL_PARAMETERS || !data) return; - glUniform4fv((GLint)index, (GLsizei)count, (const GLfloat*)data); + if (!memcmp(&this->data.local->vert[index], data, sizeof(vec4) * count)) + return; + + memcpy(&this->data.local->vert[index], data, sizeof(vec4) * count); + this->data.local_update_data[0] = true; } void shader_set_data::env_frag_set(size_t index, float_t x, float_t y, float_t z, float_t w) { @@ -1656,6 +1925,10 @@ void shader_set_data::state_material_set_shininess(bool back, const vec4& data) this->data.state_update_data = true; } +void shader_set_data::state_matrix_set_modelview(const mat4& data, bool mult) { + state_matrix_set_modelview(0, data, mult); +} + void shader_set_data::state_matrix_set_modelview(size_t index, const mat4& data, bool mult) { if (!this || index >= SHADER_MAX_VERTEX_UNITS) return; @@ -1715,7 +1988,7 @@ void shader_set_data::state_matrix_set_projection(const mat4& data, bool mult) { } void shader_set_data::state_matrix_set_mvp(const mat4& data) { - if (!this ) + if (!this) return; if (!memcmp(&this->data.state_matrix.mvp.mat, &data, sizeof(mat4))) @@ -1737,12 +2010,21 @@ void shader_set_data::state_matrix_set_mvp(const mat4& data) { this->data.state_matrix_update_data = true; } +void shader_set_data::state_matrix_set_modelview(const mat4& model, const mat4& view, bool mult) { + state_matrix_set_modelview(0, model, view, mult); +} + void shader_set_data::state_matrix_set_modelview(size_t index, const mat4& model, const mat4& view, bool mult) { mat4 mv; mat4_mult(&model, &view, &mv); state_matrix_set_modelview(index, mv, true); } +void shader_set_data::state_matrix_set_mvp(const mat4& modelview, const mat4& projection) { + state_matrix_set_modelview(modelview, false); + state_matrix_set_projection(projection, true); +} + void shader_set_data::state_matrix_set_mvp(const mat4& model, const mat4& view, const mat4& projection) { mat4 mv; mat4_mult(&model, &view, &mv); @@ -2085,10 +2367,7 @@ static GLuint shader_compile_shader(GLenum type, const char* data, const char* f if (!success) { GLchar* info_log = force_malloc_s(GLchar, 0x10000); glGetShaderInfoLog(shader, 0x10000, 0, info_log); - printf("Shader compile error:\n"); - printf("file: %s\n", file); - printf(info_log); - putchar('\n'); + printf_debug("Shader compile error:\nfile: %s\n%s\n", file, info_log); free_def(info_log); glDeleteShader(shader); @@ -2140,10 +2419,7 @@ static GLuint shader_compile(const char* vert, const char* frag, const char* vp, if (!success) { GLchar* info_log = force_malloc_s(GLchar, 0x10000); glGetProgramInfoLog(program, 0x10000, 0, info_log); - printf("Program Shader Permut linking error:\n"); - printf("vp: %s; fp: %s\n", vp, fp); - printf(info_log); - putchar('\n'); + printf_debug("Program Shader Permut linking error:\nvp: %s; fp: %s\n%s\n", vp, fp, info_log); free_def(info_log); glDeleteProgram(program); return 0; @@ -2178,10 +2454,7 @@ static GLuint shader_compile_binary(const char* vert, const char* frag, const ch if (!success) { GLchar* info_log = force_malloc_s(GLchar, 0x10000); glGetProgramInfoLog(program, 0x10000, 0, info_log); - printf("Program Shader Permut linking error:\n"); - printf("vp: %s; fp: %s\n", vp, fp); - printf(info_log); - putchar('\n'); + printf_debug("Program Shader Permut linking error:\nvp: %s; fp: %s\n%s\n", vp, fp, info_log); free_def(info_log); glDeleteProgram(program); return 0; @@ -2218,249 +2491,86 @@ static bool shader_load_binary_shader(program_binary* bin, GLuint* program) { if (!success) { glDeleteProgram(*program); *program = 0; - //printf("load error: "); return false; } return true; } -static bool shader_parse_define(const char* data, int32_t num_uniform, - const int32_t* vp_unival_max, const int32_t* fp_unival_max, - int32_t* uniform_value, char** temp, size_t* temp_size) { - if (!data) - return false; - - const char* def = strstr(data, "//DEF\n"); - if (!def) - return str_utils_copy(data); - - if (!num_uniform || !vp_unival_max || !fp_unival_max || !uniform_value) { - size_t len_a = def - data; - def += 5; - if (*def == '\n') - def++; - - size_t len_b = utf8_length(def); - size_t len = 0; - len += len_a + len_b; - - if (len + 1 > *temp_size) { - free_def(*temp); - *temp_size = len + 1; - *temp = force_malloc_s(char, *temp_size); - } - - size_t pos = 0; - memcpy(*temp + pos, data, len_a); - pos += len_a; - memcpy(*temp + pos, def, len_b); - pos += len_b; - (*temp)[pos] = 0; - return true; - } - - const int32_t s = min_def(0x100, num_uniform); - - size_t t_len[0x100]; - char t[0x100]; - memset(t, 0, 0x100); - - for (int32_t i = 0; i < s; i++) { - sprintf_s(t, sizeof(t), "#define _%d %d\n", i, uniform_value[i]); - t_len[i] = utf8_length(t); - } - - size_t len_a = def - data; - def += 5; - size_t len_b = utf8_length(def); - size_t len = 0; - for (int32_t i = 0; i < s; i++) - len += t_len[i]; - if (!len) - def++; - len += len_a + len_b; - - if (len + 1 > *temp_size) { - free_def(*temp); - *temp_size = len + 1; - *temp = force_malloc_s(char, *temp_size); - } - - size_t pos = 0; - memcpy(*temp + pos, data, len_a); - pos += len_a; - for (int32_t i = 0; i < s; i++) { - sprintf_s(t, sizeof(t), "#define _%d %d\n", i, uniform_value[i]); - memcpy(*temp + pos, t, t_len[i]); - pos += t_len[i]; - } - memcpy(*temp + pos, def, len_b); - pos += len_b; - (*temp)[pos] = 0; - return true; -} - -static char* shader_parse_include(char* data, farc* f) { - if (!data || !f) - return data; - - char* data_end = data + utf8_length(data); - char* i0 = strstr(data, "#include \""); - char* i1 = i0 ? strstr(i0, "\"\n") : 0; - if (!i0 || !i1) - return data; - - size_t count = 1; - while (i1 && (i0 = strstr(i1, "#include \""))) { - i0 += 10; - i1 = strstr(i0, "\"\n"); - if (i1) - i1 += 1; - count++; - } - - char** temp = force_malloc_s(char*, count); - size_t* temp_len = force_malloc_s(size_t, count); - char** temp_ptr0 = force_malloc_s(char*, count); - char** temp_ptr1 = force_malloc_s(char*, count); - if (!temp || !temp_len || !temp_ptr0 || !temp_ptr1) { - free_def(temp); - free_def(temp_len); - free_def(temp_ptr0); - free_def(temp_ptr1); - return data; - } - - i1 = data; - for (size_t i = 0; i < count; i++) { - temp[i] = 0; - i0 = i1 ? strstr(i1, "#include \"") : 0; - i1 = i0 ? strstr(i0, "\"\n") : 0; - if (!i0 || !i1) - continue; - - temp_ptr0[i] = i0; - temp_ptr1[i] = i1 + 1; - i0 += 10; - size_t s = i1 - i0; - i1 += 2; - char* t = force_malloc_s(char, s + 1); - if (!t) - continue; - - memcpy(t, i0, s); - t[s] = 0; - - farc_file* ff = f->read_file(t); - free_def(t); - if (!ff) - continue; - - t = force_malloc_s(char, ff->size + 1); - if (t) { - memcpy(t, ff->data, ff->size); - t[ff->size] = 0; - } - temp[i] = t; - temp_len[i] = ff->size; - } - - size_t len = data_end - data; - i1 = data; - for (size_t i = 0; i < count; i++) { - i0 = temp_ptr0[i]; - i1 = temp_ptr1[i]; - if (!i0 || !i1) - continue; - - len -= i1 - i0; - len += temp_len[i]; - } - - char* temp_data = force_malloc_s(char, len + 1); - size_t pos = 0; - memcpy(temp_data + pos, data, temp_ptr0[0] - data); - pos += temp_ptr0[0] - data; - for (int32_t i = 0; i < count; i++) { - if (temp[i]) { - size_t s = temp_len[i]; - memcpy(temp_data + pos, temp[i], s); - pos += s; - } - - if (i < count - 1 && temp_ptr1[i]) { - size_t s = temp_ptr0[i + 1] - temp_ptr1[i]; - memcpy(temp_data + pos, temp_ptr1[i], s); - pos += s; - } - else if (temp_ptr1[i]) { - size_t s = data_end - temp_ptr1[i]; - memcpy(temp_data + pos, temp_ptr1[i], s); - pos += s; - } - } - temp_data[pos] = 0; - - free_def(data); - for (size_t i = 0; i < count; i++) - free_def(temp[i]); - free_def(temp); - free_def(temp_len); - free_def(temp_ptr0); - free_def(temp_ptr1); - return temp_data; -} - static void shader_update_data(shader_set_data* set) { if (!set) return; - shader_data* data = &set->data; - if (!data->state_update_data && !data->state_matrix_update_data - && !data->env_update_data && !data->buffer_update_data) - return; - + shader_data& data = set->data; GLuint current_uniform_index = gl_state.uniform_buffer_index; GLuint current_uniform = gl_state.uniform_buffer_binding[current_uniform_index]; bool reset = false; - if (data->state_update_data && data->state_ubo) { - gl_state_bind_uniform_buffer(data->state_ubo); - glBufferSubData(GL_UNIFORM_BUFFER, 0, sizeof(data->state), &data->state); - data->state_update_data = false; - reset = true; + if (data.state_update_data && data.state_ubo) { + if (GLAD_GL_VERSION_4_5) + glNamedBufferSubData(data.state_ubo, 0, sizeof(data.state), &data.state); + else { + gl_state_bind_uniform_buffer(data.state_ubo); + glBufferSubData(GL_UNIFORM_BUFFER, 0, sizeof(data.state), &data.state); + reset = true; + } + data.state_update_data = false; } - if (data->state_matrix_update_data && data->state_matrix_ubo) { - gl_state_bind_uniform_buffer(data->state_matrix_ubo); - glBufferSubData(GL_UNIFORM_BUFFER, 0, sizeof(data->state_matrix), &data->state_matrix); - data->state_matrix_update_data = false; - reset = true; + if (data.state_matrix_update_data && data.state_matrix_ubo) { + if (GLAD_GL_VERSION_4_5) + glNamedBufferSubData(data.state_matrix_ubo, 0, sizeof(data.state_matrix), &data.state_matrix); + else { + gl_state_bind_uniform_buffer(data.state_matrix_ubo); + glBufferSubData(GL_UNIFORM_BUFFER, 0, sizeof(data.state_matrix), &data.state_matrix); + reset = true; + } + data.state_matrix_update_data = false; } - if (data->env_update_data && data->env_ubo) { - gl_state_bind_uniform_buffer(data->env_ubo); - glBufferSubData(GL_UNIFORM_BUFFER, 0, sizeof(data->env), &data->env); - data->env_update_data = false; - reset = true; + if (data.env_update_data && data.env_ubo) { + if (GLAD_GL_VERSION_4_5) + glNamedBufferSubData(data.env_ubo, 0, sizeof(data.env), &data.env); + else { + gl_state_bind_uniform_buffer(data.env_ubo); + glBufferSubData(GL_UNIFORM_BUFFER, 0, sizeof(data.env), &data.env); + reset = true; + } + data.env_update_data = false; } - if (data->buffer_update_data && data->buffer_ubo) { - gl_state_bind_uniform_buffer(data->buffer_ubo); - glBufferSubData(GL_UNIFORM_BUFFER, 0, sizeof(data->buffer.buffer), &data->buffer.buffer); - data->buffer_update_data = false; - reset = true; + if (data.buffer_update_data && data.buffer_ubo) { + if (GLAD_GL_VERSION_4_5) + glNamedBufferSubData(data.buffer_ubo, 0, sizeof(data.buffer.buffer), &data.buffer.buffer); + else { + gl_state_bind_uniform_buffer(data.buffer_ubo); + glBufferSubData(GL_UNIFORM_BUFFER, 0, sizeof(data.buffer.buffer), &data.buffer.buffer); + reset = true; + } + data.buffer_update_data = false; + } + + if (data.local_update_data && data.local_update_data[0] && data.local) { + glUniform4fv(0, sizeof(data.local->vert) / (sizeof(GLfloat) * 4), (GLfloat*)data.local->vert); + data.local_update_data[0] = false; + } + + if (data.local_update_data && data.local_update_data[1] && data.local) { + glUniform4fv(256, sizeof(data.local->frag) / (sizeof(GLfloat) * 4), (GLfloat*)data.local->frag); + data.local_update_data[1] = false; + } + + if (data.local_uniform_update_data && *data.local_uniform_update_data && data.local_uniform) { + glUniform1iv(512, sizeof(*data.local_uniform) / sizeof(int32_t), (GLint*)data.local_uniform); + *data.local_uniform_update_data = false; } if (reset) gl_state_bind_uniform_buffer_base(current_uniform_index, current_uniform); -} -#undef shader_update_state_data_buffer -#undef shader_update_state_data_buffer_array -#undef shader_update_state_data_buffer_array_of_array -#undef shader_update_state_data_buffer_array_array -#undef shader_update_state_matrix_data_buffer -#undef shader_update_env_vert_data_buffer -#undef shader_update_env_frag_data_buffer -#undef shader_update_buffer_data_buffer + if (set->primitive_restart) + gl_state_enable_primitive_restart(); + else + gl_state_disable_primitive_restart(); + + gl_state_set_primitive_restart_index(set->primitive_restart_index); +} diff --git a/src/CRE/shader.hpp b/src/CRE/shader.hpp index f1139c7c..974b35eb 100644 --- a/src/CRE/shader.hpp +++ b/src/CRE/shader.hpp @@ -25,6 +25,7 @@ #define SHADER_MAX_TEXTURE_IMAGE_UNITS 32 #define SHADER_MAX_TEXTURE_UNITS 4 #define SHADER_MAX_UNIFORM_BLOCK_SIZE 65536 +#define SHADER_MAX_UNIFORM_VALUES 16 #define SHADER_MAX_VERTEX_UNITS 4 struct shader_state_clip { @@ -167,15 +168,22 @@ struct shader_state { shader_state(); }; +struct shader_local; +struct shader_local_uniform; + struct shader_data { shader_state state; shader_state_matrix state_matrix; shader_env env; shader_buffer buffer; + shader_local* local; + shader_local_uniform* local_uniform; bool state_update_data; bool state_matrix_update_data; bool env_update_data; bool buffer_update_data; + bool* local_update_data; + bool* local_uniform_update_data; GLuint state_ubo; GLuint state_matrix_ubo; GLuint env_ubo; @@ -190,15 +198,32 @@ struct shader_set_data; typedef void (*PFNSHADERBINDFUNCPROC)(shader_set_data* set, shader* shad); struct shader_bind_func { - uint32_t index; + uint32_t name_index; PFNSHADERBINDFUNCPROC bind_func; }; +struct shader_local { + vec4 vert[SHADER_MAX_PROGRAM_LOCAL_PARAMETERS]; + vec4 frag[SHADER_MAX_PROGRAM_LOCAL_PARAMETERS]; +}; + +struct shader_local_uniform { + int32_t uniform_val[SHADER_MAX_UNIFORM_VALUES]; +}; + +struct shader_sub_shader { + GLuint program; + shader_local data; + shader_local_uniform data_uniform; + bool data_update[2]; + bool data_uniform_update; +}; + struct shader_sub { uint32_t sub_index; const int32_t* vp_unival_max; const int32_t* fp_unival_max; - GLuint* program; + shader_sub_shader* shaders; }; struct shader_sub_table { @@ -230,6 +255,11 @@ struct shader { PFNSHADERBINDFUNCPROC bind_func; int32_t bind(shader_set_data* set, uint32_t sub_index); + + static bool parse_define(const char* data, int32_t num_uniform, + const int32_t* vp_unival_max, const int32_t* fp_unival_max, + int32_t* uniform_value, char** temp, size_t* temp_size); + static char* parse_include(char* data, farc* f); static void unbind(); }; @@ -237,19 +267,24 @@ struct shader_set_data { shader* shaders; size_t size; shader_data data; + GLboolean primitive_restart; + GLuint primitive_restart_index; shader_set_data(); + void disable_primitive_restart(); void draw_arrays(GLenum mode, GLint first, GLsizei count); void draw_elements(GLenum mode, GLsizei count, GLenum type, const void* indices); void draw_range_elements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void* indices); + void enable_primitive_restart(); int32_t get_index_by_name(const char* name); - void load(farc* f, bool ignore_cache, bool not_load_cache, - const char* name, const shader_table* shaders_table, const size_t size, + void load(farc* f, bool ignore_cache, const char* name, + const shader_table* shaders_table, const size_t size, const shader_bind_func* bind_func_table, const size_t bind_func_table_size); void set(uint32_t index); + void set_primitive_restart_index(GLuint index); void unload(); void buffer_get(size_t index, vec4& data); @@ -359,10 +394,13 @@ struct shader_set_data { void state_material_set_emission(bool back, const vec4& data); void state_material_set_shininess(bool back, float_t x, float_t y, float_t z, float_t w); void state_material_set_shininess(bool back, const vec4& data); + void state_matrix_set_modelview(const mat4& data, bool mult); void state_matrix_set_modelview(size_t index, const mat4& data, bool mult); void state_matrix_set_projection(const mat4& data, bool mult); void state_matrix_set_mvp(const mat4& data); + void state_matrix_set_modelview(const mat4& model, const mat4& view, bool mult); void state_matrix_set_modelview(size_t index, const mat4& model, const mat4& view, bool mult); + void state_matrix_set_mvp(const mat4& modelview, const mat4& projection); void state_matrix_set_mvp(const mat4& model, const mat4& view, const mat4& projection); void state_matrix_set_texture(size_t index, const mat4& data); void state_matrix_set_palette(size_t index, const mat4& data); diff --git a/src/CRE/shader_ft.cpp b/src/CRE/shader_ft.cpp index 7f20f95f..dce3aff1 100644 --- a/src/CRE/shader_ft.cpp +++ b/src/CRE/shader_ft.cpp @@ -14,7 +14,10 @@ enum shader_ft_sub_enum { SHADER_FT_SUB_STAGE_BLINN, SHADER_FT_SUB_SKIN_DEFAULT, SHADER_FT_SUB_SSS_SKIN, - SHADER_FT_SUB_SSS_FILTER, + //SHADER_FT_SUB_SSS_FILTER, + SHADER_FT_SUB_SSS_FILTER_MIN, + SHADER_FT_SUB_SSS_FILTER_MIN_NPR, + SHADER_FT_SUB_SSS_FILTER_GAUSS_2D, SHADER_FT_SUB_HAIR_DEFAULT, SHADER_FT_SUB_HAIR_ANISO, SHADER_FT_SUB_HAIR_NPR1, @@ -30,7 +33,9 @@ enum shader_ft_sub_enum { SHADER_FT_SUB_SHADOWMAP, SHADER_FT_SUB_ESM, SHADER_FT_SUB_ESM_GAUSS, - SHADER_FT_SUB_ESM_FILTER, + //SHADER_FT_SUB_ESM_FILTER, + SHADER_FT_SUB_ESM_FILTER_MIN, + SHADER_FT_SUB_ESM_FILTER_EROSION, SHADER_FT_SUB_LIT_PROJ, SHADER_FT_SUB_SIMPLE, SHADER_FT_SUB_SILHOUETTE, @@ -46,8 +51,14 @@ enum shader_ft_sub_enum { SHADER_FT_SUB_MLAA_AREA, SHADER_FT_SUB_MLAA_BLEND, SHADER_FT_SUB_CONTOUR, - SHADER_FT_SUB_EXPOSURE, - SHADER_FT_SUB_PP_GAUSS, + SHADER_FT_SUB_CONTOUR_NPR, + //SHADER_FT_SUB_EXPOSURE, + SHADER_FT_SUB_EXPOSURE_AVERAGE, + SHADER_FT_SUB_EXPOSURE_MEASURE, + SHADER_FT_SUB_EXPOSURE_MINIFY, + //SHADER_FT_SUB_PP_GAUSS, + SHADER_FT_SUB_PP_GAUSS_USUAL, + SHADER_FT_SUB_PP_GAUSS_CONE, SHADER_FT_SUB_SUN, SHADER_FT_SUB_FADE, SHADER_FT_SUB_WATER01, @@ -57,6 +68,7 @@ enum shader_ft_sub_enum { SHADER_FT_SUB_SNOW_PARTICLE, SHADER_FT_SUB_LEAF_PARTICLE, SHADER_FT_SUB_STAR, + SHADER_FT_SUB_STAR_MILKY_WAY, SHADER_FT_SUB_SNOW_RING, SHADER_FT_SUB_SNOW_FOOTPRINT, SHADER_FT_SUB_SNOW_TEX_SPACE_LIGHT, @@ -129,36 +141,60 @@ static const int32_t sss_skin_fpt_unival_max[] = { 1, 0, 1, 1, 1, 0, 1, 1, }; -static const int32_t sss_filter_vpt_unival_max[] = { +/*static const int32_t sss_filter_vpt_unival_max[] = { 0, 3, 0, }; static const int32_t sss_filter_fpt_unival_max[] = { 1, 3, 1, +};*/ + +static const int32_t sss_filter_min_vpt_unival_max[] = { + -1, +}; + +static const int32_t sss_filter_min_fpt_unival_max[] = { + -1, +}; + +static const int32_t sss_filter_min_npr_vpt_unival_max[] = { + -1, +}; + +static const int32_t sss_filter_min_npr_fpt_unival_max[] = { + -1, +}; + +static const int32_t sss_filter_gauss_2d_vpt_unival_max[] = { + 0, +}; + +static const int32_t sss_filter_gauss_2d_fpt_unival_max[] = { + 1, }; static const int32_t hair_default_vpt_unival_max[] = { - 1, 1, 0, 0, 1, 0, 0, 3, 0, 2, 1, 0, 0, 0, 0, // 14th Added + 1, 1, 0, 0, 1, 0, 0, 3, 0, 2, 1, 0, 0, 0, 0, // 14th added }; static const int32_t hair_default_fpt_unival_max[] = { - 1, 0, 2, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 1, // 14th Added + 1, 0, 2, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 1, // 14th added }; static const int32_t hair_aniso_vpt_unival_max[] = { - 1, 1, 0, 0, 1, 0, 0, 3, 0, 2, 1, 0, 0, 0, 0, // 14th Added + 1, 1, 0, 0, 1, 0, 0, 3, 0, 2, 1, 0, 0, 0, 0, // 14th added }; static const int32_t hair_aniso_fpt_unival_max[] = { - 1, 0, 0, 1, 0, 1, 1, 0, 1, 0, 0, 0, 1, 1, 1, // 14th Added + 1, 0, 0, 1, 0, 1, 1, 0, 1, 0, 0, 0, 1, 1, 1, // 14th added }; static const int32_t hair_npr1_vpt_unival_max[] = { - 1, 1, 0, 0, 1, 0, 0, 3, 0, 2, 1, 0, 0, 0, 0, // 14th Added + 1, 1, 0, 0, 1, 0, 0, 3, 0, 2, 1, 0, 0, 0, 0, // 14th added }; static const int32_t hair_npr1_fpt_unival_max[] = { - 1, 0, 0, 0, 0, 1, 0, 3, 1, 0, 0, 0, 0, 0, 1, // 14th Added + 1, 0, 0, 0, 0, 1, 0, 3, 1, 0, 0, 0, 0, 0, 1, // 14th added }; static const int32_t cloth_default_vpt_unival_max[] = { @@ -257,12 +293,28 @@ static const int32_t esm_gauss_fpt_unival_max[] = { 1, }; -static const int32_t esm_filter_vpt_unival_max[] = { +/*static const int32_t esm_filter_vpt_unival_max[] = { 0, }; static const int32_t esm_filter_fpt_unival_max[] = { 1, +};*/ + +static const int32_t esm_filter_min_vpt_unival_max[] = { + -1, +}; + +static const int32_t esm_filter_min_fpt_unival_max[] = { + -1, +}; + +static const int32_t esm_filter_erosion_vpt_unival_max[] = { + -1, +}; + +static const int32_t esm_filter_erosion_fpt_unival_max[] = { + -1, }; static const int32_t lit_proj_vpt_unival_max[] = { @@ -314,19 +366,23 @@ static const int32_t peel_fpt_unival_max[] = { }; static const int32_t tonemap_vpt_unival_max[] = { - 0, 0, 0, 0, 1, 0, 0, 0, + //0, 0, 0, 0, 1, 0, 0, 0, + 0, 0, 0, 0, 1, 0, 0, // 7th removed }; static const int32_t tonemap_fpt_unival_max[] = { - 0, 2, 2, 1, 1, 1, 0, 0, + //0, 2, 2, 1, 1, 1, 0, 0, + 0, 2, 2, 1, 1, 1, 0, // 7th removed }; static const int32_t tonemap_npr1_vpt_unival_max[] = { - 0, 0, 0, 0, 1, 0, 0, 0, + //0, 0, 0, 0, 1, 0, 0, 0, + 0, 0, 0, 0, 1, 0, 0, // 7th removed }; static const int32_t tonemap_npr1_fpt_unival_max[] = { - 1, 0, 0, 1, 1, 0, 0, 1, + //1, 0, 0, 1, 1, 0, 0, 1, + 1, 0, 0, 1, 1, 0, 0, // 7th removed }; static const int32_t reduce_tex_vpt_unival_max[] = { @@ -347,12 +403,12 @@ static const int32_t magnify_fpt_unival_max[] = { /*static const int32_t mlaa_vpt_unival_max[] = { //0, 0, 2, 0, - 0, 2, 0, // 1st removed + 0, 2, 0, // 0th removed }; static const int32_t mlaa_fpt_unival_max[] = { //1, 1, 2, 2, - 1, 2, 2, // 1st removed + 1, 2, 2, // 0th removed };*/ static const int32_t mlaa_edge_vpt_unival_max[] = { @@ -387,20 +443,68 @@ static const int32_t contour_fpt_unival_max[] = { 1, 1, }; -static const int32_t exposure_vpt_unival_max[] = { +static const int32_t contour_npr_vpt_unival_max[] = { + -1, +}; + +static const int32_t contour_npr_fpt_unival_max[] = { + -1, +}; + +/*static const int32_t exposure_vpt_unival_max[] = { 2, }; static const int32_t exposure_fpt_unival_max[] = { 2, +};*/ + +static const int32_t exposure_minify_vpt_unival_max[] = { + -1, }; -static const int32_t pp_gauss_vpt_unival_max[] = { +static const int32_t exposure_minify_fpt_unival_max[] = { + -1, +}; + +static const int32_t exposure_measure_vpt_unival_max[] = { + -1, +}; + +static const int32_t exposure_measure_fpt_unival_max[] = { + -1, +}; + +static const int32_t exposure_average_vpt_unival_max[] = { + -1, +}; + +static const int32_t exposure_average_fpt_unival_max[] = { + -1, +}; + +/*static const int32_t pp_gauss_vpt_unival_max[] = { 1, }; static const int32_t pp_gauss_fpt_unival_max[] = { 1, +};*/ + +static const int32_t pp_gauss_usual_vpt_unival_max[] = { + -1, +}; + +static const int32_t pp_gauss_usual_fpt_unival_max[] = { + -1, +}; + +static const int32_t pp_gauss_cone_vpt_unival_max[] = { + -1, +}; + +static const int32_t pp_gauss_cone_fpt_unival_max[] = { + -1, }; static const int32_t sun_vpt_unival_max[] = { @@ -467,12 +571,28 @@ static const int32_t leaf_particle_fpt_unival_max[] = { -1, }; -static const int32_t star_vpt_unival_max[] = { +/*static const int32_t star_vpt_unival_max[] = { 1, }; static const int32_t star_fpt_unival_max[] = { 1, +};*/ + +static const int32_t star_vpt_unival_max[] = { + -1, +}; + +static const int32_t star_fpt_unival_max[] = { + -1, +}; + +static const int32_t star_milky_way_vpt_unival_max[] = { + -1, +}; + +static const int32_t star_milky_way_fpt_unival_max[] = { + -1, }; static const int32_t snow_ring_vpt_unival_max[] = { @@ -512,7 +632,7 @@ static const int32_t floor_vpt_unival_max[] = { }; static const int32_t floor_fpt_unival_max[] = { - 2, 1, 1, 1, 3, 0, 0, 1, // 7th Added + 2, 1, 1, 1, 3, 0, 0, 1, // 7th added }; static const int32_t puddle_vpt_unival_max[] = { @@ -700,7 +820,7 @@ static const shader_sub_table SSS_SKIN_table[] = { }, }; -static const shader_sub_table SSS_FILT_table[] = { +/*static const shader_sub_table SSS_FILT_table[] = { { SHADER_FT_SUB_SSS_FILTER, sss_filter_vpt_unival_max, @@ -708,6 +828,33 @@ static const shader_sub_table SSS_FILT_table[] = { "sss_filter", "sss_filter", }, +};*/ + +static const shader_sub_table SSS_FILT_MIN_table[] = { + { + SHADER_FT_SUB_SSS_FILTER_MIN, + sss_filter_min_vpt_unival_max, + sss_filter_min_fpt_unival_max, + "sss_filter_min", + "sss_filter_min", + }, + { + SHADER_FT_SUB_SSS_FILTER_MIN_NPR, + sss_filter_min_npr_vpt_unival_max, + sss_filter_min_npr_fpt_unival_max, + "sss_filter_min", + "sss_filter_min_npr", + }, +}; + +static const shader_sub_table SSS_FILT_GAUSS_2D_table[] = { + { + SHADER_FT_SUB_SSS_FILTER_GAUSS_2D, + sss_filter_gauss_2d_vpt_unival_max, + sss_filter_gauss_2d_fpt_unival_max, + "sss_filter_gauss_2d", + "sss_filter_gauss_2d", + }, }; static const shader_sub_table HAIR_table[] = { @@ -848,7 +995,7 @@ static const shader_sub_table ESMGAUSS_table[] = { }, }; -static const shader_sub_table ESMFILT_table[] = { +/*static const shader_sub_table ESMFILT_table[] = { { SHADER_FT_SUB_ESM_FILTER, esm_filter_vpt_unival_max, @@ -856,6 +1003,26 @@ static const shader_sub_table ESMFILT_table[] = { "esm_filter", "esm_filter", }, +};*/ + +static const shader_sub_table ESMFILT_MIN_table[] = { + { + SHADER_FT_SUB_ESM_FILTER_MIN, + esm_filter_min_vpt_unival_max, + esm_filter_min_fpt_unival_max, + "esm_filter_min", + "esm_filter_min", + }, +}; + +static const shader_sub_table ESMFILT_EROSION_table[] = { + { + SHADER_FT_SUB_ESM_FILTER_EROSION, + esm_filter_erosion_vpt_unival_max, + esm_filter_erosion_fpt_unival_max, + "esm_filter_erosion", + "esm_filter_erosion", + }, }; static const shader_sub_table LITPROJ_table[] = { @@ -1005,7 +1172,17 @@ static const shader_sub_table CONTOUR_table[] = { }, }; -static const shader_sub_table EXPOSURE_table[] = { +static const shader_sub_table CONTOUR_NPR_table[] = { + { + SHADER_FT_SUB_CONTOUR_NPR, + contour_npr_vpt_unival_max, + contour_npr_fpt_unival_max, + "contour_npr", + "contour_npr", + }, +}; + +/*static const shader_sub_table EXPOSURE_table[] = { { SHADER_FT_SUB_EXPOSURE, exposure_vpt_unival_max, @@ -1013,9 +1190,39 @@ static const shader_sub_table EXPOSURE_table[] = { "exposure", "exposure", }, +};*/ + +static const shader_sub_table EXPOSURE_MINIFY_table[] = { + { + SHADER_FT_SUB_EXPOSURE_MINIFY, + exposure_minify_vpt_unival_max, + exposure_minify_fpt_unival_max, + "exposure_minify", + "exposure_minify", + }, }; -static const shader_sub_table GAUSS_table[] = { +static const shader_sub_table EXPOSURE_MEASURE_table[] = { + { + SHADER_FT_SUB_EXPOSURE_MEASURE, + exposure_measure_vpt_unival_max, + exposure_measure_fpt_unival_max, + "exposure_measure", + "exposure_measure", + }, +}; + +static const shader_sub_table EXPOSURE_AVERAGE_table[] = { + { + SHADER_FT_SUB_EXPOSURE_AVERAGE, + exposure_average_vpt_unival_max, + exposure_average_fpt_unival_max, + "exposure_average", + "exposure_average", + }, +}; + +/*static const shader_sub_table GAUSS_table[] = { { SHADER_FT_SUB_PP_GAUSS, pp_gauss_vpt_unival_max, @@ -1023,6 +1230,26 @@ static const shader_sub_table GAUSS_table[] = { "pp_gauss", "pp_gauss", }, +};*/ + +static const shader_sub_table GAUSS_USUAL_table[] = { + { + SHADER_FT_SUB_PP_GAUSS_USUAL, + pp_gauss_usual_vpt_unival_max, + pp_gauss_usual_fpt_unival_max, + "pp_gauss_usual", + "pp_gauss_usual", + }, +}; + +static const shader_sub_table GAUSS_CONE_table[] = { + { + SHADER_FT_SUB_PP_GAUSS_CONE, + pp_gauss_cone_vpt_unival_max, + pp_gauss_cone_fpt_unival_max, + "pp_gauss_cone", + "pp_gauss_cone", + }, }; static const shader_sub_table SUN_table[] = { @@ -1115,6 +1342,16 @@ static const shader_sub_table STAR_table[] = { }, }; +static const shader_sub_table STAR_MILKY_WAY_table[] = { + { + SHADER_FT_SUB_STAR_MILKY_WAY, + star_milky_way_vpt_unival_max, + star_milky_way_fpt_unival_max, + "star_milky_way", + "star_milky_way", + }, +}; + static const shader_sub_table SNORING_table[] = { { SHADER_FT_SUB_SNOW_RING, @@ -1396,10 +1633,18 @@ static const uniform_name SSS_SKIN_uniform[] = { U26, }; -static const uniform_name SSS_FILT_uniform[] = { +/*static const uniform_name SSS_FILT_uniform[] = { U16, U_SSS_FILTER, U_NPR, +};*/ + +static const uniform_name SSS_FILT_MIN_uniform[] = { + U_INVALID, +}; + +static const uniform_name SSS_FILT_GAUSS_2D_uniform[] = { + U16, }; static const uniform_name HAIR_uniform[] = { @@ -1417,7 +1662,7 @@ static const uniform_name HAIR_uniform[] = { U_NPR, U_CHARA_COLOR, U_TONE_CURVE, - U_ALPHA_TEST, // 14th Added + U_ALPHA_TEST, // 14th added }; static const uniform_name CLOTH_uniform[] = { @@ -1509,8 +1754,16 @@ static const uniform_name ESMGAUSS_uniform[] = { U_LIGHT_PROJ, }; -static const uniform_name ESMFILT_uniform[] = { +/*static const uniform_name ESMFILT_uniform[] = { U_ESM_FILTER, +};*/ + +static const uniform_name ESMFILT_MIN_uniform[] = { + U_INVALID, +}; + +static const uniform_name ESMFILT_EROSION_uniform[] = { + U_INVALID, }; static const uniform_name LITPROJ_uniform[] = { @@ -1578,7 +1831,7 @@ static const uniform_name TONEMAP_uniform[] = { U_AET_BACK, U_LIGHT_PROJ, U_NPR, - U25, + //U25, 7th removed }; static const uniform_name REDUCE_uniform[] = { @@ -1591,7 +1844,7 @@ static const uniform_name MAGNIFY_uniform[] = { }; /*static const uniform_name MLAA_uniform[] = { - //U16, // 1st removed + //U16, // 0th removed U_ALPHA_MASK, U_MLAA, U_MLAA_SEARCH, @@ -1614,12 +1867,36 @@ static const uniform_name CONTOUR_uniform[] = { U24, }; -static const uniform_name EXPOSURE_uniform[] = { - U_EXPOSURE, +static const uniform_name CONTOUR_NPR_uniform[] = { + U_INVALID, }; -static const uniform_name GAUSS_uniform[] = { +/*static const uniform_name EXPOSURE_uniform[] = { + U_EXPOSURE, +};*/ + +static const uniform_name EXPOSURE_MINIFY_uniform[] = { + U_INVALID, +}; + +static const uniform_name EXPOSURE_MEASURE_uniform[] = { + U_INVALID, +}; + +static const uniform_name EXPOSURE_AVERAGE_uniform[] = { + U_INVALID, +}; + +/*static const uniform_name GAUSS_uniform[] = { U_GAUSS, +};*/ + +static const uniform_name GAUSS_USUAL_uniform[] = { + U_INVALID, +}; + +static const uniform_name GAUSS_CONE_uniform[] = { + U_INVALID, }; static const uniform_name SUN_uniform[] = { @@ -1663,8 +1940,16 @@ static const uniform_name LEAF_PT_uniform[] = { U_INVALID, }; -static const uniform_name STAR_uniform[] = { +/*static const uniform_name STAR_uniform[] = { U_STAR, +};*/ + +static const uniform_name STAR_uniform[] = { + U_INVALID, +}; + +static const uniform_name STAR_MILKY_WAY_uniform[] = { + U_INVALID, }; static const uniform_name SNORING_uniform[] = { @@ -1695,7 +1980,7 @@ static const uniform_name FLOOR_uniform[] = { U_FOG_HEIGHT, U_MORPH, U_MORPH_COLOR, - U_ALPHA_TEST, // 7th Added + U_ALPHA_TEST, // 7th added }; static const uniform_name PUDDLE_uniform[] = { @@ -1796,7 +2081,7 @@ static const bool BLINN_permut[] = { false, false, false, - false, // 11th Added + false, // 11th added }; static const bool ITEM_permut[] = { @@ -1855,10 +2140,18 @@ static const bool SSS_SKIN_permut[] = { false, }; -static const bool SSS_FILT_permut[] = { +/*static const bool SSS_FILT_permut[] = { true, true, true, +};*/ + +static const bool SSS_FILT_MIN_permut[] = { + false, +}; + +static const bool SSS_FILT_GAUSS_2D_permut[] = { + true, }; static const bool HAIR_permut[] = { @@ -1876,7 +2169,7 @@ static const bool HAIR_permut[] = { false, false, false, - false, // 14th Added + false, // 14th added }; static const bool CLOTH_permut[] = { @@ -1965,10 +2258,18 @@ static const bool ESM_permut[] = { }; static const bool ESMGAUSS_permut[] = { + true, +}; + +/*static const bool ESMFILT_permut[] = { + true, +};*/ + +static const bool ESMFILT_MIN_permut[] = { false, }; -static const bool ESMFILT_permut[] = { +static const bool ESMFILT_EROSION_permut[] = { false, }; @@ -2029,7 +2330,7 @@ static const bool PEEL_permut[] = { }; static const bool TONEMAP_permut[] = { - false, + true, false, false, false, @@ -2049,7 +2350,7 @@ static const bool MAGNIFY_permut[] = { }; /*static const bool MLAA_permut[] = { - //true, // 1st removed + //true, // 0th removed true, true, true, @@ -2072,12 +2373,36 @@ static const bool CONTOUR_permut[] = { false, }; -static const bool EXPOSURE_permut[] = { - true, +static const bool CONTOUR_NPR_permut[] = { + false, }; -static const bool GAUSS_permut[] = { +/*static const bool EXPOSURE_permut[] = { true, +};*/ + +static const bool EXPOSURE_MINIFY_permut[] = { + false, +}; + +static const bool EXPOSURE_MEASURE_permut[] = { + false, +}; + +static const bool EXPOSURE_AVERAGE_permut[] = { + false, +}; + +/*static const bool GAUSS_permut[] = { + true, +};*/ + +static const bool GAUSS_USUAL_permut[] = { + false, +}; + +static const bool GAUSS_CONE_permut[] = { + false, }; static const bool SUN_permut[] = { @@ -2114,17 +2439,25 @@ static const bool W_PTCL_permut[] = { }; static const bool SNOW_PT_permut[] = { - false, + true, }; static const bool LEAF_PT_permut[] = { false, }; +/*static const bool STAR_permut[] = { + false, +};*/ + static const bool STAR_permut[] = { false, }; +static const bool STAR_MILKY_WAY_permut[] = { + false, +}; + static const bool SNORING_permut[] = { false, false, @@ -2153,7 +2486,7 @@ static const bool FLOOR_permut[] = { false, false, false, - false, // 7th Added + false, // 7th added }; static const bool PUDDLE_permut[] = { @@ -2225,7 +2558,7 @@ static const bool SHOWVEC_permut[] = { }; static const bool FONT_permut[] = { - false, + true, }; static const bool MOVIE_permut[] = { @@ -2282,7 +2615,7 @@ struct glass_eye_struct { n##_permut, \ } -static const shader_table shader_ft_table[] = { +const shader_table shader_ft_table[] = { { "SHADER_FFP", SHADER_FT_FFP, @@ -2297,7 +2630,9 @@ static const shader_table shader_ft_table[] = { shader_table_struct(STAGE), shader_table_struct(SKIN), shader_table_struct(SSS_SKIN), - shader_table_struct(SSS_FILT), + //shader_table_struct(SSS_FILT), + shader_table_struct(SSS_FILT_MIN), + shader_table_struct(SSS_FILT_GAUSS_2D), shader_table_struct(HAIR), shader_table_struct(CLOTH), shader_table_struct(TIGHTS), @@ -2309,7 +2644,9 @@ static const shader_table shader_ft_table[] = { shader_table_struct(SHDMAP), shader_table_struct(ESM), shader_table_struct(ESMGAUSS), - shader_table_struct(ESMFILT), + //shader_table_struct(ESMFILT), + shader_table_struct(ESMFILT_MIN), + shader_table_struct(ESMFILT_EROSION), shader_table_struct(LITPROJ), shader_table_struct(SIMPLE), shader_table_struct(SIL), @@ -2324,8 +2661,14 @@ static const shader_table shader_ft_table[] = { shader_table_struct(MLAA_AREA), shader_table_struct(MLAA_BLEND), shader_table_struct(CONTOUR), - shader_table_struct(EXPOSURE), - shader_table_struct(GAUSS), + shader_table_struct(CONTOUR_NPR), + //shader_table_struct(EXPOSURE), + shader_table_struct(EXPOSURE_MINIFY), + shader_table_struct(EXPOSURE_MEASURE), + shader_table_struct(EXPOSURE_AVERAGE), + //shader_table_struct(GAUSS), + shader_table_struct(GAUSS_USUAL), + shader_table_struct(GAUSS_CONE), shader_table_struct(SUN), shader_table_struct(FADE), shader_table_struct(WATER01), @@ -2335,6 +2678,7 @@ static const shader_table shader_ft_table[] = { shader_table_struct(SNOW_PT), shader_table_struct(LEAF_PT), shader_table_struct(STAR), + shader_table_struct(STAR_MILKY_WAY), shader_table_struct(SNORING), shader_table_struct(SN_FOOT), shader_table_struct(SN_TSL), @@ -2360,7 +2704,7 @@ static const shader_table shader_ft_table[] = { #undef shader_table_struct -static const size_t shader_ft_table_size = +const size_t shader_ft_table_size = sizeof(shader_ft_table) / sizeof(shader_table); static void glass_eye_calc(glass_eye_struct* glass_eye); @@ -2371,8 +2715,9 @@ static void shader_bind_hair(shader_set_data* set, shader* shad); static void shader_bind_membrane(shader_set_data* set, shader* shad); static void shader_bind_eye_ball(shader_set_data* set, shader* shad); static void shader_bind_tone_map(shader_set_data* set, shader* shad); +static void shader_bind_sss_filter_min(shader_set_data* set, shader* shad); -static const shader_bind_func shader_ft_bind_func_table[] = { +const shader_bind_func shader_ft_bind_func_table[] = { { SHADER_FT_BLINN, shader_bind_blinn, @@ -2397,9 +2742,13 @@ static const shader_bind_func shader_ft_bind_func_table[] = { SHADER_FT_TONEMAP, shader_bind_tone_map, }, + { + SHADER_FT_SSS_FILT_MIN, + shader_bind_sss_filter_min, + }, }; -static const size_t shader_ft_bind_func_table_size = +const size_t shader_ft_bind_func_table_size = sizeof(shader_ft_bind_func_table) / sizeof(shader_bind_func); shader_set_data shaders_ft; @@ -2433,11 +2782,6 @@ glass_eye_struct glass_eye = { 0, }; -void shader_ft_load(shader_set_data* set, farc* f, bool ignore_cache) { - set->load(f, false, false, "ft", shader_ft_table, shader_ft_table_size, - shader_ft_bind_func_table, shader_ft_bind_func_table_size); -} - static void glass_eye_calc(glass_eye_struct* glass_eye) { float_t v2 = glass_eye->field_28; glass_eye->field_64 = glass_eye->field_2C / v2; @@ -2447,7 +2791,7 @@ static void glass_eye_calc(glass_eye_struct* glass_eye) { glass_eye->field_80 = glass_eye->field_48 * v2; glass_eye->field_8C = glass_eye->field_54 * v2; if (glass_eye->field_B0 == 0) { - glass_eye->field_A0 = vec4_null; + glass_eye->field_A0 = 0.0f; return; } @@ -2577,3 +2921,8 @@ static void shader_bind_tone_map(shader_set_data* set, shader* shad) { shad->bind(set, uniform_value[U_NPR] == 1 ? SHADER_FT_SUB_TONEMAP_NPR1 : SHADER_FT_SUB_TONEMAP); } + +static void shader_bind_sss_filter_min(shader_set_data* set, shader* shad) { + shad->bind(set, uniform_value[U_NPR] + ? SHADER_FT_SUB_SSS_FILTER_MIN_NPR : SHADER_FT_SUB_SSS_FILTER_MIN); +} diff --git a/src/CRE/shader_ft.hpp b/src/CRE/shader_ft.hpp index dcf2bb4d..d7a98769 100644 --- a/src/CRE/shader_ft.hpp +++ b/src/CRE/shader_ft.hpp @@ -15,7 +15,9 @@ enum shader_ft_enum { SHADER_FT_STAGE, SHADER_FT_SKIN, SHADER_FT_SSS_SKIN, - SHADER_FT_SSS_FILT, + //SHADER_FT_SSS_FILT, + SHADER_FT_SSS_FILT_MIN, + SHADER_FT_SSS_FILT_GAUSS_2D, SHADER_FT_HAIR, SHADER_FT_CLOTH, SHADER_FT_TIGHTS, @@ -27,7 +29,9 @@ enum shader_ft_enum { SHADER_FT_SHDMAP, SHADER_FT_ESM, SHADER_FT_ESMGAUSS, - SHADER_FT_ESMFILT, + //SHADER_FT_ESMFILT, + SHADER_FT_ESMFILT_MIN, + SHADER_FT_ESMFILT_EROSION, SHADER_FT_LITPROJ, SHADER_FT_SIMPLE, SHADER_FT_SIL, @@ -42,8 +46,14 @@ enum shader_ft_enum { SHADER_FT_MLAA_AREA, SHADER_FT_MLAA_BLEND, SHADER_FT_CONTOUR, - SHADER_FT_EXPOSURE, - SHADER_FT_GAUSS, + SHADER_FT_CONTOUR_NPR, + //SHADER_FT_EXPOSURE, + SHADER_FT_EXPOSURE_MINIFY, + SHADER_FT_EXPOSURE_MEASURE, + SHADER_FT_EXPOSURE_AVERAGE, + //SHADER_FT_GAUSS, + SHADER_FT_GAUSS_USUAL, + SHADER_FT_GAUSS_CONE, SHADER_FT_SUN, SHADER_FT_FADE, SHADER_FT_WATER01, @@ -53,6 +63,7 @@ enum shader_ft_enum { SHADER_FT_SNOW_PT, SHADER_FT_LEAF_PT, SHADER_FT_STAR, + SHADER_FT_STAR_MILKY_WAY, SHADER_FT_SNORING, SHADER_FT_SN_FOOT, SHADER_FT_SN_TSL, @@ -77,6 +88,9 @@ enum shader_ft_enum { SHADER_FT_END, }; -extern shader_set_data shaders_ft; +extern const shader_table shader_ft_table[]; +extern const size_t shader_ft_table_size; +extern const shader_bind_func shader_ft_bind_func_table[]; +extern const size_t shader_ft_bind_func_table_size; -extern void shader_ft_load(shader_set_data* set, farc* f, bool ignore_cache); +extern shader_set_data shaders_ft; diff --git a/src/CRE/shader_glsl.cpp b/src/CRE/shader_glsl.cpp index 3d477e68..92b84c92 100644 --- a/src/CRE/shader_glsl.cpp +++ b/src/CRE/shader_glsl.cpp @@ -92,9 +92,7 @@ void shader_glsl::load(const char* vert, const char* frag, if (!success) { GLchar* info_log = force_malloc_s(GLchar, 0x10000); glGetProgramInfoLog(program, 0x10000, 0, info_log); - printf("Program linking error: %s\n", param->name); - printf(info_log); - putchar('\n'); + printf_debug("Program linking error: %s\n%s\n", param->name, info_log); free_def(info_log); } @@ -446,9 +444,7 @@ static GLuint shader_compile(GLenum type, const char* data) { if (!success) { GLchar* info_log = force_malloc_s(GLchar, 0x10000); glGetShaderInfoLog(shader, 0x10000, 0, info_log); - printf("Shader compile error: "); - printf(info_log); - putchar('\n'); + printf_debug("Shader compile error:\n%s\n", info_log); free_def(info_log); } return shader; @@ -464,10 +460,10 @@ static GLint shader_get_uniform_block_index(GLint program, GLchar* name, GLint index = glGetUniformBlockIndex(program, name); if (index == GL_INVALID_INDEX) { if (program_log != program) { - printf("Program %d:\n", program); + printf_debug("Program %d:\n", program); program_log = program; } - printf(" Block Index for \"%s\" not found\n", name); + printf_debug(" Block Index for \"%s\" not found\n", name); } uniform_block->push_back({ hash, index }); return index; @@ -483,10 +479,10 @@ static GLint shader_get_uniform_location(GLint program, GLchar* name, GLint location = glGetUniformLocation(program, name); if (location == GL_INVALID_INDEX) { if (program_log != program) { - printf("Program %d:\n", program); + printf_debug("Program %d:\n", program); program_log = program; } - printf(" Location for \"%s\" not found\n", name); + printf_debug(" Location for \"%s\" not found\n", name); } uniform->push_back({ hash, location }); return location; @@ -529,8 +525,7 @@ static char* shader_parse_define(char* data, shader_glsl_param* param) { const size_t s = SHADER_PARAM_NUM_PARAMS; size_t temp_len[SHADER_PARAM_NUM_PARAMS]; - char temp[0x100]; - memset(temp, 0, 0x100); + char temp[0x100] = {}; for (size_t i = 0; i < s; i++) if (param->param[i]) { diff --git a/src/CRE/sound.cpp b/src/CRE/sound.cpp index 4f863892..2c534d17 100644 --- a/src/CRE/sound.cpp +++ b/src/CRE/sound.cpp @@ -9,6 +9,7 @@ #include "../KKdLib/str_utils.hpp" #include "../KKdLib/vec.hpp" #include "data.hpp" +#include "ogg_vorbis.hpp" #include "timer.hpp" #include #include @@ -27,13 +28,54 @@ struct SoundCueQueueVolume { float_t max; }; +struct sound_stream { + std::string path; + OggPlayback* ogg_playback; + float_t current_volume; + float_t duration; + float_t time; + bool pause; + uint32_t file_loading_frames; + uint32_t file_ready_frames; + float_t time_seek; + int32_t volume_trans; + float_t target_volume; + int32_t state; + int32_t play_state; + + sound_stream(); + ~sound_stream(); + + bool check_state(); + void ctrl(); + void ctrl_playback(); + void reset(); + void set_current_volume(float_t value); + bool set_path(const char* path, bool pause = false); + bool set_path(const char* path, float_t time, bool pause = false); + bool set_path_playback(); + bool set_pause(bool value); + void set_target_volume(float_t value, int32_t frames); + bool stop(); + bool stop_playback(); +}; + +static void sound_stream_array_init(); +static void sound_stream_array_ctrl(); +static sound_stream* sound_stream_array_get(int32_t index); +static void sound_stream_array_reset(); +static void sound_stream_array_free(); + SoundWork* sound_work; sound::wasapi::System* sound_wasapi_system_data; -std::map wave_audio_storage; +std::map wave_audio_storage_data; static int32_t sound_cue_counter = 0; static int32_t sound_wasapi_system_counter = 0; +static sound_stream* sound_stream_array; +static float_t sound_stream_volume = 1.0f; + static const int8_t ima_index_table[] = { -1, -1, -1, -1, 2, 4, 6, 8, -1, -1, -1, -1, 2, 4, 6, 8, @@ -106,7 +148,7 @@ namespace sound { } if (mix_format->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE - && !memcmp(&wave_format.SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT, sizeof(GUID))) { + && wave_format.SubFormat == KSDATAFORMAT_SUBTYPE_IEEE_FLOAT) { bit_depth = 32; format = AUDIO_FORMAT_F32; wave_format.SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT; @@ -159,7 +201,8 @@ namespace sound { return; if (pAudioClient->Initialize(AUDCLNT_SHAREMODE_SHARED, - AUDCLNT_STREAMFLAGS_RATEADJUST | AUDCLNT_STREAMFLAGS_EVENTCALLBACK, + AUDCLNT_STREAMFLAGS_AUTOCONVERTPCM | AUDCLNT_STREAMFLAGS_SRC_DEFAULT_QUALITY + | AUDCLNT_STREAMFLAGS_RATEADJUST | AUDCLNT_STREAMFLAGS_EVENTCALLBACK, hnsPeriod, 0, &wave_format.Format, 0) == AUDCLNT_ERR(0x019)) { if (FAILED(pAudioClient->GetBufferSize(&samples_count))) return; @@ -173,7 +216,8 @@ namespace sound { * 10000000.0 / (double_t)sample_rate + 0.5); if (FAILED(pAudioClient->Initialize(AUDCLNT_SHAREMODE_SHARED, - AUDCLNT_STREAMFLAGS_RATEADJUST | AUDCLNT_STREAMFLAGS_EVENTCALLBACK, + AUDCLNT_STREAMFLAGS_AUTOCONVERTPCM | AUDCLNT_STREAMFLAGS_SRC_DEFAULT_QUALITY + | AUDCLNT_STREAMFLAGS_RATEADJUST | AUDCLNT_STREAMFLAGS_EVENTCALLBACK, hnsPeriod, 0, &wave_format.Format, 0))) return; } @@ -182,22 +226,17 @@ namespace sound { return; // Rounding to prev base 2 - while (true) { - uint32_t _samples_count = samples_count; - _samples_count--; - _samples_count |= _samples_count >> 1; - _samples_count |= _samples_count >> 2; - _samples_count |= _samples_count >> 4; - _samples_count |= _samples_count >> 8; - _samples_count |= _samples_count >> 16; - _samples_count++; + uint32_t _samples_count = samples_count; + _samples_count--; + _samples_count |= _samples_count >> 1; + _samples_count |= _samples_count >> 2; + _samples_count |= _samples_count >> 4; + _samples_count |= _samples_count >> 8; + _samples_count |= _samples_count >> 16; + _samples_count++; + while (_samples_count + (_samples_count >> 1) >= samples_count) _samples_count >>= 1; - if (_samples_count + (_samples_count >> 1) < samples_count) { - samples_count = _samples_count; - break; - } - samples_count = _samples_count; - } + samples_count = _samples_count; if (!mixer->Init(se_channels_count, streaming_channels_count, samples_count)) return; @@ -245,7 +284,7 @@ namespace sound { pClockAdjustment->Release(); pClockAdjustment = 0; } - + if (pRenderClient) { pRenderClient->Release(); pRenderClient = 0; @@ -315,30 +354,17 @@ namespace sound { if (!system) return; - float_t spk_l_volume = 0.0f; - float_t spk_r_volume = 0.0f; - float_t hph_l_volume = 0.0f; - float_t hph_r_volume = 0.0f; + vec4 spk_hph_volume = 0.0f; { std::unique_lock u_lock(volume_mtx); - float_t master_volume = this->master_volume; - spk_l_volume = master_volume * channels_volume[0]; - spk_r_volume = master_volume * channels_volume[1]; - hph_l_volume = master_volume * channels_volume[2]; - hph_r_volume = master_volume * channels_volume[3]; + spk_hph_volume = master_volume * *(vec4*)channels_volume; } - if (disable_headphones_volume) { - hph_l_volume = spk_l_volume; - hph_r_volume = spk_r_volume; - } - else if (invert_phase) { - spk_l_volume = -spk_l_volume; - spk_l_volume = -spk_l_volume; - hph_l_volume = -hph_l_volume; - hph_r_volume = -hph_r_volume; - } + if (disable_headphones_volume) + *(vec2*)&spk_hph_volume.z = *(vec2*)&spk_hph_volume.x; + else if (invert_phase) + spk_hph_volume = -spk_hph_volume; memset(mix_buffer, 0, mix_buffer_size); if (streaming_channels) @@ -356,22 +382,20 @@ namespace sound { switch (system->channels) { case 2: for (size_t i = samples_count; i; i--, _mix_buffer++) { - int32_t hph_l = (int32_t)(_mix_buffer->hph_l * hph_l_volume * (float_t)0x7FFF); - int32_t hph_r = (int32_t)(_mix_buffer->hph_r * hph_r_volume * (float_t)0x7FFF); - *_buffer++ = (int16_t)clamp_def(hph_l, -0x8000, 0x7FFF); - *_buffer++ = (int16_t)clamp_def(hph_r, -0x8000, 0x7FFF); + vec2 hph = *(vec2*)&_mix_buffer->hph_l * *(vec2*)&spk_hph_volume.z * (float_t)0x7FFF; + vec2i hph_i32; + vec2_to_vec2i(hph, hph_i32); + *(vec2i*)_buffer = vec2i::clamp(hph_i32, -0x8000, 0x7FFF); + _buffer += 2; } break; case 4: for (size_t i = samples_count; i; i--, _mix_buffer++) { - int32_t spk_l = (int32_t)(_mix_buffer->spk_l * spk_l_volume * (float_t)0x7FFF); - int32_t spk_r = (int32_t)(_mix_buffer->spk_r * spk_r_volume * (float_t)0x7FFF); - int32_t hph_l = (int32_t)(_mix_buffer->hph_l * hph_l_volume * (float_t)0x7FFF); - int32_t hph_r = (int32_t)(_mix_buffer->hph_r * hph_r_volume * (float_t)0x7FFF); - *_buffer++ = (int16_t)clamp_def(spk_l, -0x8000, 0x7FFF); - *_buffer++ = (int16_t)clamp_def(spk_r, -0x8000, 0x7FFF); - *_buffer++ = (int16_t)clamp_def(hph_l, -0x8000, 0x7FFF); - *_buffer++ = (int16_t)clamp_def(hph_r, -0x8000, 0x7FFF); + vec4 spk_hph = *(vec4*)_mix_buffer * spk_hph_volume * (float_t)0x7FFF; + vec4i spk_hph_i32; + vec4_to_vec4i(spk_hph, spk_hph_i32); + *(vec4i*)_buffer = vec4i::clamp(spk_hph_i32, -0x8000, 0x7FFF); + _buffer += 4; } break; } @@ -381,35 +405,31 @@ namespace sound { switch (system->channels) { case 2: for (size_t i = samples_count; i; i--, _mix_buffer++) { - int32_t hph_l = (int32_t)(_mix_buffer->hph_l * hph_l_volume * (float_t)0x7FFFFF); - int32_t hph_r = (int32_t)(_mix_buffer->hph_r * hph_r_volume * (float_t)0x7FFFFF); - hph_l = clamp_def(hph_l, -0x800000, 0x7FFFFF); - hph_r = clamp_def(hph_r, -0x800000, 0x7FFFFF); - *(uint16_t*)&_buffer[0] = (uint16_t)hph_l; - *(uint8_t*)&_buffer[2] = (uint8_t)(hph_l >> 16); - *(uint16_t*)&_buffer[3] = (uint16_t)hph_r; - *(uint8_t*)&_buffer[5] = (uint8_t)(hph_r >> 16); + vec2 hph = *(vec2*)&_mix_buffer->hph_l * *(vec2*)&spk_hph_volume.z * (float_t)0x7FFFFF; + vec2i hph_i32; + vec2_to_vec2i(hph, hph_i32); + hph_i32 = vec2i::clamp(hph_i32, -0x800000, 0x7FFFFF); + *(uint16_t*)&_buffer[0] = (uint16_t)hph_i32.x; + *(uint8_t*)&_buffer[2] = (uint8_t)(hph_i32.x >> 16); + *(uint16_t*)&_buffer[3] = (uint16_t)hph_i32.y; + *(uint8_t*)&_buffer[5] = (uint8_t)(hph_i32.y >> 16); _buffer += 6; } break; case 4: for (size_t i = samples_count; i; i--, _mix_buffer++) { - int32_t spk_l = (int32_t)(_mix_buffer->spk_l * spk_l_volume * (float_t)0x7FFFFF); - int32_t spk_r = (int32_t)(_mix_buffer->spk_r * spk_r_volume * (float_t)0x7FFFFF); - int32_t hph_l = (int32_t)(_mix_buffer->hph_l * hph_l_volume * (float_t)0x7FFFFF); - int32_t hph_r = (int32_t)(_mix_buffer->hph_r * hph_r_volume * (float_t)0x7FFFFF); - spk_l = clamp_def(spk_l, -0x800000, 0x7FFFFF); - spk_r = clamp_def(spk_r, -0x800000, 0x7FFFFF); - hph_l = clamp_def(hph_l, -0x800000, 0x7FFFFF); - hph_r = clamp_def(hph_r, -0x800000, 0x7FFFFF); - *(uint16_t*)&_buffer[0] = (uint16_t)spk_l; - *(uint8_t*)&_buffer[2] = (uint8_t)(spk_l >> 16); - *(uint16_t*)&_buffer[3] = (uint16_t)spk_r; - *(uint8_t*)&_buffer[5] = (uint8_t)(spk_r >> 16); - *(uint16_t*)&_buffer[6] = (uint16_t)hph_l; - *(uint8_t*)&_buffer[8] = (uint8_t)(hph_l >> 16); - *(uint16_t*)&_buffer[9] = (uint16_t)hph_r; - *(uint8_t*)&_buffer[11] = (uint8_t)(hph_r >> 16); + vec4 spk_hph = *(vec4*)_mix_buffer * spk_hph_volume * (float_t)0x7FFFFF; + vec4i spk_hph_i32; + vec4_to_vec4i(spk_hph, spk_hph_i32); + spk_hph_i32 = vec4i::clamp(spk_hph_i32, -0x800000, 0x7FFFFF); + *(uint16_t*)&_buffer[0] = (uint16_t)spk_hph_i32.x; + *(uint8_t*)&_buffer[2] = (uint8_t)(spk_hph_i32.x >> 16); + *(uint16_t*)&_buffer[3] = (uint16_t)spk_hph_i32.y; + *(uint8_t*)&_buffer[5] = (uint8_t)(spk_hph_i32.y >> 16); + *(uint16_t*)&_buffer[6] = (uint16_t)spk_hph_i32.z; + *(uint8_t*)&_buffer[8] = (uint8_t)(spk_hph_i32.z >> 16); + *(uint16_t*)&_buffer[9] = (uint16_t)spk_hph_i32.w; + *(uint8_t*)&_buffer[11] = (uint8_t)(spk_hph_i32.w >> 16); _buffer += 12; } break; @@ -420,18 +440,20 @@ namespace sound { switch (system->channels) { case 2: for (size_t i = samples_count; i; i--, _mix_buffer++) { - int64_t hph_l = (int64_t)((double_t)_mix_buffer->hph_l * hph_l_volume * (double_t)0x7FFFFFFF); - int64_t hph_r = (int64_t)((double_t)_mix_buffer->hph_r * hph_r_volume * (double_t)0x7FFFFFFF); + vec2 hph = *(vec2*)&_mix_buffer->hph_l * *(vec2*)&spk_hph_volume.z; + int64_t hph_l = (int64_t)((double_t)hph.x * (double_t)0x7FFFFFFF); + int64_t hph_r = (int64_t)((double_t)hph.y * (double_t)0x7FFFFFFF); *_buffer++ = (int32_t)clamp_def(hph_l, -0x80000000LL, 0x7FFFFFFFLL); *_buffer++ = (int32_t)clamp_def(hph_r, -0x80000000LL, 0x7FFFFFFFLL); } break; case 4: for (size_t i = samples_count; i; i--, _mix_buffer++) { - int64_t spk_l = (int64_t)((double_t)_mix_buffer->spk_l * spk_l_volume * (double_t)0x7FFFFFFF); - int64_t spk_r = (int64_t)((double_t)_mix_buffer->spk_r * spk_r_volume * (double_t)0x7FFFFFFF); - int64_t hph_l = (int64_t)((double_t)_mix_buffer->hph_l * hph_l_volume * (double_t)0x7FFFFFFF); - int64_t hph_r = (int64_t)((double_t)_mix_buffer->hph_r * hph_r_volume * (double_t)0x7FFFFFFF); + vec4 spk_hph = *(vec4*)_mix_buffer * spk_hph_volume; + int64_t spk_l = (int64_t)((double_t)spk_hph.x * (double_t)0x7FFFFFFF); + int64_t spk_r = (int64_t)((double_t)spk_hph.y * (double_t)0x7FFFFFFF); + int64_t hph_l = (int64_t)((double_t)spk_hph.z * (double_t)0x7FFFFFFF); + int64_t hph_r = (int64_t)((double_t)spk_hph.w * (double_t)0x7FFFFFFF); *_buffer++ = (int32_t)clamp_def(spk_l, -0x80000000LL, 0x7FFFFFFFLL); *_buffer++ = (int32_t)clamp_def(spk_r, -0x80000000LL, 0x7FFFFFFFLL); *_buffer++ = (int32_t)clamp_def(hph_l, -0x80000000LL, 0x7FFFFFFFLL); @@ -444,18 +466,12 @@ namespace sound { float_t* _buffer = (float_t*)buffer; switch (system->channels) { case 2: - for (size_t i = samples_count; i; i--, _mix_buffer++) { - *_buffer++ = _mix_buffer->hph_l * hph_l_volume; - *_buffer++ = _mix_buffer->hph_r * hph_r_volume; - } + for (size_t i = samples_count; i; i--, _mix_buffer++, _buffer += 2) + *(vec2*)_buffer = *(vec2*)&_mix_buffer->hph_l * *(vec2*)&spk_hph_volume.z; break; case 4: - for (size_t i = samples_count; i; i--, _mix_buffer++) { - *_buffer++ = _mix_buffer->spk_l * spk_l_volume; - *_buffer++ = _mix_buffer->spk_r * spk_r_volume; - *_buffer++ = _mix_buffer->hph_l * hph_l_volume; - *_buffer++ = _mix_buffer->hph_r * hph_r_volume; - } + for (size_t i = samples_count; i; i--, _mix_buffer++, _buffer += 4) + *(vec4*)_buffer = *(vec4*)&_mix_buffer * spk_hph_volume; break; } } break; @@ -578,36 +594,43 @@ namespace sound { vec4 channels_volume(spk_l_volume, spk_r_volume, hph_l_volume, hph_r_volume); + float_t* se_buffer = this->buffer; size_t _samples_count = this->samples_count; + size_t loop_start = this->loop_start; + size_t loop_end = this->loop_end; + size_t current_sample = this->current_sample; + bool loop = !!(loop_start || loop_end); if (channels == 1) for (size_t i = samples_count; i && current_sample < _samples_count; i--, buffer++) { - float_t* _buffer = this->buffer + current_sample; + float_t* _buffer = se_buffer + current_sample; *(vec4*)buffer = channels_volume * _buffer[0] + *(vec4*)buffer; current_sample++; - if ((loop_start || loop_end) && current_sample > loop_end) + if (loop && current_sample > loop_end) current_sample = loop_start; } - if (channels == 2) + else if (channels == 2) for (size_t i = samples_count; i && current_sample < _samples_count; i--, buffer++) { - float_t* _buffer = this->buffer + current_sample * 2; + float_t* _buffer = se_buffer + current_sample * 2; *(vec4*)buffer = channels_volume * vec4(_buffer[0], _buffer[1], _buffer[0], _buffer[1]) + *(vec4*)buffer; current_sample++; - if ((loop_start || loop_end) && current_sample > loop_end) + if (loop && current_sample > loop_end) current_sample = loop_start; } else if (channels == 4) for (size_t i = samples_count; i && current_sample < _samples_count; i--, buffer++) { - float_t* _buffer = this->buffer + current_sample * 4; + float_t* _buffer = se_buffer + current_sample * 4; *(vec4*)buffer = channels_volume * *(vec4*)_buffer + *(vec4*)buffer; current_sample++; - if ((loop_start || loop_end) && current_sample > loop_end) + if (loop && current_sample > loop_end) current_sample = loop_start; } + this->current_sample = current_sample; + if (current_sample >= _samples_count) ResetData(); } @@ -677,7 +700,7 @@ namespace sound { loop_end = 0; current_sample = 0; } - + void SEChannel::ResetDataProt() { if (!play_state.get()) return; @@ -743,7 +766,14 @@ namespace sound { vec4 channels_volume(spk_l_volume, spk_r_volume, hph_l_volume, hph_r_volume); sound_buffer_data* _buffer = this->buffer; - for (size_t i = samples_count; i; i--, buffer++, _buffer++) + for (size_t i = samples_count / 4; i; i--, buffer += 4, _buffer += 4) { + ((vec4*)buffer)[0] = channels_volume * ((vec4*)_buffer)[0] + ((vec4*)buffer)[0]; + ((vec4*)buffer)[1] = channels_volume * ((vec4*)_buffer)[1] + ((vec4*)buffer)[1]; + ((vec4*)buffer)[2] = channels_volume * ((vec4*)_buffer)[2] + ((vec4*)buffer)[2]; + ((vec4*)buffer)[3] = channels_volume * ((vec4*)_buffer)[3] + ((vec4*)buffer)[3]; + } + + for (size_t i = samples_count % 4; i; i--, buffer++, _buffer++) *(vec4*)buffer = channels_volume * *(vec4*)_buffer + *(vec4*)buffer; } @@ -1192,9 +1222,25 @@ bool WaveAudio::Read(sound_db_farc* farc, const char* file_name) { float_t* buffer = this->buffer; size_t channels = data.channels; size_t samples_count = data.samples_count; - for (size_t i = samples_count; i; i--) - for (size_t j = channels; j; j--) - *buffer++ = (float_t)*_buf++ * (float_t)(1.0 / (double_t)0x7FFF); + if (channels == 1) + for (size_t i = samples_count; i; i--, buffer++, _buf++) + *buffer = (float_t)*_buf * (float_t)(1.0 / (double_t)0x7FFF); + else if (channels == 2) + for (size_t i = samples_count; i; i--, buffer += 2, _buf += 2) { + vec2 value; + vec2i16_to_vec2(*(vec2i16*)_buf, value); + *(vec2*)buffer = value * (float_t)(1.0 / (double_t)0x7FFF); + } + else if (channels == 4) + for (size_t i = samples_count; i; i--, buffer += 4, _buf += 4) { + vec4 value; + vec4i16_to_vec4(*(vec4i16*)_buf, value); + *(vec4*)buffer = value * (float_t)(1.0 / (double_t)0x7FFF); + } + else + for (size_t i = samples_count; i; i--) + for (size_t j = channels; j; j--, buffer++, _buf++) + *buffer++ = (float_t)*_buf++ * (float_t)(1.0 / (double_t)0x7FFF); free(buf); ret = true; @@ -1216,7 +1262,7 @@ void WaveAudio::Reset() { data.Reset(); } -SoundWork::SoundWork() : se_queue_enable(), streaming_enable(), se_queue_volume() { +SoundWork::SoundWork() : se_queue_enable(), stream_enable(), se_queue_volume() { counter = 1; speakers_volume = get_max_speakers_volume(); speakers_volume_changed = true; @@ -1227,7 +1273,7 @@ SoundWork::SoundWork() : se_queue_enable(), streaming_enable(), se_queue_volume( for (bool& i : se_queue_enable) i = true; - for (bool& i : streaming_enable) + for (bool& i : stream_enable) i = true; for (int32_t i = 0; i < SOUND_WORK_SE_QUEUE_COUNT; i++) @@ -1319,19 +1365,27 @@ bool SoundWork::UnloadProperty(const char* file_path) { return true; } -extern float_t get_min_headphones_volume() { +sound_stream_info::sound_stream_info() : duration(), time() { + +} + +sound_stream_info::~sound_stream_info() { + +} + +float_t get_min_headphones_volume() { return 1.0f;//0.02f; } -extern float_t get_max_headphones_volume() { +float_t get_max_headphones_volume() { return 0.45f; } -extern float_t get_min_speakers_volume() { +float_t get_min_speakers_volume() { return 0.0f; } -extern float_t get_max_speakers_volume() { +float_t get_max_speakers_volume() { return 0.8f; } @@ -1374,7 +1428,7 @@ void sound_init() { PropVariantInit(&pv); if (SUCCEEDED(store->GetValue(PKEY_Device_FriendlyName, &pv))) - printf("%ls\n", pv.pwszVal); + printf_debug("%ls\n", pv.pwszVal); PropVariantClear(&pv); store->Release(); @@ -1391,7 +1445,7 @@ void sound_init() { if (!sound_work) sound_work = new SoundWork; - + if (!sound_wasapi_system_data) sound_wasapi_system_data = new sound::wasapi::System; @@ -1426,7 +1480,7 @@ void sound_init() { } } - //sub_140622E00(); + sound_stream_array_init(); } void sound_ctrl() { @@ -1462,12 +1516,14 @@ void sound_ctrl() { i.ReleaseProt(true); } - //sub_140622AD0(); + sound_stream_array_ctrl(); sound_work->names_list.clear(); } void sound_free() { + sound_stream_array_free(); + if (sound_work) { delete sound_work; sound_work = 0; @@ -1479,25 +1535,18 @@ void sound_free() { } } -bool sound_work_cue_can_play(int32_t queue_index, const char* name) { - if (!name) +bool sound_work_check_stream_state(int32_t index) { + if (index < 0 || index >= SOUND_WORK_STREAM_COUNT || !sound_work->stream_enable[index]) return false; - SoundCue* cue = sound_work_get_cue(queue_index, name); - if (cue) - return cue->CanPlay(); - return false; + sound_stream* stream = sound_stream_array_get(index); + if (!stream) + return false; + + return stream->check_state(); } -SoundCue* sound_work_get_cue(int32_t queue_index, const char* name) { - for (SoundCue& i : sound_work->cues) - if ((!i.se_channel || i.property) && i.queue_index == queue_index - && !i.name.compare(name)) - return &i; - return 0; -} - -bool sound_work_get_cue_release(int32_t queue_index, const char* name, bool force_release) { +bool sound_work_cue_release(int32_t queue_index, const char* name, bool force_release) { if (!name) return false; @@ -1509,6 +1558,24 @@ bool sound_work_get_cue_release(int32_t queue_index, const char* name, bool forc return false; } +SoundCue* sound_work_get_cue(int32_t queue_index, const char* name) { + for (SoundCue& i : sound_work->cues) + if ((!i.se_channel || i.property) && i.queue_index == queue_index + && !i.name.compare(name)) + return &i; + return 0; +} + +bool sound_work_get_cue_can_play(int32_t queue_index, const char* name) { + if (!name) + return false; + + SoundCue* cue = sound_work_get_cue(queue_index, name); + if (cue) + return cue->CanPlay(); + return false; +} + sound_db_farc* sound_work_get_farc(const char* file_path) { for (sound_db_farc& i : sound_work->farcs) if (!i.file_path.compare(file_path)) @@ -1516,6 +1583,31 @@ sound_db_farc* sound_work_get_farc(const char* file_path) { return 0; } +bool sound_work_get_stream_info(sound_stream_info& info, int32_t index) { + if (index < 0 || index >= SOUND_WORK_STREAM_COUNT || !sound_work->stream_enable[index]) + return false; + + sound_stream* stream = sound_stream_array_get(index); + if (!stream) + return false; + + info.duration = stream->duration; + info.time = stream->time; + info.path.assign(stream->path); + return true; +} + +float_t sound_work_get_stream_volume(int32_t index) { + if (index < 0 || index >= SOUND_WORK_STREAM_COUNT || !sound_work->stream_enable[index]) + return false; + + sound_stream* stream = sound_stream_array_get(index); + if (!stream) + return 1.0f; + + return stream->current_volume; +} + float_t sound_work_get_headphones_volume() { return sound_work->headphones_volume; } @@ -1592,6 +1684,28 @@ int32_t sound_work_play_se(int32_t queue_index, const char* name, float_t volume return counter; } +bool sound_work_play_stream(int32_t index, const char* path, bool pause) { + if (index < 0 || index >= SOUND_WORK_STREAM_COUNT || !sound_work->stream_enable[index]) + return false; + + sound_stream* stream = sound_stream_array_get(index); + if (!stream) + return false; + + return stream->set_path(path, pause); +} + +bool sound_work_play_stream(int32_t index, const char* path, float_t time, bool pause) { + if (index < 0 || index >= SOUND_WORK_STREAM_COUNT || !sound_work->stream_enable[index]) + return false; + + sound_stream* stream = sound_stream_array_get(index); + if (!stream) + return false; + + return stream->set_path(path, time, pause); +} + bool sound_work_read_farc(const char* file_path) { if (!file_path || sound_work_get_farc(file_path)) return false; @@ -1638,6 +1752,28 @@ bool sound_work_release_se(const char* name, bool release) { return found; } +bool sound_work_release_stream(int32_t index) { + if (index < 0 || index >= SOUND_WORK_STREAM_COUNT || !sound_work->stream_enable[index]) + return false; + + sound_stream* stream = sound_stream_array_get(index); + if (!stream) + return false; + + return stream->stop(); +} + +bool sound_work_stream_set_pause(int32_t index, bool value) { + if (index < 0 || index >= SOUND_WORK_STREAM_COUNT || !sound_work->stream_enable[index]) + return false; + + sound_stream* stream = sound_stream_array_get(index); + if (!stream) + return false; + + return stream->set_pause(value); +} + float_t sound_cue_queue_volume_array_get_max(int32_t queue_index) { if (queue_index >= 0 && queue_index < SOUND_WORK_SE_QUEUE_COUNT) return sound_cue_queue_volume_array[queue_index].max; @@ -1682,6 +1818,30 @@ void sound_work_set_speakers_volume(float_t value) { } } +bool sound_work_set_stream_current_volume(int32_t index, float_t value) { + if (index < 0 || index >= SOUND_WORK_STREAM_COUNT || !sound_work->stream_enable[index]) + return false; + + sound_stream* stream = sound_stream_array_get(index); + if (!stream) + return false; + + stream->set_current_volume(value); + return true; +} + +bool sound_work_set_stream_target_volume(int32_t index, float_t value, int32_t frames) { + if (index < 0 || index >= SOUND_WORK_STREAM_COUNT || !sound_work->stream_enable[index]) + return false; + + sound_stream* stream = sound_stream_array_get(index); + if (!stream) + return false; + + stream->set_target_volume(value, frames); + return true; +} + bool sound_work_unload_farc(const char* file_path) { if (!file_path) return false; @@ -1693,16 +1853,16 @@ bool sound_work_unload_farc(const char* file_path) { } void wave_audio_storage_init() { - wave_audio_storage = {}; + wave_audio_storage_data = {}; } void wave_audio_storage_clear() { - wave_audio_storage.clear(); + wave_audio_storage_data.clear(); } WaveAudio* wave_audio_storage_get_wave_audio(std::string& name) { - auto elem = wave_audio_storage.find(name); - if (elem != wave_audio_storage.end()) + auto elem = wave_audio_storage_data.find(name); + if (elem != wave_audio_storage_data.end()) return &elem->second; return 0; } @@ -1716,22 +1876,22 @@ bool wave_audio_storage_load_wave_audio(std::string& name) { WaveAudio wave_audio; if (wave_audio.Read(property->farc, property->file_name.c_str())) { - wave_audio_storage.insert({ name, wave_audio }); + wave_audio_storage_data.insert({ name, wave_audio }); return true; } return false; } void wave_audio_storage_unload_wave_audio(std::string& name) { - auto elem = wave_audio_storage.find(name); - if (elem != wave_audio_storage.end()) { + auto elem = wave_audio_storage_data.find(name); + if (elem != wave_audio_storage_data.end()) { elem->second.Reset(); - wave_audio_storage.erase(elem); + wave_audio_storage_data.erase(elem); } } void wave_audio_storage_free() { - wave_audio_storage.clear(); + wave_audio_storage_data.clear(); } static size_t ima_decode(int16_t* dst, size_t dst_size, uint8_t* data, size_t samples_count, @@ -1772,4 +1932,220 @@ static size_t ima_decode(int16_t* dst, size_t dst_size, uint8_t* data, size_t sa } } return act_samp_count; -} \ No newline at end of file +} + +sound_stream::sound_stream() : ogg_playback(), duration(), pause(), file_loading_frames(), +file_ready_frames(), time_seek(), volume_trans(), state(), play_state(), time() { + current_volume = 1.0f; + target_volume = 1.0f; +} + +sound_stream::~sound_stream() { + +} + +bool sound_stream::check_state() { + if (play_state == 1) + return true; + return state == 1; +} + +void sound_stream::ctrl() { + if (!check_state()) + return; + + if (play_state == 1 && volume_trans > 0) { + current_volume += (target_volume - current_volume) / (float_t)volume_trans; + volume_trans--; + } + + if (path.size() < 4) + return; + + std::string ext; + ext.assign(path.c_str() + (path.size() - 4), 4); + for (char& c : ext) + if (c >= 'A' && c <= 'Z') + c += 0x20; + + if (ext.compare(".ogg")) + return; + + if (!ogg_playback) { + size_t index = 0; + for (size_t i = 0; i < SOUND_WORK_STREAM_COUNT; i++) + if (&sound_stream_array[i] == this) { + index = i; + break; + } + + ogg_playback = ogg_playback_data_get(index); + } + + if (ogg_playback) + ctrl_playback(); +} + +void sound_stream::ctrl_playback() { + OggFileHandlerFileState file_state = OGG_FILE_HANDLER_FILE_STATE_NONE; + if (ogg_playback) { + file_state = ogg_playback->GetFileState(); + ogg_playback->SetMasterVolume(ratio_to_db(current_volume)); + } + + duration = 0.0f; + time = 0.0f; + play_state = 0; + + if (file_state == OGG_FILE_HANDLER_FILE_STATE_NONE + || (file_state >= OGG_FILE_HANDLER_FILE_STATE_STOPPED + && file_state <= OGG_FILE_HANDLER_FILE_STATE_MAX)) { + play_state = 0; + file_loading_frames = 0; + file_ready_frames = 0; + duration = 0.0f; + time = 0.0f; + if (state != 1) { + state = 0; + stop_playback(); + } + else if (set_path_playback()) { + play_state = 1; + state = 0; + } + else + stop_playback(); + } + else if (file_state >= OGG_FILE_HANDLER_FILE_STATE_LOADING + && file_state <= OGG_FILE_HANDLER_FILE_STATE_STOPPING) { + play_state = 1; + if (ogg_playback) { + if (ogg_playback->GetPauseState() == OGG_FILE_HANDLER_PAUSE_STATE_PLAY) { + file_loading_frames += file_state == OGG_FILE_HANDLER_FILE_STATE_LOADING; + file_ready_frames += file_state == OGG_FILE_HANDLER_FILE_STATE_READY; + } + float_t _duration = ogg_playback->GetDuration(); + float_t _time = ogg_playback->GetTime(); + duration = _duration; + if (_duration > 0.0f && _time > _duration) + do + _time -= _duration; + while (_time > _duration); + time = _time; + } + + if (state) + stop_playback(); + } + + OggPlayback::SetChannelPairVolumePan(ogg_playback); +} + +void sound_stream::reset() { + state = 0; + play_state = 0; +} + +void sound_stream::set_current_volume(float_t value) { + current_volume = clamp_def(value, 0.0f, 1.0f); + volume_trans = 0; +} + +bool sound_stream::set_path(const char* path, bool pause) { + if (!pause) { + bool paused = false; + if (ogg_playback) + paused = ogg_playback->GetPauseState() == OGG_FILE_HANDLER_PAUSE_STATE_PAUSE; + + if (!(this->path.compare(path) || !check_state() || !paused)) { + if (ogg_playback) + ogg_playback->SetPauseState(OGG_FILE_HANDLER_PAUSE_STATE_PLAY); + pause = 0; + return true; + } + } + + this->path.assign(path); + state = 1; + this->pause = pause; + current_volume = sound_stream_volume; + time_seek = 0.0f; + volume_trans = 0; + target_volume = sound_stream_volume; + return true; +} + +bool sound_stream::set_path(const char* path, float_t time, bool pause) { + bool res = set_path(path, pause); + if (res) + time_seek = time; + return res; +} + +bool sound_stream::set_path_playback() { + if (!ogg_playback) + return false; + + ogg_playback->SetPauseState(pause + ? OGG_FILE_HANDLER_PAUSE_STATE_PAUSE : OGG_FILE_HANDLER_PAUSE_STATE_PLAY); + ogg_playback->SetTimeSeek(time_seek); + ogg_playback->SetPath(path); + return true; +} + +bool sound_stream::set_pause(bool value) { + if (!ogg_playback) + return false; + + pause = value; + ogg_playback->SetPauseState(value + ? OGG_FILE_HANDLER_PAUSE_STATE_PAUSE : OGG_FILE_HANDLER_PAUSE_STATE_PLAY); + return true; +} + +void sound_stream::set_target_volume(float_t value, int32_t frames) { + target_volume = value; + volume_trans = max_def(frames, 1); +} + +bool sound_stream::stop() { + state = 2; + return true; +} + +bool sound_stream::stop_playback() { + if (!ogg_playback) + return false; + + ogg_playback->SetPlaybackState(OGG_FILE_HANDLER_PLAYBACK_STATE_STOP); + ogg_playback->SetPauseState(OGG_FILE_HANDLER_PAUSE_STATE_PLAY); + return true; +} + +static void sound_stream_array_init() { + if (!sound_stream_array) + sound_stream_array = new sound_stream[SOUND_WORK_STREAM_COUNT]; +} + +static void sound_stream_array_ctrl() { + for (size_t i = 0; i < SOUND_WORK_STREAM_COUNT; i++) + sound_stream_array[i].ctrl(); +} + +static sound_stream* sound_stream_array_get(int32_t index) { + if (index >= 0 && index < SOUND_WORK_STREAM_COUNT) + return &sound_stream_array[index]; + return 0; +} + +static void sound_stream_array_reset() { + for (size_t i = 0; i < SOUND_WORK_STREAM_COUNT; i++) + sound_stream_array[i].reset(); +} + +static void sound_stream_array_free() { + if (sound_stream_array) { + delete[] sound_stream_array; + sound_stream_array = 0; + } +} diff --git a/src/CRE/sound.hpp b/src/CRE/sound.hpp index d46d4e30..f2c4f8f2 100644 --- a/src/CRE/sound.hpp +++ b/src/CRE/sound.hpp @@ -285,7 +285,7 @@ struct WaveAudio { }; #define SOUND_WORK_SE_QUEUE_COUNT 5 -#define SOUND_WORK_STREAMING_COUNT 3 +#define SOUND_WORK_STREAM_COUNT 3 struct SoundWork { std::map properties; @@ -294,7 +294,7 @@ struct SoundWork { int32_t counter; std::vector names_list; bool se_queue_enable[SOUND_WORK_SE_QUEUE_COUNT]; - bool streaming_enable[SOUND_WORK_STREAMING_COUNT]; + bool stream_enable[SOUND_WORK_STREAM_COUNT]; float_t speakers_volume; bool speakers_volume_changed; float_t headphones_volume; @@ -310,8 +310,18 @@ struct SoundWork { bool UnloadProperty(const char* file_path); }; +struct sound_stream_info { + float_t duration; + float_t time; + std::string path; + + sound_stream_info(); + ~sound_stream_info(); +}; + extern float_t get_min_headphones_volume(); extern float_t get_max_headphones_volume(); +extern float_t get_min_speakers_volume(); extern float_t get_max_speakers_volume(); extern float_t db_to_ratio(int32_t value); @@ -324,24 +334,33 @@ extern void sound_free(); extern float_t sound_cue_queue_volume_array_get_max(int32_t queue_index); extern float_t sound_cue_queue_volume_array_get_min(int32_t queue_index); +extern bool sound_work_check_stream_state(int32_t index); extern bool sound_work_cue_release(int32_t queue_index, const char* name, bool force_release = true); extern SoundCue* sound_work_get_cue(int32_t queue_index, const char* name); extern bool sound_work_get_cue_can_play(int32_t queue_index, const char* name); extern sound_db_farc* sound_work_get_farc(const char* file_path); +extern bool sound_work_get_stream_info(sound_stream_info& info, int32_t index); +extern float_t sound_work_get_stream_volume(int32_t index); extern float_t sound_work_get_headphones_volume(); extern float_t sound_work_get_speakers_volume(); extern bool sound_work_has_property(const char* name); extern bool sound_work_load_farc(const char* file_path); extern int32_t sound_work_play_se(int32_t queue_index, const char* name, float_t volume); +extern bool sound_work_play_stream(int32_t index, const char* path, bool pause = false); +extern bool sound_work_play_stream(int32_t index, const char* path, float_t time, bool pause = false); extern bool sound_work_read_farc(const char* file_path); extern void sound_work_release_farc_se(const char* file_path); extern bool sound_work_release_se(const char* name, bool force_release = true); +extern bool sound_work_release_stream(int32_t index); +extern bool sound_work_stream_set_pause(int32_t index, bool value); extern float_t sound_cue_queue_volume_array_get_max(int32_t queue_index); extern float_t sound_cue_queue_volume_array_get_min(int32_t queue_index); extern sound::wasapi::System* sound_wasapi_system_data_get(); extern void sound_work_set_headphones_volume(float_t value); extern void sound_work_set_se_queue_volume(int32_t queue_index, float_t value); extern void sound_work_set_speakers_volume(float_t value); +extern bool sound_work_set_stream_current_volume(int32_t index, float_t value); +extern bool sound_work_set_stream_target_volume(int32_t index, float_t value, int32_t frames); extern bool sound_work_unload_farc(const char* file_path); extern void wave_audio_storage_init(); diff --git a/src/CRE/stage.cpp b/src/CRE/stage.cpp index ef1a3023..5a441965 100644 --- a/src/CRE/stage.cpp +++ b/src/CRE/stage.cpp @@ -11,6 +11,7 @@ #include "draw_task.hpp" #include "light_param.hpp" #include "render_context.hpp" +#include "task_effect.hpp" namespace stage_detail { static void TaskStage_CtrlInner(stage_detail::TaskStage* a1); @@ -23,7 +24,8 @@ namespace stage_detail { task_stage_info* stg_info); static void TaskStage_GetLoadedStageInfos(stage_detail::TaskStage* a1, std::vector* vec); - static bool TaskStage_Load(stage_detail::TaskStage* a1, const char* name); + static void TaskStage_Load(stage_detail::TaskStage* a1); + static bool TaskStage_LoadTask(stage_detail::TaskStage* a1, const char* name); static void TaskStage_Reset(stage_detail::TaskStage* a1); static void TaskStage_SetStage(stage_detail::TaskStage* a1, task_stage_info stg_info); static void TaskStage_TaskWindAppend(stage_detail::TaskStage* a1); @@ -117,11 +119,11 @@ void task_stage_current_set_sky(bool value) { task_stage_set_sky(&stg_info, value); } -void task_stage_current_set_stage_display(bool value) { +void task_stage_current_set_stage_display(bool value, bool effect_enable) { task_stage_info stg_info; task_stage_get_current_stage_info(&stg_info); if (task_stage_has_stage_info(&stg_info)) - task_stage_set_stage_display(&stg_info, value); + task_stage_set_stage_display(&stg_info, value, effect_enable); } void task_stage_disp_shadow() { @@ -163,9 +165,9 @@ bool task_stage_has_stage_info(task_stage_info* stg_info) { return task_stage_get_stage(*stg_info) != 0; } -bool task_stage_load(const char* name) { +bool task_stage_load_task(const char* name) { task_stage_is_modern = false; - return stage_detail::TaskStage_Load(task_stage, name); + return stage_detail::TaskStage_LoadTask(task_stage, name); } void task_stage_set_effect_display(task_stage_info* stg_info, bool value) { @@ -200,10 +202,13 @@ void task_stage_set_stage(task_stage_info* stg_info) { stage_detail::TaskStage_SetStage(task_stage, *stg_info); } -void task_stage_set_stage_display(task_stage_info* stg_info, bool value) { +void task_stage_set_stage_display(task_stage_info* stg_info, bool value, bool effect_enable) { stage* stg = task_stage_get_stage(*stg_info); - if (stg) + if (stg) { stg->stage_display = value; + if (effect_enable) + task_effect_parent_set_enable(value); + } } void task_stage_set_stage_index(int32_t stage_index) { @@ -219,12 +224,12 @@ void task_stage_set_stage_index(int32_t stage_index) { stage_indices.begin(), stage_indices.end()); } -void task_stage_set_stage_indices(std::vector* stage_indices) { +void task_stage_set_stage_indices(std::vector& stage_indices) { task_stage->load_stage_indices.insert(task_stage->load_stage_indices.end(), - stage_indices->begin(), stage_indices->end()); + stage_indices.begin(), stage_indices.end()); } -bool task_stage_unload() { +bool task_stage_unload_task() { return task_stage->SetDest(); } @@ -249,49 +254,10 @@ static void stage_detail::TaskStage_CtrlInner(stage_detail::TaskStage* a1) { return; } - if (a1->state == 3) { - //sub_140229F30("rom/STGTST_COLI.000.bin"); - light_param_data_storage_data_load_stages(&a1->stage_indices); - a1->state = 4; - } - else if (a1->state == 4 && !light_param_data_storage_data_load_file()/* && !sub_14022A380()*/) { - bool v5 = 0; - for (int32_t i = 0; i < TASK_STAGE_STAGE_COUNT; i++) - if (a1->stages[i].index != -1 && a1->stages[i].state != 6) { - v5 = 1; - break; - } - - if (!v5) { - //sub_140343B20(&a1->stage_indices); - //task_stage_current_set_effect_display(a1->stage_display); - a1->state = 5; - //sub_14064DC10(); - } - } - else if (a1->state == 5/* && !sub_1403446E0()*/) { - std::vector vec; - stage_detail::TaskStage_GetLoadedStageInfos(a1, &vec); - if (vec.size()) { - stage_detail::TaskStage_SetStage(a1, vec[0]); - - stage* s = stage_detail::TaskStage_GetStage(a1, vec[0]); - data_struct* aft_data = &data_list[DATA_AFT]; - auth_3d_database* aft_auth_3d_db = &aft_data->data_ft.auth_3d_db; - for (int32_t& i : s->stage_data->auth_3d_ids) { - int32_t id = auth_3d_data_load_uid(i, aft_auth_3d_db); - if (id == -1) - continue; - - auth_3d_data_read_file(&id, aft_auth_3d_db); - s->auth_3d_ids.push_back(id); - } - } - a1->state = 6; - } - else if (a1->state >= 7 && a1->state <= 9) { + if (a1->state >= 3 && a1->state <= 5) + stage_detail::TaskStage_Load(a1); + else if (a1->state >= 7 && a1->state <= 9) stage_detail::TaskStage_Unload(a1); - } } static void stage_detail::TaskStage_DispShadow(stage_detail::TaskStage* a1) { @@ -341,7 +307,45 @@ static void stage_detail::TaskStage_GetLoadedStageInfos(stage_detail::TaskStage* } } -static bool stage_detail::TaskStage_Load(stage_detail::TaskStage* a1, const char* name) { +static void stage_detail::TaskStage_Load(stage_detail::TaskStage* a1) { + switch (a1->state) { + case 3: { + //sub_140229F30("rom/STGTST_COLI.000.bin"); + light_param_data_storage_data_load_stages(a1->stage_indices); + a1->state = 4; + } break; + case 4: { + if (light_param_data_storage_data_load_file()/* || sub_14022A380()*/) + break; + + bool wait_load = false; + for (int32_t i = 0; i < TASK_STAGE_STAGE_COUNT; i++) + if (a1->stages[i].index != -1 && a1->stages[i].state != 6) { + wait_load = true; + break; + } + + if (!wait_load) { + task_effect_parent_set_stage_indices(a1->stage_indices); + task_effect_parent_set_enable(a1->stage_display); + a1->state = 5; + //sub_14064DC10(); + } + } break; + case 5: { + if (task_effect_parent_load()) + break; + + std::vector vec; + stage_detail::TaskStage_GetLoadedStageInfos(a1, &vec); + if (vec.size()) + stage_detail::TaskStage_SetStage(a1, vec[0]); + a1->state = 6; + } break; + } +} + +static bool stage_detail::TaskStage_LoadTask(stage_detail::TaskStage* a1, const char* name) { if (app::TaskWork::AppendTask(a1, name)) { stage_detail::TaskStage_Reset(a1); stage_detail::TaskStage_TaskWindAppend(a1); @@ -401,11 +405,11 @@ static void stage_detail::TaskStage_Unload(stage_detail::TaskStage* a1) { } if (a1->state == 7) { - //sub_140343C30(); + task_effect_parent_dest(); a1->state = 8; } else if (a1->state == 8) { - //if (!sub_140344700()) + if (!task_effect_parent_unload()) a1->state = 9; } else if (a1->state == 9) { @@ -578,7 +582,7 @@ static void stage_free(stage* s) { rctx_ptr->post_process.movie_texture_free( texture_storage_get_texture(s->stage_data->movie_texture)); - draw_pass->shadow = true; + draw_pass->set_shadow_true(); //rctx_ptr->post_process.field_14 = 0; //rctx_ptr->post_process.field_ED8 = 1; npr_spec_color.w = 1.0f; @@ -672,44 +676,43 @@ static void stage_set(stage* s, stage* other) { if (s) { //flt_14CC925C0 = 0.0; //flt_140CB3704 = -1001.0; - draw_pass->enable[DRAW_PASS_REFLECT] = false; - draw_pass->reflect = false; - draw_pass->enable[DRAW_PASS_REFRACT] = false; - draw_pass->refract = true; - draw_pass->field_31D = 0; - draw_pass->field_31E = 0; + draw_pass->set_enable(DRAW_PASS_REFLECT, false); + draw_pass->set_reflect(false); + draw_pass->set_enable(DRAW_PASS_REFRACT, false); + draw_pass->set_refract(true); + draw_pass->field_31D = false; + draw_pass->field_31E = false; draw_pass->field_31F = false; - draw_pass->field_320 = 0; - draw_pass->shadow = true; + draw_pass->field_320 = false; + draw_pass->set_shadow_true(); //rctx_ptr->post_process.field_14 = 0; //rctx_ptr->post_process.field_ED8 = 1; npr_spec_color.w = 1.0f; - draw_pass->npr_param = 0; + draw_pass->set_npr_param(0); light_chara_ambient = false; } if (other) { rctx_ptr->chara_reflect = other->stage_data->reflect_type != STAGE_DATA_REFLECT_DISABLE; - draw_pass->reflect_type = other->stage_data->reflect_type; + draw_pass->set_reflect_type(other->stage_data->reflect_type); rctx_ptr->chara_refract = other->stage_data->refract_enable; if (other->stage_data->reflect) { stage_data_reflect* reflect = &other->stage_data->reflect_data; - draw_pass->enable[DRAW_PASS_REFLECT] = true; - draw_pass->reflect_blur_num = reflect->blur_num; - draw_pass->reflect_blur_filter = (blur_filter_mode)reflect->blur_filter; - draw_pass->reflect = true; - /*reflect_refract_resolution_mode reflect_resolution_mode = REFLECT_REFRACT_RESOLUTION_512x512; + draw_pass->set_enable(DRAW_PASS_REFLECT, true); + draw_pass->set_reflect_blur(reflect->blur_num, (blur_filter_mode)reflect->blur_filter); + draw_pass->set_reflect(true); + reflect_refract_resolution_mode reflect_resolution_mode = REFLECT_REFRACT_RESOLUTION_512x512; if (other->stage_data->reflect_type != STAGE_DATA_REFLECT_REFLECT_MAP) reflect_resolution_mode = (reflect_refract_resolution_mode)reflect->mode; - draw_pass_data_set_reflect_resolution_mode(reflect_resolution_mode);*/ + draw_pass->set_refract_resolution_mode(reflect_resolution_mode); } if (other->stage_data->refract) { stage_data_refract* refract = &other->stage_data->refract_data; - draw_pass->enable[DRAW_PASS_REFRACT] = true; - //draw_pass_data_set_refract_resolution_mode(refract->mode); - draw_pass->refract = true; + draw_pass->set_enable(DRAW_PASS_REFRACT, true); + draw_pass->set_refract_resolution_mode((reflect_refract_resolution_mode)refract->mode); + draw_pass->set_refract(true); } if (other->stage_data->flags & STAGE_DATA_FLAG_1) @@ -723,23 +726,17 @@ static void stage_set(stage* s, stage* other) { //if (stru_14CC92630.pv_id == 421) //draw_pass->field_31F = true; //sub_14064DC10(); - //sub_140344160(other->index); + task_effect_parent_set_current_stage_index(other->index); } - //else - //sub_140344160(-1); + else + task_effect_parent_set_current_stage_index(-1); if (other) light_param_data_storage_data_set_stage(other->index); else light_param_data_storage_data_set_default_light_param(); - if (s) - for (int32_t& i : s->auth_3d_ids) - auth_3d_data_set_req_frame(&i, 0.0f); - - if (other) - for (int32_t& i : other->auth_3d_ids) - auth_3d_data_set_req_frame(&i, 0.0f); + task_effect_parent_set_frame(0); //sub_140344180(0); @@ -747,7 +744,7 @@ static void stage_set(stage* s, stage* other) { for (int32_t i = 0; i < ROB_CHARA_COUNT; i++) { rob_chara* rob_chr = rob_chara_array_get(i); //if (rob_chr) - //sub_1405559D0(rob_chr, &other->index); + //rob_chara_set_stage_data_ring(rob_chr, &other->index); } } @@ -849,7 +846,7 @@ DtmStg::~DtmStg() { } bool DtmStg::Init() { - task_stage_load("DATA_TEST_STG_STAGE"); + task_stage_load_task("DATA_TEST_STG_STAGE"); task_stage_set_stage_index(stage_index); return true; } @@ -867,6 +864,6 @@ bool DtmStg::Ctrl() { } bool DtmStg::Dest() { - task_stage_unload(); + task_stage_unload_task(); return true; } diff --git a/src/CRE/stage.hpp b/src/CRE/stage.hpp index 8e9a9924..3ea8e007 100644 --- a/src/CRE/stage.hpp +++ b/src/CRE/stage.hpp @@ -95,7 +95,7 @@ extern void task_stage_current_set_effect_display(bool value); extern void task_stage_current_set_ground(bool value); extern void task_stage_current_set_ring(bool value); extern void task_stage_current_set_sky(bool value); -extern void task_stage_current_set_stage_display(bool value); +extern void task_stage_current_set_stage_display(bool value, bool effect_enable); extern void task_stage_disp_shadow(); extern stage* task_stage_get_current_stage(); int32_t task_stage_get_current_stage_index(); @@ -104,15 +104,15 @@ extern void task_stage_get_loaded_stage_infos(std::vector* vec) extern stage* task_stage_get_stage(task_stage_info stg_info); int32_t task_stage_get_stage_index(task_stage_info* stg_info); extern bool task_stage_has_stage_info(task_stage_info* stg_info); -extern bool task_stage_load(const char* name); +extern bool task_stage_load_task(const char* name); extern void task_stage_set_effect_display(task_stage_info* stg_info, bool value); extern void task_stage_set_ground(task_stage_info* stg_info, bool value); extern void task_stage_set_mat(mat4* mat); extern void task_stage_set_ring(task_stage_info* stg_info, bool value); extern void task_stage_set_sky(task_stage_info* stg_info, bool value); extern void task_stage_set_stage(task_stage_info* stg_info); -extern void task_stage_set_stage_display(task_stage_info* stg_info, bool value); +extern void task_stage_set_stage_display(task_stage_info* stg_info, bool value, bool effect_enable); extern void task_stage_set_stage_index(int32_t stage_index); -extern void task_stage_set_stage_indices(std::vector* stage_indices); -extern bool task_stage_unload(); +extern void task_stage_set_stage_indices(std::vector& stage_indices); +extern bool task_stage_unload_task(); extern void task_stage_free(); diff --git a/src/CRE/stage_modern.cpp b/src/CRE/stage_modern.cpp index 1a6680fb..1c5dc740 100644 --- a/src/CRE/stage_modern.cpp +++ b/src/CRE/stage_modern.cpp @@ -11,6 +11,7 @@ #include "draw_task.hpp" #include "light_param.hpp" #include "render_context.hpp" +#include "task_effect.hpp" namespace stage_detail { static void TaskStageModern_CtrlInner(stage_detail::TaskStageModern* a1); @@ -23,7 +24,8 @@ namespace stage_detail { task_stage_modern_info* stg_info); static void TaskStageModern_GetLoadedStageInfos(stage_detail::TaskStageModern* a1, std::vector* vec); - static bool TaskStageModern_Load(stage_detail::TaskStageModern* a1, const char* name); + static void TaskStageModern_Load(stage_detail::TaskStageModern* a1); + static bool TaskStageModern_LoadTask(stage_detail::TaskStageModern* a1, const char* name); static void TaskStageModern_Reset(stage_detail::TaskStageModern* a1); static void TaskStageModern_SetStage(stage_detail::TaskStageModern* a1, task_stage_modern_info stg_info); static void TaskStageModern_TaskWindAppend(stage_detail::TaskStageModern* a1); @@ -63,6 +65,10 @@ bool task_stage_modern_check_not_loaded() { return task_stage_modern->load_stage_hashes.size() || task_stage_modern->state != 6; } +bool task_stage_modern_check_task_ready() { + return app::TaskWork::CheckTaskReady(task_stage_modern); +} + void task_stage_modern_current_set_effect_display(bool value) { task_stage_modern_info stg_info; task_stage_modern_get_current_stage_info(&stg_info); @@ -84,11 +90,11 @@ void task_stage_modern_current_set_sky(bool value) { task_stage_modern_set_sky(&stg_info, value); } -void task_stage_modern_current_set_stage_display(bool value) { +void task_stage_modern_current_set_stage_display(bool value, bool effect_enable) { task_stage_modern_info stg_info; task_stage_modern_get_current_stage_info(&stg_info); if (task_stage_modern_has_stage_info(&stg_info)) - task_stage_modern_set_stage_display(&stg_info, value); + task_stage_modern_set_stage_display(&stg_info, value, effect_enable); } void task_stage_modern_disp_shadow() { @@ -130,9 +136,9 @@ bool task_stage_modern_has_stage_info(task_stage_modern_info* stg_info) { return task_stage_modern_get_stage(*stg_info) != 0; } -bool task_stage_modern_load(const char* name) { +bool task_stage_modern_load_task(const char* name) { task_stage_is_modern = true; - return stage_detail::TaskStageModern_Load(task_stage_modern, name); + return stage_detail::TaskStageModern_LoadTask(task_stage_modern, name); } void task_stage_modern_set_data(void* data, @@ -169,10 +175,13 @@ void task_stage_modern_set_stage(task_stage_modern_info* stg_info) { stage_detail::TaskStageModern_SetStage(task_stage_modern, *stg_info); } -void task_stage_modern_set_stage_display(task_stage_modern_info* stg_info, bool value) { +void task_stage_modern_set_stage_display(task_stage_modern_info* stg_info, bool value, bool effect_enable) { stage_modern* stg = task_stage_modern_get_stage(*stg_info); - if (stg) + if (stg) { stg->stage_display = value; + if (effect_enable) + task_effect_parent_set_enable(value); + } } void task_stage_modern_set_stage_hash(uint32_t stage_hash, stage_data_modern* stg_data) { @@ -187,15 +196,15 @@ void task_stage_modern_set_stage_hash(uint32_t stage_hash, stage_data_modern* st stages_data.begin(), stages_data.end()); } -void task_stage_modern_set_stage_hashes(std::vector* stage_hashes, - std::vector* load_stage_data) { +void task_stage_modern_set_stage_hashes(std::vector& stage_hashes, + std::vector& load_stage_data) { task_stage_modern->load_stage_hashes.insert(task_stage_modern->load_stage_hashes.end(), - stage_hashes->begin(), stage_hashes->end()); + stage_hashes.begin(), stage_hashes.end()); task_stage_modern->load_stages_data.insert(task_stage_modern->load_stages_data.end(), - load_stage_data->begin(), load_stage_data->end()); + load_stage_data.begin(), load_stage_data.end()); } -bool task_stage_modern_unload() { +bool task_stage_modern_unload_task() { return task_stage_modern->SetDest(); } @@ -222,51 +231,10 @@ static void stage_detail::TaskStageModern_CtrlInner(stage_detail::TaskStageModer return; } - if (a1->state == 3) { - //sub_140229F30("rom/STGTST_COLI.000.bin"); - light_param_data_storage_data_load_stages(&a1->stage_hashes, a1->stage_data); - a1->state = 4; - } - else if (a1->state == 4 && !light_param_data_storage_data_load_file()/* && !sub_14022A380()*/) { - bool v5 = 0; - for (int32_t i = 0; i < TASK_STAGE_STAGE_COUNT; i++) - if (a1->stages[i].hash != -1 && a1->stages[i].hash != hash_murmurhash_empty - && a1->stages[i].state != 6) { - v5 = 1; - break; - } - - if (!v5) { - //sub_140343B20(&a1->stage_hashes); - //task_stage_modern_current_set_effect_display(a1->stage_display); - a1->state = 5; - //sub_14064DC10(); - } - } - else if (a1->state == 5/* && !sub_1403446E0()*/) { - std::vector vec; - stage_detail::TaskStageModern_GetLoadedStageInfos(a1, &vec); - if (vec.size()) { - stage_detail::TaskStageModern_SetStage(a1, vec[0]); - - stage_modern* s = stage_detail::TaskStageModern_GetStage(a1, vec[0]); - for (uint32_t& i : s->stage_data->auth_3d_ids) { - int32_t id = auth_3d_data_load_hash(i, a1->data, a1->obj_db, a1->tex_db); - if (id == -1) - continue; - - auth_3d_data_read_file_modern(&id); - auth_3d_data_set_enable(&id, true); - auth_3d_data_set_paused(&id, false); - auth_3d_data_set_frame_rate(&id, 0); - s->auth_3d_ids.push_back(id); - } - } - a1->state = 6; - } - else if (a1->state >= 7 && a1->state <= 9) { + if (a1->state >= 3 && a1->state <= 5) + stage_detail::TaskStageModern_Load(a1); + else if (a1->state >= 7 && a1->state <= 9) stage_detail::TaskStageModern_Unload(a1); - } } static void stage_detail::TaskStageModern_DispShadow(stage_detail::TaskStageModern* a1) { @@ -317,7 +285,46 @@ static void stage_detail::TaskStageModern_GetLoadedStageInfos(stage_detail::Task } } -static bool stage_detail::TaskStageModern_Load(stage_detail::TaskStageModern* a1, const char* name) { +static void stage_detail::TaskStageModern_Load(stage_detail::TaskStageModern* a1) { + switch (a1->state) { + case 3: { + //sub_140229F30("rom/STGTST_COLI.000.bin"); + light_param_data_storage_data_load_stages(a1->stage_hashes, a1->stage_data); + a1->state = 4; + } break; + case 4: { + if (light_param_data_storage_data_load_file()/* || sub_14022A380()*/) + break; + + bool wait_load = false; + for (int32_t i = 0; i < TASK_STAGE_STAGE_COUNT; i++) + if (a1->stages[i].hash != -1 && a1->stages[i].hash != hash_murmurhash_empty + && a1->stages[i].state != 6) { + wait_load = true; + break; + } + + if (!wait_load) { + task_effect_parent_set_stage_hashes(a1->stage_hashes); + task_effect_parent_set_enable(a1->stage_display); + a1->state = 5; + //sub_14064DC10(); + } + } break; + case 5: { + if (task_effect_parent_load()) + break; + + std::vector vec; + stage_detail::TaskStageModern_GetLoadedStageInfos(a1, &vec); + if (vec.size()) + stage_detail::TaskStageModern_SetStage(a1, vec[0]); + a1->state = 6; + } break; + } +} + +static bool stage_detail::TaskStageModern_LoadTask(stage_detail::TaskStageModern* a1, const char* name) { if (app::TaskWork::AppendTask(a1, name)) { stage_detail::TaskStageModern_Reset(a1); stage_detail::TaskStageModern_TaskWindAppend(a1); @@ -378,11 +385,11 @@ static void stage_detail::TaskStageModern_Unload(stage_detail::TaskStageModern* } if (a1->state == 7) { - //sub_140343C30(); + task_effect_parent_dest(); a1->state = 8; } else if (a1->state == 8) { - //if (!sub_140344700()) + if (!task_effect_parent_unload()) a1->state = 9; } else if (a1->state == 9) { @@ -463,11 +470,11 @@ static void stage_modern_disp(stage_modern* s) { mat4 mat; mat4_rotate_y(s->rot_y, &mat); - if (s->stage_data->object_ground.not_null() && s->ground) + if (s->stage_data->object_ground.not_null_modern() && s->ground) draw_task_add_draw_object_by_object_info(rctx_ptr, &mat, s->stage_data->object_ground, 0, 0, 0, 0, 0, 0); - if (s->stage_data->object_reflect.not_null()) { + if (s->stage_data->object_reflect.not_null_modern()) { object_data->set_draw_task_flags( (draw_task_flags)(DRAW_TASK_NO_TRANSLUCENCY | DRAW_TASK_REFRACT)); draw_task_add_draw_object_by_object_info(rctx_ptr, @@ -475,7 +482,7 @@ static void stage_modern_disp(stage_modern* s) { object_data->set_draw_task_flags(); } - if (s->stage_data->object_refract.not_null()) { + if (s->stage_data->object_refract.not_null_modern()) { object_data->set_draw_task_flags( (draw_task_flags)(DRAW_TASK_NO_TRANSLUCENCY | DRAW_TASK_REFRACT)); draw_task_add_draw_object_by_object_info(rctx_ptr, @@ -483,7 +490,7 @@ static void stage_modern_disp(stage_modern* s) { object_data->set_draw_task_flags(); } - if (s->stage_data->object_sky.not_null() && s->sky) { + if (s->stage_data->object_sky.not_null_modern() && s->sky) { mat4 t = s->mat; mat4_mult(&t, &mat, &t); draw_task_add_draw_object_by_object_info(rctx_ptr, @@ -497,7 +504,7 @@ static void stage_modern_disp_shadow(stage_modern* s) { mat4 mat; mat4_rotate_y(s->rot_y, &mat); - if (s->stage_data->object_shadow.not_null()) + if (s->stage_data->object_shadow.not_null_modern()) stage_modern_disp_shadow_object(s->stage_data->object_shadow, &mat); } @@ -538,7 +545,7 @@ static void stage_modern_free(stage_modern* s) { rctx_ptr->post_process.movie_texture_free( texture_storage_get_texture(s->stage_data->movie_texture)); - draw_pass->shadow = true; + draw_pass->set_shadow_true(); //rctx_ptr->post_process.field_14 = 0; //rctx_ptr->post_process.field_ED8 = 1; npr_spec_color.w = 1.0f; @@ -625,19 +632,19 @@ static void stage_modern_set(stage_modern* s, stage_modern* other) { if (s) { //flt_14CC925C0 = 0.0; //flt_140CB3704 = -1001.0; - draw_pass->enable[DRAW_PASS_REFLECT] = false; - draw_pass->reflect = false; - draw_pass->enable[DRAW_PASS_REFRACT] = false; - draw_pass->refract = true; - draw_pass->field_31D = 0; - draw_pass->field_31E = 0; + draw_pass->set_enable(DRAW_PASS_REFLECT, false); + draw_pass->set_reflect(false); + draw_pass->set_enable(DRAW_PASS_REFRACT, false); + draw_pass->set_refract(true); + draw_pass->field_31D = false; + draw_pass->field_31E = false; draw_pass->field_31F = false; - draw_pass->field_320 = 0; - draw_pass->shadow = true; + draw_pass->field_320 = false; + draw_pass->set_shadow_true(); //rctx_ptr->post_process.field_14 = 0; //rctx_ptr->post_process.field_ED8 = 1; npr_spec_color.w = 1.0f; - draw_pass->npr_param = 0; + draw_pass->set_npr_param(0); light_chara_ambient = false; } @@ -645,23 +652,17 @@ static void stage_modern_set(stage_modern* s, stage_modern* other) { //if (stru_14CC92630.pv_id == 421) //draw_pass->field_31F = true; //sub_14064DC10(); - //sub_140344160(other->index); + task_effect_parent_set_current_stage_hash(other->hash); } - //else - //sub_140344160(-1); + else + task_effect_parent_set_current_stage_hash(hash_murmurhash_empty); if (other) light_param_data_storage_data_set_stage(other->hash); else light_param_data_storage_data_set_default_light_param(); - if (s) - for (int32_t& i : s->auth_3d_ids) - auth_3d_data_set_req_frame(&i, 0.0f); - - if (other) - for (int32_t& i : other->auth_3d_ids) - auth_3d_data_set_req_frame(&i, 0.0f); + task_effect_parent_set_frame(0); //sub_140344180(0); @@ -669,7 +670,7 @@ static void stage_modern_set(stage_modern* s, stage_modern* other) { for (int32_t i = 0; i < ROB_CHARA_COUNT; i++) { rob_chara* rob_chr = rob_chara_array_get(i); //if (rob_chr) - //sub_1405559D0(rob_chr, &other->index); + //rob_chara_set_stage_data_ring(rob_chr, &other->index); } } diff --git a/src/CRE/stage_modern.hpp b/src/CRE/stage_modern.hpp index 8270ba3a..d5e9bfcb 100644 --- a/src/CRE/stage_modern.hpp +++ b/src/CRE/stage_modern.hpp @@ -75,10 +75,11 @@ struct task_stage_modern_info { extern void task_stage_modern_init(); extern bool task_stage_modern_check_not_loaded(); +extern bool task_stage_modern_check_task_ready(); extern void task_stage_modern_current_set_effect_display(bool value); extern void task_stage_modern_current_set_ground(bool value); extern void task_stage_modern_current_set_sky(bool value); -extern void task_stage_modern_current_set_stage_display(bool value); +extern void task_stage_modern_current_set_stage_display(bool value, bool effect_enable); extern void task_stage_modern_disp_shadow(); extern stage_modern* task_stage_modern_get_current_stage(); extern uint32_t task_stage_modern_get_current_stage_hash(); @@ -87,7 +88,7 @@ extern void task_stage_modern_get_loaded_stage_infos(std::vector* stage_hashes, - std::vector* load_stage_data); -extern bool task_stage_modern_unload(); +extern void task_stage_modern_set_stage_hashes(std::vector& stage_hashes, + std::vector& load_stage_data); +extern bool task_stage_modern_unload_task(); extern void task_stage_modern_free(); diff --git a/src/CRE/stage_param.cpp b/src/CRE/stage_param.cpp new file mode 100644 index 00000000..dae918cb --- /dev/null +++ b/src/CRE/stage_param.cpp @@ -0,0 +1,185 @@ +/* + by korenkonder + GitHub/GitLab: korenkonder +*/ + +#include "stage_param.hpp" + +template +static T& stage_param_data_storage_get_value(std::map& map, int32_t key); + +std::map stage_param_data_fog_ring_storage; +std::map stage_param_data_leaf_storage; +std::map stage_param_data_litproj_storage; +std::map stage_param_data_rain_storage; +std::map stage_param_data_ripple_storage; +std::map stage_param_data_snow_storage; +std::map stage_param_data_splash_storage; +std::map stage_param_data_star_storage; + +void stage_param_data_storage_init() { + stage_param_data_fog_ring_storage = {}; + stage_param_data_leaf_storage = {}; + stage_param_data_litproj_storage = {}; + stage_param_data_rain_storage = {}; + stage_param_data_ripple_storage = {}; + stage_param_data_snow_storage = {}; + stage_param_data_splash_storage = {}; + stage_param_data_star_storage = {}; +} + +void stage_param_data_storage_free() { + stage_param_data_fog_ring_storage.clear(); + stage_param_data_leaf_storage.clear(); + stage_param_data_litproj_storage.clear(); + stage_param_data_rain_storage.clear(); + stage_param_data_ripple_storage.clear(); + stage_param_data_snow_storage.clear(); + stage_param_data_splash_storage.clear(); + stage_param_data_star_storage.clear(); +} + +void stage_param_data_fog_ring_storage_clear() { + stage_param_data_fog_ring_storage.clear(); +} + +stage_param_fog_ring* stage_param_data_fog_ring_storage_get_value(int32_t stage_index) { + auto elem = stage_param_data_fog_ring_storage.find(stage_index); + if (elem != stage_param_data_fog_ring_storage.end()) + return &elem->second; + return 0; +} + +void stage_param_data_fog_ring_storage_set_stage_data(int32_t stage_index, stage_param_fog_ring* value) { + if (value) + stage_param_data_storage_get_value( + stage_param_data_fog_ring_storage, stage_index) = *value; +} + +void stage_param_data_leaf_storage_clear() { + stage_param_data_leaf_storage.clear(); +} + +stage_param_leaf* stage_param_data_leaf_storage_get_value(int32_t stage_index) { + auto elem = stage_param_data_leaf_storage.find(stage_index); + if (elem != stage_param_data_leaf_storage.end()) + return &elem->second; + return 0; +} + +void stage_param_data_leaf_storage_set_stage_data(int32_t stage_index, stage_param_leaf* value) { + if (value) + stage_param_data_storage_get_value( + stage_param_data_leaf_storage, stage_index) = *value; +} + +void stage_param_data_litproj_storage_clear() { + stage_param_data_litproj_storage.clear(); +} + +stage_param_litproj* stage_param_data_litproj_storage_get_value(int32_t stage_index) { + auto elem = stage_param_data_litproj_storage.find(stage_index); + if (elem != stage_param_data_litproj_storage.end()) + return &elem->second; + return 0; +} + +void stage_param_data_litproj_storage_set_stage_data(int32_t stage_index, stage_param_litproj* value) { + if (value) + stage_param_data_storage_get_value( + stage_param_data_litproj_storage, stage_index) = *value; +} + +void stage_param_data_rain_storage_clear() { + stage_param_data_rain_storage.clear(); +} + +stage_param_rain* stage_param_data_rain_storage_get_value(int32_t stage_index) { + auto elem = stage_param_data_rain_storage.find(stage_index); + if (elem != stage_param_data_rain_storage.end()) + return &elem->second; + return 0; +} + +void stage_param_data_rain_storage_set_stage_data(int32_t stage_index, stage_param_rain* value) { + if (value) + stage_param_data_storage_get_value( + stage_param_data_rain_storage, stage_index) = *value; +} + +void stage_param_data_ripple_storage_clear() { + stage_param_data_ripple_storage.clear(); +} + +stage_param_ripple* stage_param_data_ripple_storage_get_value(int32_t stage_index) { + auto elem = stage_param_data_ripple_storage.find(stage_index); + if (elem != stage_param_data_ripple_storage.end()) + return &elem->second; + return 0; +} + +void stage_param_data_ripple_storage_set_stage_data(int32_t stage_index, stage_param_ripple* value) { + if (value) + stage_param_data_storage_get_value( + stage_param_data_ripple_storage, stage_index) = *value; +} + +void stage_param_data_snow_storage_clear() { + stage_param_data_snow_storage.clear(); +} + +stage_param_snow* stage_param_data_snow_storage_get_value(int32_t stage_index) { + auto elem = stage_param_data_snow_storage.find(stage_index); + if (elem != stage_param_data_snow_storage.end()) + return &elem->second; + return 0; +} + +void stage_param_data_snow_storage_set_stage_data(int32_t stage_index, stage_param_snow* value) { + if (value) + stage_param_data_storage_get_value( + stage_param_data_snow_storage, stage_index) = *value; +} + +void stage_param_data_splash_storage_clear() { + stage_param_data_splash_storage.clear(); +} + +stage_param_splash* stage_param_data_splash_storage_get_value(int32_t stage_index) { + auto elem = stage_param_data_splash_storage.find(stage_index); + if (elem != stage_param_data_splash_storage.end()) + return &elem->second; + return 0; +} + +void stage_param_data_splash_storage_set_stage_data(int32_t stage_index, stage_param_splash* value) { + if (value) + stage_param_data_storage_get_value( + stage_param_data_splash_storage, stage_index) = *value; +} + +void stage_param_data_star_storage_clear() { + stage_param_data_star_storage.clear(); +} + +stage_param_star* stage_param_data_star_storage_get_value(int32_t stage_index) { + auto elem = stage_param_data_star_storage.find(stage_index); + if (elem != stage_param_data_star_storage.end()) + return &elem->second; + return 0; +} + +void stage_param_data_star_storage_set_stage_data(int32_t stage_index, stage_param_star* value) { + if (value) + stage_param_data_storage_get_value( + stage_param_data_star_storage, stage_index) = *value; +} + +template +static T& stage_param_data_storage_get_value(std::map& map, int32_t key) { + auto elem = map.find(key); + if (elem != map.end()) + return elem->second; + + return map.insert({ key, {} }).first->second; +} diff --git a/src/CRE/stage_param.hpp b/src/CRE/stage_param.hpp new file mode 100644 index 00000000..806027dc --- /dev/null +++ b/src/CRE/stage_param.hpp @@ -0,0 +1,44 @@ +/* + by korenkonder + GitHub/GitLab: korenkonder +*/ + +#pragma once + +#include +#include "../KKdLib/stage_param/fog_ring.hpp" +#include "../KKdLib/stage_param/leaf.hpp" +#include "../KKdLib/stage_param/litproj.hpp" +#include "../KKdLib/stage_param/rain.hpp" +#include "../KKdLib/stage_param/ripple.hpp" +#include "../KKdLib/stage_param/snow.hpp" +#include "../KKdLib/stage_param/splash.hpp" +#include "../KKdLib/stage_param/star.hpp" + +extern void stage_param_data_storage_init(); +extern void stage_param_data_storage_free(); + +extern void stage_param_data_fog_ring_storage_clear(); +extern stage_param_fog_ring* stage_param_data_fog_ring_storage_get_value(int32_t stage_index); +extern void stage_param_data_fog_ring_storage_set_stage_data(int32_t stage_index, stage_param_fog_ring* value); +extern void stage_param_data_leaf_storage_clear(); +extern stage_param_leaf* stage_param_data_leaf_storage_get_value(int32_t stage_index); +extern void stage_param_data_leaf_storage_set_stage_data(int32_t stage_index, stage_param_leaf* value); +extern void stage_param_data_litproj_storage_clear(); +extern stage_param_litproj* stage_param_data_litproj_storage_get_value(int32_t stage_index); +extern void stage_param_data_litproj_storage_set_stage_data(int32_t stage_index, stage_param_litproj* value); +extern void stage_param_data_rain_storage_clear(); +extern stage_param_rain* stage_param_data_rain_storage_get_value(int32_t stage_index); +extern void stage_param_data_rain_storage_set_stage_data(int32_t stage_index, stage_param_rain* value); +extern void stage_param_data_ripple_storage_clear(); +extern stage_param_ripple* stage_param_data_ripple_storage_get_value(int32_t stage_index); +extern void stage_param_data_ripple_storage_set_stage_data(int32_t stage_index, stage_param_ripple* value); +extern void stage_param_data_snow_storage_clear(); +extern stage_param_snow* stage_param_data_snow_storage_get_value(int32_t stage_index); +extern void stage_param_data_snow_storage_set_stage_data(int32_t stage_index, stage_param_snow* value); +extern void stage_param_data_splash_storage_clear(); +extern stage_param_splash* stage_param_data_splash_storage_get_value(int32_t stage_index); +extern void stage_param_data_splash_storage_set_stage_data(int32_t stage_index, stage_param_splash* value); +extern void stage_param_data_star_storage_clear(); +extern stage_param_star* stage_param_data_star_storage_get_value(int32_t stage_index); +extern void stage_param_data_star_storage_set_stage_data(int32_t stage_index, stage_param_star* value); diff --git a/src/CRE/task.cpp b/src/CRE/task.cpp index 33e74331..5d00ec82 100644 --- a/src/CRE/task.cpp +++ b/src/CRE/task.cpp @@ -13,20 +13,18 @@ extern float_t delta_frame_history; extern int32_t delta_frame_history_int; namespace app { - static void Task_add_base_calc_time(Task* t, uint32_t calc_time); + static void Task_add_base_calc_time(Task* t, uint32_t value); static void Task_do_basic(Task* t); static void Task_do_ctrl(Task* t); static void Task_do_ctrl_frames(int32_t frames, bool frame_skip); static void Task_do_disp(Task* t); - static void Task_set_base_calc_time(Task* t, uint32_t base_calc_time); + static void Task_set_base_calc_time(Task* t, uint32_t value); static void Task_set_calc_time(Task* t); - static void Task_set_disp_time(Task* t, uint32_t disp_time); + static void Task_set_disp_time(Task* t, uint32_t value); static bool Task_sub_14019B810(Task* t, int32_t a2); static void Task_sub_14019C480(Task* t, uint32_t a2); static void Task_sub_14019C5A0(Task* t); - static bool TaskWork_has_task_dest(Task* t); - TaskWork* task_work; TaskInterface::TaskInterface() { @@ -126,7 +124,7 @@ namespace app { } bool Task::sub_14019C3B0() { - if (!app::TaskWork::HasTask(this) || !Task_sub_14019B810(this, 5)) + if (!TaskWork::HasTask(this) || !Task_sub_14019B810(this, 5)) return false; Task_sub_14019C480(this, 5); @@ -134,7 +132,7 @@ namespace app { } bool Task::sub_14019C540() { - if (!app::TaskWork::HasTask(this) || !Task_sub_14019B810(this, 4)) + if (!TaskWork::HasTask(this) || !Task_sub_14019B810(this, 4)) return false; Task_sub_14019C480(this, 4); @@ -184,6 +182,10 @@ namespace app { Task_do_basic(j); } + bool TaskWork::CheckTaskCtrl(Task* t) { + return app::TaskWork::HasTask(t) && t->field_1C == 1 && t->field_18 == Task::Enum::Ctrl; + } + bool TaskWork::CheckTaskReady(Task* t) { return TaskWork::HasTask(t) && (t->field_18 == Task::Enum::None || t->field_1C); } @@ -198,7 +200,7 @@ namespace app { for (std::list::iterator j = task_work->tasks.end(); j != task_work->tasks.begin(); ) { --j; Task* tsk = *j; - if (tsk->priority != i || !TaskWork_has_task_dest(tsk)) + if (tsk->priority != i || !HasTaskDest(tsk)) continue; time_struct t; @@ -301,8 +303,8 @@ namespace app { delete task_work; } - static void Task_add_base_calc_time(Task* t, uint32_t calc_time) { - t->base_calc_time += calc_time; + static void Task_add_base_calc_time(Task* t, uint32_t value) { + t->base_calc_time += value; } static void Task_do_basic(Task* t) { @@ -337,7 +339,7 @@ namespace app { for (int32_t i = 0; i < 3; i++) for (Task*& j : task_work->tasks) { Task* tsk = j; - if (tsk->priority != i || TaskWork_has_task_dest(tsk)) + if (tsk->priority != i || TaskWork::HasTaskDest(tsk)) continue; else if (tsk->is_frame_dependent) { if (frames <= 0) @@ -360,8 +362,8 @@ namespace app { t->Disp(); } - static void Task_set_base_calc_time(Task* t, uint32_t base_calc_time) { - t->base_calc_time = base_calc_time; + static void Task_set_base_calc_time(Task* t, uint32_t value) { + t->base_calc_time = value; } static void Task_set_calc_time(Task* t) { @@ -372,8 +374,8 @@ namespace app { t->calc_time = max_def(t->calc_time, t->calc_time_max); } - static void Task_set_disp_time(Task* t, uint32_t disp_time) { - t->disp_time = disp_time; + static void Task_set_disp_time(Task* t, uint32_t value) { + t->disp_time = value; uint32_t frame_counter = get_frame_counter(); if (frame_counter == (frame_counter / 300) * 300) t->disp_time_max = 0; @@ -433,10 +435,4 @@ namespace app { t->field_18 = t->field_24; t->field_1C = t->field_28; } - - static bool TaskWork_has_task_dest(Task* t) { - if (TaskWork::HasTask(t)) - return t->field_18 == Task::Enum::Dest; - return false; - } } diff --git a/src/CRE/task.hpp b/src/CRE/task.hpp index 81457398..17580795 100644 --- a/src/CRE/task.hpp +++ b/src/CRE/task.hpp @@ -50,7 +50,7 @@ namespace app { uint32_t disp_time_max; Task(); - virtual ~Task(); + virtual ~Task() override; uint32_t GetCalcTime(); uint32_t GetCalcTimeMax(); @@ -80,9 +80,10 @@ namespace app { static bool AppendTask(Task* t, const char* name = "(unknown)", int32_t priority = 1); - static bool AppendTask(Task* t, Task* parent_task = task_work->current, + static bool AppendTask(Task* t, Task* parent_task, const char* name = "(unknown)", int32_t priority = 1); static void Basic(); + static bool CheckTaskCtrl(Task* t); static bool CheckTaskReady(Task* t); static void Ctrl(); static void Dest(); diff --git a/src/CRE/task_effect.cpp b/src/CRE/task_effect.cpp index bcb9da8d..5beabd04 100644 --- a/src/CRE/task_effect.cpp +++ b/src/CRE/task_effect.cpp @@ -4,16 +4,270 @@ */ #include "task_effect.hpp" +#include "../KKdLib/hash.hpp" #include "auth_3d.hpp" #include "data.hpp" +#include "draw_task.hpp" +#include "random.hpp" #include "render_context.hpp" #include "shader_ft.hpp" +#include "stage_param.hpp" #include "texture.hpp" -extern render_context* rctx_ptr; +struct for_ring_vertex_data { + vec2 position; + vec4 color; +}; + +struct leaf_particle_data { + vec3 position; + vec3 direction; + vec3 normal; + vec3 rotation; + vec3 rotation_add; + float_t size; + int32_t type; + + void init(); +}; + +struct leaf_particle_vertex_data { + vec3 position; + vec3 normal; + vec2 texcoord; +}; + +struct particle_data { + vec3 position; + vec3 direction; + vec3 normal; + vec3 rotation; + vec3 rotation_add; + vec4 color; + bool alive; + float_t type; + float_t life_time; + float_t size; +}; + +struct particle_vertex_data { + vec3 position; + vec3 normal; + vec4 color; + vec2 texcoord; +}; + +struct rain_particle_data { + vec3 position; + vec2 texcoord; + float_t alpha; + int32_t type; + int32_t field_1C; + vec3 velocity; + int32_t field_2C; + int32_t field_30; + int32_t field_34; + int32_t field_38; + int32_t field_3C; + + rain_particle_data(); +}; + +struct struc_608 { + const stage_effects* stage_effects; + const stage_effects_modern* stage_effects_modern; + std::vector> field_10; + + struc_608(); + struc_608(const ::stage_effects* stage_effects); + struc_608(const ::stage_effects_modern* stage_effects_modern); + ~struc_608(); +}; + +struct TaskEffectParent { + uint32_t current_stage_hash; // Added + int32_t current_stage_index; + std::vector stage_hashes; // Added + std::vector stage_indices; + std::vector obj_set_ids; + std::vector> effects; + std::vector> field_50; + std::vector> field_68; + int32_t state; + bool enable; + bool modern; // Added + + void* data; // Added + object_database* obj_db; // Added + texture_database* tex_db; // Added + stage_database* stage_data; // Added + + TaskEffectParent(); + virtual ~TaskEffectParent(); + + std::pair AddTaskEffectTypePtr(TaskEffectType type); + int32_t CheckTaskEffectTypeLoaded(TaskEffectType type); + void Event(TaskEffectType type, int32_t event_type, void* data); + void Dest(); + bool Load(); + void Reset(); + void ResetData(); + void SetCurrentStageHash(uint32_t stage_hash); // Added + void SetCurrentStageIndex(int32_t stage_index); + void SetEnable(bool value); + void SetFrame(int32_t value); + void SetFrameRateControl(FrameRateControl* value); + void SetStageHashes(std::vector& stage_hashes); // Added + void SetStageIndices(std::vector& stage_indices); + bool Unload(); +}; + +static TaskEffect* task_effect_array_get(TaskEffectType type, const char** name); +static std::string task_effect_array_get_stage_param_file_path( + TaskEffectType type, int32_t stage_index, bool dev_ram, bool a4); +static bool task_effect_array_parse_stage_param_data_fog_ring(stage_param_fog_ring* fog_ring, int32_t stage_index); +static bool task_effect_array_parse_stage_param_data_leaf(stage_param_leaf* leaf, int32_t stage_index); +static bool task_effect_array_parse_stage_param_data_litproj(stage_param_litproj* litproj, int32_t stage_index); +static bool task_effect_array_parse_stage_param_data_rain(stage_param_rain* rain, int32_t stage_index); +static bool task_effect_array_parse_stage_param_data_ripple(stage_param_ripple* ripple, int32_t stage_index); +static bool task_effect_array_parse_stage_param_data_snow(stage_param_snow* snow, int32_t stage_index); +static bool task_effect_array_parse_stage_param_data_splash(stage_param_splash* splash, int32_t stage_index); +static bool task_effect_array_parse_stage_param_data_star(stage_param_star* star, int32_t stage_index); + +static void draw_fog_particle(render_context* rctx, TaskEffectFogRing::Data* data); + +static void leaf_particle_init(bool change_stage = false); +static void leaf_particle_ctrl(); +static int32_t leaf_particle_disp(); +static void leaf_particle_free(); + +static void litproj_textures_init(); +static void litproj_textures_free(); + +static void particle_init(vec3* offset); +static void particle_ctrl(); +static int32_t particle_disp(particle_vertex_data* vtx_data, particle_data* data, int32_t count); +static particle_data* particle_emit(); +static void particle_event(particle_event_data* event_data); +static void particle_kill(particle_data* data); +static void particle_free(); + +static void rain_particle_init(bool change_stage); +static void rain_particle_ctrl(); +static void rain_particle_free(); + +static TaskEffectAuth3D* task_effect_auth_3d; +static TaskEffectLeaf* task_effect_leaf; +static TaskEffectSnow* task_effect_snow; +static TaskEffectRipple* task_effect_ripple; +static TaskEffectRain* task_effect_rain; +static TaskEffectSplash* task_effect_splash; +static TaskEffectFogAnim* task_effect_fog_anim; +static TaskEffectFogRing* task_effect_fog_ring; +static TaskEffectParticle* task_effect_particle; +static TaskEffectLitproj* task_effect_litproj; +static TaskEffectStar* task_effect_star; + +static TaskEffectParent* task_effect_parent; static TaskEffectFogAnim::Data* task_effect_fog_anim_data; static TaskEffectFogRing::Data* task_effect_fog_ring_data; +static TaskEffectSplash::Data* task_effect_splash_data; + +static stage_param_leaf* stage_param_data_leaf_current; +static stage_param_litproj* stage_param_data_litproj_current; +static stage_param_rain* stage_param_data_rain_current; +static stage_param_snow* stage_param_data_snow_current; + +static bool stage_param_data_leaf_set; +static bool stage_param_data_litproj_set; +static bool stage_param_data_rain_set; +static bool stage_param_data_snow_set; + +static bool leaf_particle_enable; +static float_t leaf_particle_delta_frame; +static float_t leaf_particle_emit_interval; +static float_t leaf_particle_emit_timer; +static int32_t leaf_particle_num_ptcls; +static uint32_t leaf_particle_tex_id; +static leaf_particle_data* leaf_ptcl_data; +static GLuint leaf_ptcl_vao; +static GLuint leaf_ptcl_vbo; +static GLuint leaf_ptcl_ebo; +static const size_t leaf_ptcl_count = 0x800; + +static bool light_proj_enable; +static render_texture litproj_shadow[2]; +static render_texture litproj_texture; + +static bool particle_enable; +static float_t particle_delta_time; +static int32_t particle_index; +static int32_t particle_count; +static vec3 particle_wind; +static particle_data* ptcl_data; +static GLuint ptcl_vao; +static GLuint ptcl_vbo; +static const size_t ptcl_count = 0x400; + +static bool rain_particle_enable; +static float_t rain_particle_delta_frame; +static uint32_t rain_particle_tex_id; +static rain_particle_data rain_ptcl_data[8]; +static GLuint rain_ptcl_vao; +static GLuint rain_ptcl_vbo; +static GLuint rain_ptcl_ebo; +static const size_t rain_ptcl_count = 0x8000; + +static TaskEffect** task_effect_data_array[] = { + (TaskEffect**)&task_effect_auth_3d, + 0, + (TaskEffect**)&task_effect_leaf, + 0, + 0/*(TaskEffect**)&task_effect_snow*/, + 0, + 0/*(TaskEffect**)&task_effect_ripple*/, + (TaskEffect**)&task_effect_rain, + 0, + 0, + 0, + 0, + 0/*(TaskEffect**)&task_effect_splash*/, + 0, + (TaskEffect**)&task_effect_fog_anim, + 0, + (TaskEffect**)&task_effect_fog_ring, + 0, + (TaskEffect**)&task_effect_particle, + (TaskEffect**)&task_effect_litproj, + 0/*(TaskEffect**)task_effect_star*/, +}; + +static const char* task_effect_name_array[] = { + "EFFECT_AUTH3D", + 0, + "EFFECT_LEAF", + 0, + "EFFECT_SNOW", + 0, + "EFFECT_RIPPLE", + "EFFECT_RAIN", + 0, + 0, + 0, + 0, + "EFFECT_SPLASH", + 0, + "EFFECT_FOG_ANIM", + 0, + "EFFECT_FOG_RING", + 0, + "EFFECT_PARTICLE", + "EFFECT_LITPROJ", + "EFFECT_STAR", +}; + +extern render_context* rctx_ptr; TaskEffect::TaskEffect() { @@ -27,6 +281,11 @@ void TaskEffect::PreInit(int32_t stage_index) { } +void TaskEffect::SetStageHashes(std::vector& stage_hashes, void* data, + object_database* obj_db, texture_database* tex_db, stage_database* stage_data) { + +} + void TaskEffect::SetStageIndices(std::vector& stage_indices) { PreInit(stage_indices[0]); } @@ -43,7 +302,11 @@ void TaskEffect::SetEnable(bool value) { } -void TaskEffect::SetStageIndex(int32_t value) { +void TaskEffect::SetCurrentStageHash(uint32_t value) { + +} + +void TaskEffect::SetCurrentStageIndex(int32_t value) { } @@ -59,7 +322,7 @@ void TaskEffect::Reset() { } -void TaskEffect::Field_78() { +void TaskEffect::Event(int32_t event_type, void* data) { } @@ -90,6 +353,15 @@ void TaskEffect::Field_A8(int32_t a2, int8_t* a3) { *a3 = 0; } +struc_621::struc_621() { + stage_hash = hash_murmurhash_empty; + stage_index = -1; +} + +struc_621::~struc_621() { + +} + TaskEffectAuth3D::Stage::Stage() : auth_3d_ids() { count = 0; max_count = TASK_STAGE_STAGE_COUNT; @@ -100,7 +372,8 @@ TaskEffectAuth3D::Stage::Stage() : auth_3d_ids() { TaskEffectAuth3D::TaskEffectAuth3D() : enable(), field_13C(), field_158(), field_159(), field_15C(), frame() { - stage_index = -1; + current_stage_hash = hash_murmurhash_empty; + current_stage_index = -1; } TaskEffectAuth3D::~TaskEffectAuth3D() { @@ -137,8 +410,7 @@ bool TaskEffectAuth3D::Ctrl() { if (field_159) { int32_t frame_int; - if (frame >= 0.0) - { + if (frame >= 0.0f) { frame_int = (int32_t)frame; frame += get_delta_frame(); if (frame > (float_t)(512 * 360)) @@ -173,12 +445,47 @@ void TaskEffectAuth3D::PreInit(int32_t stage_index) { } -void sub_140344BE0(TaskEffectAuth3D* a1, int32_t stage_index) { +void TaskEffectAuth3D::SetStageHashes(std::vector& stage_hashes, void* data, + object_database* obj_db, texture_database* tex_db, stage_database* stage_data) { + this->stage_hashes.assign(stage_hashes.begin(), stage_hashes.end()); + stage_indices.clear(); + for (uint32_t i : this->stage_hashes) { + stage_data_modern* stg_data = stage_data->get_stage_data_modern(i); + if (!stg_data || !stg_data->auth_3d_ids.size()) + continue; + + struc_621 v30; + v30.stage_hash = i; + + if (stage.count != stage.max_count) { + int32_t id = -1; + for (uint32_t j : stg_data->auth_3d_ids) { + id = -1; + if (stage.count == stage.max_count) + break; + + id = auth_3d_data_load_hash(j, data, obj_db, tex_db); + if (auth_3d_data_check_id_not_empty(&id)) + break; + } + + if (id != -1) { + auth_3d_data_read_file_modern(&id); + auth_3d_data_set_visibility(&id, false); + if (stage.count + 1 <= stage.max_count) + stage.auth_3d_ids_ptr[stage.count++] = id; + v30.auth_3d_ids.push_back(id); + } + } + + field_120.push_back(v30); + } } void TaskEffectAuth3D::SetStageIndices(std::vector& stage_indices) { - this->stage_indices = stage_indices; - for (int32_t& i : this->stage_indices) { + stage_hashes.clear(); + this->stage_indices.assign(stage_indices.begin(), stage_indices.end()); + for (int32_t i : this->stage_indices) { data_struct* aft_data = &data_list[DATA_AFT]; auth_3d_database* aft_auth_3d_db = &aft_data->data_ft.auth_3d_db; stage_database* aft_stage_data = &aft_data->data_ft.stage_data; @@ -192,7 +499,7 @@ void TaskEffectAuth3D::SetStageIndices(std::vector& stage_indices) { if (stage.count != stage.max_count) { int32_t id = -1; - for (int32_t& j : stage_data->auth_3d_ids) { + for (int32_t j : stage_data->auth_3d_ids) { id = -1; if (stage.count == stage.max_count) break; @@ -221,7 +528,7 @@ void TaskEffectAuth3D::SetFrame(int32_t value) { int32_t& id = stage.auth_3d_ids_ptr[i]; float_t play_control_size = auth_3d_data_get_play_control_size(&id); float_t req_frame; - if (play_control_size != 0.0) + if (play_control_size != 0.0f) req_frame = (float_t)fmod(frame, play_control_size); else req_frame = 0.0f; @@ -229,12 +536,21 @@ void TaskEffectAuth3D::SetFrame(int32_t value) { } } -void TaskEffectAuth3D::SetStageIndex(int32_t value) { - if (stage_index == value) +void TaskEffectAuth3D::SetCurrentStageHash(uint32_t value) { + if (current_stage_hash == value) return; SetVisibility(false); - stage_index = value; + current_stage_hash = value; + SetVisibility(enable); +} + +void TaskEffectAuth3D::SetCurrentStageIndex(int32_t value) { + if (current_stage_index == value) + return; + + SetVisibility(false); + current_stage_index = value; SetVisibility(enable); } @@ -263,7 +579,8 @@ void TaskEffectAuth3D::ResetData() { enable = false; field_120.clear(); - stage_index = -1; + current_stage_hash = hash_murmurhash_empty; + current_stage_index = -1; stage_indices.clear(); field_158 = 0; field_159 = 0; @@ -272,16 +589,25 @@ void TaskEffectAuth3D::ResetData() { } void TaskEffectAuth3D::SetVisibility(bool value) { - if (stage_index == -1) - return; + if (current_stage_index != -1) + for (struc_621& i : field_120) { + if (i.stage_index != current_stage_index) + continue; - for (struc_621& i : field_120) { - if (i.stage_index != stage_index) - continue; + for (int32_t& j : i.auth_3d_ids) + auth_3d_data_set_visibility(&j, value); + break; + } + else if (current_stage_hash != -1 && current_stage_hash + != hash_murmurhash_empty && current_stage_hash != hash_murmurhash_null) + for (struc_621& i : field_120) { + if (i.stage_hash != current_stage_hash) + continue; - for (int32_t& j : i.auth_3d_ids) - auth_3d_data_set_visibility(&j, value); - } + for (int32_t& j : i.auth_3d_ids) + auth_3d_data_set_visibility(&j, value); + break; + } } void TaskEffectAuth3D::SetEnable(bool value) { @@ -309,7 +635,7 @@ void TaskEffectFogAnim::Data::Ctrl() { color.y = (float_t)(1.0 - v8 * 0.345686 - ((double_t)v9 * v7) * 0.714486); color.z = (float_t)(v8 * 1.771 + 1.0); color.w = 1.0f; - *(vec3*)&color = vec3::max(*(vec3*)&color, vec3_null); + *(vec3*)&color = vec3::max(*(vec3*)&color, 0.0f); for (int32_t i = 0; i < 3; i++) { float_t v20 = (field_18[i] * 10.0f) + field_C[i]; @@ -344,7 +670,7 @@ void TaskEffectFogAnim::Data::Reset() { field_28 = 0; field_2C = 0; field_30 = 0; - field_34 = vec4_identity; + field_34 = 1.0f; } TaskEffectFogAnim::TaskEffectFogAnim() { @@ -356,6 +682,7 @@ TaskEffectFogAnim::~TaskEffectFogAnim() { } bool TaskEffectFogAnim::Init() { + //sub_1400DE640("TaskEffectFogAnim::init()\n"); return true; } @@ -367,6 +694,7 @@ bool TaskEffectFogAnim::Ctrl() { bool TaskEffectFogAnim::Dest() { data.Reset(); task_effect_fog_anim_data = 0; + //sub_1400DE640("TaskEffectFogAnim::dest()\n"); return true; } @@ -377,27 +705,509 @@ void TaskEffectFogAnim::Disp() { void TaskEffectFogAnim::PreInit(int32_t) { data.Reset(); task_effect_fog_anim_data = &data; + //sub_1400DE640("TaskEffectFogAnim::pre_init()\n"); } -TaskEffectFogRing::Data::Data() { +void TaskEffectFogAnim::Reset() { + if (data.field_0) { + data.field_C[0] = 0.0f; + data.field_C[1] = 0.0f; + data.field_C[2] = 0.0f; + } +} +fog_ring_data::fog_ring_data() : size(), density() { + +} + +particle_event_data::particle_event_data() : type(), count(), size(), force() { + +} + +struc_371::struc_371() : field_0(), field_10(), field_14(), field_24() { + +} + +struc_573::struc_573() : chara_index(), bone_index() { + +} + +TaskEffectFogRing::Data::Data() : enable(), delta_frame(), field_8(), ring_size(), tex_id(), +ptcl_size(), max_ptcls(), num_ptcls(), density(), density_offset(), ptcl_data(), num_vtx(), +field_124(), field_2B8(), field_2B9(), disp(), frame_rate_control(), vao(), vbo(), ebo() { + current_stage_index = -1; } TaskEffectFogRing::Data::~Data() { } +void TaskEffectFogRing::Data::CalcPtcl(float_t delta_time) { + float_t delta_time1 = 1.0f * delta_time; + float_t delta_time2 = 2.0f * delta_time; + float_t delta_time3 = 3.0f * delta_time; + + fog_ring_data* ptcl_data = this->ptcl_data; + float_t ring_size = (this->ring_size * 0.5f) + 1.0f; + + for (int32_t i = num_ptcls; i > 0; i--, ptcl_data++) { + sub_140347860(ptcl_data, field_124, field_128, delta_time); + + float_t v12 = ptcl_data->field_18.x; + float_t v13 = ptcl_data->field_18.z; + + float_t pos_x = ptcl_data->position.x; + float_t pos_z = ptcl_data->position.z; + + pos_x = (v12 + ptcl_data->direction.x) * delta_time + pos_x; + pos_z = (v13 + ptcl_data->direction.z) * delta_time + pos_z; + + if (pos_x < -ring_size) + pos_x = ring_size; + else if (pos_x > ring_size) + pos_x = -ring_size; + + if (pos_z < -ring_size) + pos_z = ring_size; + else if (pos_z > ring_size) + pos_z = -ring_size; + + ptcl_data->position.x = pos_x; + ptcl_data->position.z = pos_z; + + bool v11 = false; + if (fabsf(v12) > 0.00001f) { + v11 = true; + ptcl_data->field_18.x = v12 - v12 * delta_time3; + } + + ptcl_data->field_18.y = 0.0f; + + if (fabsf(v13) > 0.00001f) { + v11 = true; + ptcl_data->field_18.z = v13 - v13 * delta_time3; + } + + float_t v17; + if (v11) { + float_t v14 = ptcl_data->field_18.x; + float_t v15 = ptcl_data->field_18.z; + v17 = ptcl_data->density - v15 * v15 + v14 * v14 * delta_time1; + v17 = max_def(v17, 0.0f); + } + else { + v17 = delta_time2 + ptcl_data->density; + v17 = min_def(v17, 1.0f); + } + + + ptcl_data->density = v17; + } +} + +void TaskEffectFogRing::Data::CalcVert() { + float_t density = this->density; + fog_ring_data* ptcl_data = this->ptcl_data; + + for_ring_vertex_data* ptcl_vtx_data; + if (GLAD_GL_VERSION_4_5) { + ptcl_vtx_data = (for_ring_vertex_data*)glMapNamedBuffer(vbo, GL_WRITE_ONLY); + if (!ptcl_vtx_data) { + glUnmapNamedBuffer(vbo); + num_vtx = 0; + return; + } + } + else { + gl_state_bind_array_buffer(vbo); + ptcl_vtx_data = (for_ring_vertex_data*)glMapBuffer(GL_ARRAY_BUFFER, GL_WRITE_ONLY); + if (!ptcl_vtx_data) { + glUnmapBuffer(GL_ARRAY_BUFFER); + gl_state_bind_array_buffer(0); + num_vtx = 0; + return; + } + } + + vec4 color = this->color; + for (int32_t i = num_ptcls; i > 0; i--, ptcl_data++, ptcl_vtx_data += 4) { + float_t size = ptcl_data->size * (float_t)((1.0 / 128.0 + 1.0 / 256.0) / 2.0); + color.w = ptcl_data->density * density; + + vec2 position; + position.x = ptcl_data->position.x * (float_t)(1.0 / 8.0); + position.y = ptcl_data->position.z * (float_t)(1.0 / 8.0); + ptcl_vtx_data[0].position = position + vec2(-size, size); + ptcl_vtx_data[0].color = color; + ptcl_vtx_data[1].position = position + vec2(-size, -size); + ptcl_vtx_data[1].color = color; + ptcl_vtx_data[2].position = position + vec2( size, -size); + ptcl_vtx_data[2].color = color; + ptcl_vtx_data[3].position = position + vec2( size, size); + ptcl_vtx_data[3].color = color; + } + + if (GLAD_GL_VERSION_4_5) + glUnmapNamedBuffer(vbo); + else { + glUnmapBuffer(GL_ARRAY_BUFFER); + gl_state_bind_array_buffer(0); + } + + num_vtx = (int32_t)(num_ptcls * 4LL); +} + void TaskEffectFogRing::Data::Ctrl() { if (!disp) return; - //sub_140349FD0(this, delta_frame * (float_t)(1.0 / 60.0)); - //sub_1403495B0(this); + CtrlInner(delta_frame * (float_t)(1.0 / 60.0)); + CalcVert(); field_8 = 0; } -void TaskEffectFogRing::Data::SetStageIndices(std::vector& stage_indices) { +void TaskEffectFogRing::Data::CtrlInner(float_t delta_time) { + if (fabs(delta_time) <= 0.000001f) + return; + sub_140347B40(delta_time); + CalcPtcl(delta_time); +} + +void TaskEffectFogRing::Data::Dest() { + stage_param_data_fog_ring_storage_clear(); + + if (ptcl_data) { + free(ptcl_data); + ptcl_data = 0; + } + + if (vao) { + glDeleteVertexArrays(1, &vao); + vao = 0; + } + + if (vbo) { + glDeleteBuffers(1, &vbo); + vbo = 0; + } + + if (ebo) { + glDeleteBuffers(1, &ebo); + ebo = 0; + } + + rctx_ptr->draw_pass.set_enable(DRAW_PASS_PRE_PROCESS, false); + rctx_ptr->draw_pass.clear_preprocess(0); + rctx_ptr->draw_state.set_fog_height(false); +} + +void TaskEffectFogRing::Data::Disp() { + if (enable && disp) + draw_task_add_draw_preprocess(rctx_ptr, &mat4_identity, + (void(*)(render_context * rctx, void* data))draw_fog_particle, this, DRAW_OBJECT_PREPROCESS); +} + +void TaskEffectFogRing::Data::Draw() { + render_context* rctx = rctx_ptr; + + rctx->draw_state.set_fog_height(false); + if (!enable || !disp) + return; + + rctx->draw_state.set_fog_height(true); + render_texture& rt = rctx->draw_pass.get_render_texture(8); + rt.bind(); + glViewport(0, 0, + rt.color_texture->get_width_align_mip_level(), + rt.color_texture->get_height_align_mip_level()); + glClearColor(density_offset, density_offset, density_offset, 1.0f); + glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); + if (draw_task_get_count(rctx, DRAW_OBJECT_PREPROCESS)) + draw_task_draw_objects_by_type(rctx, DRAW_OBJECT_PREPROCESS, 0, 0, true); + gl_state_bind_framebuffer(0); + rctx->draw_pass.set_effect_texture(rt.color_texture); + glGetError(); +} + +void TaskEffectFogRing::Data::InitParticleData() { + fog_ring_data* ptcl_data = this->ptcl_data; + if (!ptcl_data) + return; + + float_t ptcl_size = this->ptcl_size; + float_t ring_size = this->ring_size * 0.5f; + float_t wind_dir_x = wind_dir.x; + float_t wind_dir_z = wind_dir.z; + for (int32_t i = max_ptcls; i > 0; i--, ptcl_data++) { + float_t pos_x = PtclRandom(ring_size); + float_t pos_z = PtclRandom(ring_size); + float_t dir_x = PtclRandom(0.5f) + wind_dir_x; + float_t dir_z = PtclRandom(0.5f) + wind_dir_z; + float_t size = PtclRandom(3.0f); + + ptcl_data->position.x = pos_x; + ptcl_data->position.y = 0.5f; + ptcl_data->position.z = pos_z; + ptcl_data->direction.x = dir_x; + ptcl_data->direction.y = 0.0f; + ptcl_data->direction.z = dir_z; + ptcl_data->size = size + ptcl_size; + ptcl_data->density = 1.0f; + } +} + +void TaskEffectFogRing::Data::Reset() { + struc_573(*v2)[5] = field_5C; + for (int32_t i = 0; i < 2; i++, v2++) { + struc_573* v3 = *v2; + for (int32_t j = 0; j < 5; j++, v3++) { + v3->bone_index = (rob_bone_index)0; + v3->position = 0.0f; + } + } + + InitParticleData(); + field_8 = true; +} + +void TaskEffectFogRing::Data::SetStageIndices(std::vector& stage_indices) { + rctx_ptr->draw_pass.clear_preprocess(0); + rctx_ptr->draw_pass.set_enable(DRAW_PASS_PRE_PROCESS, false); + disp = false; + current_stage_index = -1; + this->stage_indices.clear(); + stage_param_data_fog_ring_storage_clear(); + + for (int32_t& i : stage_indices) { + stage_param_fog_ring fog_ring; + if (task_effect_array_parse_stage_param_data_fog_ring(&fog_ring, i)) { + this->stage_indices.push_back(i); + stage_param_data_fog_ring_storage_set_stage_data(i, &fog_ring); + } + } + + enable = true; + num_vtx = 0; + field_2B8 = 0; + field_2B9 = 0; + delta_frame = 1.0f; + field_8 = true; + + if (!this->stage_indices.size()) + return; + + current_stage_index = stage_indices.front(); + + stage_param_fog_ring* fog_ring = stage_param_data_fog_ring_storage_get_value(current_stage_index); + if (!fog_ring) + return; + + disp = true; + enable = true; + ring_size = fog_ring->ring_size; + wind_dir = fog_ring->wind_dir; + tex_id = -1; + if (fog_ring->tex_name.size()) { + data_struct* aft_data = &data_list[DATA_AFT]; + texture_database* aft_tex_db = &aft_data->data_ft.tex_db; + + tex_id = aft_tex_db->get_texture_id(fog_ring->tex_name.c_str()); + } + + color = fog_ring->color; + ptcl_size = fog_ring->ptcl_size; + max_ptcls = 2000; + num_ptcls = fog_ring->num_ptcls; + density = fog_ring->density; + density_offset = fog_ring->density_offset; + + struc_573(*v2)[5] = field_5C; + for (int32_t i = 0; i < 2; i++, v2++) { + struc_573* v3 = *v2; + v3[0].chara_index = i; + v3[0].bone_index = ROB_BONE_KL_TOE_R_WJ; + v3[0].position = 0.0f; + v3[1].chara_index = i; + v3[1].bone_index = ROB_BONE_KL_TOE_L_WJ; + v3[1].position = 0.0f; + v3[2].chara_index = i; + v3[2].bone_index = ROB_BONE_KL_TE_L_WJ; + v3[2].position = 0.0f; + v3[3].chara_index = i; + v3[3].bone_index = ROB_BONE_KL_TE_R_WJ; + v3[3].position = 0.0f; + v3[4].chara_index = i; + v3[4].bone_index = ROB_BONE_N_HARA_CP; + v3[4].position = 0.0f; + } + + const size_t max_ptcls_vtx_count = max_ptcls * 0x04ULL; + + ptcl_data = force_malloc_s(fog_ring_data, max_ptcls); + ptcl_data = new (ptcl_data) fog_ring_data[max_ptcls]; + + if (!vao) + glGenVertexArrays(1, &vao); + + if (!vbo) + glGenBuffers(1, &vbo); + + static const GLsizei buffer_size = sizeof(for_ring_vertex_data); + + gl_state_bind_array_buffer(vbo, true); + if (GLAD_GL_VERSION_4_4) + glBufferStorage(GL_ARRAY_BUFFER, + (GLsizeiptr)(buffer_size * max_ptcls_vtx_count), + 0, GL_DYNAMIC_STORAGE_BIT | GL_MAP_WRITE_BIT); + else + glBufferData(GL_ARRAY_BUFFER, + (GLsizeiptr)(buffer_size * max_ptcls_vtx_count), + 0, GL_DYNAMIC_DRAW); + + gl_state_bind_vertex_array(vao); + glEnableVertexAttribArray(0); + glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, buffer_size, + (void*)offsetof(for_ring_vertex_data, position)); // Pos + glEnableVertexAttribArray(3); + glVertexAttribPointer(3, 4, GL_FLOAT, GL_FALSE, buffer_size, + (void*)offsetof(for_ring_vertex_data, color)); // Color0 + + size_t ebo_count = max_ptcls_vtx_count / 4 * 6; + uint32_t* ebo_data = force_malloc_s(uint32_t, ebo_count); + for (size_t i = 0, j = 0; i < max_ptcls; i += 6, j += 4) { + ebo_data[i + 0] = (uint32_t)(j + 0); + ebo_data[i + 1] = (uint32_t)(j + 1); + ebo_data[i + 2] = (uint32_t)(j + 2); + ebo_data[i + 3] = (uint32_t)(j + 0); + ebo_data[i + 4] = (uint32_t)(j + 2); + ebo_data[i + 5] = (uint32_t)(j + 3); + } + + if (!ebo) + glGenBuffers(1, &ebo); + + gl_state_bind_element_array_buffer(ebo, true); + if (GLAD_GL_VERSION_4_4) + glBufferStorage(GL_ELEMENT_ARRAY_BUFFER, + (GLsizeiptr)(sizeof(uint32_t) * ebo_count), ebo_data, 0); + else + glBufferData(GL_ELEMENT_ARRAY_BUFFER, + (GLsizeiptr)(sizeof(uint32_t) * ebo_count), ebo_data, GL_STATIC_DRAW); + free_def(ebo_data); + + gl_state_bind_vertex_array(0); + gl_state_bind_array_buffer(0); + gl_state_bind_element_array_buffer(0); + + InitParticleData(); + + rctx_ptr->draw_pass.set_enable(DRAW_PASS_PRE_PROCESS, true); + rctx_ptr->draw_pass.add_preprocess(0, TaskEffectFogRing::Data::DrawStatic, this); +} + +void TaskEffectFogRing::Data::DrawStatic(void* data) { + ((TaskEffectFogRing::Data*)data)->Draw(); +} + +float_t TaskEffectFogRing::Data::PtclRandom(float_t value) { + return (float_t)(rand_state_array_get_int(4) % 10000) * 0.0001f * value * 2.0f - value; +} + +void TaskEffectFogRing::Data::sub_140347B40(float_t delta_time) { + field_124 = 0; + + struc_573(*v5)[5] = field_5C; + for (int32_t i = 0; i < 2; i++, v5++) { + if (!rob_chara_array_get(i) || !rob_chara_array_check_visibility(i)) + continue; + + rob_chara_bone_data* rob_bone_data = rob_chara_array_get_bone_data(i); + if (!rob_bone_data) + continue; + + struc_573* v8 = *v5; + for (int32_t j = 0; j < 5; j++, v8++) { + mat4* mat = rob_chara_bone_data_get_mats_mat(rob_bone_data, v8->bone_index); + if (!mat) + continue; + + vec3 trans; + mat4_get_translation(mat, &trans); + v8->position = trans; + + if (field_124 >= 10 || field_8) + continue; + + vec3 v23 = (trans - v8->position) * (1.0f / delta_time); + float_t v15 = vec3::length(v23); + + float_t v18; + float_t v19; + if (v8->bone_index) { + if (v15 < 10.0f) + continue; + + if (v15 != 0.0f) + v23 *= 1.0f / v15; + + v18 = 0.01f * v15; + v19 = 0.5f; + } + else { + if (trans.y >= 0.2f || v8->position.y < 0.2f) + continue; + + v18 = 2.2f; + v19 = 2.0f; + v23 = { 0.0f, 1.0f, 0.0f }; + } + + struc_371& v20 = field_128[field_124++]; + v20.field_0 = 1; + v20.position = trans; + v20.field_10 = v19; + v20.field_14 = v19 * v19; + v20.direction = v23; + v20.field_24 = v18; + } + } +} + +void TaskEffectFogRing::Data::sub_140347860(fog_ring_data* a1, int32_t a2, struc_371* a3, float_t delta_time) { + if (a2 <= 0) + return; + + for (int32_t i = a2; i > 0; i--, a3++) { + vec3 v32 = a1->position - a3->position; + float_t v9 = a3->field_10 + 1.0f; + float_t v10 = vec3::length_squared(v32); + if (v10 > v9 * v9) + continue; + + vec3 v33 = 0.0f; + switch (a3->field_0) { + case 0: + v33 = a3->direction * a3->field_24; + break; + case 1: + if (v10 < 0.00001f) + v33 = vec3(1.0f, 0.0f, 1.0f) * a3->field_24; + else { + float_t v16 = sqrtf(v10); + + if (v16 != 0.0f) + v32 *= 1.0f / v16; + + float_t v17 = 1.0f / v10; + v17 = min_def(v17, 1.0f); + + v33 = v32 * (v17 * a3->field_24); + } + break; + } + a1->field_18 = (v33 * delta_time * 60.0f) + a1->field_18; + } } TaskEffectFogRing::TaskEffectFogRing() { @@ -409,6 +1219,7 @@ TaskEffectFogRing::~TaskEffectFogRing() { } bool TaskEffectFogRing::Init() { + //sub_1400DE640("TaskEffectFogRing::init()\n"); return true; } @@ -419,46 +1230,14 @@ bool TaskEffectFogRing::Ctrl() { } bool TaskEffectFogRing::Dest() { - //sub_140348090(&this->data); + data.Dest(); task_effect_fog_ring_data = 0; + //sub_1400DE640("TaskEffectFogRing::dest()\n"); return 1; } -void draw_fog_particle(TaskEffectFogRing::Data* data) { - if (!data->count) - return; - - glPushAttrib(GL_SCISSOR_BIT | GL_TEXTURE_BIT | GL_LIST_BIT | GL_EVAL_BIT | GL_HINT_BIT - | GL_COLOR_BUFFER_BIT | GL_ENABLE_BIT | GL_TRANSFORM_BIT | GL_VIEWPORT_BIT - | GL_STENCIL_BUFFER_BIT | GL_ACCUM_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_FOG_BIT - | GL_LIGHTING_BIT | GL_PIXEL_MODE_BIT | GL_POLYGON_STIPPLE_BIT | GL_POLYGON_BIT | GL_LINE_BIT | GL_CLIENT_VERTEX_ARRAY_BIT | GL_CLIENT_PIXEL_STORE_BIT); - glPushClientAttrib(GL_POINT_BIT); - glDisableClientState(GL_NORMAL_ARRAY); - glEnableClientState(GL_COLOR_ARRAY); - shaders_ft.set(SHADER_FT_FOGPTCL); - glEnable(GL_BLEND); - glPointSize(data->point_size); - glPointParameteri(GL_POINT_SPRITE_COORD_ORIGIN, GL_LOWER_LEFT); - glEnable(GL_POINT_SPRITE); - glTexEnvi(GL_POINT_SPRITE, GL_COORD_REPLACE, 1); - glEnable(GL_VERTEX_PROGRAM_POINT_SIZE); - texture* tex = texture_storage_get_texture(data->tex_id); - if (tex) - gl_state_active_bind_texture_2d(0, tex->tex); - - glVertexPointer(3, GL_FLOAT, 32, data->data); - glColorPointer(4, GL_FLOAT, 32, &data->data->color); - glEnableVertexAttribArray(0xE); - glVertexAttribPointer(0xE, 1, GL_FLOAT, 0, 32, &data->data->size); - glDrawArrays(GL_POINTS, 0, data->count); - shaders_ft.set(-1); - glPopClientAttrib(); - glPopAttrib(); -} - void TaskEffectFogRing::Disp() { - //if (data.enable && data.disp) - // draw_task_preprocess_append((void(*)(void*))draw_fog_particle, &data, DRAW_OBJECT_PREPROCESS); + data.Disp(); } void TaskEffectFogRing::PreInit(int32_t stage_index) { @@ -475,11 +1254,11 @@ void TaskEffectFogRing::SetEnable(bool value) { data.enable = value; } -void TaskEffectFogRing::SetStageIndex(int32_t value) { - if (data.stage_index == value) +void TaskEffectFogRing::SetCurrentStageIndex(int32_t value) { + if (data.current_stage_index == value) return; - data.stage_index = value; + data.current_stage_index = value; if (value != -1) { for (int32_t& i : data.stage_indices) if (i == value) { @@ -500,3 +1279,1931 @@ void TaskEffectFogRing::SetFrameRateControl(FrameRateControl* value) { void TaskEffectFogRing::Reset() { //sub_140349C30(&this->data); } + +TaskEffectLeaf::TaskEffectLeaf() : frame_rate_control(), wait_frames() { + current_stage_index = -1; +} + +TaskEffectLeaf:: ~TaskEffectLeaf() { + +} + +bool TaskEffectLeaf::Init() { + if (stage_param_data_leaf_current) { + leaf_particle_init(); + wait_frames = 2; + SetFrameRateControl(0); + } + return true; +} + +bool TaskEffectLeaf::Ctrl() { + if (!stage_param_data_leaf_current) + return false; + + leaf_particle_delta_frame = frame_rate_control->GetDeltaFrame(); + if (wait_frames > 0) { + wait_frames--; + return false; + } + leaf_particle_ctrl(); + return false; +} + +bool TaskEffectLeaf::Dest() { + leaf_particle_free(); + stage_param_data_leaf_current = 0; + stage_param_data_leaf_storage_clear(); + return true; +} + +void TaskEffectLeaf::Disp() { + +} + +void TaskEffectLeaf::PreInit(int32_t stage_index) { + +} + +void TaskEffectLeaf::SetStageIndices(std::vector& stage_indices) { + if (stage_param_data_leaf_current) + Dest(); + + stage_param_data_leaf_set = 0; + current_stage_index = -1; + this->stage_indices.clear(); + stage_param_data_leaf_storage_clear(); + + for (int32_t i : stage_indices) { + stage_param_leaf leaf; + if (task_effect_array_parse_stage_param_data_leaf(&leaf, i)) { + this->stage_indices.push_back(i); + stage_param_data_leaf_storage_set_stage_data(i, &leaf); + } + } + + stage_param_data_leaf_current = 0; + if (!this->stage_indices.size()) + return; + + int32_t stage_index = stage_indices.front(); + current_stage_index = stage_index; + stage_param_leaf* leaf = stage_param_data_leaf_storage_get_value(stage_index); + + leaf_particle_tex_id = -1; + if (leaf->tex_name.size()) { + data_struct* aft_data = &data_list[DATA_AFT]; + texture_database* aft_tex_db = &aft_data->data_ft.tex_db; + + leaf_particle_tex_id = aft_tex_db->get_texture_id(leaf->tex_name.c_str()); + } + + if (leaf) { + stage_param_data_leaf_current = leaf; + stage_param_data_leaf_set = true; + } +} + +void TaskEffectLeaf::SetEnable(bool value) { + leaf_particle_enable = value; +} + +void TaskEffectLeaf::SetCurrentStageIndex(int32_t value) { + if (current_stage_index == value) + return; + + current_stage_index = value; + + bool found = false; + for (int32_t i : stage_indices) + if (i == value) { + found = true; + break; + } + + stage_param_data_leaf_set = found; + if (found) { + stage_param_data_leaf_current = stage_param_data_leaf_storage_get_value(value); + leaf_particle_init(true); + wait_frames = 2; + } +} + +void TaskEffectLeaf::SetFrameRateControl(FrameRateControl* value) { + if (value) + frame_rate_control = value; + else + frame_rate_control = &sys_frame_rate; +} + +void TaskEffectLeaf::Reset() { + if (stage_param_data_leaf_current) { + leaf_particle_init(); + wait_frames = 2; + } +} + +TaskEffectLitproj::TaskEffectLitproj() : wait_frames(), frame() { + current_stage_index = -1; +} + +TaskEffectLitproj:: ~TaskEffectLitproj() { + +} + +bool TaskEffectLitproj::Init() { + if (stage_param_data_litproj_current) { + wait_frames = 10; + frame = 0; + } + return true; +} + +bool TaskEffectLitproj::Ctrl() { + if (!stage_param_data_litproj_current) + return false; + + light_data& light = rctx_ptr->light_set[LIGHT_SET_MAIN].lights[LIGHT_PROJECTION]; + if (light.get_type() != LIGHT_SPOT) + return false; + + if (wait_frames > 0) { + if (!--wait_frames) { + light.get_diffuse(diffuse); + light.get_specular(specular); + } + return false; + } + + if (--frame < 0) + frame = 255; + + float_t v8 = (float_t)((float_t)frame * M_PI * (1.0 / 128.0)); + float_t v11 = (sinf(sinf(v8 * 27.0f) + v8 * 2.0f) + sinf(v8 * 23.0f)) * 0.5f; + light.set_diffuse({ diffuse.x, diffuse.y * (v11 * 0.1f + 1.0f), diffuse.z, diffuse.w }); + light.set_specular({ specular.x, specular.y * (v11 * 0.15f + 1.0f), specular.z, specular.w }); + return false; +} + +bool TaskEffectLitproj::Dest() { + litproj_textures_free(); + stage_param_data_litproj_current = 0; + stage_param_data_litproj_storage_clear(); + return true; +} + +void TaskEffectLitproj::Disp() { + +} + +void TaskEffectLitproj::PreInit(int32_t stage_index) { + +} + +void TaskEffectLitproj::SetStageIndices(std::vector& stage_indices) { + if (stage_param_data_litproj_current) + Dest(); + + stage_param_data_litproj_set = 0; + current_stage_index = -1; + this->stage_indices.clear(); + stage_param_data_litproj_storage_clear(); + + for (int32_t i : stage_indices) { + stage_param_litproj litproj; + if (task_effect_array_parse_stage_param_data_litproj(&litproj, i)) { + this->stage_indices.push_back(i); + stage_param_data_litproj_storage_set_stage_data(i, &litproj); + } + } + + stage_param_data_litproj_current = 0; + if (stage_indices.size()) { + int32_t stage_index = stage_indices.front(); + current_stage_index = stage_index; + stage_param_litproj* litproj = stage_param_data_litproj_storage_get_value(stage_index); + if (litproj) { + stage_param_data_litproj_current = litproj; + litproj_textures_init(); + stage_param_data_litproj_set = true; + } + } +} + +void TaskEffectLitproj::SetEnable(bool value) { + light_proj_enable = value; +} + +void TaskEffectLitproj::SetCurrentStageIndex(int32_t value) { + if (current_stage_index == value) + return; + + current_stage_index = value; + + bool found = false; + for (int32_t i : stage_indices) + if (i == value) { + found = true; + break; + } + + stage_param_data_litproj_set = found; + if (found) + stage_param_data_litproj_current = stage_param_data_litproj_storage_get_value(value); +} + +void TaskEffectLitproj::Reset() { + wait_frames = 10; + frame = 0; +} + +TaskEffectParticle::TaskEffectParticle() : frame_rate_control() { + current_stage_index = -1; +} + +TaskEffectParticle::~TaskEffectParticle() { + +} + +bool TaskEffectParticle::Init() { + SetFrameRateControl(0); + return true; +} + +bool TaskEffectParticle::Ctrl() { + particle_delta_time = frame_rate_control->GetDeltaFrame() * (float_t)(1.0 / 60.0); + if (particle_count > 0) + particle_ctrl(); + return false; +} + +bool TaskEffectParticle::Dest() { + particle_free(); + return true; +} + +void TaskEffectParticle::Disp() { + +} + +void TaskEffectParticle::PreInit(int32_t stage_index) { + current_stage_index = stage_index; + //field_74 = 0; + particle_init(0); +} + +void TaskEffectParticle::SetEnable(bool value) { + particle_enable = value; +} + +void TaskEffectParticle::SetFrameRateControl(FrameRateControl* value) { + if (value) + frame_rate_control = value; + else + frame_rate_control = &sys_frame_rate; +} + +void TaskEffectParticle::Reset() { + if (ptcl_data) + particle_init(0); +} + +void TaskEffectParticle::Event(int32_t event_type, void* data) { + if (event_type == 1) + particle_event((particle_event_data*)data); +} + +TaskEffectRain::TaskEffectRain() : frame_rate_control() { + current_stage_index = -1; +} + +TaskEffectRain:: ~TaskEffectRain() { + +} + +bool TaskEffectRain::Init() { + if (stage_param_data_rain_current) { + rain_particle_init(0); + SetFrameRateControl(0); + } + return true; +} + +bool TaskEffectRain::Ctrl() { + if (stage_param_data_rain_current) { + rain_particle_delta_frame = frame_rate_control->GetDeltaFrame(); + rain_particle_ctrl(); + } + return false; +} + +bool TaskEffectRain::Dest() { + if (stage_param_data_rain_current) { + rain_particle_free(); + rain_ptcl_vbo = 0; + stage_param_data_rain_current = 0; + stage_param_data_rain_storage_clear(); + stage_param_data_rain_set = false; + current_stage_index = -1; + stage_indices.clear(); + } + return true; +} + +void TaskEffectRain::Disp() { + +} + +void TaskEffectRain::PreInit(int32_t stage_index) { + +} + +void TaskEffectRain::SetStageIndices(std::vector& stage_indices) { + if (stage_param_data_rain_current) + Dest(); + + stage_param_data_rain_set = false; + current_stage_index = -1; + this->stage_indices.clear(); + stage_param_data_rain_storage_clear(); + + for (int32_t i : stage_indices) { + stage_param_rain rain; + if (task_effect_array_parse_stage_param_data_rain(&rain, i)) { + this->stage_indices.push_back(i); + stage_param_data_rain_storage_set_stage_data(i, &rain); + } + } + + stage_param_data_rain_current = 0; + if (!this->stage_indices.size()) + return; + + int32_t stage_index = stage_indices.front(); + current_stage_index = stage_index; + stage_param_rain* rain = stage_param_data_rain_storage_get_value(stage_index); + + rain_particle_tex_id = -1; + if (rain->tex_name.size()) { + data_struct* aft_data = &data_list[DATA_AFT]; + texture_database* aft_tex_db = &aft_data->data_ft.tex_db; + + rain_particle_tex_id = aft_tex_db->get_texture_id(rain->tex_name.c_str()); + } + + if (rain) { + stage_param_data_rain_current = rain; + stage_param_data_rain_set = true; + } +} + +void TaskEffectRain::SetEnable(bool value) { + rain_particle_enable = value; +} + +void TaskEffectRain::SetCurrentStageIndex(int32_t value) { + if (current_stage_index == value) + return; + + current_stage_index = value; + + bool found = false; + for (int32_t i : stage_indices) + if (i == value) { + found = true; + break; + } + + stage_param_data_rain_set = found; + if (found) + stage_param_data_rain_current = stage_param_data_rain_storage_get_value(value); +} + +void TaskEffectRain::SetFrameRateControl(FrameRateControl* value) { + if (value) + frame_rate_control = value; + else + frame_rate_control = &sys_frame_rate; +} + +void TaskEffectRain::Reset() { + if (stage_param_data_rain_current) { + rain_particle_init(0); + SetFrameRateControl(0); + } +} + +TaskEffectRipple::TaskEffectRipple() : field_68(), frame_rate_control(), emit() { + +} + +TaskEffectRipple::~TaskEffectRipple() { + +} + +bool TaskEffectRipple::Init() { + //sub_1400DE640("TaskEffectRipple::init()\n"); + return true; +} + +bool TaskEffectRipple::Ctrl() { + emit->delta_frame = frame_rate_control->GetDeltaFrame(); + //emit->ctrl(); + return false; +} + +bool TaskEffectRipple::Dest() { + //emit->dest(); + //sub_1400DE640("TaskEffectRipple::dest()\n"); + return true; +} + +void TaskEffectRipple::Disp() { + //emit->disp(); +} + +void TaskEffectRipple::PreInit(int32_t stage_index) { + +} + +void TaskEffectRipple::SetStageIndices(std::vector& stage_indices) { + SetFrameRateControl(0); + //emit = &ripple_emit_data; + //emit->set_stage_indices(stage_indices); +} + +void TaskEffectRipple::SetCurrentStageIndex(int32_t value) { + //emit->set_stage_index(value); +} + +void TaskEffectRipple::SetFrameRateControl(FrameRateControl* value) { + if (value) + frame_rate_control = value; + else + frame_rate_control = &sys_frame_rate; +} + +void TaskEffectRipple::Reset() { + //if (!emit->use_float_ripplemap) + // ripple_emit_data.clear_tex(); + //ripple_emit_data.reset(); +} + +void leaf_particle_draw() { + if (!stage_param_data_leaf_current || !leaf_ptcl_data + || !leaf_particle_enable || !stage_param_data_leaf_set) + return; + + texture* tex = texture_storage_get_texture(leaf_particle_tex_id); + if (!tex) + return; + + int32_t count = leaf_particle_disp(); + if (!count) + return; + + gl_state_active_bind_texture_2d(0, tex->tex); + shaders_ft.set(SHADER_FT_LEAF_PT); + shaders_ft.local_frag_set(0, stage_param_data_leaf_current->color); + shaders_ft.state_material_set_shininess(false, 1.0f); + gl_state_bind_vertex_array(leaf_ptcl_vao); + shaders_ft.draw_elements(GL_TRIANGLES, count / 4 * 6, GL_UNSIGNED_INT, 0); + gl_state_bind_vertex_array(0); +} + +void rain_particle_draw() { + if (!stage_param_data_rain_current || !rain_particle_enable || !stage_param_data_rain_set) + return; + + texture* tex = texture_storage_get_texture(rain_particle_tex_id); + if (!tex) + return; + + gl_state_enable_blend(); + gl_state_set_blend_func(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + gl_state_enable_depth_test(); + gl_state_set_depth_mask(GL_FALSE); + gl_state_active_bind_texture_2d(0, tex->tex); + shaders_ft.set(SHADER_FT_RAIN); + + stage_param_rain* rain = stage_param_data_rain_current; + float_t tangent_sign = -rain->psize.x; + float_t tangent_size = -rain->psize.y * (float_t)(1.0 / 30.0); + + int32_t first = 0; + int32_t count = min_def(rain->num_rain, rain_ptcl_count) / 2; + + vec3 range = rain->range; + vec3 range_scale = rain->range; + vec3 range_offset = rain->offset; + range_offset.x -= range.x * 0.5f; + range_offset.z -= range.z * 0.5f; + vec4 color = rain->color; + float_t color_a = color.w; + shaders_ft.local_vert_set(1, range_offset.x, range_offset.y, range_offset.z, 0.0f); + shaders_ft.local_vert_set(2, range_scale.x, range_scale.y, range_scale.z, 0.0f); + gl_state_bind_vertex_array(rain_ptcl_vao); + for (int32_t i = 0; i < 8; i++, first += count) { + rain_particle_data& data = rain_ptcl_data[i]; + vec3 pos_offset = data.position / range; + vec3 tangent = data.velocity * tangent_size; + color.w = color_a * data.alpha; + shaders_ft.local_vert_set(0, pos_offset.x, pos_offset.y, pos_offset.z, 0.075f); + shaders_ft.local_vert_set(3, tangent.x, tangent.y, tangent.z, tangent_sign); + shaders_ft.local_frag_set(0, color); + shaders_ft.draw_range_elements(GL_TRIANGLES, first, count, count / 4 * 6, GL_UNSIGNED_INT, 0); + } + gl_state_bind_vertex_array(0); + gl_state_active_bind_texture_2d(0, 0); + gl_state_set_depth_mask(GL_TRUE); + gl_state_disable_blend(); +} + +void particle_draw() { + if (!ptcl_data) + return; + + particle_vertex_data* vtx_data; + if (GLAD_GL_VERSION_4_5) { + vtx_data = (particle_vertex_data*)glMapNamedBuffer(ptcl_vbo, GL_WRITE_ONLY); + if (!vtx_data) { + glUnmapNamedBuffer(ptcl_vbo); + return; + } + } + else { + gl_state_bind_array_buffer(ptcl_vbo); + vtx_data = (particle_vertex_data*)glMapBuffer(GL_ARRAY_BUFFER, GL_WRITE_ONLY); + if (!vtx_data) { + glUnmapBuffer(GL_ARRAY_BUFFER); + gl_state_bind_array_buffer(0); + return; + } + } + + int32_t count = particle_disp(vtx_data, ptcl_data, ptcl_count); + if (GLAD_GL_VERSION_4_5) + glUnmapNamedBuffer(ptcl_vbo); + else { + glUnmapBuffer(GL_ARRAY_BUFFER); + gl_state_bind_array_buffer(0); + } + + if (!count) + return; + + gl_state_bind_vertex_array(ptcl_vao); + shaders_ft.set(SHADER_FT_PARTICL); + shaders_ft.draw_arrays(GL_TRIANGLES, 0, count); + gl_state_bind_vertex_array(0); +} + +void snow_particle_draw() { + +} + +void task_effect_init() { + if (!task_effect_auth_3d) + task_effect_auth_3d = new TaskEffectAuth3D; + + if (!task_effect_leaf) + task_effect_leaf = new TaskEffectLeaf; + + /*if (!task_effect_snow) + task_effect_snow = new TaskEffectSnow;*/ + + if (!task_effect_ripple) + task_effect_ripple = new TaskEffectRipple; + + if (!task_effect_rain) + task_effect_rain = new TaskEffectRain; + + /*if (!task_effect_splash) + task_effect_splash = new TaskEffectSplash;*/ + + if (!task_effect_fog_anim) + task_effect_fog_anim = new TaskEffectFogAnim; + + if (!task_effect_fog_ring) + task_effect_fog_ring = new TaskEffectFogRing; + + if (!task_effect_particle) + task_effect_particle = new TaskEffectParticle; + + if (!task_effect_litproj) + task_effect_litproj = new TaskEffectLitproj; + + /*if (!task_effect_star) + task_effect_star = new TaskEffectStar;*/ + + if (!task_effect_parent) + task_effect_parent = new TaskEffectParent; + + task_effect_fog_anim_data = 0; + task_effect_fog_ring_data = 0; + task_effect_splash_data = 0; +} + +void task_effect_free() { + if (task_effect_auth_3d) { + delete task_effect_auth_3d; + task_effect_auth_3d = 0; + } + + if (task_effect_leaf) { + delete task_effect_leaf; + task_effect_leaf = 0; + } + + /*if (task_effect_snow) { + delete task_effect_snow; + task_effect_snow = 0; + }*/ + + if (task_effect_ripple) { + delete task_effect_ripple; + task_effect_ripple = 0; + } + + if (task_effect_rain) { + delete task_effect_rain; + task_effect_rain = 0; + } + + /*if (task_effect_splash) { + delete task_effect_splash; + task_effect_splash = 0; + }*/ + + if (task_effect_fog_anim) { + delete task_effect_fog_anim; + task_effect_fog_anim = 0; + } + + if (task_effect_fog_ring) { + delete task_effect_fog_ring; + task_effect_fog_ring = 0; + } + + if (task_effect_particle) { + delete task_effect_particle; + task_effect_particle = 0; + } + + if (task_effect_litproj) { + delete task_effect_litproj; + task_effect_litproj = 0; + } + + /*if (task_effect_star) { + delete task_effect_star; + task_effect_star = 0; + }*/ + + if (task_effect_parent) { + delete task_effect_parent; + task_effect_parent = 0; + } + + task_effect_fog_anim_data = 0; + task_effect_fog_ring_data = 0; + task_effect_splash_data = 0; +} + +void task_effect_parent_event(TaskEffectType type, int32_t event_type, void* data) { + task_effect_parent->Event(type, event_type, data); +} + +void task_effect_parent_dest() { + task_effect_parent->Dest(); +} + +bool task_effect_parent_load() { + return task_effect_parent->Load(); +} + +void task_effect_parent_reset() { + task_effect_parent->Reset(); +} + +void task_effect_parent_set_current_stage_hash(uint32_t stage_hash) { + task_effect_parent->SetCurrentStageHash(stage_hash); +} + +void task_effect_parent_set_current_stage_index(int32_t stage_index) { + task_effect_parent->SetCurrentStageIndex(stage_index); +} + +void task_effect_parent_set_data(void* data, + object_database* obj_db, texture_database* tex_db, stage_database* stage_data) { + task_effect_parent->data = data; + task_effect_parent->obj_db = obj_db; + task_effect_parent->tex_db = tex_db; + task_effect_parent->stage_data = stage_data; +} + +void task_effect_parent_set_enable(bool value) { + task_effect_parent->SetEnable(value); +} + +void task_effect_parent_set_frame(int32_t value) { + task_effect_parent->SetFrame(value); +} + +void task_effect_parent_set_frame_rate_control(FrameRateControl* value) { + task_effect_parent->SetFrameRateControl(value); +} + +void task_effect_parent_set_stage_hashes(std::vector& stage_hashes) { + task_effect_parent->SetStageHashes(stage_hashes); +} + +void task_effect_parent_set_stage_indices(std::vector&stage_indices) { + task_effect_parent->SetStageIndices(stage_indices); +} + +bool task_effect_parent_unload() { + return task_effect_parent->Unload(); +} + +static TaskEffect* task_effect_array_get(TaskEffectType type, const char** name) { + if (type < TASK_EFFECT_AUTH_3D || type > TASK_EFFECT_STAR) { + if (name) + *name = 0; + return 0; + } + + if (name) + *name = task_effect_name_array[type]; + + TaskEffect** task = task_effect_data_array[type]; + if (task) + return *task; + return 0; +} + +static std::string task_effect_array_get_stage_param_file_path( + TaskEffectType type, int32_t stage_index, bool dev_ram, bool a4) { + std::string path; + if (dev_ram) + path.assign("dev_ram/stage_param/"); + else + path.assign("./rom/stage_param/"); + + if (a4) + return path; + + data_struct* aft_data = &data_list[DATA_AFT]; + stage_database* aft_stage_data = &aft_data->data_ft.stage_data; + + const char* stage_name = aft_stage_data->get_stage_name(stage_index); + if (!stage_name) + return {}; + + const char* effect_name = 0; + task_effect_array_get(type, &effect_name); + if (!effect_name) + return {}; + + size_t path_len = path.size(); + path.append(effect_name + 7); + path.append("_"); + path.append(stage_name + 3); + size_t path_len_new = path.size(); + for (size_t i = path_len; i < path_len_new; i++) { + char c = path[i]; + if (c >= 'A' && c <= 'Z') + path[i] = c + 0x20; + } + path.append(".txt"); + return path; +} + +static bool task_effect_array_parse_stage_param_data_fog_ring(stage_param_fog_ring* fog_ring, int32_t stage_index) { + if (!fog_ring) + return false; + + std::string path = task_effect_array_get_stage_param_file_path(TASK_EFFECT_FOG_RING, stage_index, 0, 0); + data_list[DATA_AFT].load_file(fog_ring, path.c_str(), stage_param_fog_ring::load_file); + return fog_ring->ready; +} + +static bool task_effect_array_parse_stage_param_data_leaf(stage_param_leaf* leaf, int32_t stage_index) { + if (!leaf) + return false; + + std::string path = task_effect_array_get_stage_param_file_path(TASK_EFFECT_LEAF, stage_index, 0, 0); + data_list[DATA_AFT].load_file(leaf, path.c_str(), stage_param_leaf::load_file); + return leaf->ready; +} + +static bool task_effect_array_parse_stage_param_data_litproj(stage_param_litproj* litproj, int32_t stage_index) { + if (!litproj) + return false; + + std::string path = task_effect_array_get_stage_param_file_path(TASK_EFFECT_LITPROJ, stage_index, 0, 0); + data_list[DATA_AFT].load_file(litproj, path.c_str(), stage_param_litproj::load_file); + return litproj->ready; +} + +static bool task_effect_array_parse_stage_param_data_rain(stage_param_rain* rain, int32_t stage_index) { + if (!rain) + return false; + + std::string path = task_effect_array_get_stage_param_file_path(TASK_EFFECT_RAIN, stage_index, 0, 0); + data_list[DATA_AFT].load_file(rain, path.c_str(), stage_param_rain::load_file); + return rain->ready; +} + +static bool task_effect_array_parse_stage_param_data_ripple(stage_param_ripple* ripple, int32_t stage_index) { + if (!ripple) + return false; + + std::string path = task_effect_array_get_stage_param_file_path(TASK_EFFECT_RIPPLE, stage_index, 0, 0); + data_list[DATA_AFT].load_file(ripple, path.c_str(), stage_param_ripple::load_file); + return ripple->ready; +} + +static bool task_effect_array_parse_stage_param_data_snow(stage_param_snow* snow, int32_t stage_index) { + if (!snow) + return false; + + std::string path = task_effect_array_get_stage_param_file_path(TASK_EFFECT_SNOW, stage_index, 0, 0); + data_list[DATA_AFT].load_file(snow, path.c_str(), stage_param_snow::load_file); + return snow->ready; +} + +static bool task_effect_array_parse_stage_param_data_splash(stage_param_splash* splash, int32_t stage_index) { + if (!splash) + return false; + + std::string path = task_effect_array_get_stage_param_file_path(TASK_EFFECT_SPLASH, stage_index, 0, 0); + data_list[DATA_AFT].load_file(splash, path.c_str(), stage_param_splash::load_file); + return splash->ready; +} + +static bool task_effect_array_parse_stage_param_data_star(stage_param_star* star, int32_t stage_index) { + if (!star) + return false; + + std::string path = task_effect_array_get_stage_param_file_path(TASK_EFFECT_STAR, stage_index, 0, 0); + data_list[DATA_AFT].load_file(star, path.c_str(), stage_param_star::load_file); + return star->ready; +} + +void leaf_particle_data::init() { + stage_param_leaf* leaf = stage_param_data_leaf_current; + + position.x = rand_state_array_get_float(4); + position.y = rand_state_array_get_float(4); + position.z = rand_state_array_get_float(4); + position = (position * vec3(2.0f, 1.0f, 2.0f) - vec3(1.0f, 0.0f, 1.0f)) * leaf->range + leaf->offset; + direction = vec3(0.0f, -1.0f, 0.0f); + normal = vec3(0.0f, 0.0f, 1.0f); + rotation.x = rand_state_array_get_float(4) * 6.28f; + rotation.y = rand_state_array_get_float(4) * 6.28f; + rotation.z = 0.0f; + rotation_add.x = (rand_state_array_get_float(4) + 1.0f) * 3.0f; + rotation_add.y = (rand_state_array_get_float(4) + 1.0f) * 3.0f; + rotation_add.z = 10.0f; + type = 1; + size = leaf->psize; +} + +rain_particle_data::rain_particle_data() : alpha(), type(), field_1C(), +field_2C(), field_30(), field_34(), field_38(), field_3C() { + +} + +struc_608::struc_608() : stage_effects(), stage_effects_modern() { + +} + +struc_608::struc_608(const ::stage_effects* stage_effects) : stage_effects_modern() { + this->stage_effects = stage_effects; +} + +struc_608::struc_608(const ::stage_effects_modern* stage_effects_modern) : stage_effects() { + this->stage_effects_modern = stage_effects_modern; +} + +struc_608::~struc_608() { + +} + +TaskEffectParent::TaskEffectParent() : state(), enable(), +modern(), data(), obj_db(), tex_db(), stage_data() { + current_stage_hash = hash_murmurhash_empty; + current_stage_index = -1; +} + +TaskEffectParent::~TaskEffectParent() { + +} + +std::pair TaskEffectParent::AddTaskEffectTypePtr(TaskEffectType type) { + if (CheckTaskEffectTypeLoaded(type) < 0) { + const char* name = 0; + TaskEffect* t = task_effect_array_get(type, &name); + if (t) { + app::TaskWork::AppendTask(t, name); + return { type, t }; + } + } + + return { TASK_EFFECT_INVALID, 0 }; +} + +int32_t TaskEffectParent::CheckTaskEffectTypeLoaded(TaskEffectType type) { + for (std::pair& i : effects) + if (i.first == type) + return 0; + return -1; +} + +void TaskEffectParent::Event(TaskEffectType type, int32_t event_type, void* data) { + for (std::pair& i : effects) + if (i.first == type) + i.second->Event(event_type, data); +} + +void TaskEffectParent::Dest() { + if (state == 1) + state = 4; + else if (state >= 2 && state <= 3) { + for (std::pair& i : effects) + i.second->SetDest(); + state = 4; + } +} + +static const TaskEffectType dword_1409E3440[16] = { + TASK_EFFECT_AUTH_3D, + TASK_EFFECT_PARTICLE, + TASK_EFFECT_INVALID, +}; + +bool TaskEffectParent::Load() { + if (state == 1) { + if (!modern) { + bool wait_load = false; + for (uint32_t i : obj_set_ids) + if (object_storage_load_obj_set_check_not_read(i)) + wait_load |= true; + + if (wait_load) + return true; + + for (TaskEffectType i : dword_1409E3440) { + if (i == TASK_EFFECT_INVALID) + break; + + std::pair v57 = AddTaskEffectTypePtr(i); + if (v57.second) { + v57.second->SetStageIndices(stage_indices); + v57.second->SetEnable(enable); + effects.push_back(v57); + field_50.push_back(v57); + } + } + + for (std::pair& i : field_68) { + const stage_effects* stage_effects = i.second.stage_effects; + for (int32_t j : stage_effects->field_20) { + if (j == TASK_EFFECT_INVALID) + break; + + std::pair v57 = AddTaskEffectTypePtr((TaskEffectType)j); + if (v57.second) { + v57.second->SetStageIndices(stage_indices); + v57.second->SetEnable(enable); + effects.push_back(v57); + i.second.field_10.push_back(v57); + } + } + } + } + else { + void* data = this->data; + object_database* obj_db = this->obj_db; + texture_database* tex_db = this->tex_db; + stage_database* stage_data = this->stage_data; + + bool wait_load = false; + for (uint32_t i : obj_set_ids) + if (object_storage_load_obj_set_check_not_read(i, obj_db, tex_db)) + wait_load = true; + + if (wait_load) + return true; + + for (TaskEffectType i : dword_1409E3440) { + if (i == TASK_EFFECT_INVALID) + break; + + std::pair v57 = AddTaskEffectTypePtr(i); + if (v57.second) { + v57.second->SetStageHashes(stage_hashes, data, obj_db, tex_db, stage_data); + v57.second->SetEnable(enable); + effects.push_back(v57); + field_50.push_back(v57); + } + } + + for (std::pair& i : field_68) { + const stage_effects_modern* stage_effects = i.second.stage_effects_modern; + for (int32_t j : stage_effects->field_20) { + if (j == TASK_EFFECT_INVALID) + break; + + std::pair v57 = AddTaskEffectTypePtr((TaskEffectType)j); + if (v57.second) { + v57.second->SetStageHashes(stage_hashes, data, obj_db, tex_db, stage_data); + v57.second->SetEnable(enable); + effects.push_back(v57); + i.second.field_10.push_back(v57); + } + } + } + } + state = 2; + return true; + } + else if (state != 2) + return false; + + bool wait_load = false; + for (std::pair& i : effects) + if (!app::TaskWork::CheckTaskCtrl(i.second)) { + wait_load = true; + break; + } + + if (!wait_load) { + for (std::pair& i : effects) + i.second->SetEnable(enable); + + state = 3; + return false; + } + return true; +} + +void TaskEffectParent::Reset() { + for (std::pair& i : effects) + i.second->Reset(); +} + +void TaskEffectParent::ResetData() { + current_stage_hash = hash_murmurhash_empty; + current_stage_index = -1; + this->current_stage_index = -1; + stage_hashes.clear(); + stage_indices.clear(); + obj_set_ids.clear(); + effects.clear(); + field_68.clear(); + enable = true; + state = 0; +} + +void TaskEffectParent::SetCurrentStageHash(uint32_t stage_hash) { + if (current_stage_hash != stage_hash) { + for (std::pair& i : effects) + i.second->SetCurrentStageHash(stage_hash); + current_stage_hash = stage_hash; + } +} + +void TaskEffectParent::SetCurrentStageIndex(int32_t stage_index) { + if (current_stage_index != stage_index) { + for (std::pair& i : effects) + i.second->SetCurrentStageIndex(stage_index); + current_stage_index = stage_index; + } +} + +void TaskEffectParent::SetEnable(bool value) { + for (std::pair& i : effects) + i.second->SetEnable(value); +} + +void TaskEffectParent::SetFrame(int32_t value) { + for (std::pair& i : effects) + i.second->SetFrame(value); +} + +void TaskEffectParent::SetFrameRateControl(FrameRateControl* value) { + for (std::pair& i : effects) + i.second->SetFrameRateControl(value); +} + +void TaskEffectParent::SetStageHashes(std::vector& stage_hashes) { + this->stage_indices.clear(); + this->stage_hashes.assign(stage_hashes.begin(), stage_hashes.end()); + obj_set_ids.clear(); + modern = true; + + for (uint32_t i : stage_hashes) { + ::stage_data_modern* stage_data = this->stage_data->get_stage_data_modern(i); + if (!stage_data) + continue; + + const stage_effects_modern* effects = stage_data->effects_init + ? &stage_data->effects : &stage_effects_modern_default; + + field_68.push_back({ i, struc_608(effects) }); + + for (uint32_t j : effects->field_0) { + if (j == hash_murmurhash_empty || j == hash_murmurhash_null || j == -1) + break; + + bool found = false; + for (uint32_t k : obj_set_ids) + if (k == j) { + found = true; + break; + } + + if (!found) + obj_set_ids.push_back(j); + } + } + + for (uint32_t i : obj_set_ids) + object_storage_load_set_hash(data, i); + state = 1; +} + +void TaskEffectParent::SetStageIndices(std::vector& stage_indices) { + this->stage_indices.assign(stage_indices.begin(), stage_indices.end()); + this->stage_hashes.clear(); + obj_set_ids.clear(); + modern = false; + + data_struct* aft_data = &data_list[DATA_AFT]; + object_database* aft_obj_db = &aft_data->data_ft.obj_db; + stage_database* aft_stage_data = &aft_data->data_ft.stage_data; + + for (int32_t i : stage_indices) { + ::stage_data* stage_data = aft_stage_data->get_stage_data(i); + if (!stage_data) + continue; + + const stage_effects* effects = stage_data->effects_init + ? &stage_data->effects : &stage_effects_default; + + field_68.push_back({ i, struc_608(effects) }); + + for (int32_t j : effects->field_0) { + if (j == -1) + break; + + bool found = false; + for (uint32_t k : obj_set_ids) + if (k == j) { + found = true; + break; + } + + if (!found) + obj_set_ids.push_back(j); + } + } + + for (uint32_t i : obj_set_ids) + object_storage_load_set(aft_data, aft_obj_db, i); + state = 1; +} + +bool TaskEffectParent::Unload() { + if (state != 4) { + ResetData(); + return false; + } + + for (std::pair& i : effects) + if (app::TaskWork::CheckTaskReady(i.second)) + return true; + + for (uint32_t& i : obj_set_ids) + object_storage_unload_set(i); + + ResetData(); + return false; +} + +static void draw_fog_particle(render_context* rctx, TaskEffectFogRing::Data* data) { + if (!data->num_vtx) + return; + + shaders_ft.set(SHADER_FT_FOGPTCL); + gl_state_enable_blend(); + glEnable(GL_PROGRAM_POINT_SIZE); + glPointParameteri(GL_POINT_SPRITE_COORD_ORIGIN, GL_LOWER_LEFT); + texture* tex = texture_storage_get_texture(data->tex_id); + if (tex) + gl_state_active_bind_texture_2d(0, tex->tex); + gl_state_bind_vertex_array(data->vao); + shaders_ft.draw_elements(GL_TRIANGLES, data->num_vtx / 4 * 6, GL_UNSIGNED_INT, 0); + glDisable(GL_PROGRAM_POINT_SIZE); + gl_state_disable_blend(); +} + +static void leaf_particle_init(bool change_stage) { + leaf_particle_emit_timer = 0.0f; + leaf_particle_emit_interval = stage_param_data_leaf_current->emit_interval; + if (change_stage) + return; + + leaf_particle_free(); + + const size_t leaf_ptcl_vtx_count = leaf_ptcl_count * 0x08; + + leaf_ptcl_data = force_malloc_s(leaf_particle_data, leaf_ptcl_count); + + leaf_particle_num_ptcls = stage_param_data_leaf_current->num_initial_ptcls; + + leaf_particle_data* data = leaf_ptcl_data; + int32_t i = 0; + for (; i < leaf_particle_num_ptcls; i++, data++) + data->init(); + + for (; i < leaf_ptcl_count; i++, data++) + data->type = 0; + + if (!leaf_ptcl_vao) + glGenVertexArrays(1, &leaf_ptcl_vao); + + if (!leaf_ptcl_vbo) + glGenBuffers(1, &leaf_ptcl_vbo); + + static const GLsizei buffer_size = sizeof(leaf_particle_vertex_data); + + gl_state_bind_array_buffer(leaf_ptcl_vbo, true); + if (GLAD_GL_VERSION_4_4) + glBufferStorage(GL_ARRAY_BUFFER, + (GLsizeiptr)(buffer_size * leaf_ptcl_vtx_count), + 0, GL_DYNAMIC_STORAGE_BIT | GL_MAP_WRITE_BIT); + else + glBufferData(GL_ARRAY_BUFFER, + (GLsizeiptr)(buffer_size * leaf_ptcl_vtx_count), + 0, GL_DYNAMIC_DRAW); + + gl_state_bind_vertex_array(leaf_ptcl_vao); + glEnableVertexAttribArray(0); + glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, buffer_size, + (void*)offsetof(leaf_particle_vertex_data, position)); // Pos + glEnableVertexAttribArray(2); + glVertexAttribPointer(2, 3, GL_FLOAT, GL_FALSE, buffer_size, + (void*)offsetof(leaf_particle_vertex_data, normal)); // Normal + glEnableVertexAttribArray(8); + glVertexAttribPointer(8, 2, GL_FLOAT, GL_FALSE, buffer_size, + (void*)offsetof(leaf_particle_vertex_data, texcoord)); // TexCoords + + size_t ebo_count = leaf_ptcl_vtx_count / 4 * 6; + uint32_t* ebo_data = force_malloc_s(uint32_t, ebo_count); + for (size_t i = 0, j = 0; i < ebo_count; i += 6, j += 4) { + ebo_data[i + 0] = (uint32_t)(j + 0); + ebo_data[i + 1] = (uint32_t)(j + 1); + ebo_data[i + 2] = (uint32_t)(j + 2); + ebo_data[i + 3] = (uint32_t)(j + 0); + ebo_data[i + 4] = (uint32_t)(j + 2); + ebo_data[i + 5] = (uint32_t)(j + 3); + } + + if (!leaf_ptcl_ebo) + glGenBuffers(1, &leaf_ptcl_ebo); + + gl_state_bind_element_array_buffer(leaf_ptcl_ebo, true); + if (GLAD_GL_VERSION_4_4) + glBufferStorage(GL_ELEMENT_ARRAY_BUFFER, + (GLsizeiptr)(sizeof(uint32_t) * ebo_count), ebo_data, 0); + else + glBufferData(GL_ELEMENT_ARRAY_BUFFER, + (GLsizeiptr)(sizeof(uint32_t) * ebo_count), ebo_data, GL_STATIC_DRAW); + free_def(ebo_data); + + gl_state_bind_vertex_array(0); + gl_state_bind_array_buffer(0); + gl_state_bind_element_array_buffer(0); +} + +static float_t sub_14034C960(vec3 x) { + float_t t1 = vec3::length_squared(x); + if (t1 <= 1.0e-30f) + return 0.0f; + float_t t2 = 1.0f / sqrtf(t1); + return (t2 * 1.5f + t1 * t2 * t2 * t2 * -0.5f) * t1; +} + +static void leaf_particle_ctrl() { + if (!leaf_particle_enable || !stage_param_data_leaf_set || !leaf_ptcl_data) + return; + + stage_param_leaf* leaf = stage_param_data_leaf_current; + + float_t off_y = leaf->offset.y; + float_t delta_time = (float_t)(leaf->frame_speed_coef + * (leaf_particle_delta_frame * (1.0 / 60.0))); + + leaf_particle_data* data = leaf_ptcl_data; + if (leaf_particle_num_ptcls < 0x800) { + int32_t v10 = 0; + leaf_particle_emit_timer += delta_time; + for (int32_t i = 0; i <= 100 && leaf_particle_emit_timer > leaf_particle_emit_interval; i++) { + data[leaf_particle_num_ptcls++].init(); + v10++; + leaf_particle_emit_interval += leaf->emit_interval * leaf->frame_speed_coef; + } + } + + vec3 wind = leaf->wind; + stage_param_data_leaf_lie_plane_xz lie_plane_xz = leaf->lie_plane_xz; + + data = leaf_ptcl_data; + for (int32_t i = 0; i < leaf_particle_num_ptcls; i++, data++) { + if (data->type != 1) + continue; + + vec3 direction = data->direction; + float_t v19 = sub_14034C960(direction); + vec3 direction_diff = wind - direction; + vec3 v25 = vec3::dot(direction_diff * data->normal, vec3(1.0f)) + * data->normal * 35.0f + vec3(0.0f, -9.8f, 0.0f) + + direction_diff * sub_14034C960(direction_diff) * 5.0f; + direction += v25 * delta_time; + data->direction = direction; + data->position += direction * delta_time; + data->rotation += data->rotation_add * v19 * delta_time; + + float_t pos_y = data->position.y; + if (pos_y < off_y) + data->type = 2; + else if (pos_y < 0.01f && pos_y > -0.09f + && (lie_plane_xz.min_x <= data->position.x && data->position.x <= lie_plane_xz.max_x) + && (lie_plane_xz.min_z <= data->position.z && data->position.z <= lie_plane_xz.max_z)) { + data->type = 2; + data->position.y = 0.01f; + data->rotation.x = (float_t)-M_PI_2; + data->rotation.y = 0.0f; + } + } +} + +static std::pair sub_1406427A0(vec3 x, vec3 y) { + float_t t1 = vec3::length_squared(x); + if (t1 <= 1.0e-30f) + return { y, 0.0f }; + + float_t t2 = 1.0f / sqrtf(t1); + float_t t3 = (t2 * 1.5f + t1 * t2 * t2 * t2 * -0.5f); + return { t3 * x, t3 * t1 }; +} + +static int32_t leaf_particle_disp() { + float_t size = leaf_ptcl_data[0].size; + + vec3 position[4]; + vec3 normal[4]; + position[0] = vec3(-0.5f, -0.5f, 0.0f) * size; + position[1] = vec3( 0.5f, -0.5f, 0.2f) * size; + position[2] = vec3( 0.5f, 0.5f, 0.0f) * size; + position[3] = vec3(-0.5f, 0.5f, 0.2f) * size; + normal[0] = sub_1406427A0(vec3( 0.0f, 0.0f, 1.0f), vec3(0.0f, 1.0f, 0.0f)).first; + normal[1] = sub_1406427A0(vec3(-0.4f, 0.4f, 1.0f), vec3(0.0f, 1.0f, 0.0f)).first; + normal[2] = sub_1406427A0(vec3(-0.2f, -0.2f, 1.0f), vec3(0.0f, 1.0f, 0.0f)).first; + normal[3] = sub_1406427A0(vec3( 0.4f, -0.4f, 1.0f), vec3(0.0f, 1.0f, 0.0f)).first; + + leaf_particle_vertex_data* vtx_data; + if (GLAD_GL_VERSION_4_5) { + vtx_data = (leaf_particle_vertex_data*)glMapNamedBuffer(leaf_ptcl_vbo, GL_WRITE_ONLY); + if (!vtx_data) { + glUnmapNamedBuffer(leaf_ptcl_vbo); + return 0; + } + } + else { + gl_state_bind_array_buffer(leaf_ptcl_vbo); + vtx_data = (leaf_particle_vertex_data*)glMapBuffer(GL_ARRAY_BUFFER, GL_WRITE_ONLY); + if (!vtx_data) { + glUnmapBuffer(GL_ARRAY_BUFFER); + gl_state_bind_array_buffer(0); + return 0; + } + } + + int32_t vtx_count = 0; + leaf_particle_data* data = leaf_ptcl_data; + bool split_tex = stage_param_data_leaf_current->split_tex; + for (int32_t i = 0; i < leaf_particle_num_ptcls; i++, data++) { + if (!data->type) + continue; + + vec3 pos = data->position; + vec3 rot = data->rotation; + + mat3 mat; + mat3_rotate_x(rot.x, &mat); + mat3_rotate_y_mult(&mat, rot.y, &mat); + mat3_rotate_z_mult(&mat, rot.z, &mat); + + vec3 t0; + vec3 t1; + vec3 t2; + vec3 t3; + mat3_mult_vec(&mat, &position[0], &t0); + mat3_mult_vec(&mat, &position[1], &t1); + mat3_mult_vec(&mat, &position[2], &t2); + mat3_mult_vec(&mat, &position[3], &t3); + vtx_data[0].position = pos + t0; + vtx_data[1].position = pos + t1; + vtx_data[2].position = pos + t2; + vtx_data[3].position = pos + t3; + + mat3_mult_vec(&mat, &normal[0], &t0); + mat3_mult_vec(&mat, &normal[1], &t1); + mat3_mult_vec(&mat, &normal[2], &t2); + mat3_mult_vec(&mat, &normal[3], &t3); + vtx_data[0].normal = t0; + vtx_data[1].normal = t1; + vtx_data[2].normal = t2; + vtx_data[3].normal = t3; + data[0].normal = t0; + + if (split_tex) { + float_t u = 0.0f; + float_t v = 0.0f; + if (i & 0x01) + u = 1.0f; + if (i & 0x02) + v = 1.0f; + + float_t u0 = u * 0.5f; + float_t v0 = v * 0.5f; + float_t u1 = (u + 1.0f) * 0.5f; + float_t v1 = (v + 1.0f) * 0.5f; + + vtx_data[0].texcoord.x = u0; + vtx_data[0].texcoord.y = v0; + vtx_data[1].texcoord.x = u1; + vtx_data[1].texcoord.y = v0; + vtx_data[2].texcoord.x = u1; + vtx_data[2].texcoord.y = v1; + vtx_data[3].texcoord.x = u0; + vtx_data[3].texcoord.y = v1; + } + else { + vtx_data[0].texcoord = 0.0f; + vtx_data[1].texcoord = 1.0f; + vtx_data[2].texcoord = 1.0f; + vtx_data[3].texcoord = vec2(0.0f, 1.0f); + } + + if (data->type == 1) { + vtx_data[4] = vtx_data[0]; + vtx_data[5] = vtx_data[3]; + vtx_data[6] = vtx_data[2]; + vtx_data[7] = vtx_data[1]; + vtx_data[4].normal = -vtx_data[4].normal; + vtx_data[5].normal = -vtx_data[5].normal; + vtx_data[6].normal = -vtx_data[6].normal; + vtx_data[7].normal = -vtx_data[7].normal; + vtx_data += 8; + vtx_count += 8; + } + else { + vtx_data += 4; + vtx_count += 4; + } + } + + if (GLAD_GL_VERSION_4_5) + glUnmapNamedBuffer(leaf_ptcl_vbo); + else { + glUnmapBuffer(GL_ARRAY_BUFFER); + gl_state_bind_array_buffer(0); + } + return vtx_count; +} + +static void leaf_particle_free() { + if (leaf_ptcl_data) { + free(leaf_ptcl_data); + leaf_ptcl_data = 0; + } + + if (leaf_ptcl_vao) { + glDeleteVertexArrays(1, &leaf_ptcl_vao); + leaf_ptcl_vao = 0; + } + + if (leaf_ptcl_vbo) { + glDeleteBuffers(1, &leaf_ptcl_vbo); + leaf_ptcl_vbo = 0; + } + + if (leaf_ptcl_ebo) { + glDeleteBuffers(1, &leaf_ptcl_ebo); + leaf_ptcl_ebo = 0; + } +} + +static void litproj_textures_init() { + litproj_shadow[0].init(2048, 512, 0, GL_R32F, GL_DEPTH_COMPONENT24); + litproj_shadow[1].init(2048, 512, 0, GL_R32F, GL_ZERO); + litproj_texture.init(1280, 720, 0, GL_RGBA8, GL_DEPTH_COMPONENT24); +} + +static void litproj_textures_free() { + litproj_shadow[0].free(); + litproj_shadow[1].free(); + litproj_texture.free(); +} + +static void particle_init(vec3* offset) { + if (ptcl_data) + delete[] ptcl_data; + + const size_t ptcl_vtx_count = ptcl_count * 0x06; + + ptcl_data = force_malloc_s(particle_data, ptcl_count); + + particle_data* data = ptcl_data; + for (size_t i = 0; i < ptcl_count; i++, data++) + data->alive = false; + + particle_index = 0; + particle_count = 0; + + if (offset) + particle_wind = *offset; + else + particle_wind = 0.0f; + + if (!ptcl_vao) + glGenVertexArrays(1, &ptcl_vao); + + if (!ptcl_vbo) + glGenBuffers(1, &ptcl_vbo); + + static const GLsizei buffer_size = sizeof(particle_vertex_data); + + gl_state_bind_array_buffer(ptcl_vbo, true); + if (GLAD_GL_VERSION_4_4) + glBufferStorage(GL_ARRAY_BUFFER, + (GLsizeiptr)(buffer_size * ptcl_vtx_count), + 0, GL_DYNAMIC_STORAGE_BIT | GL_MAP_WRITE_BIT); + else + glBufferData(GL_ARRAY_BUFFER, + (GLsizeiptr)(buffer_size * ptcl_vtx_count), + 0, GL_DYNAMIC_DRAW); + + gl_state_bind_vertex_array(ptcl_vao); + glEnableVertexAttribArray(0); + glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, buffer_size, + (void*)offsetof(particle_vertex_data, position)); // Pos + glEnableVertexAttribArray(2); + glVertexAttribPointer(2, 3, GL_FLOAT, GL_FALSE, buffer_size, + (void*)offsetof(particle_vertex_data, normal)); // Normal + glEnableVertexAttribArray(3); + glVertexAttribPointer(3, 4, GL_FLOAT, GL_FALSE, buffer_size, + (void*)offsetof(particle_vertex_data, color)); // Color0 + glEnableVertexAttribArray(8); + glVertexAttribPointer(8, 2, GL_FLOAT, GL_FALSE, buffer_size, + (void*)offsetof(particle_vertex_data, texcoord)); // TexCoords + + gl_state_bind_vertex_array(0); + gl_state_bind_array_buffer(0); +} + +static void particle_ctrl() { + if (!ptcl_data) + return; + + vec3 wind = particle_wind; + + particle_data* data = ptcl_data; + for (int32_t i = 0; i < ptcl_count; i++, data++) { + if (!data->alive) + continue; + + vec3 v6 = data->direction + (wind - data->direction + vec3(0.0f, -3.0f, 0.0f)) * particle_delta_time; + std::pair v7 = sub_1406427A0(v6, vec3(0.0f, 1.0f, 0.0f)); + float_t v8 = vec3::dot(v7.first * data->normal, vec3(1.0f)) * v7.second; + vec3 v14 = v6 + (v8 * data->normal * -0.345f); + data->direction = 0.97f * v14; + data->position += v14 * particle_delta_time; + data->rotation += data->rotation_add * v7.second * particle_delta_time; + data->life_time -= particle_delta_time; + if (data->position.y < 0.0f || data->life_time < 0.0f) + particle_kill(data); + } +} + +static int32_t particle_disp(particle_vertex_data* vtx_data, particle_data* data, int32_t count) { + int32_t vtx_count = 0; + for (size_t i = 0; i < count; i++, data++) { + if (!data->alive) + continue; + + vec3 pos = data->position; + vec3 rot = data->rotation; + + mat3 mat; + mat3_rotate_x(rot.x, &mat); + mat3_rotate_y_mult(&mat, rot.y, &mat); + mat3_rotate_z_mult(&mat, rot.z, &mat); + + float_t size = data->size; + + vec3 t0 = vec3( 0.0125f, 0.007216875f, 0.0f) * size; + vec3 t1 = vec3(-0.0125f, 0.007216875f, 0.0f) * size; + vec3 t2 = vec3( 0.0f , -0.01443375f , 0.0f) * size; + mat3_mult_vec(&mat, &t0, &t0); + mat3_mult_vec(&mat, &t1, &t1); + mat3_mult_vec(&mat, &t2, &t2); + t0 += pos; + t1 += pos; + t2 += pos; + + vec3 normal = vec3(0.0f, 0.0f, 1.0f); + mat3_mult_vec(&mat, &normal, &normal); + data->normal = normal; + + vec4 color = data->color; + vtx_data[0].position = t0; + vtx_data[1].position = t1; + vtx_data[2].position = t2; + vtx_data[0].normal = normal; + vtx_data[1].normal = normal; + vtx_data[2].normal = normal; + vtx_data[0].color = color; + vtx_data[1].color = color; + vtx_data[2].color = color; + vtx_data[0].texcoord = vec2(0.0f); + vtx_data[1].texcoord = vec2(1.0f, 0.5f); + vtx_data[2].texcoord = vec2(0.0f, 1.0f); + + normal = -normal; + vtx_data[3].position = t2; + vtx_data[4].position = t1; + vtx_data[5].position = t0; + vtx_data[3].normal = normal; + vtx_data[4].normal = normal; + vtx_data[5].normal = normal; + vtx_data[3].color = color; + vtx_data[4].color = color; + vtx_data[5].color = color; + vtx_data[3].texcoord = vec2(0.0f, 1.0f); + vtx_data[4].texcoord = vec2(1.0f, 0.5f); + vtx_data[5].texcoord = vec2(0.0f); + vtx_data += 6; + vtx_count += 6; + } + return vtx_count; +} + +static particle_data* particle_emit() { + if (particle_count >= ptcl_count) + return 0; + + for (int32_t i = 0; i < ptcl_count; i++) { + particle_data* data = &ptcl_data[particle_index++]; + if (particle_index >= ptcl_count) + particle_index = 0; + if (data->alive) + continue; + + *data = {}; + data->alive = true; + particle_count++; + return data; + } + return 0; +} + +static void particle_event(particle_event_data* event_data) { + if (!ptcl_data) + return; + + float_t type = event_data->type; + int32_t count = (int32_t)event_data->count; + float_t size = event_data->size; + vec3 trans = event_data->trans; + float_t force = event_data->force; + + if (type == 1.0f) { + vec4 color[3]; + color[0] = vec4(1.0f, 0.2f, 0.2f, 1.0f); + color[1] = vec4(1.0f, 1.0f, 0.4f, 1.0f); + color[2] = vec4(1.0f, 0.6f, 0.0f, 1.0f); + + for (int32_t i = 0; i < count; i++) { + particle_data* data = particle_emit(); + if (!data) + break; + + data->position = trans; + data->rotation.x = rand_state_array_get_float(4) * 6.28f; + data->rotation.y = rand_state_array_get_float(4) * 6.28f; + vec3 direction = vec3(cosf(data->rotation.x), 0.0f, sinf(data->rotation.x)); + data->direction = direction * (rand_state_array_get_float(4) * force); + data->normal = vec3(0.0f, 0.0f, 1.0f); + data->rotation_add.x = (rand_state_array_get_float(4) + 1.0f) * 5.0f; + data->rotation_add.y = (rand_state_array_get_float(4) + 1.0f) * 2.5f; + data->rotation_add.z = 20.0f; + + int32_t color_rand = rand_state_array_get_int(0, 2, 4); + data->color = color[color_rand]; + data->type = type; + data->life_time = 10.0f; + data->size = size; + } + } + else if (type == 2.0f) { + float_t v13 = rand_state_array_get_float(4) * (float_t)(M_PI * 2.0); + float_t v14 = rand_state_array_get_float(4) * (float_t)(144.0 * DEG_TO_RAD); + float_t v15 = sinf(v14); + + vec3 direction; + direction.x = sinf(v13) * v15; + direction.y = cosf(v14); + direction.z = cosf(v13) * v15; + + for (int32_t i = 0; i < count; i++) { + particle_data* data = particle_emit(); + if (!data) + break; + + data->position = trans; + data->normal = vec3(0.0f, 0.0f, 1.0f); + data->rotation.x = rand_state_array_get_float(4) * 6.28f; + data->rotation.y = rand_state_array_get_float(4) * 6.28f; + data->direction = direction * ((rand_state_array_get_float(4) + 1.0f) * force); + data->rotation_add.x = (rand_state_array_get_float(4) + 1.0f) * 5.0f; + data->rotation_add.y = (rand_state_array_get_float(4) + 1.0f) * 2.5f; + data->rotation_add.z = 20.0f; + data->color.x = 5.0; + data->color.y = 4.5; + data->color.z = 2.0; + data->color.w = 1.0; + data->type = type; + data->life_time = 8.0f; + data->size = size; + } + } +} + +static void particle_kill(particle_data* data) { + data->alive = false; + particle_count--; +} + +static void particle_free() { + if (ptcl_data) + delete[] ptcl_data; + + ptcl_data = 0; + particle_index = 0; + particle_count = 0; + + if (ptcl_vao) { + glDeleteVertexArrays(1, &ptcl_vao); + ptcl_vao = 0; + } + + if (ptcl_vbo) { + glDeleteBuffers(1, &ptcl_vbo); + ptcl_vbo = 0; + } +} + +static void rain_particle_init(bool change_stage) { + vec3 velocity = stage_param_data_rain_current->velocity; + vec3 vel_range = stage_param_data_rain_current->vel_range; + + const size_t rain_ptcl_vtx_count = rain_ptcl_count * 0x04; + + for (int32_t i = 0; i < 8; i++) { + rain_particle_data& data = rain_ptcl_data[i]; + data.position.x = 0.0f; + data.position.y = ((float_t)i * -12.5f) - 5.0f; + data.position.z = 0.0f; + data.texcoord.x = 1.0f; + data.alpha = 1.0f; + data.type = 1; + data.velocity.x = rand_state_array_get_float(4); + data.velocity.y = rand_state_array_get_float(4); + data.velocity.z = rand_state_array_get_float(4); + data.velocity = (data.velocity - 0.5f) * vel_range + velocity; + data.field_2C = 0; + data.field_30 = 0; + data.field_34 = 0; + data.field_38 = 0; + data.field_3C = 0; + } + + if (change_stage) + return; + + if (!rain_ptcl_vao) + glGenVertexArrays(1, &rain_ptcl_vao); + + if (!rain_ptcl_vbo) + glGenBuffers(1, &rain_ptcl_vbo); + + vec3* vtx_data = force_malloc_s(vec3, rain_ptcl_vtx_count); + for (int32_t i = 0; i < rain_ptcl_count; i++, vtx_data += 4) { + vec3 position; + position.x = rand_state_array_get_float(4); + position.y = rand_state_array_get_float(4); + position.z = rand_state_array_get_float(4); + vtx_data[0] = position; + vtx_data[1] = position; + vtx_data[2] = position; + vtx_data[3] = position; + } + vtx_data -= rain_ptcl_vtx_count; + + static const GLsizei buffer_size = sizeof(vec3); + + gl_state_bind_array_buffer(rain_ptcl_vbo, true); + if (GLAD_GL_VERSION_4_4) + glBufferStorage(GL_ARRAY_BUFFER, + (GLsizeiptr)(buffer_size * rain_ptcl_vtx_count), vtx_data, 0); + else + glBufferData(GL_ARRAY_BUFFER, + (GLsizeiptr)(buffer_size * rain_ptcl_vtx_count), vtx_data, GL_STATIC_DRAW); + free_def(vtx_data); + + gl_state_bind_vertex_array(rain_ptcl_vao); + glEnableVertexAttribArray(0); + glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, buffer_size, 0); // Pos + + size_t ebo_count = rain_ptcl_vtx_count / 4 * 6; + uint32_t* ebo_data = force_malloc_s(uint32_t, ebo_count); + for (size_t i = 0, j = 0; i < ebo_count; i += 6, j += 4) { + ebo_data[i + 0] = (uint32_t)(j + 0); + ebo_data[i + 1] = (uint32_t)(j + 1); + ebo_data[i + 2] = (uint32_t)(j + 2); + ebo_data[i + 3] = (uint32_t)(j + 0); + ebo_data[i + 4] = (uint32_t)(j + 2); + ebo_data[i + 5] = (uint32_t)(j + 3); + } + + if (!rain_ptcl_ebo) + glGenBuffers(1, &rain_ptcl_ebo); + + gl_state_bind_element_array_buffer(rain_ptcl_ebo, true); + if (GLAD_GL_VERSION_4_4) + glBufferStorage(GL_ELEMENT_ARRAY_BUFFER, + (GLsizeiptr)(sizeof(uint32_t) * ebo_count), ebo_data, 0); + else + glBufferData(GL_ELEMENT_ARRAY_BUFFER, + (GLsizeiptr)(sizeof(uint32_t) * ebo_count), ebo_data, GL_STATIC_DRAW); + free_def(ebo_data); + + gl_state_bind_vertex_array(0); + gl_state_bind_array_buffer(0); + gl_state_bind_element_array_buffer(0); +} + +static void rain_particle_ctrl() { + if (!stage_param_data_rain_current) + return; + + float_t delta_time = (float_t)(rain_particle_delta_frame * (1.0 / 60.0)); + + for (int32_t i = 0; i < 8; i++) { + rain_particle_data& data = rain_ptcl_data[i]; + data.position += delta_time * data.velocity; + data.alpha = 1.0f; + + float_t pos_y = data.position.y; + if (pos_y > -1.0f) + data.alpha = max_def(-pos_y, 0.0f); + else if (pos_y < -99.0f) { + data.alpha = max_def(pos_y + 100.0f, 0.0f); + if (pos_y < -100.0f) + data.position = 0.0f; + } + } +} + +static void rain_particle_free() { + if (rain_ptcl_vao) { + glDeleteVertexArrays(1, &rain_ptcl_vao); + rain_ptcl_vao = 0; + } + + if (rain_ptcl_vbo) { + glDeleteBuffers(1, &rain_ptcl_vbo); + rain_ptcl_vbo = 0; + } + + if (rain_ptcl_ebo) { + glDeleteBuffers(1, &rain_ptcl_ebo); + rain_ptcl_ebo = 0; + } +} diff --git a/src/CRE/task_effect.hpp b/src/CRE/task_effect.hpp index e0a6827f..e1c91e58 100644 --- a/src/CRE/task_effect.hpp +++ b/src/CRE/task_effect.hpp @@ -10,6 +10,7 @@ #include "../KKdLib/database/object.hpp" #include "../KKdLib/mat.hpp" #include "../KKdLib/vec.hpp" +#include "rob/rob.hpp" #include "frame_rate_control.hpp" #include "render_texture.hpp" #include "stage.hpp" @@ -40,21 +41,32 @@ enum TaskEffectType { TASK_EFFECT_STAR = 0x14, }; +struct particle_init_data { + float_t field_0; + float_t field_4; + float_t field_8; + vec3 trans; + float_t scale_y; +}; + class TaskEffect : public app::Task { public: TaskEffect(); virtual ~TaskEffect() override; virtual void PreInit(int32_t stage_index); + virtual void SetStageHashes(std::vector& stage_hashes, void* data, + object_database* obj_db, texture_database* tex_db, stage_database* stage_data); // Added virtual void SetStageIndices(std::vector& stage_indices); virtual void SetFrame(int32_t value); virtual void Field_48(); - virtual void SetEnable(bool); - virtual void SetStageIndex(int32_t value); + virtual void SetEnable(bool value); + virtual void SetCurrentStageHash(uint32_t value); // Added + virtual void SetCurrentStageIndex(int32_t value); virtual void SetFrameRateControl(FrameRateControl* value); virtual void Field_68(); virtual void Reset(); - virtual void Field_78(); + virtual void Event(int32_t event_type, void* data); virtual void Field_80(); virtual void Field_88(); virtual void Field_90(); @@ -64,11 +76,16 @@ public: }; struct struc_621 { + uint32_t stage_hash; // Added int32_t stage_index; std::vector auth_3d_ids; + + struc_621(); + ~struc_621(); }; struct TaskEffectAuth3D : public TaskEffect { +public: struct Stage { size_t count; size_t max_count; @@ -79,8 +96,10 @@ struct TaskEffectAuth3D : public TaskEffect { } stage; bool enable; std::vector field_120; - int32_t stage_index; + uint32_t current_stage_hash; // Added + int32_t current_stage_index; int32_t field_13C; + std::vector stage_hashes; std::vector stage_indices; int8_t field_158; int8_t field_159; @@ -96,10 +115,13 @@ struct TaskEffectAuth3D : public TaskEffect { virtual void Disp() override; virtual void PreInit(int32_t stage_index) override; + virtual void SetStageHashes(std::vector& stage_hashes, void* data, + object_database* obj_db, texture_database* tex_db, stage_database* stage_data) override; // Added virtual void SetStageIndices(std::vector& stage_indices) override; virtual void SetFrame(int32_t value) override; virtual void SetEnable(bool value) override; - virtual void SetStageIndex(int32_t value) override; + virtual void SetCurrentStageHash(uint32_t value) override; // Added + virtual void SetCurrentStageIndex(int32_t value) override; virtual void SetFrameRateControl(FrameRateControl* value) override; virtual void Reset() override; @@ -108,6 +130,7 @@ struct TaskEffectAuth3D : public TaskEffect { }; struct TaskEffectFogAnim : public TaskEffect { +public: struct Data { bool field_0; int32_t field_4; @@ -133,203 +156,106 @@ struct TaskEffectFogAnim : public TaskEffect { virtual bool Ctrl() override; virtual bool Dest() override; virtual void Disp() override; - virtual void Basic() override; virtual void PreInit(int32_t stage_index) override; - virtual void SetStageIndices(std::vector& stage_indices) override; - virtual void SetFrame(int32_t value) override; - virtual void Field_48() override; - virtual void SetEnable(bool) override; - virtual void SetStageIndex(int32_t value) override; - virtual void SetFrameRateControl(FrameRateControl* value) override; - virtual void Field_68() override; virtual void Reset() override; - virtual void Field_78() override; - virtual void Field_80() override; - virtual void Field_88() override; - virtual void Field_90() override; - virtual void Field_98(int32_t a2, int32_t* a3) override; - virtual void Field_A0(int32_t a2, int32_t* a3) override; - virtual void Field_A8(int32_t a2, int8_t* a3) override; +}; + +struct fog_ring_data { + vec3 position; + vec3 direction; + vec3 field_18; + float_t size; + float_t density; + + fog_ring_data(); +}; + +struct particle_event_data { + float_t type; + float_t count; + float_t size; + vec3 trans; + float_t force; + + particle_event_data(); }; struct point_particle_data { - vec3 position; + vec2 position; vec4 color; - float_t size; }; struct struc_371 { - vec3 field_0; - float_t field_C; - int32_t field_10; - int32_t field_14; - int32_t field_18; - int32_t field_1C; - int32_t field_20; - int32_t field_24; + int32_t field_0; + vec3 position; + float_t field_10; + float_t field_14; + vec3 direction; + float_t field_24; + + struc_371(); }; +struct struc_573 { + int32_t chara_index; + rob_bone_index bone_index; + vec3 position; + + struc_573(); +}; + + struct TaskEffectFogRing : public TaskEffect { +public: struct Data { bool enable; float_t delta_frame; - int8_t field_8; + bool field_8; float_t ring_size; vec3 wind_dir; int32_t tex_id; vec4 color; - float_t point_size; + float_t ptcl_size; int32_t max_ptcls; int32_t num_ptcls; float_t density; float_t density_offset; - int32_t field_44; - int64_t field_48; - point_particle_data* data; - int32_t count; - int32_t field_5C; - int32_t field_60; - int32_t field_64; - int32_t field_68; - int32_t field_6C; - int32_t field_70; - int32_t field_74; - int32_t field_78; - int32_t field_7C; - int32_t field_80; - int32_t field_84; - int32_t field_88; - int32_t field_8C; - int32_t field_90; - int32_t field_94; - int32_t field_98; - int32_t field_9C; - int32_t field_A0; - int32_t field_A4; - int32_t field_A8; - int32_t field_AC; - int32_t field_B0; - int32_t field_B4; - int32_t field_B8; - int32_t field_BC; - int32_t field_C0; - int32_t field_C4; - int32_t field_C8; - int32_t field_CC; - int32_t field_D0; - int32_t field_D4; - int32_t field_D8; - int32_t field_DC; - int32_t field_E0; - int32_t field_E4; - int32_t field_E8; - int32_t field_EC; - int32_t field_F0; - int32_t field_F4; - int32_t field_F8; - int32_t field_FC; - int32_t field_100; - int32_t field_104; - int32_t field_108; - int32_t field_10C; - int32_t field_110; - int32_t field_114; - int32_t field_118; - int32_t field_11C; - int32_t field_120; + fog_ring_data* ptcl_data; + int32_t num_vtx; + struc_573 field_5C[2][5]; int32_t field_124; - int8_t field_128[4]; - float_t field_12C[2]; - int32_t field_134; - float_t field_138[2]; - struc_371 field_140[2]; - int32_t field_190; - int32_t field_194; - int32_t field_198; - int32_t field_19C; - int32_t field_1A0; - int32_t field_1A4; - int32_t field_1A8; - int32_t field_1AC; - int32_t field_1B0; - int32_t field_1B4; - int32_t field_1B8; - int32_t field_1BC; - int32_t field_1C0; - int32_t field_1C4; - int32_t field_1C8; - int32_t field_1CC; - int32_t field_1D0; - int32_t field_1D4; - int32_t field_1D8; - int32_t field_1DC; - int32_t field_1E0; - int32_t field_1E4; - int32_t field_1E8; - int32_t field_1EC; - int32_t field_1F0; - int32_t field_1F4; - int32_t field_1F8; - int32_t field_1FC; - int32_t field_200; - int32_t field_204; - int32_t field_208; - int32_t field_20C; - int32_t field_210; - int32_t field_214; - int32_t field_218; - int32_t field_21C; - int32_t field_220; - int32_t field_224; - int32_t field_228; - int32_t field_22C; - int32_t field_230; - int32_t field_234; - int32_t field_238; - int32_t field_23C; - int32_t field_240; - int32_t field_244; - int32_t field_248; - int32_t field_24C; - int32_t field_250; - int32_t field_254; - int32_t field_258; - int32_t field_25C; - int32_t field_260; - int32_t field_264; - int32_t field_268; - int32_t field_26C; - int32_t field_270; - int32_t field_274; - int32_t field_278; - int32_t field_27C; - int32_t field_280; - int32_t field_284; - int32_t field_288; - int32_t field_28C; - int32_t field_290; - int32_t field_294; - int32_t field_298; - int32_t field_29C; - int32_t field_2A0; - int32_t field_2A4; - int64_t field_2A8; - int32_t field_2B0; - int32_t field_2B4; + struc_371 field_128[10]; int8_t field_2B8; int8_t field_2B9; bool disp; - int32_t stage_index; + int32_t current_stage_index; std::vector stage_indices; FrameRateControl* frame_rate_control; - int64_t field_2E0; + GLuint vao; + GLuint vbo; + GLuint ebo; Data(); ~Data(); + void CalcPtcl(float_t delta_time); + void CalcVert(); void Ctrl(); + void CtrlInner(float_t delta_time); + void Dest(); + void Disp(); + void Draw(); + void InitParticleData(); + void Reset(); void SetStageIndices(std::vector& stage_indices); + + static void DrawStatic(void* data); + static float_t PtclRandom(float_t value); + + void sub_140347B40(float_t delta_time); + + static void sub_140347860(fog_ring_data* a1, int32_t a2, struc_371* a3, float_t a4); } data; TaskEffectFogRing(); @@ -342,19 +268,18 @@ struct TaskEffectFogRing : public TaskEffect { virtual void PreInit(int32_t stage_index) override; virtual void SetStageIndices(std::vector& stage_indices) override; - virtual void SetEnable(bool) override; - virtual void SetStageIndex(int32_t value) override; + virtual void SetEnable(bool value) override; + virtual void SetCurrentStageIndex(int32_t value) override; virtual void SetFrameRateControl(FrameRateControl* value) override; virtual void Reset() override; }; struct TaskEffectLeaf : public TaskEffect { +public: FrameRateControl* frame_rate_control; - int32_t stage_index; + int32_t current_stage_index; std::vector stage_indices; - int32_t field_90; - int32_t field_94; - int64_t field_98; + int32_t wait_frames; TaskEffectLeaf(); virtual ~TaskEffectLeaf() override; @@ -363,33 +288,23 @@ struct TaskEffectLeaf : public TaskEffect { virtual bool Ctrl() override; virtual bool Dest() override; virtual void Disp() override; - virtual void Basic() override; virtual void PreInit(int32_t stage_index) override; virtual void SetStageIndices(std::vector& stage_indices) override; - virtual void SetFrame(int32_t value) override; - virtual void Field_48() override; - virtual void SetEnable(bool) override; - virtual void SetStageIndex(int32_t value) override; + virtual void SetEnable(bool value) override; + virtual void SetCurrentStageIndex(int32_t value) override; virtual void SetFrameRateControl(FrameRateControl* value) override; - virtual void Field_68() override; virtual void Reset() override; - virtual void Field_78() override; - virtual void Field_80() override; - virtual void Field_88() override; - virtual void Field_90() override; - virtual void Field_98(int32_t a2, int32_t* a3) override; - virtual void Field_A0(int32_t a2, int32_t* a3) override; - virtual void Field_A8(int32_t a2, int8_t* a3) override; }; struct TaskEffectLitproj : public TaskEffect { - int32_t stage_index; +public: + int32_t current_stage_index; std::vector stage_indices; - int32_t field_88; + int32_t wait_frames; vec4 diffuse; vec4 specular; - int32_t field_AC; + int32_t frame; TaskEffectLitproj(); virtual ~TaskEffectLitproj() override; @@ -398,31 +313,18 @@ struct TaskEffectLitproj : public TaskEffect { virtual bool Ctrl() override; virtual bool Dest() override; virtual void Disp() override; - virtual void Basic() override; virtual void PreInit(int32_t stage_index) override; virtual void SetStageIndices(std::vector& stage_indices) override; - virtual void SetFrame(int32_t value) override; - virtual void Field_48() override; - virtual void SetEnable(bool) override; - virtual void SetStageIndex(int32_t value) override; - virtual void SetFrameRateControl(FrameRateControl* value) override; - virtual void Field_68() override; + virtual void SetEnable(bool value) override; + virtual void SetCurrentStageIndex(int32_t value) override; virtual void Reset() override; - virtual void Field_78() override; - virtual void Field_80() override; - virtual void Field_88() override; - virtual void Field_90() override; - virtual void Field_98(int32_t a2, int32_t* a3) override; - virtual void Field_A0(int32_t a2, int32_t* a3) override; - virtual void Field_A8(int32_t a2, int8_t* a3) override; }; struct TaskEffectParticle : public TaskEffect { +public: FrameRateControl* frame_rate_control; - int32_t field_70; - int32_t field_74; - int64_t field_78; + int32_t current_stage_index; TaskEffectParticle(); virtual ~TaskEffectParticle() override; @@ -431,29 +333,18 @@ struct TaskEffectParticle : public TaskEffect { virtual bool Ctrl() override; virtual bool Dest() override; virtual void Disp() override; - virtual void Basic() override; virtual void PreInit(int32_t stage_index) override; - virtual void SetStageIndices(std::vector& stage_indices) override; - virtual void SetFrame(int32_t value) override; - virtual void Field_48() override; - virtual void SetEnable(bool) override; - virtual void SetStageIndex(int32_t value) override; + virtual void SetEnable(bool value) override; virtual void SetFrameRateControl(FrameRateControl* value) override; - virtual void Field_68() override; virtual void Reset() override; - virtual void Field_78() override; - virtual void Field_80() override; - virtual void Field_88() override; - virtual void Field_90() override; - virtual void Field_98(int32_t a2, int32_t* a3) override; - virtual void Field_A0(int32_t a2, int32_t* a3) override; - virtual void Field_A8(int32_t a2, int8_t* a3) override; + virtual void Event(int32_t event_type, void* data) override; }; struct TaskEffectRain : public TaskEffect { +public: FrameRateControl* frame_rate_control; - int32_t stage_index; + int32_t current_stage_index; std::vector stage_indices; TaskEffectRain(); @@ -463,24 +354,13 @@ struct TaskEffectRain : public TaskEffect { virtual bool Ctrl() override; virtual bool Dest() override; virtual void Disp() override; - virtual void Basic() override; virtual void PreInit(int32_t stage_index) override; virtual void SetStageIndices(std::vector& stage_indices) override; - virtual void SetFrame(int32_t value) override; - virtual void Field_48() override; - virtual void SetEnable(bool) override; - virtual void SetStageIndex(int32_t value) override; + virtual void SetEnable(bool value) override; + virtual void SetCurrentStageIndex(int32_t value) override; virtual void SetFrameRateControl(FrameRateControl* value) override; - virtual void Field_68() override; virtual void Reset() override; - virtual void Field_78() override; - virtual void Field_80() override; - virtual void Field_88() override; - virtual void Field_90() override; - virtual void Field_98(int32_t a2, int32_t* a3) override; - virtual void Field_A0(int32_t a2, int32_t* a3) override; - virtual void Field_A8(int32_t a2, int8_t* a3) override; }; struct color4u8 { @@ -490,22 +370,16 @@ struct color4u8 { uint8_t a; }; -struct struc_101 { +struct struc_101 { int32_t ripple_uniform; int32_t ripple_emit_uniform; int32_t count; - int32_t field_C; vec3* vertex; color4u8* color; float_t size; int32_t field_24; }; -struct struc_202 { - vec2 field_0; - float_t field_8; -}; - struct ripple_emit_draw_data { struc_101 data; vec3 vertex[16]; @@ -537,7 +411,7 @@ struct ripple_emit { int32_t field_30; float_t rob_emitter_size; size_t emitter_num; - struc_202* emitter_list; + vec3* emitter_list; float_t emitter_size; int32_t field_4C; ripple_emit_draw_data field_50; @@ -551,18 +425,19 @@ struct ripple_emit { int32_t field_BE8; int8_t field_BEC; float_t wake_attn; - float speed; - float field_BF8; - float field_BFC; + float_t speed; + float_t field_BF8; + float_t field_BFC; int8_t field_C00; - int32_t stage_index; + int32_t current_stage_index; std::vector stage_indices; }; struct TaskEffectRipple : public TaskEffect { +public: int64_t field_68; FrameRateControl* frame_rate_control; - ripple_emit* emit_struct; + ripple_emit* emit; TaskEffectRipple(); virtual ~TaskEffectRipple() override; @@ -571,29 +446,18 @@ struct TaskEffectRipple : public TaskEffect { virtual bool Ctrl() override; virtual bool Dest() override; virtual void Disp() override; - virtual void Basic() override; virtual void PreInit(int32_t stage_index) override; virtual void SetStageIndices(std::vector& stage_indices) override; - virtual void SetFrame(int32_t value) override; - virtual void Field_48() override; - virtual void SetEnable(bool) override; - virtual void SetStageIndex(int32_t value) override; + virtual void SetCurrentStageIndex(int32_t value) override; virtual void SetFrameRateControl(FrameRateControl* value) override; - virtual void Field_68() override; virtual void Reset() override; - virtual void Field_78() override; - virtual void Field_80() override; - virtual void Field_88() override; - virtual void Field_90() override; - virtual void Field_98(int32_t a2, int32_t* a3) override; - virtual void Field_A0(int32_t a2, int32_t* a3) override; - virtual void Field_A8(int32_t a2, int8_t* a3) override; }; struct TaskEffectSnow : public TaskEffect { +public: FrameRateControl* frame_rate_control; - int32_t stage_index; + int32_t current_stage_index; std::vector stage_indices; TaskEffectSnow(); @@ -609,12 +473,11 @@ struct TaskEffectSnow : public TaskEffect { virtual void SetStageIndices(std::vector& stage_indices) override; virtual void SetFrame(int32_t value) override; virtual void Field_48() override; - virtual void SetEnable(bool) override; - virtual void SetStageIndex(int32_t value) override; + virtual void SetEnable(bool value) override; + virtual void SetCurrentStageIndex(int32_t value) override; virtual void SetFrameRateControl(FrameRateControl* value) override; virtual void Field_68() override; virtual void Reset() override; - virtual void Field_78() override; virtual void Field_80() override; virtual void Field_88() override; virtual void Field_90() override; @@ -697,6 +560,7 @@ struct ParticleDispObj { }; struct TaskEffectSplash : public TaskEffect { +public: struct Data { struct Sub { int32_t field_0; @@ -730,7 +594,7 @@ struct TaskEffectSplash : public TaskEffect { int8_t field_8; Sub field_10; int8_t field_110; - int32_t stage_index; + int32_t current_stage_index; std::vector stage_indices; FrameRateControl* frame_rate_control; int64_t field_138; @@ -752,12 +616,11 @@ struct TaskEffectSplash : public TaskEffect { virtual void SetStageIndices(std::vector& stage_indices) override; virtual void SetFrame(int32_t value) override; virtual void Field_48() override; - virtual void SetEnable(bool) override; - virtual void SetStageIndex(int32_t value) override; + virtual void SetEnable(bool value) override; + virtual void SetCurrentStageIndex(int32_t value) override; virtual void SetFrameRateControl(FrameRateControl* value) override; virtual void Field_68() override; virtual void Reset() override; - virtual void Field_78() override; virtual void Field_80() override; virtual void Field_88() override; virtual void Field_90() override; @@ -767,8 +630,9 @@ struct TaskEffectSplash : public TaskEffect { }; struct TaskEffectStar : public TaskEffect { +public: FrameRateControl* frame_rate_control; - int32_t stage_index; + int32_t current_stage_index; float_t delta_frame; std::vector stage_indices; @@ -785,12 +649,11 @@ struct TaskEffectStar : public TaskEffect { virtual void SetStageIndices(std::vector& stage_indices) override; virtual void SetFrame(int32_t value) override; virtual void Field_48() override; - virtual void SetEnable(bool) override; - virtual void SetStageIndex(int32_t value) override; + virtual void SetEnable(bool value) override; + virtual void SetCurrentStageIndex(int32_t value) override; virtual void SetFrameRateControl(FrameRateControl* value) override; virtual void Field_68() override; virtual void Reset() override; - virtual void Field_78() override; virtual void Field_80() override; virtual void Field_88() override; virtual void Field_90() override; @@ -798,3 +661,26 @@ struct TaskEffectStar : public TaskEffect { virtual void Field_A0(int32_t a2, int32_t* a3) override; virtual void Field_A8(int32_t a2, int8_t* a3) override; }; + +extern void leaf_particle_draw(); +extern void rain_particle_draw(); +extern void particle_draw(); +extern void snow_particle_draw(); + +extern void task_effect_init(); +extern void task_effect_free(); + +extern void task_effect_parent_event(TaskEffectType type, int32_t event_type, void* data); +extern void task_effect_parent_dest(); +extern bool task_effect_parent_load(); +extern void task_effect_parent_reset(); +extern void task_effect_parent_set_current_stage_hash(uint32_t stage_hash); +extern void task_effect_parent_set_current_stage_index(int32_t stage_index); +extern void task_effect_parent_set_data(void* data, + object_database* obj_db, texture_database* tex_db, stage_database* stage_data); +extern void task_effect_parent_set_enable(bool value); +extern void task_effect_parent_set_frame(int32_t value); +extern void task_effect_parent_set_frame_rate_control(FrameRateControl* value); +extern void task_effect_parent_set_stage_hashes(std::vector& stage_hashes); +extern void task_effect_parent_set_stage_indices(std::vector& stage_indices); +extern bool task_effect_parent_unload(); diff --git a/src/CRE/texture.cpp b/src/CRE/texture.cpp index e7ade2d7..ab2c27aa 100644 --- a/src/CRE/texture.cpp +++ b/src/CRE/texture.cpp @@ -11,13 +11,6 @@ #include #include -struct texture_params { - GLenum target; - GLint wrap_s; - GLint wrap_t; - GLint wrap_r; -}; - static void texture_get_format_type_by_internal_format(GLenum internal_format, GLenum* format, GLenum* type); static uint32_t texture_get_height_align_mip_level(texture* tex, int32_t mip_level); static uint32_t texture_get_height_mip_level(texture* tex, int32_t mip_level); @@ -34,7 +27,6 @@ static void texture_set_params(GLuint texture, GLenum target, int32_t max_mipmap static GLenum texture_txp_get_internal_format(txp* t); std::vector texture_storage; -std::map texture_params_storage; texture_id::texture_id() : id(0), index(0) { @@ -49,6 +41,22 @@ tex(), target(), internal_format(), max_mipmap_level(), size() { } +uint32_t texture::get_height_align_mip_level(uint8_t mip_level) { + uint32_t height = this->height >> mip_level; + if (flags & TEXTURE_BLOCK_COMPRESSION) + return max_def(height, 4); + else + return max_def(height, 1); +} + +uint32_t texture::get_width_align_mip_level(uint8_t mip_level) { + uint32_t width = this->width >> mip_level; + if (flags & TEXTURE_BLOCK_COMPRESSION) + return max_def(width, 4); + else + return max_def(width, 1); +} + texture* texture_init(texture_id id) { return texture_storage_create_texture(id); } @@ -202,7 +210,6 @@ bool texture_txp_set_load(txp_set* t, texture*** texs, texture_id* ids) { inline void texture_storage_init() { texture_storage = {}; - texture_params_storage = {}; } inline texture* texture_storage_create_texture(texture_id id) { @@ -252,7 +259,6 @@ inline void texture_storage_delete_texture(texture_id id) { break; } - texture_params_storage.erase(tex->tex); glDeleteTextures(1, &tex->tex); delete tex; i = texture_storage.erase(i); @@ -260,90 +266,12 @@ inline void texture_storage_delete_texture(texture_id id) { } } -inline void texture_storage_set_texture_wrap(GLuint texture, GLint wrap_s, GLint wrap_t) { - auto elem = texture_params_storage.find(texture); - if (elem == texture_params_storage.end()) - return; - - texture_params& params = elem->second; - if (params.wrap_s != wrap_s) { - glTexParameteri(params.target, GL_TEXTURE_WRAP_S, wrap_s); - params.wrap_s = wrap_s; - } - - if (params.wrap_t != wrap_t) { - glTexParameteri(params.target, GL_TEXTURE_WRAP_T, wrap_t); - params.wrap_t = wrap_t; - } -} - -inline void texture_storage_set_texture_wrap(GLuint texture, GLint wrap_s, GLint wrap_t, GLint wrap_r) { - auto elem = texture_params_storage.find(texture); - if (elem == texture_params_storage.end()) - return; - - texture_params& params = elem->second; - if (params.wrap_s != wrap_s) { - glTexParameteri(params.target, GL_TEXTURE_WRAP_S, wrap_s); - params.wrap_s = wrap_s; - } - - if (params.wrap_t != wrap_t) { - glTexParameteri(params.target, GL_TEXTURE_WRAP_T, wrap_t); - params.wrap_t = wrap_t; - } - - if (params.wrap_r != wrap_r) { - glTexParameteri(params.target, GL_TEXTURE_WRAP_R, wrap_r); - params.wrap_r = wrap_r; - } -} - -inline void texture_storage_set_texture_wrap_s(GLuint texture, GLint wrap) { - auto elem = texture_params_storage.find(texture); - if (elem == texture_params_storage.end()) - return; - - texture_params& params = elem->second; - if (params.wrap_s != wrap) { - glTexParameteri(params.target, GL_TEXTURE_WRAP_S, wrap); - params.wrap_s = wrap; - } -} - -inline void texture_storage_set_texture_wrap_t(GLuint texture, GLint wrap) { - auto elem = texture_params_storage.find(texture); - if (elem == texture_params_storage.end()) - return; - - texture_params& params = elem->second; - if (params.wrap_t != wrap) { - glTexParameteri(params.target, GL_TEXTURE_WRAP_T, wrap); - params.wrap_t = wrap; - } -} - -inline void texture_storage_set_texture_wrap_r(GLuint texture, GLint wrap) { - auto elem = texture_params_storage.find(texture); - if (elem == texture_params_storage.end()) - return; - - texture_params& params = elem->second; - if (params.wrap_r != wrap) { - glTexParameteri(params.target, GL_TEXTURE_WRAP_R, wrap); - params.wrap_r = wrap; - } -} - inline void texture_storage_free() { for (texture*& i : texture_storage) { - if (i) { - texture_params_storage.erase(i->tex); + if (i) glDeleteTextures(1, &i->tex); - } delete i; } - texture_params_storage.clear(); texture_storage.clear(); texture_storage.shrink_to_fit(); } @@ -568,7 +496,6 @@ static texture* texture_load_tex(texture_id id, GLenum target, return tex; glGenTextures(1, &tex->tex); - texture_params_storage.insert({ tex->tex, { target } }); switch (target) { case GL_TEXTURE_2D: gl_state_bind_texture_2d(tex->tex); @@ -703,8 +630,11 @@ fail: } static void texture_set_params(GLuint texture, GLenum target, int32_t max_mipmap_level, bool use_high_anisotropy) { - texture_storage_set_texture_wrap(target, GL_CLAMP_TO_EDGE, GL_CLAMP_TO_EDGE, GL_CLAMP_TO_EDGE); - glTexParameterfv(target, GL_TEXTURE_BORDER_COLOR, (float_t*)&vec4_null); + glTexParameteri(target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + glTexParameteri(target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); + glTexParameteri(target, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE); + static const vec4 border_color = 0.0f; + glTexParameterfv(target, GL_TEXTURE_BORDER_COLOR, (GLfloat*)&border_color); glTexParameteri(target, GL_TEXTURE_MAG_FILTER, GL_LINEAR); glTexParameteri(target, GL_TEXTURE_MIN_FILTER, max_mipmap_level > 0 ? GL_LINEAR_MIPMAP_LINEAR : GL_LINEAR); diff --git a/src/CRE/texture.hpp b/src/CRE/texture.hpp index 3d022c81..e8332bb7 100644 --- a/src/CRE/texture.hpp +++ b/src/CRE/texture.hpp @@ -59,6 +59,9 @@ struct texture { int32_t size; texture(); + + uint32_t get_height_align_mip_level(uint8_t mip_level = 0); + uint32_t get_width_align_mip_level(uint8_t mip_level = 0); }; extern texture* texture_init(texture_id id); @@ -82,9 +85,4 @@ extern texture* texture_storage_get_texture(texture_id id); extern size_t texture_storage_get_texture_count(); extern texture* texture_storage_get_texture_by_index(size_t index); extern void texture_storage_delete_texture(texture_id id); -extern void texture_storage_set_texture_wrap(GLuint texture, GLint wrap_s, GLint wrap_t); -extern void texture_storage_set_texture_wrap(GLuint texture, GLint wrap_s, GLint wrap_t, GLint wrap_r); -extern void texture_storage_set_texture_wrap_s(GLuint texture, GLint wrap); -extern void texture_storage_set_texture_wrap_t(GLuint texture, GLint wrap); -extern void texture_storage_set_texture_wrap_r(GLuint texture, GLint wrap); extern void texture_storage_free(); diff --git a/src/DivaGL/bone_data.cpp b/src/DivaGL/bone_data.cpp index 0e7544bc..3599bab5 100644 --- a/src/DivaGL/bone_data.cpp +++ b/src/DivaGL/bone_data.cpp @@ -5,32 +5,32 @@ #include "bone_data.hpp" -typedef enum HeapCMallocType { +enum HeapCMallocType { HeapCMallocSystem = 0x00, HeapCMallocTemp = 0x01, HeapCMallocMode = 0x02, HeapCMallocEvent = 0x03, HeapCMallocDebug = 0x04, HeapCMallocMax = 0x05, -} HeapCMallocType; +}; -typedef struct skeleton_rotation_offset { +struct skeleton_rotation_offset { bool x; bool y; bool z; vec3 rotation; -} skeleton_rotation_offset; +}; -typedef struct struc_403 { +struct struc_403 { int32_t field_0; int32_t field_4; int32_t field_8; -} struc_403; +}; -typedef struct struc_404 { +struct struc_404 { int32_t field_0; int32_t field_4; -} struc_404; +}; ExNodeBlock_vtbl* ExClothBlock_vftable = (ExNodeBlock_vtbl*)0x0000000140A82FF0; ExNodeBlock_vtbl* ExOsageBlock_vftable = (ExNodeBlock_vtbl*)0x0000000140A82F88; @@ -60,20 +60,20 @@ static void bone_node_expression_data_set_position_rotation(bone_node_expression data->rotation.x = rotation_x; data->rotation.z = rotation_z; data->rotation.y = rotation_y; - data->scale = vec3_identity; - data->parent_scale = vec3_identity; + data->scale = 1.0f; + data->parent_scale = 1.0f; } static void bone_node_expression_data_reset_scale(bone_node_expression_data* data) { - data->scale = vec3_identity; - data->parent_scale = vec3_identity; + data->scale = 1.0f; + data->parent_scale = 1.0f; } static void bone_node_data_reset_position_rotation(bone_node_expression_data* data) { - data->position = vec3_null; - data->rotation = vec3_null; - data->scale = vec3_identity; - data->parent_scale = vec3_identity; + data->position = 0.0f; + data->rotation = 0.0f; + data->scale = 1.0f; + data->parent_scale = 1.0f; } static bone_data* bone_data_init(bone_data* bone) { @@ -88,16 +88,16 @@ static bone_data* bone_data_init(bone_data* bone) { bone->frame = 0; for (int32_t i = 0; i < 2; i++) - bone->base_translation[i] = vec3_null; + bone->base_translation[i] = 0.0f; - bone->rotation = vec3_null; - bone->ik_target = vec3_null; - bone->trans = vec3_null; + bone->rotation = 0.0f; + bone->ik_target = 0.0f; + bone->trans = 0.0f; for (int32_t i = 0; i < 2; i++) bone->rot_mat[i] = mat4_null; for (int32_t i = 0; i < 2; i++) - bone->trans_prev[i] = vec3_null; + bone->trans_prev[i] = 0.0f; for (int32_t i = 0; i < 2; i++) for (int32_t j = 0; j < 3; j++) @@ -237,10 +237,10 @@ static void rob_chara_bone_data_reserve(rob_chara_bone_data* rob_bone_data) { i->name = 0; i->mat = 0; i->parent = 0; - i->exp_data.position = vec3_null; - i->exp_data.rotation = vec3_null; - i->exp_data.scale = vec3_identity; - i->exp_data.parent_scale = vec3_identity; + i->exp_data.position = 0.0f; + i->exp_data.rotation = 0.0f; + i->exp_data.scale = 1.0f; + i->exp_data.parent_scale = 1.0f; i->ex_data_mat = 0; } } @@ -304,15 +304,15 @@ static void rob_chara_bone_data_set_mats(rob_chara_bone_data* rob_bone_data, i->ex_data_mat = i->mat; if (total_bone_count != rob_bone_data->total_bone_count) - printf("Node mismatch\n"); + printf_debug("Node mismatch\n"); if (mats - rob_bone_data->mats.begin != rob_bone_data->object_bone_count) - printf("Matrix mismatch\n"); + printf_debug("Matrix mismatch\n"); if (mats2 - rob_bone_data->mats2.begin != rob_bone_data->total_bone_count - rob_bone_data->object_bone_count) - printf("Matrix2 mismatch\n"); + printf_debug("Matrix2 mismatch\n"); if (ik_bone_count != rob_bone_data->ik_bone_count) - printf("LeafPos mismatch\n"); + printf_debug("LeafPos mismatch\n"); if (chain_pos != rob_bone_data->chain_pos) - printf("ChainPos mismatch\n"); + printf_debug("ChainPos mismatch\n"); } static void rob_chara_bone_data_set_parent_mats(rob_chara_bone_data* rob_bone_data, @@ -1234,12 +1234,12 @@ static void bone_data_mult_0(bone_data* a1, int32_t skeleton_select) { mat = mat4_identity; if (a1->type == BONE_DATABASE_BONE_POSITION) { - mat4_translate_mult(&mat, a1->trans.x, a1->trans.y, a1->trans.z, &mat); + mat4_translate_mult(&mat, &a1->trans, &mat); a1->rot_mat[0] = mat4_identity; } else if (a1->type == BONE_DATABASE_BONE_TYPE_1) { mat4_mult_vec3_inv_trans(&mat, &a1->trans, &a1->trans); - mat4_translate_mult(&mat, a1->trans.x, a1->trans.y, a1->trans.z, &mat); + mat4_translate_mult(&mat, &a1->trans, &mat); a1->rot_mat[0] = mat4_identity; } else { @@ -1264,7 +1264,7 @@ static void bone_data_mult_0(bone_data* a1, int32_t skeleton_select) { } mat4_rotate_x_mult(&rot_mat, a1->rotation.x, &rot_mat); - mat4_translate_mult(&mat, a1->trans.x, a1->trans.y, a1->trans.z, &mat); + mat4_translate_mult(&mat, &a1->trans, &mat); mat4_mult(&rot_mat, &mat, &mat); mat4_transpose(&rot_mat, &a1->rot_mat[0]); } @@ -1286,16 +1286,15 @@ void bone_data_mult_1(bone_data* a1, mat4* parent_mat, bone_data* a3, bool a4) { if (a1->type != BONE_DATABASE_BONE_POSITION_ROTATION) a1->trans = a1->base_translation[1]; - mat4_translate_mult(&mat, a1->trans.x, a1->trans.y, a1->trans.z, &mat); + mat4_translate_mult(&mat, &a1->trans, &mat); if (a4) { - a1->node[0].exp_data.rotation = vec3_null; + a1->node[0].exp_data.rotation = 0.0f; if (!a1->flags) { mat4_transpose(&a1->rot_mat[0], &rot_mat); mat4_get_rotation(&rot_mat, &a1->node[0].exp_data.rotation); } else if (bone_data_mult_1_exp_data(a1, &a1->node[0].exp_data, a3)) { - vec3 rotation = a1->node[0].exp_data.rotation; - mat4_rotate(rotation.x, rotation.y, rotation.z, &rot_mat); + mat4_rotate(&a1->node[0].exp_data.rotation, &rot_mat); mat4_transpose(&rot_mat, &a1->rot_mat[0]); } else { @@ -1320,9 +1319,9 @@ void bone_data_mult_1(bone_data* a1, mat4* parent_mat, bone_data* a3, bool a4) { } else { - mat4_translate_mult(&mat, a1->trans.x, a1->trans.y, a1->trans.z, &mat); + mat4_translate_mult(&mat, &a1->trans, &mat); if (a4) - a1->node[0].exp_data.rotation = vec3_null; + a1->node[0].exp_data.rotation = 0.0f; } mat4_transpose(&mat, a1->node[0].mat); @@ -1344,7 +1343,7 @@ void bone_data_mult_1(bone_data* a1, mat4* parent_mat, bone_data* a3, bool a4) { if (!a4) return; - a1->node[1].exp_data.position = vec3_null; + a1->node[1].exp_data.position = 0.0f; mat4_transpose(&a1->rot_mat[1], &rot_mat); mat4_get_rotation(&rot_mat, &a1->node[1].exp_data.rotation); bone_node_expression_data_reset_scale(&a1->node[1].exp_data); @@ -1360,12 +1359,12 @@ void bone_data_mult_1(bone_data* a1, mat4* parent_mat, bone_data* a3, bool a4) { if (!a4) return; - a1->node[1].exp_data.position = vec3_null; + a1->node[1].exp_data.position = 0.0f; mat4_transpose(&a1->rot_mat[1], &rot_mat); mat4_get_rotation(&rot_mat, &a1->node[1].exp_data.rotation); bone_node_expression_data_reset_scale(&a1->node[1].exp_data); a1->node[2].exp_data.position.x = a1->ik_segment_length[1]; - *(vec2*)&a1->node[2].exp_data.position.y = vec2_null; + *(vec2*)&a1->node[2].exp_data.position.y = 0.0f; mat4_transpose(&a1->rot_mat[2], &rot_mat); mat4_get_rotation(&rot_mat, &a1->node[2].exp_data.rotation); bone_node_expression_data_reset_scale(&a1->node[2].exp_data); @@ -1398,7 +1397,7 @@ static void sub_14040FBF0(motion_blend_mot* a1, float_t a2) { bone_data* b_kg_hara_y = &a1->bone_data.bones.begin[MOTION_BONE_KG_HARA_Y]; bone_data* b_kl_hara_xz = &a1->bone_data.bones.begin[MOTION_BONE_KL_HARA_XZ]; bone_data* b_kl_hara_etc = &a1->bone_data.bones.begin[MOTION_BONE_KL_HARA_ETC]; - a1->field_4F8.field_90 = vec3_null; + a1->field_4F8.field_90 = 0.0f; mat4 rot_mat; mat4 mat; @@ -1544,7 +1543,7 @@ static void sub_1404182B0(rob_chara_bone_data* rob_bone_data) { v3->field_4F8.field_9C = b_n_hara_cp->trans; if (v3->field_4F8.field_0 & 2) { v3->field_4F8.field_90 = b_n_hara_cp->trans; - b_n_hara_cp->trans = vec3_null; + b_n_hara_cp->trans = 0.0f; } } @@ -1937,7 +1936,7 @@ static void rob_chara_motion_reset(rob_chara_motion* a1) { parts_adjust->enable = false; parts_adjust->frame = 0.0f; parts_adjust->transition_frame = 0.0f; - parts_adjust->curr_external_force = vec3_null; + parts_adjust->curr_external_force = 0.0f; parts_adjust->curr_force = 1.0f; parts_adjust->curr_strength = 1.0f; parts_adjust->motion_id = -1; @@ -1946,9 +1945,9 @@ static void rob_chara_motion_reset(rob_chara_motion* a1) { parts_adjust->type = 6; parts_adjust->cycle_type = 0; parts_adjust->ignore_gravity = false; - parts_adjust->external_force = vec3_null; - parts_adjust->external_force_cycle_strength = vec3_null; - parts_adjust->external_force_cycle = vec3_null; + parts_adjust->external_force = 0.0f; + parts_adjust->external_force_cycle_strength = 0.0f; + parts_adjust->external_force_cycle = 0.0f; parts_adjust->cycle = 1.0f; parts_adjust->phase = 0.0f; parts_adjust->force = 1.0f; @@ -1957,7 +1956,7 @@ static void rob_chara_motion_reset(rob_chara_motion* a1) { parts_adjust_prev->enable = false; parts_adjust_prev->frame = 0.0f; parts_adjust_prev->transition_frame = 0.0f; - parts_adjust_prev->curr_external_force = vec3_null; + parts_adjust_prev->curr_external_force = 0.0f; parts_adjust_prev->curr_force = 1.0f; parts_adjust_prev->curr_strength = 1.0f; parts_adjust_prev->motion_id = -1; @@ -1966,9 +1965,9 @@ static void rob_chara_motion_reset(rob_chara_motion* a1) { parts_adjust_prev->type = 6; parts_adjust_prev->cycle_type = 0; parts_adjust_prev->ignore_gravity = false; - parts_adjust_prev->external_force = vec3_null; - parts_adjust_prev->external_force_cycle_strength = vec3_null; - parts_adjust_prev->external_force_cycle = vec3_null; + parts_adjust_prev->external_force = 0.0f; + parts_adjust_prev->external_force_cycle_strength = 0.0f; + parts_adjust_prev->external_force_cycle = 0.0f; parts_adjust_prev->cycle = 1.0f; parts_adjust_prev->phase = 0.0f; parts_adjust_prev->force = 1.0f; @@ -1986,7 +1985,7 @@ static void rob_chara_motion_reset(rob_chara_motion* a1) { v7->enable = false; v7->frame = 0.0f; v7->transition_frame = 0.0f; - v7->curr_external_force = vec3_null; + v7->curr_external_force = 0.0f; v7->curr_force = 1.0f; v7->curr_strength = 1.0f; v7->motion_id = -1; @@ -1995,9 +1994,9 @@ static void rob_chara_motion_reset(rob_chara_motion* a1) { v7->type = 6; v7->cycle_type = 0; v7->ignore_gravity = false; - v7->external_force = vec3_null; - v7->external_force_cycle_strength = vec3_null; - v7->external_force_cycle = vec3_null; + v7->external_force = 0.0f; + v7->external_force_cycle_strength = 0.0f; + v7->external_force_cycle = 0.0f; v7->cycle = 1.0f; v7->phase = 0.0f; v7->force = 1.0f; @@ -2022,8 +2021,8 @@ static void rob_chara_motion_reset(rob_chara_motion* a1) { hand_adjust->disable_x = false; hand_adjust->disable_y = false; hand_adjust->disable_z = false; - hand_adjust->offset = vec3_null; - hand_adjust->field_30 = vec3_null; + hand_adjust->offset = 0.0f; + hand_adjust->field_30 = 0.0f; hand_adjust->arm_length = 0; hand_adjust_prev->enable = false; hand_adjust_prev->scale_select = 0; @@ -2038,8 +2037,8 @@ static void rob_chara_motion_reset(rob_chara_motion* a1) { hand_adjust_prev->disable_x = false; hand_adjust_prev->disable_y = false; hand_adjust_prev->disable_z = false; - hand_adjust_prev->offset = vec3_null; - hand_adjust_prev->field_30 = vec3_null; + hand_adjust_prev->offset = 0.0f; + hand_adjust_prev->field_30 = 0.0f; hand_adjust_prev->arm_length = 0; v7++; v8++; @@ -2114,8 +2113,8 @@ static void bone_data_parent_reset(bone_data_parent* a1) { a1->field_8 = false; a1->field_9 = false; a1->motion_bone_count = 0; - a1->global_trans = vec3_null; - a1->global_rotation = vec3_null; + a1->global_trans = 0.0f; + a1->global_rotation = 0.0f; a1->ik_bone_count = 0; a1->chain_pos = 0; a1->bone_key_set_count = 0; @@ -2134,14 +2133,14 @@ static void sub_140413470(struc_308* a1) { a1->field_8C = false; a1->rot_y = 0.0f; a1->prev_rot_y = 0.0f; - a1->field_90 = vec3_identity; - a1->field_9C = vec3_identity; - a1->field_A8 = vec3_identity; + a1->field_90 = 1.0f; + a1->field_9C = 1.0f; + a1->field_A8 = 1.0f; a1->field_BC = 0; a1->field_BD = 0; a1->field_C0 = 1.0f; a1->field_C4 = 1.0f; - a1->field_C8 = vec3_null; + a1->field_C8 = 0.0f; } static void motion_blend_mot_reset(motion_blend_mot* a1) { @@ -2254,8 +2253,8 @@ static void sub_1404198D0(struc_258* a1) { a1->field_A8 = 0; a1->field_AC = 0; a1->field_B0 = 0.0f; - a1->field_B4 = vec3_null; - a1->field_C0 = vec3_null; + a1->field_B4 = 0.0f; + a1->field_C0 = 0.0f; a1->field_CC = mat4_identity; a1->field_10C = mat4_identity; a1->field_14C = 0; @@ -2287,7 +2286,7 @@ static void sub_1404198D0(struc_258* a1) { a1->field_1B4 = 0; a1->field_1B8 = 0; a1->field_1C8 = 0; - a1->field_1BC = vec2_identity; + a1->field_1BC = 1.0f; a1->field_1C4 = 0; } @@ -2299,7 +2298,7 @@ static void sub_1403FAEF0(struc_312* a1) { a1->field_0.field_10 = 0; a1->field_0.field_14 = 0; a1->field_0.field_18 = 0; - a1->field_0.field_1C = vec3_null; + a1->field_0.field_1C = 0.0f; a1->field_0.field_28 = 0; a1->field_2C.field_0 = 0; a1->field_2C.field_4 = 0; @@ -2308,16 +2307,16 @@ static void sub_1403FAEF0(struc_312* a1) { a1->field_2C.field_10 = 0; a1->field_2C.field_14 = 0; a1->field_2C.field_18 = 0; - a1->field_2C.field_1C = vec3_null; + a1->field_2C.field_1C = 0.0f; a1->field_2C.field_28 = 0; a1->field_58 = 0; a1->field_8C = 1.0f; a1->bones = 0; a1->step = 1.0f; - a1->field_5C = vec3_null; - a1->field_68 = vec3_null; - a1->field_74 = vec3_null; - a1->field_80 = vec3_null; + a1->field_5C = 0.0f; + a1->field_68 = 0.0f; + a1->field_74 = 0.0f; + a1->field_80 = 0.0f; } static void rob_chara_bone_data_reset(rob_chara_bone_data* rob_bone_data) { @@ -2365,8 +2364,8 @@ static void rob_chara_bone_data_reset(rob_chara_bone_data* rob_bone_data) { rob_bone_data->ik_scale.ratio1 = 1.0f; rob_bone_data->ik_scale.ratio2 = 1.0f; rob_bone_data->ik_scale.ratio3 = 1.0f; - rob_bone_data->field_76C = vec3_null; - rob_bone_data->field_778 = vec3_null; + rob_bone_data->field_76C = 0.0f; + rob_bone_data->field_778 = 0.0f; sub_1404198D0(&rob_bone_data->field_788); sub_1403FAEF0(&rob_bone_data->field_958); } @@ -2535,12 +2534,12 @@ static bool motion_blend_mot_interpolate_get_reverse(int32_t* a1) { static void sub_140415430(motion_blend_mot* a1) { float_t rot_y = a1->bone_data.rot_y; - vec3 global_trans = a1->bone_data.global_trans; - vec3 global_rotation = a1->bone_data.global_rotation; + vec3& global_trans = a1->bone_data.global_trans; + vec3& global_rotation = a1->bone_data.global_rotation; mat4 mat; mat4_rotate_y(rot_y, &mat); - mat4_translate_mult(&mat, global_trans.x, global_trans.y, global_trans.z, &mat); - mat4_rotate_mult(&mat, global_rotation.x, global_rotation.y, global_rotation.z, &mat); + mat4_translate_mult(&mat, &global_trans, &mat); + mat4_rotate_mult(&mat, &global_rotation, &mat); for (bone_data* i = a1->bone_data.bones.begin; i != a1->bone_data.bones.end; i++) switch (i->type) { case BONE_DATABASE_BONE_TYPE_1: @@ -2983,7 +2982,7 @@ static void sub_140412BB0(motion_blend_mot* a1, vector_old_bone_data* a2) { static void sub_1403FBF10(MotionBlend* a1, float_t a2) { a1->blend = clamp_def(a2, 0.0f, 1.0f); - a1->field_8 = 1; + a1->enable = true; a1->rot_y = true; } @@ -3322,14 +3321,14 @@ static void rob_chara_bone_data_set_rot_y(rob_chara_bone_data* rob_bone_data, fl static void sub_1403FBED0(MotionBlend* a1, float_t duration, float_t step, float_t offset) { if (duration < 0.0f) { - a1->field_8 = false; + a1->enable = false; a1->duration = 0.0f; a1->frame = 0.0f; a1->step = step; a1->offset = offset; } else { - a1->field_8 = true; + a1->enable = true; a1->duration = duration; a1->frame = 0.0f; a1->step = step; @@ -3539,7 +3538,7 @@ static void rob_chara_bone_data_get_ik_scale(rob_chara_bone_data* a1) { float_t ratio0 = a1->ik_scale.ratio0; v2->field_4F8.field_C0 = ratio0; v2->field_4F8.field_C4 = ratio0; - v2->field_4F8.field_C8 = vec3_null; + v2->field_4F8.field_C8 = 0.0f; } static float_t rob_chara_bone_data_get_ik_scale_ratio0(rob_chara_bone_data* a1) { @@ -3717,23 +3716,23 @@ static void rob_osage_node_init(rob_osage_node* node) { void (*sub_14021DCC0)(vector_old_opd_vec3_data * vec, size_t size) = (void (*)(vector_old_opd_vec3_data*, size_t))0x000000014021DCC0; node->length = 0.0f; - node->trans = vec3_null; - node->trans_orig = vec3_null; - node->trans_diff = vec3_null; - node->field_28 = vec3_null; + node->trans = 0.0f; + node->trans_orig = 0.0f; + node->trans_diff = 0.0f; + node->field_28 = 0.0f; node->child_length = 0.0f; node->bone_node_ptr = 0; node->bone_node_mat = 0; node->sibling_node = 0; node->distance = 0.0f; - node->field_94 = vec3_null; - node->reset_data.trans = vec3_null; - node->reset_data.trans_diff = vec3_null; - node->reset_data.rotation = vec3_null; + node->field_94 = 0.0f; + node->reset_data.trans = 0.0f; + node->reset_data.trans_diff = 0.0f; + node->reset_data.rotation = 0.0f; node->reset_data.length = 0.0f; node->field_C8 = 0.0f; node->field_CC = 1.0f; - node->external_force = vec3_null; + node->external_force = 0.0f; node->force = 1.0f; rob_osage_node_data_init(&node->data); node->data_ptr = &node->data; @@ -3756,7 +3755,7 @@ static void rob_osage_init(rob_osage* rob_osg) { vector_old_rob_osage_node_clear(&rob_osg->nodes, rob_osg->nodes.begin, rob_osg->nodes.end); rob_osg->nodes.end = rob_osg->nodes.begin; rob_osage_node_init(&rob_osg->node); - rob_osg->wind_direction = vec3_null; + rob_osg->wind_direction = 0.0f; rob_osg->field_1EB4 = 0.0f; rob_osg->yz_order = 0; rob_osg->field_2A0 = true; @@ -3787,7 +3786,7 @@ static void rob_osage_init(rob_osage* rob_osg) { rob_osg->field_2A4 = 0.0f; rob_osg->field_2A1 = 0; rob_osg->set_external_force = false; - rob_osg->external_force = vec3_null; + rob_osg->external_force = 0.0f; rob_osg->parent_mat_ptr = 0; rob_osg->parent_mat = mat4_null; } @@ -3898,18 +3897,15 @@ static void sub_14047EE90(rob_osage* rob_osg, mat4* mat) { static void sub_14047F110(rob_osage* rob_osg, mat4* mat, vec3* parent_scale, bool init_rot) { mat4_transpose(mat, mat); - vec3 position; - vec3_mult(rob_osg->exp_data.position, *parent_scale, position); - mat4_translate_mult(mat, position.x, position.y, position.z, mat); - - vec3 rotation = rob_osg->exp_data.rotation; - mat4_rotate_mult(mat, rotation.x, rotation.y, rotation.z, mat); + vec3 position = rob_osg->exp_data.position * *parent_scale; + mat4_translate_mult(mat, &position, mat); + mat4_rotate_mult(mat, &rob_osg->exp_data.rotation, mat); skin_param* skin_param = rob_osg->skin_param_ptr; vec3 rot = skin_param->rot; if (init_rot) - vec3_add(rot, skin_param->init_rot, rot); - mat4_rotate_mult(mat, rot.x, rot.y, rot.z, mat); + rot = skin_param->init_rot + rot; + mat4_rotate_mult(mat, &rot, mat); mat4_transpose(mat, mat); } @@ -4058,7 +4054,7 @@ static void rob_osage_set_wind_direction(rob_osage* osg_block_data, vec3* wind_d if (wind_direction) osg_block_data->wind_direction = *wind_direction; else - osg_block_data->wind_direction = vec3_null; + osg_block_data->wind_direction = 0.0f; } static void ExOsageBlock__SetWindDirection(ExOsageBlock* osg) { @@ -4126,7 +4122,7 @@ static void sub_140482180(rob_osage_node* node, float_t a2) { vec3_normalize(v3, v3); vec3_mult_scalar(v3, node->length, v3); vec3_add(node[-1].trans, v3, node->trans); - node->trans_diff = vec3_null; + node->trans_diff = 0.0f; node->field_C8 += 1.0f; } @@ -4545,7 +4541,7 @@ static int32_t sub_140485000(vec3* a1, vec3* a2, skin_param_osage_node* a3, osag int32_t v8 = 0; while (a4->type) { int32_t type = a4->type; - vec3 v21 = vec3_null; + vec3 v21 = 0.0f; switch (a4->type) { case 1: { vec3 v22 = a4->bone0_pos; @@ -4600,9 +4596,9 @@ static void osage_coli_ring_set(osage_coli* osg_coli, vector_old_skin_param_osag if (vec_skp_root_coli->begin == vec_skp_root_coli->end) { osg_coli->type = 0; osg_coli->radius = 0.0f; - osg_coli->bone0_pos = vec3_null; - osg_coli->bone1_pos = vec3_null; - osg_coli->bone_pos_diff = vec3_null; + osg_coli->bone0_pos = 0.0f; + osg_coli->bone1_pos = 0.0f; + osg_coli->bone_pos_diff = 0.0f; osg_coli->bone_pos_diff_length = 0.0f; osg_coli->bone_pos_diff_length_squared = 0.0f; osg_coli->field_34 = 1.0f; @@ -4649,9 +4645,9 @@ static int32_t sub_140483B30(vec3* a1, vec3* a2, osage_coli* a3, float_t radius) return 0; } - vec3 v28 = vec3_null; - vec3 v32 = vec3_null; - vec3 v27 = vec3_identity; + vec3 v28 = 0.0f; + vec3 v32 = 0.0f; + vec3 v27 = 1.0f; float_t v16 = 0.0f; for (int32_t i = 0; i < 3; i++) { @@ -4703,7 +4699,7 @@ static int32_t sub_140485220(vec3* a1, skin_param_osage_node* a2, osage_coli* co int32_t v8 = 0; for (osage_coli* v9 = coli; v9->type; v9++) { int32_t v11 = 0; - vec3 v31 = vec3_null; + vec3 v31 = 0.0f; switch (v9->type) { case 1: v11 = sub_140483DE0(&v31, a1, &v9->bone0_pos, v9->radius + a2->coli_r); @@ -4850,7 +4846,7 @@ static void sub_14047D8C0(rob_osage* rob_osg, mat4* mat, vec3* parent_scale, flo rob_osage_node* v27 = rob_osg->nodes.begin + 1; for (rob_osage_node* v25 = rob_osg->nodes.begin + 1; v25 != rob_osg->nodes.end; v25++, v27++) { - vec3 v62 = vec3_null; + vec3 v62 = 0.0f; for (rob_osage_node* v30 = v24->begin + 1; v30 != v26; v30++) sub_140483DE0(&v62, &v27->trans, &v30->trans, v27->data_ptr->skp_osg_node.coli_r + v30->data_ptr->skp_osg_node.coli_r); @@ -4885,7 +4881,7 @@ static void sub_14047D8C0(rob_osage* rob_osg, mat4* mat, vec3* parent_scale, flo if (v35->bone_node_mat) { mat4* v41 = v35->bone_node_mat; - mat4_scale_rot(&v64, parent_scale->x, parent_scale->y, parent_scale->z, v41); + mat4_scale_rot(&v64, parent_scale, v41); mat4_transpose(v41, v41); } @@ -4933,7 +4929,7 @@ static void sub_14047D8C0(rob_osage* rob_osg, mat4* mat, vec3* parent_scale, flo mat4_transpose(&v65, &v65); *rob_osg->node.bone_node_ptr->ex_data_mat = v65; mat4_transpose(&v65, &v65); - mat4_scale_rot(&v65, parent_scale->x, parent_scale->y, parent_scale->z, &v65); + mat4_scale_rot(&v65, parent_scale, &v65); mat4_transpose(&v65, &v65); *rob_osg->node.bone_node_mat = v65; rob_osg->node.bone_node_ptr->exp_data.parent_scale = *parent_scale; @@ -4945,7 +4941,7 @@ static void sub_140480F40(rob_osage* rob_osg, vec3* external_force, float_t a3) if (external_force) v4 = *external_force; else - v4 = vec3_null; + v4 = 0.0f; ssize_t v7 = rob_osg->osage_setting.parts; ssize_t v8 = 0; @@ -4977,7 +4973,7 @@ static void sub_140480260(rob_osage* rob_osg, mat4* mat, vec3* parent_scale, flo sub_140480F40(rob_osg, 0, 1.0f); rob_osage_set_nodes_force(rob_osg, 1.0f); rob_osg->set_external_force = false; - rob_osg->external_force = vec3_null; + rob_osg->external_force = 0.0f; } for (rob_osage_node* v6 = rob_osg->nodes.begin; v6 != rob_osg->nodes.end; v6++) { @@ -5063,9 +5059,9 @@ void ExOsageBlock__Field_20(ExOsageBlock* osg) { mat4 mat = *parent_node->ex_data_mat; if (scale.x != 1.0f || scale.y != 1.0f || scale.z != 1.0f) { - vec3_div(vec3_identity, scale, scale); + vec3_div(1.0f, scale, scale); mat4_transpose(&mat, &mat); - mat4_scale_rot(&mat, scale.x, scale.y, scale.z, &mat); + mat4_scale_rot(&mat, &scale, &mat); mat4_transpose(&mat, &mat); } ExOsageBlock__SetWindDirection(osg); @@ -5091,19 +5087,19 @@ void sub_140482100(struc_476* a1, opd_blend_data* a2, struc_477* a3) { sub_140482DF0(&a1->field_0, &a1->field_0, a3, a2->blend); } -void sub_14047E240(rob_osage* rob_osg, mat4* a2, vec3* a3, vector_old_opd_blend_data* a4) { +void sub_14047E240(rob_osage* rob_osg, mat4* a2, vec3* parent_scale, vector_old_opd_blend_data* a4) { if (!vector_old_length(*a4)) return; vec3 v63; - vec3_mult(rob_osg->exp_data.position, *a3, v63); + vec3_mult(rob_osg->exp_data.position, *parent_scale, v63); mat4 v85; mat4_transpose(a2, &v85); mat4_mult_vec3_trans(&v85, &v63, &rob_osg->nodes.begin[0].trans); mat4_transpose(&v85, &v85); - sub_14047F110(rob_osg, &v85, a3, 0); + sub_14047F110(rob_osg, &v85, parent_scale, 0); *rob_osg->nodes.begin[0].bone_node_mat = v85; *rob_osg->nodes.begin[0].bone_node_ptr->ex_data_mat = v85; mat4_transpose(&v85, &v85); @@ -5163,7 +5159,7 @@ void sub_14047E240(rob_osage* rob_osg, mat4* a2, vec3* a3, vector_old_opd_blend_ mat4_mult_vec3_inv_trans(&v87, &v82, &v86); mat4_transpose(&v87, &v87); - vec3 v64 = vec3_null; + vec3 v64 = 0.0f; sub_140482FF0(&v87, &v86, 0, &v64, &rob_osg->yz_order); mat4_transpose(&v87, &v87); mat4_set_translation(&v87, &v82); @@ -5193,12 +5189,12 @@ void sub_14047E240(rob_osage* rob_osg, mat4* a2, vec3* a3, vector_old_opd_blend_ mat4_rotate_z_mult(&v85, v55, &v85); mat4_rotate_y_mult(&v85, v54, &v85); mat4_transpose(&v85, &v85); - i->bone_node_ptr->exp_data.parent_scale = *a3; + i->bone_node_ptr->exp_data.parent_scale = *parent_scale; *i->bone_node_ptr->ex_data_mat = v85; mat4_transpose(&v85, &v85); if (i->bone_node_mat) { mat4 mat = v85; - mat4_scale_rot(&mat, a3->x, a3->y, a3->z, &mat); + mat4_scale_rot(&mat, parent_scale, &mat); mat4_transpose(&mat, i->bone_node_mat); } mat4_translate_mult(&v85, i->field_1B0.field_0.length, 0.0f, 0.0f, &v85); @@ -5209,15 +5205,15 @@ void sub_14047E240(rob_osage* rob_osg, mat4* a2, vec3* a3, vector_old_opd_blend_ if (vector_old_length(rob_osg->nodes) && rob_osg->node.bone_node_mat) { mat4 v87 = *rob_osg->nodes.end[-1].bone_node_ptr->ex_data_mat; mat4_transpose(&v87, &v87); - mat4_translate_mult(&v87, rob_osg->node.length * a3->x, 0.0f, 0.0f, &v87); + mat4_translate_mult(&v87, rob_osg->node.length * parent_scale->x, 0.0f, 0.0f, &v87); mat4_transpose(&v87, &v87); *rob_osg->node.bone_node_ptr->ex_data_mat = v87; mat4_transpose(&v87, &v87); - mat4_scale_rot(&v87, a3->x, a3->y, a3->z, &v87); + mat4_scale_rot(&v87, parent_scale, &v87); mat4_transpose(&v87, &v87); *rob_osg->node.bone_node_mat = v87; - rob_osg->node.bone_node_ptr->exp_data.parent_scale = *a3; + rob_osg->node.bone_node_ptr->exp_data.parent_scale = *parent_scale; } } @@ -5338,7 +5334,7 @@ void sub_14053CE30(rob_osage_node_data_normal_ref* normal_ref, mat4* a2) { } } -void sub_14047E1C0(rob_osage* rob_osg, vec3* a2) { +void sub_14047E1C0(rob_osage* rob_osg, vec3* parent_scale) { for (rob_osage_node* i = rob_osg->nodes.begin + 1; i != rob_osg->nodes.end; ++i) { if (!i->data_ptr->normal_ref.field_0) continue; @@ -5347,7 +5343,7 @@ void sub_14047E1C0(rob_osage* rob_osg, vec3* a2) { mat4 mat; mat4_transpose(i->bone_node_mat, &mat); - mat4_scale_rot(&mat, a2->x, a2->y, a2->z, &mat); + mat4_scale_rot(&mat, parent_scale, &mat); mat4_transpose(&mat, i->bone_node_mat); } } diff --git a/src/DivaGL/bone_data.hpp b/src/DivaGL/bone_data.hpp index 27fae10d..65884467 100644 --- a/src/DivaGL/bone_data.hpp +++ b/src/DivaGL/bone_data.hpp @@ -2708,7 +2708,7 @@ struct /*VFT*/ MotionBlend_vtbl { struct MotionBlend { MotionBlend_vtbl* __vftable; - bool field_8; + bool enable; bool rot_y; float_t duration; float_t frame; diff --git a/src/DivaGL/dllmain.cpp b/src/DivaGL/dllmain.cpp index d3cde5b4..f8098278 100644 --- a/src/DivaGL/dllmain.cpp +++ b/src/DivaGL/dllmain.cpp @@ -17,12 +17,6 @@ bool APIENTRY DllMain(HMODULE handle, DWORD ul_reason_for_call, LPVOID lpReserve printf_divagl("Patching memory"); inject_patches(); break; - - case DLL_PROCESS_DETACH: - printf_divagl("Detach"); - printf_divagl("Restore memory"); - inject_restore(); - break; } return true; } diff --git a/src/DivaGL/inject.cpp b/src/DivaGL/inject.cpp index 2a8131ce..6d172b1e 100644 --- a/src/DivaGL/inject.cpp +++ b/src/DivaGL/inject.cpp @@ -10,56 +10,44 @@ #include "shader_table.hpp" #include -typedef struct patch_struct { +struct patch_struct { void* address; size_t func_ptr; - void* orig_data; -} patch_struct; +}; -void* inject_data(void* address, void* data, size_t count) { +void inject_data(void* address, void* data, size_t count) { DWORD old_protect; VirtualProtect(address, count, PAGE_EXECUTE_READWRITE, &old_protect); - void* orig_data = force_malloc(count); - memcpy(orig_data, (const void*)address, count); - memcpy(address, (const void*)data, count); + memmove(address, data, count); VirtualProtect(address, count, old_protect, &old_protect); - return orig_data; } -uint8_t inject_uint8_t(void* address, uint8_t data) { +void inject_uint8_t(void* address, uint8_t data) { DWORD old_protect; VirtualProtect(address, sizeof(uint8_t), PAGE_EXECUTE_READWRITE, &old_protect); - uint8_t value = *(uint8_t*)address; *(uint8_t*)address = data; VirtualProtect(address, sizeof(uint8_t), old_protect, &old_protect); - return value; } -uint16_t inject_uint16_t(void* address, uint16_t data) { +void inject_uint16_t(void* address, uint16_t data) { DWORD old_protect; VirtualProtect(address, sizeof(uint16_t), PAGE_EXECUTE_READWRITE, &old_protect); - uint16_t value = *(uint16_t*)address; *(uint16_t*)address = data; VirtualProtect(address, sizeof(uint16_t), old_protect, &old_protect); - return value; } -uint32_t inject_uint32_t(void* address, uint32_t data) { +void inject_uint32_t(void* address, uint32_t data) { DWORD old_protect; VirtualProtect(address, sizeof(uint32_t), PAGE_EXECUTE_READWRITE, &old_protect); - uint32_t value = *(uint32_t*)address; *(uint32_t*)address = data; VirtualProtect(address, sizeof(uint32_t), old_protect, &old_protect); - return value; } -uint64_t inject_uint64_t(void* address, uint64_t data) { +void inject_uint64_t(void* address, uint64_t data) { DWORD old_protect; VirtualProtect(address, sizeof(uint64_t), PAGE_EXECUTE_READWRITE, &old_protect); - uint64_t value = *(uint64_t*)address; *(uint64_t*)address = data; VirtualProtect(address, sizeof(uint64_t), old_protect, &old_protect); - return value; } static patch_struct patch_data[] = { @@ -89,8 +77,6 @@ static patch_struct patch_data[] = { //{ (void*)0x00000001405F48F0, (uint64_t)&ExOsageBlock__Field_58, }, }; -static uint64_t shader_bind_func_orig_data[6]; - void inject_patches() { uint8_t buf[12]; buf[0] = 0x48; @@ -100,36 +86,17 @@ void inject_patches() { for (int32_t i = 0; i < sizeof(patch_data) / sizeof(patch_struct); i++) if (patch_data[i].func_ptr) { - free_def(patch_data[i].orig_data); memcpy(&buf[2], &patch_data[i].func_ptr, sizeof(uint64_t)); - patch_data[i].orig_data = inject_data(patch_data[i].address, buf, 12); + inject_data(patch_data[i].address, buf, 12); } - glutMainLoop = (void (*)())inject_uint64_t((void*)0x0000000140966008, (uint64_t)&gl_get_func_pointers); + glutMainLoop = (void (FASTCALL*)())*(size_t*)0x0000000140966008; + inject_uint64_t((void*)0x0000000140966008, (uint64_t)&gl_get_func_pointers); - shader_bind_func_orig_data[0] = inject_uint64_t( - (void*)&shader_name_bind_func_table[0].bind_func, (uint64_t)&shader_bind_blinn); - shader_bind_func_orig_data[1] = inject_uint64_t( - (void*)&shader_name_bind_func_table[1].bind_func, (uint64_t)&shader_bind_cloth); - shader_bind_func_orig_data[2] = inject_uint64_t( - (void*)&shader_name_bind_func_table[2].bind_func, (uint64_t)&shader_bind_hair); - shader_bind_func_orig_data[3] = inject_uint64_t( - (void*)&shader_name_bind_func_table[3].bind_func, (uint64_t)&shader_bind_membrane); - shader_bind_func_orig_data[4] = inject_uint64_t( - (void*)&shader_name_bind_func_table[4].bind_func, (uint64_t)&shader_bind_eye_ball); - shader_bind_func_orig_data[5] = inject_uint64_t( - (void*)&shader_name_bind_func_table[5].bind_func, (uint64_t)&shader_bind_tone_map); -} - -void inject_restore() { - for (int32_t i = 0; i < sizeof(patch_data) / sizeof(patch_struct); i++) - if (patch_data[i].func_ptr) { - void* data = inject_data(patch_data[i].address, patch_data[i].orig_data, 12); - free_def(data); - } - - inject_uint64_t((void*)0x0000000140966008, (uint64_t)glutMainLoop); - - for (int32_t i = 0; i < 6; i++) - inject_uint64_t(shader_name_bind_func_table[i].bind_func, shader_bind_func_orig_data[i]); + inject_uint64_t((void*)&shader_name_bind_func_table[0].bind_func, (uint64_t)&shader_bind_blinn); + inject_uint64_t((void*)&shader_name_bind_func_table[1].bind_func, (uint64_t)&shader_bind_cloth); + inject_uint64_t((void*)&shader_name_bind_func_table[2].bind_func, (uint64_t)&shader_bind_hair); + inject_uint64_t((void*)&shader_name_bind_func_table[3].bind_func, (uint64_t)&shader_bind_membrane); + inject_uint64_t((void*)&shader_name_bind_func_table[4].bind_func, (uint64_t)&shader_bind_eye_ball); + inject_uint64_t((void*)&shader_name_bind_func_table[5].bind_func, (uint64_t)&shader_bind_tone_map); } diff --git a/src/DivaGL/inject.hpp b/src/DivaGL/inject.hpp index 00c7c9e5..fc0d0cb8 100644 --- a/src/DivaGL/inject.hpp +++ b/src/DivaGL/inject.hpp @@ -7,10 +7,9 @@ #include "../KKdLib/default.hpp" -extern void* inject_data(void* address, void* data, size_t count); -extern uint8_t inject_uint8_t(void* address, uint8_t data); -extern uint16_t inject_uint16_t(void* address, uint16_t data); -extern uint32_t inject_uint32_t(void* address, uint32_t data); -extern uint64_t inject_uint64_t(void* address, uint64_t data); +extern void inject_data(void* address, const void* data, size_t count); +extern void inject_uint8_t(void* address, uint8_t data); +extern void inject_uint16_t(void* address, uint16_t data); +extern void inject_uint32_t(void* address, uint32_t data); +extern void inject_uint64_t(void* address, uint64_t data); extern void inject_patches(); -extern void inject_restore(); diff --git a/src/DivaGL/shader_table.hpp b/src/DivaGL/shader_table.hpp index 36335c50..960511c5 100644 --- a/src/DivaGL/shader_table.hpp +++ b/src/DivaGL/shader_table.hpp @@ -199,13 +199,13 @@ extern shader_bind_func* shader_name_bind_func_table; extern int32_t* current_vp; extern int32_t* current_fp; -extern void FASTCALL shader_set(shader_enum name); // 0x00000001405E4CE0 -extern void FASTCALL shader_bind_blinn(shader* shader); // 0x00000001405E4320 -extern void FASTCALL shader_bind_cloth(shader* shader); // 0x00000001405E4340 -extern void FASTCALL shader_bind_hair(shader* shader); // 0x00000001405E4370 -extern void FASTCALL shader_bind_membrane(shader* shader); // 0x00000001405E43A0 -extern void FASTCALL shader_bind_eye_ball(shader* shader); // 0x00000001405E4530 -extern void FASTCALL shader_bind_tone_map(shader* shader); // 0x00000001405E4580 -extern int32_t FASTCALL shader_bind(shader* shader, shader_sub_enum name); // 0x00000001405E4B50 -extern void FASTCALL shader_unbind(); // 0x00000001405E5660 -extern void FASTCALL shader_load_all_shaders(); // 0x00000001405E4FC0 +extern void FASTCALL shader_set(shader_enum name); // 0x00000001405E4CE0 +extern void FASTCALL shader_bind_blinn(shader* shader); // 0x00000001405E4320 +extern void FASTCALL shader_bind_cloth(shader* shader); // 0x00000001405E4340 +extern void FASTCALL shader_bind_hair(shader* shader); // 0x00000001405E4370 +extern void FASTCALL shader_bind_membrane(shader* shader); // 0x00000001405E43A0 +extern void FASTCALL shader_bind_eye_ball(shader* shader); // 0x00000001405E4530 +extern void FASTCALL shader_bind_tone_map(shader* shader); // 0x00000001405E4580 +extern int32_t FASTCALL shader_bind(shader* shader, shader_sub_enum name); // 0x00000001405E4B50 +extern void FASTCALL shader_unbind(); // 0x00000001405E5660 +extern void FASTCALL shader_load_all_shaders(); // 0x00000001405E4FC0 diff --git a/src/DivaGL/string.cpp b/src/DivaGL/string.cpp index a5426289..81278a29 100644 --- a/src/DivaGL/string.cpp +++ b/src/DivaGL/string.cpp @@ -129,8 +129,7 @@ inline void string_replace_wstring(wstring* src, string* dst) { inline bool string_compare(string* str0, string* str1) { if (str0->length != str1->length) return false; - return !memcmp(string_data(str0), string_data(str1), - str0->length) ? true : false; + return !memcmp(string_data(str0), string_data(str1), str0->length); } inline void string_free(string* s) { @@ -238,8 +237,7 @@ inline void wstring_replace_string(string* src, wstring* dst) { inline bool wstring_compare(wstring* str0, wstring* str1) { if (str0->length != str1->length) return false; - return !memcmp(wstring_data(str0), wstring_data(str1), - sizeof(wchar_t) * str0->length) ? true : false; + return !memcmp(wstring_data(str0), wstring_data(str1), sizeof(wchar_t) * str0->length); } inline void wstring_free(wstring* s) { diff --git a/src/KKdLib/a3da.cpp b/src/KKdLib/a3da.cpp index f47fddae..a5cf13b4 100644 --- a/src/KKdLib/a3da.cpp +++ b/src/KKdLib/a3da.cpp @@ -176,7 +176,9 @@ bool a3da::load_file(void* data, const char* path, const char* file, uint32_t ha if (t) file_len = t - file; - std::string s = path + std::string(file, file_len); + std::string s; + s.assign(path); + s.append(file, file_len); a3da* a = (a3da*)data; a->read(s.c_str()); @@ -387,8 +389,7 @@ a3da_post_process::~a3da_post_process() { } static void a3da_read_inner(a3da* a, stream& s) { - a3dc_header header; - memset(&header, 0, sizeof(a3dc_header)); + a3dc_header header = {}; a->format = A3DA_FORMAT_F; uint32_t signature = s.read_uint32_t(); @@ -487,8 +488,7 @@ static void a3da_write_inner(a3da* a, stream& s) { } if (a3dc) { - a3dc_header header; - memset(&header, 0, sizeof(a3dc_header)); + a3dc_header header = {}; header.string_offset = (uint32_t)0x40; header.string_length = (uint32_t)a3da_data_length; @@ -740,7 +740,7 @@ static void a3da_read_text(a3da* a, void* data, size_t size) { kv.read("clip_end", e->clip_end); kv.read("end", e->end); kv.read("name", e->name); - kv.read("param1", e->param_1); + kv.read("param1", e->param1); kv.read("ref", e->ref); kv.read("time_ref_scale", e->time_ref_scale); @@ -1321,7 +1321,7 @@ static void a3da_write_text(a3da* a, void** data, size_t* size, bool a3dc) { kv.write(s, "clip_en", e->clip_end); kv.write(s, "end", e->end); kv.write(s, "name", e->name); - kv.write(s, "param1", e->param_1); + kv.write(s, "param1", e->param1); kv.write(s, "ref", e->ref); kv.write(s, "time_ref_scale", e->time_ref_scale); kv.write(s, "type", e->type); @@ -2883,8 +2883,7 @@ static void a3dc_write_a3da_key_f16(stream& s, a3da_key& value, a3da_compress_f1 uint32_t len = (uint32_t)value.keys.size(); - a3dc_key_header head; - memset(&head, 0, sizeof(a3dc_key_header)); + a3dc_key_header head = {}; head.type = value.type; head.ep_type_pre = value.ep_type_pre; head.ep_type_post = value.ep_type_post; diff --git a/src/KKdLib/a3da.hpp b/src/KKdLib/a3da.hpp index 69e75a21..f7d83d87 100644 --- a/src/KKdLib/a3da.hpp +++ b/src/KKdLib/a3da.hpp @@ -301,7 +301,7 @@ struct a3da_event { float_t clip_end; float_t end; std::string name; - std::string param_1; + std::string param1; std::string ref; float_t time_ref_scale; a3da_event_type type; diff --git a/src/KKdLib/alloc_data.cpp b/src/KKdLib/alloc_data.cpp new file mode 100644 index 00000000..e1fc3c45 --- /dev/null +++ b/src/KKdLib/alloc_data.cpp @@ -0,0 +1,84 @@ +/* + by korenkonder + GitHub/GitLab: korenkonder +*/ + +#include "alloc_data.hpp" + +alloc_data::alloc_data() : next() { + size = 4000; +} + +alloc_data::~alloc_data() { + deallocate(); +} + +void* alloc_data::allocate(size_t size) { + alloc_node* node = next; + size = max_def(size, 1); + size = (size + 7) / 8 * 8; + + bool allocate = true; + if (node) { + alloc_node* last_node = 0; + while (node) { + if ((size_t)(node->capacity - node->size) >= size) + last_node = node; + node = node->next; + } + + if (last_node) { + node = last_node; + allocate = false; + } + else + node = next; + } + + if (allocate) { + size_t data_size = this->size; + size_t _size = size + sizeof(alloc_node); + size_t mults = 0; + while (data_size < _size) { + data_size *= 2; + if (data_size >= _size) + break; + + mults++; + data_size *= 2; + + if (mults >= 16) { + if (data_size < _size) + return 0; + break; + } + } + + alloc_node* new_node = (alloc_node*)malloc(data_size); + if (!new_node) + return 0; + + next = new_node; + + new_node->next = node; + new_node->size = 0; + new_node->capacity = data_size - sizeof(alloc_node); + node = new_node; + } + + uint8_t* data = node->data + node->size; + memset(data, 0, size); + node->size += size; + return data; +} + +void alloc_data::deallocate() { + alloc_node* node = next; + while (node) { + alloc_node* next_node = node->next; + free(node); + node = next_node; + } + + next = 0; +} diff --git a/src/KKdLib/alloc_data.hpp b/src/KKdLib/alloc_data.hpp new file mode 100644 index 00000000..17215ec7 --- /dev/null +++ b/src/KKdLib/alloc_data.hpp @@ -0,0 +1,37 @@ +/* + by korenkonder + GitHub/GitLab: korenkonder +*/ + +#pragma once + +#include "default.hpp" + +struct alloc_node { + alloc_node* next; + size_t size; + size_t capacity; +#pragma warning(suppress: 4200) + uint8_t data[]; +}; + +struct alloc_data { + size_t size; + alloc_node* next; + + alloc_data(); + ~alloc_data(); + + void* allocate(size_t size); + void deallocate(); + + template + inline T* allocate() { + return new((T*)allocate(sizeof(T))) T; + } + + template + inline T* allocate(size_t size) { + return new((T*)allocate(sizeof(T) * size)) T; + } +}; diff --git a/src/KKdLib/database/auth_3d.cpp b/src/KKdLib/database/auth_3d.cpp index c1f3fe7b..66270702 100644 --- a/src/KKdLib/database/auth_3d.cpp +++ b/src/KKdLib/database/auth_3d.cpp @@ -108,7 +108,9 @@ bool auth_3d_database_file::load_file(void* data, const char* path, const char* if (t) file_len = t - file; - std::string s = path + std::string(file, file_len); + std::string s; + s.assign(path); + s.append(file, file_len); auth_3d_database_file* auth_3d_db = (auth_3d_database_file*)data; auth_3d_db->read(s.c_str()); diff --git a/src/KKdLib/database/auth_3d.hpp b/src/KKdLib/database/auth_3d.hpp index e250fbe4..33d15305 100644 --- a/src/KKdLib/database/auth_3d.hpp +++ b/src/KKdLib/database/auth_3d.hpp @@ -55,7 +55,7 @@ struct auth_3d_database_file { int32_t uid_max; auth_3d_database_file(); - virtual ~auth_3d_database_file(); + ~auth_3d_database_file(); void read(const char* path); void read(const wchar_t* path); @@ -72,7 +72,7 @@ struct auth_3d_database { std::vector uid; auth_3d_database(); - virtual ~auth_3d_database(); + ~auth_3d_database(); void add(auth_3d_database_file* auth_3d_db_file, bool mdata); int32_t get_category_index(const char* name); diff --git a/src/KKdLib/database/bone.cpp b/src/KKdLib/database/bone.cpp index 48f82b8d..b910a321 100644 --- a/src/KKdLib/database/bone.cpp +++ b/src/KKdLib/database/bone.cpp @@ -362,7 +362,9 @@ bool bone_database::load_file(void* data, const char* path, const char* file, ui if (t) file_len = t - file; - std::string s = path + std::string(file, file_len); + std::string s; + s.assign(path); + s.append(file, file_len); bone_database* bone_data = (bone_database*)data; bone_data->read(s.c_str(), bone_data->modern); diff --git a/src/KKdLib/database/bone.hpp b/src/KKdLib/database/bone.hpp index 89bdcdec..78e75631 100644 --- a/src/KKdLib/database/bone.hpp +++ b/src/KKdLib/database/bone.hpp @@ -70,7 +70,7 @@ struct bone_database { std::vector skeleton; bone_database(); - virtual ~bone_database(); + ~bone_database(); void read(const char* path, bool modern); void read(const wchar_t* path, bool modern); diff --git a/src/KKdLib/database/item_table.cpp b/src/KKdLib/database/item_table.cpp index 4461bc1b..2d7fd82c 100644 --- a/src/KKdLib/database/item_table.cpp +++ b/src/KKdLib/database/item_table.cpp @@ -158,7 +158,9 @@ bool itm_table::load_file(void* data, const char* path, const char* file, uint32 if (t) file_len = t - file; - std::string s = path + std::string(file, file_len); + std::string s; + s.assign(path); + s.append(file, file_len); itm_table* itm_tbl = (itm_table*)data; itm_tbl->read(s.c_str()); diff --git a/src/KKdLib/database/item_table.hpp b/src/KKdLib/database/item_table.hpp index bd933699..c5bfb9b0 100644 --- a/src/KKdLib/database/item_table.hpp +++ b/src/KKdLib/database/item_table.hpp @@ -183,7 +183,7 @@ struct itm_table { std::vector dbgset; itm_table(); - virtual ~itm_table(); + ~itm_table(); void read(const char* path); void read(const wchar_t* path); diff --git a/src/KKdLib/database/motion.cpp b/src/KKdLib/database/motion.cpp index d618405b..b45d04c7 100644 --- a/src/KKdLib/database/motion.cpp +++ b/src/KKdLib/database/motion.cpp @@ -120,7 +120,9 @@ bool motion_database_file::load_file(void* data, const char* path, const char* f if (t) file_len = t - file; - std::string s = path + std::string(file, file_len); + std::string s; + s.assign(path); + s.append(file, file_len); motion_database_file* mot_db = (motion_database_file*)data; mot_db->read(s.c_str()); diff --git a/src/KKdLib/database/motion.hpp b/src/KKdLib/database/motion.hpp index db631648..89b791f1 100644 --- a/src/KKdLib/database/motion.hpp +++ b/src/KKdLib/database/motion.hpp @@ -52,7 +52,7 @@ struct motion_database_file { std::vector motion_set; motion_database_file(); - virtual ~motion_database_file(); + ~motion_database_file(); void read(const char* path); void read(const wchar_t* path); @@ -69,7 +69,7 @@ struct motion_database { std::vector motion_set; motion_database(); - virtual ~motion_database(); + ~motion_database(); void add(motion_database_file* mot_db_file); diff --git a/src/KKdLib/database/object.cpp b/src/KKdLib/database/object.cpp index 2b5961a3..2f939c38 100644 --- a/src/KKdLib/database/object.cpp +++ b/src/KKdLib/database/object.cpp @@ -229,7 +229,9 @@ bool object_database_file::load_file(void* data, const char* path, const char* f if (t) file_len = t - file; - std::string s = path + std::string(file, file_len); + std::string s; + s.assign(path); + s.append(file, file_len); object_database_file* obj_db = (object_database_file*)data; obj_db->read(s.c_str(), obj_db->modern); diff --git a/src/KKdLib/database/object.hpp b/src/KKdLib/database/object.hpp index 45a7515f..106a658d 100644 --- a/src/KKdLib/database/object.hpp +++ b/src/KKdLib/database/object.hpp @@ -8,6 +8,7 @@ #include #include #include "../default.hpp" +#include "../hash.hpp" struct object_info { uint32_t id; @@ -17,6 +18,8 @@ struct object_info { object_info(uint32_t id, uint32_t set_id); bool is_null(); bool not_null(); + bool is_null_modern(); + bool not_null_modern(); }; inline bool object_info::is_null() { @@ -27,6 +30,18 @@ inline bool object_info::not_null() { return id != (uint32_t)-1 || set_id != (uint32_t)-1; } +inline bool object_info::is_null_modern() { + return id == (uint32_t)-1 && set_id == (uint32_t)-1 + || id == hash_murmurhash_empty || id == hash_murmurhash_null + || set_id == hash_murmurhash_empty || set_id == hash_murmurhash_null; +} + +inline bool object_info::not_null_modern() { + return id != (uint32_t)-1 || set_id != (uint32_t)-1 + || (id != hash_murmurhash_empty && id != hash_murmurhash_null + && set_id != hash_murmurhash_empty && set_id != hash_murmurhash_null); +} + inline bool operator >(const object_info& left, const object_info& right) { return left.set_id > right.set_id && left.id > right.id; } @@ -104,7 +119,7 @@ struct object_database_file { std::vector object_set; object_database_file(); - virtual ~object_database_file(); + ~object_database_file(); void read(const char* path, bool modern); void read(const wchar_t* path, bool modern); @@ -120,7 +135,7 @@ struct object_database { std::vector object_set; object_database(); - virtual ~object_database(); + ~object_database(); void add(object_database_file* obj_db_file); diff --git a/src/KKdLib/database/sprite.cpp b/src/KKdLib/database/sprite.cpp index 740f5a34..87df1c38 100644 --- a/src/KKdLib/database/sprite.cpp +++ b/src/KKdLib/database/sprite.cpp @@ -235,7 +235,9 @@ bool sprite_database_file::load_file(void* data, const char* path, const char* f if (t) file_len = t - file; - std::string s = path + std::string(file, file_len); + std::string s; + s.assign(path); + s.append(file, file_len); sprite_database_file* spr_db = (sprite_database_file*)data; spr_db->read(s.c_str(), spr_db->modern); diff --git a/src/KKdLib/database/sprite.hpp b/src/KKdLib/database/sprite.hpp index 996f9248..82b7be35 100644 --- a/src/KKdLib/database/sprite.hpp +++ b/src/KKdLib/database/sprite.hpp @@ -82,7 +82,7 @@ struct sprite_database_file { std::vector sprite_set; sprite_database_file(); - virtual ~sprite_database_file(); + ~sprite_database_file(); void read(const char* path, bool modern); void read(const wchar_t* path, bool modern); @@ -98,7 +98,7 @@ struct sprite_database { std::vector sprite_set; sprite_database(); - virtual ~sprite_database(); + ~sprite_database(); void add(sprite_database_file* spr_db_file); }; diff --git a/src/KKdLib/database/stage.cpp b/src/KKdLib/database/stage.cpp index 6847b182..d1d7de58 100644 --- a/src/KKdLib/database/stage.cpp +++ b/src/KKdLib/database/stage.cpp @@ -16,10 +16,23 @@ static void stage_database_file_classic_write_inner(stage_database_file* stage_d static void stage_database_file_modern_read_inner(stage_database_file* stage_data, stream& s, uint32_t header_length); static void stage_database_file_modern_write_inner(stage_database_file* stage_data, stream& s); +const stage_effects stage_effects_default; +const stage_effects_modern stage_effects_modern_default; + +stage_effects::stage_effects() : field_0(), field_20() { + field_0[0] = -1; + field_20[0] = -1; +} + +stage_effects_modern::stage_effects_modern() { + field_0[0] = -1; + field_20[0] = -1; +} + stage_data_file::stage_data_file() : id(), object_set_id(), lens_flare_texture(), lens_shaft_texture(), lens_ghost_texture(), unknown(), render_texture(), movie_texture(), reflect_type(), refract_enable(), reflect(), reflect_data(), refract(), refract_data(), flags(), ring_rectangle_x(), ring_rectangle_y(), -ring_rectangle_width(), ring_rectangle_height(), ring_height(), ring_out_height(), effects() { +ring_rectangle_width(), ring_rectangle_height(), ring_height(), ring_out_height(), effects_init() { lens_shaft_inv_scale = 1.0f; } @@ -31,7 +44,7 @@ stage_data_modern_file::stage_data_modern_file() : unknown(), render_texture(), render_texture_flag(), movie_texture(), movie_texture_flag(), field_04(), field_04_flag(), field_05(), field_05_flag(), field_06(), field_06_flag(), field_07(), field_07_flag(), field_08(), field_09(), field_10(), field_11(), field_12(), ring_rectangle_x(), ring_rectangle_y(), ring_rectangle_width(), -ring_rectangle_height(), ring_height(), ring_out_height(), field_13(), effects() { +ring_rectangle_height(), ring_height(), ring_out_height(), field_13(), effects_init() { hash = hash_murmurhash_empty; lens_shaft_inv_scale = 1.0f; } @@ -43,7 +56,7 @@ stage_data_modern_file::~stage_data_modern_file() { stage_data::stage_data() : id(), object_set_id(), lens_flare_texture(), lens_shaft_texture(), lens_ghost_texture(), unknown(), render_texture(), movie_texture(), reflect_type(), refract_enable(), reflect(), reflect_data(), refract(), refract_data(), flags(), ring_rectangle_x(), ring_rectangle_y(), -ring_rectangle_width(), ring_rectangle_height(), ring_height(), ring_out_height(), effects() { +ring_rectangle_width(), ring_rectangle_height(), ring_height(), ring_out_height(), effects_init() { name_hash = hash_murmurhash_empty; lens_shaft_inv_scale = 1.0f; } @@ -56,7 +69,7 @@ stage_data_modern::stage_data_modern() : unknown(), render_texture(), render_texture_flag(), movie_texture(), movie_texture_flag(), field_04(), field_04_flag(), field_05(), field_05_flag(), field_06(), field_06_flag(), field_07(), field_07_flag(), field_08(), field_09(), field_10(), field_11(), field_12(), ring_rectangle_x(), ring_rectangle_y(), ring_rectangle_width(), -ring_rectangle_height(), ring_height(), ring_out_height(), field_13(), effects() { +ring_rectangle_height(), ring_height(), ring_out_height(), field_13(), effects_init() { hash = hash_murmurhash_empty; auth_3d_name_hash = hash_murmurhash_empty; lens_shaft_inv_scale = 1.0f; @@ -232,7 +245,9 @@ bool stage_database_file::load_file(void* data, const char* path, const char* fi if (t) file_len = t - file; - std::string s = path + std::string(file, file_len); + std::string s; + s.assign(path); + s.append(file, file_len); stage_database_file* stage_data = (stage_database_file*)data; stage_data->read(s.c_str(), stage_data->modern); @@ -271,9 +286,9 @@ void stage_database::add(stage_database_file* stage_data_file) { } data->id = i.id; - data->name = i.name; + data->name.assign(i.name); data->name_hash = hash_string_murmurhash(data->name); - data->auth_3d_name = i.auth_3d_name; + data->auth_3d_name.assign(i.auth_3d_name); data->object_set_id = i.object_set_id; data->object_ground = i.object_ground; data->object_ring = i.object_ring; @@ -303,7 +318,8 @@ void stage_database::add(stage_database_file* stage_data_file) { data->ring_height = i.ring_height; data->ring_out_height = i.ring_out_height; data->effects = i.effects; - data->auth_3d_ids = i.auth_3d_ids; + data->effects_init = i.effects_init; + data->auth_3d_ids.assign(i.auth_3d_ids.begin(), i.auth_3d_ids.end()); } for (stage_data_modern_file& i : stage_data_file->stage_modern) { @@ -322,8 +338,8 @@ void stage_database::add(stage_database_file* stage_data_file) { } data->hash = i.hash; - data->name = i.name; - data->auth_3d_name = i.auth_3d_name; + data->name.assign(i.name); + data->auth_3d_name.assign(i.auth_3d_name); data->auth_3d_name_hash = hash_string_murmurhash(data->auth_3d_name); data->object_ground = i.object_ground; data->object_sky = i.object_sky; @@ -355,8 +371,6 @@ void stage_database::add(stage_database_file* stage_data_file) { data->ring_rectangle_height = i.ring_rectangle_height; data->ring_height = i.ring_height; data->ring_out_height = i.ring_out_height; - data->effects = i.effects; - data->auth_3d_ids = i.auth_3d_ids; data->render_texture = i.render_texture; data->render_texture_flag = i.render_texture_flag; data->movie_texture = i.movie_texture; @@ -369,7 +383,8 @@ void stage_database::add(stage_database_file* stage_data_file) { data->ring_out_height = i.ring_out_height; data->field_13 = i.field_13; data->effects = i.effects; - data->auth_3d_ids = i.auth_3d_ids; + data->effects_init = i.effects_init; + data->auth_3d_ids.assign(i.auth_3d_ids.begin(), i.auth_3d_ids.end()); } } @@ -381,7 +396,7 @@ void stage_database::add(stage_database_file* stage_data_file) { ::stage_data_modern* stage_database::get_stage_data_modern(uint32_t stage_hash) { for (::stage_data_modern& i : stage_modern) - if (stage_hash == i.hash) + if (i.hash == stage_hash) return &i; return 0; } @@ -394,12 +409,25 @@ int32_t stage_database::get_stage_index(const char* name) { return -1; } +const char* stage_database::get_stage_name(int32_t stage_index) { + if (stage_index >= 0 && stage_index < stage_data.size()) + return stage_data[stage_index].name.c_str(); + return 0; +} + +const char* stage_database::get_stage_name_modern(uint32_t stage_hash) { + for (::stage_data_modern& i : stage_modern) + if (i.hash == stage_hash) + return i.name.c_str(); + return 0; +} + static void stage_database_file_classic_read_inner(stage_database_file* stage_data, stream& s) { int32_t count = s.read_int32_t(); int32_t stages_offset = s.read_int32_t(); int32_t stage_effects_offset = s.read_int32_t(); int32_t auth3d_id_counts_offset = s.read_int32_t(); - int32_t auth3d_ids_offsets_offset = s.read_int32_t(); + int32_t auth_3d_ids_offsets_offset = s.read_int32_t(); int32_t size = (stage_effects_offset - stages_offset) / count; stage_data->format = size == 104 ? STAGE_DATA_AC @@ -522,6 +550,7 @@ static void stage_database_file_classic_read_inner(stage_database_file* stage_da for (int32_t i = 0; i < count; i++) { stage_data_file* stage = &stage_data->stage_data[i]; stage_effects* effects = &stage->effects; + stage->effects_init = true; for (int32_t j = 0; j < 8; j++) effects->field_0[j] = s.read_uint32_t(); @@ -539,7 +568,7 @@ static void stage_database_file_classic_read_inner(stage_database_file* stage_da } s.position_pop(); - s.position_push(auth3d_ids_offsets_offset, SEEK_SET); + s.position_push(auth_3d_ids_offsets_offset, SEEK_SET); for (int32_t i = 0; i < count; i++) { stage_data_file* stage = &stage_data->stage_data[i]; @@ -647,7 +676,8 @@ static void stage_database_file_modern_read_inner(stage_database_file* stage_dat if (is_x) stage->field_13 = s.read_uint32_t_reverse_endianness(); - stage_effects* effects = &stage->effects; + stage_effects_modern* effects = &stage->effects; + stage->effects_init = true; for (int32_t j = 0; j < 8; j++) effects->field_0[j] = s.read_uint32_t_reverse_endianness(); @@ -658,20 +688,20 @@ static void stage_database_file_modern_read_inner(stage_database_file* stage_dat if (is_x) s.read_uint32_t_reverse_endianness(); - int32_t auth3d_ids_count = s.read_int32_t_reverse_endianness(); - int64_t auth3d_ids_offset = s.read_offset(header_length, is_x); + int32_t auth_3d_ids_count = s.read_int32_t_reverse_endianness(); + int64_t auth_3d_ids_offset = s.read_offset(header_length, is_x); if (is_x) s.read_uint32_t_reverse_endianness(); - if (!auth3d_ids_offset) { + if (!auth_3d_ids_offset) { stage->auth_3d_ids.clear(); stage->auth_3d_ids.shrink_to_fit(); continue; } - s.position_push(auth3d_ids_offset, SEEK_SET); - for (int32_t j = 0; j < auth3d_ids_count; j++) + s.position_push(auth_3d_ids_offset, SEEK_SET); + for (int32_t j = 0; j < auth_3d_ids_count; j++) if (s.read_uint32_t() == hash_murmurhash_empty) { stage->auth_3d_ids.resize(j); stage->auth_3d_ids.shrink_to_fit(); @@ -680,7 +710,7 @@ static void stage_database_file_modern_read_inner(stage_database_file* stage_dat s.position_pop(); if (stage->auth_3d_ids.size()) { - s.position_push(auth3d_ids_offset, SEEK_SET); + s.position_push(auth_3d_ids_offset, SEEK_SET); for (uint32_t& j : stage->auth_3d_ids) j = s.read_int32_t(); s.position_pop(); diff --git a/src/KKdLib/database/stage.hpp b/src/KKdLib/database/stage.hpp index b13826c0..0c691118 100644 --- a/src/KKdLib/database/stage.hpp +++ b/src/KKdLib/database/stage.hpp @@ -62,6 +62,15 @@ struct stage_data_refract { struct stage_effects { int32_t field_0[8]; int32_t field_20[16]; + + stage_effects(); +}; + +struct stage_effects_modern { + uint32_t field_0[8]; + int32_t field_20[16]; + + stage_effects_modern(); }; struct stage_data_file { @@ -97,6 +106,7 @@ struct stage_data_file { float_t ring_height; float_t ring_out_height; stage_effects effects; + bool effects_init; std::vector auth_3d_ids; stage_data_file(); @@ -138,7 +148,8 @@ struct stage_data_modern_file { float_t ring_height; float_t ring_out_height; uint32_t field_13; - stage_effects effects; + stage_effects_modern effects; + bool effects_init; std::vector auth_3d_ids; stage_data_modern_file(); @@ -179,6 +190,7 @@ struct stage_data { float_t ring_height; float_t ring_out_height; stage_effects effects; + bool effects_init; std::vector auth_3d_ids; stage_data(); @@ -221,7 +233,8 @@ struct stage_data_modern { float_t ring_height; float_t ring_out_height; uint32_t field_13; - stage_effects effects; + stage_effects_modern effects; + bool effects_init; std::vector auth_3d_ids; stage_data_modern(); @@ -239,7 +252,7 @@ struct stage_database_file { std::vector stage_modern; stage_database_file(); - virtual ~stage_database_file(); + ~stage_database_file(); void read(const char* path, bool modern); void read(const wchar_t* path, bool modern); @@ -256,11 +269,16 @@ struct stage_database { std::vector stage_modern; stage_database(); - virtual ~stage_database(); + ~stage_database(); void add(stage_database_file* stage_data_file); ::stage_data* get_stage_data(int32_t stage_index); ::stage_data_modern* get_stage_data_modern(uint32_t stage_hash); int32_t get_stage_index(const char* name); + const char* get_stage_name(int32_t stage_index); + const char* get_stage_name_modern(uint32_t stage_hash); }; + +extern const stage_effects stage_effects_default; +extern const stage_effects_modern stage_effects_modern_default; diff --git a/src/KKdLib/database/texture.cpp b/src/KKdLib/database/texture.cpp index 189dd541..4a7e3184 100644 --- a/src/KKdLib/database/texture.cpp +++ b/src/KKdLib/database/texture.cpp @@ -203,7 +203,9 @@ bool texture_database_file::load_file(void* data, const char* path, const char* if (t) file_len = t - file; - std::string s = path + std::string(file, file_len); + std::string s; + s.assign(path); + s.append(file, file_len); texture_database_file* tex_db = (texture_database_file*)data; tex_db->read(s.c_str(), tex_db->modern); diff --git a/src/KKdLib/database/texture.hpp b/src/KKdLib/database/texture.hpp index 84af7f8b..6321b507 100644 --- a/src/KKdLib/database/texture.hpp +++ b/src/KKdLib/database/texture.hpp @@ -35,7 +35,7 @@ struct texture_database_file { std::vector texture; texture_database_file(); - virtual ~texture_database_file(); + ~texture_database_file(); void read(const char* path, bool modern); void read(const wchar_t* path, bool modern); @@ -51,7 +51,7 @@ struct texture_database { std::vector texture; texture_database(); - virtual ~texture_database(); + ~texture_database(); void add(texture_database_file* tex_db_file); diff --git a/src/KKdLib/dds.cpp b/src/KKdLib/dds.cpp index 832824c5..39fae724 100644 --- a/src/KKdLib/dds.cpp +++ b/src/KKdLib/dds.cpp @@ -55,11 +55,11 @@ struct DDS_PIXELFORMAT { #define DDS_SURFACE_FLAGS_MIPMAP 0x00400008 // DDSCAPS_COMPLEX | DDSCAPS_MIPMAP #define DDS_SURFACE_FLAGS_cube_map 0x00000008 // DDSCAPS_COMPLEX -#define DDS_cube_map_ALLFACES ( 0x00000400 | 0x00000800 |\ +#define DDS_CUBE_MAP_ALLFACES ( 0x00000400 | 0x00000800 |\ 0x00001000 | 0x00002000 |\ 0x00004000 | 0x00008000 | 0x00000200 ) -#define DDS_cube_map 0x00000200 // DDSCAPS2_cube_map +#define DDS_CUBE_MAP 0x00000200 // DDSCAPS2_cube_map #define DDS_FLAGS_VOLUME 0x00200000 // DDSCAPS2_VOLUME @@ -187,19 +187,18 @@ void dds::read(const wchar_t* path) { if (s.read_uint32_t_reverse_endianness(true) != DDS_MAGIC) goto End; - DDS_HEADER dds_h; - memset(&dds_h, 0, sizeof(DDS_HEADER)); + DDS_HEADER dds_h = {}; if (s.read(&dds_h, sizeof(DDS_HEADER)) != sizeof(DDS_HEADER)) goto End; if (!((dds_h.flags & DDSD_CAPS) && (dds_h.flags & DDSD_HEIGHT) && (dds_h.flags & DDSD_WIDTH) && (dds_h.flags & DDSD_PIXELFORMAT))) goto End; - else if ((dds_h.flags & DDSD_PITCH) || (dds_h.flags & DDSD_DEPTH)) + else if (/*(dds_h.flags & DDSD_PITCH) || */(dds_h.flags & DDSD_DEPTH)) goto End; else if (!(dds_h.caps & DDS_SURFACE_FLAGS_TEXTURE)) goto End; - else if ((dds_h.caps2 & DDS_cube_map) && (~dds_h.caps2 & DDS_cube_map_ALLFACES) || (dds_h.flags & DDS_FLAGS_VOLUME)) + else if ((dds_h.caps2 & DDS_CUBE_MAP) && (~dds_h.caps2 & DDS_CUBE_MAP_ALLFACES) || (dds_h.flags & DDS_FLAGS_VOLUME)) goto End; bool reverse = false; @@ -263,7 +262,7 @@ void dds::read(const wchar_t* path) { width = dds_h.width; height = dds_h.height; mipmaps_count = dds_h.flags & DDSD_MIPMAPCOUNT ? dds_h.mipMapCount : 1; - has_cube_map = dds_h.caps2 & DDS_cube_map ? true : false; + has_cube_map = dds_h.caps2 & DDS_CUBE_MAP ? true : false; data.reserve(has_cube_map ? mipmaps_count * 6ULL : mipmaps_count); do @@ -303,8 +302,7 @@ void dds::write(const wchar_t* path) { file_stream s; s.open(path_dds, L"wb"); if (s.check_not_null()) { - DDS_HEADER dds_h; - memset(&dds_h, 0, sizeof(DDS_HEADER)); + DDS_HEADER dds_h = {}; dds_h.size = sizeof(DDS_HEADER); dds_h.flags = DDS_HEADER_FLAGS_TEXTURE | DDSD_LINEARSIZE; if (mipmaps_count > 1) @@ -321,7 +319,7 @@ void dds::write(const wchar_t* path) { dds_h.caps |= DDS_SURFACE_FLAGS_MIPMAP; if (has_cube_map) - dds_h.caps2 |= DDS_cube_map_ALLFACES; + dds_h.caps2 |= DDS_CUBE_MAP_ALLFACES; switch (format) { case TXP_A8: diff --git a/src/KKdLib/default.hpp b/src/KKdLib/default.hpp index ff9de82d..a25bae7c 100644 --- a/src/KKdLib/default.hpp +++ b/src/KKdLib/default.hpp @@ -292,6 +292,15 @@ inline double_t reverse_endianness_double_t(double_t value) { return *(double_t*)&v; } +inline void printf_debug(const char* fmt, ...) { +#ifdef DEBUG + va_list args; + va_start(args, fmt); + vprintf(fmt, args); + va_end(args); +#endif +} + inline constexpr size_t utf8_length(const char* s) { if (!s) return 0; diff --git a/src/KKdLib/dsc.cpp b/src/KKdLib/dsc.cpp index 84b879f2..4a8ecc43 100644 --- a/src/KKdLib/dsc.cpp +++ b/src/KKdLib/dsc.cpp @@ -3001,7 +3001,9 @@ int32_t dsc::calculate_target_flying_time(int32_t bpm, int32_t time_signature) { } bool dsc::load_file(void* data, const char* path, const char* file, uint32_t hash) { - std::string s = path + std::string(file); + std::string s; + s.assign(path); + s.append(file); file_stream dsc_s; dsc_s.open(s.c_str(), "rb"); diff --git a/src/KKdLib/f2/header.cpp b/src/KKdLib/f2/header.cpp index 9e64841b..36462c50 100644 --- a/src/KKdLib/f2/header.cpp +++ b/src/KKdLib/f2/header.cpp @@ -28,8 +28,7 @@ void f2_header_write_end_of_container(stream& s, uint32_t depth) { if (s.check_null()) return; - f2_header h; - memset(&h, 0, sizeof(f2_header)); + f2_header h = {}; h.signature = reverse_endianness_uint32_t('EOFC'); h.length = 0x20; h.depth = depth; diff --git a/src/KKdLib/f2/struct.cpp b/src/KKdLib/f2/struct.cpp index a94fa3dd..e3e5428c 100644 --- a/src/KKdLib/f2/struct.cpp +++ b/src/KKdLib/f2/struct.cpp @@ -220,8 +220,7 @@ static void f2_struct_write_inner(stream& s, f2_struct* st, uint32_t depth, bool static void f2_struct_write_pof(stream& s, pof* pof, uint32_t depth, bool shift_x) { size_t len = pof->length(shift_x); - f2_header h; - memset(&h, 0, sizeof(f2_header)); + f2_header h = {}; h.signature = shift_x ? reverse_endianness_uint32_t('POF1') : reverse_endianness_uint32_t('POF0'); h.length = 0x20; h.depth = depth; @@ -233,8 +232,7 @@ static void f2_struct_write_pof(stream& s, pof* pof, uint32_t depth, bool shift_ static void f2_struct_write_enrs(stream& s, enrs* enrs, uint32_t depth) { size_t len = enrs->length(); - f2_header h; - memset(&h, 0, sizeof(f2_header)); + f2_header h = {}; h.signature = reverse_endianness_uint32_t('ENRS'); h.length = 0x20; h.depth = depth; diff --git a/src/KKdLib/farc.cpp b/src/KKdLib/farc.cpp index 429a83b1..45082098 100644 --- a/src/KKdLib/farc.cpp +++ b/src/KKdLib/farc.cpp @@ -41,45 +41,71 @@ farc::~farc() { } -farc_file::farc_file() : offset(), size(), size_compressed(), -data(), data_compressed(), flags(), data_changed() { +farc_file* farc::add_file(const char* name) { + if (!name) + return 0; -} + uint64_t name_hash = hash_utf8_fnv1a64m(name, true); + for (farc_file& i : files) + if (hash_string_fnv1a64m(i.name, true) == name_hash) + return &i; -farc_file::~farc_file() { - free_def(data); - free_def(data_compressed); -} - -void farc::add_file(const char* name) { size_t files_count = files.size(); - void** data_temp = force_malloc_s(void*, files_count * 2); + void** data_temp = new void* [files_count]; + void** data_comp_temp = new void* [files_count]; + if (!data_temp || !data_comp_temp) { + if (data_temp) + delete[] data_temp; + if (data_comp_temp) + delete[] data_comp_temp; + return 0; + } + for (size_t i = 0; i < files_count; i++) { - data_temp[i * 2 + 0] = files[i].data; - data_temp[i * 2 + 1] = files[i].data_compressed; + data_temp[i] = files[i].data; + data_comp_temp[i] = files[i].data_compressed; files[i].data = 0; files[i].data_compressed = 0; } files.push_back({}); - if (name) - files.back().name = name; + files.back().name.assign(name); for (size_t i = 0; i < files_count; i++) { - files[i].data = data_temp[i * 2 + 0]; - files[i].data_compressed = data_temp[i * 2 + 1]; - data_temp[i * 2 + 0] = 0; - data_temp[i * 2 + 1] = 0; + files[i].data = data_temp[i]; + files[i].data_compressed = data_comp_temp[i]; + data_temp[i] = 0; + data_comp_temp[i] = 0; } - free_def(data_temp); + + delete[] data_temp; + delete[] data_comp_temp; + + return &files.back(); } -void farc::add_file(const wchar_t* name) { +farc_file* farc::add_file(const wchar_t* name) { + if (!name) + return 0; + + uint64_t name_hash = hash_utf16_fnv1a64m(name, true); + for (farc_file& i : files) + if (hash_string_fnv1a64m(i.name, true) == name_hash) + return &i; + size_t files_count = files.size(); - void** data_temp = force_malloc_s(void*, files_count * 2); + void** data_temp = new void* [files_count]; + void** data_comp_temp = new void* [files_count]; + if (!data_temp || !data_comp_temp) { + if (data_temp) + delete[] data_temp; + if (data_comp_temp) + delete[] data_comp_temp; + } + for (size_t i = 0; i < files_count; i++) { - data_temp[i * 2 + 0] = files[i].data; - data_temp[i * 2 + 1] = files[i].data_compressed; + data_temp[i] = files[i].data; + data_comp_temp[i] = files[i].data_compressed; files[i].data = 0; files[i].data_compressed = 0; } @@ -87,17 +113,21 @@ void farc::add_file(const wchar_t* name) { files.push_back({}); if (name) { char* name_temp = utf16_to_utf8(name); - files.back().name = name_temp; + files.back().name.assign(name_temp); free_def(name_temp); } for (size_t i = 0; i < files_count; i++) { - files[i].data = data_temp[i * 2 + 0]; - files[i].data_compressed = data_temp[i * 2 + 1]; - data_temp[i * 2 + 0] = 0; - data_temp[i * 2 + 1] = 0; + files[i].data = data_temp[i]; + files[i].data_compressed = data_comp_temp[i]; + data_temp[i] = 0; + data_comp_temp[i] = 0; } - free_def(data_temp); + + delete[] data_temp; + delete[] data_comp_temp; + + return &files.back(); } const char* farc::get_file_name(uint32_t hash) { @@ -121,9 +151,9 @@ size_t farc::get_file_size(const char* name) { if (!name) return 0; - uint32_t name_hash = hash_utf8_murmurhash(name); + uint64_t name_hash = hash_utf8_fnv1a64m(name, true); for (farc_file& i : files) - if (hash_string_murmurhash(i.name) == name_hash) + if (hash_string_fnv1a64m(i.name, true) == name_hash) return i.size; return 0; } @@ -132,20 +162,37 @@ size_t farc::get_file_size(const wchar_t* name) { if (!name) return 0; - uint32_t name_hash = hash_utf16_murmurhash(name); + uint64_t name_hash = hash_utf16_fnv1a64m(name, true); for (farc_file& i : files) - if (hash_string_murmurhash(i.name) == name_hash) + if (hash_string_fnv1a64m(i.name, true) == name_hash) return i.size; return 0; } +size_t farc::get_file_size(uint32_t hash) { + if (!hash || hash == hash_murmurhash_empty) + return 0; + + for (farc_file& i : files) { + const char* l_str = i.name.c_str(); + const char* t = strrchr(l_str, '.'); + size_t l_len = i.name.size(); + if (t) + l_len = t - l_str; + + if (hash_murmurhash(l_str, l_len) == hash) + return i.size; + } + return 0; +} + bool farc::has_file(const char* name) { if (!name) return false; - uint32_t name_hash = hash_utf8_murmurhash(name); + uint64_t name_hash = hash_utf8_fnv1a64m(name, true); for (farc_file& i : files) - if (hash_string_murmurhash(i.name) == name_hash) + if (hash_string_fnv1a64m(i.name, true) == name_hash) return true; return false; } @@ -154,9 +201,9 @@ bool farc::has_file(const wchar_t* name) { if (!name) return false; - uint32_t name_hash = hash_utf16_murmurhash(name); + uint64_t name_hash = hash_utf16_fnv1a64m(name, true); for (farc_file& i : files) - if (hash_string_murmurhash(i.name) == name_hash) + if (hash_string_fnv1a64m(i.name, true) == name_hash) return true; return false; } @@ -192,7 +239,6 @@ void farc::read(const wchar_t* path, bool unpack, bool save) { return; files.clear(); - files.shrink_to_fit(); wchar_t full_path_buf[MAX_PATH]; wchar_t* full_path = _wfullpath(full_path_buf, path, MAX_PATH); @@ -204,8 +250,8 @@ void farc::read(const wchar_t* path, bool unpack, bool save) { char* dir_temp = utf16_to_utf8(full_path_buf); size_t dir_temp_len = utf8_length(dir_temp); - file_path = std::string(dir_temp, dir_temp_len); - directory_path = std::string(dir_temp, dir_temp_len); + file_path.assign(dir_temp, dir_temp_len); + directory_path.assign(dir_temp, dir_temp_len); free_def(dir_temp); const char* dot = strrchr(directory_path.c_str(), '.'); @@ -223,10 +269,9 @@ void farc::read(const void* data, size_t size, bool unpack) { return; files.clear(); - files.shrink_to_fit(); + file_path.clear(); - file_path = {}; - directory_path = {}; + directory_path.clear(); memory_stream s; s.open(data, size); @@ -238,9 +283,9 @@ farc_file* farc::read_file(const char* name) { if (!name) return 0; - uint32_t name_hash = hash_utf8_murmurhash(name); + uint64_t name_hash = hash_utf8_fnv1a64m(name, true); for (farc_file& i : files) - if (hash_string_murmurhash(i.name) == name_hash) { + if (hash_string_fnv1a64m(i.name, true) == name_hash) { farc_unpack_file(this, &i); return &i; } @@ -251,9 +296,9 @@ farc_file* farc::read_file(const wchar_t* name) { if (!name) return 0; - uint32_t name_hash = hash_utf16_murmurhash(name); + uint64_t name_hash = hash_utf16_fnv1a64m(name, true); for (farc_file& i : files) - if (hash_string_murmurhash(i.name) == name_hash) { + if (hash_string_fnv1a64m(i.name, true) == name_hash) { farc_unpack_file(this, &i); return &i; } @@ -294,7 +339,6 @@ void farc::write(const wchar_t* path, farc_compress_mode mode, bool get_files) { if (get_files) { files.clear(); - files.shrink_to_fit(); } wchar_t full_path_buf[MAX_PATH]; @@ -307,9 +351,9 @@ void farc::write(const wchar_t* path, farc_compress_mode mode, bool get_files) { char* dir_temp = utf16_to_utf8(full_path_buf); size_t dir_temp_len = utf8_length(dir_temp); - directory_path = std::string(dir_temp, dir_temp_len); - file_path = std::string(dir_temp, dir_temp_len); - file_path += ".farc", 6; + directory_path.assign(dir_temp, dir_temp_len); + file_path.assign(dir_temp, dir_temp_len); + file_path.append(".farc", 5); free_def(dir_temp); if (!get_files || (get_files && !farc_get_files(this))) { @@ -324,8 +368,8 @@ void farc::write(void** data, size_t* size, farc_compress_mode mode) { if (!data || !size) return; - directory_path = {}; - file_path = {}; + directory_path.clear(); + file_path.clear(); memory_stream s; s.open(); @@ -334,7 +378,7 @@ void farc::write(void** data, size_t* size, farc_compress_mode mode) { bool farc::load_file(void* data, const char* path, const char* file, uint32_t hash) { size_t file_len = utf8_length(file); - if (file_len >= 5 && memcmp(&file[file_len - 5], ".farc", 6)) + if (file_len < 5 || memcmp(&file[file_len - 5], ".farc", 6)) return false; size_t path_len = utf8_length(path); @@ -652,7 +696,6 @@ static errno_t farc_read_header(farc* f, stream& s) { } f->files.clear(); - f->files.shrink_to_fit(); uint8_t* d_t; uint8_t* dt; diff --git a/src/KKdLib/farc.hpp b/src/KKdLib/farc.hpp index e3c5cac7..52922bed 100644 --- a/src/KKdLib/farc.hpp +++ b/src/KKdLib/farc.hpp @@ -39,8 +39,17 @@ struct farc_file { farc_flags flags; bool data_changed; - farc_file(); - ~farc_file(); + inline farc_file() : offset(), size(), size_compressed(), + data(), data_compressed(), flags(), data_changed() { + + } + + inline ~farc_file() { + if (data) + free(data); + if (data_compressed) + free(data_compressed); + } }; struct farc { @@ -56,11 +65,12 @@ struct farc { farc(); virtual ~farc(); - void add_file(const char* name = 0); - void add_file(const wchar_t* name); + farc_file* add_file(const char* name); + farc_file* add_file(const wchar_t* name); const char* get_file_name(uint32_t hash); size_t get_file_size(const char* name); size_t get_file_size(const wchar_t* name); + size_t get_file_size(uint32_t hash); bool has_file(const char* name); bool has_file(const wchar_t* name); bool has_file(uint32_t hash); diff --git a/src/KKdLib/hash.cpp b/src/KKdLib/hash.cpp index 743c2f39..67afb569 100644 --- a/src/KKdLib/hash.cpp +++ b/src/KKdLib/hash.cpp @@ -80,6 +80,30 @@ const char* string_hash::c_str() { return str.c_str(); } +void string_hash::assign(const char* str) { + this->str.assign(str); + this->hash_fnv1a64m = hash_string_fnv1a64m(this->str); + this->hash_murmurhash = hash_string_murmurhash(this->str); +} + +void string_hash::assign(std::string& str) { + this->str.assign(str); + this->hash_fnv1a64m = hash_string_fnv1a64m(this->str); + this->hash_murmurhash = hash_string_murmurhash(this->str); +} + +void string_hash::assign(std::string&& str) { + this->str.assign(str); + this->hash_fnv1a64m = hash_string_fnv1a64m(this->str); + this->hash_murmurhash = hash_string_murmurhash(this->str); +} + +void string_hash::assign(string_hash& str) { + this->str.assign(str.str); + this->hash_fnv1a64m = hash_string_fnv1a64m(this->str); + this->hash_murmurhash = hash_string_murmurhash(this->str); +} + // FNV 1a 64-bit Modified // 0x1403B04D0 in SBZV_7.10 uint64_t hash_fnv1a64m(const void* data, size_t size, bool make_upper) { @@ -87,10 +111,19 @@ uint64_t hash_fnv1a64m(const void* data, size_t size, bool make_upper) { uint64_t hash = 0xCBF29CE484222325; if (data) - for (size_t i = size; i; i--) { - hash ^= *d++; - hash *= 0x100000001B3; - } + if (make_upper) // Hash text UPPERCASE + for (size_t i = size; i; i--) { + uint8_t c = *d++; + if (c > 0x60 && c < 0x7B) + c -= 0x20; + hash ^= c; + hash *= 0x100000001B3; + } + else + for (size_t i = size; i; i--) { + hash ^= *d++; + hash *= 0x100000001B3; + } return (hash >> 32) ^ hash; // Actual Modification } diff --git a/src/KKdLib/hash.hpp b/src/KKdLib/hash.hpp index 6f4ea430..409917d0 100644 --- a/src/KKdLib/hash.hpp +++ b/src/KKdLib/hash.hpp @@ -29,6 +29,10 @@ struct string_hash { ~string_hash(); const char* c_str(); + void assign(const char* str); + void assign(std::string& str); + void assign(std::string&& str); + void assign(string_hash& str); }; extern uint64_t hash_fnv1a64m(const void* data, size_t size, bool make_upper = false); diff --git a/src/KKdLib/interpolation.hpp b/src/KKdLib/interpolation.hpp index e5f64b03..2b11c2a6 100644 --- a/src/KKdLib/interpolation.hpp +++ b/src/KKdLib/interpolation.hpp @@ -31,8 +31,7 @@ inline vec2 interpolate_linear_value(const vec2 p1, const vec2 p2, const __m128 _1 = vec4::load_xmm(1.0f); - __m128 df = _mm_sub_ps(_f2, _f1); - __m128 t = _mm_div_ps(_mm_sub_ps(_f, _f1), df); + __m128 t = _mm_div_ps(_mm_sub_ps(_f, _f1), _mm_sub_ps(_f2, _f1)); __m128 t1 = _mm_sub_ps(_1, t); return vec2::store_xmm(_mm_add_ps(_mm_mul_ps(_p1, t1), _mm_mul_ps(_p2, t))); } @@ -52,8 +51,7 @@ inline vec3 interpolate_linear_value(const vec3 p1, const vec3 p2, const __m128 _1 = vec4::load_xmm(1.0f); - __m128 df = _mm_sub_ps(_f2, _f1); - __m128 t = _mm_div_ps(_mm_sub_ps(_f, _f1), df); + __m128 t = _mm_div_ps(_mm_sub_ps(_f, _f1), _mm_sub_ps(_f2, _f1)); __m128 t1 = _mm_sub_ps(_1, t); return vec3::store_xmm(_mm_add_ps(_mm_mul_ps(_p1, t1), _mm_mul_ps(_p2, t))); } @@ -73,8 +71,7 @@ inline vec4 interpolate_linear_value(const vec4 p1, const vec4 p2, const __m128 _1 = vec4::load_xmm(1.0f); - __m128 df = _mm_sub_ps(_f2, _f1); - __m128 t = _mm_div_ps(_mm_sub_ps(_f, _f1), df); + __m128 t = _mm_div_ps(_mm_sub_ps(_f, _f1), _mm_sub_ps(_f2, _f1)); __m128 t1 = _mm_sub_ps(_1, t); return vec4::store_xmm(_mm_add_ps(_mm_mul_ps(_p1, t1), _mm_mul_ps(_p2, t))); } @@ -94,7 +91,7 @@ inline float_t interpolate_chs_value(const float_t p1, const float_t p2, float_t df = f - f1; float_t t = df / (f2 - f1); float_t t_1 = t - 1.0f; - return p1 + t * t * (3.0f - 2.0f * t) * (p2 - p1) + (t_1 * t1 + t * t2) * df * t_1; + return (t_1 * t1 + t * t2) * df * t_1 + t * t * (3.0f - 2.0f * t) * (p2 - p1) + p1; } inline vec2 interpolate_chs_value(const vec2 p1, const vec2 p2, @@ -124,7 +121,7 @@ inline vec2 interpolate_chs_value(const vec2 p1, const vec2 p2, __m128 delta = _mm_mul_ps(_mm_mul_ps(_mm_mul_ps(t, t), _mm_sub_ps(_3, _mm_mul_ps(_2, t))), _mm_sub_ps(_p2, _p1)); __m128 tangent = _mm_mul_ps(_mm_add_ps(_mm_mul_ps(t_1, _t1), _mm_mul_ps(t, _t2)), _mm_mul_ps(df, t_1)); - return vec2::store_xmm(_mm_add_ps(_mm_add_ps(_p1, delta), tangent)); + return vec2::store_xmm(_mm_add_ps(_mm_add_ps(tangent, delta), _p1)); } inline vec3 interpolate_chs_value(const vec3 p1, const vec3 p2, @@ -154,7 +151,7 @@ inline vec3 interpolate_chs_value(const vec3 p1, const vec3 p2, __m128 delta = _mm_mul_ps(_mm_mul_ps(_mm_mul_ps(t, t), _mm_sub_ps(_3, _mm_mul_ps(_2, t))), _mm_sub_ps(_p2, _p1)); __m128 tangent = _mm_mul_ps(_mm_add_ps(_mm_mul_ps(t_1, _t1), _mm_mul_ps(t, _t2)), _mm_mul_ps(df, t_1)); - return vec3::store_xmm(_mm_add_ps(_mm_add_ps(_p1, delta), tangent)); + return vec3::store_xmm(_mm_add_ps(_mm_add_ps(tangent, delta), _p1)); } inline vec4 interpolate_chs_value(const vec4 p1, const vec4 p2, @@ -184,7 +181,7 @@ inline vec4 interpolate_chs_value(const vec4 p1, const vec4 p2, __m128 delta = _mm_mul_ps(_mm_mul_ps(_mm_mul_ps(t, t), _mm_sub_ps(_3, _mm_mul_ps(_2, t))), _mm_sub_ps(_p2, _p1)); __m128 tangent = _mm_mul_ps(_mm_add_ps(_mm_mul_ps(t_1, _t1), _mm_mul_ps(t, _t2)), _mm_mul_ps(df, t_1)); - return vec4::store_xmm(_mm_add_ps(_mm_add_ps(_p1, delta), tangent)); + return vec4::store_xmm(_mm_add_ps(_mm_add_ps(tangent, delta), _p1)); } inline std::vector interpolate_chs(const float_t p1, const float_t p2, diff --git a/src/KKdLib/io/json.cpp b/src/KKdLib/io/json.cpp index 68585f37..a9ad49ed 100644 --- a/src/KKdLib/io/json.cpp +++ b/src/KKdLib/io/json.cpp @@ -525,10 +525,10 @@ inline static void io_json_write_inner(stream& s, msgpack* msg, size_t tabs) { case MSGPACK_UINT64: io_json_write_uint64_t(s, msg->data.u64); break; - case MSGPACK_FLOAT: + case MSGPACK_FLOAT32: io_json_write_float_t(s, msg->data.f32); break; - case MSGPACK_DOUBLE: + case MSGPACK_FLOAT64: io_json_write_double_t(s, msg->data.f64); break; case MSGPACK_STRING: diff --git a/src/KKdLib/io/msgpack.cpp b/src/KKdLib/io/msgpack.cpp index 54c1a528..0a104d99 100644 --- a/src/KKdLib/io/msgpack.cpp +++ b/src/KKdLib/io/msgpack.cpp @@ -226,10 +226,10 @@ inline static void io_msgpack_write_inner(stream& s, msgpack* msg) { case MSGPACK_UINT64: io_msgpack_write_uint64_t(s, msg->data.u64); break; - case MSGPACK_FLOAT: + case MSGPACK_FLOAT32: io_msgpack_write_float_t(s, msg->data.f32); break; - case MSGPACK_DOUBLE: + case MSGPACK_FLOAT64: io_msgpack_write_double_t(s, msg->data.f64); break; case MSGPACK_STRING: diff --git a/src/KKdLib/io/path.cpp b/src/KKdLib/io/path.cpp index 35afbfda..e3ac82eb 100644 --- a/src/KKdLib/io/path.cpp +++ b/src/KKdLib/io/path.cpp @@ -73,8 +73,7 @@ std::vector path_get_files(const char* path) { dir.push_back(L'*'); free_def(dir_temp); - WIN32_FIND_DATAW fdata; - memset(&fdata, 0, sizeof(WIN32_FIND_DATAW)); + WIN32_FIND_DATAW fdata = {}; HANDLE h = FindFirstFileW(dir.c_str(), &fdata); if (h == INVALID_HANDLE_VALUE) return {}; @@ -103,8 +102,7 @@ std::vector path_get_files(const wchar_t* path) { dir.push_back(L'\\'); dir.push_back(L'*'); - WIN32_FIND_DATAW fdata; - memset(&fdata, 0, sizeof(WIN32_FIND_DATAW)); + WIN32_FIND_DATAW fdata = {}; HANDLE h = FindFirstFileW(dir.c_str(), &fdata); if (h == INVALID_HANDLE_VALUE) return {}; @@ -136,8 +134,7 @@ std::vector path_get_directories( dir.push_back(L'*'); free_def(dir_temp); - WIN32_FIND_DATAW fdata; - memset(&fdata, 0, sizeof(WIN32_FIND_DATAW)); + WIN32_FIND_DATAW fdata = {}; HANDLE h = FindFirstFileW(dir.c_str(), &fdata); if (h == INVALID_HANDLE_VALUE) return {}; @@ -188,8 +185,7 @@ std::vector path_get_directories( temp.assign(dir); dir.push_back(L'*'); - WIN32_FIND_DATAW fdata; - memset(&fdata, 0, sizeof(WIN32_FIND_DATAW)); + WIN32_FIND_DATAW fdata = {}; HANDLE h = FindFirstFileW(dir.c_str(), &fdata); if (h == INVALID_HANDLE_VALUE) return {}; @@ -240,8 +236,7 @@ std::vector path_get_directories_recursive( dir.push_back(L'*'); free_def(dir_temp); - WIN32_FIND_DATAW fdata; - memset(&fdata, 0, sizeof(WIN32_FIND_DATAW)); + WIN32_FIND_DATAW fdata = {}; HANDLE h = FindFirstFileW(dir.c_str(), &fdata); if (h == INVALID_HANDLE_VALUE) return {}; @@ -329,8 +324,7 @@ std::vector path_get_directories_recursive( temp.assign(dir); dir.push_back(L'*'); - WIN32_FIND_DATAW fdata; - memset(&fdata, 0, sizeof(WIN32_FIND_DATAW)); + WIN32_FIND_DATAW fdata = {}; HANDLE h = FindFirstFileW(dir.c_str(), &fdata); if (h == INVALID_HANDLE_VALUE) return {}; diff --git a/src/KKdLib/io/stream.cpp b/src/KKdLib/io/stream.cpp index f21c92f8..54b97002 100644 --- a/src/KKdLib/io/stream.cpp +++ b/src/KKdLib/io/stream.cpp @@ -62,148 +62,141 @@ void stream::write_uint8_t(uint8_t val) { } std::string stream::read_string(size_t length) { - char* temp = force_malloc_s(char, length + 1); - read(temp, length); - temp[length] = 0; - std::string str = std::string(temp, length); - free_def(temp); + std::string str = std::string(length, 0); + read(&str.front(), sizeof(char) * length); return str; } std::wstring stream::read_wstring(size_t length) { - wchar_t* temp = force_malloc_s(wchar_t, length + 1); - read(temp, sizeof(wchar_t) * length); - temp[length] = 0; - std::wstring str = std::wstring(temp, length); - free_def(temp); + std::wstring str = std::wstring(length, 0); + read(&str.front(), sizeof(wchar_t) * length); return str; } std::string stream::read_string_null_terminated() { int64_t offset = get_position(); - int64_t length = 0; - char* temp = read_utf8_string_null_terminated_offset_length(offset, &length); - std::string str = std::string(temp, length); - free_def(temp); + + size_t length = read_utf8_string_null_terminated_offset_length(offset); + if (length) + return read_string(length); + + std::string str = {}; return str; } std::wstring stream::read_wstring_null_terminated() { int64_t offset = get_position(); - int64_t length = 0; - wchar_t* temp = read_utf16_string_null_terminated_offset_length(offset, &length); - std::wstring str = std::wstring(temp, length); - free_def(temp); + + size_t length = read_utf16_string_null_terminated_offset_length(offset); + if (length) + return read_wstring(length); + + std::wstring str = {}; return str; } std::string stream::read_string_null_terminated_offset(int64_t offset) { if (offset) { - int64_t length = 0; - char* temp = read_utf8_string_null_terminated_offset_length(offset, &length); - std::string str = std::string(temp, length); - free_def(temp); - return str; - } - else { - std::string str = {}; - return str; + size_t length = read_utf8_string_null_terminated_offset_length(offset); + if (length) { + position_push(offset, SEEK_SET); + std::string str = read_string(length); + position_pop(); + return str; + } } + + std::string str = {}; + return str; } std::wstring stream::read_wstring_null_terminated_offset(int64_t offset) { if (offset) { - int64_t length = 0; - wchar_t* temp = read_utf16_string_null_terminated_offset_length(offset, &length); - std::wstring str = std::wstring(temp, length); - free_def(temp); - return str; - } - else { - std::wstring str = {}; - return str; + size_t length = read_utf16_string_null_terminated_offset_length(offset); + if (length) { + position_push(offset, SEEK_SET); + std::wstring str = read_wstring(length); + position_pop(); + return str; + } } + + std::wstring str = {}; + return str; } char* stream::read_utf8_string_null_terminated() { int64_t offset = get_position(); - int64_t length = 0; - return read_utf8_string_null_terminated_offset_length(offset, &length); + return read_utf8_string_null_terminated_offset(offset); } wchar_t* stream::read_utf16_string_null_terminated() { int64_t offset = get_position(); - int64_t length = 0; - return read_utf16_string_null_terminated_offset_length( offset, &length); -} - -char* stream::read_utf8_string_null_terminated_length(int64_t* length) { - int64_t offset = get_position(); - return read_utf8_string_null_terminated_offset_length(offset, length); -} - -wchar_t* stream::read_utf16_string_null_terminated_length(int64_t* length) { - int64_t offset = get_position(); - return read_utf16_string_null_terminated_offset_length(offset, length); + return read_utf16_string_null_terminated_offset(offset); } char* stream::read_utf8_string_null_terminated_offset(int64_t offset) { - int64_t length = 0; - return read_utf8_string_null_terminated_offset_length(offset, &length); + size_t len = read_utf8_string_null_terminated_offset_length(offset); + if (!len) { + return 0; + } + + char* str = force_malloc_s(char, len + 1); + position_push(offset, SEEK_SET); + read(str, len); + str[len] = 0; + position_pop(); + return str; } wchar_t* stream::read_utf16_string_null_terminated_offset(int64_t offset) { - int64_t length = 0; - return read_utf16_string_null_terminated_offset_length(offset, &length); -} - -char* stream::read_utf8_string_null_terminated_offset_length(int64_t offset, int64_t* length) { - position_push(offset, SEEK_SET); - - size_t name_length = 0; - int32_t c; - while ((c = read_char()) != EOF && c != 0) - name_length++; - - if (name_length == 0) { + size_t len = read_utf16_string_null_terminated_offset_length(offset); + if (!len) { position_pop(); - *length = 0; return 0; } - char* str = force_malloc_s(char, name_length + 1); - set_position(offset, SEEK_SET); - read(str, name_length); - str[name_length] = 0; - + wchar_t* str = force_malloc_s(wchar_t, len + 1); + position_push(offset, SEEK_SET); + read(str, sizeof(wchar_t) * len); + str[len] = 0; position_pop(); - *length = name_length; return str; } -wchar_t* stream::read_utf16_string_null_terminated_offset_length(int64_t offset, int64_t* length) { +size_t stream::read_utf8_string_null_terminated_length() { + int64_t offset = get_position(); + return read_utf8_string_null_terminated_offset_length(offset); +} + +size_t stream::read_utf16_string_null_terminated_length() { + int64_t offset = get_position(); + return read_utf16_string_null_terminated_offset_length(offset); +} + +size_t stream::read_utf8_string_null_terminated_offset_length(int64_t offset) { position_push(offset, SEEK_SET); - size_t name_length = 0; + size_t len = 0; + int32_t c; + while ((c = read_char()) != EOF && c != 0) + len++; + + position_pop(); + return len; +} + +size_t stream::read_utf16_string_null_terminated_offset_length(int64_t offset) { + position_push(offset, SEEK_SET); + + size_t len = 0; int32_t c0, c1; while ((c0 = read_char()) != EOF && (c1 = read_char()) != EOF && (((c0 & 0xFF) | ((c1 & 0xFF) << 8)) != 0)) - name_length++; - - if (name_length == 0) { - position_pop(); - *length = 0; - return 0; - } - - wchar_t* str = force_malloc_s(wchar_t, name_length + 1); - set_position(offset, SEEK_SET); - read(str, sizeof(wchar_t) * name_length); - str[name_length] = 0; + len++; position_pop(); - *length = name_length; - return str; + return len; } int16_t stream::read_int16_t() { diff --git a/src/KKdLib/io/stream.hpp b/src/KKdLib/io/stream.hpp index d545797a..1bc1829d 100644 --- a/src/KKdLib/io/stream.hpp +++ b/src/KKdLib/io/stream.hpp @@ -118,12 +118,12 @@ public: std::wstring read_wstring_null_terminated_offset(int64_t offset); char* read_utf8_string_null_terminated(); wchar_t* read_utf16_string_null_terminated(); - char* read_utf8_string_null_terminated_length(int64_t* length); - wchar_t* read_utf16_string_null_terminated_length(int64_t* length); char* read_utf8_string_null_terminated_offset(int64_t offset); wchar_t* read_utf16_string_null_terminated_offset(int64_t offset); - char* read_utf8_string_null_terminated_offset_length(int64_t offset, int64_t* length); - wchar_t* read_utf16_string_null_terminated_offset_length(int64_t offset, int64_t* length); + size_t read_utf8_string_null_terminated_length(); + size_t read_utf16_string_null_terminated_length(); + size_t read_utf8_string_null_terminated_offset_length(int64_t offset); + size_t read_utf16_string_null_terminated_offset_length(int64_t offset); void write_string(std::string& str); void write_string(std::string&& str); diff --git a/src/KKdLib/key_val.cpp b/src/KKdLib/key_val.cpp index 9c668a18..b75971e4 100644 --- a/src/KKdLib/key_val.cpp +++ b/src/KKdLib/key_val.cpp @@ -233,13 +233,13 @@ bool key_val::open_scope(std::string& str) { } bool key_val::open_scope_fmt(int32_t i) { - char buf[0x100]; + char buf[0x200]; sprintf_s(buf, sizeof(buf), "%d", i); return open_scope(buf); } bool key_val::open_scope_fmt(uint32_t i) { - char buf[0x100]; + char buf[0x200]; sprintf_s(buf, sizeof(buf), "%u", i); return open_scope(buf); } @@ -498,7 +498,7 @@ bool key_val::read(const char* key, vec3& value) { close_scope(); return true; } - value = vec3_null; + value = 0.0f; return false; } @@ -510,7 +510,7 @@ bool key_val::read(std::string& key, vec3& value) { close_scope(); return true; } - value = vec3_null; + value = 0.0f; return false; } @@ -672,7 +672,7 @@ bool key_val::read(const char* key0, const char* key1, std::string& value) { bool key_val::read(std::string& key0, std::string& key1, vec3& value) { if (!open_scope(key0)) { - value = vec3_null; + value = 0.0f; return false; } @@ -685,7 +685,7 @@ bool key_val::read(std::string& key0, std::string& key1, vec3& value) { bool key_val::read(const char* key0, const char* key1, vec3& value) { if (!open_scope(key0)) { - value = vec3_null; + value = 0.0f; return false; } @@ -697,7 +697,9 @@ bool key_val::read(const char* key0, const char* key1, vec3& value) { } bool key_val::load_file(void* data, const char* path, const char* file, uint32_t hash) { - std::string s = path + std::string(file); + std::string s; + s.assign(path); + s.append(file); key_val* kv = (key_val*)data; kv->file_read(s.c_str()); diff --git a/src/KKdLib/light_param/face.cpp b/src/KKdLib/light_param/face.cpp index e26e17e4..66dd5433 100644 --- a/src/KKdLib/light_param/face.cpp +++ b/src/KKdLib/light_param/face.cpp @@ -92,7 +92,9 @@ bool light_param_face::load_file(void* data, const char* path, const char* file, if (t) file_len = t - file; - std::string s = path + std::string(file, file_len); + std::string s; + s.assign(path); + s.append(file, file_len); light_param_face* face = (light_param_face*)data; face->read(s.c_str()); @@ -105,7 +107,7 @@ static void light_param_face_read_inner(light_param_face* face, stream& s) { s.read(data, s.length); data[s.length] = 0; - char buf[0x100]; + char buf[0x200]; const char* d = data; while (d = light_param_face_read_line(buf, sizeof(buf), d)) { @@ -118,15 +120,15 @@ static void light_param_face_read_inner(light_param_face* face, stream& s) { goto End; } else if (!str_utils_compare_length(buf, sizeof(buf), "position", 8)) { - vec3* position = &face->position; + vec3& position = face->position; if (buf[8] != ' ' || sscanf_s(buf + 9, "%f %f %f", - &position->x, &position->y, &position->z) != 3) + &position.x, &position.y, &position.z) != 3) goto End; } else if (!str_utils_compare_length(buf, sizeof(buf), "direction", 10)) { - vec3* direction = &face->direction; + vec3& direction = face->direction; if (buf[9] != ' ' || sscanf_s(buf + 10, "%f %f %f", - &direction->x, &direction->y, &direction->z) != 3) + &direction.x, &direction.y, &direction.z) != 3) goto End; } } @@ -140,7 +142,7 @@ End: } static void light_param_face_write_inner(light_param_face* face, stream& s) { - char buf[0x100]; + char buf[0x200]; s.write("offset", 6); light_param_face_write_float_t(s, buf, sizeof(buf), face->offset); @@ -150,18 +152,18 @@ static void light_param_face_write_inner(light_param_face* face, stream& s) { light_param_face_write_float_t(s, buf, sizeof(buf), face->scale); s.write_char('\n'); - vec3* position = &face->position; + vec3& position = face->position; s.write("position", 8); - light_param_face_write_float_t(s, buf, sizeof(buf), position->x); - light_param_face_write_float_t(s, buf, sizeof(buf), position->y); - light_param_face_write_float_t(s, buf, sizeof(buf), position->z); + light_param_face_write_float_t(s, buf, sizeof(buf), position.x); + light_param_face_write_float_t(s, buf, sizeof(buf), position.y); + light_param_face_write_float_t(s, buf, sizeof(buf), position.z); s.write_char('\n'); - vec3* direction = &face->direction; + vec3& direction = face->direction; s.write("direction", 9); - light_param_face_write_float_t(s, buf, sizeof(buf), direction->x); - light_param_face_write_float_t(s, buf, sizeof(buf), direction->y); - light_param_face_write_float_t(s, buf, sizeof(buf), direction->z); + light_param_face_write_float_t(s, buf, sizeof(buf), direction.x); + light_param_face_write_float_t(s, buf, sizeof(buf), direction.y); + light_param_face_write_float_t(s, buf, sizeof(buf), direction.z); s.write_char('\n'); s.write("EOF", 3); @@ -201,6 +203,6 @@ inline static void light_param_face_write_int32_t(stream& s, char* buf, size_t b } inline static void light_param_face_write_float_t(stream& s, char* buf, size_t buf_size, float_t value) { - sprintf_s(buf, buf_size, " %g", value); + sprintf_s(buf, buf_size, " %#.6g", value); s.write_utf8_string(buf); } diff --git a/src/KKdLib/light_param/face.hpp b/src/KKdLib/light_param/face.hpp index b807d74a..0cc7fe7a 100644 --- a/src/KKdLib/light_param/face.hpp +++ b/src/KKdLib/light_param/face.hpp @@ -17,7 +17,7 @@ struct light_param_face { vec3 direction; light_param_face(); - virtual ~light_param_face(); + ~light_param_face(); void read(const char* path); void read(const wchar_t* path); diff --git a/src/KKdLib/light_param/fog.cpp b/src/KKdLib/light_param/fog.cpp index 76032ed6..0080450e 100644 --- a/src/KKdLib/light_param/fog.cpp +++ b/src/KKdLib/light_param/fog.cpp @@ -92,7 +92,9 @@ bool light_param_fog::load_file(void* data, const char* path, const char* file, if (t) file_len = t - file; - std::string s = path + std::string(file, file_len); + std::string s; + s.assign(path); + s.append(file, file_len); light_param_fog* fog = (light_param_fog*)data; fog->read(s.c_str()); @@ -105,16 +107,12 @@ density(), has_linear(), linear_start(), linear_end(), has_color(), color() { } -light_param_fog_group::~light_param_fog_group() { - -} - static void light_param_fog_read_inner(light_param_fog* fog, stream& s) { char* data = force_malloc_s(char, s.length + 1); s.read(data, s.length); data[s.length] = 0; - char buf[0x100]; + char buf[0x200]; const char* d = data; int32_t group_id = -1; @@ -187,7 +185,7 @@ End: } static void light_param_fog_write_inner(light_param_fog* fog, stream& s) { - char buf[0x100]; + char buf[0x200]; for (int32_t i = FOG_DEPTH; i < FOG_MAX; i++) { light_param_fog_group* group = &fog->group[i]; diff --git a/src/KKdLib/light_param/fog.hpp b/src/KKdLib/light_param/fog.hpp index b1208744..140a211a 100644 --- a/src/KKdLib/light_param/fog.hpp +++ b/src/KKdLib/light_param/fog.hpp @@ -34,7 +34,6 @@ struct light_param_fog_group { vec4 color; light_param_fog_group(); - ~light_param_fog_group(); }; struct light_param_fog { @@ -43,7 +42,7 @@ struct light_param_fog { light_param_fog_group group[FOG_MAX]; light_param_fog(); - virtual ~light_param_fog(); + ~light_param_fog(); void read(const char* path); void read(const wchar_t* path); diff --git a/src/KKdLib/light_param/glow.cpp b/src/KKdLib/light_param/glow.cpp index 9fbb31b2..5251414e 100644 --- a/src/KKdLib/light_param/glow.cpp +++ b/src/KKdLib/light_param/glow.cpp @@ -96,7 +96,9 @@ bool light_param_glow::load_file(void* data, const char* path, const char* file, if (t) file_len = t - file; - std::string s = path + std::string(file, file_len); + std::string s; + s.assign(path); + s.append(file, file_len); light_param_glow* glow = (light_param_glow*)data; glow->read(s.c_str()); @@ -109,7 +111,7 @@ static void light_param_glow_read_inner(light_param_glow* glow, stream& s) { s.read(data, s.length); data[s.length] = 0; - char buf[0x100]; + char buf[0x200]; const char* d = data; while (d = light_param_glow_read_line(buf, sizeof(buf), d)) { @@ -204,7 +206,7 @@ End: } static void light_param_glow_write_inner(light_param_glow* glow, stream& s) { - char buf[0x100]; + char buf[0x200]; if (glow->has_exposure) { s.write("exposure", 8); diff --git a/src/KKdLib/light_param/glow.hpp b/src/KKdLib/light_param/glow.hpp index 7a4ad265..e9972f9c 100644 --- a/src/KKdLib/light_param/glow.hpp +++ b/src/KKdLib/light_param/glow.hpp @@ -43,7 +43,7 @@ struct light_param_glow { vec3 tone_transform_end; light_param_glow(); - virtual ~light_param_glow(); + ~light_param_glow(); void read(const char* path); void read(const wchar_t* path); diff --git a/src/KKdLib/light_param/ibl.cpp b/src/KKdLib/light_param/ibl.cpp index cd33eaa4..60ffb26e 100644 --- a/src/KKdLib/light_param/ibl.cpp +++ b/src/KKdLib/light_param/ibl.cpp @@ -57,7 +57,9 @@ bool light_param_ibl::load_file(void* data, const char* path, const char* file, if (t) file_len = t - file; - std::string s = path + std::string(file, file_len); + std::string s; + s.assign(path); + s.append(file, file_len); light_param_ibl* ibl = (light_param_ibl*)data; ibl->read(s.c_str()); @@ -86,7 +88,7 @@ static void light_param_ibl_read_inner(light_param_ibl* ibl, stream& s) { s.read(data, s.length); data[s.length] = 0; - char buf[0x100]; + char buf[0x200]; const char* d = light_param_ibl_read_line(buf, sizeof(buf), data); if (str_utils_compare(buf, "VF5_IBL")) return; diff --git a/src/KKdLib/light_param/ibl.hpp b/src/KKdLib/light_param/ibl.hpp index 01d60039..062d7037 100644 --- a/src/KKdLib/light_param/ibl.hpp +++ b/src/KKdLib/light_param/ibl.hpp @@ -38,7 +38,7 @@ struct light_param_ibl { light_param_ibl_specular specular[4]; light_param_ibl(); - virtual ~light_param_ibl(); + ~light_param_ibl(); void read(const char* path); void read(const wchar_t* path); diff --git a/src/KKdLib/light_param/light.cpp b/src/KKdLib/light_param/light.cpp index c50bdb6f..fd0a0a13 100644 --- a/src/KKdLib/light_param/light.cpp +++ b/src/KKdLib/light_param/light.cpp @@ -92,7 +92,9 @@ bool light_param_light::load_file(void* data, const char* path, const char* file if (t) file_len = t - file; - std::string s = path + std::string(file, file_len); + std::string s; + s.assign(path); + s.append(file, file_len); light_param_light* light = (light_param_light*)data; light->read(s.c_str()); @@ -107,24 +109,16 @@ spot_cutoff(), attenuation(), has_clip_plane(), clip_plane(), has_tone_curve(), } -light_param_light_data::~light_param_light_data() { - -} - light_param_light_group::light_param_light_group() { } -light_param_light_group::~light_param_light_group() { - -} - static void light_param_light_read_inner(light_param_light* light, stream& s) { char* data = force_malloc_s(char, s.length + 1); s.read(data, s.length); data[s.length] = 0; - char buf[0x100]; + char buf[0x200]; const char* d = data; int32_t group_id = -1; @@ -284,7 +278,7 @@ End: } static void light_param_light_write_inner(light_param_light* light, stream& s) { - char buf[0x100]; + char buf[0x200]; for (int32_t i = LIGHT_SET_MAIN; i < LIGHT_SET_MAX; i++) { light_param_light_group* group = &light->group[i]; diff --git a/src/KKdLib/light_param/light.hpp b/src/KKdLib/light_param/light.hpp index 208e90b8..1d162532 100644 --- a/src/KKdLib/light_param/light.hpp +++ b/src/KKdLib/light_param/light.hpp @@ -73,14 +73,12 @@ struct light_param_light_data { light_tone_curve tone_curve; light_param_light_data(); - ~light_param_light_data(); }; struct light_param_light_group { light_param_light_data data[LIGHT_MAX]; light_param_light_group(); - ~light_param_light_group(); }; struct light_param_light { @@ -89,7 +87,7 @@ struct light_param_light { light_param_light_group group[LIGHT_SET_MAX]; light_param_light(); - virtual ~light_param_light(); + ~light_param_light(); void read(const char* path); void read(const wchar_t* path); diff --git a/src/KKdLib/light_param/wind.cpp b/src/KKdLib/light_param/wind.cpp index 2e1f55fa..43ffea25 100644 --- a/src/KKdLib/light_param/wind.cpp +++ b/src/KKdLib/light_param/wind.cpp @@ -12,7 +12,7 @@ static void light_param_wind_read_inner(light_param_wind* wind, stream& s); static void light_param_wind_write_inner(light_param_wind* wind, stream& s); static const char* light_param_wind_read_line(char* buf, int32_t size, const char* src); -static void light_param_wind_write_int32_t(stream& s, char* buf, size_t buf_size, int32_t value); +static void light_param_wind_write_size_t(stream& s, char* buf, size_t buf_size, size_t value); static void light_param_wind_write_float_t(stream& s, char* buf, size_t buf_size, float_t value); light_param_wind::light_param_wind() : ready(), has_scale(), scale(), has_cycle(), @@ -93,7 +93,9 @@ bool light_param_wind::load_file(void* data, const char* path, const char* file, if (t) file_len = t - file; - std::string s = path + std::string(file, file_len); + std::string s; + s.assign(path); + s.append(file, file_len); light_param_wind* wind = (light_param_wind*)data; wind->read(s.c_str()); @@ -105,16 +107,12 @@ light_param_wind_spc::light_param_wind_spc() : cos(), sin() { } -light_param_wind_spc::~light_param_wind_spc() { - -} - static void light_param_wind_read_inner(light_param_wind* wind, stream& s) { char* data = force_malloc_s(char, s.length + 1); s.read(data, s.length); data[s.length] = 0; - char buf[0x100]; + char buf[0x200]; const char* d = data; while (d = light_param_wind_read_line(buf, sizeof(buf), d)) { @@ -143,9 +141,9 @@ static void light_param_wind_read_inner(light_param_wind* wind, stream& s) { wind->has_bias = true; } else if (!str_utils_compare_length(buf, sizeof(buf), "spc", 3)) { - int32_t index = 0; + size_t index = 0; light_param_wind_spc spc; - if (buf[3] != ' ' || sscanf_s(buf + 4, "%d %f %f", + if (buf[3] != ' ' || sscanf_s(buf + 4, "%llu %f %f", &index, &spc.cos, &spc.sin) != 3) goto End; @@ -166,7 +164,7 @@ End: } static void light_param_wind_write_inner(light_param_wind* wind, stream& s) { - char buf[0x100]; + char buf[0x200]; if (wind->has_scale) { s.write("scale", 5); @@ -193,12 +191,13 @@ static void light_param_wind_write_inner(light_param_wind* wind, stream& s) { s.write_char('\n'); } - for (int32_t i = 0; i < 16; i++) + for (size_t i = 0; i < 16; i++) if (wind->has_spc[i]) { + light_param_wind_spc& spc = wind->spc[i]; s.write("spc", 3); - light_param_wind_write_int32_t(s, buf, sizeof(buf), i); - light_param_wind_write_float_t(s, buf, sizeof(buf), wind->spc[i].cos); - light_param_wind_write_float_t(s, buf, sizeof(buf), wind->spc[i].sin); + light_param_wind_write_size_t(s, buf, sizeof(buf), i); + light_param_wind_write_float_t(s, buf, sizeof(buf), spc.cos); + light_param_wind_write_float_t(s, buf, sizeof(buf), spc.sin); s.write_char('\n'); } } @@ -230,12 +229,12 @@ static const char* light_param_wind_read_line(char* buf, int32_t size, const cha return src; } -inline static void light_param_wind_write_int32_t(stream& s, char* buf, size_t buf_size, int32_t value) { - sprintf_s(buf, buf_size, " %d", value); +inline static void light_param_wind_write_size_t(stream& s, char* buf, size_t buf_size, size_t value) { + sprintf_s(buf, buf_size, " %llu", value); s.write_utf8_string(buf); } inline static void light_param_wind_write_float_t(stream& s, char* buf, size_t buf_size, float_t value) { - sprintf_s(buf, buf_size, " %g", value); + sprintf_s(buf, buf_size, " %#.6g", value); s.write_utf8_string(buf); } diff --git a/src/KKdLib/light_param/wind.hpp b/src/KKdLib/light_param/wind.hpp index 7dfd567d..8b4e815b 100644 --- a/src/KKdLib/light_param/wind.hpp +++ b/src/KKdLib/light_param/wind.hpp @@ -13,7 +13,6 @@ struct light_param_wind_spc { float_t sin; light_param_wind_spc(); - ~light_param_wind_spc(); }; struct light_param_wind { @@ -32,7 +31,7 @@ struct light_param_wind { light_param_wind_spc spc[16]; light_param_wind(); - virtual ~light_param_wind(); + ~light_param_wind(); void read(const char* path); void read(const wchar_t* path); diff --git a/src/KKdLib/mat.cpp b/src/KKdLib/mat.cpp index 3c5c6bed..8392aaaf 100644 --- a/src/KKdLib/mat.cpp +++ b/src/KKdLib/mat.cpp @@ -33,39 +33,15 @@ const mat4 mat4_null = { }; inline void mat3_add(const mat3* x, const mat3* y, mat3* z) { - __m128 xt; - __m128 yt; - __m128 zt; - *(vec3*)&xt = x->row0; - *(vec3*)&yt = y->row0; - zt = _mm_add_ps(xt, yt); - z->row0 = *(vec3*)&zt; - *(vec3*)&xt = x->row1; - *(vec3*)&yt = y->row1; - zt = _mm_add_ps(xt, yt); - z->row1 = *(vec3*)&zt; - *(vec3*)&xt = x->row2; - *(vec3*)&yt = y->row2; - zt = _mm_add_ps(xt, yt); - z->row2 = *(vec3*)&zt; + z->row0 = x->row0 + y->row0; + z->row1 = x->row1 + y->row1; + z->row2 = x->row2 + y->row2; } inline void mat3_sub(const mat3* x, const mat3* y, mat3* z) { - __m128 xt; - __m128 yt; - __m128 zt; - *(vec3*)&xt = x->row0; - *(vec3*)&yt = y->row0; - zt = _mm_sub_ps(xt, yt); - z->row0 = *(vec3*)&zt; - *(vec3*)&xt = x->row1; - *(vec3*)&yt = y->row1; - zt = _mm_sub_ps(xt, yt); - z->row1 = *(vec3*)&zt; - *(vec3*)&xt = x->row2; - *(vec3*)&yt = y->row2; - zt = _mm_sub_ps(xt, yt); - z->row2 = *(vec3*)&zt; + z->row0 = x->row0 - y->row0; + z->row1 = x->row1 - y->row1; + z->row2 = x->row2 - y->row2; } inline void mat3_mult(const mat3* x, const mat3* y, mat3* z) { @@ -122,8 +98,7 @@ inline void mat3_mult_scalar(const mat3* x, float_t y, mat3* z) { __m128 xt; __m128 yt; __m128 zt; - yt = _mm_set_ss(y); - yt = _mm_shuffle_ps(yt, yt, 0); + yt = vec4::load_xmm(y); *(vec3*)&xt = x->row0; zt = _mm_mul_ps(xt, yt); z->row0 = *(vec3*)&zt; @@ -147,13 +122,10 @@ inline void mat3_transpose(const mat3* x, mat3* z) { __m128 zt0; __m128 zt1; __m128 zt2; - *(vec3*)&xt0 = x->row0; - *(vec3*)&xt1 = x->row1; - *(vec3*)&xt2 = x->row2; - xt0 = _mm_and_ps(xt0, _mm_loadu_ps((float*)&(vec4_mask_vec3))); - xt1 = _mm_and_ps(xt1, _mm_loadu_ps((float*)&(vec4_mask_vec3))); - xt2 = _mm_and_ps(xt2, _mm_loadu_ps((float*)&(vec4_mask_vec3))); - xt3 = _mm_loadu_ps((float*)&(vec4_null)); + xt0 = vec3::load_xmm(x->row0); + xt1 = vec3::load_xmm(x->row1); + xt2 = vec3::load_xmm(x->row2); + xt3 = vec4::load_xmm(0.0f); yt0 = _mm_unpacklo_ps(xt0, xt1); yt1 = _mm_unpackhi_ps(xt0, xt1); yt2 = _mm_unpacklo_ps(xt2, xt3); @@ -210,13 +182,12 @@ void mat3_inverse(const mat3* x, mat3* z) { ); wt = _mm_movelh_ps(_mm_unpacklo_ps(zt0, zt1), zt2); - *(vec3*)&yt = xt0; - yt = _mm_and_ps(yt, _mm_loadu_ps((float*)&(vec4_mask_vec3))); + yt = vec3::load_xmm(xt0); wt = _mm_mul_ps(yt, wt); wt = _mm_hadd_ps(wt, wt); wt = _mm_hadd_ps(wt, wt); - if (wt.m128_f32[0] != 0.0f) - wt.m128_f32[0] = 1.0f / wt.m128_f32[0]; + if (_mm_cvtss_f32(wt) != 0.0f) + wt = _mm_div_ss(_mm_set_ss(1.0f), wt); wt = _mm_shuffle_ps(wt, wt, 0); yt = _mm_mul_ps(zt0, wt); z->row0 = *(vec3*)&yt; @@ -243,8 +214,8 @@ inline void mat3_normalize(const mat3* x, mat3* z) { __m128 xt1; __m128 xt2; det = _mm_set_ss(mat3_determinant(x)); - if (det.m128_f32[0] != 0.0f) - det.m128_f32[0] = 1.0f / det.m128_f32[0]; + if (_mm_cvtss_f32(det) != 0.0f) + det = _mm_div_ss(_mm_set_ss(1.0f), det); det = _mm_shuffle_ps(det, det, 0); *(vec3*)&xt0 = x->row0; *(vec3*)&xt1 = x->row1; @@ -258,35 +229,9 @@ inline void mat3_normalize(const mat3* x, mat3* z) { } inline void mat3_normalize_rotation(const mat3* x, mat3* z) { - __m128 xt; - __m128 yt; - *(vec3*)&xt = x->row0; - xt = _mm_and_ps(xt, _mm_loadu_ps((float*)&(vec4_mask_vec3))); - yt = _mm_mul_ps(xt, xt); - yt = _mm_hadd_ps(yt, yt); - yt = _mm_sqrt_ss(_mm_hadd_ps(yt, yt)); - if (yt.m128_f32[0] != 0.0f) - yt.m128_f32[0] = 1.0f / yt.m128_f32[0]; - xt = _mm_mul_ps(xt, _mm_shuffle_ps(yt, yt, 0)); - z->row0 = *(vec3*)&xt; - *(vec3*)&xt = x->row1; - xt = _mm_and_ps(xt, _mm_loadu_ps((float*)&(vec4_mask_vec3))); - yt = _mm_mul_ps(xt, xt); - yt = _mm_hadd_ps(yt, yt); - yt = _mm_sqrt_ss(_mm_hadd_ps(yt, yt)); - if (yt.m128_f32[0] != 0.0f) - yt.m128_f32[0] = 1.0f / yt.m128_f32[0]; - xt = _mm_mul_ps(xt, _mm_shuffle_ps(yt, yt, 0)); - z->row1 = *(vec3*)&xt; - *(vec3*)&xt = x->row2; - xt = _mm_and_ps(xt, _mm_loadu_ps((float*)&(vec4_mask_vec3))); - yt = _mm_mul_ps(xt, xt); - yt = _mm_hadd_ps(yt, yt); - yt = _mm_sqrt_ss(_mm_hadd_ps(yt, yt)); - if (yt.m128_f32[0] != 0.0f) - yt.m128_f32[0] = 1.0f / yt.m128_f32[0]; - xt = _mm_mul_ps(xt, _mm_shuffle_ps(yt, yt, 0)); - z->row2 = *(vec3*)&xt; + z->row0 = vec3::normalize(x->row0); + z->row1 = vec3::normalize(x->row1); + z->row2 = vec3::normalize(x->row2); } inline float_t mat3_determinant(const mat3* x) { @@ -358,7 +303,6 @@ inline void mat3_rotate_z_sin_cos(float_t sin_val, float_t cos_val, mat3* y) { inline void mat3_rotate_x_mult_sin_cos(const mat3* x, float_t sin_val, float_t cos_val, mat3* z) { __m128 t1; __m128 t2; - __m128 xt; __m128 y0; __m128 y1; __m128 y2; @@ -367,16 +311,12 @@ inline void mat3_rotate_x_mult_sin_cos(const mat3* x, float_t sin_val, float_t c *(vec3*)&y1 = x->row1; *(vec3*)&y2 = x->row2; z->row0 = *(vec3*)&y0; - xt = _mm_set_ss(cos_val); - t1 = _mm_mul_ps(y1, _mm_shuffle_ps(xt, xt, 0x00)); - xt = _mm_set_ss(sin_val); - t2 = _mm_mul_ps(y2, _mm_shuffle_ps(xt, xt, 0x00)); + t1 = _mm_mul_ps(y1, vec4::load_xmm(cos_val)); + t2 = _mm_mul_ps(y2, vec4::load_xmm(sin_val)); zt = _mm_add_ps(t1, t2); z->row1 = *(vec3*)&zt; - xt = _mm_set_ss(-sin_val); - t1 = _mm_mul_ps(y1, _mm_shuffle_ps(xt, xt, 0x00)); - xt = _mm_set_ss(cos_val); - t2 = _mm_mul_ps(y2, _mm_shuffle_ps(xt, xt, 0x00)); + t1 = _mm_mul_ps(y1, vec4::load_xmm(-sin_val)); + t2 = _mm_mul_ps(y2, vec4::load_xmm(cos_val)); zt = _mm_add_ps(t1, t2); z->row2 = *(vec3*)&zt; } @@ -384,7 +324,6 @@ inline void mat3_rotate_x_mult_sin_cos(const mat3* x, float_t sin_val, float_t c inline void mat3_rotate_y_mult_sin_cos(const mat3* x, float_t sin_val, float_t cos_val, mat3* z) { __m128 t0; __m128 t2; - __m128 xt; __m128 y0; __m128 y1; __m128 y2; @@ -392,17 +331,13 @@ inline void mat3_rotate_y_mult_sin_cos(const mat3* x, float_t sin_val, float_t c *(vec3*)&y0 = x->row0; *(vec3*)&y1 = x->row1; *(vec3*)&y2 = x->row2; - xt = _mm_set_ss(cos_val); - t0 = _mm_mul_ps(y0, _mm_shuffle_ps(xt, xt, 0x00)); - xt = _mm_set_ss(-sin_val); - t2 = _mm_mul_ps(y2, _mm_shuffle_ps(xt, xt, 0x00)); + t0 = _mm_mul_ps(y0, vec4::load_xmm(cos_val)); + t2 = _mm_mul_ps(y2, vec4::load_xmm(-sin_val)); zt = _mm_add_ps(t0, t2); z->row0 = *(vec3*)&zt; z->row1 = *(vec3*)&y1; - xt = _mm_set_ss(sin_val); - t0 = _mm_mul_ps(y0, _mm_shuffle_ps(xt, xt, 0x00)); - xt = _mm_set_ss(cos_val); - t2 = _mm_mul_ps(y2, _mm_shuffle_ps(xt, xt, 0x00)); + t0 = _mm_mul_ps(y0, vec4::load_xmm(sin_val)); + t2 = _mm_mul_ps(y2, vec4::load_xmm(cos_val)); zt = _mm_add_ps(t0, t2); z->row2 = *(vec3*)&zt; } @@ -410,7 +345,6 @@ inline void mat3_rotate_y_mult_sin_cos(const mat3* x, float_t sin_val, float_t c inline void mat3_rotate_z_mult_sin_cos(const mat3* x, float_t sin_val, float_t cos_val, mat3* z) { __m128 t0; __m128 t1; - __m128 xt; __m128 y0; __m128 y1; __m128 y2; @@ -418,16 +352,12 @@ inline void mat3_rotate_z_mult_sin_cos(const mat3* x, float_t sin_val, float_t c *(vec3*)&y0 = x->row0; *(vec3*)&y1 = x->row1; *(vec3*)&y2 = x->row2; - xt = _mm_set_ss(cos_val); - t0 = _mm_mul_ps(y0, _mm_shuffle_ps(xt, xt, 0x00)); - xt = _mm_set_ss(sin_val); - t1 = _mm_mul_ps(y1, _mm_shuffle_ps(xt, xt, 0x00)); + t0 = _mm_mul_ps(y0, vec4::load_xmm(cos_val)); + t1 = _mm_mul_ps(y1, vec4::load_xmm(sin_val)); zt = _mm_add_ps(t0, t1); z->row0 = *(vec3*)&zt; - xt = _mm_set_ss(-sin_val); - t0 = _mm_mul_ps(y0, _mm_shuffle_ps(xt, xt, 0x00)); - xt = _mm_set_ss(cos_val); - t1 = _mm_mul_ps(y1, _mm_shuffle_ps(xt, xt, 0x00)); + t0 = _mm_mul_ps(y0, vec4::load_xmm(-sin_val)); + t1 = _mm_mul_ps(y1, vec4::load_xmm(cos_val)); zt = _mm_add_ps(t0, t1); z->row1 = *(vec3*)&zt; z->row2 = *(vec3*)&y2; @@ -484,7 +414,6 @@ inline void mat3_rotate_mult(const mat3* s, float_t x, float_t y, float_t z, mat inline void mat3_rotate_x_mult(const mat3* x, float_t y, mat3* z) { __m128 t1; __m128 t2; - __m128 xt; __m128 y0; __m128 y1; __m128 y2; @@ -495,16 +424,12 @@ inline void mat3_rotate_x_mult(const mat3* x, float_t y, mat3* z) { *(vec3*)&y1 = x->row1; *(vec3*)&y2 = x->row2; z->row0 = *(vec3*)&y0; - xt = _mm_set_ss(y_cos); - t1 = _mm_mul_ps(y1, _mm_shuffle_ps(xt, xt, 0x00)); - xt = _mm_set_ss(y_sin); - t2 = _mm_mul_ps(y2, _mm_shuffle_ps(xt, xt, 0x00)); + t1 = _mm_mul_ps(y1, vec4::load_xmm(y_cos)); + t2 = _mm_mul_ps(y2, vec4::load_xmm(y_sin)); zt = _mm_add_ps(t1, t2); z->row1 = *(vec3*)&zt; - xt = _mm_set_ss(-y_sin); - t1 = _mm_mul_ps(y1, _mm_shuffle_ps(xt, xt, 0x00)); - xt = _mm_set_ss(y_cos); - t2 = _mm_mul_ps(y2, _mm_shuffle_ps(xt, xt, 0x00)); + t1 = _mm_mul_ps(y1, vec4::load_xmm(-y_sin)); + t2 = _mm_mul_ps(y2, vec4::load_xmm(y_cos)); zt = _mm_add_ps(t1, t2); z->row2 = *(vec3*)&zt; } @@ -512,7 +437,6 @@ inline void mat3_rotate_x_mult(const mat3* x, float_t y, mat3* z) { inline void mat3_rotate_y_mult(const mat3* x, float_t y, mat3* z) { __m128 t0; __m128 t2; - __m128 xt; __m128 y0; __m128 y1; __m128 y2; @@ -522,17 +446,13 @@ inline void mat3_rotate_y_mult(const mat3* x, float_t y, mat3* z) { *(vec3*)&y0 = x->row0; *(vec3*)&y1 = x->row1; *(vec3*)&y2 = x->row2; - xt = _mm_set_ss(y_cos); - t0 = _mm_mul_ps(y0, _mm_shuffle_ps(xt, xt, 0x00)); - xt = _mm_set_ss(-y_sin); - t2 = _mm_mul_ps(y2, _mm_shuffle_ps(xt, xt, 0x00)); + t0 = _mm_mul_ps(y0, vec4::load_xmm(y_cos)); + t2 = _mm_mul_ps(y2, vec4::load_xmm(-y_sin)); zt = _mm_add_ps(t0, t2); z->row0 = *(vec3*)&zt; z->row1 = *(vec3*)&y1; - xt = _mm_set_ss(y_sin); - t0 = _mm_mul_ps(y0, _mm_shuffle_ps(xt, xt, 0x00)); - xt = _mm_set_ss(y_cos); - t2 = _mm_mul_ps(y2, _mm_shuffle_ps(xt, xt, 0x00)); + t0 = _mm_mul_ps(y0, vec4::load_xmm(y_sin)); + t2 = _mm_mul_ps(y2, vec4::load_xmm(y_cos)); zt = _mm_add_ps(t0, t2); z->row2 = *(vec3*)&zt; } @@ -540,7 +460,6 @@ inline void mat3_rotate_y_mult(const mat3* x, float_t y, mat3* z) { inline void mat3_rotate_z_mult(const mat3* x, float_t y, mat3* z) { __m128 t0; __m128 t1; - __m128 xt; __m128 y0; __m128 y1; __m128 y2; @@ -550,16 +469,12 @@ inline void mat3_rotate_z_mult(const mat3* x, float_t y, mat3* z) { *(vec3*)&y0 = x->row0; *(vec3*)&y1 = x->row1; *(vec3*)&y2 = x->row2; - xt = _mm_set_ss(y_cos); - t0 = _mm_mul_ps(y0, _mm_shuffle_ps(xt, xt, 0x00)); - xt = _mm_set_ss(y_sin); - t1 = _mm_mul_ps(y1, _mm_shuffle_ps(xt, xt, 0x00)); + t0 = _mm_mul_ps(y0, vec4::load_xmm(y_cos)); + t1 = _mm_mul_ps(y1, vec4::load_xmm(y_sin)); zt = _mm_add_ps(t0, t1); z->row0 = *(vec3*)&zt; - xt = _mm_set_ss(-y_sin); - t0 = _mm_mul_ps(y0, _mm_shuffle_ps(xt, xt, 0x00)); - xt = _mm_set_ss(y_cos); - t1 = _mm_mul_ps(y1, _mm_shuffle_ps(xt, xt, 0x00)); + t0 = _mm_mul_ps(y0, vec4::load_xmm(-y_sin)); + t1 = _mm_mul_ps(y1, vec4::load_xmm(y_cos)); zt = _mm_add_ps(t0, t1); z->row1 = *(vec3*)&zt; z->row2 = *(vec3*)&y2; @@ -746,7 +661,6 @@ inline void mat3_mult_axis_angle(const mat3* src, mat3* dst, const vec3* axis, c quat q1; quat q2; quat q3; - quat_from_mat3(src->row0.x, src->row1.x, src->row2.x, src->row0.y, src->row1.y, src->row2.y, src->row0.z, src->row1.z, src->row2.z, &q1); quat_from_axis_angle(axis, angle, &q2); @@ -755,25 +669,17 @@ inline void mat3_mult_axis_angle(const mat3* src, mat3* dst, const vec3* axis, c } inline void mat4_add(const mat4* x, const mat4* y, mat4* z) { - _mm_storeu_ps((float*)&(z->row0), _mm_add_ps( - _mm_loadu_ps((float*)&(x->row0)), _mm_loadu_ps((float*)&(y->row0)))); - _mm_storeu_ps((float*)&(z->row1), _mm_add_ps( - _mm_loadu_ps((float*)&(x->row1)), _mm_loadu_ps((float*)&(y->row1)))); - _mm_storeu_ps((float*)&(z->row2), _mm_add_ps( - _mm_loadu_ps((float*)&(x->row2)), _mm_loadu_ps((float*)&(y->row2)))); - _mm_storeu_ps((float*)&(z->row3), _mm_add_ps( - _mm_loadu_ps((float*)&(x->row3)), _mm_loadu_ps((float*)&(y->row3)))); + z->row0 = x->row0 + y->row0; + z->row1 = x->row1 + y->row1; + z->row2 = x->row2 + y->row2; + z->row3 = x->row3 + y->row3; } inline void mat4_sub(const mat4* x, const mat4* y, mat4* z) { - _mm_storeu_ps((float*)&(z->row0), _mm_sub_ps( - _mm_loadu_ps((float*)&(x->row0)), _mm_loadu_ps((float*)&(y->row0)))); - _mm_storeu_ps((float*)&(z->row1), _mm_sub_ps( - _mm_loadu_ps((float*)&(x->row1)), _mm_loadu_ps((float*)&(y->row1)))); - _mm_storeu_ps((float*)&(z->row2), _mm_sub_ps( - _mm_loadu_ps((float*)&(x->row2)), _mm_loadu_ps((float*)&(y->row2)))); - _mm_storeu_ps((float*)&(z->row3), _mm_sub_ps( - _mm_loadu_ps((float*)&(x->row3)), _mm_loadu_ps((float*)&(y->row3)))); + z->row0 = x->row0 - y->row0; + z->row1 = x->row1 - y->row1; + z->row2 = x->row2 - y->row2; + z->row3 = x->row3 - y->row3; } inline void mat4_mult(const mat4* x, const mat4* y, mat4* z) { @@ -786,34 +692,34 @@ inline void mat4_mult(const mat4* x, const mat4* y, mat4* z) { __m128 y1; __m128 y2; __m128 y3; - y0 = _mm_loadu_ps((float*)&(y->row0)); - y1 = _mm_loadu_ps((float*)&(y->row1)); - y2 = _mm_loadu_ps((float*)&(y->row2)); - y3 = _mm_loadu_ps((float*)&(y->row3)); - xt = _mm_loadu_ps((float*)&(x->row0)); + y0 = vec4::load_xmm(y->row0); + y1 = vec4::load_xmm(y->row1); + y2 = vec4::load_xmm(y->row2); + y3 = vec4::load_xmm(y->row3); + xt = vec4::load_xmm(x->row0); t0 = _mm_mul_ps(y0, _mm_shuffle_ps(xt, xt, 0x00)); t1 = _mm_mul_ps(y1, _mm_shuffle_ps(xt, xt, 0x55)); t2 = _mm_mul_ps(y2, _mm_shuffle_ps(xt, xt, 0xAA)); t3 = _mm_mul_ps(y3, _mm_shuffle_ps(xt, xt, 0xFF)); - _mm_storeu_ps((float*)&(z->row0), _mm_add_ps(_mm_add_ps(t0, t1), _mm_add_ps(t2, t3))); - xt = _mm_loadu_ps((float*)&(x->row1)); + z->row0 = vec4::store_xmm(_mm_add_ps(_mm_add_ps(t0, t1), _mm_add_ps(t2, t3))); + xt = vec4::load_xmm(x->row1); t0 = _mm_mul_ps(y0, _mm_shuffle_ps(xt, xt, 0x00)); t1 = _mm_mul_ps(y1, _mm_shuffle_ps(xt, xt, 0x55)); t2 = _mm_mul_ps(y2, _mm_shuffle_ps(xt, xt, 0xAA)); t3 = _mm_mul_ps(y3, _mm_shuffle_ps(xt, xt, 0xFF)); - _mm_storeu_ps((float*)&(z->row1), _mm_add_ps(_mm_add_ps(t0, t1), _mm_add_ps(t2, t3))); - xt = _mm_loadu_ps((float*)&(x->row2)); + z->row1 = vec4::store_xmm(_mm_add_ps(_mm_add_ps(t0, t1), _mm_add_ps(t2, t3))); + xt = vec4::load_xmm(x->row2); t0 = _mm_mul_ps(y0, _mm_shuffle_ps(xt, xt, 0x00)); t1 = _mm_mul_ps(y1, _mm_shuffle_ps(xt, xt, 0x55)); t2 = _mm_mul_ps(y2, _mm_shuffle_ps(xt, xt, 0xAA)); t3 = _mm_mul_ps(y3, _mm_shuffle_ps(xt, xt, 0xFF)); - _mm_storeu_ps((float*)&(z->row2), _mm_add_ps(_mm_add_ps(t0, t1), _mm_add_ps(t2, t3))); - xt = _mm_loadu_ps((float*)&(x->row3)); + z->row2 = vec4::store_xmm(_mm_add_ps(_mm_add_ps(t0, t1), _mm_add_ps(t2, t3))); + xt = vec4::load_xmm(x->row3); t0 = _mm_mul_ps(y0, _mm_shuffle_ps(xt, xt, 0x00)); t1 = _mm_mul_ps(y1, _mm_shuffle_ps(xt, xt, 0x55)); t2 = _mm_mul_ps(y2, _mm_shuffle_ps(xt, xt, 0xAA)); t3 = _mm_mul_ps(y3, _mm_shuffle_ps(xt, xt, 0xFF)); - _mm_storeu_ps((float*)&(z->row3), _mm_add_ps(_mm_add_ps(t0, t1), _mm_add_ps(t2, t3))); + z->row3 = vec4::store_xmm(_mm_add_ps(_mm_add_ps(t0, t1), _mm_add_ps(t2, t3))); } inline void mat4_mult_vec3(const mat4* x, const vec3* y, vec3* z) { @@ -823,9 +729,9 @@ inline void mat4_mult_vec3(const mat4* x, const vec3* y, vec3* z) { __m128 zt1; __m128 zt2; *(vec3*)&yt = *y; - zt0 = _mm_mul_ps(_mm_loadu_ps((float*)&(x->row0)), _mm_shuffle_ps(yt, yt, 0x00)); - zt1 = _mm_mul_ps(_mm_loadu_ps((float*)&(x->row1)), _mm_shuffle_ps(yt, yt, 0x55)); - zt2 = _mm_mul_ps(_mm_loadu_ps((float*)&(x->row2)), _mm_shuffle_ps(yt, yt, 0xAA)); + zt0 = _mm_mul_ps(vec4::load_xmm(x->row0), _mm_shuffle_ps(yt, yt, 0x00)); + zt1 = _mm_mul_ps(vec4::load_xmm(x->row1), _mm_shuffle_ps(yt, yt, 0x55)); + zt2 = _mm_mul_ps(vec4::load_xmm(x->row2), _mm_shuffle_ps(yt, yt, 0xAA)); zt = _mm_add_ps(_mm_add_ps(zt0, zt1), zt2); *z = *(vec3*)&zt; } @@ -833,16 +739,14 @@ inline void mat4_mult_vec3(const mat4* x, const vec3* y, vec3* z) { inline void mat4_mult_vec3_inv(const mat4* x, const vec3* y, vec3* z) { __m128 yt; __m128 zt; - - *(vec3*)&yt = *y; - yt = _mm_and_ps(yt, _mm_loadu_ps((float*)&(vec4_mask_vec3))); - zt = _mm_mul_ps(yt, _mm_loadu_ps((float*)&(x->row0))); + yt = vec3::load_xmm(*y); + zt = _mm_mul_ps(yt, vec4::load_xmm(x->row0)); zt = _mm_hadd_ps(zt, zt); z->x = _mm_cvtss_f32(_mm_hadd_ps(zt, zt)); - zt = _mm_mul_ps(yt, _mm_loadu_ps((float*)&(x->row1))); + zt = _mm_mul_ps(yt, vec4::load_xmm(x->row1)); zt = _mm_hadd_ps(zt, zt); z->y = _mm_cvtss_f32(_mm_hadd_ps(zt, zt)); - zt = _mm_mul_ps(yt, _mm_loadu_ps((float*)&(x->row2))); + zt = _mm_mul_ps(yt, vec4::load_xmm(x->row2)); zt = _mm_hadd_ps(zt, zt); z->z = _mm_cvtss_f32(_mm_hadd_ps(zt, zt)); } @@ -855,10 +759,10 @@ inline void mat4_mult_vec3_trans(const mat4* x, const vec3* y, vec3* z) { __m128 zt2; __m128 zt3; *(vec3*)&yt = *y; - zt0 = _mm_mul_ps(_mm_loadu_ps((float*)&(x->row0)), _mm_shuffle_ps(yt, yt, 0x00)); - zt1 = _mm_mul_ps(_mm_loadu_ps((float*)&(x->row1)), _mm_shuffle_ps(yt, yt, 0x55)); - zt2 = _mm_mul_ps(_mm_loadu_ps((float*)&(x->row2)), _mm_shuffle_ps(yt, yt, 0xAA)); - zt3 = _mm_loadu_ps((float*)&(x->row3)); + zt0 = _mm_mul_ps(vec4::load_xmm(x->row0), _mm_shuffle_ps(yt, yt, 0x00)); + zt1 = _mm_mul_ps(vec4::load_xmm(x->row1), _mm_shuffle_ps(yt, yt, 0x55)); + zt2 = _mm_mul_ps(vec4::load_xmm(x->row2), _mm_shuffle_ps(yt, yt, 0xAA)); + zt3 = vec4::load_xmm(x->row3); zt = _mm_add_ps(_mm_add_ps(zt0, zt1), _mm_add_ps(zt2, zt3)); *z = *(vec3*)&zt; } @@ -866,17 +770,15 @@ inline void mat4_mult_vec3_trans(const mat4* x, const vec3* y, vec3* z) { inline void mat4_mult_vec3_inv_trans(const mat4* x, const vec3* y, vec3* z) { __m128 yt; __m128 zt; - - *(vec3*)&yt = *y; - yt = _mm_and_ps(yt, _mm_loadu_ps((float*)&(vec4_mask_vec3))); - yt = _mm_sub_ps(yt, _mm_loadu_ps((float*)&(x->row3))); - zt = _mm_mul_ps(yt, _mm_loadu_ps((float*)&(x->row0))); + yt = vec3::load_xmm(*y); + yt = _mm_sub_ps(yt, vec4::load_xmm(x->row3)); + zt = _mm_mul_ps(yt, vec4::load_xmm(x->row0)); zt = _mm_hadd_ps(zt, zt); z->x = _mm_cvtss_f32(_mm_hadd_ps(zt, zt)); - zt = _mm_mul_ps(yt, _mm_loadu_ps((float*)&(x->row1))); + zt = _mm_mul_ps(yt, vec4::load_xmm(x->row1)); zt = _mm_hadd_ps(zt, zt); z->y = _mm_cvtss_f32(_mm_hadd_ps(zt, zt)); - zt = _mm_mul_ps(yt, _mm_loadu_ps((float*)&(x->row2))); + zt = _mm_mul_ps(yt, vec4::load_xmm(x->row2)); zt = _mm_hadd_ps(zt, zt); z->z = _mm_cvtss_f32(_mm_hadd_ps(zt, zt)); } @@ -887,37 +789,44 @@ inline void mat4_mult_vec(const mat4* x, vec4* y, vec4* z) { __m128 zt1; __m128 zt2; __m128 zt3; - yt = _mm_loadu_ps((float*)y); - zt0 = _mm_mul_ps(_mm_loadu_ps((float*)&(x->row0)), _mm_shuffle_ps(yt, yt, 0x00)); - zt1 = _mm_mul_ps(_mm_loadu_ps((float*)&(x->row1)), _mm_shuffle_ps(yt, yt, 0x55)); - zt2 = _mm_mul_ps(_mm_loadu_ps((float*)&(x->row2)), _mm_shuffle_ps(yt, yt, 0xAA)); - zt3 = _mm_mul_ps(_mm_loadu_ps((float*)&(x->row3)), _mm_shuffle_ps(yt, yt, 0xFF)); - _mm_storeu_ps((float*)z, _mm_add_ps(_mm_add_ps(zt0, zt1), _mm_add_ps(zt2, zt3))); + yt = vec4::load_xmm(*y); + zt0 = _mm_mul_ps(vec4::load_xmm(x->row0), _mm_shuffle_ps(yt, yt, 0x00)); + zt1 = _mm_mul_ps(vec4::load_xmm(x->row1), _mm_shuffle_ps(yt, yt, 0x55)); + zt2 = _mm_mul_ps(vec4::load_xmm(x->row2), _mm_shuffle_ps(yt, yt, 0xAA)); + zt3 = _mm_mul_ps(vec4::load_xmm(x->row3), _mm_shuffle_ps(yt, yt, 0xFF)); + *z = vec4::store_xmm(_mm_add_ps(_mm_add_ps(zt0, zt1), _mm_add_ps(zt2, zt3))); } inline void mat4_mult_scalar(const mat4* x, float_t y, mat4* z) { __m128 yt; - yt = _mm_set_ss(y); - yt = _mm_shuffle_ps(yt, yt, 0); - _mm_storeu_ps((float*)&(z->row0), _mm_mul_ps(_mm_loadu_ps((float*)&(x->row0)), yt)); - _mm_storeu_ps((float*)&(z->row1), _mm_mul_ps(_mm_loadu_ps((float*)&(x->row1)), yt)); - _mm_storeu_ps((float*)&(z->row2), _mm_mul_ps(_mm_loadu_ps((float*)&(x->row2)), yt)); - _mm_storeu_ps((float*)&(z->row3), _mm_mul_ps(_mm_loadu_ps((float*)&(x->row3)), yt)); + yt = vec4::load_xmm(y); + z->row0 = vec4::store_xmm(_mm_mul_ps(vec4::load_xmm(x->row0), yt)); + z->row1 = vec4::store_xmm(_mm_mul_ps(vec4::load_xmm(x->row1), yt)); + z->row2 = vec4::store_xmm(_mm_mul_ps(vec4::load_xmm(x->row2), yt)); + z->row3 = vec4::store_xmm(_mm_mul_ps(vec4::load_xmm(x->row3), yt)); } inline void mat4_transpose(const mat4* x, mat4* z) { + __m128 xt0; + __m128 xt1; + __m128 xt2; + __m128 xt3; __m128 yt0; __m128 yt1; __m128 yt2; __m128 yt3; - yt0 = _mm_unpacklo_ps(_mm_loadu_ps((float*)&(x->row0)), _mm_loadu_ps((float*)&(x->row1))); - yt1 = _mm_unpackhi_ps(_mm_loadu_ps((float*)&(x->row0)), _mm_loadu_ps((float*)&(x->row1))); - yt2 = _mm_unpacklo_ps(_mm_loadu_ps((float*)&(x->row2)), _mm_loadu_ps((float*)&(x->row3))); - yt3 = _mm_unpackhi_ps(_mm_loadu_ps((float*)&(x->row2)), _mm_loadu_ps((float*)&(x->row3))); - _mm_storeu_ps((float*)&(z->row0), _mm_movelh_ps(yt0, yt2)); - _mm_storeu_ps((float*)&(z->row1), _mm_movehl_ps(yt2, yt0)); - _mm_storeu_ps((float*)&(z->row2), _mm_movelh_ps(yt1, yt3)); - _mm_storeu_ps((float*)&(z->row3), _mm_movehl_ps(yt3, yt1)); + xt0 = vec4::load_xmm(x->row0); + xt1 = vec4::load_xmm(x->row1); + xt2 = vec4::load_xmm(x->row2); + xt3 = vec4::load_xmm(x->row3); + yt0 = _mm_unpacklo_ps(xt0, xt1); + yt1 = _mm_unpackhi_ps(xt0, xt1); + yt2 = _mm_unpacklo_ps(xt2, xt3); + yt3 = _mm_unpackhi_ps(xt2, xt3); + z->row0 = vec4::store_xmm(_mm_movelh_ps(yt0, yt2)); + z->row1 = vec4::store_xmm(_mm_movehl_ps(yt2, yt0)); + z->row2 = vec4::store_xmm(_mm_movelh_ps(yt1, yt3)); + z->row3 = vec4::store_xmm(_mm_movehl_ps(yt3, yt1)); } void mat4_inverse(const mat4* x, mat4* z) { @@ -934,10 +843,10 @@ void mat4_inverse(const mat4* x, mat4* z) { __m128 wt; __m128 wt0, wt1, wt2; __m128 t0, t1, t2, t3, t4, t5; - xt0 = _mm_loadu_ps((float*)&(x->row0)); - xt1 = _mm_loadu_ps((float*)&(x->row1)); - xt2 = _mm_loadu_ps((float*)&(x->row2)); - xt3 = _mm_loadu_ps((float*)&(x->row3)); + xt0 = vec4::load_xmm(x->row0); + xt1 = vec4::load_xmm(x->row1); + xt2 = vec4::load_xmm(x->row2); + xt3 = vec4::load_xmm(x->row3); xt0x = _mm_shuffle_ps(xt0, xt0, 0x00); xt0y = _mm_shuffle_ps(xt0, xt0, 0x55); xt0z = _mm_shuffle_ps(xt0, xt0, 0xAA); @@ -999,13 +908,13 @@ void mat4_inverse(const mat4* x, mat4* z) { wt = _mm_mul_ps(xt0, wt); wt = _mm_hadd_ps(wt, wt); wt = _mm_hadd_ps(wt, wt); - if (wt.m128_f32[0] != 0.0f) - wt.m128_f32[0] = 1.0f / wt.m128_f32[0]; + if (_mm_cvtss_f32(wt) != 0.0f) + wt = _mm_div_ss(_mm_set_ss(1.0f), wt); wt = _mm_shuffle_ps(wt, wt, 0); - _mm_storeu_ps((float*)&(z->row0), _mm_mul_ps(zt0, wt)); - _mm_storeu_ps((float*)&(z->row1), _mm_mul_ps(zt1, wt)); - _mm_storeu_ps((float*)&(z->row2), _mm_mul_ps(zt2, wt)); - _mm_storeu_ps((float*)&(z->row3), _mm_mul_ps(zt3, wt)); + z->row0 = vec4::store_xmm(_mm_mul_ps(zt0, wt)); + z->row1 = vec4::store_xmm(_mm_mul_ps(zt1, wt)); + z->row2 = vec4::store_xmm(_mm_mul_ps(zt2, wt)); + z->row3 = vec4::store_xmm(_mm_mul_ps(zt3, wt)); } inline void mat4_invtrans(const mat4* x, mat4* z) { @@ -1056,42 +965,19 @@ inline void mat4_invrot_normalized(const mat4* x, mat4* z) { inline void mat4_normalize(const mat4* x, mat4* z) { __m128 det; det = _mm_set_ss(mat4_determinant(x)); - if (det.m128_f32[0] != 0.0f) - det.m128_f32[0] = 1.0f / det.m128_f32[0]; + if (_mm_cvtss_f32(det) != 0.0f) + det = _mm_div_ss(_mm_set_ss(1.0f), det); det = _mm_shuffle_ps(det, det, 0); - _mm_storeu_ps((float*)&(z->row0), _mm_mul_ps(_mm_loadu_ps((float*)&(x->row0)), det)); - _mm_storeu_ps((float*)&(z->row1), _mm_mul_ps(_mm_loadu_ps((float*)&(x->row1)), det)); - _mm_storeu_ps((float*)&(z->row2), _mm_mul_ps(_mm_loadu_ps((float*)&(x->row2)), det)); - _mm_storeu_ps((float*)&(z->row3), _mm_mul_ps(_mm_loadu_ps((float*)&(x->row3)), det)); + z->row0 = vec4::store_xmm(_mm_mul_ps(vec4::load_xmm(x->row0), det)); + z->row1 = vec4::store_xmm(_mm_mul_ps(vec4::load_xmm(x->row1), det)); + z->row2 = vec4::store_xmm(_mm_mul_ps(vec4::load_xmm(x->row2), det)); + z->row3 = vec4::store_xmm(_mm_mul_ps(vec4::load_xmm(x->row3), det)); } inline void mat4_normalize_rotation(const mat4* x, mat4* z) { - __m128 xt; - __m128 yt; - xt = _mm_and_ps(_mm_loadu_ps((float*)&(x->row0)), _mm_loadu_ps((float*)&(vec4_mask_vec3))); - yt = _mm_mul_ps(xt, xt); - yt = _mm_hadd_ps(yt, yt); - yt = _mm_sqrt_ss(_mm_hadd_ps(yt, yt)); - if (yt.m128_f32[0] != 0.0f) - yt.m128_f32[0] = 1.0f / yt.m128_f32[0]; - xt = _mm_mul_ps(xt, _mm_shuffle_ps(yt, yt, 0)); - *(vec3*)&z->row0 = *(vec3*)&xt; - xt = _mm_and_ps(_mm_loadu_ps((float*)&(x->row1)), _mm_loadu_ps((float*)&(vec4_mask_vec3))); - yt = _mm_mul_ps(xt, xt); - yt = _mm_hadd_ps(yt, yt); - yt = _mm_sqrt_ss(_mm_hadd_ps(yt, yt)); - if (yt.m128_f32[0] != 0.0f) - yt.m128_f32[0] = 1.0f / yt.m128_f32[0]; - xt = _mm_mul_ps(xt, _mm_shuffle_ps(yt, yt, 0)); - *(vec3*)&z->row1 = *(vec3*)&xt; - xt = _mm_and_ps(_mm_loadu_ps((float*)&(x->row2)), _mm_loadu_ps((float*)&(vec4_mask_vec3))); - yt = _mm_mul_ps(xt, xt); - yt = _mm_hadd_ps(yt, yt); - yt = _mm_sqrt_ss(_mm_hadd_ps(yt, yt)); - if (yt.m128_f32[0] != 0.0f) - yt.m128_f32[0] = 1.0f / yt.m128_f32[0]; - xt = _mm_mul_ps(xt, _mm_shuffle_ps(yt, yt, 0)); - *(vec3*)&z->row2 = *(vec3*)&xt; + *(vec3*)&z->row0 = vec3::normalize(*(vec3*)&x->row0); + *(vec3*)&z->row1 = vec3::normalize(*(vec3*)&x->row1); + *(vec3*)&z->row2 = vec3::normalize(*(vec3*)&x->row2); z->row0.w = x->row0.w; z->row1.w = x->row1.w; z->row2.w = x->row2.w; @@ -1193,85 +1079,70 @@ inline void mat4_rotate_mult(const mat4* s, float_t x, float_t y, float_t z, mat inline void mat4_rotate_x_mult(const mat4* x, float_t y, mat4* z) { __m128 t1; __m128 t2; - __m128 xt; __m128 y0; __m128 y1; __m128 y2; __m128 y3; float_t y_sin = sinf(y); float_t y_cos = cosf(y); - y0 = _mm_loadu_ps((float*)&(x->row0)); - y1 = _mm_loadu_ps((float*)&(x->row1)); - y2 = _mm_loadu_ps((float*)&(x->row2)); - y3 = _mm_loadu_ps((float*)&(x->row3)); - _mm_storeu_ps((float*)&(z->row0), y0); - xt = _mm_set_ss(y_cos); - t1 = _mm_mul_ps(y1, _mm_shuffle_ps(xt, xt, 0x00)); - xt = _mm_set_ss(y_sin); - t2 = _mm_mul_ps(y2, _mm_shuffle_ps(xt, xt, 0x00)); - _mm_storeu_ps((float*)&(z->row1), _mm_add_ps(t1, t2)); - xt = _mm_set_ss(-y_sin); - t1 = _mm_mul_ps(y1, _mm_shuffle_ps(xt, xt, 0x00)); - xt = _mm_set_ss(y_cos); - t2 = _mm_mul_ps(y2, _mm_shuffle_ps(xt, xt, 0x00)); - _mm_storeu_ps((float*)&(z->row2), _mm_add_ps(t1, t2)); - _mm_storeu_ps((float*)&(z->row3), y3); + y0 = vec4::load_xmm(x->row0); + y1 = vec4::load_xmm(x->row1); + y2 = vec4::load_xmm(x->row2); + y3 = vec4::load_xmm(x->row3); + z->row0 = vec4::store_xmm(y0); + t1 = _mm_mul_ps(y1, vec4::load_xmm(y_cos)); + t2 = _mm_mul_ps(y2, vec4::load_xmm(y_sin)); + z->row1 = vec4::store_xmm(_mm_add_ps(t1, t2)); + t1 = _mm_mul_ps(y1, vec4::load_xmm(-y_sin)); + t2 = _mm_mul_ps(y2, vec4::load_xmm(y_cos)); + z->row2 = vec4::store_xmm(_mm_add_ps(t1, t2)); + z->row3 = vec4::store_xmm(y3); } inline void mat4_rotate_y_mult(const mat4* x, float_t y, mat4* z) { __m128 t0; __m128 t2; - __m128 xt; __m128 y0; __m128 y1; __m128 y2; __m128 y3; float_t y_sin = sinf(y); float_t y_cos = cosf(y); - y0 = _mm_loadu_ps((float*)&(x->row0)); - y1 = _mm_loadu_ps((float*)&(x->row1)); - y2 = _mm_loadu_ps((float*)&(x->row2)); - y3 = _mm_loadu_ps((float*)&(x->row3)); - xt = _mm_set_ss(y_cos); - t0 = _mm_mul_ps(y0, _mm_shuffle_ps(xt, xt, 0x00)); - xt = _mm_set_ss(-y_sin); - t2 = _mm_mul_ps(y2, _mm_shuffle_ps(xt, xt, 0x00)); - _mm_storeu_ps((float*)&(z->row0), _mm_add_ps(t0, t2)); - _mm_storeu_ps((float*)&(z->row1), y1); - xt = _mm_set_ss(y_sin); - t0 = _mm_mul_ps(y0, _mm_shuffle_ps(xt, xt, 0x00)); - xt = _mm_set_ss(y_cos); - t2 = _mm_mul_ps(y2, _mm_shuffle_ps(xt, xt, 0x00)); - _mm_storeu_ps((float*)&(z->row2), _mm_add_ps(t0, t2)); - _mm_storeu_ps((float*)&(z->row3), y3); + y0 = vec4::load_xmm(x->row0); + y1 = vec4::load_xmm(x->row1); + y2 = vec4::load_xmm(x->row2); + y3 = vec4::load_xmm(x->row3); + t0 = _mm_mul_ps(y0, vec4::load_xmm(y_cos)); + t2 = _mm_mul_ps(y2, vec4::load_xmm(-y_sin)); + z->row0 = vec4::store_xmm(_mm_add_ps(t0, t2)); + z->row1 = vec4::store_xmm(y1); + t0 = _mm_mul_ps(y0, vec4::load_xmm(y_sin)); + t2 = _mm_mul_ps(y2, vec4::load_xmm(y_cos)); + z->row2 = vec4::store_xmm(_mm_add_ps(t0, t2)); + z->row3 = vec4::store_xmm(y3); } inline void mat4_rotate_z_mult(const mat4* x, float_t y, mat4* z) { __m128 t0; __m128 t1; - __m128 xt; __m128 y0; __m128 y1; __m128 y2; __m128 y3; float_t y_sin = sinf(y); float_t y_cos = cosf(y); - y0 = _mm_loadu_ps((float*)&(x->row0)); - y1 = _mm_loadu_ps((float*)&(x->row1)); - y2 = _mm_loadu_ps((float*)&(x->row2)); - y3 = _mm_loadu_ps((float*)&(x->row3)); - xt = _mm_set_ss(y_cos); - t0 = _mm_mul_ps(y0, _mm_shuffle_ps(xt, xt, 0x00)); - xt = _mm_set_ss(y_sin); - t1 = _mm_mul_ps(y1, _mm_shuffle_ps(xt, xt, 0x00)); - _mm_storeu_ps((float*)&(z->row0), _mm_add_ps(t0, t1)); - xt = _mm_set_ss(-y_sin); - t0 = _mm_mul_ps(y0, _mm_shuffle_ps(xt, xt, 0x00)); - xt = _mm_set_ss(y_cos); - t1 = _mm_mul_ps(y1, _mm_shuffle_ps(xt, xt, 0x00)); - _mm_storeu_ps((float*)&(z->row1), _mm_add_ps(t0, t1)); - _mm_storeu_ps((float*)&(z->row2), y2); - _mm_storeu_ps((float*)&(z->row3), y3); + y0 = vec4::load_xmm(x->row0); + y1 = vec4::load_xmm(x->row1); + y2 = vec4::load_xmm(x->row2); + y3 = vec4::load_xmm(x->row3); + t0 = _mm_mul_ps(y0, vec4::load_xmm(y_cos)); + t1 = _mm_mul_ps(y1, vec4::load_xmm(y_sin)); + z->row0 = vec4::store_xmm(_mm_add_ps(t0, t1)); + t0 = _mm_mul_ps(y0, vec4::load_xmm(-y_sin)); + t1 = _mm_mul_ps(y1, vec4::load_xmm(y_cos)); + z->row1 = vec4::store_xmm(_mm_add_ps(t0, t1)); + z->row2 = vec4::store_xmm(y2); + z->row3 = vec4::store_xmm(y3); } inline void mat4_rotate_x_sin_cos(float_t sin_val, float_t cos_val, mat4* y) { @@ -1307,79 +1178,64 @@ inline void mat4_rotate_z_sin_cos(float_t sin_val, float_t cos_val, mat4* y) { inline void mat4_rotate_x_mult_sin_cos(const mat4* x, float_t sin_val, float_t cos_val, mat4* z) { __m128 t1; __m128 t2; - __m128 xt; __m128 y0; __m128 y1; __m128 y2; __m128 y3; - y0 = _mm_loadu_ps((float*)&(x->row0)); - y1 = _mm_loadu_ps((float*)&(x->row1)); - y2 = _mm_loadu_ps((float*)&(x->row2)); - y3 = _mm_loadu_ps((float*)&(x->row3)); - _mm_storeu_ps((float*)&(z->row0), y0); - xt = _mm_set_ss(cos_val); - t1 = _mm_mul_ps(y1, _mm_shuffle_ps(xt, xt, 0x00)); - xt = _mm_set_ss(sin_val); - t2 = _mm_mul_ps(y2, _mm_shuffle_ps(xt, xt, 0x00)); - _mm_storeu_ps((float*)&(z->row1), _mm_add_ps(t1, t2)); - xt = _mm_set_ss(-sin_val); - t1 = _mm_mul_ps(y1, _mm_shuffle_ps(xt, xt, 0x00)); - xt = _mm_set_ss(cos_val); - t2 = _mm_mul_ps(y2, _mm_shuffle_ps(xt, xt, 0x00)); - _mm_storeu_ps((float*)&(z->row2), _mm_add_ps(t1, t2)); - _mm_storeu_ps((float*)&(z->row3), y3); + y0 = vec4::load_xmm(x->row0); + y1 = vec4::load_xmm(x->row1); + y2 = vec4::load_xmm(x->row2); + y3 = vec4::load_xmm(x->row3); + z->row0 = vec4::store_xmm(y0); + t1 = _mm_mul_ps(y1, vec4::load_xmm(cos_val)); + t2 = _mm_mul_ps(y2, vec4::load_xmm(sin_val)); + z->row1 = vec4::store_xmm(_mm_add_ps(t1, t2)); + t1 = _mm_mul_ps(y1, vec4::load_xmm(-sin_val)); + t2 = _mm_mul_ps(y2, vec4::load_xmm(cos_val)); + z->row2 = vec4::store_xmm(_mm_add_ps(t1, t2)); + z->row3 = vec4::store_xmm(y3); } inline void mat4_rotate_y_mult_sin_cos(const mat4* x, float_t sin_val, float_t cos_val, mat4* z) { __m128 t0; __m128 t2; - __m128 xt; __m128 y0; __m128 y1; __m128 y2; __m128 y3; - y0 = _mm_loadu_ps((float*)&(x->row0)); - y1 = _mm_loadu_ps((float*)&(x->row1)); - y2 = _mm_loadu_ps((float*)&(x->row2)); - y3 = _mm_loadu_ps((float*)&(x->row3)); - xt = _mm_set_ss(cos_val); - t0 = _mm_mul_ps(y0, _mm_shuffle_ps(xt, xt, 0x00)); - xt = _mm_set_ss(-sin_val); - t2 = _mm_mul_ps(y2, _mm_shuffle_ps(xt, xt, 0x00)); - _mm_storeu_ps((float*)&(z->row0), _mm_add_ps(t0, t2)); - _mm_storeu_ps((float*)&(z->row1), y1); - xt = _mm_set_ss(sin_val); - t0 = _mm_mul_ps(y0, _mm_shuffle_ps(xt, xt, 0x00)); - xt = _mm_set_ss(cos_val); - t2 = _mm_mul_ps(y2, _mm_shuffle_ps(xt, xt, 0x00)); - _mm_storeu_ps((float*)&(z->row2), _mm_add_ps(t0, t2)); - _mm_storeu_ps((float*)&(z->row3), y3); + y0 = vec4::load_xmm(x->row0); + y1 = vec4::load_xmm(x->row1); + y2 = vec4::load_xmm(x->row2); + y3 = vec4::load_xmm(x->row3); + t0 = _mm_mul_ps(y0, vec4::load_xmm(cos_val)); + t2 = _mm_mul_ps(y2, vec4::load_xmm(-sin_val)); + z->row0 = vec4::store_xmm(_mm_add_ps(t0, t2)); + z->row1 = vec4::store_xmm(y1); + t0 = _mm_mul_ps(y0, vec4::load_xmm(sin_val)); + t2 = _mm_mul_ps(y2, vec4::load_xmm(cos_val)); + z->row2 = vec4::store_xmm(_mm_add_ps(t0, t2)); + z->row3 = vec4::store_xmm(y3); } inline void mat4_rotate_z_mult_sin_cos(const mat4* x, float_t sin_val, float_t cos_val, mat4* z) { __m128 t0; __m128 t1; - __m128 xt; __m128 y0; __m128 y1; __m128 y2; __m128 y3; - y0 = _mm_loadu_ps((float*)&(x->row0)); - y1 = _mm_loadu_ps((float*)&(x->row1)); - y2 = _mm_loadu_ps((float*)&(x->row2)); - y3 = _mm_loadu_ps((float*)&(x->row3)); - xt = _mm_set_ss(cos_val); - t0 = _mm_mul_ps(y0, _mm_shuffle_ps(xt, xt, 0x00)); - xt = _mm_set_ss(sin_val); - t1 = _mm_mul_ps(y1, _mm_shuffle_ps(xt, xt, 0x00)); - _mm_storeu_ps((float*)&(z->row0), _mm_add_ps(t0, t1)); - xt = _mm_set_ss(-sin_val); - t0 = _mm_mul_ps(y0, _mm_shuffle_ps(xt, xt, 0x00)); - xt = _mm_set_ss(cos_val); - t1 = _mm_mul_ps(y1, _mm_shuffle_ps(xt, xt, 0x00)); - _mm_storeu_ps((float*)&(z->row1), _mm_add_ps(t0, t1)); - _mm_storeu_ps((float*)&(z->row2), y2); - _mm_storeu_ps((float*)&(z->row3), y3); + y0 = vec4::load_xmm(x->row0); + y1 = vec4::load_xmm(x->row1); + y2 = vec4::load_xmm(x->row2); + y3 = vec4::load_xmm(x->row3); + t0 = _mm_mul_ps(y0, vec4::load_xmm(cos_val)); + t1 = _mm_mul_ps(y1, vec4::load_xmm(sin_val)); + z->row0 = vec4::store_xmm(_mm_add_ps(t0, t1)); + t0 = _mm_mul_ps(y0, vec4::load_xmm(-sin_val)); + t1 = _mm_mul_ps(y1, vec4::load_xmm(cos_val)); + z->row1 = vec4::store_xmm(_mm_add_ps(t0, t1)); + z->row2 = vec4::store_xmm(y2); + z->row3 = vec4::store_xmm(y3); } inline void mat4_scale(float_t x, float_t y, float_t z, mat4* d) { @@ -1569,71 +1425,59 @@ inline void mat4_translate_z(float_t x, mat4* y) { } inline void mat4_translate_mult(const mat4* s, float_t x, float_t y, float_t z, mat4* d) { + __m128 yt; __m128 yt0; __m128 yt1; __m128 yt2; __m128 yt3; - __m128 yt4; if (s != d) *d = *s; if (x != 0.0f || y != 0.0f || z != 0.0f) { - yt0 = _mm_loadu_ps((float*)&(s->row0)); - yt1 = _mm_loadu_ps((float*)&(s->row1)); - yt2 = _mm_loadu_ps((float*)&(s->row2)); - yt3 = _mm_loadu_ps((float*)&(s->row3)); - yt4 = _mm_set_ss(x); - yt0 = _mm_mul_ps(yt0, _mm_shuffle_ps(yt4, yt4, 0)); - yt4 = _mm_set_ss(y); - yt1 = _mm_mul_ps(yt1, _mm_shuffle_ps(yt4, yt4, 0)); - yt4 = _mm_set_ss(z); - yt2 = _mm_mul_ps(yt2, _mm_shuffle_ps(yt4, yt4, 0)); - yt4 = _mm_add_ps(_mm_add_ps(yt0, yt1), _mm_add_ps(yt2, yt3)); - *(vec3*)&d->row3 = *(vec3*)&yt4; + yt0 = _mm_mul_ps(vec4::load_xmm(s->row0), vec4::load_xmm(x)); + yt1 = _mm_mul_ps(vec4::load_xmm(s->row1), vec4::load_xmm(y)); + yt2 = _mm_mul_ps(vec4::load_xmm(s->row2), vec4::load_xmm(z)); + yt3 = vec4::load_xmm(s->row3); + yt = _mm_add_ps(_mm_add_ps(yt0, yt1), _mm_add_ps(yt2, yt3)); + *(vec3*)&d->row3 = vec3::store_xmm(yt); } } inline void mat4_translate_x_mult(const mat4* x, float_t y, mat4* z) { __m128 yt0; __m128 yt1; - __m128 yt2; if (x != z) *z = *x; if (y != 0.0f) { - yt0 = _mm_loadu_ps((float*)&(x->row0)); - yt1 = _mm_loadu_ps((float*)&(x->row3)); - yt2 = _mm_set_ss(y); - yt0 = _mm_add_ps(_mm_mul_ps(yt0, _mm_shuffle_ps(yt2, yt2, 0)), yt1); - *(vec3*)&z->row3 = *(vec3*)&yt0; + yt0 = vec4::load_xmm(x->row0); + yt1 = vec4::load_xmm(x->row3); + yt0 = _mm_add_ps(_mm_mul_ps(yt0, vec4::load_xmm(y)), yt1); + *(vec3*)&z->row3 = vec3::store_xmm(yt0); } } inline void mat4_translate_y_mult(const mat4* x, float_t y, mat4* z) { __m128 yt0; __m128 yt1; - __m128 yt2; if (x != z) *z = *x; if (y != 0.0f) { - yt0 = _mm_loadu_ps((float*)&(x->row1)); - yt1 = _mm_loadu_ps((float*)&(x->row3)); - yt2 = _mm_set_ss(y); - yt0 = _mm_add_ps(_mm_mul_ps(yt0, _mm_shuffle_ps(yt2, yt2, 0)), yt1); - *(vec3*)&z->row3 = *(vec3*)&yt0; + yt0 = vec4::load_xmm(x->row1); + yt1 = vec4::load_xmm(x->row3); + yt0 = _mm_add_ps(_mm_mul_ps(yt0, vec4::load_xmm(y)), yt1); + *(vec3*)&z->row3 = vec3::store_xmm(yt0); } } inline void mat4_translate_z_mult(const mat4* x, float_t y, mat4* z) { __m128 yt0; __m128 yt1; - __m128 yt2; if (x != z) *z = *x; if (y != 0.0f) { - yt0 = _mm_loadu_ps((float*)&(x->row2)); - yt1 = _mm_loadu_ps((float*)&(x->row3)); - yt2 = _mm_set_ss(y); - yt0 = _mm_add_ps(_mm_mul_ps(yt0, _mm_shuffle_ps(yt2, yt2, 0)), yt1); - *(vec3*)&z->row3 = *(vec3*)&yt0; + yt0 = vec4::load_xmm(x->row2); + yt1 = vec4::load_xmm(x->row3); + yt0 = _mm_add_ps(_mm_mul_ps(yt0, vec4::load_xmm(y)), yt1); + *(vec3*)&z->row3 = vec3::store_xmm(yt0); } } @@ -1641,8 +1485,7 @@ inline void mat4_translate_add(const mat4* s, float_t x, float_t y, float_t z, m if (s != d) *d = *s; if (x != 0.0f || y != 0.0f || z != 0.0f) - _mm_storeu_ps((float*)&(d->row3), _mm_add_ps( - _mm_loadu_ps((float*)&(s->row3)), _mm_set_ps(x, y, z, 0.0f))); + d->row3 = vec4::store_xmm(_mm_add_ps(vec4::load_xmm(s->row3), vec4::load_xmm(vec4(x, y, z, 0.0f)))); } inline void mat4_translate_x_add(const mat4* x, float_t y, mat4* z) { diff --git a/src/KKdLib/mat.hpp b/src/KKdLib/mat.hpp index b7639d51..668fb333 100644 --- a/src/KKdLib/mat.hpp +++ b/src/KKdLib/mat.hpp @@ -57,7 +57,7 @@ extern void mat3_inverse_normalized(const mat3* x, mat3* z); extern void mat3_normalize(const mat3* x, mat3* z); extern void mat3_normalize_rotation(const mat3* x, mat3* z); extern float_t mat3_determinant(const mat3* x); -extern void mat3_rotate(float_t x, float_t y, float_t z, mat3* w); +extern void mat3_rotate(float_t x, float_t y, float_t z, mat3* d); extern void mat3_rotate_x(float_t x, mat3* y); extern void mat3_rotate_y(float_t x, mat3* y); extern void mat3_rotate_z(float_t x, mat3* y); @@ -65,13 +65,13 @@ extern void mat3_rotate_mult(const mat3* s, float_t x, float_t y, float_t z, mat extern void mat3_rotate_x_mult(const mat3* x, float_t y, mat3* z); extern void mat3_rotate_y_mult(const mat3* x, float_t y, mat3* z); extern void mat3_rotate_z_mult(const mat3* x, float_t y, mat3* z); -extern void mat3_rotate(float_t x, float_t y, float_t z, mat3* w); extern void mat3_rotate_x_sin_cos(float_t sin_val, float_t cos_val, mat3* y); extern void mat3_rotate_y_sin_cos(float_t sin_val, float_t cos_val, mat3* y); extern void mat3_rotate_z_sin_cos(float_t sin_val, float_t cos_val, mat3* y); extern void mat3_rotate_x_mult_sin_cos(const mat3* x, float_t sin_val, float_t cos_val, mat3* z); extern void mat3_rotate_y_mult_sin_cos(const mat3* x, float_t sin_val, float_t cos_val, mat3* z); extern void mat3_rotate_z_mult_sin_cos(const mat3* x, float_t sin_val, float_t cos_val, mat3* z); +extern void mat3_scale(float_t x, float_t y, float_t z, mat3* d); extern void mat3_scale_x(float_t x, mat3* y); extern void mat3_scale_y(float_t x, mat3* y); extern void mat3_scale_z(float_t x, mat3* y); @@ -167,3 +167,51 @@ extern void mat4_ortho(double_t left, double_t right, extern void mat4_persp(double_t fov_y, double_t aspect, double_t z_near, double_t z_far, mat4* mat); extern void mat4_look_at(const vec3* eye, const vec3* target, const vec3* up, mat4* mat); extern void mat4_look_at(const vec3* eye, const vec3* target, mat4* mat); + +inline void mat3_rotate(const vec3* s, mat3* d) { + mat3_rotate(s->x, s->y, s->z, d); +} + +inline void mat3_rotate_mult(const mat3* s, const vec3* y, mat3* d) { + mat3_rotate_mult(s, y->x, y->y, y->z, d); +} + +inline void mat3_scale(const vec3* s, mat3* d) { + mat3_scale(s->x, s->y, s->z, d); +} + +inline void mat3_scale_mult(const mat3* s, const vec3* y, mat3* d) { + mat3_scale_mult(s, y->x, y->y, y->z, d); +} + +inline void mat4_rotate(const vec3* s, mat4* d) { + mat4_rotate(s->x, s->y, s->z, d); +} + +inline void mat4_rotate_mult(const mat4* s, const vec3* y, mat4* d) { + mat4_rotate_mult(s, y->x, y->y, y->z, d); +} + +inline void mat4_scale(const vec3* s, mat4* d) { + mat4_scale(s->x, s->y, s->z, d); +} + +inline void mat4_scale_mult(const mat4* s, const vec4* y, mat4* d) { + mat4_scale_mult(s, y->x, y->y, y->z, y->w, d); +} + +inline void mat4_scale_rot(const mat4* s, const vec3* y, mat4* d) { + mat4_scale_rot(s, y->x, y->y, y->z, d); +} + +inline void mat4_translate(const vec3* s, mat4* d) { + mat4_translate(s->x, s->y, s->z, d); +} + +inline void mat4_translate_mult(const mat4* s, const vec3* y, mat4* d) { + mat4_translate_mult(s, y->x, y->y, y->z, d); +} + +inline void mat4_translate_add(const mat4* s, const vec3* y, mat4* d) { + mat4_translate_add(s, y->x, y->y, y->z, d); +} diff --git a/src/KKdLib/mot.cpp b/src/KKdLib/mot.cpp index 400a860a..6369d7ae 100644 --- a/src/KKdLib/mot.cpp +++ b/src/KKdLib/mot.cpp @@ -13,7 +13,7 @@ #include "str_utils.hpp" struct mot_header_classic { - uint32_t key_set_count_offset; + uint32_t key_set_info_offset; uint32_t key_set_types_offset; uint32_t key_set_offset; uint32_t bone_info_offset; @@ -22,7 +22,7 @@ struct mot_header_classic { struct mot_header_modern { uint32_t hash; int64_t name_offset; - int64_t key_set_count_offset; + int64_t key_set_info_offset; int64_t key_set_types_offset; int64_t key_set_offset; int64_t bone_info_offset; @@ -333,7 +333,7 @@ static void mot_classic_read_inner(mot_set* ms, stream& s) { ms->vec.resize(count); mot_header_classic* mh = force_malloc_s(mot_header_classic, count); for (size_t i = 0; i < count; i++) { - mh[i].key_set_count_offset = s.read_uint32_t(); + mh[i].key_set_info_offset = s.read_uint32_t(); mh[i].key_set_types_offset = s.read_uint32_t(); mh[i].key_set_offset = s.read_uint32_t(); mh[i].bone_info_offset = s.read_uint32_t(); @@ -354,7 +354,7 @@ static void mot_classic_read_inner(mot_set* ms, stream& s) { for (size_t j = 0; j < m->bone_info_count; j++) m->bone_info[j].index = s.read_uint16_t(); - s.set_position(mh[i].key_set_count_offset, SEEK_SET); + s.set_position(mh[i].key_set_info_offset, SEEK_SET); m->info = s.read_uint16_t(); m->frame_count = s.read_uint16_t(); @@ -421,7 +421,7 @@ static void mot_classic_write_inner(mot_set* ms, stream& s) { for (size_t i = 0; i < count; i++) { mot_data* m = &ms->vec[i]; - mh[i].key_set_count_offset = (uint32_t)s.get_position(); + mh[i].key_set_info_offset = (uint32_t)s.get_position(); s.write_uint16_t(m->info); s.write_uint16_t(m->frame_count); @@ -481,7 +481,7 @@ static void mot_classic_write_inner(mot_set* ms, stream& s) { s.set_position(0x00, SEEK_SET); for (size_t i = 0; i < count; i++) { - s.write_uint32_t(mh[i].key_set_count_offset); + s.write_uint32_t(mh[i].key_set_info_offset); s.write_uint32_t(mh[i].key_set_types_offset); s.write_uint32_t(mh[i].key_set_offset); s.write_uint32_t(mh[i].bone_info_offset); @@ -511,12 +511,11 @@ static void mot_modern_read_inner(mot_set* ms, stream& s) { s_motc.set_position(0x00, SEEK_SET); ms->vec.resize(1); - mot_header_modern mh; - memset(&mh, 0, sizeof(mot_header_modern)); + mot_header_modern mh = {}; if (!is_x) { mh.hash = (uint32_t)s_motc.read_uint64_t_reverse_endianness(); mh.name_offset = s_motc.read_offset_f2(st.header.length); - mh.key_set_count_offset = s_motc.read_offset_f2(st.header.length); + mh.key_set_info_offset = s_motc.read_offset_f2(st.header.length); mh.key_set_types_offset = s_motc.read_offset_f2(st.header.length); mh.key_set_offset = s_motc.read_offset_f2(st.header.length); mh.bone_info_offset = s_motc.read_offset_f2(st.header.length); @@ -526,7 +525,7 @@ static void mot_modern_read_inner(mot_set* ms, stream& s) { else { mh.hash = (uint32_t)s_motc.read_uint64_t_reverse_endianness(); mh.name_offset = s_motc.read_offset_x(); - mh.key_set_count_offset = s_motc.read_offset_x(); + mh.key_set_info_offset = s_motc.read_offset_x(); mh.key_set_types_offset = s_motc.read_offset_x(); mh.key_set_offset = s_motc.read_offset_x(); mh.bone_info_offset = s_motc.read_offset_x(); @@ -556,7 +555,7 @@ static void mot_modern_read_inner(mot_set* ms, stream& s) { for (size_t j = 0; j < mh.bone_info_count; j++) s_motc.read_uint64_t_reverse_endianness(); - s_motc.set_position(mh.key_set_count_offset, SEEK_SET); + s_motc.set_position(mh.key_set_info_offset, SEEK_SET); m->info = s_motc.read_uint16_t_reverse_endianness(); m->frame_count = s_motc.read_uint16_t_reverse_endianness(); @@ -639,8 +638,7 @@ static void mot_modern_write_inner(mot_set* ms, stream& s) { pof pof; uint32_t murmurhash = 0; if (ms->vec.size() > 0) { - mot_header_modern mh; - memset(&mh, 0, sizeof(mot_header_modern)); + mot_header_modern mh = {}; mot_data* m = &ms->vec[0]; if (!is_x) { @@ -764,7 +762,7 @@ static void mot_modern_write_inner(mot_set* ms, stream& s) { mh.hash = hash_string_murmurhash(m->name); - mh.key_set_count_offset = s_motc.get_position(); + mh.key_set_info_offset = s_motc.get_position(); s_motc.write_uint16_t_reverse_endianness(m->info); s_motc.write_uint16_t_reverse_endianness(m->frame_count); @@ -863,7 +861,7 @@ static void mot_modern_write_inner(mot_set* ms, stream& s) { if (!is_x) { s_motc.write_uint64_t_reverse_endianness((uint64_t)mh.hash); s_motc.write_offset_f2(mh.name_offset, 0x40); - s_motc.write_offset_f2(mh.key_set_count_offset, 0x40); + s_motc.write_offset_f2(mh.key_set_info_offset, 0x40); s_motc.write_offset_f2(mh.key_set_types_offset, 0x40); s_motc.write_offset_f2(mh.key_set_offset, 0x40); s_motc.write_offset_f2(mh.bone_info_offset, 0x40); @@ -873,7 +871,7 @@ static void mot_modern_write_inner(mot_set* ms, stream& s) { else { s_motc.write_uint64_t_reverse_endianness((uint64_t)mh.hash); s_motc.write_offset_x(mh.name_offset); - s_motc.write_offset_x(mh.key_set_count_offset); + s_motc.write_offset_x(mh.key_set_info_offset); s_motc.write_offset_x(mh.key_set_types_offset); s_motc.write_offset_x(mh.key_set_offset); s_motc.write_offset_x(mh.bone_info_offset); diff --git a/src/KKdLib/msgpack.cpp b/src/KKdLib/msgpack.cpp index 0ec2b063..c11db0a7 100644 --- a/src/KKdLib/msgpack.cpp +++ b/src/KKdLib/msgpack.cpp @@ -115,8 +115,13 @@ msgpack* msgpack::read(const char* name, msgpack_type type) { return 0; msgpack* m = name ? get_by_name(name) : this; - if (m && m->type == type) + if (m) { + if (m->type == type) + return m; + else if (m->type >= MSGPACK_INT8 && m->type <= MSGPACK_FLOAT64 && m->type <= type) + return m; return m; + } return 0; } @@ -158,10 +163,12 @@ int8_t msgpack::read_int8_t(const char* name) { if (!m) return 0; - if (m->type == MSGPACK_INT8) + switch (m->type) { + case MSGPACK_INT8: return m->data.i8; - else if (m->type == MSGPACK_UINT8) + case MSGPACK_UINT8: return (int8_t)m->data.u8; + } return 0; } @@ -173,10 +180,12 @@ uint8_t msgpack::read_uint8_t(const char* name) { if (!m) return 0; - if (m->type == MSGPACK_INT8) + switch (m->type) { + case MSGPACK_INT8: return (uint8_t)m->data.i8; - else if (m->type == MSGPACK_UINT8) + case MSGPACK_UINT8: return m->data.u8; + } return 0; } @@ -188,14 +197,16 @@ int16_t msgpack::read_int16_t(const char* name) { if (!m) return 0; - if (m->type == MSGPACK_INT8) + switch (m->type) { + case MSGPACK_INT8: return m->data.i8; - else if (m->type == MSGPACK_UINT8) + case MSGPACK_UINT8: return m->data.u8; - else if (m->type == MSGPACK_INT16) + case MSGPACK_INT16: return m->data.i16; - else if (m->type == MSGPACK_UINT16) + case MSGPACK_UINT16: return (int16_t)m->data.u16; + } return 0; } @@ -207,14 +218,16 @@ uint16_t msgpack::read_uint16_t(const char* name) { if (!m) return 0; - if (m->type == MSGPACK_INT8) + switch (m->type) { + case MSGPACK_INT8: return (uint16_t)(int16_t)m->data.i8; - else if (m->type == MSGPACK_UINT8) + case MSGPACK_UINT8: return m->data.u8; - else if (m->type == MSGPACK_INT16) - return (uint16_t)(int16_t)m->data.i16; - else if (m->type == MSGPACK_UINT16) + case MSGPACK_INT16: + return (uint16_t)m->data.i16; + case MSGPACK_UINT16: return m->data.u16; + } return 0; } @@ -226,18 +239,20 @@ int32_t msgpack::read_int32_t(const char* name) { if (!m) return 0; - if (m->type == MSGPACK_INT8) + switch (m->type) { + case MSGPACK_INT8: return m->data.i8; - else if (m->type == MSGPACK_UINT8) + case MSGPACK_UINT8: return m->data.u8; - else if (m->type == MSGPACK_INT16) + case MSGPACK_INT16: return m->data.i16; - else if (m->type == MSGPACK_UINT16) + case MSGPACK_UINT16: return m->data.u16; - else if (m->type == MSGPACK_INT32) + case MSGPACK_INT32: return m->data.i32; - else if (m->type == MSGPACK_UINT32) + case MSGPACK_UINT32: return (int32_t)m->data.u32; + } return 0; } @@ -249,18 +264,20 @@ uint32_t msgpack::read_uint32_t(const char* name) { if (!m) return 0; - if (m->type == MSGPACK_INT8) + switch (m->type) { + case MSGPACK_INT8: return (uint32_t)(int32_t)m->data.i8; - else if (m->type == MSGPACK_UINT8) + case MSGPACK_UINT8: return m->data.u8; - else if (m->type == MSGPACK_INT16) + case MSGPACK_INT16: return (uint32_t)(int32_t)m->data.i16; - else if (m->type == MSGPACK_UINT16) + case MSGPACK_UINT16: return m->data.u16; - else if (m->type == MSGPACK_INT32) + case MSGPACK_INT32: return (uint32_t)(int32_t)m->data.i32; - else if (m->type == MSGPACK_UINT32) + case MSGPACK_UINT32: return m->data.u32; + } return 0; } @@ -272,22 +289,24 @@ int64_t msgpack::read_int64_t(const char* name) { if (!m) return 0; - if (m->type == MSGPACK_INT8) + switch (m->type) { + case MSGPACK_INT8: return m->data.i8; - else if (m->type == MSGPACK_UINT8) + case MSGPACK_UINT8: return m->data.u8; - else if (m->type == MSGPACK_INT16) + case MSGPACK_INT16: return m->data.i16; - else if (m->type == MSGPACK_UINT16) + case MSGPACK_UINT16: return m->data.u16; - else if (m->type == MSGPACK_INT32) + case MSGPACK_INT32: return m->data.i32; - else if (m->type == MSGPACK_UINT32) + case MSGPACK_UINT32: return m->data.u32; - else if (m->type == MSGPACK_INT64) + case MSGPACK_INT64: return m->data.i64; - else if (m->type == MSGPACK_UINT64) + case MSGPACK_UINT64: return (int64_t)m->data.u64; + } return 0; } @@ -299,22 +318,24 @@ uint64_t msgpack::read_uint64_t(const char* name) { if (!m) return 0; - if (m->type == MSGPACK_INT8) + switch (m->type) { + case MSGPACK_INT8: return (uint64_t)(int64_t)m->data.i8; - else if (m->type == MSGPACK_UINT8) + case MSGPACK_UINT8: return m->data.u8; - else if (m->type == MSGPACK_INT16) + case MSGPACK_INT16: return (uint64_t)(int64_t)m->data.i16; - else if (m->type == MSGPACK_UINT16) + case MSGPACK_UINT16: return m->data.u16; - else if (m->type == MSGPACK_INT32) + case MSGPACK_INT32: return (uint64_t)(int64_t)m->data.i32; - else if (m->type == MSGPACK_UINT32) + case MSGPACK_UINT32: return m->data.u32; - else if (m->type == MSGPACK_INT32) + case MSGPACK_INT64: return (uint64_t)m->data.i64; - else if (m->type == MSGPACK_UINT32) + case MSGPACK_UINT64: return m->data.u64; + } return 0; } @@ -326,26 +347,28 @@ float_t msgpack::read_float_t(const char* name) { if (!m) return 0; - if (m->type == MSGPACK_INT8) + switch (m->type) { + case MSGPACK_INT8: return m->data.i8; - else if (m->type == MSGPACK_UINT8) + case MSGPACK_UINT8: return m->data.u8; - else if (m->type == MSGPACK_INT16) + case MSGPACK_INT16: return m->data.i16; - else if (m->type == MSGPACK_UINT16) + case MSGPACK_UINT16: return m->data.u16; - else if (m->type == MSGPACK_INT32) + case MSGPACK_INT32: return (float_t)m->data.i32; - else if (m->type == MSGPACK_UINT32) + case MSGPACK_UINT32: return (float_t)m->data.u32; - else if (m->type == MSGPACK_INT64) + case MSGPACK_INT64: return (float_t)m->data.i64; - else if (m->type == MSGPACK_UINT64) + case MSGPACK_UINT64: return (float_t)m->data.u64; - else if (m->type == MSGPACK_FLOAT) + case MSGPACK_FLOAT32: return m->data.f32; - else if (m->type == MSGPACK_DOUBLE) - return (float_t)m->data.f64; + case MSGPACK_FLOAT64: + return (float_t)m->data.f64;; + } return 0; } @@ -357,26 +380,28 @@ double_t msgpack::read_double_t(const char* name) { if (!m) return 0; - if (m->type == MSGPACK_INT8) + switch (m->type) { + case MSGPACK_INT8: return m->data.i8; - else if (m->type == MSGPACK_UINT8) + case MSGPACK_UINT8: return m->data.u8; - else if (m->type == MSGPACK_INT16) + case MSGPACK_INT16: return m->data.i16; - else if (m->type == MSGPACK_UINT16) + case MSGPACK_UINT16: return m->data.u16; - else if (m->type == MSGPACK_INT32) + case MSGPACK_INT32: return m->data.i32; - else if (m->type == MSGPACK_UINT32) + case MSGPACK_UINT32: return m->data.u32; - else if (m->type == MSGPACK_INT64) + case MSGPACK_INT64: return (double_t)m->data.i64; - else if (m->type == MSGPACK_UINT64) + case MSGPACK_UINT64: return (double_t)m->data.u64; - else if (m->type == MSGPACK_FLOAT) + case MSGPACK_FLOAT32: return m->data.f32; - else if (m->type == MSGPACK_DOUBLE) - return m->data.f64; + case MSGPACK_FLOAT64: + return m->data.f64;; + } return 0; } @@ -426,9 +451,6 @@ std::wstring msgpack::read_wstring(const char* name) { } msgpack& msgpack::operator=(const msgpack& m) { - if (this == &m) - return *this; - switch (m.type) { case MSGPACK_BOOL: case MSGPACK_INT8: @@ -439,8 +461,8 @@ msgpack& msgpack::operator=(const msgpack& m) { case MSGPACK_UINT32: case MSGPACK_INT64: case MSGPACK_UINT64: - case MSGPACK_FLOAT: - case MSGPACK_DOUBLE: + case MSGPACK_FLOAT32: + case MSGPACK_FLOAT64: switch (type) { case MSGPACK_STRING: delete data.str; @@ -510,7 +532,7 @@ msgpack& msgpack::operator=(const msgpack& m) { data.map->assign(m.data.map->begin(), m.data.map->end()); break; default: - memset(&data, 0, sizeof(data)); + data = {}; break; } type = m.type; diff --git a/src/KKdLib/msgpack.hpp b/src/KKdLib/msgpack.hpp index ceac9395..13a6ff0a 100644 --- a/src/KKdLib/msgpack.hpp +++ b/src/KKdLib/msgpack.hpp @@ -21,8 +21,8 @@ enum msgpack_type : uint32_t { MSGPACK_UINT32, MSGPACK_INT64, MSGPACK_UINT64, - MSGPACK_FLOAT, - MSGPACK_DOUBLE, + MSGPACK_FLOAT32, + MSGPACK_FLOAT64, MSGPACK_STRING, MSGPACK_ARRAY, MSGPACK_MAP, @@ -89,9 +89,6 @@ struct msgpack { } inline msgpack(const msgpack& m) : type(), data() { - if (this == &m) - return; - switch (m.type) { case MSGPACK_BOOL: case MSGPACK_INT8: @@ -102,8 +99,8 @@ struct msgpack { case MSGPACK_UINT32: case MSGPACK_INT64: case MSGPACK_UINT64: - case MSGPACK_FLOAT: - case MSGPACK_DOUBLE: + case MSGPACK_FLOAT32: + case MSGPACK_FLOAT64: switch (type) { case MSGPACK_STRING: delete data.str; @@ -173,7 +170,7 @@ struct msgpack { data.map->assign(m.data.map->begin(), m.data.map->end()); break; default: - memset(&data, 0, sizeof(data)); + data = {}; break; } type = m.type; @@ -256,12 +253,12 @@ struct msgpack { } inline msgpack(float_t val) : data() { - type = MSGPACK_FLOAT; + type = MSGPACK_FLOAT32; data.f32 = val; } inline msgpack(double_t val) : data() { - type = MSGPACK_DOUBLE; + type = MSGPACK_FLOAT64; data.f64 = val; } @@ -359,6 +356,6 @@ struct msgpack { break; } type = MSGPACK_NONE; - memset(&data, 0, sizeof(data)); + data = {}; } }; diff --git a/src/KKdLib/obj.cpp b/src/KKdLib/obj.cpp index 429dc8fe..c1c020a8 100644 --- a/src/KKdLib/obj.cpp +++ b/src/KKdLib/obj.cpp @@ -35,27 +35,27 @@ struct obj_skin_block_header { }; struct obj_skin_ex_data_header { - uint32_t osage_count; - int64_t osage_nodes_offset; - int64_t osage_names_offset; - int64_t blocks_offset; - uint32_t bone_names_count; - int64_t bone_names_offset; - int64_t osage_sibling_infos_offset; + uint32_t num_osage; + int64_t osage_node_array_offset; + int64_t osage_name_array_offset; + int64_t block_array_offset; + uint32_t num_bone_name; + int64_t bone_name_array_offset; + int64_t osage_sibling_info_array_offset; uint32_t cloth_count; }; struct obj_skin_header { - int64_t bone_ids_offset; - int64_t bone_matrices_offset; - int64_t bone_names_offset; + int64_t bone_id_array_offset; + int64_t bone_matrix_array_offset; + int64_t bone_name_array_offset; int64_t ex_data_offset; - int64_t bone_parent_ids_offset; + int64_t bone_parent_id_array_offset; }; struct obj_sub_mesh_header { - int64_t bone_indices_offset; - int64_t indices_offset; + int64_t bone_index_array_offset; + int64_t index_array_offset; }; struct obj_mesh_header { @@ -64,7 +64,7 @@ struct obj_mesh_header { uint32_t size_vertex; uint32_t num_vertex; int64_t vertex[20]; - uint32_t vertex_flags; + uint32_t vertex_format_index; }; struct obj_header { @@ -81,7 +81,7 @@ struct obj_set_header { int64_t tex_id_data; }; -const char obj_material_texture_enrs_table_bin[] = +const uint8_t obj_material_texture_enrs_table_bin[] = "\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" "\x00\x40\xBA\x44\xB0\x01\x10\x02\x18\x01\x10\x01\x10\x01\x10\x01" "\x18\x01\x10\x01\x10\x01\x10\x01\x10\x01\x10\x01\x10\x01\x10\x01" @@ -114,133 +114,166 @@ static bool obj_material_texture_enrs_table_initialized; static void obj_material_texture_enrs_table_init(); static void obj_material_texture_enrs_table_free(void); + static void obj_vertex_add_bone_weight(vec4& bone_weight, vec4i& bone_index, int32_t index, float_t weight); -static void obj_vertex_generate_tangents(obj* obj, obj_mesh* mesh); +static void obj_vertex_generate_tangents(obj_mesh* mesh); static void obj_vertex_validate_bone_data(vec4& bone_weight, vec4i& bone_index); -static void obj_set_classic_read_inner(obj_set* os, stream& s); + +static void obj_set_classic_read_inner(obj_set* os, prj::shared_ptr& alloc, stream& s); static void obj_set_classic_write_inner(obj_set* os, stream& s); -static void obj_classic_read_index(obj* obj, stream& s, obj_sub_mesh* sub_mesh); -static void obj_classic_write_index(obj* obj, stream& s, obj_sub_mesh* sub_mesh); -static void obj_classic_read_model(obj* obj, stream& s, int64_t base_offset); +static void obj_classic_read_index(obj_sub_mesh* sub_mesh, prj::shared_ptr alloc, stream& s); +static void obj_classic_write_index(obj_sub_mesh* sub_mesh, stream& s); +static void obj_classic_read_model(obj* obj, prj::shared_ptr alloc, stream& s, int64_t base_offset); static void obj_classic_write_model(obj* obj, stream& s, int64_t base_offset); -static void obj_classic_read_skin(obj* obj, stream& s, int64_t base_offset); -static void obj_classic_write_skin(obj* obj, stream& s, int64_t base_offset); -static void obj_classic_read_skin_block_cloth(obj_skin_block_cloth* b, - stream& s, char** str); -static void obj_classic_write_skin_block_cloth(obj_skin_block_cloth* b, +static void obj_classic_read_model_mesh(obj_mesh* mesh, + prj::shared_ptr alloc, stream& s, int64_t base_offset); +static void obj_classic_read_model_sub_mesh(obj_sub_mesh* sub_mesh, + prj::shared_ptr alloc, stream& s, int64_t base_offset); +static obj_skin* obj_classic_read_skin(prj::shared_ptr alloc, stream& s, int64_t base_offset); +static void obj_classic_write_skin(obj_skin* sk, stream& s, int64_t base_offset); +static obj_skin_ex_data* obj_classic_read_skin_ex_data(prj::shared_ptr alloc, + stream& s, int64_t base_offset); +static obj_skin_block_cloth* obj_classic_read_skin_block_cloth( + prj::shared_ptr alloc, stream& s, const char** str); +static void obj_classic_write_skin_block_cloth(obj_skin_block_cloth* cls, stream& s, std::vector& strings, std::vector& string_offsets, - int64_t* mats_offset, int64_t* root_offset, int64_t* nodes_offset, - int64_t* mesh_indices_offset, int64_t* backface_mesh_indices_offset); -static void obj_classic_read_skin_block_cloth_root_bone_weight(obj_skin_block_cloth_root_bone_weight* sub, - stream& s, char** str); -static void obj_classic_write_skin_block_cloth_root_bone_weight(obj_skin_block_cloth_root_bone_weight* sub, + int64_t* mat_array_offset, int64_t* root_array_offset, int64_t* node_array_offset, + int64_t* mesh_index_array_offset, int64_t* backface_mesh_index_array_offset); +static void obj_classic_read_skin_block_cloth_root(obj_skin_block_cloth_root* cloth_root, + prj::shared_ptr alloc, stream& s, const char** str); +static void obj_classic_write_skin_block_cloth_root(obj_skin_block_cloth_root* cloth_root, stream& s, std::vector& strings, std::vector& string_offsets); -static void obj_classic_read_skin_block_constraint(obj_skin_block_constraint* b, - stream& s, char** str); -static void obj_classic_write_skin_block_constraint(obj_skin_block_constraint* b, +static void obj_classic_read_skin_block_cloth_root_bone_weight(obj_skin_block_cloth_root_bone_weight* bone_weight, + prj::shared_ptr alloc, stream& s, const char** str); +static void obj_classic_write_skin_block_cloth_root_bone_weight(obj_skin_block_cloth_root_bone_weight* bone_weight, + stream& s, std::vector& strings, std::vector& string_offsets); +static obj_skin_block_constraint* obj_classic_read_skin_block_constraint( + prj::shared_ptr alloc, stream& s, const char** str); +static void obj_classic_write_skin_block_constraint(obj_skin_block_constraint* cns, stream& s, std::vector& strings, std::vector& string_offsets, - char** bone_names, int64_t* offsets); -static void obj_classic_read_skin_block_constraint_attach_point(obj_skin_block_constraint_attach_point* ap, - stream& s, char** str); -static void obj_classic_write_skin_block_constraint_attach_point(obj_skin_block_constraint_attach_point* ap, + const char** bone_name_array, int64_t* offsets); +static void obj_classic_read_skin_block_constraint_attach_point(obj_skin_block_constraint_attach_point* attach_point, + stream& s, const char** str); +static void obj_classic_write_skin_block_constraint_attach_point(obj_skin_block_constraint_attach_point* attach_point, stream& s, std::vector& strings, std::vector& string_offsets); -static void obj_classic_read_skin_block_constraint_up_vector_old(obj_skin_block_constraint_up_vector* up, - stream& s, char** str); -static void obj_classic_write_skin_block_constraint_up_vector_old(obj_skin_block_constraint_up_vector* up, +static void obj_classic_read_skin_block_constraint_up_vector(obj_skin_block_constraint_up_vector* up_vector, + prj::shared_ptr alloc, stream& s, const char** str); +static void obj_classic_write_skin_block_constraint_up_vector(obj_skin_block_constraint_up_vector* up_vector, stream& s, std::vector& strings, std::vector& string_offsets); -static void obj_classic_read_skin_block_expression(obj_skin_block_expression* b, - stream& s, char** str); -static void obj_classic_write_skin_block_expression(obj_skin_block_expression* b, - stream& s, std::vector& strings, std::vector& string_offsets, char** bone_names); -static void obj_classic_read_skin_block_motion(obj_skin_block_motion* b, - stream& s, char** str); -static void obj_classic_write_skin_block_motion(obj_skin_block_motion* b, +static obj_skin_block_expression* obj_classic_read_skin_block_expression( + prj::shared_ptr alloc, stream& s, const char** str); +static void obj_classic_write_skin_block_expression(obj_skin_block_expression* exp, stream& s, std::vector& strings, std::vector& string_offsets, - char** bone_names, int64_t* bone_names_offset, int64_t* bone_matrices_offset); -static void obj_classic_read_skin_block_node(obj_skin_block_node* b, - stream& s, char** str); -static void obj_classic_write_skin_block_node(obj_skin_block_node* b, + const char** bone_name_array); +static obj_skin_block_motion* obj_classic_read_skin_block_motion( + prj::shared_ptr alloc, stream& s, const char** str); +static void obj_classic_write_skin_block_motion(obj_skin_block_motion* mot, + stream& s, std::vector& strings, std::vector& string_offsets, + const char** bone_name_array, int64_t* bone_name_array_offset, int64_t* bone_matrix_array_offset); +static void obj_classic_read_skin_block_node(obj_skin_block_node* node, + prj::shared_ptr alloc, stream& s, const char** str); +static void obj_classic_write_skin_block_node(obj_skin_block_node* node, stream& s, std::vector& strings, std::vector& string_offsets); -static void obj_classic_read_skin_block_osage(obj_skin_block_osage* b, - stream& s, char** str); -static void obj_classic_write_skin_block_osage(obj_skin_block_osage* b, - stream& s, std::vector& strings, std::vector& string_offsets, int64_t* nodes_offset); -static void obj_classic_read_skin_param(obj_skin_skin_param* skp, - stream& s, char** str); +static obj_skin_block_osage* obj_classic_read_skin_block_osage( + prj::shared_ptr alloc, stream& s, const char** str); +static void obj_classic_write_skin_block_osage(obj_skin_block_osage* osg, + stream& s, std::vector& strings, std::vector& string_offsets, int64_t* node_array_offset); +static obj_skin_skin_param* obj_classic_read_skin_param( + prj::shared_ptr alloc, stream& s, const char** str); static void obj_classic_write_skin_param(obj_skin_skin_param* skp, stream& s, std::vector& strings, std::vector& string_offsets); -static void obj_classic_read_vertex(obj* obj, stream& s, int64_t* vertex, obj_mesh* mesh, - int64_t base_offset, uint32_t num_vertex, obj_vertex_format_file vertex_format_file); -static void obj_classic_write_vertex(obj* obj, stream& s, int64_t* vertex, obj_mesh* mesh, - int64_t base_offset, uint32_t* num_vertex, obj_vertex_format_file* vertex_format_file, uint32_t* size_vertex); -static void obj_set_modern_read_inner(obj_set* os, stream& s); +static void obj_classic_read_vertex(obj_mesh* mesh, + prj::shared_ptr alloc, stream& s, int64_t* vertex, int64_t base_offset, uint32_t num_vertex, + obj_vertex_format_file vertex_format_file); +static void obj_classic_write_vertex(obj_mesh* mesh, + stream& s, int64_t* vertex, int64_t base_offset, uint32_t* num_vertex, + obj_vertex_format_file* vertex_format_file, uint32_t* size_vertex); + +static void obj_set_modern_read_inner(obj_set* os, prj::shared_ptr& alloc, stream& s); static void obj_set_modern_write_inner(obj_set* os, stream& s); -static void obj_modern_read_index(obj* obj, stream& s, - obj_sub_mesh* sub_mesh); -static void obj_modern_write_index(obj* obj, stream& s, bool is_x, - obj_sub_mesh* sub_mesh, f2_struct* ovtx); -static void obj_modern_read_model(obj* obj, stream& s, int64_t base_offset, +static void obj_modern_read_index(obj_sub_mesh* sub_mesh, prj::shared_ptr alloc, stream& s); +static void obj_modern_write_index(obj_sub_mesh* sub_mesh, stream& s, bool is_x, f2_struct* ovtx); +static void obj_modern_read_model(obj* obj, prj::shared_ptr alloc, stream& s, int64_t base_offset, uint32_t header_length, bool is_x, stream* s_oidx, stream* s_ovtx); static void obj_modern_write_model(obj* obj, stream& s, int64_t base_offset, bool is_x, f2_struct* omdl); -static void obj_modern_read_skin(obj* obj, stream& s, int64_t base_offset, - uint32_t header_length, bool is_x); -static void obj_modern_write_skin(obj* obj, stream& s, +static void obj_modern_read_model_mesh(obj_mesh* mesh, + prj::shared_ptr alloc, stream& s, int64_t base_offset, + uint32_t header_length, bool is_x, stream* s_oidx, stream* s_ovtx); +static void obj_modern_read_model_sub_mesh(obj_sub_mesh* sub_mesh, + prj::shared_ptr alloc, stream& s, int64_t base_offset, + uint32_t header_length, bool is_x, stream* s_oidx); +static obj_skin* obj_modern_read_skin(prj::shared_ptr alloc, + stream& s, int64_t base_offset, uint32_t header_length, bool is_x); +static void obj_modern_write_skin(obj_skin* sk, stream& s, int64_t base_offset, bool is_x, f2_struct* oskn); -static void obj_modern_read_skin_block_cloth(obj_skin_block_cloth* b, - stream& s, uint32_t header_length, char** str, bool is_x); -static void obj_modern_write_skin_block_cloth(obj_skin_block_cloth* b, +static obj_skin_ex_data* obj_modern_read_skin_ex_data(prj::shared_ptr alloc, + stream& s, int64_t base_offset, uint32_t header_length, bool is_x); +static obj_skin_block_cloth* obj_modern_read_skin_block_cloth( + prj::shared_ptr alloc, stream& s, uint32_t header_length, const char** str, bool is_x); +static void obj_modern_write_skin_block_cloth(obj_skin_block_cloth* cls, stream& s, std::vector& strings, std::vector& string_offsets, bool is_x, - int64_t* mats_offset, int64_t* root_offset, int64_t* nodes_offset, - int64_t* mesh_indices_offset, int64_t* backface_mesh_indices_offset); -static void obj_modern_read_skin_block_cloth_root_bone_weight(obj_skin_block_cloth_root_bone_weight* sub, - stream& s, uint32_t header_length, char** str, bool is_x); -static void obj_modern_write_skin_block_cloth_root_bone_weight(obj_skin_block_cloth_root_bone_weight* sub, + int64_t* mat_array_offset, int64_t* root_array_offset, int64_t* node_array_offset, + int64_t* mesh_index_array_offset, int64_t* backface_mesh_index_array_offset); +static void obj_modern_read_skin_block_cloth_root_bone_weight(obj_skin_block_cloth_root_bone_weight* bone_weight, + prj::shared_ptr alloc, stream& s, uint32_t header_length, const char** str, bool is_x); +static void obj_modern_write_skin_block_cloth_root_bone_weight(obj_skin_block_cloth_root_bone_weight* bone_weight, stream& s, std::vector& strings, std::vector& string_offsets, bool is_x); -static void obj_modern_read_skin_block_constraint(obj_skin_block_constraint* b, - stream& s, uint32_t header_length, char** str, bool is_x); -static void obj_modern_write_skin_block_constraint(obj_skin_block_constraint* b, - stream& s, std::vector& strings, std::vector& string_offsets, char** bone_names, +static obj_skin_block_constraint* obj_modern_read_skin_block_constraint( + prj::shared_ptr alloc, stream& s, uint32_t header_length, const char** str, bool is_x); +static void obj_modern_write_skin_block_constraint(obj_skin_block_constraint* cns, + stream& s, std::vector& strings, std::vector& string_offsets, const char** bone_name_array, bool is_x, int64_t* offsets); -static void obj_modern_read_skin_block_constraint_attach_point(obj_skin_block_constraint_attach_point* ap, - stream& s, uint32_t header_length, char** str, bool is_x); -static void obj_modern_write_skin_block_constraint_attach_point(obj_skin_block_constraint_attach_point* ap, +static void obj_modern_read_skin_block_constraint_attach_point(obj_skin_block_constraint_attach_point* attach_point, + stream& s, uint32_t header_length, const char** str, bool is_x); +static void obj_modern_write_skin_block_constraint_attach_point(obj_skin_block_constraint_attach_point* attach_point, stream& s, std::vector& strings, std::vector& string_offsets, bool is_x); -static void obj_modern_read_skin_block_constraint_up_vector_old(obj_skin_block_constraint_up_vector* up, - stream& s, uint32_t header_length, char** str, bool is_x); -static void obj_modern_write_skin_block_constraint_up_vector_old(obj_skin_block_constraint_up_vector* up, +static void obj_modern_read_skin_block_constraint_up_vector(obj_skin_block_constraint_up_vector* up_vector, + prj::shared_ptr alloc, stream& s, uint32_t header_length, const char** str, bool is_x); +static void obj_modern_write_skin_block_constraint_up_vector(obj_skin_block_constraint_up_vector* up_vector, stream& s, std::vector& strings, std::vector& string_offsets, bool is_x); -static void obj_modern_read_skin_block_expression(obj_skin_block_expression* b, - stream& s, uint32_t header_length, char** str, bool is_x); -static void obj_modern_write_skin_block_expression(obj_skin_block_expression* b, - stream& s, std::vector& strings, std::vector& string_offsets, char** bone_names, bool is_x); -static void obj_modern_read_skin_block_motion(obj_skin_block_motion* b, - stream& s, uint32_t header_length, char** str, bool is_x); -static void obj_modern_write_skin_block_motion(obj_skin_block_motion* b, +static obj_skin_block_expression* obj_modern_read_skin_block_expression( + prj::shared_ptr alloc, stream& s, uint32_t header_length, const char** str, bool is_x); +static void obj_modern_write_skin_block_expression(obj_skin_block_expression* exp, + stream& s, std::vector& strings, std::vector& string_offsets, + const char** bone_name_array, bool is_x); +static obj_skin_block_motion* obj_modern_read_skin_block_motion( + prj::shared_ptr alloc, stream& s, uint32_t header_length, const char** str, bool is_x); +static void obj_modern_write_skin_block_motion(obj_skin_block_motion* mot, stream& s, std::vector& strings, std::vector& string_offsets, bool is_x, - char** bone_names, int64_t* bone_names_offset, int64_t* bone_matrices_offset); -static void obj_modern_read_skin_block_node(obj_skin_block_node* b, - stream& s, uint32_t header_length, char** str, bool is_x); -static void obj_modern_write_skin_block_node(obj_skin_block_node* b, + const char** bone_name_array, int64_t* bone_name_array_offset, int64_t* bone_matrix_array_offset); +static void obj_modern_read_skin_block_node(obj_skin_block_node* node, + prj::shared_ptr alloc, stream& s, uint32_t header_length, const char** str, bool is_x); +static void obj_modern_write_skin_block_node(obj_skin_block_node* node, stream& s, std::vector& strings, std::vector& string_offsets, bool is_x); -static void obj_modern_read_skin_block_osage(obj_skin_block_osage* b, - stream& s, uint32_t header_length, char** str, bool is_x); -static void obj_modern_write_skin_block_osage(obj_skin_block_osage* b, +static obj_skin_block_osage* obj_modern_read_skin_block_osage( + prj::shared_ptr alloc, stream& s, uint32_t header_length, const char** str, bool is_x); +static void obj_modern_write_skin_block_osage(obj_skin_block_osage* osg, stream& s, std::vector& strings, std::vector& string_offsets, bool is_x); -static void obj_modern_read_vertex(obj* obj, stream& s, int64_t* vertex, obj_mesh* mesh, - const uint32_t attrib_flags, uint32_t num_vertex, uint32_t size_vertex); -static void obj_modern_write_vertex(obj* obj, stream& s, bool is_x, - int64_t* vertex, obj_mesh* mesh, uint32_t* attrib_flags, - uint32_t* num_vertex, uint32_t* size_vertex, f2_struct* ovtx); -static void obj_skin_block_node_free(obj_skin_block_node* b); +static void obj_modern_read_vertex(obj_mesh* mesh, prj::shared_ptr alloc, stream& s, + int64_t* vertex, const uint32_t vertex_format_index, uint32_t num_vertex, uint32_t size_vertex); +static void obj_modern_write_vertex(obj_mesh* mesh, stream& s, int64_t* vertex, + uint32_t* vertex_format_index, uint32_t* num_vertex, uint32_t* size_vertex, f2_struct* ovtx); + +static const char* obj_read_utf8_string_null_terminated_offset( + prj::shared_ptr& alloc, stream& s, int64_t offset); + static uint32_t obj_skin_strings_get_string_index(std::vector& vec, const char* str); static int64_t obj_skin_strings_get_string_offset(std::vector& vec, std::vector& vec_off, const char* str); static int64_t obj_skin_strings_get_string_offset_by_index(std::vector& vec, - std::vector& vec_off, char** strings, uint32_t index); + std::vector& vec_off, const char** strings, uint32_t index); static void obj_skin_strings_push_back_check(std::vector& vec, const char* str); static void obj_skin_strings_push_back_check_by_index(std::vector& vec, - char** strings, uint32_t index); + const char** strings, uint32_t index); + +obj_axis_aligned_bounding_box::obj_axis_aligned_bounding_box() { + +} + +obj_bounding_box::obj_bounding_box() { + +} obj_bounding_sphere::obj_bounding_sphere() : radius() { @@ -285,12 +318,133 @@ obj_material_data::obj_material_data() : num_of_textures() { } -obj_sub_mesh::obj_sub_mesh() : flags(), bounding_sphere(), material_index(), uv_index(), bone_indices(), -bone_indices_count(), bones_per_vertex(), primitive_type(), index_format(), indices(), indices_count(), -attrib(), axis_aligned_bounding_box(), first_index(), last_index(), indices_offset() { +obj_sub_mesh::obj_sub_mesh() : flags(), bounding_sphere(), material_index(), uv_index(), bone_index_array(), +num_bone_index(), bones_per_vertex(), primitive_type(), index_format(), index_array(), num_index(), +attrib(), axis_aligned_bounding_box(), first_index(), last_index(), index_offset() { } +obj_vertex_data::obj_vertex_data() { + +} + +obj_mesh::obj_mesh() : flags(), num_submesh(), submesh_array(), vertex_format(), +size_vertex(), num_vertex(), vertex_array(), attrib(), reserved(), name() { + +} + +obj_skin_block_node::obj_skin_block_node() : parent_name() { + +} + +obj_skin_skin_param_coli::obj_skin_skin_param_coli() : type(), bone0_index(), bone1_index(), radius() { + +} + +obj_skin_skin_param::obj_skin_skin_param() : unk0(), force(), force_gain(), air_res(), rot_y(), rot_z(), +hinge_y(), hinge_z(), name(), coli(), coli_count(), coli_r(), friction(), wind_afc(), unk44() { + +} + +obj_skin_block_cloth_root_bone_weight::obj_skin_block_cloth_root_bone_weight() : +bone_name(), weight(), matrix_index(), reserved() { + +} + +obj_skin_block_cloth_root::obj_skin_block_cloth_root() : field_18(), field_1C(), field_20(), field_24() { + +} + +obj_skin_block_cloth_node::obj_skin_block_cloth_node() : flags(), +dist_top(), dist_bottom(), dist_right(), dist_left() { + +} + +obj_skin_block_cloth::obj_skin_block_cloth() : mesh_name(), backface_mesh_name(), field_8(), +num_root(), num_node(), field_14(), mat_array(), num_mat(), root_array(), node_array(), mesh_index_array(), +num_mesh_index(), backface_mesh_index_array(), num_backface_mesh_index(), skin_param(), reserved() { + +} + +obj_skin_block_constraint_attach_point::obj_skin_block_constraint_attach_point() + : affected_by_orientation(), affected_by_scaling() { + +} + +obj_skin_block_constraint_up_vector::obj_skin_block_constraint_up_vector() : active(), roll(), name() { + +} + +obj_skin_block_constraint_direction::obj_skin_block_constraint_direction() { + +} + +obj_skin_block_constraint_distance::obj_skin_block_constraint_distance() : distance() { + +} + +obj_skin_block_constraint_orientation::obj_skin_block_constraint_orientation() { + +} + +obj_skin_block_constraint_position::obj_skin_block_constraint_position() { + +} + +obj_skin_block_constraint::obj_skin_block_constraint() + : name_index(), source_node_name(), coupling(), type(), data() { + +} + +obj_skin_block_expression::obj_skin_block_expression() + : name_index(), num_expression(), expression_array() { + +} + +obj_skin_motion_node::obj_skin_motion_node() : name_index() { + +} + +obj_skin_block_motion::obj_skin_block_motion() : name(), node_array(), num_node() { + +} + +obj_skin_osage_node::obj_skin_osage_node() : name_index(), length() { + +} + +obj_skin_block_osage::obj_skin_block_osage() : start_index(), count(), node_array(), +num_node(), skin_param(), external_name_index(), name_index(), motion_node_name() { + +} + +obj_skin_block::obj_skin_block() : type(), node() { + +} + +obj_skin_osage_sibling_info::obj_skin_osage_sibling_info() + : name_index(), sibling_name_index(), max_distance() { + +} + +obj_skin_ex_data::obj_skin_ex_data() : osage_node_array(), num_osage_node(), block_array(), num_block(), +bone_name_array(), num_bone_name(), osage_sibling_info_array(), num_osage_sibling_info(), reserved() { + +} + +obj_skin_bone::obj_skin_bone() : id(), parent(), name() { + +} + +obj_skin::obj_skin() : bone_array(), num_bone(), ex_data() { + +} + +obj::obj() : mesh_array(), num_mesh(), material_array(), +num_material(), flags(), reserved(), skin(), name(), id() { + hash = hash_murmurhash_empty; +} + obj_mesh* obj::get_obj_mesh(const char* name) { uint32_t name_hash = hash_utf8_murmurhash(name); for (uint32_t k = 0; k < num_mesh; k++) @@ -312,84 +466,6 @@ obj_num(), tex_id_data(), tex_id_num(), reserved() { } -obj_set::~obj_set() { - for (uint32_t i = 0; i < obj_num; i++) { - obj* obj = &obj_data[i]; - for (uint32_t j = 0; j < obj->skin.bones_count; j++) - free_def(obj->skin.bones[j].name); - free_def(obj->skin.bones); - - for (uint32_t j = 0; j < obj->skin.ex_data.blocks_count; j++) { - obj_skin_block* block = &obj->skin.ex_data.blocks[j]; - switch (block->type) { - case OBJ_SKIN_BLOCK_CLOTH: { - obj_skin_block_cloth* cloth = &block->cloth; - free_def(cloth->mesh_name); - free_def(cloth->backface_mesh_name); - - for (uint32_t k = 0; k < cloth->root_count; k++) { - obj_skin_block_cloth_root* sub = &cloth->root[k]; - for (uint32_t l = 0; l < 4; l++) - free_def(sub->bone_weights[l].bone_name); - } - free_def(cloth->root); - free_def(cloth->nodes); - free_def(cloth->mesh_indices); - free_def(cloth->backface_mesh_indices); - free_def(cloth->skin_param.coli); - } break; - case OBJ_SKIN_BLOCK_CONSTRAINT: { - obj_skin_block_constraint* constraint = &block->constraint; - obj_skin_block_node_free(&constraint->base); - free_def(constraint->source_node_name); - } break; - case OBJ_SKIN_BLOCK_EXPRESSION: { - obj_skin_block_expression* expression = &block->expression; - obj_skin_block_node_free(&expression->base); - for (uint32_t k = 0; k < 9; k++) - free_def(expression->expressions[k]); - } break; - case OBJ_SKIN_BLOCK_MOTION: { - obj_skin_block_motion* motion = &block->motion; - obj_skin_block_node_free(&motion->base); - if (is_x) - free_def(motion->name); - free_def(motion->nodes); - } break; - case OBJ_SKIN_BLOCK_OSAGE: { - obj_skin_block_osage* osage = &block->osage; - obj_skin_block_node_free(&osage->base); - free_def(osage->skin_param.coli); - free_def(osage->nodes); - } break; - } - } - free_def(obj->skin.ex_data.blocks); - free_def(obj->skin.ex_data.osage_nodes); - free_def(obj->skin.ex_data.bone_names_buf); - free_def(obj->skin.ex_data.bone_names); - free_def(obj->skin.ex_data.osage_sibling_infos); - - if (obj->mesh_array) - for (uint32_t j = 0; j < obj->num_mesh; j++) { - obj_mesh* mesh = &obj->mesh_array[j]; - if (mesh->submesh_array) - for (uint32_t k = 0; k < mesh->num_submesh; k++) { - obj_sub_mesh* sub_mesh = &mesh->submesh_array[k]; - free_def(sub_mesh->bone_indices); - free_def(sub_mesh->indices); - } - free_def(mesh->vertex); - free_def(mesh->submesh_array); - } - free_def(obj->mesh_array); - free_def(obj->material_array); - free_def(obj->name); - } - free_def(obj_data); - free_def(tex_id_data); -} - void obj_set::pack_file(void** data, size_t* size) { if (!data || !ready) return; @@ -404,16 +480,16 @@ void obj_set::pack_file(void** data, size_t* size) { s.copy(data, size); } -void obj_set::unpack_file(const void* data, size_t size, bool modern) { +void obj_set::unpack_file(prj::shared_ptr alloc, const void* data, size_t size, bool modern) { if (!data || !size) return; memory_stream s; s.open(data, size); if (!modern) - obj_set_classic_read_inner(this, s); + obj_set_classic_read_inner(this, alloc, s); else - obj_set_modern_read_inner(this, s); + obj_set_modern_read_inner(this, alloc, s); } static void obj_material_texture_enrs_table_init() { @@ -481,7 +557,7 @@ static void calculate_tangent(obj_vertex_data* vtx, bitangents[c] += bitangent; } -static void obj_vertex_generate_tangents(obj* obj, obj_mesh* mesh) { +static void obj_vertex_generate_tangents(obj_mesh* mesh) { if (~mesh->vertex_format & OBJ_VERTEX_NORMAL || mesh->vertex_format & OBJ_VERTEX_TANGENT || ~mesh->vertex_format & OBJ_VERTEX_TEXCOORD0) @@ -492,16 +568,17 @@ static void obj_vertex_generate_tangents(obj* obj, obj_mesh* mesh) { vec3* tangents = force_malloc_s(vec3, num_vertex); vec3* bitangents = force_malloc_s(vec3, num_vertex); - obj_vertex_data* vtx = mesh->vertex; - for (uint32_t i = 0; i < mesh->num_submesh; i++) { + obj_vertex_data* vtx = mesh->vertex_array; + uint32_t num_submesh = mesh->num_submesh; + for (uint32_t i = 0; i < num_submesh; i++) { obj_sub_mesh* sub_mesh = &mesh->submesh_array[i]; - if (!sub_mesh->indices || !sub_mesh->indices_count + if (!sub_mesh->index_array || !sub_mesh->num_index || (sub_mesh->primitive_type != OBJ_PRIMITIVE_TRIANGLES && sub_mesh->primitive_type != OBJ_PRIMITIVE_TRIANGLE_STRIP)) continue; - uint32_t* start = sub_mesh->indices; - uint32_t* end = sub_mesh->indices + sub_mesh->indices_count; + uint32_t* start = sub_mesh->index_array; + uint32_t* end = sub_mesh->index_array + sub_mesh->num_index; bool triangle_strip = sub_mesh->primitive_type == OBJ_PRIMITIVE_TRIANGLE_STRIP; if (!triangle_strip) { @@ -565,7 +642,7 @@ static void obj_vertex_generate_tangents(obj* obj, obj_mesh* mesh) { vec3 position = vtx[i].position; vec3 tangent = tangents[i]; - if (memcmp(&tangent, &vec3_null, sizeof(vec3))) + if (tangent != 0.0f) continue; int32_t nearest_vtx_idx = -1; @@ -575,7 +652,7 @@ static void obj_vertex_generate_tangents(obj* obj, obj_mesh* mesh) { vec3 position_to_compare = vtx[j].position; vec3 tangent_to_compare = tangents[j]; - if (i == j || !memcmp(&tangent_to_compare, &vec3_null, sizeof(vec3))) + if (i == j || tangent_to_compare == 0.0f) continue; float_t distance = vec3::distance_squared(position, position_to_compare); @@ -591,10 +668,8 @@ static void obj_vertex_generate_tangents(obj* obj, obj_mesh* mesh) { else { vec3 normal = vtx[i].normal; - const vec3 up = { 0.0f, 1.0f, 0.0f }; - const vec3 left = { 1.0f, 0.0f, 0.0f }; - vec3 temp1 = vec3::cross(normal, up); - vec3 temp2 = vec3::cross(normal, left); + vec3 temp1 = vec3::cross(normal, { 0.0f, 1.0f, 0.0f }); + vec3 temp2 = vec3::cross(normal, { 1.0f, 0.0f, 0.0f }); float_t temp3 = vec3::length_squared(temp1); float_t temp4 = vec3::length_squared(temp2); @@ -636,7 +711,7 @@ static void obj_vertex_validate_bone_data(vec4& bone_weight, vec4i& bone_index) bone_index = _bone_index; } -static void obj_set_classic_read_inner(obj_set* os, stream& s) { +static void obj_set_classic_read_inner(obj_set* os, prj::shared_ptr& alloc, stream& s) { uint32_t version = s.read_uint32_t(); if (version != 0x05062500) { os->ready = false; @@ -659,43 +734,45 @@ static void obj_set_classic_read_inner(obj_set* os, stream& s) { os->reserved[1] = s.read_uint32_t(); uint32_t obj_num = os->obj_num; - os->obj_data = force_malloc_s(obj, os->obj_num); + os->obj_data = alloc->allocate(obj_num); - int32_t* obj_datas = 0; + int32_t* data = force_malloc_s(int32_t, obj_num * 3ULL); + + int32_t* obj_data = 0; if (osh.obj_data) { - obj_datas = force_malloc_s(int32_t, obj_num); + obj_data = data; s.set_position(osh.obj_data, SEEK_SET); for (uint32_t i = 0; i < obj_num; i++) - obj_datas[i] = s.read_int32_t(); + obj_data[i] = s.read_int32_t(); } - int32_t* obj_skin_datas = 0; + int32_t* obj_skin_data = 0; if (osh.obj_skin_data) { - obj_skin_datas = force_malloc_s(int32_t, obj_num); + obj_skin_data = data + obj_num; s.set_position(osh.obj_skin_data, SEEK_SET); for (uint32_t i = 0; i < obj_num; i++) - obj_skin_datas[i] = s.read_int32_t(); + obj_skin_data[i] = s.read_int32_t(); } - int32_t* obj_name_datas = 0; + int32_t* obj_name_data = 0; if (osh.obj_name_data) { - obj_name_datas = force_malloc_s(int32_t, obj_num); + obj_name_data = data + obj_num * 2ULL; s.set_position(osh.obj_name_data, SEEK_SET); for (uint32_t i = 0; i < obj_num; i++) - obj_name_datas[i] = s.read_int32_t(); + obj_name_data[i] = s.read_int32_t(); } if (osh.obj_data) { for (uint32_t i = 0; i < obj_num; i++) { obj* obj = &os->obj_data[i]; - if (obj_datas[i]) - obj_classic_read_model(obj, s, obj_datas[i]); + if (obj_data[i]) + obj_classic_read_model(obj, alloc, s, obj_data[i]); - if (osh.obj_skin_data && obj_skin_datas[i]) - obj_classic_read_skin(obj, s, obj_skin_datas[i]); + if (osh.obj_skin_data && obj_skin_data[i]) + obj->skin = obj_classic_read_skin(alloc, s, obj_skin_data[i]); - if (osh.obj_name_data && obj_name_datas[i]) { - obj->name = s.read_utf8_string_null_terminated_offset(obj_name_datas[i]); + if (osh.obj_name_data && obj_name_data[i]) { + obj->name = obj_read_utf8_string_null_terminated_offset(alloc, s, obj_name_data[i]); obj->hash = hash_utf8_murmurhash(obj->name); } else @@ -708,15 +785,13 @@ static void obj_set_classic_read_inner(obj_set* os, stream& s) { } if (osh.tex_id_data) { - os->tex_id_data = force_malloc_s(uint32_t, os->tex_id_num); + os->tex_id_data = alloc->allocate(os->tex_id_num); s.set_position(osh.tex_id_data, SEEK_SET); for (uint32_t i = 0; i < os->tex_id_num; i++) os->tex_id_data[i] = s.read_uint32_t(); } - free_def(obj_datas); - free_def(obj_skin_datas); - free_def(obj_name_datas); + free_def(data); os->ready = true; os->modern = false; @@ -750,18 +825,19 @@ static void obj_set_classic_write_inner(obj_set* os, stream& s) { s.write_int32_t(0); s.align_write(0x10); - uint32_t* obj_datas = force_malloc_s(uint32_t, obj_num); + int32_t* data = force_malloc_s(int32_t, obj_num); + + int32_t* obj_data = data; for (uint32_t i = 0; i < obj_num; i++) { - obj_datas[i] = (uint32_t)s.get_position(); - obj_classic_write_model(&os->obj_data[i], s, obj_datas[i]); + obj_data[i] = (int32_t)s.get_position(); + obj_classic_write_model(&os->obj_data[i], s, obj_data[i]); } s.align_write(0x10); s.position_push(osh.obj_data, SEEK_SET); for (uint32_t i = 0; i < obj_num; i++) - s.write_uint32_t(obj_datas[i]); + s.write_uint32_t(obj_data[i]); s.position_pop(); - free_def(obj_datas); osh.obj_id_data = s.get_position(); for (uint32_t i = 0; i < obj_num; i++) { @@ -772,18 +848,17 @@ static void obj_set_classic_write_inner(obj_set* os, stream& s) { } s.align_write(0x10); - int32_t* obj_name_datas = force_malloc_s(int32_t, obj_num); + int32_t* obj_name_data = data; for (uint32_t i = 0; i < obj_num; i++) { - obj_name_datas[i] = (int32_t)s.get_position(); + obj_name_data[i] = (int32_t)s.get_position(); s.write_utf8_string_null_terminated(os->obj_data[i].name); } s.align_write(0x10); osh.obj_name_data = s.get_position(); for (uint32_t i = 0; i < obj_num; i++) - s.write_int32_t(obj_name_datas[i]); + s.write_int32_t(obj_name_data[i]); s.align_write(0x10); - free_def(obj_name_datas); osh.tex_id_data = s.get_position(); for (uint32_t i = 0; i < os->tex_id_num; i++) @@ -795,23 +870,25 @@ static void obj_set_classic_write_inner(obj_set* os, stream& s) { s.write_int32_t(0); s.align_write(0x10); - int32_t* obj_skin_datas = force_malloc_s(int32_t, obj_num); + int32_t* obj_skin_data = data; for (uint32_t i = 0; i < obj_num; i++) { - if (!os->obj_data[i].skin_init) { - obj_skin_datas[i] = 0; + obj_skin* sk = os->obj_data[i].skin; + if (!sk) { + obj_skin_data[i] = 0; continue; } - obj_skin_datas[i] = (int32_t)s.get_position(); - obj_classic_write_skin(&os->obj_data[i], s, obj_skin_datas[i]); + obj_skin_data[i] = (int32_t)s.get_position(); + obj_classic_write_skin(sk, s, obj_skin_data[i]); } s.align_write(0x10); s.position_push(osh.obj_skin_data, SEEK_SET); for (uint32_t i = 0; i < obj_num; i++) - s.write_int32_t(obj_skin_datas[i]); + s.write_int32_t(obj_skin_data[i]); s.position_pop(); - free_def(obj_skin_datas); + + free_def(data); s.position_push(0x00, SEEK_SET); s.write_uint32_t(0x05062500); @@ -828,55 +905,53 @@ static void obj_set_classic_write_inner(obj_set* os, stream& s) { s.position_pop(); } -static void obj_classic_read_index(obj* obj, stream& s, - obj_sub_mesh* sub_mesh) { +static void obj_classic_read_index(obj_sub_mesh* sub_mesh, prj::shared_ptr alloc, stream& s) { bool tri_strip = sub_mesh->primitive_type == OBJ_PRIMITIVE_TRIANGLE_STRIP; - uint32_t indices_count = sub_mesh->indices_count; - uint32_t* indices = force_malloc_s(uint32_t, indices_count); + uint32_t num_index = sub_mesh->num_index; + uint32_t* index_array = alloc->allocate(num_index); switch (sub_mesh->index_format) { case OBJ_INDEX_U8: - for (uint32_t i = 0; i < indices_count; i++) { + for (uint32_t i = 0; i < num_index; i++) { uint8_t idx = s.read_uint8_t(); - indices[i] = tri_strip && idx == 0xFF ? 0xFFFFFFFF : idx; + index_array[i] = tri_strip && idx == 0xFF ? 0xFFFFFFFF : idx; } break; case OBJ_INDEX_U16: - for (uint32_t i = 0; i < indices_count; i++) { + for (uint32_t i = 0; i < num_index; i++) { uint16_t idx = s.read_uint16_t(); - indices[i] = tri_strip && idx == 0xFFFF ? 0xFFFFFFFF : idx; + index_array[i] = tri_strip && idx == 0xFFFF ? 0xFFFFFFFF : idx; } break; case OBJ_INDEX_U32: - for (uint32_t i = 0; i < indices_count; i++) - indices[i] = s.read_uint32_t(); + for (uint32_t i = 0; i < num_index; i++) + index_array[i] = s.read_uint32_t(); break; } - sub_mesh->indices = indices; + sub_mesh->index_array = index_array; } -static void obj_classic_write_index(obj* obj, stream& s, obj_sub_mesh* sub_mesh) { - uint32_t* indices = sub_mesh->indices; - uint32_t indices_count = sub_mesh->indices_count; +static void obj_classic_write_index(obj_sub_mesh* sub_mesh, stream& s) { + uint32_t* index_array = sub_mesh->index_array; + uint32_t num_index = sub_mesh->num_index; switch (sub_mesh->index_format) { case OBJ_INDEX_U8: - for (uint32_t i = 0; i < indices_count; i++) - s.write_uint8_t((uint8_t)indices[i]); + for (uint32_t i = 0; i < num_index; i++) + s.write_uint8_t((uint8_t)index_array[i]); break; case OBJ_INDEX_U16: - for (uint32_t i = 0; i < indices_count; i++) - s.write_uint16_t((uint16_t)indices[i]); + for (uint32_t i = 0; i < num_index; i++) + s.write_uint16_t((uint16_t)index_array[i]); break; case OBJ_INDEX_U32: - for (uint32_t i = 0; i < indices_count; i++) - s.write_uint32_t(indices[i]); + for (uint32_t i = 0; i < num_index; i++) + s.write_uint32_t(index_array[i]); break; } s.align_write(0x04); } -static void obj_classic_read_model(obj* obj, stream& s, int64_t base_offset) { +static void obj_classic_read_model(obj* obj, prj::shared_ptr alloc, stream& s, int64_t base_offset) { const size_t mesh_size = 0xD8; - const size_t sub_mesh_size = 0x5C; s.set_position(base_offset, SEEK_SET); @@ -903,95 +978,24 @@ static void obj_classic_read_model(obj* obj, stream& s, int64_t base_offset) { obj->reserved[9] = s.read_uint32_t(); if (oh.mesh_array > 0) { - obj->mesh_array = force_malloc_s(obj_mesh, obj->num_mesh); - for (uint32_t i = 0; i < obj->num_mesh; i++) { - obj_mesh* mesh = &obj->mesh_array[i]; - + uint32_t num_mesh = obj->num_mesh; + obj->mesh_array = alloc->allocate(num_mesh); + for (uint32_t i = 0; i < num_mesh; i++) { s.set_position(base_offset + oh.mesh_array + mesh_size * i, SEEK_SET); - - obj_mesh_header mh = {}; - mesh->flags = s.read_uint32_t(); - mesh->bounding_sphere.center.x = s.read_float_t(); - mesh->bounding_sphere.center.y = s.read_float_t(); - mesh->bounding_sphere.center.z = s.read_float_t(); - mesh->bounding_sphere.radius = s.read_float_t(); - mesh->num_submesh = s.read_int32_t(); - mh.submesh_array = s.read_int32_t(); - mh.format = (obj_vertex_format_file)s.read_uint32_t(); - mh.size_vertex = s.read_int32_t(); - mh.num_vertex = s.read_int32_t(); - - for (uint32_t j = 0; j < 20; j++) - mh.vertex[j] = s.read_int32_t(); - - mesh->attrib.w = s.read_uint32_t(); - mh.vertex_flags = s.read_uint32_t(); - mesh->reserved[0] = s.read_uint32_t(); - mesh->reserved[1] = s.read_uint32_t(); - mesh->reserved[2] = s.read_uint32_t(); - mesh->reserved[3] = s.read_uint32_t(); - mesh->reserved[4] = s.read_uint32_t(); - mesh->reserved[5] = s.read_uint32_t(); - s.read(&mesh->name, sizeof(mesh->name)); - mesh->name[sizeof(mesh->name) - 1] = 0; - - if (mh.submesh_array) { - mesh->submesh_array = force_malloc_s(obj_sub_mesh, mesh->num_submesh); - for (uint32_t j = 0; j < mesh->num_submesh; j++) { - obj_sub_mesh* sub_mesh = &mesh->submesh_array[j]; - - s.set_position(base_offset + mh.submesh_array + sub_mesh_size * j, SEEK_SET); - - obj_sub_mesh_header smh = {}; - sub_mesh->flags = s.read_uint32_t(); - sub_mesh->bounding_sphere.center.x = s.read_float_t(); - sub_mesh->bounding_sphere.center.y = s.read_float_t(); - sub_mesh->bounding_sphere.center.z = s.read_float_t(); - sub_mesh->bounding_sphere.radius = s.read_float_t(); - sub_mesh->material_index = s.read_uint32_t(); - s.read(&sub_mesh->uv_index, 0x08); - sub_mesh->bone_indices_count = s.read_int32_t(); - smh.bone_indices_offset = s.read_uint32_t(); - sub_mesh->bones_per_vertex = s.read_uint32_t(); - sub_mesh->primitive_type = (obj_primitive_type)s.read_uint32_t(); - sub_mesh->index_format = (obj_index_format)s.read_uint32_t(); - sub_mesh->indices_count = s.read_int32_t(); - smh.indices_offset = s.read_uint32_t(); - sub_mesh->attrib.w = s.read_uint32_t(); - sub_mesh->bounding_box.center = sub_mesh->bounding_sphere.center; - sub_mesh->bounding_box.size.x = sub_mesh->bounding_sphere.radius * 2.0f; - sub_mesh->bounding_box.size.y = sub_mesh->bounding_sphere.radius * 2.0f; - sub_mesh->bounding_box.size.z = sub_mesh->bounding_sphere.radius * 2.0f; - s.read(0, 0x18); - sub_mesh->indices_offset = s.read_uint32_t(); - - if (sub_mesh->bones_per_vertex == 4 && smh.bone_indices_offset) { - sub_mesh->bone_indices = force_malloc_s(uint16_t, sub_mesh->bone_indices_count); - s.set_position(base_offset + smh.bone_indices_offset, SEEK_SET); - s.read(sub_mesh->bone_indices, sub_mesh->bone_indices_count * sizeof(uint16_t)); - } - - s.set_position(base_offset + smh.indices_offset, SEEK_SET); - obj_classic_read_index(obj, s, sub_mesh); - } - } - - obj_classic_read_vertex(obj, s, mh.vertex, mesh, - base_offset, mh.num_vertex, mh.format); - obj_vertex_generate_tangents(obj, mesh); + obj_classic_read_model_mesh(&obj->mesh_array[i], + alloc, s, base_offset); } } if (oh.material_array > 0) { s.set_position(base_offset + oh.material_array, SEEK_SET); - obj->material_array = force_malloc_s(obj_material_data, obj->num_material); + obj->material_array = alloc->allocate(obj->num_material); for (uint32_t i = 0; i < obj->num_material; i++) { - obj_material_data mat_data; + obj_material_data& mat_data = obj->material_array[i]; s.read(&mat_data, sizeof(obj_material_data)); for (obj_material_texture_data& j : mat_data.material.texdata) mat4_transpose(&j.tex_coord_mat, &j.tex_coord_mat); - obj->material_array[i] = mat_data; } } } @@ -1022,13 +1026,16 @@ static void obj_classic_write_model(obj* obj, stream& s, int64_t base_offset) { s.write_uint32_t(0); s.align_write(0x10); + uint32_t num_mesh = obj->num_mesh; + obj_header oh = {}; - if (obj->num_mesh) { + if (num_mesh) { oh.mesh_array = s.get_position() - base_offset; - obj_mesh_header* mhs = force_malloc_s(obj_mesh_header, obj->num_mesh); - for (uint32_t i = 0; i < obj->num_mesh; i++) { + obj_mesh_header* mhs = force_malloc_s(obj_mesh_header, num_mesh); + for (uint32_t i = 0; i < num_mesh; i++) { obj_mesh* mesh = &obj->mesh_array[i]; + obj_mesh_header* mh = &mhs[i]; s.write(0x04); s.write_float_t(0.0f); @@ -1041,7 +1048,7 @@ static void obj_classic_write_model(obj* obj, stream& s, int64_t base_offset) { s.write_int32_t(0); s.write_int32_t(0); - for (uint32_t j = 0; j < 20; j++) + for (int64_t& i : mh->vertex) s.write_int32_t(0); s.write_int32_t(0); @@ -1050,13 +1057,14 @@ static void obj_classic_write_model(obj* obj, stream& s, int64_t base_offset) { s.write(sizeof(mesh->name)); } - for (uint32_t i = 0; i < obj->num_mesh; i++) { + for (uint32_t i = 0; i < num_mesh; i++) { obj_mesh* mesh = &obj->mesh_array[i]; obj_mesh_header* mh = &mhs[i]; - if (mesh->num_submesh) { + uint32_t num_submesh = mesh->num_submesh; + if (num_submesh) { mh->submesh_array = s.get_position() - base_offset; - for (uint32_t j = 0; j < mesh->num_submesh; j++) { + for (uint32_t j = 0; j < num_submesh; j++) { s.write(0x04); s.write_float_t(0.0f); s.write_float_t(0.0f); @@ -1077,21 +1085,21 @@ static void obj_classic_write_model(obj* obj, stream& s, int64_t base_offset) { } } - obj_classic_write_vertex(obj, s, mh->vertex, - mesh, base_offset, &mh->num_vertex, &mh->format, &mh->size_vertex); + obj_classic_write_vertex(mesh, s, mh->vertex, + base_offset, &mh->num_vertex, &mh->format, &mh->size_vertex); - for (uint32_t j = 0; j < mesh->num_submesh; j++) { + for (uint32_t j = 0; j < num_submesh; j++) { obj_sub_mesh* sub_mesh = &mesh->submesh_array[j]; obj_sub_mesh_header smh = {}; - if (sub_mesh->bones_per_vertex == 4 && sub_mesh->bone_indices_count) { - smh.bone_indices_offset = s.get_position() - base_offset; - s.write(sub_mesh->bone_indices, sub_mesh->bone_indices_count * sizeof(uint16_t)); + if (sub_mesh->bones_per_vertex == 4 && sub_mesh->num_bone_index) { + smh.bone_index_array_offset = s.get_position() - base_offset; + s.write(sub_mesh->bone_index_array, sub_mesh->num_bone_index * sizeof(uint16_t)); s.align_write(0x04); } - smh.indices_offset = s.get_position() - base_offset; - obj_classic_write_index(obj, s, sub_mesh); + smh.index_array_offset = s.get_position() - base_offset; + obj_classic_write_index(sub_mesh, s); s.position_push(base_offset + mh->submesh_array + sub_mesh_size * j, SEEK_SET); s.write_uint32_t(sub_mesh->flags); @@ -1101,22 +1109,22 @@ static void obj_classic_write_model(obj* obj, stream& s, int64_t base_offset) { s.write_float_t(sub_mesh->bounding_sphere.radius); s.write_uint32_t(sub_mesh->material_index); s.write(&sub_mesh->uv_index, 0x08); - s.write_int32_t(sub_mesh->bone_indices_count); - s.write_uint32_t((uint32_t)smh.bone_indices_offset); + s.write_int32_t(sub_mesh->num_bone_index); + s.write_uint32_t((uint32_t)smh.bone_index_array_offset); s.write_uint32_t(sub_mesh->bones_per_vertex); s.write_uint32_t(sub_mesh->primitive_type); s.write_uint32_t(sub_mesh->index_format); - s.write_int32_t(sub_mesh->indices_count); - s.write_uint32_t((uint32_t)smh.indices_offset); + s.write_int32_t(sub_mesh->num_index); + s.write_uint32_t((uint32_t)smh.index_array_offset); s.write_uint32_t(sub_mesh->attrib.w); s.write(0x18); - s.write_uint32_t(sub_mesh->indices_offset); + s.write_uint32_t(sub_mesh->index_offset); s.position_pop(); } } s.position_push(base_offset + oh.mesh_array, SEEK_SET); - for (uint32_t i = 0; i < obj->num_mesh; i++) { + for (uint32_t i = 0; i < num_mesh; i++) { obj_mesh* mesh = &obj->mesh_array[i]; obj_mesh_header* mh = &mhs[i]; @@ -1131,11 +1139,11 @@ static void obj_classic_write_model(obj* obj, stream& s, int64_t base_offset) { s.write_int32_t(mh->size_vertex); s.write_int32_t(mh->num_vertex); - for (uint32_t j = 0; j < 20; j++) - s.write_uint32_t((uint32_t)mh->vertex[j]); + for (int64_t& j : mh->vertex) + s.write_uint32_t((uint32_t)j); s.write_uint32_t(mesh->attrib.w); - s.write_uint32_t(mh->vertex_flags); + s.write_uint32_t(mh->vertex_format_index); s.write_uint32_t(mesh->reserved[0]); s.write_uint32_t(mesh->reserved[1]); s.write_uint32_t(mesh->reserved[2]); @@ -1184,264 +1192,149 @@ static void obj_classic_write_model(obj* obj, stream& s, int64_t base_offset) { s.position_pop(); } -static void obj_classic_read_skin(obj* obj, stream& s, int64_t base_offset) { - obj_skin* sk = &obj->skin; - obj->skin_init = true; +static void obj_classic_read_model_mesh(obj_mesh* mesh, + prj::shared_ptr alloc, stream& s, int64_t base_offset) { + const size_t sub_mesh_size = 0x5C; + + obj_mesh_header mh = {}; + mesh->flags = s.read_uint32_t(); + mesh->bounding_sphere.center.x = s.read_float_t(); + mesh->bounding_sphere.center.y = s.read_float_t(); + mesh->bounding_sphere.center.z = s.read_float_t(); + mesh->bounding_sphere.radius = s.read_float_t(); + mesh->num_submesh = s.read_int32_t(); + mh.submesh_array = s.read_int32_t(); + mh.format = (obj_vertex_format_file)s.read_uint32_t(); + mh.size_vertex = s.read_int32_t(); + mh.num_vertex = s.read_int32_t(); + + for (int64_t& i : mh.vertex) + i = s.read_int32_t(); + + mesh->attrib.w = s.read_uint32_t(); + mh.vertex_format_index = s.read_uint32_t(); + mesh->reserved[0] = s.read_uint32_t(); + mesh->reserved[1] = s.read_uint32_t(); + mesh->reserved[2] = s.read_uint32_t(); + mesh->reserved[3] = s.read_uint32_t(); + mesh->reserved[4] = s.read_uint32_t(); + mesh->reserved[5] = s.read_uint32_t(); + s.read(&mesh->name, sizeof(mesh->name)); + mesh->name[sizeof(mesh->name) - 1] = 0; + + if (mh.submesh_array) { + uint32_t num_submesh = mesh->num_submesh; + mesh->submesh_array = alloc->allocate(num_submesh); + for (uint32_t i = 0; i < num_submesh; i++) { + s.set_position(base_offset + mh.submesh_array + sub_mesh_size * i, SEEK_SET); + obj_classic_read_model_sub_mesh(&mesh->submesh_array[i], + alloc, s, base_offset); + } + } + + obj_classic_read_vertex(mesh, alloc, s, mh.vertex, + base_offset, mh.num_vertex, mh.format); + obj_vertex_generate_tangents(mesh); +} + +static void obj_classic_read_model_sub_mesh(obj_sub_mesh* sub_mesh, + prj::shared_ptr alloc, stream& s, int64_t base_offset) { + obj_sub_mesh_header smh = {}; + sub_mesh->flags = s.read_uint32_t(); + sub_mesh->bounding_sphere.center.x = s.read_float_t(); + sub_mesh->bounding_sphere.center.y = s.read_float_t(); + sub_mesh->bounding_sphere.center.z = s.read_float_t(); + sub_mesh->bounding_sphere.radius = s.read_float_t(); + sub_mesh->material_index = s.read_uint32_t(); + s.read(&sub_mesh->uv_index, 0x08); + sub_mesh->num_bone_index = s.read_int32_t(); + smh.bone_index_array_offset = s.read_uint32_t(); + sub_mesh->bones_per_vertex = s.read_uint32_t(); + sub_mesh->primitive_type = (obj_primitive_type)s.read_uint32_t(); + sub_mesh->index_format = (obj_index_format)s.read_uint32_t(); + sub_mesh->num_index = s.read_int32_t(); + smh.index_array_offset = s.read_uint32_t(); + sub_mesh->attrib.w = s.read_uint32_t(); + sub_mesh->bounding_box.center = sub_mesh->bounding_sphere.center; + sub_mesh->bounding_box.size.x = sub_mesh->bounding_sphere.radius * 2.0f; + sub_mesh->bounding_box.size.y = sub_mesh->bounding_sphere.radius * 2.0f; + sub_mesh->bounding_box.size.z = sub_mesh->bounding_sphere.radius * 2.0f; + s.read(0, 0x18); + sub_mesh->index_offset = s.read_uint32_t(); + + if (sub_mesh->bones_per_vertex == 4 && smh.bone_index_array_offset) { + sub_mesh->bone_index_array = alloc->allocate(sub_mesh->num_bone_index); + s.set_position(base_offset + smh.bone_index_array_offset, SEEK_SET); + s.read(sub_mesh->bone_index_array, sub_mesh->num_bone_index * sizeof(uint16_t)); + } + + s.set_position(base_offset + smh.index_array_offset, SEEK_SET); + obj_classic_read_index(sub_mesh, alloc, s); +} + +static obj_skin* obj_classic_read_skin(prj::shared_ptr alloc, stream& s, int64_t base_offset) { + obj_skin* sk = alloc->allocate(); s.set_position(base_offset, SEEK_SET); obj_skin_header sh = {}; - sh.bone_ids_offset = s.read_uint32_t(); - sh.bone_matrices_offset = s.read_uint32_t(); - sh.bone_names_offset = s.read_uint32_t(); + sh.bone_id_array_offset = s.read_uint32_t(); + sh.bone_matrix_array_offset = s.read_uint32_t(); + sh.bone_name_array_offset = s.read_uint32_t(); sh.ex_data_offset = s.read_uint32_t(); - sk->bones_count = s.read_int32_t(); - sh.bone_parent_ids_offset = s.read_uint32_t(); + sk->num_bone = s.read_int32_t(); + sh.bone_parent_id_array_offset = s.read_uint32_t(); s.read(0, 0x0C); - if (sh.bone_ids_offset) { - sk->bones = force_malloc_s(obj_skin_bone, sk->bones_count); + if (sh.bone_id_array_offset) { + sk->bone_array = alloc->allocate(sk->num_bone); - int32_t* bone_names_offsets = 0; - if (sh.bone_names_offset) { - bone_names_offsets = force_malloc_s(int32_t, sk->bones_count); - s.set_position(sh.bone_names_offset, SEEK_SET); - for (uint32_t i = 0; i < sk->bones_count; i++) - bone_names_offsets[i] = s.read_int32_t(); - } + s.set_position(sh.bone_id_array_offset, SEEK_SET); + for (uint32_t i = 0; i < sk->num_bone; i++) + sk->bone_array[i].id = s.read_uint32_t(); - if (sh.bone_ids_offset) { - s.set_position(sh.bone_ids_offset, SEEK_SET); - for (uint32_t i = 0; i < sk->bones_count; i++) - sk->bones[i].id = s.read_uint32_t(); - - if (sh.bone_matrices_offset) { - s.set_position(sh.bone_matrices_offset, SEEK_SET); - for (uint32_t i = 0; i < sk->bones_count; i++) { - mat4& mat = sk->bones[i].inv_bind_pose_mat; - mat.row0.x = s.read_float_t(); - mat.row1.x = s.read_float_t(); - mat.row2.x = s.read_float_t(); - mat.row3.x = s.read_float_t(); - mat.row0.y = s.read_float_t(); - mat.row1.y = s.read_float_t(); - mat.row2.y = s.read_float_t(); - mat.row3.y = s.read_float_t(); - mat.row0.z = s.read_float_t(); - mat.row1.z = s.read_float_t(); - mat.row2.z = s.read_float_t(); - mat.row3.z = s.read_float_t(); - mat.row0.w = s.read_float_t(); - mat.row1.w = s.read_float_t(); - mat.row2.w = s.read_float_t(); - mat.row3.w = s.read_float_t(); - } - } - - if (sh.bone_names_offset) - for (uint32_t i = 0; i < sk->bones_count; i++) - sk->bones[i].name = s.read_utf8_string_null_terminated_offset( - bone_names_offsets[i]); - - if (sh.bone_parent_ids_offset) { - s.set_position(sh.bone_parent_ids_offset, SEEK_SET); - for (uint32_t i = 0; i < sk->bones_count; i++) - sk->bones[i].parent = s.read_uint32_t(); - } - } - free_def(bone_names_offsets); - } - - if (sh.ex_data_offset) { - obj_skin_ex_data* ex = &sk->ex_data; - sk->ex_data_init = true; - s.set_position(sh.ex_data_offset, SEEK_SET); - - obj_skin_ex_data_header exh = {}; - exh.osage_count = s.read_int32_t(); - ex->osage_nodes_count = s.read_int32_t(); - s.read(0, 0x04); - exh.osage_nodes_offset = s.read_uint32_t(); - exh.osage_names_offset = s.read_uint32_t(); - exh.blocks_offset = s.read_uint32_t(); - exh.bone_names_count = s.read_int32_t(); - exh.bone_names_offset = s.read_uint32_t(); - exh.osage_sibling_infos_offset = s.read_uint32_t(); - exh.cloth_count = s.read_uint32_t(); - ex->reserved[0] = s.read_uint32_t(); - ex->reserved[1] = s.read_uint32_t(); - ex->reserved[2] = s.read_uint32_t(); - ex->reserved[3] = s.read_uint32_t(); - ex->reserved[4] = s.read_uint32_t(); - ex->reserved[5] = s.read_uint32_t(); - ex->reserved[6] = s.read_uint32_t(); - - if (exh.bone_names_offset) { - std::vector bone_names; - bone_names.reserve(exh.bone_names_count); - int32_t* strings_offsets = force_malloc_s(int32_t, exh.bone_names_count); - s.set_position(exh.bone_names_offset, SEEK_SET); - for (uint32_t i = 0; i < exh.bone_names_count; i++) - strings_offsets[i] = s.read_int32_t(); - - size_t buf_size = 0; - for (uint32_t i = 0; i < exh.bone_names_count; i++) { - if (strings_offsets[i]) - bone_names.push_back(s.read_string_null_terminated_offset( - strings_offsets[i])); - else - bone_names.push_back({}); - buf_size += bone_names.back().size() + 1; - } - free_def(strings_offsets); - - if (bone_names.size()) { - ex->bone_names_buf = force_malloc_s(char, buf_size); - ex->bone_names = force_malloc_s(char*, buf_size + 1); - ex->bone_names_count = exh.bone_names_count; - - char* bone_names_buf = ex->bone_names_buf; - char** bone_names_ptr = ex->bone_names; - for (uint32_t i = 0; i < exh.bone_names_count; i++) { - std::string* str = &bone_names.data()[i]; - *bone_names_ptr++ = bone_names_buf; - memcpy(bone_names_buf, str->c_str(), str->size()); - bone_names_buf[str->size()] = 0; - bone_names_buf += str->size() + 1; - } - *bone_names_ptr = 0; - } - } - else { - ex->bone_names_buf = 0; - ex->bone_names = 0; - ex->bone_names_count = 0; - } - - char** bone_names = ex->bone_names; - if (!bone_names) - return; - - if (exh.osage_nodes_offset) { - ex->osage_nodes = force_malloc_s(obj_skin_osage_node, ex->osage_nodes_count); - - s.set_position(exh.osage_nodes_offset, SEEK_SET); - for (uint32_t i = 0; i < ex->osage_nodes_count; i++) { - obj_skin_osage_node* osage_node = &ex->osage_nodes[i]; - - osage_node->name_index = s.read_uint32_t(); - osage_node->length = s.read_float_t(); - s.read(0, 0x04); + if (sh.bone_matrix_array_offset) { + s.set_position(sh.bone_matrix_array_offset, SEEK_SET); + for (uint32_t i = 0; i < sk->num_bone; i++) { + mat4& mat = sk->bone_array[i].inv_bind_pose_mat; + mat.row0.x = s.read_float_t(); + mat.row1.x = s.read_float_t(); + mat.row2.x = s.read_float_t(); + mat.row3.x = s.read_float_t(); + mat.row0.y = s.read_float_t(); + mat.row1.y = s.read_float_t(); + mat.row2.y = s.read_float_t(); + mat.row3.y = s.read_float_t(); + mat.row0.z = s.read_float_t(); + mat.row1.z = s.read_float_t(); + mat.row2.z = s.read_float_t(); + mat.row3.z = s.read_float_t(); + mat.row0.w = s.read_float_t(); + mat.row1.w = s.read_float_t(); + mat.row2.w = s.read_float_t(); + mat.row3.w = s.read_float_t(); } } - if (exh.blocks_offset) { - ex->blocks_count = 0; - s.set_position(exh.blocks_offset, SEEK_SET); - while (s.read_int32_t()) { - s.read(0, 0x04); - ex->blocks_count++; - } - - obj_skin_block_header* bhs = force_malloc_s(obj_skin_block_header, ex->blocks_count); - s.set_position(exh.blocks_offset, SEEK_SET); - for (uint32_t i = 0; i < ex->blocks_count; i++) { - bhs[i].block_signature_offset = s.read_uint32_t(); - bhs[i].block_offset = s.read_uint32_t(); - } - - ex->blocks = force_malloc_s(obj_skin_block, ex->blocks_count); - for (uint32_t i = 0; i < ex->blocks_count; i++) { - obj_skin_block* block = &ex->blocks[i]; - - std::string block_signature = s.read_string_null_terminated_offset( - bhs[i].block_signature_offset); - if (block_signature.size() != 3) - continue; - - uint32_t signature = load_reverse_endianness_uint32_t(block_signature.c_str()); - switch (signature) { - case 'CLS\0': - block->type = OBJ_SKIN_BLOCK_CLOTH; - s.set_position(bhs[i].block_offset, SEEK_SET); - obj_classic_read_skin_block_cloth(&block->cloth, - s, bone_names); - break; - case 'CNS\0': - block->type = OBJ_SKIN_BLOCK_CONSTRAINT; - s.set_position(bhs[i].block_offset, SEEK_SET); - obj_classic_read_skin_block_constraint(&block->constraint, - s, bone_names); - break; - case 'EXP\0': - block->type = OBJ_SKIN_BLOCK_EXPRESSION; - s.set_position(bhs[i].block_offset, SEEK_SET); - obj_classic_read_skin_block_expression(&block->expression, - s, bone_names); - break; - case 'MOT\0': - block->type = OBJ_SKIN_BLOCK_MOTION; - s.set_position(bhs[i].block_offset, SEEK_SET); - obj_classic_read_skin_block_motion(&block->motion, - s, bone_names); - break; - case 'OSG\0': - block->type = OBJ_SKIN_BLOCK_OSAGE; - s.set_position(bhs[i].block_offset, SEEK_SET); - obj_classic_read_skin_block_osage(&block->osage, - s, bone_names); - break; - } - } - free_def(bhs); + if (sh.bone_parent_id_array_offset) { + s.set_position(sh.bone_parent_id_array_offset, SEEK_SET); + for (uint32_t i = 0; i < sk->num_bone; i++) + sk->bone_array[i].parent = s.read_uint32_t(); } - if (exh.osage_sibling_infos_offset) { - ex->osage_sibling_infos_count = 0; - s.set_position(exh.osage_sibling_infos_offset, SEEK_SET); - while (s.read_uint32_t()) { - s.read(0, 0x08); - ex->osage_sibling_infos_count++; - } - - obj_skin_osage_sibling_info* osis = force_malloc_s( - obj_skin_osage_sibling_info, ex->osage_sibling_infos_count); - ex->osage_sibling_infos = osis; - s.set_position(exh.osage_sibling_infos_offset, SEEK_SET); - for (uint32_t i = 0; i < ex->osage_sibling_infos_count; i++) { - osis[i].name_index = s.read_uint32_t(); - osis[i].sibling_name_index = s.read_uint32_t(); - osis[i].max_distance = s.read_float_t(); - } - - s.set_position(exh.osage_sibling_infos_offset, SEEK_SET); - } - - for (uint32_t i = 0; i < ex->blocks_count; i++) { - obj_skin_block* block = &ex->blocks[i]; - if (block->type != OBJ_SKIN_BLOCK_OSAGE) - continue; - - obj_skin_block_osage* osage = &block->osage; - if (!osage->nodes) - continue; - - int32_t count = osage->count; - obj_skin_osage_node* child_osage_node = &ex->osage_nodes[osage->start_index]; - obj_skin_osage_node* osage_node = osage->nodes; - for (int32_t j = 0; j < count; j++) { - osage_node->name_index = child_osage_node->name_index; - osage_node->length = child_osage_node->length; - - child_osage_node++; - osage_node++; - } + if (sh.bone_name_array_offset) { + s.set_position(sh.bone_name_array_offset, SEEK_SET); + for (uint32_t i = 0; i < sk->num_bone; i++) + sk->bone_array[i].name = obj_read_utf8_string_null_terminated_offset( + alloc, s, s.read_int32_t()); } } + + if (sh.ex_data_offset) + sk->ex_data = obj_classic_read_skin_ex_data(alloc, s, sh.ex_data_offset); + return sk; } -static void obj_classic_write_skin(obj* obj, stream& s, int64_t base_offset) { - obj_skin* sk = &obj->skin; - +static void obj_classic_write_skin(obj_skin* sk, stream& s, int64_t base_offset) { obj_skin_header sh = {}; s.write_int32_t(0); s.write_int32_t(0); @@ -1455,27 +1348,27 @@ static void obj_classic_write_skin(obj* obj, stream& s, int64_t base_offset) { std::vector strings; std::vector string_offsets; std::vector bone_names; - if (sk->bones) { - sh.bone_ids_offset = s.get_position(); - for (uint32_t i = 0; i < sk->bones_count; i++) - s.write_int32_t(sk->bones[i].id); + if (sk->bone_array) { + sh.bone_id_array_offset = s.get_position(); + for (uint32_t i = 0; i < sk->num_bone; i++) + s.write_int32_t(sk->bone_array[i].id); s.align_write(0x10); - sh.bone_parent_ids_offset = s.get_position(); - for (uint32_t i = 0; i < sk->bones_count; i++) - s.write_int32_t(sk->bones[i].parent); + sh.bone_parent_id_array_offset = s.get_position(); + for (uint32_t i = 0; i < sk->num_bone; i++) + s.write_int32_t(sk->bone_array[i].parent); s.align_write(0x10); - sh.bone_names_offset = s.get_position(); - for (uint32_t i = 0; i < sk->bones_count; i++) { + sh.bone_name_array_offset = s.get_position(); + for (uint32_t i = 0; i < sk->num_bone; i++) { s.write_int32_t(0); - obj_skin_strings_push_back_check(strings, sk->bones[i].name); + obj_skin_strings_push_back_check(strings, sk->bone_array[i].name); } s.align_write(0x10); - sh.bone_matrices_offset = s.get_position(); - for (uint32_t i = 0; i < sk->bones_count; i++) { - mat4& mat = sk->bones[i].inv_bind_pose_mat; + sh.bone_matrix_array_offset = s.get_position(); + for (uint32_t i = 0; i < sk->num_bone; i++) { + mat4& mat = sk->bone_array[i].inv_bind_pose_mat; s.write_float_t(mat.row0.x); s.write_float_t(mat.row1.x); s.write_float_t(mat.row2.x); @@ -1507,8 +1400,8 @@ static void obj_classic_write_skin(obj* obj, stream& s, int64_t base_offset) { int64_t cloth_backface_mesh_indices = 0; obj_skin_ex_data_header exh = {}; - if (sk->ex_data_init) { - obj_skin_ex_data* ex = &sk->ex_data; + if (sk->ex_data) { + obj_skin_ex_data* ex = sk->ex_data; sh.ex_data_offset = s.get_position(); s.write_int32_t(0); @@ -1524,17 +1417,17 @@ static void obj_classic_write_skin(obj* obj, stream& s, int64_t base_offset) { s.write(0x1C); s.align_write(0x10); - if (ex->osage_nodes_count) { - exh.osage_nodes_offset = s.get_position(); - for (uint32_t i = 0; i < ex->osage_nodes_count; i++) { + if (ex->num_osage_node) { + exh.osage_node_array_offset = s.get_position(); + for (uint32_t i = 0; i < ex->num_osage_node; i++) { s.write_int32_t(0); s.write_int32_t(0); s.write_int32_t(0); } s.align_write(0x10); - exh.osage_sibling_infos_offset = s.get_position(); - for (uint32_t i = 0; i < ex->osage_sibling_infos_count; i++) { + exh.osage_sibling_info_array_offset = s.get_position(); + for (uint32_t i = 0; i < ex->num_osage_sibling_info; i++) { s.write_int32_t(0); s.write_int32_t(0); s.write_int32_t(0); @@ -1546,18 +1439,18 @@ static void obj_classic_write_skin(obj* obj, stream& s, int64_t base_offset) { } exh.cloth_count = 0; - exh.osage_count = 0; - for (uint32_t i = 0; i < ex->blocks_count; i++) { - obj_skin_block* block = &ex->blocks[i]; + exh.num_osage = 0; + for (uint32_t i = 0; i < ex->num_block; i++) { + obj_skin_block* block = &ex->block_array[i]; if (block->type == OBJ_SKIN_BLOCK_CLOTH) exh.cloth_count++; else if (block->type == OBJ_SKIN_BLOCK_OSAGE) - exh.osage_count++; + exh.num_osage++; } - if (exh.osage_count || exh.cloth_count) { - exh.osage_names_offset = s.get_position(); - for (uint32_t i = 0; i < exh.osage_count; i++) + if (exh.num_osage || exh.cloth_count) { + exh.osage_name_array_offset = s.get_position(); + for (uint32_t i = 0; i < exh.num_osage; i++) s.write_int32_t(0); for (uint32_t i = 0; i < exh.cloth_count; i++) @@ -1565,29 +1458,29 @@ static void obj_classic_write_skin(obj* obj, stream& s, int64_t base_offset) { s.align_write(0x10); } - char** bone_names_ptr = ex->bone_names; - for (uint32_t i = 0; i < ex->blocks_count; i++) { - obj_skin_block* block = &ex->blocks[i]; + const char** bone_name_array = ex->bone_name_array; + for (uint32_t i = 0; i < ex->num_block; i++) { + obj_skin_block* block = &ex->block_array[i]; switch (block->type) { case OBJ_SKIN_BLOCK_CLOTH: { - obj_skin_block_cloth* cloth = &block->cloth; + obj_skin_block_cloth* cloth = block->cloth; obj_skin_strings_push_back_check(strings, cloth->mesh_name); obj_skin_strings_push_back_check(strings, cloth->backface_mesh_name); - for (uint32_t k = 0; k < cloth->root_count; k++) { - obj_skin_block_cloth_root* sub = &cloth->root[k]; + for (uint32_t k = 0; k < cloth->num_root; k++) { + obj_skin_block_cloth_root* root_array = &cloth->root_array[k]; for (uint32_t l = 0; l < 4; l++) - obj_skin_strings_push_back_check(strings, sub->bone_weights[l].bone_name); + obj_skin_strings_push_back_check(strings, root_array->bone_weights[l].bone_name); } - if (cloth->skin_param_init) - obj_skin_strings_push_back_check(strings, cloth->skin_param.name); + if (cloth->skin_param) + obj_skin_strings_push_back_check(strings, cloth->skin_param->name); obj_skin_strings_push_back_check(strings, "CLS"); } break; case OBJ_SKIN_BLOCK_CONSTRAINT: { - obj_skin_block_constraint* constraint = &block->constraint; - obj_skin_strings_push_back_check(strings, constraint->base.parent_name); + obj_skin_block_constraint* constraint = block->constraint; + obj_skin_strings_push_back_check(strings, constraint->node.parent_name); obj_skin_strings_push_back_check_by_index(strings, - bone_names_ptr, constraint->name_index); + bone_name_array, constraint->name_index); obj_skin_strings_push_back_check(strings, constraint->source_node_name); switch (constraint->type) { case OBJ_SKIN_BLOCK_CONSTRAINT_ORIENTATION: @@ -1595,130 +1488,130 @@ static void obj_classic_write_skin(obj* obj, stream& s, int64_t base_offset) { break; case OBJ_SKIN_BLOCK_CONSTRAINT_DIRECTION: obj_skin_strings_push_back_check(strings, "Direction"); - obj_skin_strings_push_back_check(strings, constraint->direction.up_vector.name); + obj_skin_strings_push_back_check(strings, constraint->direction->up_vector.name); break; case OBJ_SKIN_BLOCK_CONSTRAINT_POSITION: obj_skin_strings_push_back_check(strings, "Position"); - obj_skin_strings_push_back_check(strings, constraint->position.up_vector.name); + obj_skin_strings_push_back_check(strings, constraint->position->up_vector.name); break; case OBJ_SKIN_BLOCK_CONSTRAINT_DISTANCE: obj_skin_strings_push_back_check(strings, "Distance"); - obj_skin_strings_push_back_check(strings, constraint->distance.up_vector.name); + obj_skin_strings_push_back_check(strings, constraint->distance->up_vector.name); break; } obj_skin_strings_push_back_check(strings, "CNS"); obj_skin_strings_push_back_check_by_index(bone_names, - bone_names_ptr, constraint->name_index); + bone_name_array, constraint->name_index); } break; case OBJ_SKIN_BLOCK_EXPRESSION: { - obj_skin_block_expression* expression = &block->expression; - for (uint32_t j = 0; j < expression->expressions_count; j++) - obj_skin_strings_push_back_check(strings, expression->expressions[j]); - obj_skin_strings_push_back_check(strings, expression->base.parent_name); + obj_skin_block_expression* expression = block->expression; + for (uint32_t j = 0; j < expression->num_expression; j++) + obj_skin_strings_push_back_check(strings, expression->expression_array[j]); + obj_skin_strings_push_back_check(strings, expression->node.parent_name); obj_skin_strings_push_back_check_by_index(strings, - bone_names_ptr, expression->name_index); + bone_name_array, expression->name_index); obj_skin_strings_push_back_check(strings, "EXP"); obj_skin_strings_push_back_check_by_index(bone_names, - bone_names_ptr, expression->name_index); + bone_name_array, expression->name_index); } break; case OBJ_SKIN_BLOCK_MOTION: { - obj_skin_block_motion* motion = &block->motion; - obj_skin_strings_push_back_check(strings, motion->base.parent_name); + obj_skin_block_motion* motion = block->motion; + obj_skin_strings_push_back_check(strings, motion->node.parent_name); obj_skin_strings_push_back_check(strings, motion->name); - for (uint32_t j = 0; j < motion->nodes_count; j++) + for (uint32_t j = 0; j < motion->num_node; j++) obj_skin_strings_push_back_check_by_index(strings, - bone_names_ptr, motion->nodes[j].name_index); + bone_name_array, motion->node_array[j].name_index); obj_skin_strings_push_back_check(strings, "MOT"); obj_skin_strings_push_back_check(bone_names, motion->name); - for (uint32_t j = 0; j < motion->nodes_count; j++) + for (uint32_t j = 0; j < motion->num_node; j++) obj_skin_strings_push_back_check_by_index(bone_names, - bone_names_ptr, motion->nodes[j].name_index); + bone_name_array, motion->node_array[j].name_index); } break; case OBJ_SKIN_BLOCK_OSAGE: { - obj_skin_block_osage* osage = &block->osage; - obj_skin_strings_push_back_check(strings, osage->base.parent_name); + obj_skin_block_osage* osage = block->osage; + obj_skin_strings_push_back_check(strings, osage->node.parent_name); obj_skin_strings_push_back_check_by_index(strings, - bone_names_ptr, osage->name_index); + bone_name_array, osage->name_index); obj_skin_strings_push_back_check_by_index(strings, - bone_names_ptr, osage->external_name_index); + bone_name_array, osage->external_name_index); for (uint32_t j = 0; j < osage->count; j++) { - obj_skin_osage_node* osage_node = &ex->osage_nodes[j]; + obj_skin_osage_node* osage_node = &ex->osage_node_array[j]; obj_skin_strings_push_back_check_by_index(strings, - bone_names_ptr, osage_node->name_index); + bone_name_array, osage_node->name_index); int32_t name_index = osage->name_index; - obj_skin_osage_sibling_info* osage_sibling_infos = ex->osage_sibling_infos; - for (uint32_t k = 0; k < ex->osage_sibling_infos_count; k++) { - if (name_index == osage_sibling_infos->name_index) { + obj_skin_osage_sibling_info* osage_sibling_info = ex->osage_sibling_info_array; + for (uint32_t k = 0; k < ex->num_osage_sibling_info; k++) { + if (name_index == osage_sibling_info->name_index) { obj_skin_strings_push_back_check_by_index(strings, - bone_names_ptr, osage_sibling_infos->sibling_name_index); + bone_name_array, osage_sibling_info->sibling_name_index); break; } - osage_sibling_infos++; + osage_sibling_info++; } } - if (osage->skin_param_init) - obj_skin_strings_push_back_check(strings, osage->skin_param.name); + if (osage->skin_param) + obj_skin_strings_push_back_check(strings, osage->skin_param->name); obj_skin_strings_push_back_check(strings, "OSG"); obj_skin_strings_push_back_check_by_index(bone_names, - bone_names_ptr, osage->external_name_index); + bone_name_array, osage->external_name_index); for (uint32_t j = 0; j < osage->count; j++) { - obj_skin_osage_node* osage_node = &ex->osage_nodes[j]; + obj_skin_osage_node* osage_node = &ex->osage_node_array[j]; obj_skin_strings_push_back_check_by_index(bone_names, - bone_names_ptr, osage_node->name_index); + bone_name_array, osage_node->name_index); int32_t name_index = osage->name_index; - obj_skin_osage_sibling_info* osage_sibling_infos = ex->osage_sibling_infos; - for (uint32_t k = 0; k < ex->osage_sibling_infos_count; k++) { - if (name_index == osage_sibling_infos->name_index) { + obj_skin_osage_sibling_info* osage_sibling_info = ex->osage_sibling_info_array; + for (uint32_t k = 0; k < ex->num_osage_sibling_info; k++) { + if (name_index == osage_sibling_info->name_index) { obj_skin_strings_push_back_check_by_index(bone_names, - bone_names_ptr, osage_sibling_infos->sibling_name_index); + bone_name_array, osage_sibling_info->sibling_name_index); break; } - osage_sibling_infos++; + osage_sibling_info++; } } - obj_skin_osage_node* child_osage_node = &ex->osage_nodes[osage->start_index]; + obj_skin_osage_node* child_osage_node = &ex->osage_node_array[osage->start_index]; for (uint32_t j = 0; j < osage->count; j++) { obj_skin_strings_push_back_check_by_index(bone_names, - bone_names_ptr, child_osage_node->name_index); + bone_name_array, child_osage_node->name_index); int32_t name_index = child_osage_node->name_index; - obj_skin_osage_sibling_info* osage_sibling_infos = ex->osage_sibling_infos; - for (uint32_t k = 0; k < ex->osage_sibling_infos_count; k++) { - if (name_index == osage_sibling_infos->name_index) { + obj_skin_osage_sibling_info* osage_sibling_info = ex->osage_sibling_info_array; + for (uint32_t k = 0; k < ex->num_osage_sibling_info; k++) { + if (name_index == osage_sibling_info->name_index) { obj_skin_strings_push_back_check_by_index(bone_names, - bone_names_ptr, osage_sibling_infos->sibling_name_index); + bone_name_array, osage_sibling_info->sibling_name_index); break; } - osage_sibling_infos++; + osage_sibling_info++; } child_osage_node++; } obj_skin_strings_push_back_check_by_index(bone_names, - bone_names_ptr, osage->name_index); + bone_name_array, osage->name_index); - if (osage->skin_param_init) - obj_skin_strings_push_back_check(strings, osage->skin_param.name); + if (osage->skin_param) + obj_skin_strings_push_back_check(strings, osage->skin_param->name); } break; } } - exh.bone_names_count = (int32_t)bone_names.size(); - exh.bone_names_offset = s.get_position(); + exh.num_bone_name = (int32_t)bone_names.size(); + exh.bone_name_array_offset = s.get_position(); for (string_hash& i : bone_names) s.write_int32_t(0); s.align_write(0x10); - if (ex->blocks_count > 0) { - exh.blocks_offset = s.get_position(); - for (uint32_t i = 0; i < ex->blocks_count; i++) { + if (ex->num_block > 0) { + exh.block_array_offset = s.get_position(); + for (uint32_t i = 0; i < ex->num_block; i++) { s.write_int32_t(0); s.write_int32_t(0); } @@ -1726,15 +1619,15 @@ static void obj_classic_write_skin(obj* obj, stream& s, int64_t base_offset) { s.write_int32_t(0); s.align_write(0x10); - bhs = force_malloc_s(obj_skin_block_header, ex->blocks_count); - for (uint32_t i = 0; i < ex->blocks_count; i++) { - obj_skin_block* block = &ex->blocks[i]; + bhs = force_malloc_s(obj_skin_block_header, ex->num_block); + for (uint32_t i = 0; i < ex->num_block; i++) { + obj_skin_block* block = &ex->block_array[i]; if (block->type != OBJ_SKIN_BLOCK_OSAGE) continue; - obj_skin_block_osage* osage = &block->osage; - if (osage->skin_param_init) { - obj_skin_skin_param* skin_param = &osage->skin_param; + obj_skin_block_osage* osage = block->osage; + if (osage->skin_param) { + obj_skin_skin_param* skin_param = osage->skin_param; if (skin_param->coli) { s.write(0x28ULL * skin_param->coli_count); s.align_write(0x10); @@ -1750,8 +1643,8 @@ static void obj_classic_write_skin(obj* obj, stream& s, int64_t base_offset) { } s.align_write(0x10); - for (uint32_t i = 0; i < ex->blocks_count; i++) { - obj_skin_block* block = &ex->blocks[i]; + for (uint32_t i = 0; i < ex->num_block; i++) { + obj_skin_block* block = &ex->block_array[i]; if (block->type != OBJ_SKIN_BLOCK_EXPRESSION) continue; @@ -1761,14 +1654,14 @@ static void obj_classic_write_skin(obj* obj, stream& s, int64_t base_offset) { } s.align_write(0x10); - for (uint32_t i = 0; i < ex->blocks_count; i++) { - obj_skin_block* block = &ex->blocks[i]; + for (uint32_t i = 0; i < ex->num_block; i++) { + obj_skin_block* block = &ex->block_array[i]; if (block->type != OBJ_SKIN_BLOCK_CLOTH) continue; - obj_skin_block_cloth* cloth = &block->cloth; - if (cloth->skin_param_init) { - obj_skin_skin_param* skin_param = &cloth->skin_param; + obj_skin_block_cloth* cloth = block->cloth; + if (cloth->skin_param) { + obj_skin_skin_param* skin_param = cloth->skin_param; if (skin_param->coli) { s.write(0x28ULL * skin_param->coli_count); s.align_write(0x10); @@ -1782,15 +1675,15 @@ static void obj_classic_write_skin(obj* obj, stream& s, int64_t base_offset) { } s.align_write(0x10); - for (uint32_t i = 0; i < ex->blocks_count; i++) { - obj_skin_block* block = &ex->blocks[i]; + for (uint32_t i = 0; i < ex->num_block; i++) { + obj_skin_block* block = &ex->block_array[i]; if (block->type != OBJ_SKIN_BLOCK_CONSTRAINT) continue; bhs[i].block_offset = s.get_position(); s.write(0x28); s.write(0x10); - switch (block->constraint.type) { + switch (block->constraint->type) { case OBJ_SKIN_BLOCK_CONSTRAINT_ORIENTATION: s.write(0x0C); break; @@ -1814,8 +1707,8 @@ static void obj_classic_write_skin(obj* obj, stream& s, int64_t base_offset) { s.align_write(0x10); int32_t motion_block_count = 0; - for (uint32_t i = 0; i < ex->blocks_count; i++) { - obj_skin_block* block = &ex->blocks[i]; + for (uint32_t i = 0; i < ex->num_block; i++) { + obj_skin_block* block = &ex->block_array[i]; if (block->type != OBJ_SKIN_BLOCK_MOTION) continue; @@ -1826,105 +1719,105 @@ static void obj_classic_write_skin(obj* obj, stream& s, int64_t base_offset) { } s.align_write(0x10); - if (exh.osage_count) { + if (exh.num_osage) { osage_block_node = s.get_position(); - for (uint32_t i = 0; i < ex->blocks_count; i++) { - obj_skin_block* block = &ex->blocks[i]; + for (uint32_t i = 0; i < ex->num_block; i++) { + obj_skin_block* block = &ex->block_array[i]; if (block->type != OBJ_SKIN_BLOCK_OSAGE) continue; - obj_skin_block_osage* osage = &block->osage; - s.write(osage->nodes_count * (sizeof(uint32_t) + sizeof(float_t) * 4)); + obj_skin_block_osage* osage = block->osage; + s.write(osage->num_node * (sizeof(uint32_t) + sizeof(float_t) * 4)); } s.align_write(0x10); } if (motion_block_count) { motion_block_node_mats = s.get_position(); - for (uint32_t i = 0; i < ex->blocks_count; i++) { - obj_skin_block* block = &ex->blocks[i]; + for (uint32_t i = 0; i < ex->num_block; i++) { + obj_skin_block* block = &ex->block_array[i]; if (block->type != OBJ_SKIN_BLOCK_MOTION) continue; - obj_skin_block_motion* motion = &block->motion; - s.write(motion->nodes_count * sizeof(mat4)); + obj_skin_block_motion* motion = block->motion; + s.write(motion->num_node * sizeof(mat4)); } s.align_write(0x10); motion_block_node_name_offset = s.get_position(); - for (uint32_t i = 0; i < ex->blocks_count; i++) { - obj_skin_block* block = &ex->blocks[i]; + for (uint32_t i = 0; i < ex->num_block; i++) { + obj_skin_block* block = &ex->block_array[i]; if (block->type != OBJ_SKIN_BLOCK_MOTION) continue; - obj_skin_block_motion* motion = &block->motion; - s.write(motion->nodes_count * sizeof(uint32_t)); + obj_skin_block_motion* motion = block->motion; + s.write(motion->num_node * sizeof(uint32_t)); } s.align_write(0x10); } if (exh.cloth_count) { cloth_mats = s.get_position(); - for (uint32_t i = 0; i < ex->blocks_count; i++) { - obj_skin_block* block = &ex->blocks[i]; + for (uint32_t i = 0; i < ex->num_block; i++) { + obj_skin_block* block = &ex->block_array[i]; if (block->type != OBJ_SKIN_BLOCK_CLOTH) continue; - obj_skin_block_cloth* cloth = &block->cloth; - if (cloth->mats) - s.write(cloth->mats_count * sizeof(mat4)); + obj_skin_block_cloth* cloth = block->cloth; + if (cloth->mat_array) + s.write(cloth->num_mat * sizeof(mat4)); } s.align_write(0x10); cloth_root = s.get_position(); - for (uint32_t i = 0; i < ex->blocks_count; i++) { - obj_skin_block* block = &ex->blocks[i]; + for (uint32_t i = 0; i < ex->num_block; i++) { + obj_skin_block* block = &ex->block_array[i]; if (block->type != OBJ_SKIN_BLOCK_CLOTH) continue; - obj_skin_block_cloth* cloth = &block->cloth; + obj_skin_block_cloth* cloth = block->cloth; s.write((sizeof(int32_t) + 4 * (sizeof(int32_t) + 3 * sizeof(int32_t))) - * cloth->root_count * (cloth->nodes_count - 1ULL)); + * cloth->num_root * (cloth->num_node - 1ULL)); } s.align_write(0x10); cloth_nodes = s.get_position(); - for (uint32_t i = 0; i < ex->blocks_count; i++) { - obj_skin_block* block = &ex->blocks[i]; + for (uint32_t i = 0; i < ex->num_block; i++) { + obj_skin_block* block = &ex->block_array[i]; if (block->type != OBJ_SKIN_BLOCK_CLOTH) continue; - obj_skin_block_cloth* cloth = &block->cloth; - s.write((11 * sizeof(int32_t)) * cloth->root_count * (cloth->nodes_count - 1ULL)); + obj_skin_block_cloth* cloth = block->cloth; + s.write((11 * sizeof(int32_t)) * cloth->num_root * (cloth->num_node - 1ULL)); } s.align_write(0x10); cloth_mesh_indices = s.get_position(); - for (uint32_t i = 0; i < ex->blocks_count; i++) { - obj_skin_block* block = &ex->blocks[i]; + for (uint32_t i = 0; i < ex->num_block; i++) { + obj_skin_block* block = &ex->block_array[i]; if (block->type != OBJ_SKIN_BLOCK_CLOTH) continue; - obj_skin_block_cloth* cloth = &block->cloth; - s.write(sizeof(uint16_t) + cloth->mesh_indices_count * sizeof(uint16_t)); + obj_skin_block_cloth* cloth = block->cloth; + s.write(sizeof(uint16_t) + cloth->num_mesh_index * sizeof(uint16_t)); } s.align_write(0x10); cloth_backface_mesh_indices = s.get_position(); - for (uint32_t i = 0; i < ex->blocks_count; i++) { - obj_skin_block* block = &ex->blocks[i]; + for (uint32_t i = 0; i < ex->num_block; i++) { + obj_skin_block* block = &ex->block_array[i]; if (block->type != OBJ_SKIN_BLOCK_CLOTH) continue; - obj_skin_block_cloth* cloth = &block->cloth; - s.write(sizeof(uint16_t) + cloth->backface_mesh_indices_count * sizeof(uint16_t)); + obj_skin_block_cloth* cloth = block->cloth; + s.write(sizeof(uint16_t) + cloth->num_backface_mesh_index * sizeof(uint16_t)); } s.align_write(0x10); } } } - if (sk->bones || sk->ex_data_init) { + if (sk->bone_array || sk->ex_data) { quicksort_string_hash(strings.data(), strings.size()); string_offsets.reserve(strings.size()); for (string_hash& i : strings) { @@ -1935,8 +1828,8 @@ static void obj_classic_write_skin(obj* obj, stream& s, int64_t base_offset) { s.align_write(0x10); std::vector osage_names; - if (sk->ex_data_init) { - obj_skin_ex_data* ex = &sk->ex_data; + if (sk->ex_data) { + obj_skin_ex_data* ex = sk->ex_data; int64_t cls_offset = obj_skin_strings_get_string_offset(strings, string_offsets, "CLS"); int64_t cns_offset = obj_skin_strings_get_string_offset(strings, string_offsets, "CNS"); @@ -1944,14 +1837,14 @@ static void obj_classic_write_skin(obj* obj, stream& s, int64_t base_offset) { int64_t mot_offset = obj_skin_strings_get_string_offset(strings, string_offsets, "MOT"); int64_t osg_offset = obj_skin_strings_get_string_offset(strings, string_offsets, "OSG"); - if (ex->blocks_count > 0) { - for (uint32_t i = 0; i < ex->blocks_count; i++) { - obj_skin_block* block = &ex->blocks[i]; + if (ex->num_block > 0) { + for (uint32_t i = 0; i < ex->num_block; i++) { + obj_skin_block* block = &ex->block_array[i]; if (block->type != OBJ_SKIN_BLOCK_CLOTH) continue; s.position_push(bhs[i].block_offset, SEEK_SET); - obj_classic_write_skin_block_cloth(&block->cloth, + obj_classic_write_skin_block_cloth(block->cloth, s, strings, string_offsets, &cloth_mats, &cloth_root, &cloth_nodes, &cloth_mesh_indices, &cloth_backface_mesh_indices); s.position_pop(); @@ -1967,68 +1860,68 @@ static void obj_classic_write_skin(obj* obj, stream& s, int64_t base_offset) { constraint_type_name_offsets[3] = obj_skin_strings_get_string_offset(strings, string_offsets, "Distance"); - char** bone_names_ptr = ex->bone_names; - for (uint32_t i = 0; i < ex->blocks_count; i++) { - obj_skin_block* block = &ex->blocks[i]; + const char** bone_name_array = ex->bone_name_array; + for (uint32_t i = 0; i < ex->num_block; i++) { + obj_skin_block* block = &ex->block_array[i]; if (block->type != OBJ_SKIN_BLOCK_CONSTRAINT) continue; s.position_push(bhs[i].block_offset, SEEK_SET); - obj_classic_write_skin_block_constraint(&block->constraint, - s, strings, string_offsets, bone_names_ptr, constraint_type_name_offsets); + obj_classic_write_skin_block_constraint(block->constraint, + s, strings, string_offsets, bone_name_array, constraint_type_name_offsets); s.position_pop(); } - for (uint32_t i = 0; i < ex->blocks_count; i++) { - obj_skin_block* block = &ex->blocks[i]; + for (uint32_t i = 0; i < ex->num_block; i++) { + obj_skin_block* block = &ex->block_array[i]; if (block->type != OBJ_SKIN_BLOCK_EXPRESSION) continue; s.position_push(bhs[i].block_offset, SEEK_SET); - obj_classic_write_skin_block_expression(&block->expression, - s, strings, string_offsets, bone_names_ptr); + obj_classic_write_skin_block_expression(block->expression, + s, strings, string_offsets, bone_name_array); s.position_pop(); } - for (uint32_t i = 0; i < ex->blocks_count; i++) { - obj_skin_block* block = &ex->blocks[i]; + for (uint32_t i = 0; i < ex->num_block; i++) { + obj_skin_block* block = &ex->block_array[i]; if (block->type != OBJ_SKIN_BLOCK_MOTION) continue; s.position_push(bhs[i].block_offset, SEEK_SET); - obj_classic_write_skin_block_motion(&block->motion, - s, strings, string_offsets, bone_names_ptr, + obj_classic_write_skin_block_motion(block->motion, + s, strings, string_offsets, bone_name_array, &motion_block_node_name_offset, &motion_block_node_mats); s.position_pop(); } - for (uint32_t i = 0; i < ex->blocks_count; i++) { - obj_skin_block* block = &ex->blocks[i]; + for (uint32_t i = 0; i < ex->num_block; i++) { + obj_skin_block* block = &ex->block_array[i]; if (block->type != OBJ_SKIN_BLOCK_OSAGE) continue; s.position_push(bhs[i].block_offset, SEEK_SET); - obj_classic_write_skin_block_osage(&block->osage, + obj_classic_write_skin_block_osage(block->osage, s, strings, string_offsets, &osage_block_node); s.position_pop(); } - for (uint32_t i = 0; i < ex->blocks_count; i++) { - obj_skin_block* block = &ex->blocks[i]; + for (uint32_t i = 0; i < ex->num_block; i++) { + obj_skin_block* block = &ex->block_array[i]; if (block->type == OBJ_SKIN_BLOCK_CLOTH) { - obj_skin_block_cloth* cloth = &block->cloth; + obj_skin_block_cloth* cloth = block->cloth; obj_skin_strings_push_back_check(osage_names, cloth->mesh_name); } else if (block->type == OBJ_SKIN_BLOCK_OSAGE) { - obj_skin_block_osage* osage = &block->osage; + obj_skin_block_osage* osage = block->osage; obj_skin_strings_push_back_check_by_index(osage_names, - bone_names_ptr, osage->external_name_index); + bone_name_array, osage->external_name_index); } } - s.position_push(exh.blocks_offset, SEEK_SET); - for (uint32_t i = 0; i < ex->blocks_count; i++) { - obj_skin_block* block = &ex->blocks[i]; + s.position_push(exh.block_array_offset, SEEK_SET); + for (uint32_t i = 0; i < ex->num_block; i++) { + obj_skin_block* block = &ex->block_array[i]; switch (block->type) { case OBJ_SKIN_BLOCK_CLOTH: s.write_uint32_t((uint32_t)cls_offset); @@ -2063,21 +1956,21 @@ static void obj_classic_write_skin(obj* obj, stream& s, int64_t base_offset) { } } - if (sk->bones) { - s.position_push(sh.bone_names_offset, SEEK_SET); - for (uint32_t i = 0; i < sk->bones_count; i++) { + if (sk->bone_array) { + s.position_push(sh.bone_name_array_offset, SEEK_SET); + for (uint32_t i = 0; i < sk->num_bone; i++) { size_t str_offset = obj_skin_strings_get_string_offset( - strings, string_offsets, sk->bones[i].name); + strings, string_offsets, sk->bone_array[i].name); s.write_uint32_t((uint32_t)str_offset); } s.position_pop(); } - if (sk->ex_data_init) { - obj_skin_ex_data* ex = &sk->ex_data; + if (sk->ex_data) { + obj_skin_ex_data* ex = sk->ex_data; - if (ex->blocks_count > 0) { - s.position_push(exh.bone_names_offset, SEEK_SET); + if (ex->num_block > 0) { + s.position_push(exh.bone_name_array_offset, SEEK_SET); for (string_hash& i : bone_names) { size_t str_offset = obj_skin_strings_get_string_offset(strings, string_offsets, i.c_str()); @@ -2085,18 +1978,18 @@ static void obj_classic_write_skin(obj* obj, stream& s, int64_t base_offset) { } s.position_pop(); - s.position_push(exh.osage_nodes_offset, SEEK_SET); - for (uint32_t i = 0; i < ex->osage_nodes_count; i++) { - obj_skin_osage_node* osage_node = &ex->osage_nodes[i]; + s.position_push(exh.osage_node_array_offset, SEEK_SET); + for (uint32_t i = 0; i < ex->num_osage_node; i++) { + obj_skin_osage_node* osage_node = &ex->osage_node_array[i]; s.write_uint32_t(osage_node->name_index); s.write_float_t(osage_node->length); s.write_uint32_t(osage_node->name_index & 0x7FFF); } s.position_pop(); - s.position_push(exh.osage_sibling_infos_offset, SEEK_SET); - for (uint32_t i = 0; i < ex->osage_sibling_infos_count; i++) { - obj_skin_osage_sibling_info* osage_sibling_info = &ex->osage_sibling_infos[i]; + s.position_push(exh.osage_sibling_info_array_offset, SEEK_SET); + for (uint32_t i = 0; i < ex->num_osage_sibling_info; i++) { + obj_skin_osage_sibling_info* osage_sibling_info = &ex->osage_sibling_info_array[i]; s.write_uint32_t(osage_sibling_info->name_index); s.write_uint32_t(osage_sibling_info->sibling_name_index); s.write_float_t(osage_sibling_info->max_distance); @@ -2106,9 +1999,9 @@ static void obj_classic_write_skin(obj* obj, stream& s, int64_t base_offset) { s.write_int32_t(0); s.position_pop(); - exh.osage_count = (int32_t)osage_names.size(); - exh.osage_count -= exh.cloth_count; - s.position_push(exh.osage_names_offset, SEEK_SET); + exh.num_osage = (int32_t)osage_names.size(); + exh.num_osage -= exh.cloth_count; + s.position_push(exh.osage_name_array_offset, SEEK_SET); for (string_hash& i : osage_names) { size_t str_offset = obj_skin_strings_get_string_offset(strings, string_offsets, i.c_str()); @@ -2118,15 +2011,15 @@ static void obj_classic_write_skin(obj* obj, stream& s, int64_t base_offset) { } s.position_push(sh.ex_data_offset, SEEK_SET); - s.write_int32_t(exh.osage_count); - s.write_int32_t(ex->osage_nodes_count); + s.write_int32_t(exh.num_osage); + s.write_int32_t(ex->num_osage_node); s.write(0x04); - s.write_uint32_t((uint32_t)exh.osage_nodes_offset); - s.write_uint32_t((uint32_t)exh.osage_names_offset); - s.write_uint32_t((uint32_t)exh.blocks_offset); - s.write_int32_t(exh.bone_names_count); - s.write_uint32_t((uint32_t)exh.bone_names_offset); - s.write_uint32_t((uint32_t)exh.osage_sibling_infos_offset); + s.write_uint32_t((uint32_t)exh.osage_node_array_offset); + s.write_uint32_t((uint32_t)exh.osage_name_array_offset); + s.write_uint32_t((uint32_t)exh.block_array_offset); + s.write_int32_t(exh.num_bone_name); + s.write_uint32_t((uint32_t)exh.bone_name_array_offset); + s.write_uint32_t((uint32_t)exh.osage_sibling_info_array_offset); s.write_int32_t(exh.cloth_count); s.write_uint32_t((uint32_t)ex->reserved[0]); s.write_uint32_t((uint32_t)ex->reserved[1]); @@ -2139,40 +2032,205 @@ static void obj_classic_write_skin(obj* obj, stream& s, int64_t base_offset) { } s.position_push(base_offset, SEEK_SET); - s.write_uint32_t((uint32_t)sh.bone_ids_offset); - s.write_uint32_t((uint32_t)sh.bone_matrices_offset); - s.write_uint32_t((uint32_t)sh.bone_names_offset); + s.write_uint32_t((uint32_t)sh.bone_id_array_offset); + s.write_uint32_t((uint32_t)sh.bone_matrix_array_offset); + s.write_uint32_t((uint32_t)sh.bone_name_array_offset); s.write_uint32_t((uint32_t)sh.ex_data_offset); - s.write_int32_t(sk->bones_count); - s.write_uint32_t((uint32_t)sh.bone_parent_ids_offset); + s.write_int32_t(sk->num_bone); + s.write_uint32_t((uint32_t)sh.bone_parent_id_array_offset); s.write(0x0C); s.position_pop(); } -static void obj_classic_read_skin_block_cloth(obj_skin_block_cloth* b, - stream& s, char** str) { +static obj_skin_ex_data* obj_classic_read_skin_ex_data(prj::shared_ptr alloc, + stream& s, int64_t base_offset) { + obj_skin_ex_data* ex = alloc->allocate(); + s.set_position(base_offset, SEEK_SET); + + obj_skin_ex_data_header exh = {}; + exh.num_osage = s.read_int32_t(); + ex->num_osage_node = s.read_int32_t(); + s.read(0, 0x04); + exh.osage_node_array_offset = s.read_uint32_t(); + exh.osage_name_array_offset = s.read_uint32_t(); + exh.block_array_offset = s.read_uint32_t(); + exh.num_bone_name = s.read_int32_t(); + exh.bone_name_array_offset = s.read_uint32_t(); + exh.osage_sibling_info_array_offset = s.read_uint32_t(); + exh.cloth_count = s.read_uint32_t(); + ex->reserved[0] = s.read_uint32_t(); + ex->reserved[1] = s.read_uint32_t(); + ex->reserved[2] = s.read_uint32_t(); + ex->reserved[3] = s.read_uint32_t(); + ex->reserved[4] = s.read_uint32_t(); + ex->reserved[5] = s.read_uint32_t(); + ex->reserved[6] = s.read_uint32_t(); + + ex->bone_name_array = 0; + ex->num_bone_name = 0; + if (!exh.bone_name_array_offset) + return ex; + + uint32_t num_bone_name = exh.num_bone_name; + const char** bone_name_array = alloc->allocate(num_bone_name); + if (!bone_name_array) + return ex; + + ex->bone_name_array = bone_name_array; + ex->num_bone_name = num_bone_name; + + s.set_position(exh.bone_name_array_offset, SEEK_SET); + for (uint32_t i = 0; i < num_bone_name; i++) { + int32_t string_offset = s.read_int32_t(); + if (string_offset) + bone_name_array[i] = obj_read_utf8_string_null_terminated_offset(alloc, s, string_offset); + else + bone_name_array[i] = 0; + } + + if (exh.osage_node_array_offset) { + ex->osage_node_array = alloc->allocate(ex->num_osage_node); + + s.set_position(exh.osage_node_array_offset, SEEK_SET); + for (uint32_t i = 0; i < ex->num_osage_node; i++) { + obj_skin_osage_node* osage_node = &ex->osage_node_array[i]; + + osage_node->name_index = s.read_uint32_t(); + osage_node->length = s.read_float_t(); + s.read(0, 0x04); + } + } + + if (exh.block_array_offset) { + ex->num_block = 0; + s.set_position(exh.block_array_offset, SEEK_SET); + while (s.read_int32_t()) { + s.read(0, 0x04); + ex->num_block++; + } + + obj_skin_block_header* bhs = force_malloc_s(obj_skin_block_header, ex->num_block); + s.set_position(exh.block_array_offset, SEEK_SET); + for (uint32_t i = 0; i < ex->num_block; i++) { + bhs[i].block_signature_offset = s.read_uint32_t(); + bhs[i].block_offset = s.read_uint32_t(); + } + + ex->block_array = alloc->allocate(ex->num_block); + for (uint32_t i = 0; i < ex->num_block; i++) { + obj_skin_block* block = &ex->block_array[i]; + + std::string block_signature = s.read_string_null_terminated_offset( + bhs[i].block_signature_offset); + if (block_signature.size() != 3) + continue; + + uint32_t signature = load_reverse_endianness_uint32_t(block_signature.c_str()); + switch (signature) { + case 'CLS\0': + block->type = OBJ_SKIN_BLOCK_CLOTH; + s.set_position(bhs[i].block_offset, SEEK_SET); + block->cloth = obj_classic_read_skin_block_cloth( + alloc, s, bone_name_array); + break; + case 'CNS\0': + block->type = OBJ_SKIN_BLOCK_CONSTRAINT; + s.set_position(bhs[i].block_offset, SEEK_SET); + block->constraint = obj_classic_read_skin_block_constraint( + alloc, s, bone_name_array); + break; + case 'EXP\0': + block->type = OBJ_SKIN_BLOCK_EXPRESSION; + s.set_position(bhs[i].block_offset, SEEK_SET); + block->expression = obj_classic_read_skin_block_expression( + alloc, s, bone_name_array); + break; + case 'MOT\0': + block->type = OBJ_SKIN_BLOCK_MOTION; + s.set_position(bhs[i].block_offset, SEEK_SET); + block->motion = obj_classic_read_skin_block_motion( + alloc, s, bone_name_array); + break; + case 'OSG\0': + block->type = OBJ_SKIN_BLOCK_OSAGE; + s.set_position(bhs[i].block_offset, SEEK_SET); + block->osage = obj_classic_read_skin_block_osage( + alloc, s, bone_name_array); + break; + } + } + free_def(bhs); + } + + if (exh.osage_sibling_info_array_offset) { + ex->num_osage_sibling_info = 0; + s.set_position(exh.osage_sibling_info_array_offset, SEEK_SET); + while (s.read_uint32_t()) { + s.read(0, 0x08); + ex->num_osage_sibling_info++; + } + + obj_skin_osage_sibling_info* osi = alloc->allocate< + obj_skin_osage_sibling_info>(ex->num_osage_sibling_info); + ex->osage_sibling_info_array = osi; + s.set_position(exh.osage_sibling_info_array_offset, SEEK_SET); + for (uint32_t i = 0; i < ex->num_osage_sibling_info; i++) { + osi->name_index = s.read_uint32_t(); + osi->sibling_name_index = s.read_uint32_t(); + osi->max_distance = s.read_float_t(); + } + + s.set_position(exh.osage_sibling_info_array_offset, SEEK_SET); + } + + for (uint32_t i = 0; i < ex->num_block; i++) { + obj_skin_block* block = &ex->block_array[i]; + if (block->type != OBJ_SKIN_BLOCK_OSAGE) + continue; + + obj_skin_block_osage* osage = block->osage; + if (!osage->node_array) + continue; + + int32_t count = osage->count; + obj_skin_osage_node* child_osage_node = &ex->osage_node_array[osage->start_index]; + obj_skin_osage_node* osage_node = osage->node_array; + for (int32_t j = 0; j < count; j++) { + osage_node->name_index = child_osage_node->name_index; + osage_node->length = child_osage_node->length; + + child_osage_node++; + osage_node++; + } + } + return ex; +} + +static obj_skin_block_cloth* obj_classic_read_skin_block_cloth( + prj::shared_ptr alloc, stream& s, const char** str) { + obj_skin_block_cloth* cls = alloc->allocate(); uint32_t mesh_name_offset = s.read_uint32_t(); uint32_t backface_mesh_name_offset = s.read_uint32_t(); - b->field_8 = s.read_int32_t(); - b->root_count = s.read_int32_t(); - b->nodes_count = s.read_int32_t(); - b->field_14 = s.read_int32_t(); - uint32_t mats_offset = s.read_uint32_t(); - uint32_t root_offset = s.read_uint32_t(); - uint32_t nodes_offset = s.read_uint32_t(); - uint32_t mesh_indices_offset = s.read_uint32_t(); - uint32_t backface_mesh_indices_offset = s.read_uint32_t(); + cls->field_8 = s.read_int32_t(); + cls->num_root = s.read_int32_t(); + cls->num_node = s.read_int32_t(); + cls->field_14 = s.read_int32_t(); + uint32_t mat_array_offset = s.read_uint32_t(); + uint32_t root_array_offset = s.read_uint32_t(); + uint32_t node_array_offset = s.read_uint32_t(); + uint32_t mesh_index_array_offset = s.read_uint32_t(); + uint32_t backface_mesh_index_array_offset = s.read_uint32_t(); uint32_t skin_param_offset = s.read_uint32_t(); - b->reserved = s.read_uint32_t(); + cls->reserved = s.read_uint32_t(); - b->mesh_name = s.read_utf8_string_null_terminated_offset(mesh_name_offset); - b->backface_mesh_name = s.read_utf8_string_null_terminated_offset(backface_mesh_name_offset); + cls->mesh_name = obj_read_utf8_string_null_terminated_offset(alloc, s, mesh_name_offset); + cls->backface_mesh_name = obj_read_utf8_string_null_terminated_offset(alloc, s, backface_mesh_name_offset); - if (mats_offset) { + if (mat_array_offset) { int32_t max_matrix_index = -1; - s.position_push(root_offset, SEEK_SET); - for (uint32_t i = 0; i < b->root_count; i++) { + s.position_push(root_array_offset, SEEK_SET); + for (uint32_t i = 0; i < cls->num_root; i++) { s.read(0x28); for (uint32_t j = 0; j < 4; j++) { uint32_t name_offset = s.read_uint32_t(); @@ -2185,11 +2243,11 @@ static void obj_classic_read_skin_block_cloth(obj_skin_block_cloth* b, } s.position_pop(); - b->mats_count = max_matrix_index > -1 ? max_matrix_index + 1 : 0; - b->mats = force_malloc_s(mat4, b->mats_count); - s.position_push(mats_offset, SEEK_SET); - for (uint32_t i = 0; i < b->mats_count; i++) { - mat4& mat = b->mats[i]; + cls->num_mat = max_matrix_index > -1 ? max_matrix_index + 1 : 0; + cls->mat_array = alloc->allocate(cls->num_mat); + s.position_push(mat_array_offset, SEEK_SET); + for (uint32_t i = 0; i < cls->num_mat; i++) { + mat4& mat = cls->mat_array[i]; mat.row0.x = s.read_float_t(); mat.row1.x = s.read_float_t(); mat.row2.x = s.read_float_t(); @@ -2210,35 +2268,21 @@ static void obj_classic_read_skin_block_cloth(obj_skin_block_cloth* b, s.position_pop(); } - if (root_offset) { - s.position_push(root_offset, SEEK_SET); - b->root = force_malloc_s(obj_skin_block_cloth_root, b->root_count); - for (uint32_t i = 0; i < b->root_count; i++) { - obj_skin_block_cloth_root* f = &b->root[i]; - f->trans.x = s.read_float_t(); - f->trans.y = s.read_float_t(); - f->trans.z = s.read_float_t(); - f->normal.x = s.read_float_t(); - f->normal.y = s.read_float_t(); - f->normal.z = s.read_float_t(); - f->field_18 = s.read_float_t(); - f->field_1C = s.read_int32_t(); - f->field_20 = s.read_int32_t(); - f->field_24 = s.read_int32_t(); - - for (uint32_t j = 0; j < 4; j++) - obj_classic_read_skin_block_cloth_root_bone_weight(&f->bone_weights[j], s, str); - } + if (root_array_offset) { + s.position_push(root_array_offset, SEEK_SET); + cls->root_array = alloc->allocate(cls->num_root); + for (uint32_t i = 0; i < cls->num_root; i++) + obj_classic_read_skin_block_cloth_root(&cls->root_array[i], alloc, s, str); s.position_pop(); } - if (nodes_offset) { - s.position_push(nodes_offset, SEEK_SET); - b->nodes = force_malloc_s(obj_skin_block_cloth_node, - b->root_count * (b->nodes_count - 1ULL)); - for (uint32_t i = 0; i < b->nodes_count - 1; i++) - for (uint32_t j = 0; j < b->root_count; j++) { - obj_skin_block_cloth_node* f = &b->nodes[i * b->root_count + j]; + if (node_array_offset) { + s.position_push(node_array_offset, SEEK_SET); + cls->node_array = alloc->allocate( + cls->num_root * (cls->num_node - 1ULL)); + for (uint32_t i = 0; i < cls->num_node - 1; i++) + for (uint32_t j = 0; j < cls->num_root; j++) { + obj_skin_block_cloth_node* f = &cls->node_array[i * cls->num_root + j]; f->flags = s.read_uint32_t(); f->trans.x = s.read_float_t(); f->trans.y = s.read_float_t(); @@ -2254,63 +2298,60 @@ static void obj_classic_read_skin_block_cloth(obj_skin_block_cloth* b, s.position_pop(); } - if (mesh_indices_offset) { - s.position_push(mesh_indices_offset, SEEK_SET); - b->mesh_indices_count = s.read_uint16_t_reverse_endianness(); - b->mesh_indices = force_malloc_s(uint16_t, b->mesh_indices_count); - s.read(b->mesh_indices, b->mesh_indices_count * sizeof(uint16_t)); + if (mesh_index_array_offset) { + s.position_push(mesh_index_array_offset, SEEK_SET); + cls->num_mesh_index = s.read_uint16_t_reverse_endianness(); + cls->mesh_index_array = alloc->allocate(cls->num_mesh_index); + s.read(cls->mesh_index_array, cls->num_mesh_index * sizeof(uint16_t)); s.position_pop(); } - if (backface_mesh_indices_offset) { - s.position_push(backface_mesh_indices_offset, SEEK_SET); - b->backface_mesh_indices_count = s.read_uint16_t_reverse_endianness(); - b->backface_mesh_indices = force_malloc_s(uint16_t, b->backface_mesh_indices_count); - s.read(b->backface_mesh_indices, b->backface_mesh_indices_count * sizeof(uint16_t)); + if (backface_mesh_index_array_offset) { + s.position_push(backface_mesh_index_array_offset, SEEK_SET); + cls->num_backface_mesh_index = s.read_uint16_t_reverse_endianness(); + cls->backface_mesh_index_array = alloc->allocate(cls->num_backface_mesh_index); + s.read(cls->backface_mesh_index_array, cls->num_backface_mesh_index * sizeof(uint16_t)); s.position_pop(); } - if (skin_param_offset) { - obj_classic_read_skin_param(&b->skin_param, s, str); - b->skin_param_init = true; - } - else - b->skin_param_init = false; + if (skin_param_offset) + cls->skin_param = obj_classic_read_skin_param(alloc, s, str); + return cls; } -static void obj_classic_write_skin_block_cloth(obj_skin_block_cloth* b, +static void obj_classic_write_skin_block_cloth(obj_skin_block_cloth* cls, stream& s, std::vector& strings, std::vector& string_offsets, - int64_t* mats_offset, int64_t* root_offset, int64_t* nodes_offset, - int64_t* mesh_indices_offset, int64_t* backface_mesh_indices_offset) { + int64_t* mat_array_offset, int64_t* root_array_offset, int64_t* node_array_offset, + int64_t* mesh_index_array_offset, int64_t* backface_mesh_index_array_offset) { int64_t skin_param_offset = 0; - if (b->skin_param_init) { + if (cls->skin_param) { skin_param_offset = s.get_position(); - obj_classic_write_skin_param(&b->skin_param, s, strings, string_offsets); + obj_classic_write_skin_param(cls->skin_param, s, strings, string_offsets); } int64_t mesh_name_offset = obj_skin_strings_get_string_offset(strings, - string_offsets, b->mesh_name); + string_offsets, cls->mesh_name); int64_t backface_mesh_name_offset = obj_skin_strings_get_string_offset(strings, - string_offsets, b->backface_mesh_name); + string_offsets, cls->backface_mesh_name); s.write_uint32_t((uint32_t)mesh_name_offset); s.write_uint32_t((uint32_t)backface_mesh_name_offset); - s.write_int32_t(b->field_8); - s.write_int32_t(b->root_count); - s.write_int32_t(b->nodes_count); - s.write_int32_t(b->field_14); - s.write_uint32_t((uint32_t)*mats_offset); - s.write_uint32_t((uint32_t)*root_offset); - s.write_uint32_t((uint32_t)*nodes_offset); - s.write_uint32_t((uint32_t)*mesh_indices_offset); - s.write_uint32_t((uint32_t)*backface_mesh_indices_offset); + s.write_int32_t(cls->field_8); + s.write_int32_t(cls->num_root); + s.write_int32_t(cls->num_node); + s.write_int32_t(cls->field_14); + s.write_uint32_t((uint32_t)*mat_array_offset); + s.write_uint32_t((uint32_t)*root_array_offset); + s.write_uint32_t((uint32_t)*node_array_offset); + s.write_uint32_t((uint32_t)*mesh_index_array_offset); + s.write_uint32_t((uint32_t)*backface_mesh_index_array_offset); s.write_uint32_t((uint32_t)skin_param_offset); - s.write_uint32_t(b->reserved); + s.write_uint32_t(cls->reserved); - if (b->mats) { - s.position_push(*mats_offset, SEEK_SET); - for (uint32_t i = 0; i < b->mats_count; i++) { - mat4& mat = b->mats[i]; + if (cls->mat_array) { + s.position_push(*mat_array_offset, SEEK_SET); + for (uint32_t i = 0; i < cls->num_mat; i++) { + mat4& mat = cls->mat_array[i]; s.write_float_t(mat.row0.x); s.write_float_t(mat.row1.x); s.write_float_t(mat.row2.x); @@ -2327,15 +2368,15 @@ static void obj_classic_write_skin_block_cloth(obj_skin_block_cloth* b, s.write_float_t(mat.row1.w); s.write_float_t(mat.row2.w); s.write_float_t(mat.row3.w); - *mats_offset += sizeof(mat4); + *mat_array_offset += sizeof(mat4); } s.position_pop(); } - if (b->root) { - s.position_push(*root_offset, SEEK_SET); - for (uint32_t i = 0; i < b->root_count; i++) { - obj_skin_block_cloth_root* f = &b->root[i]; + if (cls->root_array) { + s.position_push(*root_array_offset, SEEK_SET); + for (uint32_t i = 0; i < cls->num_root; i++) { + obj_skin_block_cloth_root* f = &cls->root_array[i]; s.write_float_t(f->trans.x); s.write_float_t(f->trans.y); s.write_float_t(f->trans.z); @@ -2352,15 +2393,15 @@ static void obj_classic_write_skin_block_cloth(obj_skin_block_cloth* b, s, strings, string_offsets); } s.position_pop(); - *root_offset += (sizeof(int32_t) + 4 * (sizeof(int32_t) + 3 * sizeof(int32_t))) - * b->root_count * (b->nodes_count - 1ULL); + *root_array_offset += (sizeof(int32_t) + 4 * (sizeof(int32_t) + 3 * sizeof(int32_t))) + * cls->num_root * (cls->num_node - 1ULL); } - if (b->nodes) { - s.position_push(*nodes_offset, SEEK_SET); - for (uint32_t i = 0; i < b->nodes_count - 1; i++) - for (uint32_t j = 0; j < b->root_count; j++) { - obj_skin_block_cloth_node* f = &b->nodes[i * b->root_count + j]; + if (cls->node_array) { + s.position_push(*node_array_offset, SEEK_SET); + for (uint32_t i = 0; i < cls->num_node - 1; i++) + for (uint32_t j = 0; j < cls->num_root; j++) { + obj_skin_block_cloth_node* f = &cls->node_array[i * cls->num_root + j]; s.write_uint32_t(f->flags); s.write_float_t(f->trans.x); s.write_float_t(f->trans.y); @@ -2374,48 +2415,72 @@ static void obj_classic_write_skin_block_cloth(obj_skin_block_cloth* b, s.write_float_t(f->dist_left); } s.position_pop(); - *nodes_offset += (11 * sizeof(int32_t)) * b->root_count * (b->nodes_count - 1ULL); + *node_array_offset += (11 * sizeof(int32_t)) * cls->num_root * (cls->num_node - 1ULL); } - if (b->mesh_indices) { - s.position_push(*mesh_indices_offset, SEEK_SET); - s.write_uint16_t((uint16_t)b->mesh_indices_count); - s.write(b->mesh_indices, b->mesh_indices_count * sizeof(uint16_t)); + if (cls->mesh_index_array) { + s.position_push(*mesh_index_array_offset, SEEK_SET); + s.write_uint16_t((uint16_t)cls->num_mesh_index); + s.write(cls->mesh_index_array, cls->num_mesh_index * sizeof(uint16_t)); s.position_pop(); - *mesh_indices_offset += sizeof(uint16_t) + b->mesh_indices_count * sizeof(uint16_t); + *mesh_index_array_offset += sizeof(uint16_t) + cls->num_mesh_index * sizeof(uint16_t); } - if (b->backface_mesh_indices) { - s.position_push(*backface_mesh_indices_offset, SEEK_SET); - s.write_uint16_t((uint16_t)b->backface_mesh_indices_count); - s.write(b->backface_mesh_indices, b->backface_mesh_indices_count * sizeof(uint16_t)); + if (cls->backface_mesh_index_array) { + s.position_push(*backface_mesh_index_array_offset, SEEK_SET); + s.write_uint16_t((uint16_t)cls->num_backface_mesh_index); + s.write(cls->backface_mesh_index_array, cls->num_backface_mesh_index * sizeof(uint16_t)); s.position_pop(); - *backface_mesh_indices_offset += sizeof(uint16_t) + b->backface_mesh_indices_count * sizeof(uint16_t); + *backface_mesh_index_array_offset += sizeof(uint16_t) + cls->num_backface_mesh_index * sizeof(uint16_t); } } -static void obj_classic_read_skin_block_cloth_root_bone_weight(obj_skin_block_cloth_root_bone_weight* sub, - stream& s, char** str) { +static void obj_classic_read_skin_block_cloth_root(obj_skin_block_cloth_root* cloth_root, + prj::shared_ptr alloc, stream& s, const char** str) { + cloth_root->trans.x = s.read_float_t(); + cloth_root->trans.y = s.read_float_t(); + cloth_root->trans.z = s.read_float_t(); + cloth_root->normal.x = s.read_float_t(); + cloth_root->normal.y = s.read_float_t(); + cloth_root->normal.z = s.read_float_t(); + cloth_root->field_18 = s.read_float_t(); + cloth_root->field_1C = s.read_int32_t(); + cloth_root->field_20 = s.read_int32_t(); + cloth_root->field_24 = s.read_int32_t(); + + for (uint32_t i = 0; i < 4; i++) + obj_classic_read_skin_block_cloth_root_bone_weight(&cloth_root->bone_weights[i], + alloc, s, str); +} + +static void obj_classic_write_skin_block_cloth_root(obj_skin_block_cloth_root* cloth_root, + stream& s, std::vector& strings, std::vector& string_offsets) { + +} + +static void obj_classic_read_skin_block_cloth_root_bone_weight(obj_skin_block_cloth_root_bone_weight* bone_weight, + prj::shared_ptr alloc, stream& s, const char** str) { int32_t bone_name_offset = s.read_uint32_t(); - sub->bone_name = s.read_utf8_string_null_terminated_offset(bone_name_offset); - sub->weight = s.read_float_t(); - sub->matrix_index = s.read_uint32_t(); - sub->reserved = s.read_uint32_t(); + bone_weight->bone_name = obj_read_utf8_string_null_terminated_offset(alloc, s, bone_name_offset); + bone_weight->weight = s.read_float_t(); + bone_weight->matrix_index = s.read_uint32_t(); + bone_weight->reserved = s.read_uint32_t(); } -static void obj_classic_write_skin_block_cloth_root_bone_weight(obj_skin_block_cloth_root_bone_weight* sub, +static void obj_classic_write_skin_block_cloth_root_bone_weight(obj_skin_block_cloth_root_bone_weight* bone_weight, stream& s, std::vector& strings, std::vector& string_offsets) { int64_t bone_name_offset = obj_skin_strings_get_string_offset(strings, - string_offsets, sub->bone_name); + string_offsets, bone_weight->bone_name); s.write_uint32_t((uint32_t)bone_name_offset); - s.write_float_t(sub->weight); - s.write_uint32_t(sub->matrix_index); - s.write_uint32_t(sub->reserved); + s.write_float_t(bone_weight->weight); + s.write_uint32_t(bone_weight->matrix_index); + s.write_uint32_t(bone_weight->reserved); } -static void obj_classic_read_skin_block_constraint(obj_skin_block_constraint* b, - stream& s, char** str) { - obj_classic_read_skin_block_node(&b->base, s, str); +static obj_skin_block_constraint* obj_classic_read_skin_block_constraint( + prj::shared_ptr alloc, stream& s, const char** str) { + obj_skin_block_constraint* cns = alloc->allocate(); + obj_classic_read_skin_block_node(&cns->node, alloc, s, str); uint32_t type_offset = s.read_uint32_t(); char* type = s.read_utf8_string_null_terminated_offset(type_offset); @@ -2423,67 +2488,84 @@ static void obj_classic_read_skin_block_constraint(obj_skin_block_constraint* b, uint32_t name_offset = s.read_uint32_t(); char* name = s.read_utf8_string_null_terminated_offset(name_offset); - b->name_index = 0; - for (char** i = str; *i; i++) + cns->name_index = 0; + for (const char** i = str; *i; i++) if (!str_utils_compare(name, *i)) { - b->name_index = 0x8000 | (int32_t)(i - str); + cns->name_index = 0x8000 | (int32_t)(i - str); break; } free_def(name); - b->coupling = (obj_skin_block_constraint_coupling)s.read_int32_t(); + cns->coupling = (obj_skin_block_constraint_coupling)s.read_int32_t(); uint32_t source_node_name_offset = s.read_uint32_t(); - b->source_node_name = s.read_utf8_string_null_terminated_offset(source_node_name_offset); + cns->source_node_name = obj_read_utf8_string_null_terminated_offset(alloc, s, source_node_name_offset); if (!str_utils_compare(type, "Orientation")) { - b->type = OBJ_SKIN_BLOCK_CONSTRAINT_ORIENTATION; - b->orientation.offset.x = s.read_float_t(); - b->orientation.offset.y = s.read_float_t(); - b->orientation.offset.z = s.read_float_t(); + cns->type = OBJ_SKIN_BLOCK_CONSTRAINT_ORIENTATION; + + obj_skin_block_constraint_orientation* orientation + = alloc->allocate(); + orientation->offset.x = s.read_float_t(); + orientation->offset.y = s.read_float_t(); + orientation->offset.z = s.read_float_t(); + cns->orientation = orientation; } else if (!str_utils_compare(type, "Direction")) { - b->type = OBJ_SKIN_BLOCK_CONSTRAINT_DIRECTION; - obj_classic_read_skin_block_constraint_up_vector_old(&b->direction.up_vector, - s, str); - b->direction.align_axis.x = s.read_float_t(); - b->direction.align_axis.y = s.read_float_t(); - b->direction.align_axis.z = s.read_float_t(); - b->direction.target_offset.x = s.read_float_t(); - b->direction.target_offset.y = s.read_float_t(); - b->direction.target_offset.z = s.read_float_t(); + cns->type = OBJ_SKIN_BLOCK_CONSTRAINT_DIRECTION; + + obj_skin_block_constraint_direction* direction + = alloc->allocate(); + obj_classic_read_skin_block_constraint_up_vector(&direction->up_vector, + alloc, s, str); + direction->align_axis.x = s.read_float_t(); + direction->align_axis.y = s.read_float_t(); + direction->align_axis.z = s.read_float_t(); + direction->target_offset.x = s.read_float_t(); + direction->target_offset.y = s.read_float_t(); + direction->target_offset.z = s.read_float_t(); + cns->direction = direction; } else if (!str_utils_compare(type, "Position")) { - b->type = OBJ_SKIN_BLOCK_CONSTRAINT_POSITION; - obj_classic_read_skin_block_constraint_up_vector_old(&b->position.up_vector, + cns->type = OBJ_SKIN_BLOCK_CONSTRAINT_POSITION; + + obj_skin_block_constraint_position* position + = alloc->allocate(); + obj_classic_read_skin_block_constraint_up_vector(&position->up_vector, + alloc, s, str); + obj_classic_read_skin_block_constraint_attach_point(&position->constrained_object, s, str); - obj_classic_read_skin_block_constraint_attach_point(&b->position.constrained_object, - s, str); - obj_classic_read_skin_block_constraint_attach_point(&b->position.constraining_object, + obj_classic_read_skin_block_constraint_attach_point(&position->constraining_object, s, str); + cns->position = position; } else if (!str_utils_compare(type, "Distance")) { - b->type = OBJ_SKIN_BLOCK_CONSTRAINT_DISTANCE; - obj_classic_read_skin_block_constraint_up_vector_old(&b->distance.up_vector, + cns->type = OBJ_SKIN_BLOCK_CONSTRAINT_DISTANCE; + + obj_skin_block_constraint_distance* distance + = alloc->allocate(); + obj_classic_read_skin_block_constraint_up_vector(&distance->up_vector, + alloc, s, str); + distance->distance = s.read_float_t(); + obj_classic_read_skin_block_constraint_attach_point(&distance->constrained_object, s, str); - b->distance.distance = s.read_float_t(); - obj_classic_read_skin_block_constraint_attach_point(&b->distance.constrained_object, - s, str); - obj_classic_read_skin_block_constraint_attach_point(&b->distance.constraining_object, + obj_classic_read_skin_block_constraint_attach_point(&distance->constraining_object, s, str); + cns->distance = distance; } else - b->type = OBJ_SKIN_BLOCK_CONSTRAINT_NONE; + cns->type = OBJ_SKIN_BLOCK_CONSTRAINT_NONE; free_def(type); + return cns; } -static void obj_classic_write_skin_block_constraint(obj_skin_block_constraint* b, +static void obj_classic_write_skin_block_constraint(obj_skin_block_constraint* cns, stream& s, std::vector& strings, std::vector& string_offsets, - char** bone_names, int64_t* offsets) { - obj_classic_write_skin_block_node(&b->base, s, strings, string_offsets); + const char** bone_name_array, int64_t* offsets) { + obj_classic_write_skin_block_node(&cns->node, s, strings, string_offsets); int64_t type_offset = 0; - switch (b->type) { + switch (cns->type) { case OBJ_SKIN_BLOCK_CONSTRAINT_ORIENTATION: type_offset = offsets[0]; break; @@ -2500,183 +2582,188 @@ static void obj_classic_write_skin_block_constraint(obj_skin_block_constraint* b s.write_uint32_t((uint32_t)type_offset); int64_t name_offset = obj_skin_strings_get_string_offset_by_index(strings, - string_offsets, bone_names, b->name_index); + string_offsets, bone_name_array, cns->name_index); s.write_uint32_t((uint32_t)name_offset); - s.write_int32_t(b->coupling); + s.write_int32_t(cns->coupling); int64_t source_node_name_offset = obj_skin_strings_get_string_offset(strings, - string_offsets, b->source_node_name); + string_offsets, cns->source_node_name); s.write_uint32_t((uint32_t)source_node_name_offset); - switch (b->type) { + switch (cns->type) { case OBJ_SKIN_BLOCK_CONSTRAINT_ORIENTATION: - s.write_float_t(b->orientation.offset.x); - s.write_float_t(b->orientation.offset.y); - s.write_float_t(b->orientation.offset.z); + s.write_float_t(cns->orientation->offset.x); + s.write_float_t(cns->orientation->offset.y); + s.write_float_t(cns->orientation->offset.z); break; case OBJ_SKIN_BLOCK_CONSTRAINT_DIRECTION: - obj_classic_write_skin_block_constraint_up_vector_old(&b->direction.up_vector, + obj_classic_write_skin_block_constraint_up_vector(&cns->direction->up_vector, s, strings, string_offsets); - s.write_float_t(b->direction.align_axis.x); - s.write_float_t(b->direction.align_axis.y); - s.write_float_t(b->direction.align_axis.z); - s.write_float_t(b->direction.target_offset.x); - s.write_float_t(b->direction.target_offset.y); - s.write_float_t(b->direction.target_offset.z); + s.write_float_t(cns->direction->align_axis.x); + s.write_float_t(cns->direction->align_axis.y); + s.write_float_t(cns->direction->align_axis.z); + s.write_float_t(cns->direction->target_offset.x); + s.write_float_t(cns->direction->target_offset.y); + s.write_float_t(cns->direction->target_offset.z); break; case OBJ_SKIN_BLOCK_CONSTRAINT_POSITION: - obj_classic_write_skin_block_constraint_up_vector_old(&b->position.up_vector, + obj_classic_write_skin_block_constraint_up_vector(&cns->position->up_vector, s, strings, string_offsets); - obj_classic_write_skin_block_constraint_attach_point(&b->position.constrained_object, + obj_classic_write_skin_block_constraint_attach_point(&cns->position->constrained_object, s, strings, string_offsets); - obj_classic_write_skin_block_constraint_attach_point(&b->position.constraining_object, + obj_classic_write_skin_block_constraint_attach_point(&cns->position->constraining_object, s, strings, string_offsets); break; case OBJ_SKIN_BLOCK_CONSTRAINT_DISTANCE: - obj_classic_write_skin_block_constraint_up_vector_old(&b->distance.up_vector, + obj_classic_write_skin_block_constraint_up_vector(&cns->distance->up_vector, s, strings, string_offsets); - s.write_float_t(b->distance.distance); - obj_classic_write_skin_block_constraint_attach_point(&b->distance.constrained_object, + s.write_float_t(cns->distance->distance); + obj_classic_write_skin_block_constraint_attach_point(&cns->distance->constrained_object, s, strings, string_offsets); - obj_classic_write_skin_block_constraint_attach_point(&b->distance.constraining_object, + obj_classic_write_skin_block_constraint_attach_point(&cns->distance->constraining_object, s, strings, string_offsets); break; } } -static void obj_classic_read_skin_block_constraint_attach_point(obj_skin_block_constraint_attach_point* ap, - stream& s, char** str) { - ap->affected_by_orientation = s.read_int32_t() != 0; - ap->affected_by_scaling = s.read_int32_t() != 0; - ap->offset.x = s.read_float_t(); - ap->offset.y = s.read_float_t(); - ap->offset.z = s.read_float_t(); +static void obj_classic_read_skin_block_constraint_attach_point(obj_skin_block_constraint_attach_point* attach_point, + stream& s, const char** str) { + attach_point->affected_by_orientation = s.read_int32_t() != 0; + attach_point->affected_by_scaling = s.read_int32_t() != 0; + attach_point->offset.x = s.read_float_t(); + attach_point->offset.y = s.read_float_t(); + attach_point->offset.z = s.read_float_t(); } -static void obj_classic_write_skin_block_constraint_attach_point(obj_skin_block_constraint_attach_point* ap, +static void obj_classic_write_skin_block_constraint_attach_point(obj_skin_block_constraint_attach_point* attach_point, stream& s, std::vector& strings, std::vector& string_offsets) { - s.write_int32_t(ap->affected_by_orientation ? 1 : 0); - s.write_int32_t(ap->affected_by_scaling ? 1 : 0); - s.write_float_t(ap->offset.x); - s.write_float_t(ap->offset.y); - s.write_float_t(ap->offset.z); + s.write_int32_t(attach_point->affected_by_orientation ? 1 : 0); + s.write_int32_t(attach_point->affected_by_scaling ? 1 : 0); + s.write_float_t(attach_point->offset.x); + s.write_float_t(attach_point->offset.y); + s.write_float_t(attach_point->offset.z); } -static void obj_classic_read_skin_block_constraint_up_vector_old(obj_skin_block_constraint_up_vector* up, - stream& s, char** str) { - up->active = s.read_int32_t() != 0; - up->roll = s.read_float_t(); - up->affected_axis.x = s.read_float_t(); - up->affected_axis.y = s.read_float_t(); - up->affected_axis.z = s.read_float_t(); - up->point_at.x = s.read_float_t(); - up->point_at.y = s.read_float_t(); - up->point_at.z = s.read_float_t(); +static void obj_classic_read_skin_block_constraint_up_vector(obj_skin_block_constraint_up_vector* up_vector, + prj::shared_ptr alloc, stream& s, const char** str) { + up_vector->active = !!s.read_int32_t(); + up_vector->roll = s.read_float_t(); + up_vector->affected_axis.x = s.read_float_t(); + up_vector->affected_axis.y = s.read_float_t(); + up_vector->affected_axis.z = s.read_float_t(); + up_vector->point_at.x = s.read_float_t(); + up_vector->point_at.y = s.read_float_t(); + up_vector->point_at.z = s.read_float_t(); uint32_t name_offset = s.read_uint32_t(); - up->name = s.read_utf8_string_null_terminated_offset(name_offset); + up_vector->name = obj_read_utf8_string_null_terminated_offset(alloc, s, name_offset); } -static void obj_classic_write_skin_block_constraint_up_vector_old(obj_skin_block_constraint_up_vector* up, +static void obj_classic_write_skin_block_constraint_up_vector(obj_skin_block_constraint_up_vector* up_vector, stream& s, std::vector& strings, std::vector& string_offsets) { - s.write_int32_t(up->active ? 1 : 0); - s.write_float_t(up->roll); - s.write_float_t(up->affected_axis.x); - s.write_float_t(up->affected_axis.y); - s.write_float_t(up->affected_axis.z); - s.write_float_t(up->point_at.x); - s.write_float_t(up->point_at.y); - s.write_float_t(up->point_at.z); + s.write_int32_t(up_vector->active ? 1 : 0); + s.write_float_t(up_vector->roll); + s.write_float_t(up_vector->affected_axis.x); + s.write_float_t(up_vector->affected_axis.y); + s.write_float_t(up_vector->affected_axis.z); + s.write_float_t(up_vector->point_at.x); + s.write_float_t(up_vector->point_at.y); + s.write_float_t(up_vector->point_at.z); int64_t name_offset = obj_skin_strings_get_string_offset(strings, - string_offsets, up->name); + string_offsets, up_vector->name); s.write_uint32_t((uint32_t)name_offset); } -static void obj_classic_read_skin_block_expression(obj_skin_block_expression* b, - stream& s, char** str) { - obj_classic_read_skin_block_node(&b->base, s, str); +static obj_skin_block_expression* obj_classic_read_skin_block_expression( + prj::shared_ptr alloc, stream& s, const char** str) { + obj_skin_block_expression* exp = alloc->allocate(); + obj_classic_read_skin_block_node(&exp->node, alloc, s, str); uint32_t name_offset = s.read_uint32_t(); char* name = s.read_utf8_string_null_terminated_offset(name_offset); - b->name_index = 0; - for (char** i = str; *i; i++) + exp->name_index = 0; + for (const char** i = str; *i; i++) if (!str_utils_compare(name, *i)) { - b->name_index = 0x8000 | (int32_t)(i - str); + exp->name_index = 0x8000 | (int32_t)(i - str); break; } free_def(name); - b->expressions_count = s.read_int32_t(); - b->expressions_count = min_def(b->expressions_count, 9); - for (uint32_t i = 0; i < b->expressions_count; i++) { + exp->num_expression = s.read_int32_t(); + exp->num_expression = min_def(exp->num_expression, 9); + for (uint32_t i = 0; i < exp->num_expression; i++) { uint32_t expression_offset = s.read_uint32_t(); if (expression_offset) - b->expressions[i] = s.read_utf8_string_null_terminated_offset(expression_offset); + exp->expression_array[i] + = obj_read_utf8_string_null_terminated_offset(alloc, s, expression_offset); } - for (uint32_t i = b->expressions_count; i < 9; i++) - b->expressions[i] = 0; + for (uint32_t i = exp->num_expression; i < 9; i++) + exp->expression_array[i] = 0; + return exp; } -static void obj_classic_write_skin_block_expression(obj_skin_block_expression* b, - stream& s, std::vector& strings, std::vector& string_offsets, char** bone_names) { - obj_classic_write_skin_block_node(&b->base, s, strings, string_offsets); +static void obj_classic_write_skin_block_expression(obj_skin_block_expression* exp, + stream& s, std::vector& strings, std::vector& string_offsets, + const char** bone_name_array) { + obj_classic_write_skin_block_node(&exp->node, s, strings, string_offsets); int64_t name_offset = obj_skin_strings_get_string_offset_by_index(strings, - string_offsets, bone_names, b->name_index); + string_offsets, bone_name_array, exp->name_index); s.write_uint32_t((uint32_t)name_offset); - s.write_int32_t(min_def(b->expressions_count, 9)); - for (uint32_t i = 0; i < b->expressions_count && i < 9; i++) { + s.write_int32_t(min_def(exp->num_expression, 9)); + for (uint32_t i = 0; i < exp->num_expression && i < 9; i++) { int64_t expression_offset = obj_skin_strings_get_string_offset(strings, - string_offsets, b->expressions[i]); + string_offsets, exp->expression_array[i]); s.write_uint32_t((uint32_t)expression_offset); } - for (uint32_t i = b->expressions_count; i < 9; i++) + for (uint32_t i = exp->num_expression; i < 9; i++) s.write_int32_t(0); } -static void obj_classic_read_skin_block_motion(obj_skin_block_motion* b, - stream& s, char** str) { - obj_classic_read_skin_block_node(&b->base, s, str); +static obj_skin_block_motion* obj_classic_read_skin_block_motion( + prj::shared_ptr alloc, stream& s, const char** str) { + obj_skin_block_motion* mot = alloc->allocate(); + obj_classic_read_skin_block_node(&mot->node, alloc, s, str); uint32_t name_offset = s.read_uint32_t(); - b->nodes_count = s.read_int32_t(); - uint32_t bone_names_offset = s.read_uint32_t(); - uint32_t bone_matrices_offset = s.read_uint32_t(); + mot->num_node = s.read_int32_t(); + uint32_t bone_name_array_offset = s.read_uint32_t(); + uint32_t bone_matrix_array_offset = s.read_uint32_t(); char* name = s.read_utf8_string_null_terminated_offset(name_offset); - b->name_index = 0; - for (char** i = str; *i; i++) + mot->name_index = 0; + for (const char** i = str; *i; i++) if (!str_utils_compare(name, *i)) { - b->name_index = 0x8000 | (int32_t)(i - str); + mot->name_index = 0x8000 | (int32_t)(i - str); break; } free_def(name); - b->nodes = 0; + mot->node_array = 0; - if (!b->nodes_count) - return; + if (!mot->num_node) + return mot; - b->nodes = force_malloc_s(obj_skin_motion_node, b->nodes_count); + mot->node_array = alloc->allocate(mot->num_node); - if (bone_names_offset) { - s.position_push(bone_names_offset, SEEK_SET); - for (uint32_t i = 0; i < b->nodes_count; i++) - b->nodes[i].name_index = s.read_uint32_t(); + if (bone_name_array_offset) { + s.position_push(bone_name_array_offset, SEEK_SET); + for (uint32_t i = 0; i < mot->num_node; i++) + mot->node_array[i].name_index = s.read_uint32_t(); s.position_pop(); } - if (bone_matrices_offset) { - s.position_push(bone_matrices_offset, SEEK_SET); - for (uint32_t i = 0; i < b->nodes_count; i++) { - mat4& mat = b->nodes[i].inv_bind_pose_mat; + if (bone_matrix_array_offset) { + s.position_push(bone_matrix_array_offset, SEEK_SET); + for (uint32_t i = 0; i < mot->num_node; i++) { + mat4& mat = mot->node_array[i].inv_bind_pose_mat; mat.row0.x = s.read_float_t(); mat.row1.x = s.read_float_t(); mat.row2.x = s.read_float_t(); @@ -2696,30 +2783,31 @@ static void obj_classic_read_skin_block_motion(obj_skin_block_motion* b, } s.position_pop(); } + return mot; } -static void obj_classic_write_skin_block_motion(obj_skin_block_motion* b, +static void obj_classic_write_skin_block_motion(obj_skin_block_motion* mot, stream& s, std::vector& strings, std::vector& string_offsets, - char** bone_names, int64_t* bone_names_offset, int64_t* bone_matrices_offset) { - obj_classic_write_skin_block_node(&b->base, s, strings, string_offsets); + const char** bone_name_array, int64_t* bone_name_array_offset, int64_t* bone_matrix_array_offset) { + obj_classic_write_skin_block_node(&mot->node, s, strings, string_offsets); int64_t name_offset = obj_skin_strings_get_string_offset_by_index(strings, - string_offsets, bone_names, b->name_index); + string_offsets, bone_name_array, mot->name_index); s.write_uint32_t((uint32_t)name_offset); - s.write_int32_t(b->nodes_count); - s.write_uint32_t((uint32_t)*bone_names_offset); - s.write_uint32_t((uint32_t)*bone_matrices_offset); + s.write_int32_t(mot->num_node); + s.write_uint32_t((uint32_t)*bone_name_array_offset); + s.write_uint32_t((uint32_t)*bone_matrix_array_offset); - if (b->nodes) { - s.position_push(*bone_names_offset, SEEK_SET); - for (uint32_t i = 0; i < b->nodes_count; i++) - s.write_uint32_t(b->nodes[i].name_index); + if (mot->node_array) { + s.position_push(*bone_name_array_offset, SEEK_SET); + for (uint32_t i = 0; i < mot->num_node; i++) + s.write_uint32_t(mot->node_array[i].name_index); s.position_pop(); - *bone_names_offset += b->nodes_count * sizeof(uint32_t); + *bone_name_array_offset += mot->num_node * sizeof(uint32_t); - s.position_push(*bone_matrices_offset, SEEK_SET); - for (uint32_t i = 0; i < b->nodes_count; i++) { - mat4& mat = b->nodes[i].inv_bind_pose_mat; + s.position_push(*bone_matrix_array_offset, SEEK_SET); + for (uint32_t i = 0; i < mot->num_node; i++) { + mat4& mat = mot->node_array[i].inv_bind_pose_mat; s.write_float_t(mat.row0.x); s.write_float_t(mat.row1.x); s.write_float_t(mat.row2.x); @@ -2738,108 +2826,107 @@ static void obj_classic_write_skin_block_motion(obj_skin_block_motion* b, s.write_float_t(mat.row3.w); } s.position_pop(); - *bone_matrices_offset += b->nodes_count * sizeof(mat4); + *bone_matrix_array_offset += mot->num_node * sizeof(mat4); } } -static void obj_classic_read_skin_block_node(obj_skin_block_node* b, - stream& s, char** str) { +static void obj_classic_read_skin_block_node(obj_skin_block_node* node, + prj::shared_ptr alloc, stream& s, const char** str) { uint32_t parent_name_offset = s.read_uint32_t(); - b->parent_name = s.read_utf8_string_null_terminated_offset(parent_name_offset); + node->parent_name = obj_read_utf8_string_null_terminated_offset(alloc, s, parent_name_offset); - b->position.x = s.read_float_t(); - b->position.y = s.read_float_t(); - b->position.z = s.read_float_t(); - b->rotation.x = s.read_float_t(); - b->rotation.y = s.read_float_t(); - b->rotation.z = s.read_float_t(); - b->scale.x = s.read_float_t(); - b->scale.y = s.read_float_t(); - b->scale.z = s.read_float_t(); + node->position.x = s.read_float_t(); + node->position.y = s.read_float_t(); + node->position.z = s.read_float_t(); + node->rotation.x = s.read_float_t(); + node->rotation.y = s.read_float_t(); + node->rotation.z = s.read_float_t(); + node->scale.x = s.read_float_t(); + node->scale.y = s.read_float_t(); + node->scale.z = s.read_float_t(); } -static void obj_classic_write_skin_block_node(obj_skin_block_node* b, +static void obj_classic_write_skin_block_node(obj_skin_block_node* node, stream& s, std::vector& strings, std::vector& string_offsets) { int64_t parent_name_offset = obj_skin_strings_get_string_offset(strings, - string_offsets, b->parent_name); + string_offsets, node->parent_name); s.write_uint32_t((uint32_t)parent_name_offset); - s.write_float_t(b->position.x); - s.write_float_t(b->position.y); - s.write_float_t(b->position.z); - s.write_float_t(b->rotation.x); - s.write_float_t(b->rotation.y); - s.write_float_t(b->rotation.z); - s.write_float_t(b->scale.x); - s.write_float_t(b->scale.y); - s.write_float_t(b->scale.z); + s.write_float_t(node->position.x); + s.write_float_t(node->position.y); + s.write_float_t(node->position.z); + s.write_float_t(node->rotation.x); + s.write_float_t(node->rotation.y); + s.write_float_t(node->rotation.z); + s.write_float_t(node->scale.x); + s.write_float_t(node->scale.y); + s.write_float_t(node->scale.z); } -static void obj_classic_read_skin_block_osage(obj_skin_block_osage* b, - stream& s, char** str) { - obj_classic_read_skin_block_node(&b->base, s, str); +static obj_skin_block_osage* obj_classic_read_skin_block_osage( + prj::shared_ptr alloc, stream& s, const char** str) { + obj_skin_block_osage* osg = alloc->allocate(); + obj_classic_read_skin_block_node(&osg->node, alloc, s, str); - b->start_index = s.read_int32_t(); - b->count = s.read_int32_t(); - b->external_name_index = s.read_uint32_t(); - b->name_index = s.read_uint32_t(); + osg->start_index = s.read_int32_t(); + osg->count = s.read_int32_t(); + osg->external_name_index = s.read_uint32_t(); + osg->name_index = s.read_uint32_t(); int32_t offset = s.read_int32_t(); s.read(0, 0x14); - b->nodes = 0; + osg->node_array = 0; - if (!b->count || !offset) - return; + if (!osg->count || !offset) + return osg; - b->nodes_count = b->count; - b->nodes = force_malloc_s(obj_skin_osage_node, b->count); + osg->num_node = osg->count; + osg->node_array = alloc->allocate(osg->count); s.position_push(offset, SEEK_SET); - if (!(s.read_uint32_t() & 0x8000)) { - obj_classic_read_skin_param(&b->skin_param, s, str); - b->skin_param_init = true; - } + if (!(s.read_uint32_t() & 0x8000)) + osg->skin_param = obj_classic_read_skin_param( alloc, s, str); else { s.set_position(offset, SEEK_SET); - for (uint32_t i = 0; i < b->nodes_count; i++) { - obj_skin_osage_node* node = &b->nodes[i]; + for (uint32_t i = 0; i < osg->num_node; i++) { + obj_skin_osage_node* node = &osg->node_array[i]; node->name_index = s.read_uint32_t(); node->length = s.read_float_t(); node->rotation.x = s.read_float_t(); node->rotation.y = s.read_float_t(); node->rotation.z = s.read_float_t(); } - b->skin_param_init = false; } s.position_pop(); + return osg; } -static void obj_classic_write_skin_block_osage(obj_skin_block_osage* b, - stream& s, std::vector& strings, std::vector& string_offsets, int64_t* nodes_offset) { +static void obj_classic_write_skin_block_osage(obj_skin_block_osage* osg, + stream& s, std::vector& strings, std::vector& string_offsets, int64_t* node_array_offset) { int64_t skin_param_offset = 0; - if (b->skin_param_init) { + if (osg->skin_param) { skin_param_offset = s.get_position(); - obj_classic_write_skin_param(&b->skin_param, s, strings, string_offsets); + obj_classic_write_skin_param(osg->skin_param, s, strings, string_offsets); } - obj_classic_write_skin_block_node(&b->base, s, strings, string_offsets); + obj_classic_write_skin_block_node(&osg->node, s, strings, string_offsets); - s.write_int32_t(b->start_index); - s.write_int32_t(b->count); - s.write_uint32_t(b->external_name_index); - s.write_uint32_t(b->name_index); + s.write_int32_t(osg->start_index); + s.write_int32_t(osg->count); + s.write_uint32_t(osg->external_name_index); + s.write_uint32_t(osg->name_index); - if (b->skin_param_init) + if (osg->skin_param) s.write_uint32_t((uint32_t)skin_param_offset); else - s.write_uint32_t((uint32_t)*nodes_offset); + s.write_uint32_t((uint32_t)*node_array_offset); s.write(0x14); - if (!b->skin_param_init && b->nodes) { - s.position_push(*nodes_offset, SEEK_SET); - for (uint32_t i = 0; i < b->nodes_count; i++) { - obj_skin_osage_node* node = &b->nodes[i]; + if (!osg->skin_param && osg->node_array) { + s.position_push(*node_array_offset, SEEK_SET); + for (uint32_t i = 0; i < osg->num_node; i++) { + obj_skin_osage_node* node = &osg->node_array[i]; s.write_uint32_t(node->name_index); s.write_float_t(node->length); s.write_float_t(node->rotation.x); @@ -2847,12 +2934,13 @@ static void obj_classic_write_skin_block_osage(obj_skin_block_osage* b, s.write_float_t(node->rotation.z); } s.position_pop(); - *nodes_offset += b->nodes_count * (sizeof(uint32_t) + sizeof(float_t) * 4); + *node_array_offset += osg->num_node * (sizeof(uint32_t) + sizeof(float_t) * 4); } } -static void obj_classic_read_skin_param(obj_skin_skin_param* skp, - stream& s, char** str) { +static obj_skin_skin_param* obj_classic_read_skin_param( + prj::shared_ptr alloc, stream& s, const char** str) { + obj_skin_skin_param* skp = alloc->allocate(); skp->coli = 0; skp->coli_count = 0; @@ -2871,7 +2959,7 @@ static void obj_classic_read_skin_param(obj_skin_skin_param* skp, skp->wind_afc = s.read_float_t(); skp->unk44 = s.read_int32_t(); - skp->name = s.read_utf8_string_null_terminated_offset(name_offset); + skp->name = obj_read_utf8_string_null_terminated_offset(alloc, s, name_offset); if (coli_offset) { s.set_position(coli_offset, SEEK_SET); @@ -2881,7 +2969,7 @@ static void obj_classic_read_skin_param(obj_skin_skin_param* skp, coli_count++; } - skp->coli = force_malloc_s(obj_skin_skin_param_coli, coli_count); + skp->coli = alloc->allocate(coli_count); skp->coli_count = coli_count; s.set_position(coli_offset, SEEK_SET); @@ -2899,6 +2987,7 @@ static void obj_classic_read_skin_param(obj_skin_skin_param* skp, coli->bone1_pos.z = s.read_float_t(); } } + return skp; } static void obj_classic_write_skin_param(obj_skin_skin_param* skp, @@ -2942,8 +3031,9 @@ static void obj_classic_write_skin_param(obj_skin_skin_param* skp, s.write(0x08); } -static void obj_classic_read_vertex(obj* obj, stream& s, int64_t* vertex, obj_mesh* mesh, - int64_t base_offset, uint32_t num_vertex, obj_vertex_format_file vertex_format_file) { +static void obj_classic_read_vertex(obj_mesh* mesh, + prj::shared_ptr alloc, stream& s, int64_t* vertex, int64_t base_offset, uint32_t num_vertex, + obj_vertex_format_file vertex_format_file) { obj_vertex_format vertex_format = OBJ_VERTEX_NONE; if (vertex_format_file & OBJ_VERTEX_FILE_POSITION) enum_or(vertex_format, OBJ_VERTEX_POSITION); @@ -2984,7 +3074,7 @@ static void obj_classic_read_vertex(obj* obj, stream& s, int64_t* vertex, obj_me if (vertex_format_file & OBJ_VERTEX_FILE_UNKNOWN) enum_or(vertex_format, OBJ_VERTEX_UNKNOWN); - obj_vertex_data* vtx = force_malloc_s(obj_vertex_data, num_vertex); + obj_vertex_data* vtx = alloc->allocate(num_vertex); for (uint32_t i = 0; i < 20; i++) { obj_vertex_format_file attribute = (obj_vertex_format_file)(1 << i); if (!(vertex_format_file & attribute)) @@ -3092,14 +3182,15 @@ static void obj_classic_read_vertex(obj* obj, stream& s, int64_t* vertex, obj_me for (uint32_t i = 0; i < num_vertex; i++) obj_vertex_validate_bone_data(vtx[i].bone_weight, vtx[i].bone_index); - mesh->vertex = vtx; + mesh->vertex_array = vtx; mesh->num_vertex = num_vertex; mesh->vertex_format = vertex_format; } -static void obj_classic_write_vertex(obj* obj, stream& s, int64_t* vertex, obj_mesh* mesh, - int64_t base_offset, uint32_t* num_vertex, obj_vertex_format_file* vertex_format_file, uint32_t* size_vertex) { - obj_vertex_data* vtx = mesh->vertex; +static void obj_classic_write_vertex(obj_mesh* mesh, + stream& s, int64_t* vertex, int64_t base_offset, uint32_t* num_vertex, + obj_vertex_format_file* vertex_format_file, uint32_t* size_vertex) { + obj_vertex_data* vtx = mesh->vertex_array; uint32_t _num_vertex = mesh->num_vertex; obj_vertex_format vertex_format = mesh->vertex_format; @@ -3288,7 +3379,7 @@ static void obj_classic_write_vertex(obj* obj, stream& s, int64_t* vertex, obj_m } } -static void obj_set_modern_read_inner(obj_set* os, stream& s) { +static void obj_set_modern_read_inner(obj_set* os, prj::shared_ptr& alloc, stream& s) { f2_struct st; st.read(s); if (st.header.signature != reverse_endianness_uint32_t('MOSD') || !st.data.size()) @@ -3348,49 +3439,52 @@ static void obj_set_modern_read_inner(obj_set* os, stream& s) { os->reserved[1] = s_mosd.read_uint32_t_reverse_endianness(); } - os->obj_data = force_malloc_s(obj, os->obj_num); + uint32_t obj_num = os->obj_num; + os->obj_data = alloc->allocate(obj_num); - int64_t* obj_datas = 0; + int64_t* data = force_malloc_s(int64_t, obj_num * 3ULL); + + int64_t* obj_data = 0; if (osh.obj_data) { - obj_datas = force_malloc_s(int64_t, os->obj_num); + obj_data = data; s_mosd.set_position(osh.obj_data, SEEK_SET); if (!is_x) - for (uint32_t i = 0; i < os->obj_num; i++) - obj_datas[i] = s_mosd.read_offset_f2(st.header.length); + for (uint32_t i = 0; i < obj_num; i++) + obj_data[i] = s_mosd.read_offset_f2(st.header.length); else - for (uint32_t i = 0; i < os->obj_num; i++) - obj_datas[i] = s_mosd.read_offset_x(); + for (uint32_t i = 0; i < obj_num; i++) + obj_data[i] = s_mosd.read_offset_x(); } - int64_t* obj_skin_datas = 0; + int64_t* obj_skin_data = 0; if (osh.obj_skin_data) { - obj_skin_datas = force_malloc_s(int64_t, os->obj_num); + obj_skin_data = data + obj_num; s_mosd.set_position(osh.obj_skin_data, SEEK_SET); if (!is_x) - for (uint32_t i = 0; i < os->obj_num; i++) - obj_skin_datas[i] = s_mosd.read_offset_f2(st.header.length); + for (uint32_t i = 0; i < obj_num; i++) + obj_skin_data[i] = s_mosd.read_offset_f2(st.header.length); else - for (uint32_t i = 0; i < os->obj_num; i++) - obj_skin_datas[i] = s_mosd.read_offset_x(); + for (uint32_t i = 0; i < obj_num; i++) + obj_skin_data[i] = s_mosd.read_offset_x(); } - int64_t* obj_name_datas = 0; + int64_t* obj_name_data = 0; if (osh.obj_name_data) { - obj_name_datas = force_malloc_s(int64_t, os->obj_num); + obj_name_data = data + obj_num * 2ULL; s_mosd.set_position(osh.obj_name_data, SEEK_SET); if (!is_x) - for (uint32_t i = 0; i < os->obj_num; i++) - obj_name_datas[i] = s_mosd.read_offset_f2(st.header.length); + for (uint32_t i = 0; i < obj_num; i++) + obj_name_data[i] = s_mosd.read_offset_f2(st.header.length); else - for (uint32_t i = 0; i < os->obj_num; i++) - obj_name_datas[i] = s_mosd.read_offset_x(); + for (uint32_t i = 0; i < obj_num; i++) + obj_name_data[i] = s_mosd.read_offset_x(); } if (osh.obj_data) - for (uint32_t i = 0; i < os->obj_num; i++) { + for (uint32_t i = 0; i < obj_num; i++) { obj* obj = &os->obj_data[i]; - if (osh.obj_name_data && obj_name_datas[i]) { - obj->name = s_mosd.read_utf8_string_null_terminated_offset(obj_name_datas[i]); + if (osh.obj_name_data && obj_name_data[i]) { + obj->name = obj_read_utf8_string_null_terminated_offset(alloc, s_mosd, obj_name_data[i]); obj->hash = hash_utf8_murmurhash(obj->name); } else @@ -3399,17 +3493,15 @@ static void obj_set_modern_read_inner(obj_set* os, stream& s) { if (osh.obj_id_data) { s_mosd.set_position(osh.obj_id_data, SEEK_SET); - for (uint32_t i = 0; i < os->obj_num; i++) + for (uint32_t i = 0; i < obj_num; i++) os->obj_data[i].id = s_mosd.read_uint32_t_reverse_endianness(); } - free_def(obj_datas); - free_def(obj_skin_datas); - free_def(obj_name_datas); + free_def(data); if (osh.tex_id_data) { s_mosd.set_position(osh.tex_id_data, SEEK_SET); - os->tex_id_data = force_malloc_s(uint32_t, os->tex_id_num); + os->tex_id_data = alloc->allocate(os->tex_id_num); for (uint32_t i = 0; i < os->tex_id_num; i++) os->tex_id_data[i] = s_mosd.read_uint32_t_reverse_endianness(); } @@ -3458,11 +3550,13 @@ static void obj_set_modern_read_inner(obj_set* os, stream& s) { memory_stream s_omdl; s_omdl.open(i.data); s_omdl.big_endian = i.header.use_big_endian; - obj_modern_read_model(obj, s_omdl, 0, i.header.length, is_x, s_oidx_ptr, s_ovtx_ptr); + obj_modern_read_model(obj, alloc, + s_omdl, 0, i.header.length, is_x, s_oidx_ptr, s_ovtx_ptr); s_omdl.close(); if (s_oskn_ptr) - obj_modern_read_skin(obj, *s_oskn_ptr, 0, oskn->header.length, is_x); + obj->skin = obj_modern_read_skin(alloc, + *s_oskn_ptr, 0, oskn->header.length, is_x); omdl_index++; } @@ -3610,9 +3704,9 @@ static void obj_set_modern_write_inner(obj_set* os, stream& s) { s_mosd.write_uint32_t_reverse_endianness(os->tex_id_data[i]); s_mosd.align_write(0x10); - int64_t* obj_name_datas = force_malloc_s(int64_t, obj_num); + int64_t* obj_name_data = force_malloc_s(int64_t, obj_num); for (uint32_t i = 0; i < obj_num; i++) { - obj_name_datas[i] = (int32_t)s_mosd.get_position(); + obj_name_data[i] = (int32_t)s_mosd.get_position(); s_mosd.write_utf8_string_null_terminated(os->obj_data[i].name); } s_mosd.align_write(0x10); @@ -3620,12 +3714,12 @@ static void obj_set_modern_write_inner(obj_set* os, stream& s) { s_mosd.position_push(osh.obj_name_data, SEEK_SET); if (!is_x) for (uint32_t i = 0; i < obj_num; i++) - s_mosd.write_offset_f2(obj_name_datas[i], 0x20); + s_mosd.write_offset_f2(obj_name_data[i], 0x20); else for (uint32_t i = 0; i < obj_num; i++) - s_mosd.write_offset_x(obj_name_datas[i]); + s_mosd.write_offset_x(obj_name_data[i]); s_mosd.position_pop(); - free_def(obj_name_datas); + free_def(obj_name_data); s_mosd.position_push(0x00, SEEK_SET); if (!is_x) { @@ -3667,7 +3761,7 @@ static void obj_set_modern_write_inner(obj_set* os, stream& s) { s_omdl.open(); s_omdl.big_endian = big_endian; - if (obj->skin_init) { + if (obj->skin) { st.sub_structs.push_back({}); f2_struct* oskn = &st.sub_structs.back(); @@ -3675,7 +3769,7 @@ static void obj_set_modern_write_inner(obj_set* os, stream& s) { s_oskn.open(); s_oskn.big_endian = big_endian; - obj_modern_write_skin(obj, s_oskn, 0, is_x, oskn); + obj_modern_write_skin(obj->skin, s_oskn, 0, is_x, oskn); s_oskn.align_write(0x10); s_oskn.copy(oskn->data); @@ -3714,32 +3808,33 @@ static void obj_set_modern_write_inner(obj_set* os, stream& s) { st.write(s, true, os->is_x); } -static void obj_modern_read_index(obj* obj, stream& s, obj_sub_mesh* sub_mesh) { +static void obj_modern_read_index(obj_sub_mesh* sub_mesh, prj::shared_ptr alloc, stream& s) { bool tri_strip = sub_mesh->primitive_type == OBJ_PRIMITIVE_TRIANGLE_STRIP; - uint32_t* indices = force_malloc_s(uint32_t, sub_mesh->indices_count); + uint32_t* index_array = alloc->allocate(sub_mesh->num_index); + uint32_t num_index = sub_mesh->num_index; switch (sub_mesh->index_format) { case OBJ_INDEX_U8: - for (uint32_t i = 0; i < sub_mesh->indices_count; i++) { + for (uint32_t i = 0; i < num_index; i++) { uint8_t idx = s.read_uint8_t(); - indices[i] = tri_strip && idx == 0xFF ? 0xFFFFFFFF : idx; + index_array[i] = tri_strip && idx == 0xFF ? 0xFFFFFFFF : idx; } break; case OBJ_INDEX_U16: - for (uint32_t i = 0; i < sub_mesh->indices_count; i++) { + for (uint32_t i = 0; i < num_index; i++) { uint16_t idx = s.read_uint16_t_reverse_endianness(); - indices[i] = tri_strip && idx == 0xFFFF ? 0xFFFFFFFF : idx; + index_array[i] = tri_strip && idx == 0xFFFF ? 0xFFFFFFFF : idx; } break; case OBJ_INDEX_U32: - for (uint32_t i = 0; i < sub_mesh->indices_count; i++) - indices[i] = s.read_uint32_t_reverse_endianness(); + for (uint32_t i = 0; i < num_index; i++) + index_array[i] = s.read_uint32_t_reverse_endianness(); break; } - sub_mesh->indices = indices; + sub_mesh->index_array = index_array; } -static void obj_modern_write_index(obj* obj, stream& s, bool is_x, - obj_sub_mesh* sub_mesh, f2_struct* oidx) { +static void obj_modern_write_index(obj_sub_mesh* sub_mesh, + stream& s, bool is_x, f2_struct* oidx) { int32_t size = 1; enrs_type type = ENRS_INVALID; switch (sub_mesh->index_format) { @@ -3760,45 +3855,44 @@ static void obj_modern_write_index(obj* obj, stream& s, bool is_x, if (e->vec.size() > 0) { off = (uint32_t)((size_t)e->vec.back().size * e->vec.back().repeat_count); if (e->vec.back().count && e->vec.back().sub.front().type == type) { - e->vec.back().repeat_count += sub_mesh->indices_count; + e->vec.back().repeat_count += sub_mesh->num_index; add_enrs = false; } } if (add_enrs) if (type != ENRS_INVALID) { - ee = { off, 1, (uint32_t)size, (uint32_t)sub_mesh->indices_count }; + ee = { off, 1, (uint32_t)size, (uint32_t)sub_mesh->num_index }; ee.append(0, 1, type); e->vec.push_back(ee); } else { - ee = { off, 0, (uint32_t)size, (uint32_t)sub_mesh->indices_count }; + ee = { off, 0, (uint32_t)size, (uint32_t)sub_mesh->num_index }; e->vec.push_back(ee); } - uint32_t* indices = sub_mesh->indices; - uint32_t _indices_count = sub_mesh->indices_count; + uint32_t* index_array = sub_mesh->index_array; + uint32_t num_index = sub_mesh->num_index; switch (sub_mesh->index_format) { case OBJ_INDEX_U8: - for (uint32_t i = 0; i < _indices_count; i++) - s.write_uint8_t((uint8_t)indices[i]); + for (uint32_t i = 0; i < num_index; i++) + s.write_uint8_t((uint8_t)index_array[i]); break; case OBJ_INDEX_U16: - for (uint32_t i = 0; i < _indices_count; i++) - s.write_uint16_t_reverse_endianness((uint16_t)indices[i]); + for (uint32_t i = 0; i < num_index; i++) + s.write_uint16_t_reverse_endianness((uint16_t)index_array[i]); break; case OBJ_INDEX_U32: - for (uint32_t i = 0; i < _indices_count; i++) - s.write_uint32_t_reverse_endianness(indices[i]); + for (uint32_t i = 0; i < num_index; i++) + s.write_uint32_t_reverse_endianness(index_array[i]); break; } s.align_write(0x04); } -static void obj_modern_read_model(obj* obj, stream& s, int64_t base_offset, +static void obj_modern_read_model(obj* obj, prj::shared_ptr alloc, stream& s, int64_t base_offset, uint32_t header_length, bool is_x, stream* s_oidx, stream* s_ovtx) { const size_t mesh_size = is_x ? 0x130 : 0xD8; - const size_t sub_mesh_size = is_x ? 0x80 : 0x70; s.set_position(base_offset, SEEK_SET); @@ -3852,97 +3946,13 @@ static void obj_modern_read_model(obj* obj, stream& s, int64_t base_offset, } if (oh.mesh_array > 0) { - obj->mesh_array = force_malloc_s(obj_mesh, obj->num_mesh); - for (uint32_t i = 0; i < obj->num_mesh; i++) { - obj_mesh* mesh = &obj->mesh_array[i]; - + uint32_t num_mesh = obj->num_mesh; + obj->mesh_array = alloc->allocate(num_mesh); + for (uint32_t i = 0; i < num_mesh; i++) { s.set_position(base_offset + oh.mesh_array + mesh_size * i, SEEK_SET); - - obj_mesh_header mh = {}; - mesh->flags = s.read_uint32_t_reverse_endianness(); - mesh->bounding_sphere.center.x = s.read_float_t_reverse_endianness(); - mesh->bounding_sphere.center.y = s.read_float_t_reverse_endianness(); - mesh->bounding_sphere.center.z = s.read_float_t_reverse_endianness(); - mesh->bounding_sphere.radius = s.read_float_t_reverse_endianness(); - mesh->num_submesh = s.read_int32_t_reverse_endianness(); - mh.submesh_array = s.read_offset(header_length, is_x); - mh.format = (obj_vertex_format_file)s.read_uint32_t_reverse_endianness(); - mh.size_vertex = s.read_int32_t_reverse_endianness(); - mh.num_vertex = s.read_int32_t_reverse_endianness(); - - if (!is_x) - for (uint32_t j = 0; j < 20; j++) - mh.vertex[j] = s.read_offset_f2(0); - else - for (uint32_t j = 0; j < 20; j++) - mh.vertex[j] = s.read_offset_x(); - - mesh->attrib.w = s.read_uint32_t_reverse_endianness(); - mh.vertex_flags = s.read_uint32_t_reverse_endianness(); - mesh->reserved[0] = s.read_uint32_t_reverse_endianness(); - mesh->reserved[1] = s.read_uint32_t_reverse_endianness(); - mesh->reserved[2] = s.read_uint32_t_reverse_endianness(); - mesh->reserved[3] = s.read_uint32_t_reverse_endianness(); - mesh->reserved[4] = s.read_uint32_t_reverse_endianness(); - mesh->reserved[5] = s.read_uint32_t_reverse_endianness(); - s.read(&mesh->name, sizeof(mesh->name)); - mesh->name[sizeof(mesh->name) - 1] = 0; - - if (mh.submesh_array) { - mesh->submesh_array = force_malloc_s(obj_sub_mesh, mesh->num_submesh); - for (uint32_t j = 0; j < mesh->num_submesh; j++) { - obj_sub_mesh* sub_mesh = &mesh->submesh_array[j]; - - s.set_position(base_offset + mh.submesh_array + sub_mesh_size * j, SEEK_SET); - - obj_sub_mesh_header smh = {}; - sub_mesh->flags = s.read_uint32_t_reverse_endianness(); - sub_mesh->bounding_sphere.center.x = s.read_float_t_reverse_endianness(); - sub_mesh->bounding_sphere.center.y = s.read_float_t_reverse_endianness(); - sub_mesh->bounding_sphere.center.z = s.read_float_t_reverse_endianness(); - sub_mesh->bounding_sphere.radius = s.read_float_t_reverse_endianness(); - sub_mesh->material_index = s.read_uint32_t_reverse_endianness(); - s.read(&sub_mesh->uv_index, 0x08); - sub_mesh->bone_indices_count = s.read_int32_t_reverse_endianness(); - smh.bone_indices_offset = s.read_offset(header_length, is_x); - sub_mesh->bones_per_vertex = s.read_uint32_t_reverse_endianness(); - sub_mesh->primitive_type = (obj_primitive_type)s.read_uint32_t_reverse_endianness(); - sub_mesh->index_format = (obj_index_format)s.read_uint32_t_reverse_endianness(); - sub_mesh->indices_count = s.read_int32_t_reverse_endianness(); - smh.indices_offset = s.read_offset(0, is_x); - sub_mesh->attrib.w = s.read_uint32_t_reverse_endianness(); - s.read(0, 0x10); - sub_mesh->bounding_box.center.x = s.read_float_t_reverse_endianness(); - sub_mesh->bounding_box.center.y = s.read_float_t_reverse_endianness(); - sub_mesh->bounding_box.center.z = s.read_float_t_reverse_endianness(); - sub_mesh->bounding_box.size.x = s.read_float_t_reverse_endianness(); - sub_mesh->bounding_box.size.y = s.read_float_t_reverse_endianness(); - sub_mesh->bounding_box.size.z = s.read_float_t_reverse_endianness(); - s.read(0, 0x04); - sub_mesh->indices_offset = s.read_uint32_t_reverse_endianness(); - - if (is_x) - s.read(0, 0x04); - - if (sub_mesh->bones_per_vertex == 4 && smh.bone_indices_offset) { - sub_mesh->bone_indices = force_malloc_s(uint16_t, sub_mesh->bone_indices_count); - s.set_position(base_offset + smh.bone_indices_offset, SEEK_SET); - s.read(sub_mesh->bone_indices, sub_mesh->bone_indices_count * sizeof(uint16_t)); - if (s.big_endian) { - uint16_t* bone_indices = sub_mesh->bone_indices; - for (uint32_t k = 0; k < sub_mesh->bone_indices_count; k++) - bone_indices[k] = reverse_endianness_uint16_t(bone_indices[k]); - } - } - - s_oidx->set_position(smh.indices_offset, SEEK_SET); - obj_modern_read_index(obj, *s_oidx, sub_mesh); - } - } - - obj_modern_read_vertex(obj, *s_ovtx, mh.vertex, mesh, - mh.vertex_flags, mh.num_vertex, mh.size_vertex); - obj_vertex_generate_tangents(obj, mesh); + obj_modern_read_model_mesh(&obj->mesh_array[i], + alloc, s, base_offset, + header_length, is_x, s_oidx, s_ovtx); } } @@ -3950,7 +3960,7 @@ static void obj_modern_read_model(obj* obj, stream& s, int64_t base_offset, obj_material_texture_enrs_table_init(); s.set_position(base_offset + oh.material_array, SEEK_SET); - obj->material_array = force_malloc_s(obj_material_data, obj->num_material); + obj->material_array = alloc->allocate(obj->num_material); for (uint32_t i = 0; i < obj->num_material; i++) { obj_material_data mat_data; s.read(&mat_data, sizeof(obj_material_data)); @@ -4004,25 +4014,27 @@ static void obj_modern_write_model(obj* obj, stream& s, off = 112; } + uint32_t num_mesh = obj->num_mesh; + if (!is_x) { - ee = { off, 1, 216, (uint32_t)obj->num_mesh }; + ee = { off, 1, 216, (uint32_t)num_mesh }; ee.append(0, 32, ENRS_DWORD); e.vec.push_back(ee); - off = (uint32_t)(obj->num_mesh * 216ULL); + off = (uint32_t)(num_mesh * 216ULL); } else { - ee = { off, 5, 304, (uint32_t)obj->num_mesh }; + ee = { off, 5, 304, (uint32_t)num_mesh }; ee.append(0, 6, ENRS_DWORD); ee.append(0, 1, ENRS_QWORD); ee.append(0, 3, ENRS_DWORD); ee.append(4, 20, ENRS_QWORD); ee.append(0, 2, ENRS_DWORD); e.vec.push_back(ee); - off = (uint32_t)(obj->num_mesh * 304ULL); + off = (uint32_t)(num_mesh * 304ULL); } uint32_t total_sub_meshes = 0; - for (uint32_t i = 0; i < obj->num_mesh; i++) + for (uint32_t i = 0; i < num_mesh; i++) total_sub_meshes += obj->mesh_array[i].num_submesh; if (!is_x) { @@ -4045,7 +4057,7 @@ static void obj_modern_write_model(obj* obj, stream& s, ee.append(0, 1, ENRS_WORD); ee.append(0, 1, ENRS_WORD); e.vec.push_back(ee); - off = (uint32_t)(obj->num_mesh * 112ULL); + off = (uint32_t)(num_mesh * 112ULL); } else { ee = { off, 17, 128, total_sub_meshes }; @@ -4067,16 +4079,17 @@ static void obj_modern_write_model(obj* obj, stream& s, ee.append(0, 1, ENRS_WORD); ee.append(0, 1, ENRS_WORD); e.vec.push_back(ee); - off = (uint32_t)(obj->num_mesh * 128ULL); + off = (uint32_t)(num_mesh * 128ULL); } int32_t total_bone_indices_count = 0; - for (uint32_t i = 0; i < obj->num_mesh; i++) { + for (uint32_t i = 0; i < num_mesh; i++) { obj_mesh* mesh = &obj->mesh_array[i]; - for (uint32_t j = 0; j < mesh->num_submesh; j++) { + uint32_t num_submesh = mesh->num_submesh; + for (uint32_t j = 0; j < num_submesh; j++) { obj_sub_mesh* sub_mesh = &mesh->submesh_array[i]; if (sub_mesh->bones_per_vertex == 4) - total_bone_indices_count += sub_mesh->bone_indices_count; + total_bone_indices_count += sub_mesh->num_bone_index; } } @@ -4149,12 +4162,12 @@ static void obj_modern_write_model(obj* obj, stream& s, } s.align_write(0x10); - if (obj->num_mesh) { + if (num_mesh) { oh.mesh_array = s.get_position() - base_offset; - obj_mesh_header* mhs = force_malloc_s(obj_mesh_header, obj->num_mesh); - obj_sub_mesh_header** smhss = force_malloc_s(obj_sub_mesh_header*, obj->num_mesh); - for (uint32_t i = 0; i < obj->num_mesh; i++) { + obj_mesh_header* mhs = force_malloc_s(obj_mesh_header, num_mesh); + obj_sub_mesh_header** smhss = force_malloc_s(obj_sub_mesh_header*, num_mesh); + for (uint32_t i = 0; i < num_mesh; i++) { obj_mesh* mesh = &obj->mesh_array[i]; s.write(0x04); @@ -4181,14 +4194,15 @@ static void obj_modern_write_model(obj* obj, stream& s, s.write(sizeof(mesh->name)); } - for (uint32_t i = 0; i < obj->num_mesh; i++) { + for (uint32_t i = 0; i < num_mesh; i++) { obj_mesh* mesh = &obj->mesh_array[i]; obj_mesh_header* mh = &mhs[i]; mh->format = OBJ_VERTEX_FILE_MODERN_STORAGE; - if (mesh->num_submesh) { + uint32_t num_submesh = mesh->num_submesh; + if (num_submesh) { mh->submesh_array = s.get_position() - base_offset; - for (uint32_t j = 0; j < mesh->num_submesh; j++) { + for (uint32_t j = 0; j < num_submesh; j++) { s.write(0x04); s.write_float_t(0.0f); s.write_float_t(0.0f); @@ -4219,42 +4233,44 @@ static void obj_modern_write_model(obj* obj, stream& s, } } - obj_modern_write_vertex(obj, s_ovtx, is_x, mh->vertex, mesh, - &mh->vertex_flags, &mh->num_vertex, &mh->size_vertex, ovtx); + obj_modern_write_vertex(mesh, s_ovtx, mh->vertex, + &mh->vertex_format_index, &mh->num_vertex, &mh->size_vertex, ovtx); } - for (uint32_t i = 0; i < obj->num_mesh; i++) { + for (uint32_t i = 0; i < num_mesh; i++) { obj_mesh* mesh = &obj->mesh_array[i]; obj_mesh_header* mh = &mhs[i]; obj_sub_mesh_header* smhs = 0; - if (mesh->num_submesh) { - smhs = force_malloc_s(obj_sub_mesh_header, mesh->num_submesh); + uint32_t num_submesh = mesh->num_submesh; + if (num_submesh) { + smhs = force_malloc_s(obj_sub_mesh_header, num_submesh); smhss[i] = smhs; - for (uint32_t j = 0; j < mesh->num_submesh; j++) { + for (uint32_t j = 0; j < num_submesh; j++) { obj_sub_mesh* sub_mesh = &mesh->submesh_array[j]; obj_sub_mesh_header* smh = &smhs[j]; - if (sub_mesh->bones_per_vertex == 4 && sub_mesh->bone_indices_count) { - smh->bone_indices_offset = s.get_position() - base_offset; - s.write(sub_mesh->bone_indices, sub_mesh->bone_indices_count * sizeof(uint16_t)); + if (sub_mesh->bones_per_vertex == 4 && sub_mesh->num_bone_index) { + smh->bone_index_array_offset = s.get_position() - base_offset; + s.write(sub_mesh->bone_index_array, sub_mesh->num_bone_index * sizeof(uint16_t)); } - smh->indices_offset = s_oidx.get_position(); - obj_modern_write_index(obj, s_oidx, is_x, sub_mesh, oidx); + smh->index_array_offset = s_oidx.get_position(); + obj_modern_write_index(sub_mesh, s_oidx, is_x, oidx); } } } s.align_write(is_x ? 0x10 : 0x04); - for (uint32_t i = 0; i < obj->num_mesh; i++) { + for (uint32_t i = 0; i < num_mesh; i++) { obj_mesh* mesh = &obj->mesh_array[i]; obj_mesh_header* mh = &mhs[i]; obj_sub_mesh_header* smhs = smhss[i]; - if (mesh->num_submesh) { + uint32_t num_submesh = mesh->num_submesh; + if (num_submesh) { s.position_push(base_offset + mh->submesh_array, SEEK_SET); - for (uint32_t j = 0; j < mesh->num_submesh; j++) { + for (uint32_t j = 0; j < num_submesh; j++) { obj_sub_mesh* sub_mesh = &mesh->submesh_array[j]; obj_sub_mesh_header* smh = &smhs[j]; @@ -4265,13 +4281,13 @@ static void obj_modern_write_model(obj* obj, stream& s, s.write_float_t_reverse_endianness(sub_mesh->bounding_sphere.radius); s.write_uint32_t_reverse_endianness(sub_mesh->material_index); s.write(&sub_mesh->uv_index, 0x08); - s.write_int32_t_reverse_endianness(sub_mesh->bone_indices_count); - s.write_offset(smh->bone_indices_offset, 0x20, is_x); + s.write_int32_t_reverse_endianness(sub_mesh->num_bone_index); + s.write_offset(smh->bone_index_array_offset, 0x20, is_x); s.write_uint32_t_reverse_endianness(sub_mesh->bones_per_vertex); s.write_uint32_t_reverse_endianness(sub_mesh->primitive_type); s.write_uint32_t_reverse_endianness(sub_mesh->index_format); - s.write_int32_t_reverse_endianness(sub_mesh->indices_count); - s.write_offset(smh->indices_offset, 0, is_x); + s.write_int32_t_reverse_endianness(sub_mesh->num_index); + s.write_offset(smh->index_array_offset, 0, is_x); s.write_uint32_t_reverse_endianness(sub_mesh->attrib.w); s.write(0x10); s.write_float_t_reverse_endianness(sub_mesh->bounding_box.center.x); @@ -4282,9 +4298,11 @@ static void obj_modern_write_model(obj* obj, stream& s, s.write_float_t_reverse_endianness(sub_mesh->bounding_box.size.z); uint32_t index_max = 0; - for (uint32_t k = 0; k < sub_mesh->indices_count; k++) - if (index_max < sub_mesh->indices[k]) - index_max = sub_mesh->indices[k]; + uint32_t* index = sub_mesh->index_array; + uint32_t num_index = sub_mesh->num_index; + for (uint32_t k = 0; k < num_index; k++, index++) + if (index_max < *index) + index_max = *index; switch (sub_mesh->index_format) { case OBJ_INDEX_U8: @@ -4297,7 +4315,7 @@ static void obj_modern_write_model(obj* obj, stream& s, s.write_uint32_t_reverse_endianness(index_max); break; } - s.write_uint32_t_reverse_endianness(sub_mesh->indices_offset); + s.write_uint32_t_reverse_endianness(sub_mesh->index_offset); if (is_x) s.write(0x04); @@ -4308,7 +4326,7 @@ static void obj_modern_write_model(obj* obj, stream& s, } s.position_push(base_offset + oh.mesh_array, SEEK_SET); - for (uint32_t i = 0; i < obj->num_mesh; i++) { + for (uint32_t i = 0; i < num_mesh; i++) { obj_mesh* mesh = &obj->mesh_array[i]; obj_mesh_header* mh = &mhs[i]; @@ -4333,7 +4351,7 @@ static void obj_modern_write_model(obj* obj, stream& s, s.write_offset_x(mh->vertex[j]); s.write_uint32_t_reverse_endianness(mesh->attrib.w); - s.write_uint32_t_reverse_endianness(mh->vertex_flags); + s.write_uint32_t_reverse_endianness(mh->vertex_format_index); s.write_uint32_t_reverse_endianness(mesh->reserved[0]); s.write_uint32_t_reverse_endianness(mesh->reserved[1]); s.write_uint32_t_reverse_endianness(mesh->reserved[2]); @@ -4431,295 +4449,185 @@ static void obj_modern_write_model(obj* obj, stream& s, ovtx->header.use_section_size = true; } -static void obj_modern_read_skin(obj* obj, stream& s, int64_t base_offset, - uint32_t header_length, bool is_x) { - obj_skin* sk = &obj->skin; - obj->skin_init = true; +static void obj_modern_read_model_mesh(obj_mesh* mesh, + prj::shared_ptr alloc, stream& s, int64_t base_offset, + uint32_t header_length, bool is_x, stream* s_oidx, stream* s_ovtx) { + const size_t sub_mesh_size = is_x ? 0x80 : 0x70; + + obj_mesh_header mh = {}; + mesh->flags = s.read_uint32_t_reverse_endianness(); + mesh->bounding_sphere.center.x = s.read_float_t_reverse_endianness(); + mesh->bounding_sphere.center.y = s.read_float_t_reverse_endianness(); + mesh->bounding_sphere.center.z = s.read_float_t_reverse_endianness(); + mesh->bounding_sphere.radius = s.read_float_t_reverse_endianness(); + mesh->num_submesh = s.read_int32_t_reverse_endianness(); + mh.submesh_array = s.read_offset(header_length, is_x); + mh.format = (obj_vertex_format_file)s.read_uint32_t_reverse_endianness(); + mh.size_vertex = s.read_int32_t_reverse_endianness(); + mh.num_vertex = s.read_int32_t_reverse_endianness(); + + if (!is_x) + for (int64_t& i : mh.vertex) + i = s.read_offset_f2(0); + else + for (int64_t& i : mh.vertex) + i = s.read_offset_x(); + + mesh->attrib.w = s.read_uint32_t_reverse_endianness(); + mh.vertex_format_index = s.read_uint32_t_reverse_endianness(); + mesh->reserved[0] = s.read_uint32_t_reverse_endianness(); + mesh->reserved[1] = s.read_uint32_t_reverse_endianness(); + mesh->reserved[2] = s.read_uint32_t_reverse_endianness(); + mesh->reserved[3] = s.read_uint32_t_reverse_endianness(); + mesh->reserved[4] = s.read_uint32_t_reverse_endianness(); + mesh->reserved[5] = s.read_uint32_t_reverse_endianness(); + s.read(&mesh->name, sizeof(mesh->name)); + mesh->name[sizeof(mesh->name) - 1] = 0; + + if (mh.submesh_array) { + uint32_t num_submesh = mesh->num_submesh; + mesh->submesh_array = alloc->allocate(num_submesh); + for (uint32_t i = 0; i < num_submesh; i++) { + s.set_position(base_offset + mh.submesh_array + sub_mesh_size * i, SEEK_SET); + obj_modern_read_model_sub_mesh(&mesh->submesh_array[i], + alloc, s, base_offset, header_length, is_x, s_oidx); + } + } + + obj_modern_read_vertex(mesh, alloc, *s_ovtx, mh.vertex, + mh.vertex_format_index, mh.num_vertex, mh.size_vertex); + obj_vertex_generate_tangents(mesh); +} + +static void obj_modern_read_model_sub_mesh(obj_sub_mesh* sub_mesh, + prj::shared_ptr alloc, stream& s, int64_t base_offset, + uint32_t header_length, bool is_x, stream* s_oidx) { + obj_sub_mesh_header smh = {}; + sub_mesh->flags = s.read_uint32_t_reverse_endianness(); + sub_mesh->bounding_sphere.center.x = s.read_float_t_reverse_endianness(); + sub_mesh->bounding_sphere.center.y = s.read_float_t_reverse_endianness(); + sub_mesh->bounding_sphere.center.z = s.read_float_t_reverse_endianness(); + sub_mesh->bounding_sphere.radius = s.read_float_t_reverse_endianness(); + sub_mesh->material_index = s.read_uint32_t_reverse_endianness(); + s.read(&sub_mesh->uv_index, 0x08); + sub_mesh->num_bone_index = s.read_int32_t_reverse_endianness(); + smh.bone_index_array_offset = s.read_offset(header_length, is_x); + sub_mesh->bones_per_vertex = s.read_uint32_t_reverse_endianness(); + sub_mesh->primitive_type = (obj_primitive_type)s.read_uint32_t_reverse_endianness(); + sub_mesh->index_format = (obj_index_format)s.read_uint32_t_reverse_endianness(); + sub_mesh->num_index = s.read_int32_t_reverse_endianness(); + smh.index_array_offset = s.read_offset(0, is_x); + sub_mesh->attrib.w = s.read_uint32_t_reverse_endianness(); + s.read(0, 0x10); + sub_mesh->bounding_box.center.x = s.read_float_t_reverse_endianness(); + sub_mesh->bounding_box.center.y = s.read_float_t_reverse_endianness(); + sub_mesh->bounding_box.center.z = s.read_float_t_reverse_endianness(); + sub_mesh->bounding_box.size.x = s.read_float_t_reverse_endianness(); + sub_mesh->bounding_box.size.y = s.read_float_t_reverse_endianness(); + sub_mesh->bounding_box.size.z = s.read_float_t_reverse_endianness(); + s.read(0, 0x04); + sub_mesh->index_offset = s.read_uint32_t_reverse_endianness(); + + if (is_x) + s.read(0, 0x04); + + if (sub_mesh->bones_per_vertex == 4 && smh.bone_index_array_offset) { + sub_mesh->bone_index_array = alloc->allocate(sub_mesh->num_bone_index); + s.set_position(base_offset + smh.bone_index_array_offset, SEEK_SET); + s.read(sub_mesh->bone_index_array, sub_mesh->num_bone_index * sizeof(uint16_t)); + if (s.big_endian) { + uint16_t* bone_index_array = sub_mesh->bone_index_array; + for (uint32_t k = 0; k < sub_mesh->num_bone_index; k++) + bone_index_array[k] = reverse_endianness_uint16_t(bone_index_array[k]); + } + } + + s_oidx->set_position(smh.index_array_offset, SEEK_SET); + obj_modern_read_index(sub_mesh, alloc, *s_oidx); +} + +static obj_skin* obj_modern_read_skin(prj::shared_ptr alloc, + stream& s, int64_t base_offset, uint32_t header_length, bool is_x) { + obj_skin* sk = alloc->allocate(); s.set_position(base_offset, SEEK_SET); obj_skin_header sh = {}; if (!is_x) { - sh.bone_ids_offset = s.read_offset_f2(header_length); - sh.bone_matrices_offset = s.read_offset_f2(header_length); - sh.bone_names_offset = s.read_offset_f2(header_length); + sh.bone_id_array_offset = s.read_offset_f2(header_length); + sh.bone_matrix_array_offset = s.read_offset_f2(header_length); + sh.bone_name_array_offset = s.read_offset_f2(header_length); sh.ex_data_offset = s.read_offset_f2(header_length); - sk->bones_count = s.read_int32_t_reverse_endianness(); - sh.bone_parent_ids_offset = s.read_offset_f2(header_length); + sk->num_bone = s.read_int32_t_reverse_endianness(); + sh.bone_parent_id_array_offset = s.read_offset_f2(header_length); s.read(0, 0x0C); } else { - sh.bone_ids_offset = s.read_offset_x(); - sh.bone_matrices_offset = s.read_offset_x(); - sh.bone_names_offset = s.read_offset_x(); + sh.bone_id_array_offset = s.read_offset_x(); + sh.bone_matrix_array_offset = s.read_offset_x(); + sh.bone_name_array_offset = s.read_offset_x(); sh.ex_data_offset = s.read_offset_x(); - sk->bones_count = s.read_int32_t_reverse_endianness(); - sh.bone_parent_ids_offset = s.read_offset_x(); + sk->num_bone = s.read_int32_t_reverse_endianness(); + sh.bone_parent_id_array_offset = s.read_offset_x(); s.read(0, 0x18); } - if (sh.bone_ids_offset) { - sk->bones = force_malloc_s(obj_skin_bone, sk->bones_count); + if (sh.bone_id_array_offset) { + sk->bone_array = alloc->allocate(sk->num_bone); - int64_t* bone_names_offsets = 0; - if (sh.bone_names_offset) { - bone_names_offsets = force_malloc_s(int64_t, sk->bones_count); - s.set_position(sh.bone_names_offset, SEEK_SET); + s.set_position(sh.bone_id_array_offset, SEEK_SET); + for (uint32_t i = 0; i < sk->num_bone; i++) + sk->bone_array[i].id = s.read_uint32_t_reverse_endianness(); + + if (sh.bone_matrix_array_offset) { + s.set_position(sh.bone_matrix_array_offset, SEEK_SET); + for (uint32_t i = 0; i < sk->num_bone; i++) { + mat4& mat = sk->bone_array[i].inv_bind_pose_mat; + mat.row0.x = s.read_float_t_reverse_endianness(); + mat.row1.x = s.read_float_t_reverse_endianness(); + mat.row2.x = s.read_float_t_reverse_endianness(); + mat.row3.x = s.read_float_t_reverse_endianness(); + mat.row0.y = s.read_float_t_reverse_endianness(); + mat.row1.y = s.read_float_t_reverse_endianness(); + mat.row2.y = s.read_float_t_reverse_endianness(); + mat.row3.y = s.read_float_t_reverse_endianness(); + mat.row0.z = s.read_float_t_reverse_endianness(); + mat.row1.z = s.read_float_t_reverse_endianness(); + mat.row2.z = s.read_float_t_reverse_endianness(); + mat.row3.z = s.read_float_t_reverse_endianness(); + mat.row0.w = s.read_float_t_reverse_endianness(); + mat.row1.w = s.read_float_t_reverse_endianness(); + mat.row2.w = s.read_float_t_reverse_endianness(); + mat.row3.w = s.read_float_t_reverse_endianness(); + } + } + + if (sh.bone_name_array_offset) { + s.set_position(sh.bone_name_array_offset, SEEK_SET); if (!is_x) - for (uint32_t i = 0; i < sk->bones_count; i++) - bone_names_offsets[i] = s.read_offset_f2(header_length); + for (uint32_t i = 0; i < sk->num_bone; i++) + sk->bone_array[i].name = obj_read_utf8_string_null_terminated_offset( + alloc, s, s.read_offset_f2(header_length)); else - for (uint32_t i = 0; i < sk->bones_count; i++) - bone_names_offsets[i] = s.read_offset_x(); + for (uint32_t i = 0; i < sk->num_bone; i++) + sk->bone_array[i].name = obj_read_utf8_string_null_terminated_offset( + alloc, s, s.read_offset_x()); } - if (sh.bone_ids_offset) { - s.set_position(sh.bone_ids_offset, SEEK_SET); - for (uint32_t i = 0; i < sk->bones_count; i++) - sk->bones[i].id = s.read_uint32_t_reverse_endianness(); - - if (sh.bone_matrices_offset) { - s.set_position(sh.bone_matrices_offset, SEEK_SET); - for (uint32_t i = 0; i < sk->bones_count; i++) { - mat4& mat = sk->bones[i].inv_bind_pose_mat; - mat.row0.x = s.read_float_t_reverse_endianness(); - mat.row1.x = s.read_float_t_reverse_endianness(); - mat.row2.x = s.read_float_t_reverse_endianness(); - mat.row3.x = s.read_float_t_reverse_endianness(); - mat.row0.y = s.read_float_t_reverse_endianness(); - mat.row1.y = s.read_float_t_reverse_endianness(); - mat.row2.y = s.read_float_t_reverse_endianness(); - mat.row3.y = s.read_float_t_reverse_endianness(); - mat.row0.z = s.read_float_t_reverse_endianness(); - mat.row1.z = s.read_float_t_reverse_endianness(); - mat.row2.z = s.read_float_t_reverse_endianness(); - mat.row3.z = s.read_float_t_reverse_endianness(); - mat.row0.w = s.read_float_t_reverse_endianness(); - mat.row1.w = s.read_float_t_reverse_endianness(); - mat.row2.w = s.read_float_t_reverse_endianness(); - mat.row3.w = s.read_float_t_reverse_endianness(); - } - } - - if (sh.bone_names_offset) - for (uint32_t i = 0; i < sk->bones_count; i++) - sk->bones[i].name = s.read_utf8_string_null_terminated_offset( - bone_names_offsets[i]); - - if (sh.bone_parent_ids_offset) { - s.set_position(sh.bone_parent_ids_offset, SEEK_SET); - for (uint32_t i = 0; i < sk->bones_count; i++) - sk->bones[i].parent = s.read_uint32_t_reverse_endianness(); - } + if (sh.bone_parent_id_array_offset) { + s.set_position(sh.bone_parent_id_array_offset, SEEK_SET); + for (uint32_t i = 0; i < sk->num_bone; i++) + sk->bone_array[i].parent = s.read_uint32_t_reverse_endianness(); } - free_def(bone_names_offsets); } - if (sh.ex_data_offset) { - obj_skin_ex_data* ex = &sk->ex_data; - sk->ex_data_init = true; - s.set_position(sh.ex_data_offset, SEEK_SET); - - obj_skin_ex_data_header exh = {}; - if (!is_x) { - exh.osage_count = s.read_int32_t_reverse_endianness(); - ex->osage_nodes_count = s.read_int32_t_reverse_endianness(); - s.read(0, 0x04); - exh.osage_nodes_offset = s.read_offset_f2(header_length); - exh.osage_names_offset = s.read_offset_f2(header_length); - exh.blocks_offset = s.read_offset_f2(header_length); - exh.bone_names_count = s.read_int32_t_reverse_endianness(); - exh.bone_names_offset = s.read_offset_f2(header_length); - exh.osage_sibling_infos_offset = s.read_offset_f2(header_length); - exh.cloth_count = s.read_int32_t_reverse_endianness(); - ex->reserved[0] = s.read_offset_f2(header_length); - ex->reserved[1] = s.read_offset_f2(header_length); - ex->reserved[2] = s.read_offset_f2(header_length); - ex->reserved[3] = s.read_offset_f2(header_length); - ex->reserved[4] = s.read_offset_f2(header_length); - ex->reserved[5] = s.read_offset_f2(header_length); - ex->reserved[6] = s.read_offset_f2(header_length); - } - else { - exh.osage_count = s.read_int32_t_reverse_endianness(); - ex->osage_nodes_count = s.read_int32_t_reverse_endianness(); - s.read(0, 0x08); - exh.osage_nodes_offset = s.read_offset_x(); - exh.osage_names_offset = s.read_offset_x(); - exh.blocks_offset = s.read_offset_x(); - exh.bone_names_count = s.read_int32_t_reverse_endianness(); - exh.bone_names_offset = s.read_offset_x(); - exh.osage_sibling_infos_offset = s.read_offset_x(); - exh.cloth_count = s.read_int32_t_reverse_endianness(); - ex->reserved[0] = s.read_offset_x(); - ex->reserved[1] = s.read_offset_x(); - ex->reserved[2] = s.read_offset_x(); - ex->reserved[3] = s.read_offset_x(); - ex->reserved[4] = s.read_offset_x(); - ex->reserved[5] = s.read_offset_x(); - ex->reserved[6] = s.read_offset_x(); - } - - if (exh.bone_names_offset) { - std::vector bone_names; - bone_names.reserve(exh.bone_names_count); - int32_t* strings_offsets = force_malloc_s(int32_t, exh.bone_names_count); - s.set_position(exh.bone_names_offset, SEEK_SET); - for (uint32_t i = 0; i < exh.bone_names_count; i++) - strings_offsets[i] = s.read_int32_t(); - - size_t buf_size = 0; - for (uint32_t i = 0; i < exh.bone_names_count; i++) { - if (strings_offsets[i]) - bone_names.push_back(s.read_string_null_terminated_offset( - strings_offsets[i])); - else - bone_names.push_back({}); - buf_size += bone_names.back().size() + 1; - } - free_def(strings_offsets); - - if (bone_names.size()) { - ex->bone_names_buf = force_malloc_s(char, buf_size); - ex->bone_names = force_malloc_s(char*, buf_size + 1); - ex->bone_names_count = exh.bone_names_count; - - char* bone_names_buf = ex->bone_names_buf; - char** bone_names_ptr = ex->bone_names; - for (uint32_t i = 0; i < exh.bone_names_count; i++) { - std::string* str = &bone_names.data()[i]; - *bone_names_ptr++ = bone_names_buf; - memcpy(bone_names_buf, str->c_str(), str->size()); - bone_names_buf[str->size()] = 0; - bone_names_buf += str->size() + 1; - } - *bone_names_ptr = 0; - } - } - else { - ex->bone_names_buf = 0; - ex->bone_names = 0; - ex->bone_names_count = 0; - } - - char** bone_names = ex->bone_names; - if (!bone_names) - return; - - if (exh.osage_nodes_offset) { - ex->osage_nodes = force_malloc_s(obj_skin_osage_node, ex->osage_nodes_count); - - s.set_position(exh.osage_nodes_offset, SEEK_SET); - for (uint32_t i = 0; i < ex->osage_nodes_count; i++) { - obj_skin_osage_node* osage_node = &ex->osage_nodes[i]; - - osage_node->name_index = s.read_uint32_t_reverse_endianness(); - osage_node->length = s.read_float_t_reverse_endianness(); - s.read(0, 0x04); - } - } - - if (exh.blocks_offset) { - ex->blocks_count = 0; - s.set_position(exh.blocks_offset, SEEK_SET); - if (!is_x) - while (s.read_int32_t()) { - s.read(0, 0x04); - ex->blocks_count++; - } - else - while (s.read_int64_t()) { - s.read(0, 0x08); - ex->blocks_count++; - } - - obj_skin_block_header* bhs = force_malloc_s(obj_skin_block_header, ex->blocks_count); - s.set_position(exh.blocks_offset, SEEK_SET); - if (!is_x) - for (uint32_t i = 0; i < ex->blocks_count; i++) { - bhs[i].block_signature_offset = s.read_offset_f2(header_length); - bhs[i].block_offset = s.read_offset_f2(header_length); - } - else - for (uint32_t i = 0; i < ex->blocks_count; i++) { - bhs[i].block_signature_offset = s.read_offset_x(); - bhs[i].block_offset = s.read_offset_x(); - } - - ex->blocks = force_malloc_s(obj_skin_block, ex->blocks_count); - for (uint32_t i = 0; i < ex->blocks_count; i++) { - obj_skin_block* block = &ex->blocks[i]; - - std::string block_signature = s.read_string_null_terminated_offset( - bhs[i].block_signature_offset); - if (block_signature.size() != 3) - continue; - - uint32_t signature = load_reverse_endianness_uint32_t(block_signature.c_str()); - switch (signature) { - case 'CLS\0': - block->type = OBJ_SKIN_BLOCK_CLOTH; - s.set_position(bhs[i].block_offset, SEEK_SET); - obj_modern_read_skin_block_cloth(&block->cloth, s, - header_length, bone_names, is_x); - break; - case 'CNS\0': - block->type = OBJ_SKIN_BLOCK_CONSTRAINT; - s.set_position(bhs[i].block_offset, SEEK_SET); - obj_modern_read_skin_block_constraint(&block->constraint, s, - header_length, bone_names, is_x); - break; - case 'EXP\0': - block->type = OBJ_SKIN_BLOCK_EXPRESSION; - s.set_position(bhs[i].block_offset, SEEK_SET); - obj_modern_read_skin_block_expression(&block->expression, s, - header_length, bone_names, is_x); - break; - case 'MOT\0': - block->type = OBJ_SKIN_BLOCK_MOTION; - s.set_position(bhs[i].block_offset, SEEK_SET); - obj_modern_read_skin_block_motion(&block->motion, s, - header_length, bone_names, is_x); - break; - case 'OSG\0': - block->type = OBJ_SKIN_BLOCK_OSAGE; - s.set_position(bhs[i].block_offset, SEEK_SET); - obj_modern_read_skin_block_osage(&block->osage, s, - header_length, bone_names, is_x); - break; - default: - break; - } - } - free_def(bhs); - } - - if (exh.osage_sibling_infos_offset) { - ex->osage_sibling_infos_count = 0; - s.set_position(exh.osage_sibling_infos_offset, SEEK_SET); - while (s.read_uint32_t()) { - s.read(0, 0x08); - ex->osage_sibling_infos_count++; - } - - obj_skin_osage_sibling_info* osis = force_malloc_s( - obj_skin_osage_sibling_info, ex->osage_sibling_infos_count); - ex->osage_sibling_infos = osis; - s.set_position(exh.blocks_offset, SEEK_SET); - for (uint32_t i = 0; i < ex->osage_sibling_infos_count; i++) { - osis[i].name_index = s.read_uint32_t_reverse_endianness(); - osis[i].sibling_name_index = s.read_uint32_t_reverse_endianness(); - osis[i].max_distance = s.read_float_t_reverse_endianness(); - } - - s.set_position(exh.osage_sibling_infos_offset, SEEK_SET); - } - } + if (sh.ex_data_offset) + sk->ex_data = obj_modern_read_skin_ex_data(alloc, + s, sh.ex_data_offset, header_length, is_x); + return sk; } -static void obj_modern_write_skin(obj* obj, stream& s, +static void obj_modern_write_skin(obj_skin* sk, stream& s, int64_t base_offset, bool is_x, f2_struct* oskn) { - obj_skin* sk = &obj->skin; - uint32_t off; enrs e; enrs_entry ee; @@ -4742,45 +4650,45 @@ static void obj_modern_write_skin(obj* obj, stream& s, off = align_val(off, 0x10); obj_skin_header sh = {}; - if (sk->bones_count) { - if (sk->bones_count % 4) { - ee = { off, 1, 4, (uint32_t)sk->bones_count }; + if (sk->num_bone) { + if (sk->num_bone % 4) { + ee = { off, 1, 4, (uint32_t)sk->num_bone }; ee.append(0, 1, ENRS_DWORD); e.vec.push_back(ee); - off = (uint32_t)(sk->bones_count * 4ULL); + off = (uint32_t)(sk->num_bone * 4ULL); off = align_val(off, 0x10); - ee = { off, 1, 4, (uint32_t)sk->bones_count }; + ee = { off, 1, 4, (uint32_t)sk->num_bone }; ee.append(0, 1, ENRS_DWORD); e.vec.push_back(ee); - off = (uint32_t)(sk->bones_count * 4ULL); + off = (uint32_t)(sk->num_bone * 4ULL); } else { - ee = { off, 1, 4, (uint32_t)(sk->bones_count * 2ULL) }; + ee = { off, 1, 4, (uint32_t)(sk->num_bone * 2ULL) }; ee.append(0, 1, ENRS_DWORD); e.vec.push_back(ee); - off = (uint32_t)(sk->bones_count * 2 * 4ULL); + off = (uint32_t)(sk->num_bone * 2 * 4ULL); } off = align_val(off, 0x10); if (!is_x) { - ee = { off, 1, 4, (uint32_t)sk->bones_count }; + ee = { off, 1, 4, (uint32_t)sk->num_bone }; ee.append(0, 1, ENRS_DWORD); e.vec.push_back(ee); - off = (uint32_t)(sk->bones_count * 4ULL); + off = (uint32_t)(sk->num_bone * 4ULL); } else { - ee = { off, 1, 8, (uint32_t)sk->bones_count }; + ee = { off, 1, 8, (uint32_t)sk->num_bone }; ee.append(0, 1, ENRS_QWORD); e.vec.push_back(ee); - off = (uint32_t)(sk->bones_count * 8ULL); + off = (uint32_t)(sk->num_bone * 8ULL); } off = align_val(off, 0x10); - ee = { off, 1, 64, (uint32_t)sk->bones_count }; + ee = { off, 1, 64, (uint32_t)sk->num_bone }; ee.append(0, 16, ENRS_DWORD); e.vec.push_back(ee); - off = (uint32_t)(sk->bones_count * 64ULL); + off = (uint32_t)(sk->num_bone * 64ULL); off = align_val(off, 0x10); } @@ -4802,30 +4710,30 @@ static void obj_modern_write_skin(obj* obj, stream& s, int32_t motion_count = 0; int32_t motion_nodes_count = 0; - if (sk->ex_data_init) { - obj_skin_ex_data* ex = &sk->ex_data; + if (sk->ex_data) { + obj_skin_ex_data* ex = sk->ex_data; - char** bone_names_ptr = ex->bone_names; - for (uint32_t i = 0; i < ex->blocks_count; i++) { - obj_skin_block* block = &ex->blocks[i]; + const char** bone_name_array = ex->bone_name_array; + for (uint32_t i = 0; i < ex->num_block; i++) { + obj_skin_block* block = &ex->block_array[i]; switch (block->type) { case OBJ_SKIN_BLOCK_CLOTH: { - obj_skin_block_cloth* cloth = &block->cloth; + obj_skin_block_cloth* cloth = block->cloth; obj_skin_strings_push_back_check(strings, cloth->mesh_name); obj_skin_strings_push_back_check(strings, cloth->backface_mesh_name); - for (uint32_t k = 0; k < cloth->root_count; k++) { - obj_skin_block_cloth_root* sub = &cloth->root[k]; + for (uint32_t k = 0; k < cloth->num_root; k++) { + obj_skin_block_cloth_root* root_array = &cloth->root_array[k]; for (uint32_t l = 0; l < 4; l++) - obj_skin_strings_push_back_check(strings, sub->bone_weights[l].bone_name); + obj_skin_strings_push_back_check(strings, root_array->bone_weights[l].bone_name); } obj_skin_strings_push_back_check(strings, "CLS"); } break; case OBJ_SKIN_BLOCK_CONSTRAINT: { - obj_skin_block_constraint* constraint = &block->constraint; - obj_skin_strings_push_back_check(strings, constraint->base.parent_name); + obj_skin_block_constraint* constraint = block->constraint; + obj_skin_strings_push_back_check(strings, constraint->node.parent_name); obj_skin_strings_push_back_check_by_index(strings, - bone_names_ptr, constraint->name_index); + bone_name_array, constraint->name_index); obj_skin_strings_push_back_check(strings, constraint->source_node_name); switch (constraint->type) { case OBJ_SKIN_BLOCK_CONSTRAINT_ORIENTATION: @@ -4833,121 +4741,121 @@ static void obj_modern_write_skin(obj* obj, stream& s, break; case OBJ_SKIN_BLOCK_CONSTRAINT_DIRECTION: obj_skin_strings_push_back_check(strings, "Direction"); - obj_skin_strings_push_back_check(strings, constraint->direction.up_vector.name); + obj_skin_strings_push_back_check(strings, constraint->direction->up_vector.name); break; case OBJ_SKIN_BLOCK_CONSTRAINT_POSITION: obj_skin_strings_push_back_check(strings, "Position"); - obj_skin_strings_push_back_check(strings, constraint->position.up_vector.name); + obj_skin_strings_push_back_check(strings, constraint->position->up_vector.name); break; case OBJ_SKIN_BLOCK_CONSTRAINT_DISTANCE: obj_skin_strings_push_back_check(strings, "Distance"); - obj_skin_strings_push_back_check(strings, constraint->distance.up_vector.name); + obj_skin_strings_push_back_check(strings, constraint->distance->up_vector.name); break; } obj_skin_strings_push_back_check(strings, "CNS"); obj_skin_strings_push_back_check_by_index(bone_names, - bone_names_ptr, constraint->name_index); + bone_name_array, constraint->name_index); } break; case OBJ_SKIN_BLOCK_EXPRESSION: { - obj_skin_block_expression* expression = &block->expression; - for (uint32_t j = 0; j < expression->expressions_count; j++) - obj_skin_strings_push_back_check(strings, expression->expressions[j]); - obj_skin_strings_push_back_check(strings, expression->base.parent_name); + obj_skin_block_expression* expression = block->expression; + for (uint32_t j = 0; j < expression->num_expression; j++) + obj_skin_strings_push_back_check(strings, expression->expression_array[j]); + obj_skin_strings_push_back_check(strings, expression->node.parent_name); obj_skin_strings_push_back_check_by_index(strings, - bone_names_ptr, expression->name_index); + bone_name_array, expression->name_index); obj_skin_strings_push_back_check(strings, "EXP"); obj_skin_strings_push_back_check_by_index(bone_names, - bone_names_ptr, expression->name_index); + bone_name_array, expression->name_index); } break; case OBJ_SKIN_BLOCK_MOTION: { - obj_skin_block_motion* motion = &block->motion; - obj_skin_strings_push_back_check(strings, motion->base.parent_name); + obj_skin_block_motion* motion = block->motion; + obj_skin_strings_push_back_check(strings, motion->node.parent_name); obj_skin_strings_push_back_check(strings, motion->name); - for (uint32_t j = 0; j < motion->nodes_count; j++) + for (uint32_t j = 0; j < motion->num_node; j++) obj_skin_strings_push_back_check_by_index(strings, - bone_names_ptr, motion->nodes[j].name_index); + bone_name_array, motion->node_array[j].name_index); obj_skin_strings_push_back_check(strings, "MOT"); if (!is_x) obj_skin_strings_push_back_check(bone_names, motion->name); - for (uint32_t j = 0; j < motion->nodes_count; j++) + for (uint32_t j = 0; j < motion->num_node; j++) obj_skin_strings_push_back_check_by_index(bone_names, - bone_names_ptr, motion->nodes[j].name_index); + bone_name_array, motion->node_array[j].name_index); } break; case OBJ_SKIN_BLOCK_OSAGE: { - obj_skin_block_osage* osage = &block->osage; - obj_skin_strings_push_back_check(strings, osage->base.parent_name); + obj_skin_block_osage* osage = block->osage; + obj_skin_strings_push_back_check(strings, osage->node.parent_name); obj_skin_strings_push_back_check_by_index(strings, - bone_names_ptr, osage->name_index); + bone_name_array, osage->name_index); obj_skin_strings_push_back_check_by_index(strings, - bone_names_ptr, osage->external_name_index); - obj_skin_osage_node* osage_node = &ex->osage_nodes[osage->start_index]; + bone_name_array, osage->external_name_index); + obj_skin_osage_node* osage_node = &ex->osage_node_array[osage->start_index]; for (uint32_t j = 0; j < osage->count; j++) { obj_skin_strings_push_back_check_by_index(strings, - bone_names_ptr, osage_node->name_index); + bone_name_array, osage_node->name_index); int32_t name_index = osage->name_index; - obj_skin_osage_sibling_info* osage_sibling_infos = ex->osage_sibling_infos; - for (uint32_t k = 0; k < ex->osage_sibling_infos_count; k++) { - if (name_index == osage_sibling_infos->name_index) { + obj_skin_osage_sibling_info* osage_sibling_info = ex->osage_sibling_info_array; + for (uint32_t k = 0; k < ex->num_osage_sibling_info; k++) { + if (name_index == osage_sibling_info->name_index) { obj_skin_strings_push_back_check_by_index(strings, - bone_names_ptr, osage_sibling_infos->sibling_name_index); + bone_name_array, osage_sibling_info->sibling_name_index); break; } - osage_sibling_infos++; + osage_sibling_info++; } osage_node++; } obj_skin_strings_push_back_check(strings, "OSG"); obj_skin_strings_push_back_check_by_index(bone_names, - bone_names_ptr, osage->external_name_index); - osage_node = &ex->osage_nodes[osage->start_index]; + bone_name_array, osage->external_name_index); + osage_node = &ex->osage_node_array[osage->start_index]; for (uint32_t j = 0; j < osage->count; j++) { obj_skin_strings_push_back_check_by_index(bone_names, - bone_names_ptr, osage_node->name_index); + bone_name_array, osage_node->name_index); int32_t name_index = osage->name_index; - obj_skin_osage_sibling_info* osage_sibling_infos = ex->osage_sibling_infos; - for (uint32_t k = 0; k < ex->osage_sibling_infos_count; k++) { - if (name_index == osage_sibling_infos->name_index) { + obj_skin_osage_sibling_info* osage_sibling_info = ex->osage_sibling_info_array; + for (uint32_t k = 0; k < ex->num_osage_sibling_info; k++) { + if (name_index == osage_sibling_info->name_index) { obj_skin_strings_push_back_check_by_index(bone_names, - bone_names_ptr, osage_sibling_infos->sibling_name_index); + bone_name_array, osage_sibling_info->sibling_name_index); break; } - osage_sibling_infos++; + osage_sibling_info++; } osage_node++; } obj_skin_strings_push_back_check_by_index(bone_names, - bone_names_ptr, osage->name_index); + bone_name_array, osage->name_index); } break; } } exh.cloth_count = 0; - exh.osage_count = 0; - for (uint32_t i = 0; i < ex->blocks_count; i++) { - obj_skin_block* block = &ex->blocks[i]; + exh.num_osage = 0; + for (uint32_t i = 0; i < ex->num_block; i++) { + obj_skin_block* block = &ex->block_array[i]; if (block->type == OBJ_SKIN_BLOCK_CLOTH) exh.cloth_count++; else if (block->type == OBJ_SKIN_BLOCK_EXPRESSION) expressions_count++; else if (block->type == OBJ_SKIN_BLOCK_MOTION) { motion_count++; - motion_nodes_count += block->motion.nodes_count; + motion_nodes_count += block->motion->num_node; } else if (block->type == OBJ_SKIN_BLOCK_OSAGE) - exh.osage_count++; + exh.num_osage++; } - exh.bone_names_count = (int32_t)bone_names.size(); + exh.num_bone_name = (int32_t)bone_names.size(); } - if (sk->ex_data_init) { - obj_skin_ex_data* ex = &sk->ex_data; + if (sk->ex_data) { + obj_skin_ex_data* ex = sk->ex_data; if (!is_x) { ee = { off, 1, 80, 1 }; @@ -4967,22 +4875,22 @@ static void obj_modern_write_skin(obj* obj, stream& s, } off = align_val(off, 0x10); - if (ex->osage_nodes_count) { - ee = { off, 1, 12, (uint32_t)ex->osage_nodes_count }; + if (ex->num_osage_node) { + ee = { off, 1, 12, (uint32_t)ex->num_osage_node }; ee.append(0, 2, ENRS_DWORD); e.vec.push_back(ee); - off = (uint32_t)(ex->osage_nodes_count * 12ULL); + off = (uint32_t)(ex->num_osage_node * 12ULL); off = align_val(off, 0x10); - ee = { off, 1, 12, (uint32_t)ex->osage_sibling_infos_count }; + ee = { off, 1, 12, (uint32_t)ex->num_osage_sibling_info }; ee.append(0, 3, ENRS_DWORD); e.vec.push_back(ee); - off = (uint32_t)(ex->osage_sibling_infos_count * 12ULL); + off = (uint32_t)(ex->num_osage_sibling_info * 12ULL); off = align_val(off, 0x10); } - if (exh.osage_count || exh.cloth_count) { - int32_t count = exh.osage_count + exh.cloth_count; + if (exh.num_osage || exh.cloth_count) { + int32_t count = exh.num_osage + exh.cloth_count; if (!is_x) { ee = { off, 1, 4, (uint32_t)count }; ee.append(0, 1, ENRS_DWORD); @@ -4999,50 +4907,50 @@ static void obj_modern_write_skin(obj* obj, stream& s, } if (!is_x) { - ee = { off, 1, 4, (uint32_t)exh.bone_names_count }; + ee = { off, 1, 4, (uint32_t)exh.num_bone_name }; ee.append(0, 1, ENRS_DWORD); e.vec.push_back(ee); - off = (uint32_t)(exh.bone_names_count * 4ULL); + off = (uint32_t)(exh.num_bone_name * 4ULL); } else { - ee = { off, 1, 8, (uint32_t)exh.bone_names_count }; + ee = { off, 1, 8, (uint32_t)exh.num_bone_name }; ee.append(0, 1, ENRS_QWORD); e.vec.push_back(ee); - off = (uint32_t)(exh.bone_names_count * 8ULL); + off = (uint32_t)(exh.num_bone_name * 8ULL); } off = align_val(off, 0x10); - if (ex->blocks_count > 0) { + if (ex->num_block > 0) { if (!is_x) { - ee = { off, 1, 8, (uint32_t)ex->blocks_count }; + ee = { off, 1, 8, (uint32_t)ex->num_block }; ee.append(0, 2, ENRS_DWORD); e.vec.push_back(ee); - off = (uint32_t)(ex->blocks_count * 8ULL); + off = (uint32_t)(ex->num_block * 8ULL); } else { - ee = { off, 1, 16, (uint32_t)ex->blocks_count }; + ee = { off, 1, 16, (uint32_t)ex->num_block }; ee.append(0, 2, ENRS_QWORD); e.vec.push_back(ee); - off = (uint32_t)(ex->blocks_count * 16ULL); + off = (uint32_t)(ex->num_block * 16ULL); } off = align_val(off, 0x10); - if (exh.osage_count) { + if (exh.num_osage) { if (!is_x) { - ee = { off, 2, 76, (uint32_t)exh.osage_count }; + ee = { off, 2, 76, (uint32_t)exh.num_osage }; ee.append(0, 14, ENRS_DWORD); ee.append(4, 1, ENRS_DWORD); e.vec.push_back(ee); - off = (uint32_t)(exh.osage_count * 76ULL); + off = (uint32_t)(exh.num_osage * 76ULL); } else { - ee = { off, 4, 104, (uint32_t)exh.osage_count }; + ee = { off, 4, 104, (uint32_t)exh.num_osage }; ee.append(0, 1, ENRS_QWORD); ee.append(0, 9, ENRS_DWORD); ee.append(4, 4, ENRS_DWORD); ee.append(8, 1, ENRS_QWORD); e.vec.push_back(ee); - off = (uint32_t)(exh.osage_count * 104ULL); + off = (uint32_t)(exh.num_osage * 104ULL); } off = align_val(off, 0x10); } @@ -5088,12 +4996,12 @@ static void obj_modern_write_skin(obj* obj, stream& s, int32_t constraint_count = 0; obj_skin_block_constraint_type cns_type = OBJ_SKIN_BLOCK_CONSTRAINT_NONE; - for (uint32_t i = 0; i < ex->blocks_count; i++) { - obj_skin_block* block = &ex->blocks[i]; + for (uint32_t i = 0; i < ex->num_block; i++) { + obj_skin_block* block = &ex->block_array[i]; if (block->type != OBJ_SKIN_BLOCK_CONSTRAINT) continue; - if (cns_type == block->constraint.type) { + if (cns_type == block->constraint->type) { constraint_count++; continue; } @@ -5104,7 +5012,7 @@ static void obj_modern_write_skin(obj* obj, stream& s, off = ee.size * ee.repeat_count; } - cns_type = block->constraint.type; + cns_type = block->constraint->type; if (!is_x) switch (cns_type) { case OBJ_SKIN_BLOCK_CONSTRAINT_ORIENTATION: @@ -5212,42 +5120,42 @@ static void obj_modern_write_skin(obj* obj, stream& s, } if (exh.cloth_count) { - int32_t mats_count = 0; - int32_t root_count = 0; - int32_t nodes_count = 0; - int32_t mesh_indices_count = 0; - int32_t backface_mesh_indices_count = 0; - for (uint32_t i = 0; i < ex->blocks_count; i++) { - obj_skin_block* block = &ex->blocks[i]; + int32_t num_mat = 0; + int32_t num_root = 0; + int32_t num_node = 0; + int32_t num_mesh_index = 0; + int32_t num_backface_mesh_index = 0; + for (uint32_t i = 0; i < ex->num_block; i++) { + obj_skin_block* block = &ex->block_array[i]; if (block->type == OBJ_SKIN_BLOCK_CLOTH) { - mats_count += block->cloth.mats ? block->cloth.mats_count : 0; - root_count += block->cloth.root ? block->cloth.root_count : 0; - nodes_count += block->cloth.nodes - ? block->cloth.root_count * (block->cloth.nodes_count - 1) : 0; - mesh_indices_count += block->cloth.mesh_indices - ? block->cloth.mesh_indices_count + 1 : 0; - backface_mesh_indices_count += block->cloth.backface_mesh_indices - ? block->cloth.backface_mesh_indices_count + 1 : 0; + num_mat += block->cloth->mat_array ? block->cloth->num_mat : 0; + num_root += block->cloth->root_array ? block->cloth->num_root : 0; + num_node += block->cloth->node_array + ? block->cloth->num_root * (block->cloth->num_node - 1) : 0; + num_mesh_index += block->cloth->mesh_index_array + ? block->cloth->num_mesh_index + 1 : 0; + num_backface_mesh_index += block->cloth->backface_mesh_index_array + ? block->cloth->num_backface_mesh_index + 1 : 0; } } - if (mats_count) { - ee = { off, 1, sizeof(mat4), (uint32_t)mats_count }; + if (num_mat) { + ee = { off, 1, sizeof(mat4), (uint32_t)num_mat }; ee.append(0, 16, ENRS_DWORD); e.vec.push_back(ee); - off = (uint32_t)(mats_count * sizeof(mat4)); + off = (uint32_t)(num_mat * sizeof(mat4)); off = align_val(off, 0x10); } - if (root_count) { + if (num_root) { if (!is_x) { - ee = { off, 1, 104, (uint32_t)root_count }; + ee = { off, 1, 104, (uint32_t)num_root }; ee.append(0, 26, ENRS_DWORD); e.vec.push_back(ee); - off = (uint32_t)(root_count * 104ULL); + off = (uint32_t)(num_root * 104ULL); } else { - ee = { off, 9, 136, (uint32_t)root_count }; + ee = { off, 9, 136, (uint32_t)num_root }; ee.append(0, 10, ENRS_DWORD); ee.append(0, 1, ENRS_QWORD); ee.append(0, 3, ENRS_DWORD); @@ -5258,32 +5166,32 @@ static void obj_modern_write_skin(obj* obj, stream& s, ee.append(4, 1, ENRS_QWORD); ee.append(0, 3, ENRS_DWORD); e.vec.push_back(ee); - off = (uint32_t)(root_count * 136ULL); + off = (uint32_t)(num_root * 136ULL); } off = align_val(off, 0x10); } - if (nodes_count) { - ee = { off, 1, 44, (uint32_t)nodes_count }; + if (num_node) { + ee = { off, 1, 44, (uint32_t)num_node }; ee.append(0, 11, ENRS_DWORD); e.vec.push_back(ee); - off = (uint32_t)(nodes_count * 44ULL); + off = (uint32_t)(num_node * 44ULL); off = align_val(off, 0x10); } - if (mesh_indices_count) { - ee = { off, 1, 2, (uint32_t)mesh_indices_count }; + if (num_mesh_index) { + ee = { off, 1, 2, (uint32_t)num_mesh_index }; ee.append(0, 1, ENRS_WORD); e.vec.push_back(ee); - off = (uint32_t)(mesh_indices_count * 2ULL); + off = (uint32_t)(num_mesh_index * 2ULL); off = align_val(off, 0x10); } - if (backface_mesh_indices_count) { - ee = { off, 1, 2, (uint32_t)backface_mesh_indices_count }; + if (num_backface_mesh_index) { + ee = { off, 1, 2, (uint32_t)num_backface_mesh_index }; ee.append(0, 1, ENRS_WORD); e.vec.push_back(ee); - off = (uint32_t)(backface_mesh_indices_count * 2ULL); + off = (uint32_t)(num_backface_mesh_index * 2ULL); off = align_val(off, 0x10); } } @@ -5310,33 +5218,33 @@ static void obj_modern_write_skin(obj* obj, stream& s, } s.align_write(0x10); - if (sk->bones_count) { - sh.bone_ids_offset = s.get_position(); - for (uint32_t i = 0; i < sk->bones_count; i++) - s.write_int32_t_reverse_endianness(sk->bones[i].id); + if (sk->num_bone) { + sh.bone_id_array_offset = s.get_position(); + for (uint32_t i = 0; i < sk->num_bone; i++) + s.write_int32_t_reverse_endianness(sk->bone_array[i].id); s.align_write(0x10); - sh.bone_parent_ids_offset = s.get_position(); - for (uint32_t i = 0; i < sk->bones_count; i++) - s.write_int32_t_reverse_endianness(sk->bones[i].parent); + sh.bone_parent_id_array_offset = s.get_position(); + for (uint32_t i = 0; i < sk->num_bone; i++) + s.write_int32_t_reverse_endianness(sk->bone_array[i].parent); s.align_write(0x10); - sh.bone_names_offset = s.get_position(); + sh.bone_name_array_offset = s.get_position(); if (!is_x) - for (uint32_t i = 0; i < sk->bones_count; i++) { + for (uint32_t i = 0; i < sk->num_bone; i++) { io_write_offset_f2_pof_add(s, 0, 0x20, &pof); - obj_skin_strings_push_back_check(strings, sk->bones[i].name); + obj_skin_strings_push_back_check(strings, sk->bone_array[i].name); } else - for (uint32_t i = 0; i < sk->bones_count; i++) { + for (uint32_t i = 0; i < sk->num_bone; i++) { io_write_offset_x_pof_add(s, 0, &pof); - obj_skin_strings_push_back_check(strings, sk->bones[i].name); + obj_skin_strings_push_back_check(strings, sk->bone_array[i].name); } s.align_write(0x10); - sh.bone_matrices_offset = s.get_position(); - for (uint32_t i = 0; i < sk->bones_count; i++) { - mat4& mat = sk->bones[i].inv_bind_pose_mat; + sh.bone_matrix_array_offset = s.get_position(); + for (uint32_t i = 0; i < sk->num_bone; i++) { + mat4& mat = sk->bone_array[i].inv_bind_pose_mat; s.write_float_t_reverse_endianness(mat.row0.x); s.write_float_t_reverse_endianness(mat.row1.x); s.write_float_t_reverse_endianness(mat.row2.x); @@ -5357,8 +5265,8 @@ static void obj_modern_write_skin(obj* obj, stream& s, s.align_write(0x10); } - if (sk->ex_data_init) { - obj_skin_ex_data* ex = &sk->ex_data; + if (sk->ex_data) { + obj_skin_ex_data* ex = sk->ex_data; sh.ex_data_offset = s.get_position(); if (!is_x) { @@ -5401,17 +5309,17 @@ static void obj_modern_write_skin(obj* obj, stream& s, } s.align_write(0x10); - if (ex->osage_nodes_count) { - exh.osage_nodes_offset = s.get_position(); - for (uint32_t i = 0; i < ex->osage_nodes_count; i++) { + if (ex->num_osage_node) { + exh.osage_node_array_offset = s.get_position(); + for (uint32_t i = 0; i < ex->num_osage_node; i++) { s.write_int32_t(0); s.write_int32_t(0); s.write_int32_t(0); } s.align_write(0x10); - exh.osage_sibling_infos_offset = s.get_position(); - for (uint32_t i = 0; i < ex->osage_sibling_infos_count; i++) { + exh.osage_sibling_info_array_offset = s.get_position(); + for (uint32_t i = 0; i < ex->num_osage_sibling_info; i++) { s.write_int32_t(0); s.write_int32_t(0); s.write_int32_t(0); @@ -5422,17 +5330,17 @@ static void obj_modern_write_skin(obj* obj, stream& s, s.align_write(0x10); } - if (exh.osage_count || exh.cloth_count) { - exh.osage_names_offset = s.get_position(); + if (exh.num_osage || exh.cloth_count) { + exh.osage_name_array_offset = s.get_position(); if (!is_x) { - for (uint32_t i = 0; i < exh.osage_count; i++) + for (uint32_t i = 0; i < exh.num_osage; i++) io_write_offset_f2_pof_add(s, 0, 0x20, &pof); for (uint32_t i = 0; i < exh.cloth_count; i++) io_write_offset_f2_pof_add(s, 0, 0x20, &pof); } else { - for (uint32_t i = 0; i < exh.osage_count; i++) + for (uint32_t i = 0; i < exh.num_osage; i++) io_write_offset_x_pof_add(s, 0, &pof); for (uint32_t i = 0; i < exh.cloth_count; i++) @@ -5441,7 +5349,7 @@ static void obj_modern_write_skin(obj* obj, stream& s, s.align_write(0x10); } - exh.bone_names_offset = s.get_position(); + exh.bone_name_array_offset = s.get_position(); if (!is_x) for (string_hash& i : bone_names) io_write_offset_f2_pof_add(s, 0, 0x20, &pof); @@ -5450,10 +5358,10 @@ static void obj_modern_write_skin(obj* obj, stream& s, io_write_offset_x_pof_add(s, 0, &pof); s.align_write(0x10); - if (ex->blocks_count > 0) { - exh.blocks_offset = s.get_position(); + if (ex->num_block > 0) { + exh.block_array_offset = s.get_position(); if (!is_x) { - for (uint32_t i = 0; i < ex->blocks_count; i++) { + for (uint32_t i = 0; i < ex->num_block; i++) { io_write_offset_f2_pof_add(s, 0, 0x20, &pof); io_write_offset_f2_pof_add(s, 0, 0x20, &pof); } @@ -5461,7 +5369,7 @@ static void obj_modern_write_skin(obj* obj, stream& s, s.write_offset_f2(0, 0x20); } else { - for (uint32_t i = 0; i < ex->blocks_count; i++) { + for (uint32_t i = 0; i < ex->num_block; i++) { io_write_offset_x_pof_add(s, 0, &pof); io_write_offset_x_pof_add(s, 0, &pof); } @@ -5470,10 +5378,10 @@ static void obj_modern_write_skin(obj* obj, stream& s, } s.align_write(0x10); - bhs = force_malloc_s(obj_skin_block_header, ex->blocks_count); + bhs = force_malloc_s(obj_skin_block_header, ex->num_block); if (!is_x) - for (uint32_t i = 0; i < ex->blocks_count; i++) { - obj_skin_block* block = &ex->blocks[i]; + for (uint32_t i = 0; i < ex->num_block; i++) { + obj_skin_block* block = &ex->block_array[i]; if (block->type != OBJ_SKIN_BLOCK_OSAGE) continue; @@ -5483,12 +5391,12 @@ static void obj_modern_write_skin(obj* obj, stream& s, s.write(0x24); } else - for (uint32_t i = 0; i < ex->blocks_count; i++) { - obj_skin_block* block = &ex->blocks[i]; + for (uint32_t i = 0; i < ex->num_block; i++) { + obj_skin_block* block = &ex->block_array[i]; if (block->type != OBJ_SKIN_BLOCK_OSAGE) continue; - obj_skin_block_osage* osage = &block->osage; + obj_skin_block_osage* osage = block->osage; bhs[i].block_offset = s.get_position(); io_write_offset_x_pof_add(s, 0, &pof); @@ -5504,12 +5412,12 @@ static void obj_modern_write_skin(obj* obj, stream& s, s.align_write(0x10); if (!is_x) - for (uint32_t i = 0; i < ex->blocks_count; i++) { - obj_skin_block* block = &ex->blocks[i]; + for (uint32_t i = 0; i < ex->num_block; i++) { + obj_skin_block* block = &ex->block_array[i]; if (block->type != OBJ_SKIN_BLOCK_EXPRESSION) continue; - obj_skin_block_expression* expression = &block->expression; + obj_skin_block_expression* expression = block->expression; bhs[i].block_offset = s.get_position(); io_write_offset_f2_pof_add(s, 0, 0x20, &pof); @@ -5517,18 +5425,18 @@ static void obj_modern_write_skin(obj* obj, stream& s, io_write_offset_f2_pof_add(s, 0, 0x20, &pof); s.write(0x04); - for (uint32_t j = 0; j < expression->expressions_count && j < 9; j++) + for (uint32_t j = 0; j < expression->num_expression && j < 9; j++) io_write_offset_f2_pof_add(s, 0, 0x20, &pof); - for (uint32_t j = expression->expressions_count; j < 9; j++) + for (uint32_t j = expression->num_expression; j < 9; j++) s.write(0x04); } else - for (uint32_t i = 0; i < ex->blocks_count; i++) { - obj_skin_block* block = &ex->blocks[i]; + for (uint32_t i = 0; i < ex->num_block; i++) { + obj_skin_block* block = &ex->block_array[i]; if (block->type != OBJ_SKIN_BLOCK_EXPRESSION) continue; - obj_skin_block_expression* expression = &block->expression; + obj_skin_block_expression* expression = block->expression; bhs[i].block_offset = s.get_position(); io_write_offset_x_pof_add(s, 0, &pof); @@ -5536,45 +5444,45 @@ static void obj_modern_write_skin(obj* obj, stream& s, io_write_offset_x_pof_add(s, 0, &pof); s.write(0x08); - for (uint32_t j = 0; j < expression->expressions_count && j < 9; j++) + for (uint32_t j = 0; j < expression->num_expression && j < 9; j++) io_write_offset_x_pof_add(s, 0, &pof); - for (uint32_t j = expression->expressions_count; j < 9; j++) + for (uint32_t j = expression->num_expression; j < 9; j++) s.write(0x08); } s.align_write(0x10); if (!is_x) - for (uint32_t i = 0; i < ex->blocks_count; i++) { - obj_skin_block* block = &ex->blocks[i]; + for (uint32_t i = 0; i < ex->num_block; i++) { + obj_skin_block* block = &ex->block_array[i]; if (block->type != OBJ_SKIN_BLOCK_CLOTH) continue; - obj_skin_block_cloth* cloth = &block->cloth; + obj_skin_block_cloth* cloth = block->cloth; bhs[i].block_offset = s.get_position(); io_write_offset_f2_pof_add(s, 0, 0x20, &pof); io_write_offset_f2_pof_add(s, 0, 0x20, &pof); s.write(0x10); - if (cloth->nodes_count) + if (cloth->num_node) io_write_offset_f2_pof_add(s, 0, 0x20, &pof); else s.write(0x04); - if (cloth->root_count) { + if (cloth->num_root) { io_write_offset_f2_pof_add(s, 0, 0x20, &pof); io_write_offset_f2_pof_add(s, 0, 0x20, &pof); } else s.write(0x08); - if (cloth->mesh_indices_count) + if (cloth->num_mesh_index) io_write_offset_f2_pof_add(s, 0, 0x20, &pof); else s.write(0x04); - if (cloth->backface_mesh_indices_count) + if (cloth->num_backface_mesh_index) io_write_offset_f2_pof_add(s, 0, 0x20, &pof); else s.write(0x04); @@ -5582,36 +5490,36 @@ static void obj_modern_write_skin(obj* obj, stream& s, s.write(0x08); } else - for (uint32_t i = 0; i < ex->blocks_count; i++) { - obj_skin_block* block = &ex->blocks[i]; + for (uint32_t i = 0; i < ex->num_block; i++) { + obj_skin_block* block = &ex->block_array[i]; if (block->type != OBJ_SKIN_BLOCK_CLOTH) continue; - obj_skin_block_cloth* cloth = &block->cloth; + obj_skin_block_cloth* cloth = block->cloth; bhs[i].block_offset = s.get_position(); io_write_offset_x_pof_add(s, 0, &pof); io_write_offset_x_pof_add(s, 0, &pof); s.write(0x10); - if (cloth->nodes_count) + if (cloth->num_node) io_write_offset_x_pof_add(s, 0, &pof); else s.write(0x08); - if (cloth->root_count) { + if (cloth->num_root) { io_write_offset_x_pof_add(s, 0, &pof); io_write_offset_x_pof_add(s, 0, &pof); } else s.write(0x10); - if (cloth->mesh_indices_count) + if (cloth->num_mesh_index) io_write_offset_x_pof_add(s, 0, &pof); else s.write(0x08); - if (cloth->backface_mesh_indices_count) + if (cloth->num_backface_mesh_index) io_write_offset_x_pof_add(s, 0, &pof); else s.write(0x08); @@ -5621,8 +5529,8 @@ static void obj_modern_write_skin(obj* obj, stream& s, s.align_write(0x10); if (!is_x) - for (uint32_t i = 0; i < ex->blocks_count; i++) { - obj_skin_block* block = &ex->blocks[i]; + for (uint32_t i = 0; i < ex->num_block; i++) { + obj_skin_block* block = &ex->block_array[i]; if (block->type != OBJ_SKIN_BLOCK_CONSTRAINT) continue; @@ -5633,7 +5541,7 @@ static void obj_modern_write_skin(obj* obj, stream& s, io_write_offset_f2_pof_add(s, 0, 0x20, &pof); s.write(0x04); io_write_offset_f2_pof_add(s, 0, 0x20, &pof); - switch (block->constraint.type) { + switch (block->constraint->type) { case OBJ_SKIN_BLOCK_CONSTRAINT_ORIENTATION: s.write(0x0C); break; @@ -5658,8 +5566,8 @@ static void obj_modern_write_skin(obj* obj, stream& s, } } else - for (uint32_t i = 0; i < ex->blocks_count; i++) { - obj_skin_block* block = &ex->blocks[i]; + for (uint32_t i = 0; i < ex->num_block; i++) { + obj_skin_block* block = &ex->block_array[i]; if (block->type != OBJ_SKIN_BLOCK_CONSTRAINT) continue; @@ -5670,7 +5578,7 @@ static void obj_modern_write_skin(obj* obj, stream& s, io_write_offset_x_pof_add(s, 0, &pof); s.write(0x08); io_write_offset_x_pof_add(s, 0, &pof); - switch (block->constraint.type) { + switch (block->constraint->type) { case OBJ_SKIN_BLOCK_CONSTRAINT_ORIENTATION: s.write(0x0C); s.write(0x04); @@ -5699,8 +5607,8 @@ static void obj_modern_write_skin(obj* obj, stream& s, s.align_write(0x10); if (!is_x) - for (uint32_t i = 0; i < ex->blocks_count; i++) { - obj_skin_block* block = &ex->blocks[i]; + for (uint32_t i = 0; i < ex->num_block; i++) { + obj_skin_block* block = &ex->block_array[i]; if (block->type != OBJ_SKIN_BLOCK_MOTION) continue; @@ -5713,8 +5621,8 @@ static void obj_modern_write_skin(obj* obj, stream& s, io_write_offset_f2_pof_add(s, 0, 0x20, &pof); } else - for (uint32_t i = 0; i < ex->blocks_count; i++) { - obj_skin_block* block = &ex->blocks[i]; + for (uint32_t i = 0; i < ex->num_block; i++) { + obj_skin_block* block = &ex->block_array[i]; if (block->type != OBJ_SKIN_BLOCK_MOTION) continue; @@ -5730,101 +5638,101 @@ static void obj_modern_write_skin(obj* obj, stream& s, if (motion_count) { motion_block_node_mats = s.get_position(); - for (uint32_t i = 0; i < ex->blocks_count; i++) { - obj_skin_block* block = &ex->blocks[i]; + for (uint32_t i = 0; i < ex->num_block; i++) { + obj_skin_block* block = &ex->block_array[i]; if (block->type != OBJ_SKIN_BLOCK_MOTION) continue; - obj_skin_block_motion* motion = &block->motion; - s.write(motion->nodes_count * sizeof(mat4)); + obj_skin_block_motion* motion = block->motion; + s.write(motion->num_node * sizeof(mat4)); } s.align_write(0x10); motion_block_node_name_offset = s.get_position(); - for (uint32_t i = 0; i < ex->blocks_count; i++) { - obj_skin_block* block = &ex->blocks[i]; + for (uint32_t i = 0; i < ex->num_block; i++) { + obj_skin_block* block = &ex->block_array[i]; if (block->type != OBJ_SKIN_BLOCK_MOTION) continue; - obj_skin_block_motion* motion = &block->motion; - s.write(motion->nodes_count * sizeof(uint32_t)); + obj_skin_block_motion* motion = block->motion; + s.write(motion->num_node * sizeof(uint32_t)); } s.align_write(0x10); } if (exh.cloth_count) { cloth_mats = s.get_position(); - for (uint32_t i = 0; i < ex->blocks_count; i++) { - obj_skin_block* block = &ex->blocks[i]; + for (uint32_t i = 0; i < ex->num_block; i++) { + obj_skin_block* block = &ex->block_array[i]; if (block->type != OBJ_SKIN_BLOCK_CLOTH) continue; - obj_skin_block_cloth* cloth = &block->cloth; - if (cloth->mats) - s.write(cloth->mats_count * sizeof(mat4)); + obj_skin_block_cloth* cloth = block->cloth; + if (cloth->mat_array) + s.write(cloth->num_mat * sizeof(mat4)); } s.align_write(0x10); cloth_root = s.get_position(); if (!is_x) - for (uint32_t i = 0; i < ex->blocks_count; i++) { - obj_skin_block* block = &ex->blocks[i]; + for (uint32_t i = 0; i < ex->num_block; i++) { + obj_skin_block* block = &ex->block_array[i]; if (block->type != OBJ_SKIN_BLOCK_CLOTH) continue; - obj_skin_block_cloth* cloth = &block->cloth; + obj_skin_block_cloth* cloth = block->cloth; s.write((sizeof(int32_t) + 4 * (sizeof(int32_t) + 3 * sizeof(int32_t))) - * cloth->root_count * (cloth->nodes_count - 1ULL)); + * cloth->num_root * (cloth->num_node - 1ULL)); } else - for (uint32_t i = 0; i < ex->blocks_count; i++) { - obj_skin_block* block = &ex->blocks[i]; + for (uint32_t i = 0; i < ex->num_block; i++) { + obj_skin_block* block = &ex->block_array[i]; if (block->type != OBJ_SKIN_BLOCK_CLOTH) continue; - obj_skin_block_cloth* cloth = &block->cloth; + obj_skin_block_cloth* cloth = block->cloth; s.write((sizeof(int32_t) + 4 * (sizeof(int64_t) + 4 * sizeof(int32_t))) - * cloth->root_count* (cloth->nodes_count - 1ULL)); + * cloth->num_root* (cloth->num_node - 1ULL)); } s.align_write(0x10); cloth_nodes = s.get_position(); - for (uint32_t i = 0; i < ex->blocks_count; i++) { - obj_skin_block* block = &ex->blocks[i]; + for (uint32_t i = 0; i < ex->num_block; i++) { + obj_skin_block* block = &ex->block_array[i]; if (block->type != OBJ_SKIN_BLOCK_CLOTH) continue; - obj_skin_block_cloth* cloth = &block->cloth; - s.write((11 * sizeof(int32_t)) * cloth->root_count * (cloth->nodes_count - 1ULL)); + obj_skin_block_cloth* cloth = block->cloth; + s.write((11 * sizeof(int32_t)) * cloth->num_root * (cloth->num_node - 1ULL)); } s.align_write(0x10); cloth_mesh_indices = s.get_position(); - for (uint32_t i = 0; i < ex->blocks_count; i++) { - obj_skin_block* block = &ex->blocks[i]; + for (uint32_t i = 0; i < ex->num_block; i++) { + obj_skin_block* block = &ex->block_array[i]; if (block->type != OBJ_SKIN_BLOCK_CLOTH) continue; - obj_skin_block_cloth* cloth = &block->cloth; - s.write(sizeof(uint16_t) + cloth->mesh_indices_count * sizeof(uint16_t)); + obj_skin_block_cloth* cloth = block->cloth; + s.write(sizeof(uint16_t) + cloth->num_mesh_index * sizeof(uint16_t)); } s.align_write(0x10); cloth_backface_mesh_indices = s.get_position(); - for (uint32_t i = 0; i < ex->blocks_count; i++) { - obj_skin_block* block = &ex->blocks[i]; + for (uint32_t i = 0; i < ex->num_block; i++) { + obj_skin_block* block = &ex->block_array[i]; if (block->type != OBJ_SKIN_BLOCK_CLOTH) continue; - obj_skin_block_cloth* cloth = &block->cloth; - s.write(sizeof(uint16_t) + cloth->backface_mesh_indices_count * sizeof(uint16_t)); + obj_skin_block_cloth* cloth = block->cloth; + s.write(sizeof(uint16_t) + cloth->num_backface_mesh_index * sizeof(uint16_t)); } s.align_write(0x10); } } } - if (sk->bones || sk->ex_data_init) { + if (sk->bone_array || sk->ex_data) { quicksort_string_hash(strings.data(), strings.size()); string_offsets.reserve(strings.size()); for (string_hash& i : strings) { @@ -5835,8 +5743,8 @@ static void obj_modern_write_skin(obj* obj, stream& s, s.align_write(0x10); std::vector osage_names; - if (sk->ex_data_init) { - obj_skin_ex_data* ex = &sk->ex_data; + if (sk->ex_data) { + obj_skin_ex_data* ex = sk->ex_data; int64_t cls_offset = obj_skin_strings_get_string_offset(strings, string_offsets, "CLS"); int64_t cns_offset = obj_skin_strings_get_string_offset(strings, string_offsets, "CNS"); @@ -5844,14 +5752,14 @@ static void obj_modern_write_skin(obj* obj, stream& s, int64_t mot_offset = obj_skin_strings_get_string_offset(strings, string_offsets, "MOT"); int64_t osg_offset = obj_skin_strings_get_string_offset(strings, string_offsets, "OSG"); - if (ex->blocks_count > 0) { - for (uint32_t i = 0; i < ex->blocks_count; i++) { - obj_skin_block* block = &ex->blocks[i]; + if (ex->num_block > 0) { + for (uint32_t i = 0; i < ex->num_block; i++) { + obj_skin_block* block = &ex->block_array[i]; if (block->type != OBJ_SKIN_BLOCK_CLOTH) continue; s.position_push(bhs[i].block_offset, SEEK_SET); - obj_modern_write_skin_block_cloth(&block->cloth, + obj_modern_write_skin_block_cloth(block->cloth, s, strings, string_offsets, is_x, &cloth_mats, &cloth_root, &cloth_nodes, &cloth_mesh_indices, &cloth_backface_mesh_indices); s.position_pop(); @@ -5867,69 +5775,69 @@ static void obj_modern_write_skin(obj* obj, stream& s, constraint_type_name_offsets[3] = obj_skin_strings_get_string_offset(strings, string_offsets, "Distance"); - char** bone_names_ptr = ex->bone_names; - for (uint32_t i = 0; i < ex->blocks_count; i++) { - obj_skin_block* block = &ex->blocks[i]; + const char** bone_name_array = ex->bone_name_array; + for (uint32_t i = 0; i < ex->num_block; i++) { + obj_skin_block* block = &ex->block_array[i]; if (block->type != OBJ_SKIN_BLOCK_CONSTRAINT) continue; s.position_push(bhs[i].block_offset, SEEK_SET); - obj_modern_write_skin_block_constraint(&block->constraint, - s, strings, string_offsets, bone_names_ptr, is_x, constraint_type_name_offsets); + obj_modern_write_skin_block_constraint(block->constraint, + s, strings, string_offsets, bone_name_array, is_x, constraint_type_name_offsets); s.position_pop(); } - for (uint32_t i = 0; i < ex->blocks_count; i++) { - obj_skin_block* block = &ex->blocks[i]; + for (uint32_t i = 0; i < ex->num_block; i++) { + obj_skin_block* block = &ex->block_array[i]; if (block->type != OBJ_SKIN_BLOCK_EXPRESSION) continue; s.position_push(bhs[i].block_offset, SEEK_SET); - obj_modern_write_skin_block_expression(&block->expression, - s, strings, string_offsets, bone_names_ptr, is_x); + obj_modern_write_skin_block_expression(block->expression, + s, strings, string_offsets, bone_name_array, is_x); s.position_pop(); } - for (uint32_t i = 0; i < ex->blocks_count; i++) { - obj_skin_block* block = &ex->blocks[i]; + for (uint32_t i = 0; i < ex->num_block; i++) { + obj_skin_block* block = &ex->block_array[i]; if (block->type != OBJ_SKIN_BLOCK_MOTION) continue; s.position_push(bhs[i].block_offset, SEEK_SET); - obj_modern_write_skin_block_motion(&block->motion, - s, strings, string_offsets, is_x, bone_names_ptr, + obj_modern_write_skin_block_motion(block->motion, + s, strings, string_offsets, is_x, bone_name_array, &motion_block_node_name_offset, &motion_block_node_mats); s.position_pop(); } - for (uint32_t i = 0; i < ex->blocks_count; i++) { - obj_skin_block* block = &ex->blocks[i]; + for (uint32_t i = 0; i < ex->num_block; i++) { + obj_skin_block* block = &ex->block_array[i]; if (block->type != OBJ_SKIN_BLOCK_OSAGE) continue; s.position_push(bhs[i].block_offset, SEEK_SET); - obj_modern_write_skin_block_osage(&block->osage, + obj_modern_write_skin_block_osage(block->osage, s, strings, string_offsets, is_x); s.position_pop(); } - for (uint32_t i = 0; i < ex->blocks_count; i++) { - obj_skin_block* block = &ex->blocks[i]; + for (uint32_t i = 0; i < ex->num_block; i++) { + obj_skin_block* block = &ex->block_array[i]; if (block->type == OBJ_SKIN_BLOCK_CLOTH) { - obj_skin_block_cloth* cloth = &block->cloth; + obj_skin_block_cloth* cloth = block->cloth; obj_skin_strings_push_back_check(osage_names, cloth->mesh_name); } else if (block->type == OBJ_SKIN_BLOCK_OSAGE) { - obj_skin_block_osage* osage = &block->osage; + obj_skin_block_osage* osage = block->osage; obj_skin_strings_push_back_check_by_index(osage_names, - bone_names_ptr, osage->external_name_index); + bone_name_array, osage->external_name_index); } } - s.position_push(exh.blocks_offset, SEEK_SET); + s.position_push(exh.block_array_offset, SEEK_SET); if (!is_x) { - for (uint32_t i = 0; i < ex->blocks_count; i++) { - obj_skin_block* block = &ex->blocks[i]; + for (uint32_t i = 0; i < ex->num_block; i++) { + obj_skin_block* block = &ex->block_array[i]; switch (block->type) { case OBJ_SKIN_BLOCK_CLOTH: s.write_offset_f2(cls_offset, 0x20); @@ -5961,8 +5869,8 @@ static void obj_modern_write_skin(obj* obj, stream& s, s.write_offset_f2(0, 0); } else { - for (uint32_t i = 0; i < ex->blocks_count; i++) { - obj_skin_block* block = &ex->blocks[i]; + for (uint32_t i = 0; i < ex->num_block; i++) { + obj_skin_block* block = &ex->block_array[i]; switch (block->type) { case OBJ_SKIN_BLOCK_CLOTH: s.write_offset_x(cls_offset); @@ -5998,28 +5906,28 @@ static void obj_modern_write_skin(obj* obj, stream& s, } } - if (sk->bones) { - s.position_push(sh.bone_names_offset, SEEK_SET); + if (sk->bone_array) { + s.position_push(sh.bone_name_array_offset, SEEK_SET); if (!is_x) - for (uint32_t i = 0; i < sk->bones_count; i++) { + for (uint32_t i = 0; i < sk->num_bone; i++) { size_t str_offset = obj_skin_strings_get_string_offset(strings, - string_offsets, sk->bones[i].name); + string_offsets, sk->bone_array[i].name); s.write_offset_f2(str_offset, 0x20); } else - for (uint32_t i = 0; i < sk->bones_count; i++) { + for (uint32_t i = 0; i < sk->num_bone; i++) { size_t str_offset = obj_skin_strings_get_string_offset(strings, - string_offsets, sk->bones[i].name); + string_offsets, sk->bone_array[i].name); s.write_offset_x(str_offset); } s.position_pop(); } - if (sk->ex_data_init) { - obj_skin_ex_data* ex = &sk->ex_data; + if (sk->ex_data) { + obj_skin_ex_data* ex = sk->ex_data; - if (ex->blocks_count > 0) { - s.position_push(exh.bone_names_offset, SEEK_SET); + if (ex->num_block > 0) { + s.position_push(exh.bone_name_array_offset, SEEK_SET); if (!is_x) for (string_hash& i : bone_names) { size_t str_offset = obj_skin_strings_get_string_offset(strings, @@ -6034,18 +5942,18 @@ static void obj_modern_write_skin(obj* obj, stream& s, } s.position_pop(); - s.position_push(exh.osage_nodes_offset, SEEK_SET); - for (uint32_t i = 0; i < ex->osage_nodes_count; i++) { - obj_skin_osage_node* osage_node = &ex->osage_nodes[i]; + s.position_push(exh.osage_node_array_offset, SEEK_SET); + for (uint32_t i = 0; i < ex->num_osage_node; i++) { + obj_skin_osage_node* osage_node = &ex->osage_node_array[i]; s.write_uint32_t_reverse_endianness(osage_node->name_index); s.write_float_t_reverse_endianness(osage_node->length); s.write_uint32_t_reverse_endianness(0); } s.position_pop(); - s.position_push(exh.osage_sibling_infos_offset, SEEK_SET); - for (uint32_t i = 0; i < ex->osage_sibling_infos_count; i++) { - obj_skin_osage_sibling_info* osage_sibling_info = &ex->osage_sibling_infos[i]; + s.position_push(exh.osage_sibling_info_array_offset, SEEK_SET); + for (uint32_t i = 0; i < ex->num_osage_sibling_info; i++) { + obj_skin_osage_sibling_info* osage_sibling_info = &ex->osage_sibling_info_array[i]; s.write_uint32_t_reverse_endianness(osage_sibling_info->name_index); s.write_uint32_t_reverse_endianness(osage_sibling_info->sibling_name_index); s.write_float_t_reverse_endianness(osage_sibling_info->max_distance); @@ -6055,9 +5963,9 @@ static void obj_modern_write_skin(obj* obj, stream& s, s.write_int32_t(0); s.position_pop(); - exh.osage_count = (int32_t)osage_names.size(); - exh.osage_count -= exh.cloth_count; - s.position_push(exh.osage_names_offset, SEEK_SET); + exh.num_osage = (int32_t)osage_names.size(); + exh.num_osage -= exh.cloth_count; + s.position_push(exh.osage_name_array_offset, SEEK_SET); if (!is_x) for (string_hash& i : osage_names) { size_t str_offset = obj_skin_strings_get_string_offset(strings, @@ -6075,15 +5983,15 @@ static void obj_modern_write_skin(obj* obj, stream& s, s.position_push(sh.ex_data_offset, SEEK_SET); if (!is_x) { - s.write_int32_t_reverse_endianness(exh.osage_count); - s.write_int32_t_reverse_endianness(ex->osage_nodes_count); + s.write_int32_t_reverse_endianness(exh.num_osage); + s.write_int32_t_reverse_endianness(ex->num_osage_node); s.write(0x04); - s.write_offset_f2(exh.osage_nodes_offset, 0x20); - s.write_offset_f2(exh.osage_names_offset, 0x20); - s.write_offset_f2(exh.blocks_offset, 0x20); - s.write_int32_t_reverse_endianness(exh.bone_names_count); - s.write_offset_f2(exh.bone_names_offset, 0x20); - s.write_offset_f2(exh.osage_sibling_infos_offset, 0x20); + s.write_offset_f2(exh.osage_node_array_offset, 0x20); + s.write_offset_f2(exh.osage_name_array_offset, 0x20); + s.write_offset_f2(exh.block_array_offset, 0x20); + s.write_int32_t_reverse_endianness(exh.num_bone_name); + s.write_offset_f2(exh.bone_name_array_offset, 0x20); + s.write_offset_f2(exh.osage_sibling_info_array_offset, 0x20); s.write_int32_t_reverse_endianness(exh.cloth_count); s.write_offset_f2(ex->reserved[0], 0x20); s.write_offset_f2(ex->reserved[1], 0x20); @@ -6094,15 +6002,15 @@ static void obj_modern_write_skin(obj* obj, stream& s, s.write_offset_f2(ex->reserved[6], 0x20); } else { - s.write_int32_t_reverse_endianness(exh.osage_count); - s.write_int32_t_reverse_endianness(ex->osage_nodes_count); + s.write_int32_t_reverse_endianness(exh.num_osage); + s.write_int32_t_reverse_endianness(ex->num_osage_node); s.write(0x08); - s.write_offset_x(exh.osage_nodes_offset); - s.write_offset_x(exh.osage_names_offset); - s.write_offset_x(exh.blocks_offset); - s.write_int32_t_reverse_endianness(exh.bone_names_count); - s.write_offset_x(exh.bone_names_offset); - s.write_offset_x(exh.osage_sibling_infos_offset); + s.write_offset_x(exh.osage_node_array_offset); + s.write_offset_x(exh.osage_name_array_offset); + s.write_offset_x(exh.block_array_offset); + s.write_int32_t_reverse_endianness(exh.num_bone_name); + s.write_offset_x(exh.bone_name_array_offset); + s.write_offset_x(exh.osage_sibling_info_array_offset); s.write_int32_t_reverse_endianness(exh.cloth_count); s.write_offset_x(ex->reserved[0]); s.write_offset_x(ex->reserved[1]); @@ -6117,21 +6025,21 @@ static void obj_modern_write_skin(obj* obj, stream& s, s.position_push(base_offset, SEEK_SET); if (!is_x) { - s.write_offset_f2(sh.bone_ids_offset, 0x20); - s.write_offset_f2(sh.bone_matrices_offset, 0x20); - s.write_offset_f2(sh.bone_names_offset, 0x20); + s.write_offset_f2(sh.bone_id_array_offset, 0x20); + s.write_offset_f2(sh.bone_matrix_array_offset, 0x20); + s.write_offset_f2(sh.bone_name_array_offset, 0x20); s.write_offset_f2(sh.ex_data_offset, 0x20); - s.write_int32_t_reverse_endianness(sk->bones_count); - s.write_offset_f2(sh.bone_parent_ids_offset, 0x20); + s.write_int32_t_reverse_endianness(sk->num_bone); + s.write_offset_f2(sh.bone_parent_id_array_offset, 0x20); s.write(0x0C); } else { - s.write_offset_x(sh.bone_ids_offset); - s.write_offset_x(sh.bone_matrices_offset); - s.write_offset_x(sh.bone_names_offset); + s.write_offset_x(sh.bone_id_array_offset); + s.write_offset_x(sh.bone_matrix_array_offset); + s.write_offset_x(sh.bone_name_array_offset); s.write_offset_x(sh.ex_data_offset); - s.write_int32_t_reverse_endianness(sk->bones_count); - s.write_offset_x(sh.bone_parent_ids_offset); + s.write_int32_t_reverse_endianness(sk->num_bone); + s.write_offset_x(sh.bone_parent_id_array_offset); s.write(0x18); } s.position_pop(); @@ -6140,36 +6048,218 @@ static void obj_modern_write_skin(obj* obj, stream& s, oskn->pof = pof; } -static void obj_modern_read_skin_block_cloth(obj_skin_block_cloth* b, - stream& s, uint32_t header_length, char** str, bool is_x) { +static obj_skin_ex_data* obj_modern_read_skin_ex_data(prj::shared_ptr alloc, + stream& s, int64_t base_offset, uint32_t header_length, bool is_x) { + obj_skin_ex_data* ex = alloc->allocate(); + s.set_position(base_offset, SEEK_SET); + + obj_skin_ex_data_header exh = {}; + if (!is_x) { + exh.num_osage = s.read_int32_t_reverse_endianness(); + ex->num_osage_node = s.read_int32_t_reverse_endianness(); + s.read(0, 0x04); + exh.osage_node_array_offset = s.read_offset_f2(header_length); + exh.osage_name_array_offset = s.read_offset_f2(header_length); + exh.block_array_offset = s.read_offset_f2(header_length); + exh.num_bone_name = s.read_int32_t_reverse_endianness(); + exh.bone_name_array_offset = s.read_offset_f2(header_length); + exh.osage_sibling_info_array_offset = s.read_offset_f2(header_length); + exh.cloth_count = s.read_int32_t_reverse_endianness(); + ex->reserved[0] = s.read_offset_f2(header_length); + ex->reserved[1] = s.read_offset_f2(header_length); + ex->reserved[2] = s.read_offset_f2(header_length); + ex->reserved[3] = s.read_offset_f2(header_length); + ex->reserved[4] = s.read_offset_f2(header_length); + ex->reserved[5] = s.read_offset_f2(header_length); + ex->reserved[6] = s.read_offset_f2(header_length); + } + else { + exh.num_osage = s.read_int32_t_reverse_endianness(); + ex->num_osage_node = s.read_int32_t_reverse_endianness(); + s.read(0, 0x08); + exh.osage_node_array_offset = s.read_offset_x(); + exh.osage_name_array_offset = s.read_offset_x(); + exh.block_array_offset = s.read_offset_x(); + exh.num_bone_name = s.read_int32_t_reverse_endianness(); + exh.bone_name_array_offset = s.read_offset_x(); + exh.osage_sibling_info_array_offset = s.read_offset_x(); + exh.cloth_count = s.read_int32_t_reverse_endianness(); + ex->reserved[0] = s.read_offset_x(); + ex->reserved[1] = s.read_offset_x(); + ex->reserved[2] = s.read_offset_x(); + ex->reserved[3] = s.read_offset_x(); + ex->reserved[4] = s.read_offset_x(); + ex->reserved[5] = s.read_offset_x(); + ex->reserved[6] = s.read_offset_x(); + } + + ex->bone_name_array = 0; + ex->num_bone_name = 0; + if (!exh.bone_name_array_offset) { + return ex; + } + + uint32_t num_bone_name = exh.num_bone_name; + + const char** bone_name_array = alloc->allocate(num_bone_name); + ex->bone_name_array = bone_name_array; + ex->num_bone_name = num_bone_name; + + s.set_position(exh.bone_name_array_offset, SEEK_SET); + if (!is_x) + for (uint32_t i = 0; i < num_bone_name; i++) { + int64_t string_offset = s.read_offset_f2(header_length); + if (string_offset) + bone_name_array[i] = obj_read_utf8_string_null_terminated_offset(alloc, s, string_offset); + else + bone_name_array[i] = 0; + } + else + for (uint32_t i = 0; i < num_bone_name; i++) { + int64_t string_offset = s.read_offset_x(); + if (string_offset) + bone_name_array[i] = obj_read_utf8_string_null_terminated_offset(alloc, s, string_offset); + else + bone_name_array[i] = 0; + } + + if (exh.osage_node_array_offset) { + ex->osage_node_array = alloc->allocate(ex->num_osage_node); + + s.set_position(exh.osage_node_array_offset, SEEK_SET); + for (uint32_t i = 0; i < ex->num_osage_node; i++) { + obj_skin_osage_node* osage_node = &ex->osage_node_array[i]; + + osage_node->name_index = s.read_uint32_t_reverse_endianness(); + osage_node->length = s.read_float_t_reverse_endianness(); + s.read(0, 0x04); + } + } + + if (exh.block_array_offset) { + ex->num_block = 0; + s.set_position(exh.block_array_offset, SEEK_SET); + if (!is_x) + while (s.read_int32_t()) { + s.read(0, 0x04); + ex->num_block++; + } + else + while (s.read_int64_t()) { + s.read(0, 0x08); + ex->num_block++; + } + + obj_skin_block_header* bhs = force_malloc_s(obj_skin_block_header, ex->num_block); + s.set_position(exh.block_array_offset, SEEK_SET); + if (!is_x) + for (uint32_t i = 0; i < ex->num_block; i++) { + bhs[i].block_signature_offset = s.read_offset_f2(header_length); + bhs[i].block_offset = s.read_offset_f2(header_length); + } + else + for (uint32_t i = 0; i < ex->num_block; i++) { + bhs[i].block_signature_offset = s.read_offset_x(); + bhs[i].block_offset = s.read_offset_x(); + } + + ex->block_array = alloc->allocate(ex->num_block); + for (uint32_t i = 0; i < ex->num_block; i++) { + obj_skin_block* block = &ex->block_array[i]; + + std::string block_signature = s.read_string_null_terminated_offset( + bhs[i].block_signature_offset); + if (block_signature.size() != 3) + continue; + + uint32_t signature = load_reverse_endianness_uint32_t(block_signature.c_str()); + switch (signature) { + case 'CLS\0': + block->type = OBJ_SKIN_BLOCK_CLOTH; + s.set_position(bhs[i].block_offset, SEEK_SET); + block->cloth = obj_modern_read_skin_block_cloth( + alloc, s, header_length, bone_name_array, is_x); + break; + case 'CNS\0': + block->type = OBJ_SKIN_BLOCK_CONSTRAINT; + s.set_position(bhs[i].block_offset, SEEK_SET); + block->constraint = obj_modern_read_skin_block_constraint( + alloc, s, header_length, bone_name_array, is_x); + break; + case 'EXP\0': + block->type = OBJ_SKIN_BLOCK_EXPRESSION; + s.set_position(bhs[i].block_offset, SEEK_SET); + block->expression = obj_modern_read_skin_block_expression( + alloc, s, header_length, bone_name_array, is_x); + break; + case 'MOT\0': + block->type = OBJ_SKIN_BLOCK_MOTION; + s.set_position(bhs[i].block_offset, SEEK_SET); + block->motion = obj_modern_read_skin_block_motion( + alloc, s, header_length, bone_name_array, is_x); + break; + case 'OSG\0': + block->type = OBJ_SKIN_BLOCK_OSAGE; + s.set_position(bhs[i].block_offset, SEEK_SET); + block->osage = obj_modern_read_skin_block_osage( + alloc, s, header_length, bone_name_array, is_x); + break; + default: + break; + } + } + free_def(bhs); + } + + if (exh.osage_sibling_info_array_offset) { + ex->num_osage_sibling_info = 0; + s.set_position(exh.osage_sibling_info_array_offset, SEEK_SET); + while (s.read_uint32_t()) { + s.read(0, 0x08); + ex->num_osage_sibling_info++; + } + + obj_skin_osage_sibling_info* osi = alloc->allocate< + obj_skin_osage_sibling_info>(ex->num_osage_sibling_info); + ex->osage_sibling_info_array = osi; + s.set_position(exh.block_array_offset, SEEK_SET); + for (uint32_t i = 0; i < ex->num_osage_sibling_info; i++, osi++) { + osi->name_index = s.read_uint32_t_reverse_endianness(); + osi->sibling_name_index = s.read_uint32_t_reverse_endianness(); + osi->max_distance = s.read_float_t_reverse_endianness(); + } + + s.set_position(exh.osage_sibling_info_array_offset, SEEK_SET); + } + return ex; +} + +static obj_skin_block_cloth* obj_modern_read_skin_block_cloth( + prj::shared_ptr alloc, stream& s, uint32_t header_length, const char** str, bool is_x) { + obj_skin_block_cloth* cls = alloc->allocate(); int64_t mesh_name_offset = s.read_offset(header_length, is_x); - b->mesh_name = s.read_utf8_string_null_terminated_offset(mesh_name_offset); - int64_t backface_mesh_name_offset = s.read_offset(header_length, is_x); - b->backface_mesh_name = s.read_utf8_string_null_terminated_offset(backface_mesh_name_offset); - - b->field_8 = s.read_int32_t_reverse_endianness(); - b->root_count = s.read_int32_t_reverse_endianness(); - b->nodes_count = s.read_int32_t_reverse_endianness(); - b->field_14 = s.read_int32_t_reverse_endianness(); - int64_t mats_offset = s.read_offset(header_length, is_x); - int64_t root_offset = s.read_offset(header_length, is_x); - - b->root = 0; - b->nodes = 0; - b->mesh_indices = 0; - b->backface_mesh_indices = 0; - int64_t nodes_offset = s.read_offset(header_length, is_x); - int64_t mesh_indices_offset = s.read_offset(header_length, is_x); - int64_t backface_mesh_indices_offset = s.read_offset(header_length, is_x); + cls->field_8 = s.read_int32_t_reverse_endianness(); + cls->num_root = s.read_int32_t_reverse_endianness(); + cls->num_node = s.read_int32_t_reverse_endianness(); + cls->field_14 = s.read_int32_t_reverse_endianness(); + int64_t mat_array_offset = s.read_offset(header_length, is_x); + int64_t root_array_offset = s.read_offset(header_length, is_x); + int64_t node_array_offset = s.read_offset(header_length, is_x); + int64_t mesh_index_array_offset = s.read_offset(header_length, is_x); + int64_t backface_mesh_index_array_offset = s.read_offset(header_length, is_x); int64_t skp_root_offset = s.read_uint32_t_reverse_endianness(); - b->reserved = s.read_uint32_t_reverse_endianness(); + cls->reserved = s.read_uint32_t_reverse_endianness(); - if (mats_offset) { + cls->mesh_name = obj_read_utf8_string_null_terminated_offset(alloc, s, mesh_name_offset); + cls->backface_mesh_name = obj_read_utf8_string_null_terminated_offset(alloc, s, backface_mesh_name_offset); + + if (mat_array_offset) { int32_t max_matrix_index = -1; - s.position_push(root_offset, SEEK_SET); - for (uint32_t i = 0; i < b->root_count; i++) { + s.position_push(root_array_offset, SEEK_SET); + uint32_t num_root = cls->num_root; + for (uint32_t i = 0; i < num_root; i++) { s.read(0x28); for (uint32_t j = 0; j < 4; j++) { uint32_t name_offset = s.read_uint32_t(); @@ -6180,11 +6270,12 @@ static void obj_modern_read_skin_block_cloth(obj_skin_block_cloth* b, } s.position_pop(); - b->mats_count = max_matrix_index > -1 ? max_matrix_index + 1 : 0; - b->mats = force_malloc_s(mat4, b->mats_count); - s.position_push(mats_offset, SEEK_SET); - for (uint32_t i = 0; i < b->mats_count; i++) { - mat4& mat = b->mats[i]; + uint32_t num_mat = max_matrix_index > -1 ? max_matrix_index + 1 : 0; + cls->num_mat = num_mat; + cls->mat_array = alloc->allocate(num_mat); + s.position_push(mat_array_offset, SEEK_SET); + for (uint32_t i = 0; i < num_mat; i++) { + mat4& mat = cls->mat_array[i]; mat.row0.x = s.read_float_t_reverse_endianness(); mat.row1.x = s.read_float_t_reverse_endianness(); mat.row2.x = s.read_float_t_reverse_endianness(); @@ -6205,11 +6296,12 @@ static void obj_modern_read_skin_block_cloth(obj_skin_block_cloth* b, s.position_pop(); } - if (root_offset) { - s.position_push(root_offset, SEEK_SET); - b->root = force_malloc_s(obj_skin_block_cloth_root, b->root_count); - for (uint32_t i = 0; i < b->root_count; i++) { - obj_skin_block_cloth_root* f = &b->root[i]; + if (root_array_offset) { + s.position_push(root_array_offset, SEEK_SET); + uint32_t num_root = cls->num_root; + cls->root_array = alloc->allocate(num_root); + for (uint32_t i = 0; i < num_root; i++) { + obj_skin_block_cloth_root* f = &cls->root_array[i]; f->trans.x = s.read_float_t_reverse_endianness(); f->trans.y = s.read_float_t_reverse_endianness(); f->trans.z = s.read_float_t_reverse_endianness(); @@ -6223,18 +6315,20 @@ static void obj_modern_read_skin_block_cloth(obj_skin_block_cloth* b, for (uint32_t j = 0; j < 4; j++) obj_modern_read_skin_block_cloth_root_bone_weight(&f->bone_weights[j], - s, header_length, str, is_x); + alloc, s, header_length, str, is_x); } s.position_pop(); } - if (nodes_offset) { - s.position_push(nodes_offset, SEEK_SET); - b->nodes = force_malloc_s(obj_skin_block_cloth_node, - b->root_count * (b->nodes_count - 1ULL)); - for (uint32_t i = 0; i < b->nodes_count - 1; i++) - for (uint32_t j = 0; j < b->root_count; j++) { - obj_skin_block_cloth_node* f = &b->nodes[i * b->root_count + j]; + if (node_array_offset) { + s.position_push(node_array_offset, SEEK_SET); + uint32_t num_root = cls->num_root; + uint32_t num_node = cls->num_node; + cls->node_array = alloc->allocate( + num_root * (cls->num_node - 1ULL)); + for (uint32_t i = 0; i < num_node - 1; i++) + for (uint32_t j = 0; j < num_root; j++) { + obj_skin_block_cloth_node* f = &cls->node_array[(size_t)i * num_root + j]; f->flags = s.read_uint32_t_reverse_endianness(); f->trans.x = s.read_float_t_reverse_endianness(); f->trans.y = s.read_float_t_reverse_endianness(); @@ -6250,78 +6344,79 @@ static void obj_modern_read_skin_block_cloth(obj_skin_block_cloth* b, s.position_pop(); } - if (mesh_indices_offset) { - s.position_push(mesh_indices_offset, SEEK_SET); - b->mesh_indices_count = s.read_uint16_t_reverse_endianness(); - b->mesh_indices = force_malloc_s(uint16_t, b->mesh_indices_count); - s.read(b->mesh_indices, b->mesh_indices_count * sizeof(uint16_t)); + if (mesh_index_array_offset) { + s.position_push(mesh_index_array_offset, SEEK_SET); + cls->num_mesh_index = s.read_uint16_t_reverse_endianness(); + cls->mesh_index_array = alloc->allocate(cls->num_mesh_index); + s.read(cls->mesh_index_array, cls->num_mesh_index * sizeof(uint16_t)); if (s.big_endian) { - uint16_t* mesh_indices = b->mesh_indices; - for (int32_t i = 0; i < b->mesh_indices_count; i++) - mesh_indices[i] = reverse_endianness_uint16_t(mesh_indices[i]); + uint16_t* mesh_index_array = cls->mesh_index_array; + for (int32_t i = cls->num_mesh_index; i > 0; i--, mesh_index_array++) + *mesh_index_array = reverse_endianness_uint16_t(*mesh_index_array); } s.position_pop(); } - if (backface_mesh_indices_offset) { - s.position_push(backface_mesh_indices_offset, SEEK_SET); - b->backface_mesh_indices_count = s.read_uint16_t_reverse_endianness(); - b->backface_mesh_indices = force_malloc_s(uint16_t, b->backface_mesh_indices_count); - s.read(b->backface_mesh_indices, b->backface_mesh_indices_count * sizeof(uint16_t)); + if (backface_mesh_index_array_offset) { + s.position_push(backface_mesh_index_array_offset, SEEK_SET); + cls->num_backface_mesh_index = s.read_uint16_t_reverse_endianness(); + cls->backface_mesh_index_array = alloc->allocate(cls->num_backface_mesh_index); + s.read(cls->backface_mesh_index_array, cls->num_backface_mesh_index * sizeof(uint16_t)); if (s.big_endian) { - uint16_t* backface_mesh_indices = b->backface_mesh_indices; - for (int32_t i = 0; i < b->backface_mesh_indices_count; i++) - backface_mesh_indices[i] = reverse_endianness_uint16_t(backface_mesh_indices[i]); + uint16_t* backface_mesh_index_array = cls->backface_mesh_index_array; + for (int32_t i = cls->num_mesh_index; i > 0; i--, backface_mesh_index_array++) + *backface_mesh_index_array = reverse_endianness_uint16_t(*backface_mesh_index_array); } s.position_pop(); } - + return cls; } -static void obj_modern_write_skin_block_cloth(obj_skin_block_cloth* b, +static void obj_modern_write_skin_block_cloth(obj_skin_block_cloth* cls, stream& s, std::vector& strings, std::vector& string_offsets, bool is_x, - int64_t* mats_offset, int64_t* root_offset, int64_t* nodes_offset, - int64_t* mesh_indices_offset, int64_t* backface_mesh_indices_offset) { + int64_t* mat_array_offset, int64_t* root_array_offset, int64_t* node_array_offset, + int64_t* mesh_index_array_offset, int64_t* backface_mesh_index_array_offset) { int64_t mesh_name_offset = obj_skin_strings_get_string_offset(strings, - string_offsets, b->mesh_name); + string_offsets, cls->mesh_name); int64_t backface_mesh_name_offset = obj_skin_strings_get_string_offset(strings, - string_offsets, b->backface_mesh_name); + string_offsets, cls->backface_mesh_name); if (!is_x) { s.write_offset_f2(mesh_name_offset, 0x20); s.write_offset_f2(backface_mesh_name_offset, 0x20); - s.write_int32_t_reverse_endianness(b->field_8); - s.write_int32_t_reverse_endianness(b->root_count); - s.write_int32_t_reverse_endianness(b->nodes_count); - s.write_int32_t_reverse_endianness(b->field_14); - s.write_offset_f2(b->nodes_count ? *mats_offset : 0, 0x20); - s.write_offset_f2(b->root ? *root_offset : 0, 0x20); - s.write_offset_f2(b->nodes ? *nodes_offset : 0, 0x20); - s.write_offset_f2(b->mesh_indices ? *mesh_indices_offset : 0, 0x20); - s.write_offset_f2(b->backface_mesh_indices ? *backface_mesh_indices_offset : 0, 0x20); + s.write_int32_t_reverse_endianness(cls->field_8); + s.write_int32_t_reverse_endianness(cls->num_root); + s.write_int32_t_reverse_endianness(cls->num_node); + s.write_int32_t_reverse_endianness(cls->field_14); + s.write_offset_f2(cls->num_node ? *mat_array_offset : 0, 0x20); + s.write_offset_f2(cls->root_array ? *root_array_offset : 0, 0x20); + s.write_offset_f2(cls->node_array ? *node_array_offset : 0, 0x20); + s.write_offset_f2(cls->mesh_index_array ? *mesh_index_array_offset : 0, 0x20); + s.write_offset_f2(cls->backface_mesh_index_array ? *backface_mesh_index_array_offset : 0, 0x20); s.write_uint32_t_reverse_endianness(0); - s.write_uint32_t_reverse_endianness(b->reserved); + s.write_uint32_t_reverse_endianness(cls->reserved); } else { s.write_offset_x(mesh_name_offset); s.write_offset_x(backface_mesh_name_offset); - s.write_int32_t_reverse_endianness(b->field_8); - s.write_int32_t_reverse_endianness(b->root_count); - s.write_int32_t_reverse_endianness(b->nodes_count); - s.write_int32_t_reverse_endianness(b->field_14); - s.write_offset_x(b->nodes_count ? *mats_offset : 0); - s.write_offset_x(b->root ? *root_offset : 0); - s.write_offset_x(b->nodes ? *nodes_offset : 0); - s.write_offset_x(b->mesh_indices ? *mesh_indices_offset : 0); - s.write_offset_x(b->backface_mesh_indices ? *backface_mesh_indices_offset : 0); + s.write_int32_t_reverse_endianness(cls->field_8); + s.write_int32_t_reverse_endianness(cls->num_root); + s.write_int32_t_reverse_endianness(cls->num_node); + s.write_int32_t_reverse_endianness(cls->field_14); + s.write_offset_x(cls->num_node ? *mat_array_offset : 0); + s.write_offset_x(cls->root_array ? *root_array_offset : 0); + s.write_offset_x(cls->node_array ? *node_array_offset : 0); + s.write_offset_x(cls->mesh_index_array ? *mesh_index_array_offset : 0); + s.write_offset_x(cls->backface_mesh_index_array ? *backface_mesh_index_array_offset : 0); s.write_uint32_t_reverse_endianness(0); - s.write_uint32_t_reverse_endianness(b->reserved); + s.write_uint32_t_reverse_endianness(cls->reserved); } - if (b->mats) { - s.position_push(*mats_offset, SEEK_SET); - for (uint32_t i = 0; i < b->mats_count; i++) { - mat4& mat = b->mats[i]; + if (cls->mat_array) { + s.position_push(*mat_array_offset, SEEK_SET); + uint32_t num_mat = cls->num_mat; + for (uint32_t i = 0; i < num_mat; i++) { + mat4& mat = cls->mat_array[i]; s.write_float_t_reverse_endianness(mat.row0.x); s.write_float_t_reverse_endianness(mat.row1.x); s.write_float_t_reverse_endianness(mat.row2.x); @@ -6338,15 +6433,16 @@ static void obj_modern_write_skin_block_cloth(obj_skin_block_cloth* b, s.write_float_t_reverse_endianness(mat.row1.w); s.write_float_t_reverse_endianness(mat.row2.w); s.write_float_t_reverse_endianness(mat.row3.w); - *mats_offset += sizeof(mat4); + *mat_array_offset += sizeof(mat4); } s.position_pop(); } - if (b->root) { - s.position_push(*root_offset, SEEK_SET); - for (uint32_t i = 0; i < b->root_count; i++) { - obj_skin_block_cloth_root* f = &b->root[i]; + if (cls->root_array) { + s.position_push(*root_array_offset, SEEK_SET); + uint32_t num_root = cls->num_root; + for (uint32_t i = 0; i < num_root; i++) { + obj_skin_block_cloth_root* f = &cls->root_array[i]; s.write_float_t_reverse_endianness(f->trans.x); s.write_float_t_reverse_endianness(f->trans.y); s.write_float_t_reverse_endianness(f->trans.z); @@ -6364,18 +6460,20 @@ static void obj_modern_write_skin_block_cloth(obj_skin_block_cloth* b, } s.position_pop(); if (!is_x) - *root_offset += (sizeof(int32_t) + 4 * (sizeof(int64_t) + 4 * sizeof(int32_t))) - * b->root_count * (b->nodes_count - 1ULL); + *root_array_offset += (sizeof(int32_t) + 4 * (sizeof(int64_t) + 4 * sizeof(int32_t))) + * cls->num_root * (cls->num_node - 1ULL); else - *root_offset += (sizeof(int32_t) + 4 * (sizeof(int32_t) + 3 * sizeof(int32_t))) - * b->root_count * (b->nodes_count - 1ULL); + *root_array_offset += (sizeof(int32_t) + 4 * (sizeof(int32_t) + 3 * sizeof(int32_t))) + * cls->num_root * (cls->num_node - 1ULL); } - if (b->nodes) { - s.position_push(*nodes_offset, SEEK_SET); - for (uint32_t i = 0; i < b->nodes_count - 1; i++) - for (uint32_t j = 0; j < b->root_count; j++) { - obj_skin_block_cloth_node* f = &b->nodes[i * b->root_count + j]; + if (cls->node_array) { + s.position_push(*node_array_offset, SEEK_SET); + uint32_t num_root = cls->num_root; + uint32_t num_node = cls->num_node; + for (uint32_t i = 0; i < num_node - 1; i++) + for (uint32_t j = 0; j < num_root; j++) { + obj_skin_block_cloth_node* f = &cls->node_array[(size_t)i * num_root + j]; s.write_uint32_t_reverse_endianness(f->flags); s.write_float_t_reverse_endianness(f->trans.x); s.write_float_t_reverse_endianness(f->trans.y); @@ -6389,54 +6487,57 @@ static void obj_modern_write_skin_block_cloth(obj_skin_block_cloth* b, s.write_float_t_reverse_endianness(f->dist_left); } s.position_pop(); - *nodes_offset += (11 * sizeof(int32_t)) * b->root_count * (b->nodes_count - 1ULL); + *node_array_offset += (11 * sizeof(int32_t)) * cls->num_root * (cls->num_node - 1ULL); } - if (b->mesh_indices) { - s.position_push(*mesh_indices_offset, SEEK_SET); - s.write_uint16_t_reverse_endianness((uint16_t)b->mesh_indices_count); - for (size_t i = 0; i < b->mesh_indices_count; i++) - s.write_uint16_t_reverse_endianness(b->mesh_indices[i]); + if (cls->mesh_index_array) { + s.position_push(*mesh_index_array_offset, SEEK_SET); + s.write_uint16_t_reverse_endianness((uint16_t)cls->num_mesh_index); + uint16_t* mesh_index_array = cls->mesh_index_array; + for (int32_t i = cls->num_mesh_index; i > 0; i--, mesh_index_array++) + s.write_uint16_t_reverse_endianness(*mesh_index_array); s.position_pop(); - *mesh_indices_offset += sizeof(uint16_t) + b->mesh_indices_count * sizeof(uint16_t); + *mesh_index_array_offset += sizeof(uint16_t) + cls->num_mesh_index * sizeof(uint16_t); } - if (b->backface_mesh_indices) { - s.position_push(*backface_mesh_indices_offset, SEEK_SET); - s.write_uint16_t_reverse_endianness((uint16_t)b->backface_mesh_indices_count); - for (size_t i = 0; i < b->backface_mesh_indices_count; i++) - s.write_uint16_t_reverse_endianness(b->backface_mesh_indices[i]); + if (cls->backface_mesh_index_array) { + s.position_push(*backface_mesh_index_array_offset, SEEK_SET); + s.write_uint16_t_reverse_endianness((uint16_t)cls->num_backface_mesh_index); + uint16_t* backface_mesh_index_array = cls->backface_mesh_index_array; + for (int32_t i = cls->num_backface_mesh_index; i > 0; i--, backface_mesh_index_array++) + s.write_uint16_t_reverse_endianness(*backface_mesh_index_array); s.position_pop(); - *backface_mesh_indices_offset += sizeof(uint16_t) + b->backface_mesh_indices_count * sizeof(uint16_t); + *backface_mesh_index_array_offset += sizeof(uint16_t) + cls->num_backface_mesh_index * sizeof(uint16_t); } } -static void obj_modern_read_skin_block_cloth_root_bone_weight(obj_skin_block_cloth_root_bone_weight* sub, - stream& s, uint32_t header_length, char** str, bool is_x) { +static void obj_modern_read_skin_block_cloth_root_bone_weight(obj_skin_block_cloth_root_bone_weight* bone_weight, + prj::shared_ptr alloc, stream& s, uint32_t header_length, const char** str, bool is_x) { int64_t bone_name_offset = s.read_offset(header_length, is_x); - sub->bone_name = s.read_utf8_string_null_terminated_offset(bone_name_offset); - sub->weight = s.read_float_t_reverse_endianness(); - sub->matrix_index = s.read_uint32_t_reverse_endianness(); - sub->reserved = s.read_uint32_t_reverse_endianness(); + bone_weight->bone_name = obj_read_utf8_string_null_terminated_offset(alloc, s, bone_name_offset); + bone_weight->weight = s.read_float_t_reverse_endianness(); + bone_weight->matrix_index = s.read_uint32_t_reverse_endianness(); + bone_weight->reserved = s.read_uint32_t_reverse_endianness(); if (is_x) s.read(0, 0x04); } -static void obj_modern_write_skin_block_cloth_root_bone_weight(obj_skin_block_cloth_root_bone_weight* sub, +static void obj_modern_write_skin_block_cloth_root_bone_weight(obj_skin_block_cloth_root_bone_weight* bone_weight, stream& s, std::vector& strings, std::vector& string_offsets, bool is_x) { int64_t bone_name_offset = obj_skin_strings_get_string_offset(strings, - string_offsets, sub->bone_name); + string_offsets, bone_weight->bone_name); s.write_offset(bone_name_offset, 0x20, is_x); - s.write_float_t_reverse_endianness(sub->weight); - s.write_uint32_t_reverse_endianness(sub->matrix_index); - s.write_uint32_t_reverse_endianness(sub->reserved); + s.write_float_t_reverse_endianness(bone_weight->weight); + s.write_uint32_t_reverse_endianness(bone_weight->matrix_index); + s.write_uint32_t_reverse_endianness(bone_weight->reserved); if (is_x) s.write(0x04); } -static void obj_modern_read_skin_block_constraint(obj_skin_block_constraint* b, - stream& s, uint32_t header_length, char** str, bool is_x) { - obj_modern_read_skin_block_node(&b->base, s, header_length, str, is_x); +static obj_skin_block_constraint* obj_modern_read_skin_block_constraint( + prj::shared_ptr alloc, stream& s, uint32_t header_length, const char** str, bool is_x) { + obj_skin_block_constraint* cns = alloc->allocate(); + obj_modern_read_skin_block_node(&cns->node, alloc, s, header_length, str, is_x); int64_t type_offset = s.read_offset(header_length, is_x); char* type = s.read_utf8_string_null_terminated_offset(type_offset); @@ -6444,67 +6545,84 @@ static void obj_modern_read_skin_block_constraint(obj_skin_block_constraint* b, int64_t name_offset = s.read_offset(header_length, is_x); char* name = s.read_utf8_string_null_terminated_offset(name_offset); - b->name_index = 0; - for (char** i = str; *i; i++) + uint32_t name_index = 0; + for (const char** i = str; *i; i++) if (!str_utils_compare(name, *i)) { - b->name_index = 0x8000 | (int32_t)(i - str); + cns->name_index = 0x8000 | (int32_t)(i - str); break; } free_def(name); - b->coupling = (obj_skin_block_constraint_coupling)s.read_int32_t_reverse_endianness(); + cns->coupling = (obj_skin_block_constraint_coupling)s.read_int32_t_reverse_endianness(); int64_t source_node_name_offset = s.read_offset(header_length, is_x); - b->source_node_name = s.read_utf8_string_null_terminated_offset(source_node_name_offset); + cns->source_node_name = obj_read_utf8_string_null_terminated_offset(alloc, s, source_node_name_offset); if (!str_utils_compare(type, "Orientation")) { - b->type = OBJ_SKIN_BLOCK_CONSTRAINT_ORIENTATION; - b->orientation.offset.x = s.read_float_t_reverse_endianness(); - b->orientation.offset.y = s.read_float_t_reverse_endianness(); - b->orientation.offset.z = s.read_float_t_reverse_endianness(); + cns->type = OBJ_SKIN_BLOCK_CONSTRAINT_ORIENTATION; + + obj_skin_block_constraint_orientation* orientation + = alloc->allocate(); + orientation->offset.x = s.read_float_t_reverse_endianness(); + orientation->offset.y = s.read_float_t_reverse_endianness(); + orientation->offset.z = s.read_float_t_reverse_endianness(); + cns->orientation = orientation; } else if (!str_utils_compare(type, "Direction")) { - b->type = OBJ_SKIN_BLOCK_CONSTRAINT_DIRECTION; - obj_modern_read_skin_block_constraint_up_vector_old(&b->direction.up_vector, - s, header_length, str, is_x); - b->direction.align_axis.x = s.read_float_t_reverse_endianness(); - b->direction.align_axis.y = s.read_float_t_reverse_endianness(); - b->direction.align_axis.z = s.read_float_t_reverse_endianness(); - b->direction.target_offset.x = s.read_float_t_reverse_endianness(); - b->direction.target_offset.y = s.read_float_t_reverse_endianness(); - b->direction.target_offset.z = s.read_float_t_reverse_endianness(); + cns->type = OBJ_SKIN_BLOCK_CONSTRAINT_DIRECTION; + + obj_skin_block_constraint_direction* direction + = alloc->allocate(); + obj_modern_read_skin_block_constraint_up_vector(&direction->up_vector, + alloc, s, header_length, str, is_x); + direction->align_axis.x = s.read_float_t_reverse_endianness(); + direction->align_axis.y = s.read_float_t_reverse_endianness(); + direction->align_axis.z = s.read_float_t_reverse_endianness(); + direction->target_offset.x = s.read_float_t_reverse_endianness(); + direction->target_offset.y = s.read_float_t_reverse_endianness(); + direction->target_offset.z = s.read_float_t_reverse_endianness(); + cns->direction = direction; } else if (!str_utils_compare(type, "Position")) { - b->type = OBJ_SKIN_BLOCK_CONSTRAINT_POSITION; - obj_modern_read_skin_block_constraint_up_vector_old(&b->position.up_vector, + cns->type = OBJ_SKIN_BLOCK_CONSTRAINT_POSITION; + + obj_skin_block_constraint_position* position + = alloc->allocate(); + obj_modern_read_skin_block_constraint_up_vector(&position->up_vector, + alloc, s, header_length, str, is_x); + obj_modern_read_skin_block_constraint_attach_point(&position->constrained_object, s, header_length, str, is_x); - obj_modern_read_skin_block_constraint_attach_point(&b->position.constrained_object, - s, header_length, str, is_x); - obj_modern_read_skin_block_constraint_attach_point(&b->position.constraining_object, + obj_modern_read_skin_block_constraint_attach_point(&position->constraining_object, s, header_length, str, is_x); + cns->position = position; } else if (!str_utils_compare(type, "Distance")) { - b->type = OBJ_SKIN_BLOCK_CONSTRAINT_DISTANCE; - obj_modern_read_skin_block_constraint_up_vector_old(&b->distance.up_vector, + cns->type = OBJ_SKIN_BLOCK_CONSTRAINT_DISTANCE; + + obj_skin_block_constraint_distance* distance + = alloc->allocate(); + obj_modern_read_skin_block_constraint_up_vector(&distance->up_vector, + alloc, s, header_length, str, is_x); + distance->distance = s.read_float_t_reverse_endianness(); + obj_modern_read_skin_block_constraint_attach_point(&distance->constrained_object, s, header_length, str, is_x); - b->distance.distance = s.read_float_t_reverse_endianness(); - obj_modern_read_skin_block_constraint_attach_point(&b->distance.constrained_object, - s, header_length, str, is_x); - obj_modern_read_skin_block_constraint_attach_point(&b->distance.constraining_object, + obj_modern_read_skin_block_constraint_attach_point(&distance->constraining_object, s, header_length, str, is_x); + cns->distance = distance; } else - b->type = OBJ_SKIN_BLOCK_CONSTRAINT_NONE; + cns->type = OBJ_SKIN_BLOCK_CONSTRAINT_NONE; free_def(type); + return cns; } -static void obj_modern_write_skin_block_constraint(obj_skin_block_constraint* b, - stream& s, std::vector& strings, std::vector& string_offsets, char** bone_names, +static void obj_modern_write_skin_block_constraint(obj_skin_block_constraint* cns, + stream& s, std::vector& strings, std::vector& string_offsets, const char** bone_name_array, bool is_x, int64_t* offsets) { - obj_modern_write_skin_block_node(&b->base, s, strings, string_offsets, is_x); + obj_modern_write_skin_block_node(&cns->node, s, strings, string_offsets, is_x); int64_t type_offset = 0; - switch (b->type) { + switch (cns->type) { case OBJ_SKIN_BLOCK_CONSTRAINT_ORIENTATION: type_offset = offsets[0]; break; @@ -6521,205 +6639,211 @@ static void obj_modern_write_skin_block_constraint(obj_skin_block_constraint* b, s.write_offset(type_offset, 0x20, is_x); int64_t name_offset = obj_skin_strings_get_string_offset_by_index(strings, - string_offsets, bone_names, b->name_index); + string_offsets, bone_name_array, cns->name_index); s.write_offset(name_offset, 0x20, is_x); - s.write_int32_t_reverse_endianness(b->coupling); + s.write_int32_t_reverse_endianness(cns->coupling); int64_t source_node_name_offset = obj_skin_strings_get_string_offset(strings, - string_offsets, b->source_node_name); + string_offsets, cns->source_node_name); s.write_offset(source_node_name_offset, 0x20, is_x); - switch (b->type) { + switch (cns->type) { case OBJ_SKIN_BLOCK_CONSTRAINT_ORIENTATION: - s.write_float_t_reverse_endianness(b->orientation.offset.x); - s.write_float_t_reverse_endianness(b->orientation.offset.y); - s.write_float_t_reverse_endianness(b->orientation.offset.z); + s.write_float_t_reverse_endianness(cns->orientation->offset.x); + s.write_float_t_reverse_endianness(cns->orientation->offset.y); + s.write_float_t_reverse_endianness(cns->orientation->offset.z); break; case OBJ_SKIN_BLOCK_CONSTRAINT_DIRECTION: - obj_modern_write_skin_block_constraint_up_vector_old(&b->direction.up_vector, + obj_modern_write_skin_block_constraint_up_vector(&cns->direction->up_vector, s, strings, string_offsets, is_x); - s.write_float_t_reverse_endianness(b->direction.align_axis.x); - s.write_float_t_reverse_endianness(b->direction.align_axis.y); - s.write_float_t_reverse_endianness(b->direction.align_axis.z); - s.write_float_t_reverse_endianness(b->direction.target_offset.x); - s.write_float_t_reverse_endianness(b->direction.target_offset.y); - s.write_float_t_reverse_endianness(b->direction.target_offset.z); + s.write_float_t_reverse_endianness(cns->direction->align_axis.x); + s.write_float_t_reverse_endianness(cns->direction->align_axis.y); + s.write_float_t_reverse_endianness(cns->direction->align_axis.z); + s.write_float_t_reverse_endianness(cns->direction->target_offset.x); + s.write_float_t_reverse_endianness(cns->direction->target_offset.y); + s.write_float_t_reverse_endianness(cns->direction->target_offset.z); break; case OBJ_SKIN_BLOCK_CONSTRAINT_POSITION: - obj_modern_write_skin_block_constraint_up_vector_old(&b->position.up_vector, + obj_modern_write_skin_block_constraint_up_vector(&cns->position->up_vector, s, strings, string_offsets, is_x); - obj_modern_write_skin_block_constraint_attach_point(&b->position.constrained_object, + obj_modern_write_skin_block_constraint_attach_point(&cns->position->constrained_object, s, strings, string_offsets, is_x); - obj_modern_write_skin_block_constraint_attach_point(&b->position.constraining_object, + obj_modern_write_skin_block_constraint_attach_point(&cns->position->constraining_object, s, strings, string_offsets, is_x); break; case OBJ_SKIN_BLOCK_CONSTRAINT_DISTANCE: - obj_modern_write_skin_block_constraint_up_vector_old(&b->distance.up_vector, + obj_modern_write_skin_block_constraint_up_vector(&cns->distance->up_vector, s, strings, string_offsets, is_x); - s.write_float_t_reverse_endianness(b->distance.distance); - obj_modern_write_skin_block_constraint_attach_point(&b->distance.constrained_object, + s.write_float_t_reverse_endianness(cns->distance->distance); + obj_modern_write_skin_block_constraint_attach_point(&cns->distance->constrained_object, s, strings, string_offsets, is_x); - obj_modern_write_skin_block_constraint_attach_point(&b->distance.constraining_object, + obj_modern_write_skin_block_constraint_attach_point(&cns->distance->constraining_object, s, strings, string_offsets, is_x); break; } } -static void obj_modern_read_skin_block_constraint_attach_point(obj_skin_block_constraint_attach_point* ap, - stream& s, uint32_t header_length, char** str, bool is_x) { - ap->affected_by_orientation = s.read_int32_t_reverse_endianness() != 0; - ap->affected_by_scaling = s.read_int32_t_reverse_endianness() != 0; - ap->offset.x = s.read_float_t_reverse_endianness(); - ap->offset.y = s.read_float_t_reverse_endianness(); - ap->offset.z = s.read_float_t_reverse_endianness(); +static void obj_modern_read_skin_block_constraint_attach_point(obj_skin_block_constraint_attach_point* attach_point, + stream& s, uint32_t header_length, const char** str, bool is_x) { + attach_point->affected_by_orientation = s.read_int32_t_reverse_endianness() != 0; + attach_point->affected_by_scaling = s.read_int32_t_reverse_endianness() != 0; + attach_point->offset.x = s.read_float_t_reverse_endianness(); + attach_point->offset.y = s.read_float_t_reverse_endianness(); + attach_point->offset.z = s.read_float_t_reverse_endianness(); } -static void obj_modern_write_skin_block_constraint_attach_point(obj_skin_block_constraint_attach_point* ap, +static void obj_modern_write_skin_block_constraint_attach_point(obj_skin_block_constraint_attach_point* attach_point, stream& s, std::vector& strings, std::vector& string_offsets, bool is_x) { - s.write_int32_t_reverse_endianness(ap->affected_by_orientation ? 1 : 0); - s.write_int32_t_reverse_endianness(ap->affected_by_scaling ? 1 : 0); - s.write_float_t_reverse_endianness(ap->offset.x); - s.write_float_t_reverse_endianness(ap->offset.y); - s.write_float_t_reverse_endianness(ap->offset.z); + s.write_int32_t_reverse_endianness(attach_point->affected_by_orientation ? 1 : 0); + s.write_int32_t_reverse_endianness(attach_point->affected_by_scaling ? 1 : 0); + s.write_float_t_reverse_endianness(attach_point->offset.x); + s.write_float_t_reverse_endianness(attach_point->offset.y); + s.write_float_t_reverse_endianness(attach_point->offset.z); } -static void obj_modern_read_skin_block_constraint_up_vector_old(obj_skin_block_constraint_up_vector* up, - stream& s, uint32_t header_length, char** str, bool is_x) { - up->active = s.read_int32_t_reverse_endianness() != 0; - up->roll = s.read_float_t_reverse_endianness(); - up->affected_axis.x = s.read_float_t_reverse_endianness(); - up->affected_axis.y = s.read_float_t_reverse_endianness(); - up->affected_axis.z = s.read_float_t_reverse_endianness(); - up->point_at.x = s.read_float_t_reverse_endianness(); - up->point_at.y = s.read_float_t_reverse_endianness(); - up->point_at.z = s.read_float_t_reverse_endianness(); +static void obj_modern_read_skin_block_constraint_up_vector(obj_skin_block_constraint_up_vector* up_vector, + prj::shared_ptr alloc, stream& s, uint32_t header_length, const char** str, bool is_x) { + up_vector->active = !!s.read_int32_t_reverse_endianness(); + up_vector->roll = s.read_float_t_reverse_endianness(); + up_vector->affected_axis.x = s.read_float_t_reverse_endianness(); + up_vector->affected_axis.y = s.read_float_t_reverse_endianness(); + up_vector->affected_axis.z = s.read_float_t_reverse_endianness(); + up_vector->point_at.x = s.read_float_t_reverse_endianness(); + up_vector->point_at.y = s.read_float_t_reverse_endianness(); + up_vector->point_at.z = s.read_float_t_reverse_endianness(); int64_t name_offset = s.read_offset(header_length, is_x); - up->name = s.read_utf8_string_null_terminated_offset(name_offset); + up_vector->name = obj_read_utf8_string_null_terminated_offset(alloc, s, name_offset); } -static void obj_modern_write_skin_block_constraint_up_vector_old(obj_skin_block_constraint_up_vector* up, +static void obj_modern_write_skin_block_constraint_up_vector(obj_skin_block_constraint_up_vector* up_vector, stream& s, std::vector& strings, std::vector& string_offsets, bool is_x) { - s.write_int32_t_reverse_endianness(up->active ? 1 : 0); - s.write_float_t_reverse_endianness(up->roll); - s.write_float_t_reverse_endianness(up->affected_axis.x); - s.write_float_t_reverse_endianness(up->affected_axis.y); - s.write_float_t_reverse_endianness(up->affected_axis.z); - s.write_float_t_reverse_endianness(up->point_at.x); - s.write_float_t_reverse_endianness(up->point_at.y); - s.write_float_t_reverse_endianness(up->point_at.z); + s.write_int32_t_reverse_endianness(up_vector->active ? 1 : 0); + s.write_float_t_reverse_endianness(up_vector->roll); + s.write_float_t_reverse_endianness(up_vector->affected_axis.x); + s.write_float_t_reverse_endianness(up_vector->affected_axis.y); + s.write_float_t_reverse_endianness(up_vector->affected_axis.z); + s.write_float_t_reverse_endianness(up_vector->point_at.x); + s.write_float_t_reverse_endianness(up_vector->point_at.y); + s.write_float_t_reverse_endianness(up_vector->point_at.z); int64_t name_offset = obj_skin_strings_get_string_offset(strings, - string_offsets, up->name); + string_offsets, up_vector->name); s.write_offset(name_offset, 0x20, is_x); } -static void obj_modern_read_skin_block_expression(obj_skin_block_expression* b, - stream& s, uint32_t header_length, char** str, bool is_x) { - obj_modern_read_skin_block_node(&b->base, s, header_length, str, is_x); +static obj_skin_block_expression* obj_modern_read_skin_block_expression( + prj::shared_ptr alloc, stream& s, uint32_t header_length, const char** str, bool is_x) { + obj_skin_block_expression* exp = alloc->allocate(); + obj_modern_read_skin_block_node(&exp->node, alloc, s, header_length, str, is_x); int64_t name_offset = s.read_offset(header_length, is_x); char* name = s.read_utf8_string_null_terminated_offset(name_offset); - b->name_index = 0; - for (char** i = str; *i; i++) + exp->name_index = 0; + for (const char** i = str; *i; i++) if (!str_utils_compare(name, *i)) { - b->name_index = 0x8000 | (int32_t)(i - str); + exp->name_index = 0x8000 | (int32_t)(i - str); break; } free_def(name); - b->expressions_count = s.read_int32_t_reverse_endianness(); - b->expressions_count = min_def(b->expressions_count, 9); + exp->num_expression = s.read_int32_t_reverse_endianness(); + exp->num_expression = min_def(exp->num_expression, 9); if (!is_x) - for (uint32_t i = 0; i < b->expressions_count; i++) { + for (uint32_t i = 0; i < exp->num_expression; i++) { int64_t expression_offset = s.read_offset_f2(header_length); if (expression_offset) - b->expressions[i] = s.read_utf8_string_null_terminated_offset(expression_offset); + exp->expression_array[i] + = obj_read_utf8_string_null_terminated_offset(alloc, s, expression_offset); } else - for (uint32_t i = 0; i < b->expressions_count; i++) { + for (uint32_t i = 0; i < exp->num_expression; i++) { int64_t expression_offset = s.read_offset_x(); if (expression_offset) - b->expressions[i] = s.read_utf8_string_null_terminated_offset(expression_offset); + exp->expression_array[i] + = obj_read_utf8_string_null_terminated_offset(alloc, s, expression_offset); } - for (uint32_t i = b->expressions_count; i < 9; i++) - b->expressions[i] = 0; + for (uint32_t i = exp->num_expression; i < 9; i++) + exp->expression_array[i] = 0; + return exp; } -static void obj_modern_write_skin_block_expression(obj_skin_block_expression* b, - stream& s, std::vector& strings, std::vector& string_offsets, char** bone_names, bool is_x) { - obj_modern_write_skin_block_node(&b->base, s, strings, string_offsets, is_x); +static void obj_modern_write_skin_block_expression(obj_skin_block_expression* exp, + stream& s, std::vector& strings, std::vector& string_offsets, + const char** bone_name_array, bool is_x) { + obj_modern_write_skin_block_node(&exp->node, s, strings, string_offsets, is_x); int64_t name_offset = obj_skin_strings_get_string_offset_by_index(strings, - string_offsets, bone_names, b->name_index); + string_offsets, bone_name_array, exp->name_index); s.write_offset(name_offset, 0x20, is_x); - s.write_int32_t_reverse_endianness(min_def(b->expressions_count, 9)); + s.write_int32_t_reverse_endianness(min_def(exp->num_expression, 9)); if (!is_x) { - for (uint32_t i = 0; i < b->expressions_count && i < 9; i++) { + for (uint32_t i = 0; i < exp->num_expression && i < 9; i++) { int64_t expression_offset = obj_skin_strings_get_string_offset(strings, - string_offsets, b->expressions[i]); + string_offsets, exp->expression_array[i]); s.write_offset_f2((int32_t)expression_offset, 0x20); } - for (uint32_t i = b->expressions_count; i < 9; i++) + for (uint32_t i = exp->num_expression; i < 9; i++) s.write_offset_f2(0, 0x20); } else { - for (uint32_t i = 0; i < b->expressions_count && i < 9; i++) { + for (uint32_t i = 0; i < exp->num_expression && i < 9; i++) { int64_t expression_offset = obj_skin_strings_get_string_offset(strings, - string_offsets, b->expressions[i]); + string_offsets, exp->expression_array[i]); s.write_offset_x(expression_offset); } - for (uint32_t i = b->expressions_count; i < 9; i++) + for (uint32_t i = exp->num_expression; i < 9; i++) s.write_offset_x(0); } } -static void obj_modern_read_skin_block_motion(obj_skin_block_motion* b, - stream& s, uint32_t header_length, char** str, bool is_x) { - obj_modern_read_skin_block_node(&b->base, s, header_length, str, is_x); +static obj_skin_block_motion* obj_modern_read_skin_block_motion( + prj::shared_ptr alloc, stream& s, uint32_t header_length, const char** str, bool is_x) { + obj_skin_block_motion* mot = alloc->allocate(); + obj_modern_read_skin_block_node(&mot->node, alloc, s, header_length, str, is_x); int64_t name_offset = s.read_offset(header_length, is_x); - b->nodes_count = s.read_int32_t_reverse_endianness(); - int64_t bone_names_offset = s.read_offset(header_length, is_x); - int64_t bone_matrices_offset = s.read_offset(header_length, is_x); + mot->num_node = s.read_int32_t_reverse_endianness(); + int64_t bone_name_array_offset = s.read_offset(header_length, is_x); + int64_t bone_matrix_array_offset = s.read_offset(header_length, is_x); if (!is_x) { - b->name_index = 0; + mot->name_index = 0; char* name = s.read_utf8_string_null_terminated_offset(name_offset); - for (char** i = str; *i; i++) + for (const char** i = str; *i; i++) if (!str_utils_compare(name, *i)) { - b->name_index = 0x8000 | (int32_t)(i - str); + mot->name_index = 0x8000 | (int32_t)(i - str); break; } free_def(name); } else - b->name = s.read_utf8_string_null_terminated_offset(name_offset); + mot->name = obj_read_utf8_string_null_terminated_offset(alloc, s, name_offset); - b->nodes = 0; + mot->node_array = 0; - if (!b->nodes_count) - return; + if (!mot->num_node) + return mot; - b->nodes = force_malloc_s(obj_skin_motion_node, b->nodes_count); + mot->node_array = alloc->allocate(mot->num_node); - if (bone_names_offset) { - s.position_push(bone_names_offset, SEEK_SET); - for (uint32_t i = 0; i < b->nodes_count; i++) - b->nodes[i].name_index = s.read_uint32_t_reverse_endianness(); + if (bone_name_array_offset) { + s.position_push(bone_name_array_offset, SEEK_SET); + for (uint32_t i = 0; i < mot->num_node; i++) + mot->node_array[i].name_index = s.read_uint32_t_reverse_endianness(); s.position_pop(); } - if (bone_matrices_offset) { - s.position_push(bone_matrices_offset, SEEK_SET); - for (uint32_t i = 0; i < b->nodes_count; i++) { - mat4& mat = b->nodes[i].inv_bind_pose_mat; + if (bone_matrix_array_offset) { + s.position_push(bone_matrix_array_offset, SEEK_SET); + for (uint32_t i = 0; i < mot->num_node; i++) { + mat4& mat = mot->node_array[i].inv_bind_pose_mat; mat.row0.x = s.read_float_t_reverse_endianness(); mat.row1.x = s.read_float_t_reverse_endianness(); mat.row2.x = s.read_float_t_reverse_endianness(); @@ -6739,35 +6863,36 @@ static void obj_modern_read_skin_block_motion(obj_skin_block_motion* b, } s.position_pop(); } + return mot; } -static void obj_modern_write_skin_block_motion(obj_skin_block_motion* b, +static void obj_modern_write_skin_block_motion(obj_skin_block_motion* mot, stream& s, std::vector& strings, std::vector& string_offsets, bool is_x, - char** bone_names, int64_t* bone_names_offset, int64_t* bone_matrices_offset) { - obj_modern_write_skin_block_node(&b->base, s, strings, string_offsets, is_x); + const char** bone_name_array, int64_t* bone_name_array_offset, int64_t* bone_matrix_array_offset) { + obj_modern_write_skin_block_node(&mot->node, s, strings, string_offsets, is_x); int64_t name_offset; if (!is_x) name_offset = obj_skin_strings_get_string_offset_by_index(strings, - string_offsets, bone_names, b->name_index); + string_offsets, bone_name_array, mot->name_index); else name_offset = obj_skin_strings_get_string_offset(strings, - string_offsets, b->name); + string_offsets, mot->name); s.write_offset(name_offset, 0x20, is_x); - s.write_int32_t_reverse_endianness(b->nodes_count); - s.write_offset(b->nodes ? *bone_names_offset : 0, 0x20, is_x); - s.write_offset(b->nodes ? *bone_matrices_offset : 0, 0x20, is_x); + s.write_int32_t_reverse_endianness(mot->num_node); + s.write_offset(mot->node_array ? *bone_name_array_offset : 0, 0x20, is_x); + s.write_offset(mot->node_array ? *bone_matrix_array_offset : 0, 0x20, is_x); - if (b->nodes) { - s.position_push(*bone_names_offset, SEEK_SET); - for (uint32_t i = 0; i < b->nodes_count; i++) - s.write_uint32_t_reverse_endianness(b->nodes[i].name_index); + if (mot->node_array) { + s.position_push(*bone_name_array_offset, SEEK_SET); + for (uint32_t i = 0; i < mot->num_node; i++) + s.write_uint32_t_reverse_endianness(mot->node_array[i].name_index); s.position_pop(); - *bone_names_offset += b->nodes_count * sizeof(uint32_t); + *bone_name_array_offset += mot->num_node * sizeof(uint32_t); - s.position_push(*bone_matrices_offset, SEEK_SET); - for (uint32_t i = 0; i < b->nodes_count; i++) { - mat4& mat = b->nodes[i].inv_bind_pose_mat; + s.position_push(*bone_matrix_array_offset, SEEK_SET); + for (uint32_t i = 0; i < mot->num_node; i++) { + mat4& mat = mot->node_array[i].inv_bind_pose_mat; s.write_float_t_reverse_endianness(mat.row0.x); s.write_float_t_reverse_endianness(mat.row1.x); s.write_float_t_reverse_endianness(mat.row2.x); @@ -6786,91 +6911,158 @@ static void obj_modern_write_skin_block_motion(obj_skin_block_motion* b, s.write_float_t_reverse_endianness(mat.row3.w); } s.position_pop(); - *bone_matrices_offset += b->nodes_count * sizeof(mat4); + *bone_matrix_array_offset += mot->num_node * sizeof(mat4); } } -static void obj_modern_read_skin_block_node(obj_skin_block_node* b, - stream& s, uint32_t header_length, char** str, bool is_x) { +static void obj_modern_read_skin_block_node(obj_skin_block_node* node, + prj::shared_ptr alloc, stream& s, uint32_t header_length, const char** str, bool is_x) { int64_t parent_name = s.read_offset(header_length, is_x); - b->parent_name = s.read_utf8_string_null_terminated_offset(parent_name); + node->parent_name = obj_read_utf8_string_null_terminated_offset(alloc, s, parent_name); - b->position.x = s.read_float_t_reverse_endianness(); - b->position.y = s.read_float_t_reverse_endianness(); - b->position.z = s.read_float_t_reverse_endianness(); - b->rotation.x = s.read_float_t_reverse_endianness(); - b->rotation.y = s.read_float_t_reverse_endianness(); - b->rotation.z = s.read_float_t_reverse_endianness(); - b->scale.x = s.read_float_t_reverse_endianness(); - b->scale.y = s.read_float_t_reverse_endianness(); - b->scale.z = s.read_float_t_reverse_endianness(); + node->position.x = s.read_float_t_reverse_endianness(); + node->position.y = s.read_float_t_reverse_endianness(); + node->position.z = s.read_float_t_reverse_endianness(); + node->rotation.x = s.read_float_t_reverse_endianness(); + node->rotation.y = s.read_float_t_reverse_endianness(); + node->rotation.z = s.read_float_t_reverse_endianness(); + node->scale.x = s.read_float_t_reverse_endianness(); + node->scale.y = s.read_float_t_reverse_endianness(); + node->scale.z = s.read_float_t_reverse_endianness(); if (is_x) s.read(0, 0x04); } -static void obj_modern_write_skin_block_node(obj_skin_block_node* b, +static void obj_modern_write_skin_block_node(obj_skin_block_node* node, stream& s, std::vector& strings, std::vector& string_offsets, bool is_x) { int64_t parent_name_offset = obj_skin_strings_get_string_offset(strings, - string_offsets, b->parent_name); + string_offsets, node->parent_name); s.write_offset(parent_name_offset, 0x20, is_x); - s.write_float_t_reverse_endianness(b->position.x); - s.write_float_t_reverse_endianness(b->position.y); - s.write_float_t_reverse_endianness(b->position.z); - s.write_float_t_reverse_endianness(b->rotation.x); - s.write_float_t_reverse_endianness(b->rotation.y); - s.write_float_t_reverse_endianness(b->rotation.z); - s.write_float_t_reverse_endianness(b->scale.x); - s.write_float_t_reverse_endianness(b->scale.y); - s.write_float_t_reverse_endianness(b->scale.z); + s.write_float_t_reverse_endianness(node->position.x); + s.write_float_t_reverse_endianness(node->position.y); + s.write_float_t_reverse_endianness(node->position.z); + s.write_float_t_reverse_endianness(node->rotation.x); + s.write_float_t_reverse_endianness(node->rotation.y); + s.write_float_t_reverse_endianness(node->rotation.z); + s.write_float_t_reverse_endianness(node->scale.x); + s.write_float_t_reverse_endianness(node->scale.y); + s.write_float_t_reverse_endianness(node->scale.z); if (is_x) s.write(0x04); } -static void obj_modern_read_skin_block_osage(obj_skin_block_osage* b, - stream& s, uint32_t header_length, char** str, bool is_x) { - obj_modern_read_skin_block_node(&b->base, s, header_length, str, is_x); +static obj_skin_block_osage* obj_modern_read_skin_block_osage( + prj::shared_ptr alloc, stream& s, uint32_t header_length, const char** str, bool is_x) { + obj_skin_block_osage* osg = alloc->allocate(); + obj_modern_read_skin_block_node(&osg->node, alloc, s, header_length, str, is_x); - b->start_index = s.read_int32_t_reverse_endianness(); - b->count = s.read_int32_t_reverse_endianness(); - b->external_name_index = s.read_uint32_t_reverse_endianness(); - b->name_index = s.read_uint32_t_reverse_endianness(); + osg->start_index = s.read_int32_t_reverse_endianness(); + osg->count = s.read_int32_t_reverse_endianness(); + osg->external_name_index = s.read_uint32_t_reverse_endianness(); + osg->name_index = s.read_uint32_t_reverse_endianness(); if (!is_x) s.read(0, 0x14); else { s.read(0, 0x08); int64_t motion_node_name_offset = s.read_offset_x(); - b->motion_node_name = s.read_utf8_string_null_terminated_offset(motion_node_name_offset); + osg->motion_node_name = obj_read_utf8_string_null_terminated_offset(alloc, s, motion_node_name_offset); s.read(0, 0x18); } - b->nodes = 0; - b->nodes_count = 0; + osg->node_array = 0; + osg->num_node = 0; + return osg; } -static void obj_modern_write_skin_block_osage(obj_skin_block_osage* b, +static void obj_modern_write_skin_block_osage(obj_skin_block_osage* osg, stream& s, std::vector& strings, std::vector& string_offsets, bool is_x) { - obj_modern_write_skin_block_node(&b->base, s, strings, string_offsets, is_x); + obj_modern_write_skin_block_node(&osg->node, s, strings, string_offsets, is_x); - s.write_int32_t_reverse_endianness(b->start_index); - s.write_int32_t_reverse_endianness(b->count); - s.write_uint32_t_reverse_endianness(b->external_name_index); - s.write_uint32_t_reverse_endianness(b->name_index); + s.write_int32_t_reverse_endianness(osg->start_index); + s.write_int32_t_reverse_endianness(osg->count); + s.write_uint32_t_reverse_endianness(osg->external_name_index); + s.write_uint32_t_reverse_endianness(osg->name_index); if (!is_x) s.write(0x14); else { s.write(0x08); int64_t motion_node_name_offset = obj_skin_strings_get_string_offset(strings, - string_offsets, b->motion_node_name); + string_offsets, osg->motion_node_name); s.write_offset_x(motion_node_name_offset); s.write(0x18); } } -static void obj_modern_read_vertex(obj* obj, stream& s, int64_t* vertex, obj_mesh* mesh, - const uint32_t vertex_flags, uint32_t num_vertex, uint32_t size_vertex) { +static int32_t vtx_fmt_map[] = { + -1, 1, 2, 3, 4, 5, 6, 7, 8, 9, + 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, + 20 +}; + +static void obj_modern_read_vertex(obj_mesh* mesh, prj::shared_ptr alloc, stream& s, + int64_t* vertex, const uint32_t vertex_format_index, uint32_t num_vertex, uint32_t size_vertex) { + int32_t vtx_fmt = vertex_format_index >= 0 && vertex_format_index <= 20 + ? vtx_fmt_map[vertex_format_index] : -1; + + bool tex2 = false; + bool tex3 = false; + bool tex4 = false; + bool tex5 = false; + bool bone = false; + + switch (vtx_fmt) { + default: + return; + case 2: + break; + case 4: + bone = true; + break; + case 6: + tex2 = true; + bone = true; + case 8: + tex2 = true; + bone = true; + break; + case 10: + tex2 = true; + tex3 = true; + break; + case 12: + tex2 = true; + tex3 = true; + bone = true; + break; + case 14: + tex2 = true; + tex3 = true; + tex4 = true; + break; + case 16: + tex2 = true; + tex3 = true; + tex4 = true; + bone = true; + break; + case 18: + tex2 = true; + tex3 = true; + tex4 = true; + tex5 = true; + break; + case 20: + tex2 = true; + tex3 = true; + tex4 = true; + tex5 = true; + bone = true; + break; + } + obj_vertex_format vertex_format = (obj_vertex_format)(OBJ_VERTEX_POSITION | OBJ_VERTEX_NORMAL | OBJ_VERTEX_TANGENT @@ -6878,17 +7070,17 @@ static void obj_modern_read_vertex(obj* obj, stream& s, int64_t* vertex, obj_mes | OBJ_VERTEX_TEXCOORD1 | OBJ_VERTEX_COLOR0); - if (vertex_flags == 0x06) + if (tex2) enum_or(vertex_format, OBJ_VERTEX_TEXCOORD2); - else if (vertex_flags == 0x0A) - enum_or(vertex_format, OBJ_VERTEX_TEXCOORD2 | OBJ_VERTEX_TEXCOORD3); - else if (vertex_flags == 0x04) + if (tex3) + enum_or(vertex_format, OBJ_VERTEX_TEXCOORD3); + if (bone) enum_or(vertex_format, OBJ_VERTEX_BONE_DATA); int64_t vtx_offset = vertex[13]; bool has_tangents = false; - obj_vertex_data* vtx = force_malloc_s(obj_vertex_data, num_vertex); + obj_vertex_data* vtx = alloc->allocate(num_vertex); for (uint32_t i = 0; i < num_vertex; i++) { s.set_position(vtx_offset + (int64_t)size_vertex * i, SEEK_SET); @@ -6922,24 +7114,26 @@ static void obj_modern_read_vertex(obj* obj, stream& s, int64_t* vertex, obj_mes texcoord1.y = s.read_half_t_reverse_endianness(); vec2h_to_vec2(texcoord1, vtx[i].texcoord1); - if (vertex_flags == 0x06) { + if (tex2) { vec2h texcoord2; texcoord2.x = s.read_half_t_reverse_endianness(); texcoord2.y = s.read_half_t_reverse_endianness(); vec2h_to_vec2(texcoord2, vtx[i].texcoord2); } - else if (vertex_flags == 0x0A) { - vec2h texcoord2; - texcoord2.x = s.read_half_t_reverse_endianness(); - texcoord2.y = s.read_half_t_reverse_endianness(); - vec2h_to_vec2(texcoord2, vtx[i].texcoord2); + if (tex3) { vec2h texcoord3; texcoord3.x = s.read_half_t_reverse_endianness(); texcoord3.y = s.read_half_t_reverse_endianness(); vec2h_to_vec2(texcoord3, vtx[i].texcoord3); } + if (tex4) + s.read(sizeof(half_t) * 2); + + if (tex5) + s.read(sizeof(half_t) * 2); + vec4h color; color.x = s.read_half_t_reverse_endianness(); color.y = s.read_half_t_reverse_endianness(); @@ -6947,7 +7141,7 @@ static void obj_modern_read_vertex(obj* obj, stream& s, int64_t* vertex, obj_mes color.w = s.read_half_t_reverse_endianness(); vec4h_to_vec4(color, vtx[i].color0); - if (vertex_flags == 0x04) { + if (bone) { vec4 bone_weight; bone_weight.x = (float_t)s.read_int16_t_reverse_endianness(); bone_weight.y = (float_t)s.read_int16_t_reverse_endianness(); @@ -6975,44 +7169,63 @@ static void obj_modern_read_vertex(obj* obj, stream& s, int64_t* vertex, obj_mes vtx[i].bone_index = bone_index; } - if (memcmp(&vtx[i].tangent, &vec4_null, sizeof(vec4))) + if (vtx[i].tangent != 0.0f) has_tangents = true; } if (!has_tangents) enum_and(vertex_format, ~OBJ_VERTEX_TANGENT); - mesh->vertex = vtx; + mesh->vertex_array = vtx; mesh->num_vertex = num_vertex; mesh->vertex_format = vertex_format; } -static void obj_modern_write_vertex(obj* obj, stream& s, bool is_x, - int64_t* vertex, obj_mesh* mesh, uint32_t* vertex_flags, - uint32_t* num_vertex, uint32_t* size_vertex, f2_struct* ovtx) { - - obj_vertex_data* vtx = mesh->vertex; +static void obj_modern_write_vertex(obj_mesh* mesh, stream& s, int64_t* vertex, + uint32_t* vertex_format_index, uint32_t* num_vertex, uint32_t* size_vertex, f2_struct* ovtx) { + obj_vertex_data* vtx = mesh->vertex_array; uint32_t _num_vertex = mesh->num_vertex; obj_vertex_format vertex_format = mesh->vertex_format; - uint32_t _vertex_flags = 0x02; + bool tex2 = false; + bool tex3 = false; + bool bone = false; + + uint32_t _vertex_format_index; + if ((vertex_format & OBJ_VERTEX_TEXCOORD2 | OBJ_VERTEX_TEXCOORD3 | OBJ_VERTEX_BONE_DATA) + == (OBJ_VERTEX_TEXCOORD2 | OBJ_VERTEX_TEXCOORD3 | OBJ_VERTEX_BONE_DATA)) + _vertex_format_index = 12; + else if ((vertex_format & OBJ_VERTEX_TEXCOORD2 | OBJ_VERTEX_TEXCOORD3) + == (OBJ_VERTEX_TEXCOORD2 | OBJ_VERTEX_TEXCOORD3)) + _vertex_format_index = 10; + else if ((vertex_format & OBJ_VERTEX_TEXCOORD2 | OBJ_VERTEX_BONE_DATA) + == (OBJ_VERTEX_TEXCOORD2 | OBJ_VERTEX_BONE_DATA)) + _vertex_format_index = 8; + else if ((vertex_format & OBJ_VERTEX_TEXCOORD2) == OBJ_VERTEX_TEXCOORD2) + _vertex_format_index = 6; + else if ((vertex_format & OBJ_VERTEX_BONE_DATA) == OBJ_VERTEX_BONE_DATA) + _vertex_format_index = 4; + else + _vertex_format_index = 2; + uint32_t _size_vertex = 0x2C; uint32_t enrs_se3_rc = 12; if (vertex_format & OBJ_VERTEX_BONE_DATA) { - _vertex_flags = 0x04; _size_vertex += 0x0C; enrs_se3_rc += 4; + bone = true; } - else if ((vertex_format & (OBJ_VERTEX_TEXCOORD2 & OBJ_VERTEX_TEXCOORD3)) - == (OBJ_VERTEX_TEXCOORD2 | OBJ_VERTEX_TEXCOORD3)) { - _vertex_flags = 0x0A; - _size_vertex += 0x08; - enrs_se3_rc += 4; - } - else if (vertex_format & OBJ_VERTEX_TEXCOORD2) { - _vertex_flags = 0x06; + + if (vertex_format & OBJ_VERTEX_TEXCOORD3) { _size_vertex += 0x04; enrs_se3_rc += 2; + tex3 = true; + } + + if (vertex_format & OBJ_VERTEX_TEXCOORD2) { + _size_vertex += 0x04; + enrs_se3_rc += 2; + tex2 = true; } uint32_t off = 0; @@ -7065,18 +7278,14 @@ static void obj_modern_write_vertex(obj* obj, stream& s, bool is_x, s.write_half_t_reverse_endianness(texcoord1.x); s.write_half_t_reverse_endianness(texcoord1.y); - if (_vertex_flags == 0x06) { + if (tex2) { vec2h texcoord2; vec2_to_vec2h(vtx[i].texcoord2, texcoord2); s.write_half_t_reverse_endianness(texcoord2.x); s.write_half_t_reverse_endianness(texcoord2.y); } - else if (_vertex_flags == 0x0A) { - vec2h texcoord2; - vec2_to_vec2h(vtx[i].texcoord2, texcoord2); - s.write_half_t_reverse_endianness(texcoord2.x); - s.write_half_t_reverse_endianness(texcoord2.y); + if (tex3) { vec2h texcoord3; vec2_to_vec2h(vtx[i].texcoord3, texcoord3); s.write_half_t_reverse_endianness(texcoord3.x); @@ -7090,7 +7299,7 @@ static void obj_modern_write_vertex(obj* obj, stream& s, bool is_x, s.write_half_t_reverse_endianness(color.z); s.write_half_t_reverse_endianness(color.w); - if (_vertex_flags == 0x04) { + if (bone) { vec4 bone_weight = vec4::mult_min_max(vtx[i].bone_weight, -32768.0f, 32767.0f); s.write_int16_t_reverse_endianness((int16_t)bone_weight.x); s.write_int16_t_reverse_endianness((int16_t)bone_weight.y); @@ -7106,13 +7315,20 @@ static void obj_modern_write_vertex(obj* obj, stream& s, bool is_x, } } - *vertex_flags = _vertex_flags; + *vertex_format_index = _vertex_format_index; *num_vertex = _num_vertex; *size_vertex = _size_vertex; } -inline static void obj_skin_block_node_free(obj_skin_block_node* b) { - free_def(b->parent_name); +inline static const char* obj_read_utf8_string_null_terminated_offset( + prj::shared_ptr& alloc, stream& s, int64_t offset) { + size_t len = s.read_utf8_string_null_terminated_offset_length(offset); + char* str = alloc->allocate(len + 1); + s.position_push(offset, SEEK_SET); + s.read(str, len); + s.position_pop(); + str[len] = 0; + return str; } inline static uint32_t obj_skin_strings_get_string_index(std::vector& vec, const char* str) { @@ -7137,11 +7353,11 @@ inline static int64_t obj_skin_strings_get_string_offset(std::vector& vec, - std::vector& vec_off, char** strings, uint32_t index) { + std::vector& vec_off, const char** strings, uint32_t index) { if (~index & 0x8000) return 0; - char* str = strings[index & 0x7FFF]; + const char* str = strings[index & 0x7FFF]; size_t len = utf8_length(str); uint64_t hash_fnv1a64m = hash_string_fnv1a64m(str); uint64_t hash_murmurhash = hash_string_murmurhash(str); @@ -7163,11 +7379,11 @@ inline static void obj_skin_strings_push_back_check(std::vector& ve } inline static void obj_skin_strings_push_back_check_by_index(std::vector& vec, - char** strings, uint32_t index) { + const char** strings, uint32_t index) { if (~index & 0x8000) return; - char* str = strings[index & 0x7FFF]; + const char* str = strings[index & 0x7FFF]; size_t len = utf8_length(str); uint64_t hash_fnv1a64m = hash_string_fnv1a64m(str); uint64_t hash_murmurhash = hash_string_murmurhash(str); diff --git a/src/KKdLib/obj.hpp b/src/KKdLib/obj.hpp index 95b2bd4b..4ec3d9bb 100644 --- a/src/KKdLib/obj.hpp +++ b/src/KKdLib/obj.hpp @@ -6,6 +6,8 @@ #pragma once #include "default.hpp" +#include "prj/shared_ptr.hpp" +#include "alloc_data.hpp" #include "mat.hpp" #include "vec.hpp" @@ -148,11 +150,15 @@ enum obj_vertex_format : uint32_t { struct obj_axis_aligned_bounding_box { vec3 center; vec3 size; + + obj_axis_aligned_bounding_box(); }; struct obj_bounding_box { vec3 center; vec3 size; + + obj_bounding_box(); }; struct obj_bounding_sphere { @@ -341,13 +347,13 @@ struct obj_sub_mesh { obj_bounding_sphere bounding_sphere; uint32_t material_index; uint8_t uv_index[8]; - uint16_t* bone_indices; - uint32_t bone_indices_count; + uint16_t* bone_index_array; + uint32_t num_bone_index; uint32_t bones_per_vertex; obj_primitive_type primitive_type; obj_index_format index_format; - uint32_t* indices; - uint32_t indices_count; + uint32_t* index_array; + uint32_t num_index; obj_sub_mesh_attrib attrib; union { obj_axis_aligned_bounding_box axis_aligned_bounding_box; @@ -355,7 +361,7 @@ struct obj_sub_mesh { }; uint16_t first_index; uint16_t last_index; - uint32_t indices_offset; + uint32_t index_offset; obj_sub_mesh(); }; @@ -374,6 +380,8 @@ struct obj_vertex_data { vec4 bone_weight; vec4i bone_index; vec4 unknown; + + obj_vertex_data(); }; struct obj_mesh_attrib_member { @@ -398,44 +406,21 @@ struct obj_mesh { obj_vertex_format vertex_format; uint32_t size_vertex; uint32_t num_vertex; - obj_vertex_data* vertex; + obj_vertex_data* vertex_array; obj_mesh_attrib attrib; uint32_t reserved[6]; char name[0x40]; -}; -struct obj_skin_block_cloth_root_bone_weight { - char* bone_name; - float_t weight; - int32_t matrix_index; - int32_t reserved; -}; - -struct obj_skin_block_cloth_root { - vec3 trans; - vec3 normal; - float_t field_18; - int32_t field_1C; - int32_t field_20; - int32_t field_24; - obj_skin_block_cloth_root_bone_weight bone_weights[4]; -}; - -struct obj_skin_block_cloth_node { - uint32_t flags; - vec3 trans; - vec3 trans_diff; - float_t dist_top; - float_t dist_bottom; - float_t dist_right; - float_t dist_left; + obj_mesh(); }; struct obj_skin_block_node { - char* parent_name; + const char* parent_name; vec3 position; vec3 rotation; vec3 scale; + + obj_skin_block_node(); }; struct obj_skin_skin_param_coli { @@ -445,6 +430,8 @@ struct obj_skin_skin_param_coli { float_t radius; vec3 bone0_pos; vec3 bone1_pos; + + obj_skin_skin_param_coli(); }; struct obj_skin_skin_param { @@ -456,38 +443,77 @@ struct obj_skin_skin_param { float_t rot_z; float_t hinge_y; float_t hinge_z; - char* name; + const char* name; obj_skin_skin_param_coli* coli; int32_t coli_count; float_t coli_r; float_t friction; float_t wind_afc; int32_t unk44; + + obj_skin_skin_param(); }; + +struct obj_skin_block_cloth_root_bone_weight { + const char* bone_name; + float_t weight; + int32_t matrix_index; + int32_t reserved; + + obj_skin_block_cloth_root_bone_weight(); +}; + +struct obj_skin_block_cloth_root { + vec3 trans; + vec3 normal; + float_t field_18; + int32_t field_1C; + int32_t field_20; + int32_t field_24; + obj_skin_block_cloth_root_bone_weight bone_weights[4]; + + obj_skin_block_cloth_root(); +}; + +struct obj_skin_block_cloth_node { + uint32_t flags; + vec3 trans; + vec3 trans_diff; + float_t dist_top; + float_t dist_bottom; + float_t dist_right; + float_t dist_left; + + obj_skin_block_cloth_node(); +}; + struct obj_skin_block_cloth { - char* mesh_name; - char* backface_mesh_name; + const char* mesh_name; + const char* backface_mesh_name; uint32_t field_8; - uint32_t root_count; - uint32_t nodes_count; + uint32_t num_root; + uint32_t num_node; uint32_t field_14; - mat4* mats; - uint32_t mats_count; - obj_skin_block_cloth_root* root; - obj_skin_block_cloth_node* nodes; - uint16_t* mesh_indices; - int32_t mesh_indices_count; - uint16_t* backface_mesh_indices; - int32_t backface_mesh_indices_count; - obj_skin_skin_param skin_param; - bool skin_param_init; + mat4* mat_array; + uint32_t num_mat; + obj_skin_block_cloth_root* root_array; + obj_skin_block_cloth_node* node_array; + uint16_t* mesh_index_array; + int32_t num_mesh_index; + uint16_t* backface_mesh_index_array; + int32_t num_backface_mesh_index; + obj_skin_skin_param* skin_param; uint32_t reserved; + + obj_skin_block_cloth(); }; struct obj_skin_block_constraint_attach_point { bool affected_by_orientation; bool affected_by_scaling; vec3 offset; + + obj_skin_block_constraint_attach_point(); }; struct obj_skin_block_constraint_up_vector { @@ -495,13 +521,17 @@ struct obj_skin_block_constraint_up_vector { float_t roll; vec3 affected_axis; vec3 point_at; - char* name; + const char* name; + + obj_skin_block_constraint_up_vector(); }; struct obj_skin_block_constraint_direction { obj_skin_block_constraint_up_vector up_vector; vec3 align_axis; vec3 target_offset; + + obj_skin_block_constraint_direction(); }; struct obj_skin_block_constraint_distance { @@ -509,116 +539,142 @@ struct obj_skin_block_constraint_distance { float_t distance; obj_skin_block_constraint_attach_point constrained_object; obj_skin_block_constraint_attach_point constraining_object; + + obj_skin_block_constraint_distance(); }; struct obj_skin_block_constraint_orientation { vec3 offset; + + obj_skin_block_constraint_orientation(); }; struct obj_skin_block_constraint_position { obj_skin_block_constraint_up_vector up_vector; obj_skin_block_constraint_attach_point constrained_object; obj_skin_block_constraint_attach_point constraining_object; + + obj_skin_block_constraint_position(); }; struct obj_skin_block_constraint { - obj_skin_block_node base; + obj_skin_block_node node; uint32_t name_index; - char* source_node_name; + const char* source_node_name; obj_skin_block_constraint_coupling coupling; obj_skin_block_constraint_type type; union { - obj_skin_block_constraint_direction direction; - obj_skin_block_constraint_distance distance; - obj_skin_block_constraint_orientation orientation; - obj_skin_block_constraint_position position; + void* data; + obj_skin_block_constraint_direction* direction; + obj_skin_block_constraint_distance* distance; + obj_skin_block_constraint_orientation* orientation; + obj_skin_block_constraint_position* position; }; + + obj_skin_block_constraint(); }; struct obj_skin_block_expression { - obj_skin_block_node base; + obj_skin_block_node node; uint32_t name_index; - uint32_t expressions_count; - char* expressions[9]; + uint32_t num_expression; + const char* expression_array[9]; + + obj_skin_block_expression(); }; struct obj_skin_motion_node { uint32_t name_index; mat4 inv_bind_pose_mat; + + obj_skin_motion_node(); }; struct obj_skin_block_motion { - obj_skin_block_node base; + obj_skin_block_node node; union { - char* name; + const char* name; uint32_t name_index; }; - obj_skin_motion_node* nodes; - uint32_t nodes_count; + obj_skin_motion_node* node_array; + uint32_t num_node; + + obj_skin_block_motion(); }; struct obj_skin_osage_node { uint32_t name_index; float_t length; vec3 rotation; + + obj_skin_osage_node(); }; struct obj_skin_block_osage { - obj_skin_block_node base; + obj_skin_block_node node; uint32_t start_index; uint32_t count; - obj_skin_osage_node* nodes; - uint32_t nodes_count; - obj_skin_skin_param skin_param; - bool skin_param_init; + obj_skin_osage_node* node_array; + uint32_t num_node; + obj_skin_skin_param* skin_param; uint32_t external_name_index; uint32_t name_index; - char* motion_node_name; + const char* motion_node_name; + + obj_skin_block_osage(); }; struct obj_skin_block { obj_skin_block_type type; union { - obj_skin_block_node base; - obj_skin_block_cloth cloth; - obj_skin_block_constraint constraint; - obj_skin_block_expression expression; - obj_skin_block_motion motion; - obj_skin_block_osage osage; + obj_skin_block_node* node; + obj_skin_block_cloth* cloth; + obj_skin_block_constraint* constraint; + obj_skin_block_expression* expression; + obj_skin_block_motion* motion; + obj_skin_block_osage* osage; }; + + obj_skin_block(); }; struct obj_skin_osage_sibling_info { uint32_t name_index; uint32_t sibling_name_index; float_t max_distance; + + obj_skin_osage_sibling_info(); }; struct obj_skin_ex_data { - obj_skin_osage_node* osage_nodes; - uint32_t osage_nodes_count; - obj_skin_block* blocks; - uint32_t blocks_count; - char* bone_names_buf; - char** bone_names; - uint32_t bone_names_count; - obj_skin_osage_sibling_info* osage_sibling_infos; - uint32_t osage_sibling_infos_count; + obj_skin_osage_node* osage_node_array; + uint32_t num_osage_node; + obj_skin_block* block_array; + uint32_t num_block; + const char** bone_name_array; + uint32_t num_bone_name; + obj_skin_osage_sibling_info* osage_sibling_info_array; + uint32_t num_osage_sibling_info; int64_t reserved[7]; + + obj_skin_ex_data(); }; struct obj_skin_bone { uint32_t id; uint32_t parent; mat4 inv_bind_pose_mat; - char* name; + const char* name; + + obj_skin_bone(); }; struct obj_skin { - obj_skin_bone* bones; - uint32_t bones_count; - obj_skin_ex_data ex_data; - bool ex_data_init; + obj_skin_bone* bone_array; + uint32_t num_bone; + obj_skin_ex_data* ex_data; + + obj_skin(); }; struct obj { @@ -629,12 +685,13 @@ struct obj { uint32_t num_material; uint8_t flags; uint32_t reserved[10]; - obj_skin skin; - bool skin_init; - char* name; + obj_skin* skin; + const char* name; uint32_t id; uint32_t hash; + obj(); + obj_mesh* get_obj_mesh(const char* name); uint32_t get_obj_mesh_index(const char* name); }; @@ -652,8 +709,7 @@ struct obj_set { uint32_t reserved[2]; obj_set(); - virtual ~obj_set(); void pack_file(void** data, size_t* size); - void unpack_file(const void* data, size_t size, bool modern); + void unpack_file(prj::shared_ptr alloc, const void* data, size_t size, bool modern); }; diff --git a/src/KKdLib/post_process_table/dof.cpp b/src/KKdLib/post_process_table/dof.cpp index bb740edf..79cab222 100644 --- a/src/KKdLib/post_process_table/dof.cpp +++ b/src/KKdLib/post_process_table/dof.cpp @@ -115,7 +115,9 @@ bool dof::load_file(void* data, const char* path, const char* file, uint32_t has if (t) file_len = t - file; - std::string s = path + std::string(file, file_len); + std::string s; + s.assign(path); + s.append(file, file_len); dof* d = (dof*)data; d->read(s.c_str()); diff --git a/src/KKdLib/prj/shared_ptr.cpp b/src/KKdLib/prj/shared_ptr.cpp new file mode 100644 index 00000000..a6d277b5 --- /dev/null +++ b/src/KKdLib/prj/shared_ptr.cpp @@ -0,0 +1,6 @@ +/* + by korenkonder + GitHub/GitLab: korenkonder +*/ + +#include "shared_ptr.hpp" diff --git a/src/KKdLib/prj/shared_ptr.hpp b/src/KKdLib/prj/shared_ptr.hpp new file mode 100644 index 00000000..ca3b6e11 --- /dev/null +++ b/src/KKdLib/prj/shared_ptr.hpp @@ -0,0 +1,284 @@ +/* + by korenkonder + GitHub/GitLab: korenkonder + + Taken from MSVC's VC/include/memory +*/ + +#pragma once + +#include "../default.hpp" + +namespace prj { + template + class ref_count { + private: + uint32_t uses; + uint32_t weaks; + T* ptr; + void(*delete_this_func)(ref_count* ref); + void(*destroy_func)(ref_count* ref, T* ptr); + + protected: + ref_count() { + uses = 1; + weaks = 1; + ptr = nullptr; + delete_this_func = delete_this; + destroy_func = destroy; + } + + public: + ~ref_count() { + + } + + ref_count(T* ptr) { + uses = 1; + weaks = 1; + this->ptr = ptr; + delete_this_func = delete_this; + destroy_func = destroy; + } + + bool expired() const { + return !use_count(); + } + + void decrement() { + if (!--uses) { + destroy_func(this, ptr); + decrement_weaks(); + } + } + + void decrement_weaks() { + if (!--weaks) + delete_this_func(this); + } + + uint32_t use_count() const { + return uses; + } + + void increment() { + uses++; + } + + void increment_weaks() { + weaks++; + } + + private: + static void delete_this(ref_count* ref) { + delete ref; + } + + static void destroy(ref_count* ref, T* ptr) { + delete ptr; + } + }; + + template + class shared_ptr; + + template + class ptr_base { + public: + typedef ptr_base my_t; + + ptr_base() : ptr(0), ref(0) { + + } + + ptr_base(my_t&& right) noexcept : ptr(0), ref(0) { + assign(std::forward(right)); + } + + template + ptr_base(ptr_base&& right) + : ptr(right.ptr), ref(right.ref) { + right.ptr = 0; + right.ref = 0; + } + + my_t& operator=(my_t&& right) { + assign(std::forward(right)); + return *this; + } + + void assign(my_t&& right) { + swap(right); + } + + uint32_t use_count() const { + return ref ? ref->use_count() : 0; + } + + void swap(ptr_base& right) { + std::swap(ref, right.ref); + std::swap(ptr, right.ptr); + } + + template + bool owner_before(const ptr_base& right) const { + return ref < right.ref; + } + + T* get() const { + return ptr; + } + + bool expired() const { + return !ref || ref->expired(); + } + + void decrement() { + if (ref) + ref->decrement(); + } + + void reset() { + reset(0, 0); + } + + template + void reset(const ptr_base& other) { + reset(other.ptr, other.ref); + } + + template + void reset(T* ptr, const ptr_base& other) { + reset(ptr, other.ref); + } + + void reset(T* other_ptr, ref_count* other_ref) { + if (other_ref) + other_ref->increment(); + reset_base(other_ptr, other_ref); + } + + void reset_base(T* other_ptr, ref_count* other_ref) { + if (ref) + ref->decrement(); + ref = other_ref; + ptr = other_ptr; + } + + void decrement_weaks() { + if (ref) + ref->decrement_weaks(); + } + + private: + T* ptr; + ref_count* ref; + template + friend class ptr_base; + }; + + template + class shared_ptr : public ptr_base { + public: + typedef shared_ptr my_t; + typedef ptr_base my_base; + + shared_ptr() { + + } + + template + explicit shared_ptr(U* ptr) { + reset_ptr(ptr); + } + + template + shared_ptr(nullptr_t) { + reset_ptr((T*)0); + } + + shared_ptr(const my_t& other) { + ptr_base::reset(other); + } + + shared_ptr(my_t&& right) noexcept : my_base(std::forward(right)) { + + } + + my_t& operator=(my_t&& right) noexcept { + shared_ptr(std::move(right)).swap(*this); + return *this; + } + + template + my_t& operator=(shared_ptr&& right) { + shared_ptr(std::move(right)).swap(*this); + return *this; + } + + ~shared_ptr() { + this->decrement(); + } + + my_t& operator=(const my_t& right) { + shared_ptr(right).swap(*this); + return *this; + } + + template + my_t& operator=(const shared_ptr& right) { + shared_ptr(right).swap(*this); + return *this; + } + + void reset() { + shared_ptr().swap(*this); + } + + template + void reset(U* ptr) { + shared_ptr(ptr).swap(*this); + } + + T* operator->() const { + return this->get(); + } + + bool unique() const { + return this->use_count() == 1; + } + + operator bool() const { + return !!this->get(); + } + + private: + template + void reset_ptr(U* ptr) { + try { + this->reset_base(ptr, new ref_count(ptr)); + } + catch (...) { + delete ptr; + throw; + } + } + }; + + template + bool operator==(const shared_ptr& left, + const shared_ptr& right) { + return left.get() == right.get(); + } + + template + bool operator!=(const shared_ptr& left, + const shared_ptr& right) { + return !(left == right); + } + + template + void swap(shared_ptr& left, shared_ptr& right) { + left.swap(right); + } +} diff --git a/src/KKdLib/pv_exp.cpp b/src/KKdLib/pv_exp.cpp index 8ec0b34f..cc553f5e 100644 --- a/src/KKdLib/pv_exp.cpp +++ b/src/KKdLib/pv_exp.cpp @@ -10,12 +10,16 @@ #include "io/path.hpp" #include "str_utils.hpp" -static void pv_exp_classic_read_inner(pv_exp* exp, stream& s); +static void pv_exp_classic_read_inner(pv_exp* exp, prj::shared_ptr& alloc, stream& s); static void pv_exp_classic_write_inner(pv_exp* exp, stream& s); -static void pv_exp_modern_read_inner(pv_exp* exp, stream& s, uint32_t header_length); + +static void pv_exp_modern_read_inner(pv_exp* exp, prj::shared_ptr& alloc, stream& s, uint32_t header_length); static void pv_exp_modern_write_inner(pv_exp* exp, stream& s); -pv_exp_mot::pv_exp_mot() : face_data(), face_cl_data() { +static const char* pv_exp_read_utf8_string_null_terminated_offset( + prj::shared_ptr& alloc, stream& s, int64_t offset); + +pv_exp_mot::pv_exp_mot() : face_data(), face_cl_data(), name() { } @@ -31,152 +35,11 @@ pv_exp_mot::~pv_exp_mot() { } } -pv_exp::pv_exp() : ready(), modern(), big_endian(), is_x() { +pv_exp::pv_exp() : ready(), modern(), big_endian(), is_x(), motion_data(), motion_num() { } -pv_exp::~pv_exp() { - -} - -void pv_exp::read(const char* path, bool modern) { - if (!path) - return; - - if (!modern) { - char* path_bin = str_utils_add(path, ".bin"); - if (path_check_file_exists(path_bin)) { - file_stream s; - s.open(path_bin, "rb"); - if (s.check_not_null()) { - uint8_t* data = force_malloc_s(uint8_t, s.length); - s.read(data, s.length); - memory_stream s_bin; - s_bin.open(data, s.length); - pv_exp_classic_read_inner(this, s_bin); - free_def(data); - } - } - free_def(path_bin); - } - else { - char* path_dex = str_utils_add(path, ".dex"); - if (path_check_file_exists(path_dex)) { - f2_struct st; - st.read(path_dex); - if (st.header.signature == reverse_endianness_uint32_t('EXPC')) { - memory_stream s_expc; - s_expc.open(st.data); - s_expc.big_endian = st.header.use_big_endian; - pv_exp_modern_read_inner(this, s_expc, st.header.length); - } - } - free_def(path_dex); - } -} - -void pv_exp::read(const wchar_t* path, bool modern) { - if (!path) - return; - - if (!modern) { - wchar_t* path_bin = str_utils_add(path, L".bin"); - if (path_check_file_exists(path_bin)) { - file_stream s; - s.open(path_bin, L"rb"); - if (s.check_not_null()) { - uint8_t* data = force_malloc_s(uint8_t, s.length); - s.read(data, s.length); - memory_stream s_bin; - s_bin.open(data, s.length); - pv_exp_classic_read_inner(this, s_bin); - free_def(data); - } - } - free_def(path_bin); - } - else { - wchar_t* path_dex = str_utils_add(path, L".dex"); - if (path_check_file_exists(path_dex)) { - f2_struct st; - st.read(path_dex); - if (st.header.signature == reverse_endianness_uint32_t('EXPC')) { - memory_stream s_expc; - s_expc.open(st.data); - s_expc.big_endian = st.header.use_big_endian; - pv_exp_modern_read_inner(this, s_expc, st.header.length); - } - } - free_def(path_dex); - } -} - -void pv_exp::read(const void* data, size_t size, bool modern) { - if (!data || !size) - return; - - if (!modern) { - memory_stream s; - s.open(data, size); - pv_exp_classic_read_inner(this, s); - } - else { - f2_struct st; - st.read(data, size); - if (st.header.signature == reverse_endianness_uint32_t('EXPC')) { - memory_stream s_expc; - s_expc.open(st.data); - s_expc.big_endian = st.header.use_big_endian; - pv_exp_modern_read_inner(this, s_expc, st.header.length); - } - } -} - -void pv_exp::write(const char* path) { - if (!path || !ready) - return; - - if (!modern) { - char* path_bin = str_utils_add(path, ".bin"); - file_stream s; - s.open(path_bin, "wb"); - if (s.check_not_null()) - pv_exp_classic_write_inner(this, s); - free_def(path_bin); - } - else { - char* path_dex = str_utils_add(path, ".dex"); - file_stream s; - s.open(path_dex, "wb"); - if (s.check_not_null()) - pv_exp_modern_write_inner(this, s); - free_def(path_dex); - } -} - -void pv_exp::write(const wchar_t* path) { - if (!path || !ready) - return; - - if (!modern) { - wchar_t* path_bin = str_utils_add(path, L".bin"); - file_stream s; - s.open(path_bin, L"wb"); - if (s.check_not_null()) - pv_exp_classic_write_inner(this, s); - free_def(path_bin); - } - else { - wchar_t* path_dex = str_utils_add(path, L".dex"); - file_stream s; - s.open(path_dex, L"wb"); - if (s.check_not_null()) - pv_exp_modern_write_inner(this, s); - free_def(path_dex); - } -} - -void pv_exp::write(void** data, size_t* size) { +void pv_exp::pack_file(void** data, size_t* size) { if (!data || !size || !ready) return; @@ -190,22 +53,28 @@ void pv_exp::write(void** data, size_t* size) { s.copy(data, size); } -bool pv_exp::load_file(void* data, const char* path, const char* file, uint32_t hash) { - size_t file_len = utf8_length(file); +void pv_exp::unpack_file(prj::shared_ptr alloc, const void* data, size_t size, bool modern) { + if (!data || !size) + return; - const char* t = strrchr(file, '.'); - if (t) - file_len = t - file; - - std::string s = path + std::string(file, file_len); - - pv_exp* exp = (pv_exp*)data; - exp->read(s.c_str(), exp->modern); - - return exp->ready; + if (!modern) { + memory_stream s; + s.open(data, size); + pv_exp_classic_read_inner(this, alloc, s); + } + else { + f2_struct st; + st.read(data, size); + if (st.header.signature == reverse_endianness_uint32_t('EXPC')) { + memory_stream s_expc; + s_expc.open(st.data); + s_expc.big_endian = st.header.use_big_endian; + pv_exp_modern_read_inner(this, alloc, s_expc, st.header.length); + } + } } -static void pv_exp_classic_read_inner(pv_exp* exp, stream& s) { +static void pv_exp_classic_read_inner(pv_exp* exp, prj::shared_ptr& alloc, stream& s) { if (s.read_uint32_t() != 0x64) { exp->ready = false; exp->modern = false; @@ -214,32 +83,37 @@ static void pv_exp_classic_read_inner(pv_exp* exp, stream& s) { return; } - exp->motion_data.resize(0); - exp->motion_data.resize(s.read_int32_t()); + uint32_t motion_num = s.read_int32_t(); + pv_exp_mot* motion_data = alloc->allocate(motion_num); + exp->motion_data = motion_data; + exp->motion_num = motion_num; int64_t motion_offsets_offset = s.read_int32_t(); int64_t name_offsets_offset = s.read_uint32_t(); - int64_t* face_offset = force_malloc_s(int64_t, exp->motion_data.size()); - int64_t* face_cl_offset = force_malloc_s(int64_t, exp->motion_data.size()); - int64_t* name_offset = force_malloc_s(int64_t, exp->motion_data.size()); + int64_t* offsets = force_malloc_s(int64_t, motion_num * 3ULL); + int64_t* face_offset = offsets; + int64_t* face_cl_offset = offsets + motion_num; + int64_t* name_offset = offsets + motion_num * 2ULL; s.position_push(motion_offsets_offset, SEEK_SET); - for (pv_exp_mot& i : exp->motion_data) { - face_offset[&i - exp->motion_data.data()] = s.read_uint32_t(); - face_cl_offset[&i - exp->motion_data.data()] = s.read_uint32_t(); + for (uint32_t i = 0; i < motion_num; i++) { + face_offset[i] = s.read_uint32_t(); + face_cl_offset[i] = s.read_uint32_t(); } s.position_pop(); s.position_push(name_offsets_offset, SEEK_SET); - for (pv_exp_mot& i : exp->motion_data) - name_offset[&i - exp->motion_data.data()] = s.read_uint32_t(); + for (uint32_t i = 0; i < motion_num; i++) + name_offset[i] = s.read_uint32_t(); s.position_pop(); - for (pv_exp_mot& i : exp->motion_data) { - if (face_offset[&i - exp->motion_data.data()]) { + for (uint32_t i = 0; i < motion_num; i++) { + pv_exp_mot& mot = motion_data[i]; + + if (face_offset[i]) { size_t face_count = 0; - s.position_push(face_offset[&i - exp->motion_data.data()], SEEK_SET); + s.position_push(face_offset[i], SEEK_SET); s.read(0x04); while (s.read_int16_t() != -1) { s.read(0x0C); @@ -248,9 +122,9 @@ static void pv_exp_classic_read_inner(pv_exp* exp, stream& s) { face_count++; s.position_pop(); - i.face_data = new pv_exp_data[face_count]; - pv_exp_data* face_data = i.face_data; - s.position_push(face_offset[&i - exp->motion_data.data()], SEEK_SET); + pv_exp_data* face_data = alloc->allocate(face_count); + mot.face_data = face_data; + s.position_push(face_offset[i], SEEK_SET); for (size_t j = face_count; j; j--, face_data++) { face_data->frame = s.read_float_t(); face_data->type = s.read_int16_t(); @@ -261,9 +135,9 @@ static void pv_exp_classic_read_inner(pv_exp* exp, stream& s) { s.position_pop(); } - if (face_cl_offset[&i - exp->motion_data.data()]) { + if (face_cl_offset[i]) { size_t face_cl_count = 0; - s.position_push(face_cl_offset[&i - exp->motion_data.data()], SEEK_SET); + s.position_push(face_cl_offset[i], SEEK_SET); s.read(0x04); while (s.read_int16_t() != -1) { s.read(0x0C); @@ -272,9 +146,9 @@ static void pv_exp_classic_read_inner(pv_exp* exp, stream& s) { face_cl_count++; s.position_pop(); - i.face_cl_data = new pv_exp_data[face_cl_count]; - pv_exp_data* face_cl_data = i.face_cl_data; - s.position_push(face_cl_offset[&i - exp->motion_data.data()], SEEK_SET); + pv_exp_data* face_cl_data = alloc->allocate(face_cl_count); + mot.face_cl_data = face_cl_data; + s.position_push(face_cl_offset[i], SEEK_SET); for (size_t j = face_cl_count; j; j--, face_cl_data++) { face_cl_data->frame = s.read_float_t(); face_cl_data->type = s.read_int16_t(); @@ -285,13 +159,11 @@ static void pv_exp_classic_read_inner(pv_exp* exp, stream& s) { s.position_pop(); } - if (name_offset[&i - exp->motion_data.data()]) - i.name = s.read_string_null_terminated_offset(name_offset[&i - exp->motion_data.data()]); + if (name_offset[i]) + mot.name = pv_exp_read_utf8_string_null_terminated_offset(alloc, s, name_offset[i]); } - free_def(face_offset); - free_def(face_cl_offset); - free_def(name_offset); + free_def(offsets); exp->ready = true; exp->modern = false; @@ -300,8 +172,10 @@ static void pv_exp_classic_read_inner(pv_exp* exp, stream& s) { } static void pv_exp_classic_write_inner(pv_exp* exp, stream& s) { + uint32_t motion_num = exp->motion_num; + s.write_uint32_t(0x64); - s.write_uint32_t((uint32_t)exp->motion_data.size()); + s.write_uint32_t(motion_num); s.write_uint32_t(0x20); s.position_push(s.get_position(), SEEK_SET); @@ -310,21 +184,24 @@ static void pv_exp_classic_write_inner(pv_exp* exp, stream& s) { s.write_uint32_t(0x00); s.write_uint32_t(0x00); - for (pv_exp_mot& i : exp->motion_data) { + for (uint32_t i = 0; i < motion_num; i++) { s.write_uint32_t(0x00); s.write_uint32_t(0x00); s.write_uint32_t(0x00); } s.align_write(0x20); - int64_t* face_offset = force_malloc_s(int64_t, exp->motion_data.size()); - int64_t* face_cl_offset = force_malloc_s(int64_t, exp->motion_data.size()); - int64_t* name_offset = force_malloc_s(int64_t, exp->motion_data.size()); + int64_t* offsets = force_malloc_s(int64_t, motion_num * 3ULL); + int64_t* face_offset = offsets; + int64_t* face_cl_offset = offsets + motion_num; + int64_t* name_offset = offsets + motion_num * 2ULL; - for (pv_exp_mot& i : exp->motion_data) { - face_offset[&i - exp->motion_data.data()] = s.get_position(); + pv_exp_mot* motion_data = exp->motion_data; + for (uint32_t i = 0; i < motion_num; i++) { + pv_exp_mot& mot = motion_data[i]; + face_offset[i] = s.get_position(); - pv_exp_data* face_data = i.face_data; + pv_exp_data* face_data = mot.face_data; while (true) { s.write_float_t(face_data->frame); s.write_int16_t(face_data->type); @@ -339,9 +216,9 @@ static void pv_exp_classic_write_inner(pv_exp* exp, stream& s) { } s.align_write(0x20); - face_cl_offset[&i - exp->motion_data.data()] = s.get_position(); + face_cl_offset[i] = s.get_position(); - pv_exp_data* face_cl_data = i.face_cl_data; + pv_exp_data* face_cl_data = mot.face_cl_data; while (true) { s.write_float_t(face_cl_data->frame); s.write_int16_t(face_cl_data->type); @@ -357,31 +234,29 @@ static void pv_exp_classic_write_inner(pv_exp* exp, stream& s) { s.align_write(0x20); } - for (pv_exp_mot& i : exp->motion_data) { - name_offset[&i - exp->motion_data.data()] = s.get_position(); - s.write_string_null_terminated(i.name); + for (uint32_t i = 0; i < motion_num; i++) { + name_offset[i] = s.get_position(); + s.write_utf8_string_null_terminated(motion_data[i].name); } s.align_write(0x10); s.set_position(exp->is_x ? 0x28 : 0x20, SEEK_SET); - for (pv_exp_mot& i : exp->motion_data) { - s.write_uint32_t((uint32_t)face_offset[&i - exp->motion_data.data()]); - s.write_uint32_t((uint32_t)face_cl_offset[&i - exp->motion_data.data()]); + for (uint32_t i = 0; i < motion_num; i++) { + s.write_uint32_t((uint32_t)face_offset[i]); + s.write_uint32_t((uint32_t)face_cl_offset[i]); } int64_t name_offsets_offset = s.get_position(); - for (pv_exp_mot& i : exp->motion_data) - s.write_uint32_t((uint32_t)name_offset[&i - exp->motion_data.data()]); + for (uint32_t i = 0; i < motion_num; i++) + s.write_uint32_t((uint32_t)name_offset[i]); - free_def(face_offset); - free_def(face_cl_offset); - free_def(name_offset); + free_def(offsets); s.position_pop(); s.write_uint32_t((uint32_t)name_offsets_offset); } -static void pv_exp_modern_read_inner(pv_exp* exp, stream& s, uint32_t header_length) { +static void pv_exp_modern_read_inner(pv_exp* exp, prj::shared_ptr& alloc, stream& s, uint32_t header_length) { if (s.read_uint32_t() != 0x64) { exp->ready = false; exp->modern = false; @@ -393,8 +268,10 @@ static void pv_exp_modern_read_inner(pv_exp* exp, stream& s, uint32_t header_len bool big_endian = s.big_endian; bool is_x = false; - exp->motion_data.resize(0); - exp->motion_data.resize(s.read_int32_t()); + uint32_t motion_num = s.read_int32_t(); + pv_exp_mot* motion_data = alloc->allocate(motion_num); + exp->motion_data = motion_data; + exp->motion_num = motion_num; int64_t motion_offsets_offset = s.read_int32_t(); int64_t name_offsets_offset = s.read_offset_f2(header_length); @@ -403,36 +280,39 @@ static void pv_exp_modern_read_inner(pv_exp* exp, stream& s, uint32_t header_len name_offsets_offset = (int)s.read_offset_x(); } - int64_t* face_offset = force_malloc_s(int64_t, exp->motion_data.size()); - int64_t* face_cl_offset = force_malloc_s(int64_t, exp->motion_data.size()); - int64_t* name_offset = force_malloc_s(int64_t, exp->motion_data.size()); + int64_t* offsets = force_malloc_s(int64_t, motion_num * 3ULL); + int64_t* face_offset = offsets; + int64_t* face_cl_offset = offsets + motion_num; + int64_t* name_offset = offsets + motion_num * 2ULL; s.position_push(motion_offsets_offset, SEEK_SET); if (!is_x) - for (pv_exp_mot& i : exp->motion_data) { - face_offset[&i - exp->motion_data.data()] = s.read_offset_f2(header_length); - face_cl_offset[&i - exp->motion_data.data()] = s.read_offset_f2(header_length); + for (uint32_t i = 0; i < motion_num; i++) { + face_offset[i] = s.read_offset_f2(header_length); + face_cl_offset[i] = s.read_offset_f2(header_length); } else - for (pv_exp_mot& i : exp->motion_data) { - face_offset[&i - exp->motion_data.data()] = s.read_offset_x(); - face_cl_offset[&i - exp->motion_data.data()] = s.read_offset_x(); + for (uint32_t i = 0; i < motion_num; i++) { + face_offset[i] = s.read_offset_x(); + face_cl_offset[i] = s.read_offset_x(); } s.position_pop(); s.position_push(name_offsets_offset, SEEK_SET); if (!is_x) - for (pv_exp_mot& i : exp->motion_data) - name_offset[&i - exp->motion_data.data()] = s.read_offset_f2(header_length); + for (uint32_t i = 0; i < motion_num; i++) + name_offset[i] = s.read_offset_f2(header_length); else - for (pv_exp_mot& i : exp->motion_data) - name_offset[&i - exp->motion_data.data()] = s.read_offset_x(); + for (uint32_t i = 0; i < motion_num; i++) + name_offset[i] = s.read_offset_x(); s.position_pop(); - for (pv_exp_mot& i : exp->motion_data) { - if (face_offset[&i - exp->motion_data.data()]) { + for (uint32_t i = 0; i < motion_num; i++) { + pv_exp_mot& mot = motion_data[i]; + + if (face_offset[i]) { size_t face_count = 0; - s.position_push(face_offset[&i - exp->motion_data.data()], SEEK_SET); + s.position_push(face_offset[i], SEEK_SET); s.read(0x04); while (s.read_int16_t() != -1) { s.read(0x0E); @@ -441,9 +321,9 @@ static void pv_exp_modern_read_inner(pv_exp* exp, stream& s, uint32_t header_len face_count++; s.position_pop(); - i.face_data = new pv_exp_data[face_count]; - pv_exp_data* face_data = i.face_data; - s.position_push(face_offset[&i - exp->motion_data.data()], SEEK_SET); + pv_exp_data* face_data = alloc->allocate(face_count); + mot.face_data = face_data; + s.position_push(face_offset[i], SEEK_SET); for (size_t j = face_count; j; j--, face_data++) { face_data->frame = s.read_float_t_reverse_endianness(); face_data->type = s.read_int16_t_reverse_endianness(); @@ -454,9 +334,9 @@ static void pv_exp_modern_read_inner(pv_exp* exp, stream& s, uint32_t header_len s.position_pop(); } - if (face_cl_offset[&i - exp->motion_data.data()]) { + if (face_cl_offset[i]) { size_t face_cl_count = 0; - s.position_push(face_cl_offset[&i - exp->motion_data.data()], SEEK_SET); + s.position_push(face_cl_offset[i], SEEK_SET); s.read(0x04); while (s.read_int16_t() != -1) { s.read(0x0E); @@ -465,9 +345,9 @@ static void pv_exp_modern_read_inner(pv_exp* exp, stream& s, uint32_t header_len face_cl_count++; s.position_pop(); - i.face_cl_data = new pv_exp_data[face_cl_count]; - pv_exp_data* face_cl_data = i.face_cl_data; - s.position_push(face_cl_offset[&i - exp->motion_data.data()], SEEK_SET); + pv_exp_data* face_cl_data = alloc->allocate(face_cl_count); + mot.face_cl_data = face_cl_data; + s.position_push(face_cl_offset[i], SEEK_SET); for (size_t j = face_cl_count; j; j--, face_cl_data++) { face_cl_data->frame = s.read_float_t_reverse_endianness(); face_cl_data->type = s.read_int16_t_reverse_endianness(); @@ -478,13 +358,11 @@ static void pv_exp_modern_read_inner(pv_exp* exp, stream& s, uint32_t header_len s.position_pop(); } - if (name_offset[&i - exp->motion_data.data()]) - i.name = s.read_string_null_terminated_offset(name_offset[&i - exp->motion_data.data()]); + if (name_offset[i]) + mot.name = pv_exp_read_utf8_string_null_terminated_offset(alloc, s, name_offset[i]); } - free_def(face_offset); - free_def(face_cl_offset); - free_def(name_offset); + free_def(offsets); exp->ready = true; exp->modern = true; @@ -495,13 +373,14 @@ static void pv_exp_modern_read_inner(pv_exp* exp, stream& s, uint32_t header_len static void pv_exp_modern_write_inner(pv_exp* exp, stream& s) { bool big_endian = exp->big_endian; bool is_x = exp->is_x; + uint32_t motion_num = exp->motion_num; memory_stream s_expc; s_expc.open(); s_expc.big_endian = big_endian; s_expc.write_uint32_t_reverse_endianness(0x64); - s_expc.write_int32_t_reverse_endianness((int32_t)exp->motion_data.size()); + s_expc.write_uint32_t_reverse_endianness(motion_num); s_expc.write_offset(is_x ? 0x28 : 0x20, 0x20, is_x); s_expc.position_push(s_expc.get_position(), SEEK_SET); @@ -511,27 +390,30 @@ static void pv_exp_modern_write_inner(pv_exp* exp, stream& s) { s_expc.write_offset(0x00, 0x20, is_x); if (!is_x) - for (pv_exp_mot& i : exp->motion_data) { + for (uint32_t i = 0; i < motion_num; i++) { s_expc.write_offset_f2(0x00, 0x20); s_expc.write_offset_f2(0x00, 0x20); s_expc.write_offset_f2(0x00, 0x20); } else - for (pv_exp_mot& i : exp->motion_data) { + for (uint32_t i = 0; i < motion_num; i++) { s_expc.write_offset_x(0x00); s_expc.write_offset_x(0x00); s_expc.write_offset_x(0x00); } s_expc.align_write(0x20); - int64_t* face_offset = force_malloc_s(int64_t, exp->motion_data.size()); - int64_t* face_cl_offset = force_malloc_s(int64_t, exp->motion_data.size()); - int64_t* name_offset = force_malloc_s(int64_t, exp->motion_data.size()); + int64_t* offsets = force_malloc_s(int64_t, motion_num * 3ULL); + int64_t* face_offset = offsets; + int64_t* face_cl_offset = offsets + motion_num; + int64_t* name_offset = offsets + motion_num * 2ULL; - for (pv_exp_mot& i : exp->motion_data) { - face_offset[&i - exp->motion_data.data()] = s_expc.get_position(); + pv_exp_mot* motion_data = exp->motion_data; + for (uint32_t i = 0; i < motion_num; i++) { + pv_exp_mot& mot = motion_data[i]; + face_offset[i] = s_expc.get_position(); - pv_exp_data* face_data = i.face_data; + pv_exp_data* face_data = mot.face_data; while (true) { s_expc.write_float_t_reverse_endianness(face_data->frame); s_expc.write_int16_t_reverse_endianness(face_data->type); @@ -546,9 +428,9 @@ static void pv_exp_modern_write_inner(pv_exp* exp, stream& s) { } s_expc.align_write(0x20); - face_cl_offset[&i - exp->motion_data.data()] = s_expc.get_position(); + face_cl_offset[i] = s_expc.get_position(); - pv_exp_data* face_cl_data = i.face_cl_data; + pv_exp_data* face_cl_data = mot.face_cl_data; while (true) { s_expc.write_float_t_reverse_endianness(face_cl_data->frame); s_expc.write_int16_t_reverse_endianness(face_cl_data->type); @@ -564,35 +446,33 @@ static void pv_exp_modern_write_inner(pv_exp* exp, stream& s) { s_expc.align_write(0x20); } - for (pv_exp_mot& i : exp->motion_data) { - name_offset[&i - exp->motion_data.data()] = s_expc.get_position(); - s_expc.write_string_null_terminated(i.name); + for (uint32_t i = 0; i < motion_num; i++) { + name_offset[i] = s_expc.get_position(); + s_expc.write_utf8_string_null_terminated(motion_data[i].name); } s_expc.align_write(0x10); s_expc.set_position(is_x ? 0x28 : 0x20, SEEK_SET); if (!is_x) - for (pv_exp_mot& i : exp->motion_data) { - s_expc.write_offset_f2(face_offset[&i - exp->motion_data.data()], 0x20); - s_expc.write_offset_f2(face_cl_offset[&i - exp->motion_data.data()], 0x20); + for (uint32_t i = 0; i < motion_num; i++) { + s_expc.write_offset_f2(face_offset[i], 0x20); + s_expc.write_offset_f2(face_cl_offset[i], 0x20); } else - for (pv_exp_mot& i : exp->motion_data) { - s_expc.write_offset_x(face_offset[&i - exp->motion_data.data()]); - s_expc.write_offset_x(face_cl_offset[&i - exp->motion_data.data()]); + for (uint32_t i = 0; i < motion_num; i++) { + s_expc.write_offset_x(face_offset[i]); + s_expc.write_offset_x(face_cl_offset[i]); } int64_t name_offsets_offset = s_expc.get_position(); if (!is_x) - for (pv_exp_mot& i : exp->motion_data) - s_expc.write_offset_f2(name_offset[&i - exp->motion_data.data()], 0x20); + for (uint32_t i = 0; i < motion_num; i++) + s_expc.write_offset_f2(name_offset[i], 0x20); else - for (pv_exp_mot& i : exp->motion_data) - s_expc.write_offset_x(name_offset[&i - exp->motion_data.data()]); + for (uint32_t i = 0; i < motion_num; i++) + s_expc.write_offset_x(name_offset[i]); - free_def(face_offset); - free_def(face_cl_offset); - free_def(name_offset); + free_def(offsets); s_expc.position_pop(); @@ -610,3 +490,14 @@ static void pv_exp_modern_write_inner(pv_exp* exp, stream& s) { st.write(s, true, exp->is_x); } + +inline static const char* pv_exp_read_utf8_string_null_terminated_offset( + prj::shared_ptr& alloc, stream& s, int64_t offset) { + size_t len = s.read_utf8_string_null_terminated_offset_length(offset); + char* str = alloc->allocate(len + 1); + s.position_push(offset, SEEK_SET); + s.read(str, len); + s.position_pop(); + str[len] = 0; + return str; +} diff --git a/src/KKdLib/pv_exp.hpp b/src/KKdLib/pv_exp.hpp index ebf81001..e6cf7c1c 100644 --- a/src/KKdLib/pv_exp.hpp +++ b/src/KKdLib/pv_exp.hpp @@ -8,6 +8,8 @@ #include #include #include "default.hpp" +#include "prj/shared_ptr.hpp" +#include "alloc_data.hpp" struct pv_exp_data { float_t frame; @@ -20,7 +22,7 @@ struct pv_exp_data { struct pv_exp_mot { pv_exp_data* face_data; pv_exp_data* face_cl_data; - std::string name; + const char* name; pv_exp_mot(); ~pv_exp_mot(); @@ -32,17 +34,11 @@ struct pv_exp { bool big_endian; bool is_x; - std::vector motion_data; + pv_exp_mot* motion_data; + uint32_t motion_num; pv_exp(); - virtual ~pv_exp(); - void read(const char* path, bool modern); - void read(const wchar_t* path, bool modern); - void read(const void* data, size_t size, bool modern); - void write(const char* path); - void write(const wchar_t* path); - void write(void** data, size_t* size); - - static bool load_file(void* data, const char* path, const char* file, uint32_t hash); + void pack_file(void** data, size_t* size); + void unpack_file(prj::shared_ptr alloc, const void* data, size_t size, bool modern); }; diff --git a/src/KKdLib/pvpp.cpp b/src/KKdLib/pvpp.cpp index bd20e1c6..ea094d16 100644 --- a/src/KKdLib/pvpp.cpp +++ b/src/KKdLib/pvpp.cpp @@ -123,7 +123,9 @@ bool pvpp::load_file(void* data, const char* path, const char* file, uint32_t ha if (t) file_len = t - file; - std::string s = path + std::string(file, file_len); + std::string s; + s.assign(path); + s.append(file, file_len); pvpp* pp = (pvpp*)data; pp->read(s.c_str()); diff --git a/src/KKdLib/pvsr.cpp b/src/KKdLib/pvsr.cpp index 8eb61366..13b3e0d5 100644 --- a/src/KKdLib/pvsr.cpp +++ b/src/KKdLib/pvsr.cpp @@ -139,7 +139,9 @@ bool pvsr::load_file(void* data, const char* path, const char* file, uint32_t ha if (t) file_len = t - file; - std::string s = path + std::string(file, file_len); + std::string s; + s.assign(path); + s.append(file, file_len); pvsr* sr = (pvsr*)data; sr->read(s.c_str()); diff --git a/src/KKdLib/quat.hpp b/src/KKdLib/quat.hpp index 2e110f07..74a255c2 100644 --- a/src/KKdLib/quat.hpp +++ b/src/KKdLib/quat.hpp @@ -267,8 +267,8 @@ inline quat quat::mult_min_max(const quat& left, const quat& min, const quat& ma quat w; xt = _mm_loadu_ps((const float*)&left); yt = _mm_xor_ps(_mm_loadu_ps((const float*)&(min)), vec4_neg); - wt = _mm_or_ps(_mm_and_ps(yt, _mm_cmplt_ps(xt, _mm_loadu_ps((const float*)&(vec4_null)))), - _mm_and_ps(_mm_loadu_ps((const float*)&(max)), _mm_cmpge_ps(xt, _mm_loadu_ps((const float*)&(vec4_null))))); + wt = _mm_or_ps(_mm_and_ps(yt, _mm_cmplt_ps(xt, vec4::load_xmm(0.0f))), + _mm_and_ps(_mm_loadu_ps((const float*)&(max)), _mm_cmpge_ps(xt, vec4::load_xmm(0.0f)))); _mm_storeu_ps((float*)&w, _mm_mul_ps(xt, wt)); return w; } @@ -285,8 +285,8 @@ inline quat quat::mult_min_max(const quat& left, const float_t min, const float_ zt = _mm_set_ss(max); zt = _mm_shuffle_ps(zt, zt, 0); yt = _mm_xor_ps(yt, vec4_neg); - wt = _mm_or_ps(_mm_and_ps(yt, _mm_cmplt_ps(xt, _mm_loadu_ps((const float*)&(vec4_null)))), - _mm_and_ps(zt, _mm_cmpge_ps(xt, _mm_loadu_ps((const float*)&(vec4_null))))); + wt = _mm_or_ps(_mm_and_ps(yt, _mm_cmplt_ps(xt, vec4::load_xmm(0.0f))), + _mm_and_ps(zt, _mm_cmpge_ps(xt, vec4::load_xmm(0.0f)))); _mm_storeu_ps((float*)&w, _mm_mul_ps(xt, wt)); return w; } @@ -298,8 +298,8 @@ inline quat quat::div_min_max(const quat& left, const quat& min, const quat& max quat w; xt = _mm_loadu_ps((const float*)&left); yt = _mm_xor_ps(_mm_loadu_ps((const float*)&(min)), vec4_neg); - wt = _mm_or_ps(_mm_and_ps(yt, _mm_cmplt_ps(xt, _mm_loadu_ps((const float*)&(vec4_null)))), - _mm_and_ps(_mm_loadu_ps((const float*)&(max)), _mm_cmpge_ps(xt, _mm_loadu_ps((const float*)&(vec4_null))))); + wt = _mm_or_ps(_mm_and_ps(yt, _mm_cmplt_ps(xt, vec4::load_xmm(0.0f))), + _mm_and_ps(_mm_loadu_ps((const float*)&(max)), _mm_cmpge_ps(xt, vec4::load_xmm(0.0f)))); _mm_storeu_ps((float*)&w, _mm_div_ps(xt, wt)); return w; } @@ -316,8 +316,8 @@ inline quat quat::div_min_max(const quat& left, const float_t min, const float_t zt = _mm_set_ss(max); zt = _mm_shuffle_ps(zt, zt, 0); yt = _mm_xor_ps(yt, vec4_neg); - wt = _mm_or_ps(_mm_and_ps(yt, _mm_cmplt_ps(xt, _mm_loadu_ps((const float*)&(vec4_null)))), - _mm_and_ps(zt, _mm_cmpge_ps(xt, _mm_loadu_ps((const float*)&(vec4_null))))); + wt = _mm_or_ps(_mm_and_ps(yt, _mm_cmplt_ps(xt, vec4::load_xmm(0.0f))), + _mm_and_ps(zt, _mm_cmpge_ps(xt, vec4::load_xmm(0.0f)))); _mm_storeu_ps((float*)&w, _mm_div_ps(xt, wt)); return w; } diff --git a/src/KKdLib/sort.cpp b/src/KKdLib/sort.cpp index 170b30f6..32cb9c62 100644 --- a/src/KKdLib/sort.cpp +++ b/src/KKdLib/sort.cpp @@ -441,17 +441,17 @@ static int quicksort_wchar_t_ptr_compare(void const* src1, void const* src2) { static int quicksort_std_string_compare(void const* src1, void const* src2) { std::string* str1 = (std::string*)src1; std::string* str2 = (std::string*)src2; - return str_utils_compare(str1->c_str(), str2->c_str()); + return str1->compare(*str2); } static int quicksort_std_wstring_compare(void const* src1, void const* src2) { std::wstring* str1 = (std::wstring*)src1; std::wstring* str2 = (std::wstring*)src2; - return str_utils_compare(str1->c_str(), str2->c_str()); + return str1->compare(*str2); } static int quicksort_string_hash_compare(void const* src1, void const* src2) { string_hash* str1 = (string_hash*)src1; string_hash* str2 = (string_hash*)src2; - return str_utils_compare(str1->c_str(), str2->c_str()); + return str1->str.compare(str2->str); } diff --git a/src/KKdLib/sound/vag.cpp b/src/KKdLib/sound/vag.cpp index e60ea372..38d269b1 100644 --- a/src/KKdLib/sound/vag.cpp +++ b/src/KKdLib/sound/vag.cpp @@ -266,9 +266,10 @@ static bool vag_read_inner(vag* v, stream& s, float_t*& data, size_t& num_blocks s.read_uint32_t(); s.read_uint32_t(); s.read_uint16_t(); - v->channels = s.read_uint16_t(); + v->channels = s.read_uint8_t(); if (v->channels < 2) v->channels = 1; + s.read_uint8_t(); s.read_uint64_t(); s.read_uint64_t(); @@ -339,6 +340,11 @@ static bool vag_read_inner(vag* v, stream& s, float_t*& data, size_t& num_blocks static void vag_write_inner(vag* v, stream& s, const float_t* data, const uint8_t* flags, vag_option option) { int32_t coef_index_count; switch (option) { + case VAG_OPTION_VAG: + case VAG_OPTION_HEVAG_FASTEST: + default: + coef_index_count = 5; + break; case VAG_OPTION_HEVAG_FAST: coef_index_count = 16; break; @@ -354,9 +360,6 @@ static void vag_write_inner(vag* v, stream& s, const float_t* data, const uint8_ case VAG_OPTION_HEVAG_SLOWASHELL: coef_index_count = 128; break; - default: - coef_index_count = 5; - break; } bool hevag = option != VAG_OPTION_VAG; @@ -368,7 +371,8 @@ static void vag_write_inner(vag* v, stream& s, const float_t* data, const uint8_ s.write_uint32_t(0); s.write_uint32_t(0); s.write_uint16_t(0); - s.write_uint16_t(hevag ? v->channels : 1); + s.write_uint8_t(hevag ? (uint8_t)v->channels : 1); + s.write_uint8_t(0); s.write_uint64_t(0); s.write_uint64_t(0); diff --git a/src/KKdLib/stage_param/fog_ring.cpp b/src/KKdLib/stage_param/fog_ring.cpp new file mode 100644 index 00000000..a14f313d --- /dev/null +++ b/src/KKdLib/stage_param/fog_ring.cpp @@ -0,0 +1,247 @@ +/* + by korenkonder + GitHub/GitLab: korenkonder +*/ + +#include "fog_ring.hpp" +#include "../io/file_stream.hpp" +#include "../io/memory_stream.hpp" +#include "../io/path.hpp" +#include "../str_utils.hpp" + +static void stage_param_fog_ring_read_inner(stage_param_fog_ring* fog_ring, stream& s); +static void stage_param_fog_ring_write_inner(stage_param_fog_ring* fog_ring, stream& s); +static const char* stage_param_fog_ring_read_line(char* buf, int32_t size, const char* src); +static void stage_param_fog_ring_write_int32_t(stream& s, char* buf, size_t buf_size, int32_t value); +static void stage_param_fog_ring_write_float_t(stream& s, char* buf, size_t buf_size, float_t value); +static void stage_param_fog_ring_write_string(stream& s, + char* buf, size_t buf_size, std::string& value); + +stage_param_fog_ring::stage_param_fog_ring() : ready(), +num_ptcls(), ring_size(), ptcl_size(), density(), density_offset() { + +} + +stage_param_fog_ring::~stage_param_fog_ring() { + +} + +void stage_param_fog_ring::read(const char* path) { + char* path_txt = str_utils_add(path, ".txt"); + if (path_check_file_exists(path_txt)) { + file_stream s; + s.open(path_txt, "rb"); + if (s.check_not_null()) + stage_param_fog_ring_read_inner(this, s); + } + free_def(path_txt); +} + +void stage_param_fog_ring::read(const wchar_t* path) { + wchar_t* path_txt = str_utils_add(path, L".txt"); + if (path_check_file_exists(path_txt)) { + file_stream s; + s.open(path_txt, L"rb"); + if (s.check_not_null()) + stage_param_fog_ring_read_inner(this, s); + } + free_def(path_txt); +} + +void stage_param_fog_ring::read(const void* data, size_t size) { + memory_stream s; + s.open(data, size); + stage_param_fog_ring_read_inner(this, s); +} + +void stage_param_fog_ring::write(const char* path) { + if (!path || !ready) + return; + + char* path_txt = str_utils_add(path, ".txt"); + file_stream s; + s.open(path_txt, "wb"); + if (s.check_not_null()) + stage_param_fog_ring_write_inner(this, s); + free_def(path_txt); +} + +void stage_param_fog_ring::write(const wchar_t* path) { + if (!path || !ready) + return; + + wchar_t* path_txt = str_utils_add(path, L".txt"); + file_stream s; + s.open(path_txt, L"wb"); + if (s.check_not_null()) + stage_param_fog_ring_write_inner(this, s); + free_def(path_txt); +} + +void stage_param_fog_ring::write(void** data, size_t* size) { + if (!data || !ready) + return; + + memory_stream s; + s.open(); + stage_param_fog_ring_write_inner(this, s); + s.copy(data, size); +} + +bool stage_param_fog_ring::load_file(void* data, const char* path, const char* file, uint32_t hash) { + size_t file_len = utf8_length(file); + + const char* t = strrchr(file, '.'); + if (t) + file_len = t - file; + + std::string s; + s.assign(path); + s.append(file, file_len); + + stage_param_fog_ring* fog_ring = (stage_param_fog_ring*)data; + fog_ring->read(s.c_str()); + + return fog_ring->ready; +} + +static void stage_param_fog_ring_read_inner(stage_param_fog_ring* fog_ring, stream& s) { + char* data = force_malloc_s(char, s.length + 1); + s.read(data, s.length); + data[s.length] = 0; + + char buf[0x200]; + const char* d = data; + while (d = stage_param_fog_ring_read_line(buf, sizeof(buf), d)) { + if (!str_utils_compare_length(buf, sizeof(buf), "num_ptcls", 9)) { + if (buf[9] != ' ' || sscanf_s(buf + 10, "%d", &fog_ring->num_ptcls) != 1) + goto End; + } + else if (!str_utils_compare_length(buf, sizeof(buf), "ring_size", 9)) { + if (buf[9] != ' ' || sscanf_s(buf + 10, "%f", &fog_ring->ring_size) != 1) + goto End; + } + else if (!str_utils_compare_length(buf, sizeof(buf), "wind_dir", 8)) { + vec3& wind_dir = fog_ring->wind_dir; + if (buf[8] != ' ' || sscanf_s(buf + 9, "%f %f %f", + &wind_dir.x, &wind_dir.y, &wind_dir.z) != 3) + goto End; + } + else if (!str_utils_compare_length(buf, sizeof(buf), "tex_name", 8)) { + if (buf[8] != ' ') + goto End; + + fog_ring->tex_name.assign(buf + 9); + } + else if (!str_utils_compare_length(buf, sizeof(buf), "color", 5)) { + vec4& color = fog_ring->color; + if (buf[5] != ' ' || sscanf_s(buf + 6, "%f %f %f %f", + &color.x, &color.y, &color.z, &color.w) != 4) + goto End; + } + else if (!str_utils_compare_length(buf, sizeof(buf), "ptcl_size", 9)) { + if (buf[9] != ' ' || sscanf_s(buf + 10, "%f", &fog_ring->ptcl_size) != 1) + goto End; + } + else if (!str_utils_compare_length(buf, sizeof(buf), "density", 7)) { + if (!str_utils_compare_length(buf, sizeof(buf), "density_offset", 14)) { + if (buf[14] != ' ' || sscanf_s(buf + 15, "%f", &fog_ring->density_offset) != 1) + goto End; + } + else { + if (buf[7] != ' ' || sscanf_s(buf + 8, "%f", &fog_ring->density) != 1) + goto End; + } + } + } + + free_def(data); + fog_ring->ready = true; + return; + +End: + free_def(data); +} + +static void stage_param_fog_ring_write_inner(stage_param_fog_ring* fog_ring, stream& s) { + char buf[0x200]; + + s.write("num_ptcls", 9); + stage_param_fog_ring_write_int32_t(s, buf, sizeof(buf), fog_ring->num_ptcls); + s.write_char('\n'); + + s.write("ring_size", 9); + stage_param_fog_ring_write_float_t(s, buf, sizeof(buf), fog_ring->ring_size); + s.write_char('\n'); + + vec3& wind_dir = fog_ring->wind_dir; + s.write("wind_dir", 8); + stage_param_fog_ring_write_float_t(s, buf, sizeof(buf), wind_dir.x); + stage_param_fog_ring_write_float_t(s, buf, sizeof(buf), wind_dir.y); + stage_param_fog_ring_write_float_t(s, buf, sizeof(buf), wind_dir.z); + s.write_char('\n'); + + s.write("tex_name", 8); + stage_param_fog_ring_write_string(s, buf, sizeof(buf), fog_ring->tex_name); + s.write_char('\n'); + + vec4& color = fog_ring->color; + s.write("color", 5); + stage_param_fog_ring_write_float_t(s, buf, sizeof(buf), color.x); + stage_param_fog_ring_write_float_t(s, buf, sizeof(buf), color.y); + stage_param_fog_ring_write_float_t(s, buf, sizeof(buf), color.z); + stage_param_fog_ring_write_float_t(s, buf, sizeof(buf), color.w); + s.write_char('\n'); + + s.write("ptcl_size", 9); + stage_param_fog_ring_write_float_t(s, buf, sizeof(buf), fog_ring->ptcl_size); + s.write_char('\n'); + + s.write("density", 7); + stage_param_fog_ring_write_float_t(s, buf, sizeof(buf), fog_ring->density); + s.write_char('\n'); + + s.write("density_offset", 14); + stage_param_fog_ring_write_float_t(s, buf, sizeof(buf), fog_ring->density_offset); + s.write_char('\n'); +} + +static const char* stage_param_fog_ring_read_line(char* buf, int32_t size, const char* src) { + char* b = buf; + if (!src || !*src) + return 0; + + for (int32_t i = 0; i < size - 1; i++, b++) { + char c = *b = *src++; + if (!c) { + b++; + break; + } + else if (c == '\n') { + *b++ = 0; + break; + } + else if (c == '\r' && *src == '\n') { + *b++ = 0; + src++; + break; + } + } + return src; +} + +inline static void stage_param_fog_ring_write_int32_t(stream& s, char* buf, size_t buf_size, int32_t value) { + sprintf_s(buf, buf_size, " %d", value); + s.write_utf8_string(buf); +} + +inline static void stage_param_fog_ring_write_float_t(stream& s, char* buf, size_t buf_size, float_t value) { + sprintf_s(buf, buf_size, " %#.6g", value); + s.write_utf8_string(buf); +} + +inline static void stage_param_fog_ring_write_string(stream& s, + char* buf, size_t buf_size, std::string& value) { + s.write_char(' '); + s.write_string(value); +} diff --git a/src/KKdLib/stage_param/fog_ring.hpp b/src/KKdLib/stage_param/fog_ring.hpp new file mode 100644 index 00000000..7d6b9232 --- /dev/null +++ b/src/KKdLib/stage_param/fog_ring.hpp @@ -0,0 +1,35 @@ +/* + by korenkonder + GitHub/GitLab: korenkonder +*/ + +#pragma once + +#include "../default.hpp" +#include "../vec.hpp" +#include + +struct stage_param_fog_ring { + bool ready; + + int32_t num_ptcls; + float_t ring_size; + vec3 wind_dir; + std::string tex_name; + vec4 color; + float_t ptcl_size; + float_t density; + float_t density_offset; + + stage_param_fog_ring(); + ~stage_param_fog_ring(); + + void read(const char* path); + void read(const wchar_t* path); + void read(const void* data, size_t size); + void write(const char* path); + void write(const wchar_t* path); + void write(void** data, size_t* size); + + static bool load_file(void* data, const char* path, const char* file, uint32_t hash); +}; diff --git a/src/KKdLib/stage_param/leaf.cpp b/src/KKdLib/stage_param/leaf.cpp new file mode 100644 index 00000000..6072c586 --- /dev/null +++ b/src/KKdLib/stage_param/leaf.cpp @@ -0,0 +1,294 @@ +/* + by korenkonder + GitHub/GitLab: korenkonder +*/ + +#include "leaf.hpp" +#include "../io/file_stream.hpp" +#include "../io/memory_stream.hpp" +#include "../io/path.hpp" +#include "../str_utils.hpp" + +static void stage_param_leaf_read_inner(stage_param_leaf* leaf, stream& s); +static void stage_param_leaf_write_inner(stage_param_leaf* leaf, stream& s); +static const char* stage_param_leaf_read_line(char* buf, int32_t size, const char* src); +static void stage_param_leaf_write_int32_t(stream& s, char* buf, size_t buf_size, int32_t value); +static void stage_param_leaf_write_float_t(stream& s, char* buf, size_t buf_size, float_t value); +static void stage_param_leaf_write_string(stream& s, + char* buf, size_t buf_size, std::string& value); + +stage_param_data_leaf_lie_plane_xz::stage_param_data_leaf_lie_plane_xz() : min_x(), max_x(), min_z(), max_z() { + +} + +stage_param_leaf::stage_param_leaf() : ready(), psize(), +num_initial_ptcls(), frame_speed_coef(), emit_interval(), split_tex() { + +} + +stage_param_leaf::~stage_param_leaf() { + +} + +void stage_param_leaf::read(const char* path) { + char* path_txt = str_utils_add(path, ".txt"); + if (path_check_file_exists(path_txt)) { + file_stream s; + s.open(path_txt, "rb"); + if (s.check_not_null()) + stage_param_leaf_read_inner(this, s); + } + free_def(path_txt); +} + +void stage_param_leaf::read(const wchar_t* path) { + wchar_t* path_txt = str_utils_add(path, L".txt"); + if (path_check_file_exists(path_txt)) { + file_stream s; + s.open(path_txt, L"rb"); + if (s.check_not_null()) + stage_param_leaf_read_inner(this, s); + } + free_def(path_txt); +} + +void stage_param_leaf::read(const void* data, size_t size) { + memory_stream s; + s.open(data, size); + stage_param_leaf_read_inner(this, s); +} + +void stage_param_leaf::write(const char* path) { + if (!path || !ready) + return; + + char* path_txt = str_utils_add(path, ".txt"); + file_stream s; + s.open(path_txt, "wb"); + if (s.check_not_null()) + stage_param_leaf_write_inner(this, s); + free_def(path_txt); +} + +void stage_param_leaf::write(const wchar_t* path) { + if (!path || !ready) + return; + + wchar_t* path_txt = str_utils_add(path, L".txt"); + file_stream s; + s.open(path_txt, L"wb"); + if (s.check_not_null()) + stage_param_leaf_write_inner(this, s); + free_def(path_txt); +} + +void stage_param_leaf::write(void** data, size_t* size) { + if (!data || !ready) + return; + + memory_stream s; + s.open(); + stage_param_leaf_write_inner(this, s); + s.copy(data, size); +} + +bool stage_param_leaf::load_file(void* data, const char* path, const char* file, uint32_t hash) { + size_t file_len = utf8_length(file); + + const char* t = strrchr(file, '.'); + if (t) + file_len = t - file; + + std::string s; + s.assign(path); + s.append(file, file_len); + + stage_param_leaf* leaf = (stage_param_leaf*)data; + leaf->read(s.c_str()); + + return leaf->ready; +} + +static void stage_param_leaf_read_inner(stage_param_leaf* leaf, stream& s) { + char* data = force_malloc_s(char, s.length + 1); + s.read(data, s.length); + data[s.length] = 0; + + char buf[0x200]; + const char* d = data; + + int32_t group_id = -1; + while (d = stage_param_leaf_read_line(buf, sizeof(buf), d)) { + if (!str_utils_compare_length(buf, sizeof(buf), "tex_name", 8)) { + if (buf[8] != ' ') + goto End; + + leaf->tex_name.assign(buf + 9); + } + else if (!str_utils_compare_length(buf, sizeof(buf), "color", 5)) { + vec4& color = leaf->color; + if (buf[5] != ' ' || sscanf_s(buf + 6, "%f %f %f %f", + &color.x, &color.y, &color.z, &color.w) != 4) + goto End; + } + else if (!str_utils_compare_length(buf, sizeof(buf), "psize", 5)) { + if (buf[5] != ' ' || sscanf_s(buf + 6, "%f", &leaf->psize) != 1) + goto End; + } + else if (!str_utils_compare_length(buf, sizeof(buf), "num_initial_ptcls", 17)) { + if (buf[17] != ' ' || sscanf_s(buf + 18, "%d", &leaf->num_initial_ptcls) != 1) + goto End; + } + else if (!str_utils_compare_length(buf, sizeof(buf), "frame_speed_coef", 16)) { + if (buf[16] != ' ' || sscanf_s(buf + 17, "%f", &leaf->frame_speed_coef) != 1) + goto End; + } + else if (!str_utils_compare_length(buf, sizeof(buf), "emit_interval", 13)) { + if (buf[13] != ' ' || sscanf_s(buf + 14, "%f", &leaf->emit_interval) != 1) + goto End; + } + else if (!str_utils_compare_length(buf, sizeof(buf), "wind", 4)) { + vec3& wind = leaf->wind; + if (buf[4] != ' ' || sscanf_s(buf + 5, "%f %f %f", + &wind.x, &wind.y, &wind.z) != 3) + goto End; + } + else if (!str_utils_compare_length(buf, sizeof(buf), "range", 5)) { + vec3& range = leaf->range; + if (buf[5] != ' ' || sscanf_s(buf + 6, "%f %f %f", + &range.x, &range.y, &range.z) != 3) + goto End; + } + else if (!str_utils_compare_length(buf, sizeof(buf), "offset", 6)) { + vec3& offset = leaf->offset; + if (buf[6] != ' ' || sscanf_s(buf + 7, "%f %f %f", + &offset.x, &offset.y, &offset.z) != 3) + goto End; + } + else if (!str_utils_compare_length(buf, sizeof(buf), "lie_plane_xz", 12)) { + stage_param_data_leaf_lie_plane_xz& lie_plane_xz = leaf->lie_plane_xz; + if (buf[12] != ' ' || sscanf_s(buf + 13, "%f %f %f %f", + &lie_plane_xz.min_x, &lie_plane_xz.max_x, &lie_plane_xz.min_z, &lie_plane_xz.max_z) != 4) + goto End; + } + else if (!str_utils_compare_length(buf, sizeof(buf), "split_tex", 9)) { + int32_t split_tex = 0; + if (buf[9] != ' ' || sscanf_s(buf + 10, "%d", &split_tex) != 1) + goto End; + + leaf->split_tex = !!split_tex; + } + } + + free_def(data); + leaf->ready = true; + return; + +End: + free_def(data); +} + +static void stage_param_leaf_write_inner(stage_param_leaf* leaf, stream& s) { + char buf[0x200]; + + s.write("tex_name", 8); + stage_param_leaf_write_string(s, buf, sizeof(buf), leaf->tex_name); + s.write_char('\n'); + + vec4& color = leaf->color; + s.write("color", 5); + stage_param_leaf_write_float_t(s, buf, sizeof(buf), color.x); + stage_param_leaf_write_float_t(s, buf, sizeof(buf), color.y); + stage_param_leaf_write_float_t(s, buf, sizeof(buf), color.z); + stage_param_leaf_write_float_t(s, buf, sizeof(buf), color.w); + s.write_char('\n'); + + s.write("psize", 5); + stage_param_leaf_write_float_t(s, buf, sizeof(buf), leaf->psize); + s.write_char('\n'); + + s.write("num_initial_ptcls", 17); + stage_param_leaf_write_int32_t(s, buf, sizeof(buf), leaf->num_initial_ptcls); + s.write_char('\n'); + + s.write("frame_speed_coef", 16); + stage_param_leaf_write_float_t(s, buf, sizeof(buf), leaf->frame_speed_coef); + s.write_char('\n'); + + s.write("emit_interval", 13); + stage_param_leaf_write_float_t(s, buf, sizeof(buf), leaf->emit_interval); + s.write_char('\n'); + + vec3& wind = leaf->wind; + s.write("wind", 4); + stage_param_leaf_write_float_t(s, buf, sizeof(buf), wind.x); + stage_param_leaf_write_float_t(s, buf, sizeof(buf), wind.y); + stage_param_leaf_write_float_t(s, buf, sizeof(buf), wind.z); + s.write_char('\n'); + + vec3& range = leaf->range; + s.write("range", 5); + stage_param_leaf_write_float_t(s, buf, sizeof(buf), range.x); + stage_param_leaf_write_float_t(s, buf, sizeof(buf), range.y); + stage_param_leaf_write_float_t(s, buf, sizeof(buf), range.z); + s.write_char('\n'); + + vec3& offset = leaf->offset; + s.write("offset", 6); + stage_param_leaf_write_float_t(s, buf, sizeof(buf), offset.x); + stage_param_leaf_write_float_t(s, buf, sizeof(buf), offset.y); + stage_param_leaf_write_float_t(s, buf, sizeof(buf), offset.z); + s.write_char('\n'); + + stage_param_data_leaf_lie_plane_xz& lie_plane_xz = leaf->lie_plane_xz; + s.write("lie_plane_xz", 12); + stage_param_leaf_write_float_t(s, buf, sizeof(buf), lie_plane_xz.min_x); + stage_param_leaf_write_float_t(s, buf, sizeof(buf), lie_plane_xz.max_x); + stage_param_leaf_write_float_t(s, buf, sizeof(buf), lie_plane_xz.min_z); + stage_param_leaf_write_float_t(s, buf, sizeof(buf), lie_plane_xz.max_z); + s.write_char('\n'); + + s.write("split_tex", 9); + stage_param_leaf_write_int32_t(s, buf, sizeof(buf), leaf->split_tex ? 1 : 0); + s.write_char('\n'); +} + +static const char* stage_param_leaf_read_line(char* buf, int32_t size, const char* src) { + char* b = buf; + if (!src || !*src) + return 0; + + for (int32_t i = 0; i < size - 1; i++, b++) { + char c = *b = *src++; + if (!c) { + b++; + break; + } + else if (c == '\n') { + *b++ = 0; + break; + } + else if (c == '\r' && *src == '\n') { + *b++ = 0; + src++; + break; + } + } + return src; +} + +inline static void stage_param_leaf_write_int32_t(stream& s, char* buf, size_t buf_size, int32_t value) { + sprintf_s(buf, buf_size, " %d", value); + s.write_utf8_string(buf); +} + +inline static void stage_param_leaf_write_float_t(stream& s, char* buf, size_t buf_size, float_t value) { + sprintf_s(buf, buf_size, " %#.6g", value); + s.write_utf8_string(buf); +} + +inline static void stage_param_leaf_write_string(stream& s, + char* buf, size_t buf_size, std::string& value) { + s.write_char(' '); + s.write_string(value); +} diff --git a/src/KKdLib/stage_param/leaf.hpp b/src/KKdLib/stage_param/leaf.hpp new file mode 100644 index 00000000..5ec76554 --- /dev/null +++ b/src/KKdLib/stage_param/leaf.hpp @@ -0,0 +1,47 @@ +/* + by korenkonder + GitHub/GitLab: korenkonder +*/ + +#pragma once + +#include "../default.hpp" +#include "../vec.hpp" +#include + +struct stage_param_data_leaf_lie_plane_xz { + float_t min_x; + float_t max_x; + float_t min_z; + float_t max_z; + + stage_param_data_leaf_lie_plane_xz(); +}; + +struct stage_param_leaf { + bool ready; + + std::string tex_name; + vec4 color; + float_t psize; + int32_t num_initial_ptcls; + float_t frame_speed_coef; + float_t emit_interval; + vec3 wind; + vec3 range; + vec3 offset; + stage_param_data_leaf_lie_plane_xz lie_plane_xz; + bool split_tex; + + stage_param_leaf(); + ~stage_param_leaf(); + + void read(const char* path); + void read(const wchar_t* path); + void read(const void* data, size_t size); + void write(const char* path); + void write(const wchar_t* path); + void write(void** data, size_t* size); + + static bool load_file(void* data, const char* path, const char* file, uint32_t hash); +}; diff --git a/src/KKdLib/stage_param/litproj.cpp b/src/KKdLib/stage_param/litproj.cpp new file mode 100644 index 00000000..a88da5f3 --- /dev/null +++ b/src/KKdLib/stage_param/litproj.cpp @@ -0,0 +1,166 @@ +/* + by korenkonder + GitHub/GitLab: korenkonder +*/ + +#include "litproj.hpp" +#include "../io/file_stream.hpp" +#include "../io/memory_stream.hpp" +#include "../io/path.hpp" +#include "../str_utils.hpp" + +static void stage_param_litproj_read_inner(stage_param_litproj* litproj, stream& s); +static void stage_param_litproj_write_inner(stage_param_litproj* litproj, stream& s); +static const char* stage_param_litproj_read_line(char* buf, int32_t size, const char* src); +static void stage_param_litproj_write_string(stream& s, + char* buf, size_t buf_size, std::string& value); + +stage_param_litproj::stage_param_litproj() : ready() { + +} + +stage_param_litproj::~stage_param_litproj() { + +} + +void stage_param_litproj::read(const char* path) { + char* path_txt = str_utils_add(path, ".txt"); + if (path_check_file_exists(path_txt)) { + file_stream s; + s.open(path_txt, "rb"); + if (s.check_not_null()) + stage_param_litproj_read_inner(this, s); + } + free_def(path_txt); +} + +void stage_param_litproj::read(const wchar_t* path) { + wchar_t* path_txt = str_utils_add(path, L".txt"); + if (path_check_file_exists(path_txt)) { + file_stream s; + s.open(path_txt, L"rb"); + if (s.check_not_null()) + stage_param_litproj_read_inner(this, s); + } + free_def(path_txt); +} + +void stage_param_litproj::read(const void* data, size_t size) { + memory_stream s; + s.open(data, size); + stage_param_litproj_read_inner(this, s); +} + +void stage_param_litproj::write(const char* path) { + if (!path || !ready) + return; + + char* path_txt = str_utils_add(path, ".txt"); + file_stream s; + s.open(path_txt, "wb"); + if (s.check_not_null()) + stage_param_litproj_write_inner(this, s); + free_def(path_txt); +} + +void stage_param_litproj::write(const wchar_t* path) { + if (!path || !ready) + return; + + wchar_t* path_txt = str_utils_add(path, L".txt"); + file_stream s; + s.open(path_txt, L"wb"); + if (s.check_not_null()) + stage_param_litproj_write_inner(this, s); + free_def(path_txt); +} + +void stage_param_litproj::write(void** data, size_t* size) { + if (!data || !ready) + return; + + memory_stream s; + s.open(); + stage_param_litproj_write_inner(this, s); + s.copy(data, size); +} + +bool stage_param_litproj::load_file(void* data, const char* path, const char* file, uint32_t hash) { + size_t file_len = utf8_length(file); + + const char* t = strrchr(file, '.'); + if (t) + file_len = t - file; + + std::string s; + s.assign(path); + s.append(file, file_len); + + stage_param_litproj* litproj = (stage_param_litproj*)data; + litproj->read(s.c_str()); + + return litproj->ready; +} + +static void stage_param_litproj_read_inner(stage_param_litproj* litproj, stream& s) { + char* data = force_malloc_s(char, s.length + 1); + s.read(data, s.length); + data[s.length] = 0; + + char buf[0x200]; + const char* d = data; + + while (d = stage_param_litproj_read_line(buf, sizeof(buf), d)) { + if (!str_utils_compare_length(buf, sizeof(buf), "tex_name", 8)) { + if (buf[8] != ' ') + goto End; + + litproj->tex_name.assign(buf + 9); + } + } + + free_def(data); + litproj->ready = true; + return; + +End: + free_def(data); +} + +static void stage_param_litproj_write_inner(stage_param_litproj* litproj, stream& s) { + char buf[0x200]; + + s.write("tex_name", 8); + stage_param_litproj_write_string(s, buf, sizeof(buf), litproj->tex_name); + s.write_char('\n'); +} + +static const char* stage_param_litproj_read_line(char* buf, int32_t size, const char* src) { + char* b = buf; + if (!src || !*src) + return 0; + + for (int32_t i = 0; i < size - 1; i++, b++) { + char c = *b = *src++; + if (!c) { + b++; + break; + } + else if (c == '\n') { + *b++ = 0; + break; + } + else if (c == '\r' && *src == '\n') { + *b++ = 0; + src++; + break; + } + } + return src; +} + +inline static void stage_param_litproj_write_string(stream& s, + char* buf, size_t buf_size, std::string& value) { + s.write_char(' '); + s.write_string(value); +} diff --git a/src/KKdLib/stage_param/litproj.hpp b/src/KKdLib/stage_param/litproj.hpp new file mode 100644 index 00000000..ab7159c0 --- /dev/null +++ b/src/KKdLib/stage_param/litproj.hpp @@ -0,0 +1,27 @@ +/* + by korenkonder + GitHub/GitLab: korenkonder +*/ + +#pragma once + +#include "../default.hpp" +#include + +struct stage_param_litproj { + bool ready; + + std::string tex_name; + + stage_param_litproj(); + ~stage_param_litproj(); + + void read(const char* path); + void read(const wchar_t* path); + void read(const void* data, size_t size); + void write(const char* path); + void write(const wchar_t* path); + void write(void** data, size_t* size); + + static bool load_file(void* data, const char* path, const char* file, uint32_t hash); +}; diff --git a/src/KKdLib/stage_param/rain.cpp b/src/KKdLib/stage_param/rain.cpp new file mode 100644 index 00000000..62282b32 --- /dev/null +++ b/src/KKdLib/stage_param/rain.cpp @@ -0,0 +1,258 @@ +/* + by korenkonder + GitHub/GitLab: korenkonder +*/ + +#include "rain.hpp" +#include "../io/file_stream.hpp" +#include "../io/memory_stream.hpp" +#include "../io/path.hpp" +#include "../str_utils.hpp" + +static void stage_param_rain_read_inner(stage_param_rain* rain, stream& s); +static void stage_param_rain_write_inner(stage_param_rain* rain, stream& s); +static const char* stage_param_rain_read_line(char* buf, int32_t size, const char* src); +static void stage_param_rain_write_int32_t(stream& s, char* buf, size_t buf_size, int32_t value); +static void stage_param_rain_write_float_t(stream& s, char* buf, size_t buf_size, float_t value); +static void stage_param_rain_write_string(stream& s, + char* buf, size_t buf_size, std::string& value); + +stage_param_rain::stage_param_rain() : ready(), num_rain() { + +} + +stage_param_rain::~stage_param_rain() { + +} + +void stage_param_rain::read(const char* path) { + char* path_txt = str_utils_add(path, ".txt"); + if (path_check_file_exists(path_txt)) { + file_stream s; + s.open(path_txt, "rb"); + if (s.check_not_null()) + stage_param_rain_read_inner(this, s); + } + free_def(path_txt); +} + +void stage_param_rain::read(const wchar_t* path) { + wchar_t* path_txt = str_utils_add(path, L".txt"); + if (path_check_file_exists(path_txt)) { + file_stream s; + s.open(path_txt, L"rb"); + if (s.check_not_null()) + stage_param_rain_read_inner(this, s); + } + free_def(path_txt); +} + +void stage_param_rain::read(const void* data, size_t size) { + memory_stream s; + s.open(data, size); + stage_param_rain_read_inner(this, s); +} + +void stage_param_rain::write(const char* path) { + if (!path || !ready) + return; + + char* path_txt = str_utils_add(path, ".txt"); + file_stream s; + s.open(path_txt, "wb"); + if (s.check_not_null()) + stage_param_rain_write_inner(this, s); + free_def(path_txt); +} + +void stage_param_rain::write(const wchar_t* path) { + if (!path || !ready) + return; + + wchar_t* path_txt = str_utils_add(path, L".txt"); + file_stream s; + s.open(path_txt, L"wb"); + if (s.check_not_null()) + stage_param_rain_write_inner(this, s); + free_def(path_txt); +} + +void stage_param_rain::write(void** data, size_t* size) { + if (!data || !size || !ready) + return; + + memory_stream s; + s.open(); + stage_param_rain_write_inner(this, s); + s.copy(data, size); +} + +bool stage_param_rain::load_file(void* data, const char* path, const char* file, uint32_t hash) { + size_t file_len = utf8_length(file); + + const char* t = strrchr(file, '.'); + if (t) + file_len = t - file; + + std::string s; + s.assign(path); + s.append(file, file_len); + + stage_param_rain* rain = (stage_param_rain*)data; + rain->read(s.c_str()); + + return rain->ready; +} + +static void stage_param_rain_read_inner(stage_param_rain* rain, stream& s) { + char* data = force_malloc_s(char, s.length + 1); + s.read(data, s.length); + data[s.length] = 0; + + char buf[0x200]; + const char* d = data; + + while (d = stage_param_rain_read_line(buf, sizeof(buf), d)) { + if (!str_utils_compare_length(buf, sizeof(buf), "tex_name", 8)) { + if (buf[8] != ' ') + goto End; + + rain->tex_name.assign(buf + 9); + } + if (!str_utils_compare_length(buf, sizeof(buf), "num_rain", 8)) { + if (buf[8] != ' ' || sscanf_s(buf + 9, "%d", &rain->num_rain) != 1) + goto End; + } + else if (!str_utils_compare_length(buf, sizeof(buf), "color", 5)) { + vec4& color = rain->color; + if (buf[5] != ' ' || sscanf_s(buf + 6, "%f %f %f %f", + &color.x, &color.y, &color.z, &color.w) != 4) + goto End; + } + else if (!str_utils_compare_length(buf, sizeof(buf), "velocity", 8)) { + vec3& velocity = rain->velocity; + if (buf[8] != ' ' || sscanf_s(buf + 9, "%f %f %f", + &velocity.x, &velocity.y, &velocity.z) != 3) + goto End; + } + else if (!str_utils_compare_length(buf, sizeof(buf), "psize", 5)) { + vec2& psize = rain->psize; + if (buf[5] != ' ' || sscanf_s(buf + 6, "%f %f", + &psize.x, &psize.y) != 2) + goto End; + } + else if (!str_utils_compare_length(buf, sizeof(buf), "range", 5)) { + vec3& range = rain->range; + if (buf[5] != ' ' || sscanf_s(buf + 6, "%f %f %f", + &range.x, &range.y, &range.z) != 3) + goto End; + } + else if (!str_utils_compare_length(buf, sizeof(buf), "offset", 6)) { + vec3& offset = rain->offset; + if (buf[6] != ' ' || sscanf_s(buf + 7, "%f %f %f", + &offset.x, &offset.y, &offset.z) != 3) + goto End; + } + } + + free_def(data); + rain->ready = true; + return; + +End: + free_def(data); +} + +static void stage_param_rain_write_inner(stage_param_rain* rain, stream& s) { + char buf[0x200]; + + s.write("tex_name", 8); + stage_param_rain_write_string(s, buf, sizeof(buf), rain->tex_name); + s.write_char('\n'); + + s.write("num_rain", 8); + stage_param_rain_write_int32_t(s, buf, sizeof(buf), rain->num_rain); + s.write_char('\n'); + + vec4& color = rain->color; + s.write("color", 5); + stage_param_rain_write_float_t(s, buf, sizeof(buf), color.x); + stage_param_rain_write_float_t(s, buf, sizeof(buf), color.y); + stage_param_rain_write_float_t(s, buf, sizeof(buf), color.z); + stage_param_rain_write_float_t(s, buf, sizeof(buf), color.w); + s.write_char('\n'); + + vec3& velocity = rain->velocity; + s.write("velocity", 8); + stage_param_rain_write_float_t(s, buf, sizeof(buf), velocity.x); + stage_param_rain_write_float_t(s, buf, sizeof(buf), velocity.y); + stage_param_rain_write_float_t(s, buf, sizeof(buf), velocity.z); + s.write_char('\n'); + + vec3& vel_range = rain->vel_range; + s.write("vel_range", 9); + stage_param_rain_write_float_t(s, buf, sizeof(buf), vel_range.x); + stage_param_rain_write_float_t(s, buf, sizeof(buf), vel_range.y); + stage_param_rain_write_float_t(s, buf, sizeof(buf), vel_range.z); + s.write_char('\n'); + + vec2& psize = rain->psize; + s.write("psize", 5); + stage_param_rain_write_float_t(s, buf, sizeof(buf), psize.x); + stage_param_rain_write_float_t(s, buf, sizeof(buf), psize.y); + s.write_char('\n'); + + vec3& range = rain->range; + s.write("range", 5); + stage_param_rain_write_float_t(s, buf, sizeof(buf), range.x); + stage_param_rain_write_float_t(s, buf, sizeof(buf), range.y); + stage_param_rain_write_float_t(s, buf, sizeof(buf), range.z); + s.write_char('\n'); + + vec3& offset = rain->offset; + s.write("offset", 6); + stage_param_rain_write_float_t(s, buf, sizeof(buf), offset.x); + stage_param_rain_write_float_t(s, buf, sizeof(buf), offset.y); + stage_param_rain_write_float_t(s, buf, sizeof(buf), offset.z); + s.write_char('\n'); +} + +static const char* stage_param_rain_read_line(char* buf, int32_t size, const char* src) { + char* b = buf; + if (!src || !*src) + return 0; + + for (int32_t i = 0; i < size - 1; i++, b++) { + char c = b[0] = *src++; + if (!c) { + b++; + break; + } + else if (c == '\n') { + *b++ = 0; + break; + } + else if (c == '\r' && *src == '\n') { + *b++ = 0; + src++; + break; + } + } + return src; +} + +inline static void stage_param_rain_write_int32_t(stream& s, char* buf, size_t buf_size, int32_t value) { + sprintf_s(buf, buf_size, " %d", value); + s.write_utf8_string(buf); +} + +inline static void stage_param_rain_write_float_t(stream& s, char* buf, size_t buf_size, float_t value) { + sprintf_s(buf, buf_size, " %#.6g", value); + s.write_utf8_string(buf); +} + +inline static void stage_param_rain_write_string(stream& s, + char* buf, size_t buf_size, std::string& value) { + s.write_char(' '); + s.write_string(value); +} diff --git a/src/KKdLib/stage_param/rain.hpp b/src/KKdLib/stage_param/rain.hpp new file mode 100644 index 00000000..80763705 --- /dev/null +++ b/src/KKdLib/stage_param/rain.hpp @@ -0,0 +1,35 @@ +/* + by korenkonder + GitHub/GitLab: korenkonder +*/ + +#pragma once + +#include "../default.hpp" +#include "../vec.hpp" +#include + +struct stage_param_rain { + bool ready; + + std::string tex_name; + int32_t num_rain; + vec4 color; + vec3 velocity; + vec3 vel_range; + vec2 psize; + vec3 range; + vec3 offset; + + stage_param_rain(); + ~stage_param_rain(); + + void read(const char* path); + void read(const wchar_t* path); + void read(const void* data, size_t size); + void write(const char* path); + void write(const wchar_t* path); + void write(void** data, size_t* size); + + static bool load_file(void* data, const char* path, const char* file, uint32_t hash); +}; diff --git a/src/KKdLib/stage_param/ripple.cpp b/src/KKdLib/stage_param/ripple.cpp new file mode 100644 index 00000000..58db265d --- /dev/null +++ b/src/KKdLib/stage_param/ripple.cpp @@ -0,0 +1,319 @@ +/* + by korenkonder + GitHub/GitLab: korenkonder +*/ + +#include "ripple.hpp" +#include "../io/file_stream.hpp" +#include "../io/memory_stream.hpp" +#include "../io/path.hpp" +#include "../str_utils.hpp" + +static void stage_param_ripple_read_inner(stage_param_ripple* ripple, stream& s); +static void stage_param_ripple_write_inner(stage_param_ripple* ripple, stream& s); +static const char* stage_param_ripple_read_line(char* buf, int32_t size, const char* src); +static void stage_param_ripple_write_int32_t(stream& s, char* buf, size_t buf_size, int32_t value); +static void stage_param_ripple_write_size_t(stream& s, char* buf, size_t buf_size, size_t value); +static void stage_param_ripple_write_float_t(stream& s, char* buf, size_t buf_size, float_t value); +static void stage_param_ripple_write_string(stream& s, + char* buf, size_t buf_size, std::string& value); + +stage_param_ripple::stage_param_ripple() : ready(), rain_ripple_num(), rain_ripple_min_value(), +rain_ripple_max_value(), ground_y(), emit_pos_scale(), emit_pos_ofs_x(), emit_pos_ofs_z(), +wake_attn(), speed(), use_float_ripplemap(), rob_emitter_size(), emitter_num(), emitter_size() { + +} + +stage_param_ripple::~stage_param_ripple() { + +} + +void stage_param_ripple::read(const char* path) { + char* path_txt = str_utils_add(path, ".txt"); + if (path_check_file_exists(path_txt)) { + file_stream s; + s.open(path_txt, "rb"); + if (s.check_not_null()) + stage_param_ripple_read_inner(this, s); + } + free_def(path_txt); +} + +void stage_param_ripple::read(const wchar_t* path) { + wchar_t* path_txt = str_utils_add(path, L".txt"); + if (path_check_file_exists(path_txt)) { + file_stream s; + s.open(path_txt, L"rb"); + if (s.check_not_null()) + stage_param_ripple_read_inner(this, s); + } + free_def(path_txt); +} + +void stage_param_ripple::read(const void* data, size_t size) { + memory_stream s; + s.open(data, size); + stage_param_ripple_read_inner(this, s); +} + +void stage_param_ripple::write(const char* path) { + if (!path || !ready) + return; + + char* path_txt = str_utils_add(path, ".txt"); + file_stream s; + s.open(path_txt, "wb"); + if (s.check_not_null()) + stage_param_ripple_write_inner(this, s); + free_def(path_txt); +} + +void stage_param_ripple::write(const wchar_t* path) { + if (!path || !ready) + return; + + wchar_t* path_txt = str_utils_add(path, L".txt"); + file_stream s; + s.open(path_txt, L"wb"); + if (s.check_not_null()) + stage_param_ripple_write_inner(this, s); + free_def(path_txt); +} + +void stage_param_ripple::write(void** data, size_t* size) { + if (!data || !size || !ready) + return; + + memory_stream s; + s.open(); + stage_param_ripple_write_inner(this, s); + s.copy(data, size); +} + +bool stage_param_ripple::load_file(void* data, const char* path, const char* file, uint32_t hash) { + size_t file_len = utf8_length(file); + + const char* t = strrchr(file, '.'); + if (t) + file_len = t - file; + + std::string s; + s.assign(path); + s.append(file, file_len); + + stage_param_ripple* ripple = (stage_param_ripple*)data; + ripple->read(s.c_str()); + + return ripple->ready; +} + +static void stage_param_ripple_read_inner(stage_param_ripple* ripple, stream& s) { + char* data = force_malloc_s(char, s.length + 1); + s.read(data, s.length); + data[s.length] = 0; + + char buf[0x200]; + const char* d = data; + + while (d = stage_param_ripple_read_line(buf, sizeof(buf), d)) { + if (!str_utils_compare_length(buf, sizeof(buf), "rain_ripple_num", 15)) { + if (buf[15] != ' ' || sscanf_s(buf + 16, "%llu", &ripple->rain_ripple_num) != 1) + goto End; + } + else if (!str_utils_compare_length(buf, sizeof(buf), "rain_ripple_min_value", 21)) { + if (buf[21] != ' ' || sscanf_s(buf + 22, "%f", &ripple->rain_ripple_min_value) != 1) + goto End; + } + else if (!str_utils_compare_length(buf, sizeof(buf), "rain_ripple_max_value", 21)) { + if (buf[21] != ' ' || sscanf_s(buf + 22, "%f", &ripple->rain_ripple_max_value) != 1) + goto End; + } + else if (!str_utils_compare_length(buf, sizeof(buf), "ground_y", 8)) { + if (buf[8] != ' ' || sscanf_s(buf + 9, "%f", &ripple->ground_y) != 1) + goto End; + } + else if (!str_utils_compare_length(buf, sizeof(buf), "emit_pos_scale", 14)) { + if (buf[14] != ' ' || sscanf_s(buf + 15, "%f", &ripple->emit_pos_scale) != 1) + goto End; + } + else if (!str_utils_compare_length(buf, sizeof(buf), "emit_pos_ofs_x", 14)) { + if (buf[14] != ' ' || sscanf_s(buf + 15, "%f", &ripple->emit_pos_ofs_x) != 1) + goto End; + } + else if (!str_utils_compare_length(buf, sizeof(buf), "emit_pos_ofs_z", 14)) { + if (buf[14] != ' ' || sscanf_s(buf + 15, "%f", &ripple->emit_pos_ofs_z) != 1) + goto End; + } + else if (!str_utils_compare_length(buf, sizeof(buf), "wake_attn", 9)) { + if (buf[9] != ' ' || sscanf_s(buf + 10, "%f", &ripple->wake_attn) != 1) + goto End; + } + else if (!str_utils_compare_length(buf, sizeof(buf), "speed", 5)) { + if (buf[5] != ' ' || sscanf_s(buf + 6, "%f", &ripple->speed) != 1) + goto End; + } + else if (!str_utils_compare_length(buf, sizeof(buf), "ripple_tex_name", 15)) { + if (buf[15] != ' ') + goto End; + + ripple->ripple_tex_name.assign(buf + 16); + } + else if (!str_utils_compare_length(buf, sizeof(buf), "use_float_ripplemap", 4)) { + int32_t use_float_ripplemap = 0; + if (buf[4] != ' ' || sscanf_s(buf + 5, "%d", &use_float_ripplemap) != 1) + goto End; + + ripple->use_float_ripplemap = !!use_float_ripplemap; + } + else if (!str_utils_compare_length(buf, sizeof(buf), "rob_emitter_size", 16)) { + if (buf[16] != ' ' || sscanf_s(buf + 17, "%f", &ripple->rob_emitter_size) != 1) + goto End; + } + else if (!str_utils_compare_length(buf, sizeof(buf), "emitter_size", 12)) { + if (buf[12] != ' ' || sscanf_s(buf + 13, "%f", &ripple->emitter_size) != 1) + goto End; + } + else if (!str_utils_compare_length(buf, sizeof(buf), "emitter_num", 11)) { + if (buf[11] != ' ' || sscanf_s(buf + 12, "%llu", &ripple->emitter_num) != 1) + goto End; + + ripple->emitter_list.resize(ripple->emitter_num); + } + else if (!str_utils_compare_length(buf, sizeof(buf), "emitter_list", 12)) { + size_t index = 0; + vec3 pos; + if (buf[12] != ' ' || sscanf_s(buf + 13, "%llu %f %f %f", + &index, &pos.x, &pos.y, &pos.z) != 4) + goto End; + + if (index >= ripple->emitter_num) + goto End; + + ripple->emitter_list[index] = pos; + } + } + + free_def(data); + ripple->ready = true; + return; + +End: + free_def(data); +} + +static void stage_param_ripple_write_inner(stage_param_ripple* ripple, stream& s) { + char buf[0x200]; + + size_t emitter_num = ripple->emitter_list.size(); + + s.write("rain_ripple_num", 15); + stage_param_ripple_write_size_t(s, buf, sizeof(buf), ripple->rain_ripple_num); + s.write_char('\n'); + + s.write("rain_ripple_min_value", 21); + stage_param_ripple_write_float_t(s, buf, sizeof(buf), ripple->rain_ripple_min_value); + s.write_char('\n'); + + s.write("rain_ripple_max_value", 21); + stage_param_ripple_write_float_t(s, buf, sizeof(buf), ripple->rain_ripple_max_value); + s.write_char('\n'); + + s.write("ground_y", 8); + stage_param_ripple_write_float_t(s, buf, sizeof(buf), ripple->ground_y); + s.write_char('\n'); + + s.write("emit_pos_scale", 14); + stage_param_ripple_write_float_t(s, buf, sizeof(buf), ripple->emit_pos_scale); + s.write_char('\n'); + + s.write("emit_pos_ofs_x", 14); + stage_param_ripple_write_float_t(s, buf, sizeof(buf), ripple->emit_pos_ofs_x); + s.write_char('\n'); + + s.write("emit_pos_ofs_z", 14); + stage_param_ripple_write_float_t(s, buf, sizeof(buf), ripple->emit_pos_ofs_z); + s.write_char('\n'); + + s.write("wake_attn", 9); + stage_param_ripple_write_float_t(s, buf, sizeof(buf), ripple->wake_attn); + s.write_char('\n'); + + s.write("speed", 5); + stage_param_ripple_write_float_t(s, buf, sizeof(buf), ripple->speed); + s.write_char('\n'); + + s.write("ripple_tex_name", 15); + stage_param_ripple_write_string(s, buf, sizeof(buf), ripple->ripple_tex_name); + s.write_char('\n'); + + s.write("use_float_ripplemap", 19); + stage_param_ripple_write_int32_t(s, buf, sizeof(buf), ripple->use_float_ripplemap ? 1 : 0); + s.write_char('\n'); + + s.write("rob_emitter_size", 16); + stage_param_ripple_write_float_t(s, buf, sizeof(buf), ripple->rob_emitter_size); + s.write_char('\n'); + + s.write("emitter_size", 12); + stage_param_ripple_write_float_t(s, buf, sizeof(buf), ripple->emitter_size); + s.write_char('\n'); + + s.write("emitter_num", 11); + stage_param_ripple_write_size_t(s, buf, sizeof(buf), emitter_num); + s.write_char('\n'); + + vec3* emitter_list = ripple->emitter_list.data(); + for (int32_t i = 0; i < emitter_num; i++, emitter_list++) { + s.write("emitter_list", 12); + stage_param_ripple_write_size_t(s, buf, sizeof(buf), i); + stage_param_ripple_write_float_t(s, buf, sizeof(buf), emitter_list->x); + stage_param_ripple_write_float_t(s, buf, sizeof(buf), emitter_list->y); + stage_param_ripple_write_float_t(s, buf, sizeof(buf), emitter_list->z); + s.write_char('\n'); + } +} + +static const char* stage_param_ripple_read_line(char* buf, int32_t size, const char* src) { + char* b = buf; + if (!src || !*src) + return 0; + + for (int32_t i = 0; i < size - 1; i++, b++) { + char c = b[0] = *src++; + if (!c) { + b++; + break; + } + else if (c == '\n') { + *b++ = 0; + break; + } + else if (c == '\r' && *src == '\n') { + *b++ = 0; + src++; + break; + } + } + return src; +} + +inline static void stage_param_ripple_write_int32_t(stream& s, char* buf, size_t buf_size, int32_t value) { + sprintf_s(buf, buf_size, " %d", value); + s.write_utf8_string(buf); +} + +inline static void stage_param_ripple_write_size_t(stream& s, char* buf, size_t buf_size, size_t value) { + sprintf_s(buf, buf_size, " %llu", value); + s.write_utf8_string(buf); +} + +inline static void stage_param_ripple_write_float_t(stream& s, char* buf, size_t buf_size, float_t value) { + sprintf_s(buf, buf_size, " %#.6g", value); + s.write_utf8_string(buf); +} + +inline static void stage_param_ripple_write_string(stream& s, + char* buf, size_t buf_size, std::string& value) { + s.write_char(' '); + s.write_string(value); +} diff --git a/src/KKdLib/stage_param/ripple.hpp b/src/KKdLib/stage_param/ripple.hpp new file mode 100644 index 00000000..49a95d9b --- /dev/null +++ b/src/KKdLib/stage_param/ripple.hpp @@ -0,0 +1,42 @@ +/* + by korenkonder + GitHub/GitLab: korenkonder +*/ + +#pragma once + +#include "../default.hpp" +#include "../vec.hpp" +#include + +struct stage_param_ripple { + bool ready; + + size_t rain_ripple_num; + float_t rain_ripple_min_value; + float_t rain_ripple_max_value; + float_t ground_y; + float_t emit_pos_scale; + float_t emit_pos_ofs_x; + float_t emit_pos_ofs_z; + float_t wake_attn; + float_t speed; + std::string ripple_tex_name; + bool use_float_ripplemap; + float_t rob_emitter_size; + std::vector emitter_list; + size_t emitter_num; + float_t emitter_size; + + stage_param_ripple(); + ~stage_param_ripple(); + + void read(const char* path); + void read(const wchar_t* path); + void read(const void* data, size_t size); + void write(const char* path); + void write(const wchar_t* path); + void write(void** data, size_t* size); + + static bool load_file(void* data, const char* path, const char* file, uint32_t hash); +}; diff --git a/src/KKdLib/stage_param/snow.cpp b/src/KKdLib/stage_param/snow.cpp new file mode 100644 index 00000000..5ed10bd4 --- /dev/null +++ b/src/KKdLib/stage_param/snow.cpp @@ -0,0 +1,313 @@ +/* + by korenkonder + GitHub/GitLab: korenkonder +*/ + +#include "snow.hpp" +#include "../io/file_stream.hpp" +#include "../io/memory_stream.hpp" +#include "../io/path.hpp" +#include "../str_utils.hpp" + +static void stage_param_snow_read_inner(stage_param_snow* snow, stream& s); +static void stage_param_snow_write_inner(stage_param_snow* snow, stream& s); +static const char* stage_param_snow_read_line(char* buf, int32_t size, const char* src); +static void stage_param_snow_write_int32_t(stream& s, char* buf, size_t buf_size, int32_t value); +static void stage_param_snow_write_float_t(stream& s, char* buf, size_t buf_size, float_t value); +static void stage_param_snow_write_string(stream& s, + char* buf, size_t buf_size, std::string& value); + +stage_param_snow_colli_ground::stage_param_snow_colli_ground() + : field_0(), field_4(), field_8(), field_C(), field_10() { + +} + +stage_param_snow::stage_param_snow() : ready(), num_snow(), num_snow_gpu() { + +} + +stage_param_snow::~stage_param_snow() { + +} + +void stage_param_snow::read(const char* path) { + char* path_txt = str_utils_add(path, ".txt"); + if (path_check_file_exists(path_txt)) { + file_stream s; + s.open(path_txt, "rb"); + if (s.check_not_null()) + stage_param_snow_read_inner(this, s); + } + free_def(path_txt); +} + +void stage_param_snow::read(const wchar_t* path) { + wchar_t* path_txt = str_utils_add(path, L".txt"); + if (path_check_file_exists(path_txt)) { + file_stream s; + s.open(path_txt, L"rb"); + if (s.check_not_null()) + stage_param_snow_read_inner(this, s); + } + free_def(path_txt); +} + +void stage_param_snow::read(const void* data, size_t size) { + memory_stream s; + s.open(data, size); + stage_param_snow_read_inner(this, s); +} + +void stage_param_snow::write(const char* path) { + if (!path || !ready) + return; + + char* path_txt = str_utils_add(path, ".txt"); + file_stream s; + s.open(path_txt, "wb"); + if (s.check_not_null()) + stage_param_snow_write_inner(this, s); + free_def(path_txt); +} + +void stage_param_snow::write(const wchar_t* path) { + if (!path || !ready) + return; + + wchar_t* path_txt = str_utils_add(path, L".txt"); + file_stream s; + s.open(path_txt, L"wb"); + if (s.check_not_null()) + stage_param_snow_write_inner(this, s); + free_def(path_txt); +} + +void stage_param_snow::write(void** data, size_t* size) { + if (!data || !size || !ready) + return; + + memory_stream s; + s.open(); + stage_param_snow_write_inner(this, s); + s.copy(data, size); +} + +bool stage_param_snow::load_file(void* data, const char* path, const char* file, uint32_t hash) { + size_t file_len = utf8_length(file); + + const char* t = strrchr(file, '.'); + if (t) + file_len = t - file; + + std::string s; + s.assign(path); + s.append(file, file_len); + + stage_param_snow* snow = (stage_param_snow*)data; + snow->read(s.c_str()); + + return snow->ready; +} + +static void stage_param_snow_read_inner(stage_param_snow* snow, stream& s) { + char* data = force_malloc_s(char, s.length + 1); + s.read(data, s.length); + data[s.length] = 0; + + char buf[0x200]; + const char* d = data; + + while (d = stage_param_snow_read_line(buf, sizeof(buf), d)) { + if (!str_utils_compare_length(buf, sizeof(buf), "tex_name", 8)) { + if (buf[8] != ' ') + goto End; + + snow->tex_name.assign(buf + 23); + } + else if (!str_utils_compare_length(buf, sizeof(buf), "num_snow", 8)) { + if (!str_utils_compare_length(buf, sizeof(buf), "num_snow_gpu", 12)) { + if (buf[12] != ' ' || sscanf_s(buf + 13, "%d", &snow->num_snow_gpu) != 1) + goto End; + } + else { + if (buf[8] != ' ' || sscanf_s(buf + 9, "%d", &snow->num_snow) != 1) + goto End; + } + } + else if (!str_utils_compare_length(buf, sizeof(buf), "color", 5)) { + vec4& color = snow->color; + if (buf[5] != ' ' || sscanf_s(buf + 6, "%f %f %f %f", + &color.x, &color.y, &color.z, &color.w) != 4) + goto End; + } + else if (!str_utils_compare_length(buf, sizeof(buf), "velocity", 8)) { + vec3& velocity = snow->velocity; + if (buf[8] != ' ' || sscanf_s(buf + 9, "%f %f %f", + &velocity.x, &velocity.y, &velocity.z) != 3) + goto End; + } + else if (!str_utils_compare_length(buf, sizeof(buf), "vel_range", 9)) { + vec3& vel_range = snow->vel_range; + if (buf[9] != ' ' || sscanf_s(buf + 10, "%f %f %f", + &vel_range.x, &vel_range.y, &vel_range.z) != 3) + goto End; + } + else if (!str_utils_compare_length(buf, sizeof(buf), "range", 5)) { + if (!str_utils_compare_length(buf, sizeof(buf), "range_gpu", 9)) { + vec3& range_gpu = snow->range_gpu; + if (buf[9] != ' ' || sscanf_s(buf + 10, "%f %f %f", + &range_gpu.x, &range_gpu.y, &range_gpu.z) != 3) + goto End; + } + else { + vec3& range = snow->range; + if (buf[5] != ' ' || sscanf_s(buf + 6, "%f %f %f", + &range.x, &range.y, &range.z) != 3) + goto End; + } + } + else if (!str_utils_compare_length(buf, sizeof(buf), "offset", 6)) { + if (!str_utils_compare_length(buf, sizeof(buf), "offset_gpu", 10)) { + vec3& offset_gpu = snow->offset_gpu; + if (buf[10] != ' ' || sscanf_s(buf + 11, "%f %f %f", + &offset_gpu.x, &offset_gpu.y, &offset_gpu.z) != 3) + goto End; + } + else { + vec3& offset = snow->offset; + if (buf[6] != ' ' || sscanf_s(buf + 7, "%f %f %f", + &offset.x, &offset.y, &offset.z) != 3) + goto End; + } + } + else if (!str_utils_compare_length(buf, sizeof(buf), "colli_ground", 12)) { + stage_param_snow_colli_ground& colli_ground = snow->colli_ground; + if (buf[12] != ' ' || sscanf_s(buf + 13, "%f %f %f %f %f", + &colli_ground.field_0, &colli_ground.field_4, &colli_ground.field_8, + &colli_ground.field_C, &colli_ground.field_10) != 5) + goto End; + } + } + + free_def(data); + snow->ready = true; + return; + +End: + free_def(data); +} + +static void stage_param_snow_write_inner(stage_param_snow* snow, stream& s) { + char buf[0x200]; + + s.write("tex_name", 8); + stage_param_snow_write_string(s, buf, sizeof(buf), snow->tex_name); + s.write_char('\n'); + + s.write("num_snow", 8); + stage_param_snow_write_int32_t(s, buf, sizeof(buf), snow->num_snow); + s.write_char('\n'); + + s.write("num_snow_gpu", 12); + stage_param_snow_write_int32_t(s, buf, sizeof(buf), snow->num_snow_gpu); + s.write_char('\n'); + + vec4& color = snow->color; + s.write("color", 5); + stage_param_snow_write_float_t(s, buf, sizeof(buf), color.x); + stage_param_snow_write_float_t(s, buf, sizeof(buf), color.y); + stage_param_snow_write_float_t(s, buf, sizeof(buf), color.z); + stage_param_snow_write_float_t(s, buf, sizeof(buf), color.w); + s.write_char('\n'); + + vec3& velocity = snow->velocity; + s.write("velocity", 8); + stage_param_snow_write_float_t(s, buf, sizeof(buf), velocity.x); + stage_param_snow_write_float_t(s, buf, sizeof(buf), velocity.y); + stage_param_snow_write_float_t(s, buf, sizeof(buf), velocity.z); + s.write_char('\n'); + + vec3& vel_range = snow->vel_range; + s.write("vel_range", 9); + stage_param_snow_write_float_t(s, buf, sizeof(buf), vel_range.x); + stage_param_snow_write_float_t(s, buf, sizeof(buf), vel_range.y); + stage_param_snow_write_float_t(s, buf, sizeof(buf), vel_range.z); + s.write_char('\n'); + + vec3& range = snow->range; + s.write("range", 5); + stage_param_snow_write_float_t(s, buf, sizeof(buf), range.x); + stage_param_snow_write_float_t(s, buf, sizeof(buf), range.y); + stage_param_snow_write_float_t(s, buf, sizeof(buf), range.z); + s.write_char('\n'); + + vec3& range_gpu = snow->range_gpu; + s.write("range_gpu", 9); + stage_param_snow_write_float_t(s, buf, sizeof(buf), range_gpu.x); + stage_param_snow_write_float_t(s, buf, sizeof(buf), range_gpu.y); + stage_param_snow_write_float_t(s, buf, sizeof(buf), range_gpu.z); + s.write_char('\n'); + + vec3& offset = snow->offset; + s.write("offset", 6); + stage_param_snow_write_float_t(s, buf, sizeof(buf), offset.x); + stage_param_snow_write_float_t(s, buf, sizeof(buf), offset.y); + stage_param_snow_write_float_t(s, buf, sizeof(buf), offset.z); + s.write_char('\n'); + + vec3& offset_gpu = snow->offset_gpu; + s.write("offset_gpu", 10); + stage_param_snow_write_float_t(s, buf, sizeof(buf), offset_gpu.x); + stage_param_snow_write_float_t(s, buf, sizeof(buf), offset_gpu.y); + stage_param_snow_write_float_t(s, buf, sizeof(buf), offset_gpu.z); + s.write_char('\n'); + + stage_param_snow_colli_ground& colli_ground = snow->colli_ground; + s.write("colli_ground", 12); + stage_param_snow_write_float_t(s, buf, sizeof(buf), colli_ground.field_0); + stage_param_snow_write_float_t(s, buf, sizeof(buf), colli_ground.field_4); + stage_param_snow_write_float_t(s, buf, sizeof(buf), colli_ground.field_8); + stage_param_snow_write_float_t(s, buf, sizeof(buf), colli_ground.field_C); + stage_param_snow_write_float_t(s, buf, sizeof(buf), colli_ground.field_10); + s.write_char('\n'); +} + +static const char* stage_param_snow_read_line(char* buf, int32_t size, const char* src) { + char* b = buf; + if (!src || !*src) + return 0; + + for (int32_t i = 0; i < size - 1; i++, b++) { + char c = b[0] = *src++; + if (!c) { + b++; + break; + } + else if (c == '\n') { + *b++ = 0; + break; + } + else if (c == '\r' && *src == '\n') { + *b++ = 0; + src++; + break; + } + } + return src; +} + +inline static void stage_param_snow_write_int32_t(stream& s, char* buf, size_t buf_size, int32_t value) { + sprintf_s(buf, buf_size, " %d", value); + s.write_utf8_string(buf); +} + +inline static void stage_param_snow_write_float_t(stream& s, char* buf, size_t buf_size, float_t value) { + sprintf_s(buf, buf_size, " %#.6g", value); + s.write_utf8_string(buf); +} + +inline static void stage_param_snow_write_string(stream& s, + char* buf, size_t buf_size, std::string& value) { + s.write_char(' '); + s.write_string(value); +} diff --git a/src/KKdLib/stage_param/snow.hpp b/src/KKdLib/stage_param/snow.hpp new file mode 100644 index 00000000..1d23f925 --- /dev/null +++ b/src/KKdLib/stage_param/snow.hpp @@ -0,0 +1,48 @@ +/* + by korenkonder + GitHub/GitLab: korenkonder +*/ + +#pragma once + +#include "../default.hpp" +#include "../vec.hpp" +#include + +struct stage_param_snow_colli_ground { + float_t field_0; + float_t field_4; + float_t field_8; + float_t field_C; + float_t field_10; + + stage_param_snow_colli_ground(); +}; + +struct stage_param_snow { + bool ready; + + std::string tex_name; + int32_t num_snow; + int32_t num_snow_gpu; + vec4 color; + vec3 velocity; + vec3 vel_range; + vec3 range; + vec3 range_gpu; + vec3 offset; + vec3 offset_gpu; + stage_param_snow_colli_ground colli_ground; + + stage_param_snow(); + ~stage_param_snow(); + + void read(const char* path); + void read(const wchar_t* path); + void read(const void* data, size_t size); + void write(const char* path); + void write(const wchar_t* path); + void write(void** data, size_t* size); + + static bool load_file(void* data, const char* path, const char* file, uint32_t hash); +}; diff --git a/src/KKdLib/stage_param/splash.cpp b/src/KKdLib/stage_param/splash.cpp new file mode 100644 index 00000000..11fb2b0d --- /dev/null +++ b/src/KKdLib/stage_param/splash.cpp @@ -0,0 +1,265 @@ +/* + by korenkonder + GitHub/GitLab: korenkonder +*/ + +#include "splash.hpp" +#include "../io/file_stream.hpp" +#include "../io/memory_stream.hpp" +#include "../io/path.hpp" +#include "../str_utils.hpp" + +static void stage_param_splash_read_inner(stage_param_splash* splash, stream& s); +static void stage_param_splash_write_inner(stage_param_splash* splash, stream& s); +static const char* stage_param_splash_read_line(char* buf, int32_t size, const char* src); +static void stage_param_splash_write_int32_t(stream& s, char* buf, size_t buf_size, int32_t value); +static void stage_param_splash_write_float_t(stream& s, char* buf, size_t buf_size, float_t value); +static void stage_param_splash_write_string(stream& s, + char* buf, size_t buf_size, std::string& value); + +stage_param_splash::stage_param_splash() : ready(), particle_size(), emit_num(), +emission_ratio_attn(), emission_velocity_scale(), ripple_emission(), in_water(), blink() { + +} + +stage_param_splash::~stage_param_splash() { + +} + +void stage_param_splash::read(const char* path) { + char* path_txt = str_utils_add(path, ".txt"); + if (path_check_file_exists(path_txt)) { + file_stream s; + s.open(path_txt, "rb"); + if (s.check_not_null()) + stage_param_splash_read_inner(this, s); + } + free_def(path_txt); +} + +void stage_param_splash::read(const wchar_t* path) { + wchar_t* path_txt = str_utils_add(path, L".txt"); + if (path_check_file_exists(path_txt)) { + file_stream s; + s.open(path_txt, L"rb"); + if (s.check_not_null()) + stage_param_splash_read_inner(this, s); + } + free_def(path_txt); +} + +void stage_param_splash::read(const void* data, size_t size) { + memory_stream s; + s.open(data, size); + stage_param_splash_read_inner(this, s); +} + +void stage_param_splash::write(const char* path) { + if (!path || !ready) + return; + + char* path_txt = str_utils_add(path, ".txt"); + file_stream s; + s.open(path_txt, "wb"); + if (s.check_not_null()) + stage_param_splash_write_inner(this, s); + free_def(path_txt); +} + +void stage_param_splash::write(const wchar_t* path) { + if (!path || !ready) + return; + + wchar_t* path_txt = str_utils_add(path, L".txt"); + file_stream s; + s.open(path_txt, L"wb"); + if (s.check_not_null()) + stage_param_splash_write_inner(this, s); + free_def(path_txt); +} + +void stage_param_splash::write(void** data, size_t* size) { + if (!data || !size || !ready) + return; + + memory_stream s; + s.open(); + stage_param_splash_write_inner(this, s); + s.copy(data, size); +} + +bool stage_param_splash::load_file(void* data, const char* path, const char* file, uint32_t hash) { + size_t file_len = utf8_length(file); + + const char* t = strrchr(file, '.'); + if (t) + file_len = t - file; + + std::string s; + s.assign(path); + s.append(file, file_len); + + stage_param_splash* splash = (stage_param_splash*)data; + splash->read(s.c_str()); + + return splash->ready; +} + +static void stage_param_splash_read_inner(stage_param_splash* splash, stream& s) { + char* data = force_malloc_s(char, s.length + 1); + s.read(data, s.length); + data[s.length] = 0; + + char buf[0x200]; + const char* d = data; + + while (d = stage_param_splash_read_line(buf, sizeof(buf), d)) { + if (!str_utils_compare_length(buf, sizeof(buf), "splash_tex_name", 15)) { + if (buf[15] != ' ') + goto End; + + splash->splash_tex_name.assign(buf + 16); + } + if (!str_utils_compare_length(buf, sizeof(buf), "splash_obj_name", 15)) { + if (buf[15] != ' ') + goto End; + + splash->splash_obj_name.assign(buf + 16); + } + else if (!str_utils_compare_length(buf, sizeof(buf), "particle_size", 13)) { + if (buf[13] != ' ' || sscanf_s(buf + 14, "%f", &splash->particle_size) != 1) + goto End; + } + else if (!str_utils_compare_length(buf, sizeof(buf), "emit_num", 8)) { + if (buf[8] != ' ' || sscanf_s(buf + 9, "%d", &splash->emit_num) != 1) + goto End; + } + else if (!str_utils_compare_length(buf, sizeof(buf), "emission_ratio_attn", 19)) { + if (buf[19] != ' ' || sscanf_s(buf + 20, "%f", &splash->emission_ratio_attn) != 1) + goto End; + } + else if (!str_utils_compare_length(buf, sizeof(buf), "emission_velocity_scale", 23)) { + if (buf[23] != ' ' || sscanf_s(buf + 24, "%f", &splash->emission_velocity_scale) != 1) + goto End; + } + else if (!str_utils_compare_length(buf, sizeof(buf), "ripple_emission", 15)) { + if (buf[15] != ' ' || sscanf_s(buf + 16, "%f", &splash->ripple_emission) != 1) + goto End; + } + else if (!str_utils_compare_length(buf, sizeof(buf), "color", 5)) { + vec4& color = splash->color; + if (buf[5] != ' ' || sscanf_s(buf + 6, "%f %f %f %f", + &color.x, &color.y, &color.z, &color.w) != 4) + goto End; + } + else if (!str_utils_compare_length(buf, sizeof(buf), "in_water", 8)) { + int32_t in_water = 0; + if (buf[8] != ' ' || sscanf_s(buf + 9, "%d", &in_water) != 1) + goto End; + + splash->in_water = !!in_water; + } + else if (!str_utils_compare_length(buf, sizeof(buf), "blink", 5)) { + int32_t blink = 0; + if (buf[5] != ' ' || sscanf_s(buf + 6, "%d", &blink) != 1) + goto End; + + splash->blink = !!blink; + } + } + + free_def(data); + splash->ready = true; + return; + +End: + free_def(data); +} + +static void stage_param_splash_write_inner(stage_param_splash* splash, stream& s) { + char buf[0x200]; + + s.write("splash_tex_name", 15); + stage_param_splash_write_string(s, buf, sizeof(buf), splash->splash_tex_name); + s.write_char('\n'); + + s.write("splash_obj_name", 15); + stage_param_splash_write_string(s, buf, sizeof(buf), splash->splash_obj_name); + s.write_char('\n'); + + s.write("particle_size", 13); + stage_param_splash_write_float_t(s, buf, sizeof(buf), splash->particle_size); + s.write_char('\n'); + + s.write("emit_num", 8); + stage_param_splash_write_int32_t(s, buf, sizeof(buf), splash->emit_num); + s.write_char('\n'); + + s.write("emission_ratio_attn", 19); + stage_param_splash_write_float_t(s, buf, sizeof(buf), splash->emission_ratio_attn); + s.write_char('\n'); + + s.write("emission_velocity_scale", 23); + stage_param_splash_write_float_t(s, buf, sizeof(buf), splash->emission_velocity_scale); + s.write_char('\n'); + + s.write("ripple_emission", 15); + stage_param_splash_write_float_t(s, buf, sizeof(buf), splash->ripple_emission); + s.write_char('\n'); + + vec4& color = splash->color; + s.write("color", 5); + stage_param_splash_write_float_t(s, buf, sizeof(buf), color.x); + stage_param_splash_write_float_t(s, buf, sizeof(buf), color.y); + stage_param_splash_write_float_t(s, buf, sizeof(buf), color.z); + stage_param_splash_write_float_t(s, buf, sizeof(buf), color.w); + s.write_char('\n'); + + s.write("in_water", 8); + stage_param_splash_write_int32_t(s, buf, sizeof(buf), splash->in_water ? 1 : 0); + s.write_char('\n'); + + s.write("blink", 5); + stage_param_splash_write_int32_t(s, buf, sizeof(buf), splash->blink ? 1 : 0); + s.write_char('\n'); +} + +static const char* stage_param_splash_read_line(char* buf, int32_t size, const char* src) { + char* b = buf; + if (!src || !*src) + return 0; + + for (int32_t i = 0; i < size - 1; i++, b++) { + char c = b[0] = *src++; + if (!c) { + b++; + break; + } + else if (c == '\n') { + *b++ = 0; + break; + } + else if (c == '\r' && *src == '\n') { + *b++ = 0; + src++; + break; + } + } + return src; +} + +inline static void stage_param_splash_write_int32_t(stream& s, char* buf, size_t buf_size, int32_t value) { + sprintf_s(buf, buf_size, " %d", value); + s.write_utf8_string(buf); +} + +inline static void stage_param_splash_write_float_t(stream& s, char* buf, size_t buf_size, float_t value) { + sprintf_s(buf, buf_size, " %#.6g", value); + s.write_utf8_string(buf); +} + +inline static void stage_param_splash_write_string(stream& s, + char* buf, size_t buf_size, std::string& value) { + s.write_char(' '); + s.write_string(value); +} diff --git a/src/KKdLib/stage_param/splash.hpp b/src/KKdLib/stage_param/splash.hpp new file mode 100644 index 00000000..6bf10227 --- /dev/null +++ b/src/KKdLib/stage_param/splash.hpp @@ -0,0 +1,37 @@ +/* + by korenkonder + GitHub/GitLab: korenkonder +*/ + +#pragma once + +#include "../default.hpp" +#include "../vec.hpp" +#include + +struct stage_param_splash { + bool ready; + + std::string splash_tex_name; + std::string splash_obj_name; + float_t particle_size; + int32_t emit_num; + float_t emission_ratio_attn; + float_t emission_velocity_scale; + float_t ripple_emission; + vec4 color; + bool in_water; + bool blink; + + stage_param_splash(); + ~stage_param_splash(); + + void read(const char* path); + void read(const wchar_t* path); + void read(const void* data, size_t size); + void write(const char* path); + void write(const wchar_t* path); + void write(void** data, size_t* size); + + static bool load_file(void* data, const char* path, const char* file, uint32_t hash); +}; diff --git a/src/KKdLib/stage_param/star.cpp b/src/KKdLib/stage_param/star.cpp new file mode 100644 index 00000000..686187f3 --- /dev/null +++ b/src/KKdLib/stage_param/star.cpp @@ -0,0 +1,268 @@ +/* + by korenkonder + GitHub/GitLab: korenkonder +*/ + +#include "star.hpp" +#include "../io/file_stream.hpp" +#include "../io/memory_stream.hpp" +#include "../io/path.hpp" +#include "../str_utils.hpp" + +static void stage_param_star_read_inner(stage_param_star* star, stream& s); +static void stage_param_star_write_inner(stage_param_star* star, stream& s); +static const char* stage_param_star_read_line(char* buf, int32_t size, const char* src); +static void stage_param_star_write_int32_t(stream& s, char* buf, size_t buf_size, int32_t value); +static void stage_param_star_write_size_t(stream& s, char* buf, size_t buf_size, size_t value); +static void stage_param_star_write_float_t(stream& s, char* buf, size_t buf_size, float_t value); +static void stage_param_star_write_string(stream& s, + char* buf, size_t buf_size, std::string& value); + +stage_param_star_utc::stage_param_star_utc() { + year = 2013; + month = 1; + day = 1; + hour = 12; + minute = 0; + second = 0.0f; +} + +stage_param_star_modifiers::stage_param_star_modifiers() { + field_0 = 1.0f; + field_4 = 1.0f; + field_8 = 0.0f; + field_C = 0.0f; + size_max = 64.0f; +} + +stage_param_star::stage_param_star() : ready() { + rotation_y_deg = 0.0f; + observer_north_latitude_deg = 0.0f; + observer_east_longitude_deg = 0.0f; +} + +stage_param_star::~stage_param_star() { + +} + +void stage_param_star::read(const char* path) { + char* path_txt = str_utils_add(path, ".txt"); + if (path_check_file_exists(path_txt)) { + file_stream s; + s.open(path_txt, "rb"); + if (s.check_not_null()) + stage_param_star_read_inner(this, s); + } + free_def(path_txt); +} + +void stage_param_star::read(const wchar_t* path) { + wchar_t* path_txt = str_utils_add(path, L".txt"); + if (path_check_file_exists(path_txt)) { + file_stream s; + s.open(path_txt, L"rb"); + if (s.check_not_null()) + stage_param_star_read_inner(this, s); + } + free_def(path_txt); +} + +void stage_param_star::read(const void* data, size_t size) { + memory_stream s; + s.open(data, size); + stage_param_star_read_inner(this, s); +} + +void stage_param_star::write(const char* path) { + if (!path || !ready) + return; + + char* path_txt = str_utils_add(path, ".txt"); + file_stream s; + s.open(path_txt, "wb"); + if (s.check_not_null()) + stage_param_star_write_inner(this, s); + free_def(path_txt); +} + +void stage_param_star::write(const wchar_t* path) { + if (!path || !ready) + return; + + wchar_t* path_txt = str_utils_add(path, L".txt"); + file_stream s; + s.open(path_txt, L"wb"); + if (s.check_not_null()) + stage_param_star_write_inner(this, s); + free_def(path_txt); +} + +void stage_param_star::write(void** data, size_t* size) { + if (!data || !size || !ready) + return; + + memory_stream s; + s.open(); + stage_param_star_write_inner(this, s); + s.copy(data, size); +} + +bool stage_param_star::load_file(void* data, const char* path, const char* file, uint32_t hash) { + size_t file_len = utf8_length(file); + + const char* t = strrchr(file, '.'); + if (t) + file_len = t - file; + + std::string s; + s.assign(path); + s.append(file, file_len); + + stage_param_star* star = (stage_param_star*)data; + star->read(s.c_str()); + + return star->ready; +} + +static void stage_param_star_read_inner(stage_param_star* star, stream& s) { + char* data = force_malloc_s(char, s.length + 1); + s.read(data, s.length); + data[s.length] = 0; + + char buf[0x200]; + const char* d = data; + + while (d = stage_param_star_read_line(buf, sizeof(buf), d)) { + if (!str_utils_compare_length(buf, sizeof(buf), "milky_way_texture_name", 22)) { + if (buf[22] != ' ') + goto End; + + star->milky_way_texture_name.assign(buf + 23); + } + else if (!str_utils_compare_length(buf, sizeof(buf), "utc", 3)) { + stage_param_star_utc& utc = star->utc; + if (buf[3] != ' ' || sscanf_s(buf + 4, "%d %d %d %d %d %f", + &utc.year, &utc.month, &utc.day, &utc.hour, &utc.minute, &utc.second) != 6) + goto End; + } + else if (!str_utils_compare_length(buf, sizeof(buf), "rotation_y_deg", 14)) { + if (buf[14] != ' ' || sscanf_s(buf + 15, "%f", &star->rotation_y_deg) != 1) + goto End; + } + else if (!str_utils_compare_length(buf, sizeof(buf), "observer_north_latitude_deg", 27)) { + if (buf[27] != ' ' || sscanf_s(buf + 28, "%f", &star->observer_north_latitude_deg) != 1) + goto End; + } + else if (!str_utils_compare_length(buf, sizeof(buf), "observer_east_longitude_deg", 27)) { + if (buf[27] != ' ' || sscanf_s(buf + 28, "%f", &star->observer_east_longitude_deg) != 1) + goto End; + } + else if (!str_utils_compare_length(buf, sizeof(buf), "modifiers", 9)) { + size_t index = 0; + stage_param_star_modifiers modifiers; + if (buf[9] != ' ' || sscanf_s(buf + 10, "%llu %f %f %f %f %f", + &index, &modifiers.field_0, &modifiers.field_4, + &modifiers.field_8, &modifiers.field_C, &modifiers.size_max) != 6) + goto End; + + if (index >= 2) + goto End; + + star->modifiers[index] = modifiers; + } + } + + free_def(data); + star->ready = true; + return; + +End: + free_def(data); +} + +static void stage_param_star_write_inner(stage_param_star* star, stream& s) { + char buf[0x200]; + + s.write("milky_way_texture_name", 22); + stage_param_star_write_string(s, buf, sizeof(buf), star->milky_way_texture_name); + s.write_char('\n'); + + stage_param_star_utc& utc = star->utc; + s.write("utc", 3); + stage_param_star_write_int32_t(s, buf, sizeof(buf), utc.year); + stage_param_star_write_int32_t(s, buf, sizeof(buf), utc.month); + stage_param_star_write_int32_t(s, buf, sizeof(buf), utc.day); + stage_param_star_write_int32_t(s, buf, sizeof(buf), utc.hour); + stage_param_star_write_int32_t(s, buf, sizeof(buf), utc.minute); + stage_param_star_write_float_t(s, buf, sizeof(buf), utc.second); + s.write_char('\n'); + + s.write("rotation_y_deg", 14); + stage_param_star_write_float_t(s, buf, sizeof(buf), star->rotation_y_deg); + s.write_char('\n'); + + s.write("observer_north_latitude_deg", 27); + stage_param_star_write_float_t(s, buf, sizeof(buf), star->observer_north_latitude_deg); + s.write_char('\n'); + + s.write("observer_east_longitude_deg", 27); + stage_param_star_write_float_t(s, buf, sizeof(buf), star->observer_east_longitude_deg); + s.write_char('\n'); + + for (size_t i = 0; i < 2; i++) { + stage_param_star_modifiers& modifiers = star->modifiers[i]; + s.write("modifiers", 9); + stage_param_star_write_size_t(s, buf, sizeof(buf), i); + stage_param_star_write_float_t(s, buf, sizeof(buf), modifiers.field_0); + stage_param_star_write_float_t(s, buf, sizeof(buf), modifiers.field_4); + stage_param_star_write_float_t(s, buf, sizeof(buf), modifiers.field_8); + stage_param_star_write_float_t(s, buf, sizeof(buf), modifiers.field_C); + stage_param_star_write_float_t(s, buf, sizeof(buf), modifiers.size_max); + s.write_char('\n'); + } +} + +static const char* stage_param_star_read_line(char* buf, int32_t size, const char* src) { + char* b = buf; + if (!src || !*src) + return 0; + + for (int32_t i = 0; i < size - 1; i++, b++) { + char c = b[0] = *src++; + if (!c) { + b++; + break; + } + else if (c == '\n') { + *b++ = 0; + break; + } + else if (c == '\r' && *src == '\n') { + *b++ = 0; + src++; + break; + } + } + return src; +} + +inline static void stage_param_star_write_int32_t(stream& s, char* buf, size_t buf_size, int32_t value) { + sprintf_s(buf, buf_size, " %d", value); + s.write_utf8_string(buf); +} + +inline static void stage_param_star_write_size_t(stream& s, char* buf, size_t buf_size, size_t value) { + sprintf_s(buf, buf_size, " %llu", value); + s.write_utf8_string(buf); +} + +inline static void stage_param_star_write_float_t(stream& s, char* buf, size_t buf_size, float_t value) { + sprintf_s(buf, buf_size, " %#.6g", value); + s.write_utf8_string(buf); +} + +inline static void stage_param_star_write_string(stream& s, + char* buf, size_t buf_size, std::string& value) { + s.write_char(' '); + s.write_string(value); +} diff --git a/src/KKdLib/stage_param/star.hpp b/src/KKdLib/stage_param/star.hpp new file mode 100644 index 00000000..b1d9b436 --- /dev/null +++ b/src/KKdLib/stage_param/star.hpp @@ -0,0 +1,53 @@ +/* + by korenkonder + GitHub/GitLab: korenkonder +*/ + +#pragma once + +#include "../default.hpp" +#include + +struct stage_param_star_utc { + int32_t year; + int32_t month; + int32_t day; + int32_t hour; + int32_t minute; + float_t second; + + stage_param_star_utc(); +}; + +struct stage_param_star_modifiers { + float_t field_0; + float_t field_4; + float_t field_8; + float_t field_C; + float_t size_max; + + stage_param_star_modifiers(); +}; + +struct stage_param_star { + bool ready; + + std::string milky_way_texture_name; + stage_param_star_utc utc; + float_t rotation_y_deg; + float_t observer_north_latitude_deg; + float_t observer_east_longitude_deg; + stage_param_star_modifiers modifiers[2]; + + stage_param_star(); + ~stage_param_star(); + + void read(const char* path); + void read(const wchar_t* path); + void read(const void* data, size_t size); + void write(const char* path); + void write(const wchar_t* path); + void write(void** data, size_t* size); + + static bool load_file(void* data, const char* path, const char* file, uint32_t hash); +}; diff --git a/src/KKdLib/str_utils.cpp b/src/KKdLib/str_utils.cpp index fc06153e..b2593ec3 100644 --- a/src/KKdLib/str_utils.cpp +++ b/src/KKdLib/str_utils.cpp @@ -627,6 +627,8 @@ bool str_utils_text_file_parse(const void* data, size_t size, if (ch != '\r' && ch != '\n') buf_len++; + else + c--; lf = false; t = d; diff --git a/src/KKdLib/vec.cpp b/src/KKdLib/vec.cpp index 774d38d8..b75e2750 100644 --- a/src/KKdLib/vec.cpp +++ b/src/KKdLib/vec.cpp @@ -11,15 +11,3 @@ const __m128 vec4_neg = { -0.0f, -0.0f, -0.0f, -0.0f }; const vec4i vec4_mask_vec2 = { (int32_t)0xFFFFFFFF, (int32_t)0xFFFFFFFF, (int32_t)0x00000000, (int32_t)0x00000000 }; const vec4i vec4_mask_vec3 = { (int32_t)0xFFFFFFFF, (int32_t)0xFFFFFFFF, (int32_t)0xFFFFFFFF, (int32_t)0x00000000 }; - -const vec2 vec2_identity = { 1.0f, 1.0f }; -const vec3 vec3_identity = { 1.0f, 1.0f, 1.0f }; -const vec4 vec4_identity = { 1.0f, 1.0f, 1.0f, 1.0f }; - -const vec2 vec2_null = { 0.0f, 0.0f }; -const vec3 vec3_null = { 0.0f, 0.0f, 0.0f }; -const vec4 vec4_null = { 0.0f, 0.0f, 0.0f, 0.0f }; - -const vec2i vec2i_null = { 0, 0 }; -const vec3i vec3i_null = { 0, 0, 0 }; -const vec4i vec4i_null = { 0, 0, 0, 0 }; diff --git a/src/KKdLib/vec.hpp b/src/KKdLib/vec.hpp index 543b1d91..2b214b09 100644 --- a/src/KKdLib/vec.hpp +++ b/src/KKdLib/vec.hpp @@ -458,18 +458,6 @@ extern const __m128 vec4_neg; extern const vec4i vec4_mask_vec2; extern const vec4i vec4_mask_vec3; -extern const vec2 vec2_identity; -extern const vec3 vec3_identity; -extern const vec4 vec4_identity; - -extern const vec2 vec2_null; -extern const vec3 vec3_null; -extern const vec4 vec4_null; - -extern const vec2i vec2i_null; -extern const vec3i vec3i_null; -extern const vec4i vec4i_null; - inline vec2::vec2() : x(), y() { } @@ -484,15 +472,18 @@ inline vec2::vec2(float_t x, float_t y) : x(x), y(y) { inline __m128 vec2::load_xmm(const float_t data) { __m128 _data = _mm_set_ss(data); - return _mm_shuffle_ps(_data, _data, 0); + _data = _mm_shuffle_ps(_data, _data, 0); + return _mm_and_ps(_data, _mm_castsi128_ps(vec4i::load_xmm(vec4_mask_vec2))); } inline __m128 vec2::load_xmm(const vec2& data) { - return _mm_castsi128_ps(_mm_loadl_epi64((const __m128i*) & data)); + __m128 _data = _mm_castsi128_ps(_mm_loadl_epi64((const __m128i*) & data)); + return _mm_and_ps(_data, _mm_castsi128_ps(vec4i::load_xmm(vec4_mask_vec2))); } inline __m128 vec2::load_xmm(const vec2&& data) { - return _mm_castsi128_ps(_mm_loadl_epi64((const __m128i*) & data)); + __m128 _data = _mm_castsi128_ps(_mm_loadl_epi64((const __m128i*) & data)); + return _mm_and_ps(_data, _mm_castsi128_ps(vec4i::load_xmm(vec4_mask_vec2))); } inline vec2 vec2::store_xmm(const __m128& data) { @@ -509,15 +500,18 @@ inline vec2 vec2::store_xmm(const __m128&& data) { inline __m128 vec3::load_xmm(const float_t data) { __m128 _data = _mm_set_ss(data); - return _mm_shuffle_ps(_data, _data, 0); + _data = _mm_shuffle_ps(_data, _data, 0); + return _mm_and_ps(_data, _mm_castsi128_ps(vec4i::load_xmm(vec4_mask_vec3))); } inline __m128 vec3::load_xmm(const vec3& data) { - return _mm_movelh_ps(_mm_castsi128_ps(_mm_loadl_epi64((const __m128i*) & data)), _mm_set_ss(data.z)); + __m128 _data = _mm_movelh_ps(_mm_castsi128_ps(_mm_loadl_epi64((const __m128i*) & data)), _mm_set_ss(data.z)); + return _mm_and_ps(_data, _mm_castsi128_ps(vec4i::load_xmm(vec4_mask_vec3))); } inline __m128 vec3::load_xmm(const vec3&& data) { - return _mm_movelh_ps(_mm_castsi128_ps(_mm_loadl_epi64((const __m128i*) & data)), _mm_set_ss(data.z)); + __m128 _data = _mm_movelh_ps(_mm_castsi128_ps(_mm_loadl_epi64((const __m128i*) & data)), _mm_set_ss(data.z)); + return _mm_and_ps(_data, _mm_castsi128_ps(vec4i::load_xmm(vec4_mask_vec3))); } inline vec3 vec3::store_xmm(const __m128& data) { @@ -760,6 +754,14 @@ inline vec2 operator -(const vec2& left) { return vec2::store_xmm(_mm_xor_ps(vec2::load_xmm(left), vec2_neg)); } +inline bool operator ==(const vec2& left, const vec2& right) { + return !memcmp(&left, &right, sizeof(vec2)); +} + +inline bool operator !=(const vec2& left, const vec2& right) { + return !!memcmp(&left, &right, sizeof(vec2)); +} + inline float_t vec2::angle(const vec2& left, const vec2& right) { return acosf(vec2::dot(left, right) / (vec2::length(left) * vec2::length(right))); } @@ -824,8 +826,8 @@ inline vec2 vec2::normalize(const vec2& left) { xt = vec2::load_xmm(left); zt = _mm_mul_ps(xt, xt); zt = _mm_sqrt_ss(_mm_hadd_ps(zt, zt)); - if (zt.m128_f32[0] != 0.0f) - zt.m128_f32[0] = 1.0f / zt.m128_f32[0]; + if (_mm_cvtss_f32(zt) != 0.0f) + zt = _mm_div_ss(_mm_set_ss(1.0f), zt); return vec2::store_xmm(_mm_mul_ps(xt, _mm_shuffle_ps(zt, zt, 0))); } @@ -856,8 +858,8 @@ inline vec2 vec2::mult_min_max(const vec2& left, const vec2& min, const vec2& ma __m128 yt; __m128 zt; xt = vec2::load_xmm(left); - yt = _mm_and_ps(_mm_cmplt_ps(xt, vec4::load_xmm(vec4_null)), vec2::load_xmm(-min)); - zt = _mm_and_ps(_mm_cmpge_ps(xt, vec4::load_xmm(vec4_null)), vec2::load_xmm(max)); + yt = _mm_and_ps(_mm_cmplt_ps(xt, vec4::load_xmm(0.0f)), vec2::load_xmm(-min)); + zt = _mm_and_ps(_mm_cmpge_ps(xt, vec4::load_xmm(0.0f)), vec2::load_xmm(max)); return vec2::store_xmm(_mm_mul_ps(xt, _mm_or_ps(yt, zt))); } @@ -866,8 +868,8 @@ inline vec2 vec2::mult_min_max(const vec2& left, const float_t min, const float_ __m128 yt; __m128 zt; xt = vec2::load_xmm(left); - yt = _mm_and_ps(_mm_cmplt_ps(xt, vec4::load_xmm(vec4_null)), vec2::load_xmm(-min)); - zt = _mm_and_ps(_mm_cmpge_ps(xt, vec4::load_xmm(vec4_null)), vec2::load_xmm(max)); + yt = _mm_and_ps(_mm_cmplt_ps(xt, vec4::load_xmm(0.0f)), vec2::load_xmm(-min)); + zt = _mm_and_ps(_mm_cmpge_ps(xt, vec4::load_xmm(0.0f)), vec2::load_xmm(max)); return vec2::store_xmm(_mm_mul_ps(xt, _mm_or_ps(yt, zt))); } @@ -876,8 +878,8 @@ inline vec2 vec2::div_min_max(const vec2& left, const vec2& min, const vec2& max __m128 yt; __m128 zt; xt = vec2::load_xmm(left); - yt = _mm_and_ps(_mm_cmplt_ps(xt, vec4::load_xmm(vec4_null)), vec2::load_xmm(-min)); - zt = _mm_and_ps(_mm_cmpge_ps(xt, vec4::load_xmm(vec4_null)), vec2::load_xmm(max)); + yt = _mm_and_ps(_mm_cmplt_ps(xt, vec4::load_xmm(0.0f)), vec2::load_xmm(-min)); + zt = _mm_and_ps(_mm_cmpge_ps(xt, vec4::load_xmm(0.0f)), vec2::load_xmm(max)); return vec2::store_xmm(_mm_div_ps(xt, _mm_or_ps(yt, zt))); } @@ -886,8 +888,8 @@ inline vec2 vec2::div_min_max(const vec2& left, const float_t min, const float_t __m128 yt; __m128 zt; xt = vec2::load_xmm(left); - yt = _mm_and_ps(_mm_cmplt_ps(xt, vec4::load_xmm(vec4_null)), vec2::load_xmm(-min)); - zt = _mm_and_ps(_mm_cmpge_ps(xt, vec4::load_xmm(vec4_null)), vec2::load_xmm(max)); + yt = _mm_and_ps(_mm_cmplt_ps(xt, vec4::load_xmm(0.0f)), vec2::load_xmm(-min)); + zt = _mm_and_ps(_mm_cmpge_ps(xt, vec4::load_xmm(0.0f)), vec2::load_xmm(max)); return vec2::store_xmm(_mm_div_ps(xt, _mm_or_ps(yt, zt))); } @@ -1027,6 +1029,14 @@ inline vec3 operator -(const vec3& left) { return vec3::store_xmm(_mm_xor_ps(vec3::load_xmm(left), vec3_neg)); } +inline bool operator ==(const vec3& left, const vec3& right) { + return !memcmp(&left, &right, sizeof(vec3)); +} + +inline bool operator !=(const vec3& left, const vec3& right) { + return !!memcmp(&left, &right, sizeof(vec3)); +} + inline float_t vec3::angle(const vec3& left, const vec3& right) { return acosf(vec3::dot(left, right) / (vec3::length(left) * vec3::length(right))); } @@ -1036,9 +1046,7 @@ inline float_t vec3::dot(const vec3& left, const vec3& right) { __m128 yt; __m128 zt; xt = vec3::load_xmm(left); - xt = _mm_and_ps(xt, _mm_castsi128_ps(vec4i::load_xmm(vec4_mask_vec3))); yt = vec3::load_xmm(right); - yt = _mm_and_ps(yt, _mm_castsi128_ps(vec4i::load_xmm(vec4_mask_vec3))); zt = _mm_mul_ps(xt, yt); zt = _mm_hadd_ps(zt, zt); return _mm_cvtss_f32(_mm_hadd_ps(zt, zt)); @@ -1047,7 +1055,7 @@ inline float_t vec3::dot(const vec3& left, const vec3& right) { inline float_t vec3::length(const vec3& left) { __m128 xt; __m128 zt; - xt = _mm_and_ps(vec3::load_xmm(left), _mm_castsi128_ps(vec4i::load_xmm(vec4_mask_vec3))); + xt = vec3::load_xmm(left); zt = _mm_mul_ps(xt, xt); zt = _mm_hadd_ps(zt, zt); return _mm_cvtss_f32(_mm_sqrt_ss(_mm_hadd_ps(zt, zt))); @@ -1056,7 +1064,7 @@ inline float_t vec3::length(const vec3& left) { inline float_t vec3::length_squared(const vec3& left) { __m128 xt; __m128 zt; - xt = _mm_and_ps(vec3::load_xmm(left), _mm_castsi128_ps(vec4i::load_xmm(vec4_mask_vec3))); + xt = vec3::load_xmm(left); zt = _mm_mul_ps(xt, xt); zt = _mm_hadd_ps(zt, zt); return _mm_cvtss_f32(_mm_hadd_ps(zt, zt)); @@ -1066,8 +1074,8 @@ inline float_t vec3::distance(const vec3& left, const vec3& right) { __m128 xt; __m128 yt; __m128 zt; - xt = _mm_and_ps(vec3::load_xmm(left), _mm_castsi128_ps(vec4i::load_xmm(vec4_mask_vec3))); - yt = _mm_and_ps(vec3::load_xmm(right), _mm_castsi128_ps(vec4i::load_xmm(vec4_mask_vec3))); + xt = vec3::load_xmm(left); + yt = vec3::load_xmm(right); zt = _mm_sub_ps(xt, yt); zt = _mm_mul_ps(zt, zt); zt = _mm_hadd_ps(zt, zt); @@ -1078,8 +1086,8 @@ inline float_t vec3::distance_squared(const vec3& left, const vec3& right) { __m128 xt; __m128 yt; __m128 zt; - xt = _mm_and_ps(vec3::load_xmm(left), _mm_castsi128_ps(vec4i::load_xmm(vec4_mask_vec3))); - yt = _mm_and_ps(vec3::load_xmm(right), _mm_castsi128_ps(vec4i::load_xmm(vec4_mask_vec3))); + xt = vec3::load_xmm(left); + yt = vec3::load_xmm(right); zt = _mm_sub_ps(xt, yt); zt = _mm_mul_ps(zt, zt); zt = _mm_hadd_ps(zt, zt); @@ -1108,12 +1116,11 @@ inline vec3 vec3::normalize(const vec3& left) { __m128 xt; __m128 zt; xt = vec3::load_xmm(left); - xt = _mm_and_ps(xt, _mm_castsi128_ps(vec4i::load_xmm(vec4_mask_vec3))); zt = _mm_mul_ps(xt, xt); zt = _mm_hadd_ps(zt, zt); zt = _mm_sqrt_ss(_mm_hadd_ps(zt, zt)); - if (zt.m128_f32[0] != 0.0f) - zt.m128_f32[0] = 1.0f / zt.m128_f32[0]; + if (_mm_cvtss_f32(zt) != 0.0f) + zt = _mm_div_ss(_mm_set_ss(1.0f), zt); return vec3::store_xmm(_mm_mul_ps(xt, _mm_shuffle_ps(zt, zt, 0))); } @@ -1144,8 +1151,8 @@ inline vec3 vec3::mult_min_max(const vec3& left, const vec3& min, const vec3& ma __m128 yt; __m128 zt; xt = vec3::load_xmm(left); - yt = _mm_and_ps(_mm_cmplt_ps(xt, vec4::load_xmm(vec4_null)), vec3::load_xmm(-min)); - zt = _mm_and_ps(_mm_cmpge_ps(xt, vec4::load_xmm(vec4_null)), vec3::load_xmm(max)); + yt = _mm_and_ps(_mm_cmplt_ps(xt, vec4::load_xmm(0.0f)), vec3::load_xmm(-min)); + zt = _mm_and_ps(_mm_cmpge_ps(xt, vec4::load_xmm(0.0f)), vec3::load_xmm(max)); return vec3::store_xmm(_mm_mul_ps(xt, _mm_or_ps(yt, zt))); } @@ -1154,8 +1161,8 @@ inline vec3 vec3::mult_min_max(const vec3& left, const float_t min, const float_ __m128 yt; __m128 zt; xt = vec3::load_xmm(left); - yt = _mm_and_ps(_mm_cmplt_ps(xt, vec4::load_xmm(vec4_null)), vec3::load_xmm(-min)); - zt = _mm_and_ps(_mm_cmpge_ps(xt, vec4::load_xmm(vec4_null)), vec3::load_xmm(max)); + yt = _mm_and_ps(_mm_cmplt_ps(xt, vec4::load_xmm(0.0f)), vec3::load_xmm(-min)); + zt = _mm_and_ps(_mm_cmpge_ps(xt, vec4::load_xmm(0.0f)), vec3::load_xmm(max)); return vec3::store_xmm(_mm_mul_ps(xt, _mm_or_ps(yt, zt))); } @@ -1164,8 +1171,8 @@ inline vec3 vec3::div_min_max(const vec3& left, const vec3& min, const vec3& max __m128 yt; __m128 zt; xt = vec3::load_xmm(left); - yt = _mm_and_ps(_mm_cmplt_ps(xt, vec4::load_xmm(vec4_null)), vec3::load_xmm(-min)); - zt = _mm_and_ps(_mm_cmpge_ps(xt, vec4::load_xmm(vec4_null)), vec3::load_xmm(max)); + yt = _mm_and_ps(_mm_cmplt_ps(xt, vec4::load_xmm(0.0f)), vec3::load_xmm(-min)); + zt = _mm_and_ps(_mm_cmpge_ps(xt, vec4::load_xmm(0.0f)), vec3::load_xmm(max)); return vec3::store_xmm(_mm_div_ps(xt, _mm_or_ps(yt, zt))); } @@ -1174,8 +1181,8 @@ inline vec3 vec3::div_min_max(const vec3& left, const float_t min, const float_t __m128 yt; __m128 zt; xt = vec3::load_xmm(left); - yt = _mm_and_ps(_mm_cmplt_ps(xt, vec4::load_xmm(vec4_null)), vec3::load_xmm(-min)); - zt = _mm_and_ps(_mm_cmpge_ps(xt, vec4::load_xmm(vec4_null)), vec3::load_xmm(max)); + yt = _mm_and_ps(_mm_cmplt_ps(xt, vec4::load_xmm(0.0f)), vec3::load_xmm(-min)); + zt = _mm_and_ps(_mm_cmpge_ps(xt, vec4::load_xmm(0.0f)), vec3::load_xmm(max)); return vec3::store_xmm(_mm_div_ps(xt, _mm_or_ps(yt, zt))); } @@ -1328,6 +1335,14 @@ inline vec4 operator -(const vec4& left) { return vec4::store_xmm(_mm_xor_ps(vec4::load_xmm(left), vec4_neg)); } +inline bool operator ==(const vec4& left, const vec4& right) { + return !memcmp(&left, &right, sizeof(vec4)); +} + +inline bool operator !=(const vec4& left, const vec4& right) { + return !!memcmp(&left, &right, sizeof(vec4)); +} + inline float_t vec4::angle(const vec4& left, const vec4& right) { return acosf(vec4::dot(left, right) / (vec4::length(left) * vec4::length(right))); } @@ -1377,8 +1392,7 @@ inline vec4 vec4::lerp(const vec4& left, const vec4& right, const vec4& blend) { __m128 b1; __m128 b2; b1 = vec4::load_xmm(blend); - b2 = vec4::load_xmm(1.0f); - b2 = _mm_sub_ps(b2, b1); + b2 = _mm_sub_ps(vec4::load_xmm(1.0f), b1); return vec4::store_xmm(_mm_add_ps(_mm_mul_ps(vec4::load_xmm(left), b2), _mm_mul_ps(vec4::load_xmm(right), b1))); } @@ -1387,8 +1401,7 @@ inline vec4 vec4::lerp(const vec4& left, const vec4& right, const float_t blend) __m128 b1; __m128 b2; b1 = vec4::load_xmm(blend); - b2 = vec4::load_xmm(1.0f); - b2 = _mm_sub_ps(b2, b1); + b2 = _mm_sub_ps(vec4::load_xmm(1.0f), b1); return vec4::store_xmm(_mm_add_ps(_mm_mul_ps(vec4::load_xmm(left), b2), _mm_mul_ps(vec4::load_xmm(right), b1))); } @@ -1400,8 +1413,8 @@ inline vec4 vec4::normalize(const vec4& left) { zt = _mm_mul_ps(xt, xt); zt = _mm_hadd_ps(zt, zt); zt = _mm_sqrt_ss(_mm_hadd_ps(zt, zt)); - if (zt.m128_f32[0] != 0.0f) - zt.m128_f32[0] = 1.0f / zt.m128_f32[0]; + if (_mm_cvtss_f32(zt) != 0.0f) + zt = _mm_div_ss(_mm_set_ss(1.0f), zt); return vec4::store_xmm(_mm_mul_ps(xt, _mm_shuffle_ps(zt, zt, 0))); } @@ -1432,8 +1445,8 @@ inline vec4 vec4::mult_min_max(const vec4& left, const vec4& min, const vec4& ma __m128 yt; __m128 zt; xt = vec4::load_xmm(left); - yt = _mm_and_ps(_mm_cmplt_ps(xt, vec4::load_xmm(vec4_null)), vec4::load_xmm(-min)); - zt = _mm_and_ps(_mm_cmpge_ps(xt, vec4::load_xmm(vec4_null)), vec4::load_xmm(max)); + yt = _mm_and_ps(_mm_cmplt_ps(xt, vec4::load_xmm(0.0f)), vec4::load_xmm(-min)); + zt = _mm_and_ps(_mm_cmpge_ps(xt, vec4::load_xmm(0.0f)), vec4::load_xmm(max)); return vec4::store_xmm(_mm_mul_ps(xt, _mm_or_ps(yt, zt))); } @@ -1442,8 +1455,8 @@ inline vec4 vec4::mult_min_max(const vec4& left, const float_t min, const float_ __m128 yt; __m128 zt; xt = vec4::load_xmm(left); - yt = _mm_and_ps(_mm_cmplt_ps(xt, vec4::load_xmm(vec4_null)), vec4::load_xmm(-min)); - zt = _mm_and_ps(_mm_cmpge_ps(xt, vec4::load_xmm(vec4_null)), vec4::load_xmm(max)); + yt = _mm_and_ps(_mm_cmplt_ps(xt, vec4::load_xmm(0.0f)), vec4::load_xmm(-min)); + zt = _mm_and_ps(_mm_cmpge_ps(xt, vec4::load_xmm(0.0f)), vec4::load_xmm(max)); return vec4::store_xmm(_mm_mul_ps(xt, _mm_or_ps(yt, zt))); } @@ -1452,8 +1465,8 @@ inline vec4 vec4::div_min_max(const vec4& left, const vec4& min, const vec4& max __m128 yt; __m128 zt; xt = vec4::load_xmm(left); - yt = _mm_and_ps(_mm_cmplt_ps(xt, vec4::load_xmm(vec4_null)), vec4::load_xmm(-min)); - zt = _mm_and_ps(_mm_cmpge_ps(xt, vec4::load_xmm(vec4_null)), vec4::load_xmm(max)); + yt = _mm_and_ps(_mm_cmplt_ps(xt, vec4::load_xmm(0.0f)), vec4::load_xmm(-min)); + zt = _mm_and_ps(_mm_cmpge_ps(xt, vec4::load_xmm(0.0f)), vec4::load_xmm(max)); return vec4::store_xmm(_mm_div_ps(xt, _mm_or_ps(yt, zt))); } @@ -1462,8 +1475,8 @@ inline vec4 vec4::div_min_max(const vec4& left, const float_t min, const float_t __m128 yt; __m128 zt; xt = vec4::load_xmm(left); - yt = _mm_and_ps(_mm_cmplt_ps(xt, vec4::load_xmm(vec4_null)), vec4::load_xmm(-min)); - zt = _mm_and_ps(_mm_cmpge_ps(xt, vec4::load_xmm(vec4_null)), vec4::load_xmm(max)); + yt = _mm_and_ps(_mm_cmplt_ps(xt, vec4::load_xmm(0.0f)), vec4::load_xmm(-min)); + zt = _mm_and_ps(_mm_cmpge_ps(xt, vec4::load_xmm(0.0f)), vec4::load_xmm(max)); return vec4::store_xmm(_mm_div_ps(xt, _mm_or_ps(yt, zt))); } diff --git a/src/ReDIVA/classes.cpp b/src/ReDIVA/classes.cpp index 255bfe24..bda3dc58 100644 --- a/src/ReDIVA/classes.cpp +++ b/src/ReDIVA/classes.cpp @@ -75,6 +75,7 @@ void classes_process_ctrl(classes_data* classes, const size_t classes_count) { } lock_unlock(c->data.lock); delete c->data.lock; + c->data.lock = 0; } if (c->data.flags & CLASS_INIT && c->ctrl) { diff --git a/src/ReDIVA/classes/data_view/draw_task.cpp b/src/ReDIVA/classes/data_view/draw_task.cpp index 4537f717..8503d5ae 100644 --- a/src/ReDIVA/classes/data_view/draw_task.cpp +++ b/src/ReDIVA/classes/data_view/draw_task.cpp @@ -62,7 +62,7 @@ struct data_view_draw_task { std::vector draw_tasks; data_view_draw_task(); - virtual ~data_view_draw_task(); + ~data_view_draw_task(); }; extern int32_t width; diff --git a/src/ReDIVA/classes/data_view/glitter.cpp b/src/ReDIVA/classes/data_view/glitter.cpp index 2b08d90b..08e2d10e 100644 --- a/src/ReDIVA/classes/data_view/glitter.cpp +++ b/src/ReDIVA/classes/data_view/glitter.cpp @@ -85,12 +85,12 @@ void data_view_glitter_imgui(class_data* data) { } int32_t eff_index = 0; - for (Glitter::SceneEffect& j : i->effects) { - if (!j.disp || !j.ptr) - continue; + if (i->type != Glitter::X) + for (Glitter::SceneEffect& j : i->effects) { + if (!j.disp || !j.ptr) + continue; - Glitter::F2EffectInst* eff_f2 = dynamic_cast(j.ptr); - if (eff_f2) { + Glitter::F2EffectInst* eff_f2 = (Glitter::F2EffectInst*)j.ptr; tree_node_flags = tree_node_base_flags; ImGui::PushStyleColor(ImGuiCol_Text, @@ -140,11 +140,14 @@ void data_view_glitter_imgui(class_data* data) { ImGui::PopStyleColor(); ImGui::PopID(); eff_index++; - continue; - } - Glitter::XEffectInst* eff_x = dynamic_cast(j.ptr); - if (eff_x) { + } + else + for (Glitter::SceneEffect& j : i->effects) { + if (!j.disp || !j.ptr) + continue; + + Glitter::XEffectInst* eff_x = (Glitter::XEffectInst*)j.ptr; tree_node_flags = tree_node_base_flags; ImGui::PushStyleColor(ImGuiCol_Text, @@ -194,11 +197,7 @@ void data_view_glitter_imgui(class_data* data) { ImGui::PopStyleColor(); ImGui::PopID(); eff_index++; - continue; } - - eff_index++; - } ImGui::TreePop(); ImGui::PopID(); sc_index++; diff --git a/src/ReDIVA/classes/glitter_editor.cpp b/src/ReDIVA/classes/glitter_editor.cpp index bc018996..b5d935f0 100644 --- a/src/ReDIVA/classes/glitter_editor.cpp +++ b/src/ReDIVA/classes/glitter_editor.cpp @@ -48,9 +48,8 @@ enum glitter_editor_flags { }; enum glitter_editor_draw_flags { - GLITTER_EDITOR_DRAW_WIREFRAME = 0x01, - GLITTER_EDITOR_DRAW_SELECTED = 0x02, - GLITTER_EDITOR_DRAW_NO_DRAW = 0x04, + GLITTER_EDITOR_DRAW_SELECTED = 0x01, + GLITTER_EDITOR_DRAW_NO_DRAW = 0x02, }; struct GlitterEditor; @@ -89,33 +88,6 @@ struct GlitterEditor { void ResetState(Glitter::CurveType type = (Glitter::CurveType)-1); }; - struct GL { - struct Wireframe { - shader_glsl shader; - - Wireframe(); - virtual ~Wireframe(); - - void Disp(GlitterEditor* glt_edt); - size_t Calc(GlitterEditor* glt_edt, Glitter::EffectInst* eff, Glitter::ParticleInst* ptcl); - size_t Calc(GlitterEditor* glt_edt, Glitter::F2EffectInst* eff, Glitter::F2ParticleInst* ptcl); - size_t Calc(GlitterEditor* glt_edt, Glitter::XEffectInst* eff, Glitter::XParticleInst* ptcl); - void Disp(GlitterEditor* glt_edt, Glitter::EffectInst* eff, Glitter::ParticleInst* ptcl); - void Disp(GlitterEditor* glt_edt, Glitter::F2EffectInst* eff, Glitter::F2ParticleInst* ptcl); - void Disp(GlitterEditor* glt_edt, Glitter::XEffectInst* eff, Glitter::XParticleInst* ptcl); - void DispMesh(GlitterEditor* glt_edt, Glitter::XRenderGroup* rg); - }; - - Wireframe wireframe; - - GL(); - virtual ~GL(); - - static void Load(GlitterEditor* glt_edt); - static void Disp(GlitterEditor* glt_edt); - static void Free(GlitterEditor* glt_edt); - }; - bool test; bool create_popup; bool load; @@ -160,12 +132,13 @@ struct GlitterEditor { Glitter::Effect* selected_effect; Glitter::Emitter* selected_emitter; Glitter::Particle* selected_particle; + Glitter::Effect* selected_edit_effect; + Glitter::Emitter* selected_edit_emitter; + Glitter::Particle* selected_edit_particle; CurveEditor curve_editor; - GlitterEditor::GL* gl_data; - GlitterEditor(); - virtual ~GlitterEditor(); + ~GlitterEditor(); void Reset(); @@ -351,7 +324,7 @@ bool glitter_editor_init(class_data* data, render_context* rctx) { for (ssize_t i = 0; i < c; i++) { char* file_x = str_utils_get_without_extension(string_data(&files_x.begin[i])); - char buf[0x100]; + char buf[0x200]; sprintf_s(buf, 0x100, "%hs\n", file_x); OutputDebugStringA(buf); @@ -375,7 +348,7 @@ bool glitter_editor_init(class_data* data, render_context* rctx) { break; if (j == count) { - char buf[0x100]; + char buf[0x200]; sprintf_s(buf, 0x100, "%08llX\n", e->data.name_hash); OutputDebugStringA(buf); } @@ -414,7 +387,7 @@ bool glitter_editor_init(class_data* data, render_context* rctx) { for (ssize_t i = 0; i < c; i++) { char* file_x = str_utils_get_without_extension(string_data(&files_x.begin[i])); - char buf[0x100]; + char buf[0x200]; sprintf_s(buf, 0x100, "%hs\n", file_x); OutputDebugStringA(buf); @@ -434,7 +407,7 @@ bool glitter_editor_init(class_data* data, render_context* rctx) { Glitter::Effect_ext_anim* ea = e->data.ext_anim; if (ea->instance_id) { - char buf[0x100]; + char buf[0x200]; sprintf_s(buf, 0x100, "%08llX %d\n", e->data.name_hash, ea->instance_id); OutputDebugStringA(buf); } @@ -574,7 +547,7 @@ void glitter_editor_ctrl(class_data* data) { QueryPerformanceCounter(&time); Glitter::EffectGroup* eg = new Glitter::EffectGroup(glt_edt->load_glt_type); - char buf[0x100]; + char buf[0x200]; snprintf(buf, sizeof(buf), "eff_%016llx_main", time.LowPart * hash_fnv1a64m_empty); uint64_t hash = glt_edt->load_glt_type == Glitter::FT ? hash_utf8_fnv1a64m(buf) : hash_utf8_murmurhash(buf); @@ -727,24 +700,12 @@ void glitter_editor_ctrl(class_data* data) { QueryPerformanceCounter(&time); Glitter::Effect* e = new Glitter::Effect(eg->type); - *e = *glt_edt->selected_effect; - if (eg->type != Glitter::X) { - if (glt_edt->selected_effect->data.ext_anim) { - e->data.ext_anim = force_malloc_s(Glitter::Effect::ExtAnim, 1); - *e->data.ext_anim = *glt_edt->selected_effect->data.ext_anim; - } - } - else { - if (glt_edt->selected_effect->data.ext_anim_x) { - e->data.ext_anim_x = force_malloc_s(Glitter::Effect::ExtAnimX, 1); - *e->data.ext_anim_x = *glt_edt->selected_effect->data.ext_anim_x; - } - } + *e = *glt_edt->selected_edit_effect; char name[0x80]; sprintf_s(name, sizeof(name), "eff_%08x", (uint32_t)((eff_count + 1)* time.LowPart* hash_murmurhash_empty)); - e->name = name; + e->name.assign(name); eg->effects.push_back(e); glt_edt->input_reload = true; } @@ -866,14 +827,14 @@ void glitter_editor_ctrl(class_data* data) { if (eg && has_particle) if (glt_edt->particle_flags & GLITTER_EDITOR_DUPLICATE) { Glitter::Particle* p = new Glitter::Particle(eg->type); - *p = *glt_edt->selected_particle; + *p = *glt_edt->selected_edit_particle; sel_emit->particles.push_back(p); glt_edt->input_reload = true; } else if (glt_edt->particle_flags & GLITTER_EDITOR_DELETE) { ssize_t j = (ssize_t)-1; for (Glitter::Particle*& i : sel_emit->particles) - if (i && i == glt_edt->selected_particle) { + if (i && i == glt_edt->selected_edit_particle) { j = &i - sel_emit->particles.data(); break; } @@ -881,13 +842,13 @@ void glitter_editor_ctrl(class_data* data) { if (j > -1) sel_emit->particles.erase(sel_emit->particles.begin() + j); glt_edt->selected_type = GLITTER_EDITOR_SELECTED_EMITTER; - glt_edt->selected_particle = 0; + glt_edt->selected_edit_particle = 0; glt_edt->input_reload = true; } else if (glt_edt->particle_flags & GLITTER_EDITOR_MOVE_UP) { ssize_t j = -1; for (Glitter::Particle*& i : sel_emit->particles) - if (i == glt_edt->selected_particle) { + if (i == glt_edt->selected_edit_particle) { j = &i - sel_emit->particles.data(); break; } @@ -902,7 +863,7 @@ void glitter_editor_ctrl(class_data* data) { else if (glt_edt->particle_flags & GLITTER_EDITOR_MOVE_DOWN) { ssize_t j = -1; for (Glitter::Particle*& i : sel_emit->particles) - if (i == glt_edt->selected_particle) { + if (i == glt_edt->selected_edit_particle) { j = &i - sel_emit->particles.data(); break; } @@ -967,7 +928,7 @@ void glitter_editor_ctrl(class_data* data) { continue; } - e->name = ds->glitter_list_names[hash - hashes.begin()]; + e->name.assign(ds->glitter_list_names[hash - hashes.begin()]); } switch (ds->type) { @@ -1006,7 +967,7 @@ void glitter_editor_ctrl(class_data* data) { continue; } - e->name = ds->glitter_list_names[hash - hashes.begin()]; + e->name.assign(ds->glitter_list_names[hash - hashes.begin()]); } } break; } @@ -1128,8 +1089,6 @@ void glitter_editor_disp(class_data* data) { GlitterEditor* glt_edt = (GlitterEditor*)data->data; if (!glt_edt) return; - - GlitterEditor::GL::Disp(glt_edt); } void glitter_editor_drop(class_data* data, size_t count, char** paths) { @@ -1286,433 +1245,19 @@ void GlitterEditor::CurveEditor::ResetState(Glitter::CurveType type) { del_key = false; } -GlitterEditor::GL::Wireframe::Wireframe() { - -} - -GlitterEditor::GL::Wireframe::~Wireframe() { - -} - -void GlitterEditor::GL::Wireframe::Disp(GlitterEditor* glt_edt) { - Glitter::Scene* sc = Glitter::glt_particle_manager->selected_scene; - Glitter::EffectInst* eff = Glitter::glt_particle_manager->selected_effect; - Glitter::EmitterInst* emit = Glitter::glt_particle_manager->selected_emitter; - Glitter::ParticleInst* ptcl = Glitter::glt_particle_manager->selected_particle; - if (!Glitter::glt_particle_manager->draw_selected || !eff) { - if (!sc) - return; - - size_t count = 0; - for (Glitter::SceneEffect& i : sc->effects) - if (i.disp && i.ptr) - count += Calc(glt_edt, i.ptr, 0); - - if (!count) - return; - - for (Glitter::SceneEffect& i : sc->effects) - if (i.disp && i.ptr) - Disp(glt_edt, i.ptr, 0); - } - else if ((eff && ptcl) || (eff && !emit)) { - size_t count = Calc(glt_edt, eff, ptcl); - if (!count) - return; - - Disp(glt_edt, eff, ptcl); - } - else if (emit) { - Glitter::F2EmitterInst* emit_f2 = dynamic_cast(emit); - Glitter::XEmitterInst* emit_x = dynamic_cast(emit); - if (emit_f2) { - size_t count = 0; - for (Glitter::F2ParticleInst*& i : emit_f2->particles) { - if (!i) - continue; - - Glitter::F2ParticleInst* particle = i; - count += Calc(glt_edt, eff, particle); - for (Glitter::F2ParticleInst*& j : particle->data.children) - if (j) - count += Calc(glt_edt, eff, j); - } - - if (!count) - return; - - for (Glitter::F2ParticleInst*& i : emit_f2->particles) { - if (!i) - continue; - - Glitter::F2ParticleInst* particle = i; - Disp(glt_edt, eff, particle); - for (Glitter::F2ParticleInst*& j : particle->data.children) - if (j) - Disp(glt_edt, eff, j); - } - } - else if (emit_x) { - size_t count = 0; - for (Glitter::XParticleInst*& i : emit_x->particles) { - if (!i) - continue; - - Glitter::XParticleInst* particle = i; - count += Calc(glt_edt, eff, particle); - for (Glitter::XParticleInst*& j : particle->data.children) - if (j) - count += Calc(glt_edt, eff, j); - } - - if (!count) - return; - - for (Glitter::XParticleInst*& i : emit_x->particles) { - if (!i) - continue; - - Glitter::XParticleInst* particle = i; - Disp(glt_edt, eff, particle); - for (Glitter::XParticleInst*& j : particle->data.children) - if (j) - Disp(glt_edt, eff, j); - } - } - } -} - -size_t GlitterEditor::GL::Wireframe::Calc(GlitterEditor* glt_edt, - Glitter::EffectInst* eff, Glitter::ParticleInst* ptcl) { - Glitter::F2EffectInst* e = dynamic_cast(eff); - Glitter::F2ParticleInst* p = dynamic_cast(ptcl); - if (e) - return Calc(glt_edt, e, p); - - Glitter::XEffectInst* ex = dynamic_cast(eff); - Glitter::XParticleInst* px = dynamic_cast(ptcl); - if (ex) - return Calc(glt_edt, ex, px); - return 0; -} - -size_t GlitterEditor::GL::Wireframe::Calc(GlitterEditor* glt_edt, - Glitter::F2EffectInst* eff, Glitter::F2ParticleInst* ptcl) { - size_t count = 0; - for (Glitter::F2RenderGroup*& i : eff->render_scene.groups) { - if (!i) - continue; - - Glitter::F2RenderGroup* rg = i; - if (ptcl && rg->particle != ptcl) - continue; - else if (rg->disp > 0) - count++; - } - return count; -} - -size_t GlitterEditor::GL::Wireframe::Calc(GlitterEditor* glt_edt, - Glitter::XEffectInst* eff, Glitter::XParticleInst* ptcl) { - size_t count = 0; - for (Glitter::XRenderGroup*& i : eff->render_scene.groups) { - if (!i) - continue; - - Glitter::XRenderGroup* rg = i; - if (ptcl && rg->particle != ptcl) - continue; - else if (rg->disp > 0) - count++; - } - return count; -} - -void GlitterEditor::GL::Wireframe::Disp(GlitterEditor* glt_edt, - Glitter::EffectInst* eff, Glitter::ParticleInst* ptcl) { - Glitter::F2EffectInst* e = dynamic_cast(eff); - Glitter::F2ParticleInst* p = dynamic_cast(ptcl); - if (e && p) { - Disp(glt_edt, e, p); - return; - } - - Glitter::XEffectInst* ex = dynamic_cast(eff); - Glitter::XParticleInst* px = dynamic_cast(ptcl); - if (ex) - Disp(glt_edt, ex, px); -} - -void GlitterEditor::GL::Wireframe::Disp(GlitterEditor* glt_edt, - Glitter::F2EffectInst* eff, Glitter::F2ParticleInst* ptcl) { - gl_state_disable_blend(); - gl_state_disable_depth_test(); - gl_state_set_depth_mask(GL_FALSE); - gl_state_disable_cull_face(); - gl_state_set_polygon_mode(GL_FRONT_AND_BACK, GL_LINE); - - shader.use(); - shader.set("color", 1.0f, 1.0f, 0.0f, 1.0f); - for (Glitter::F2RenderGroup*& i : eff->render_scene.groups) { - if (!i) - continue; - - Glitter::F2RenderGroup* rg = i; - if (ptcl && rg->particle != ptcl) - continue; - else if (rg->disp < 1) - continue; - - shader.set("model", false, rg->mat_draw); - - switch (rg->type) { - case Glitter::PARTICLE_QUAD: { - static const GLsizei buffer_size = sizeof(Glitter::Buffer); - - gl_state_bind_vertex_array(rg->vao); - glDrawElements(GL_TRIANGLES, (GLsizei)(6 * rg->disp), GL_UNSIGNED_INT, 0); - } break; - case Glitter::PARTICLE_LINE: - case Glitter::PARTICLE_LOCUS: { - static const GLsizei buffer_size = sizeof(Glitter::Buffer); - - gl_state_bind_vertex_array(rg->vao); - const GLenum mode = rg->type == Glitter::PARTICLE_LINE ? GL_LINE_STRIP : GL_TRIANGLE_STRIP; - for (std::pair& i : rg->draw_list) - glDrawArrays(mode, i.first, i.second); - } break; - } - } - gl_state_bind_vertex_array(0); - gl_state_set_polygon_mode(GL_FRONT_AND_BACK, GL_FILL); - gl_state_use_program(0); -} - -void GlitterEditor::GL::Wireframe::Disp(GlitterEditor* glt_edt, - Glitter::XEffectInst* eff, Glitter::XParticleInst* ptcl) { - gl_state_disable_blend(); - gl_state_disable_depth_test(); - gl_state_set_depth_mask(GL_FALSE); - gl_state_disable_cull_face(); - gl_state_set_polygon_mode(GL_FRONT_AND_BACK, GL_LINE); - - shader.use(); - shader.set("color", 1.0f, 1.0f, 0.0f, 1.0f); - for (Glitter::XRenderGroup*& i : eff->render_scene.groups) { - if (!i) - continue; - - Glitter::XRenderGroup* rg = i; - if (ptcl && rg->particle != ptcl) - continue; - else if (rg->disp < 1) - continue; - - shader.set("model", false, rg->mat_draw); - - switch (rg->type) { - case Glitter::PARTICLE_QUAD: { - static const GLsizei buffer_size = sizeof(Glitter::Buffer); - - gl_state_bind_vertex_array(rg->vao); - glDrawElements(GL_TRIANGLES, (GLsizei)(6 * rg->disp), GL_UNSIGNED_INT, 0); - } break; - case Glitter::PARTICLE_LINE: - case Glitter::PARTICLE_LOCUS: { - static const GLsizei buffer_size = sizeof(Glitter::Buffer); - - gl_state_bind_vertex_array(rg->vao); - const GLenum mode = rg->type == Glitter::PARTICLE_LINE ? GL_LINE_STRIP : GL_TRIANGLE_STRIP; - for (std::pair& i : rg->draw_list) - glDrawArrays(mode, i.first, i.second); - } break; - case Glitter::PARTICLE_MESH: - GlitterEditor::GL::Wireframe::DispMesh(glt_edt, rg); - break; - } - } - gl_state_bind_vertex_array(0); - gl_state_set_polygon_mode(GL_FRONT_AND_BACK, GL_FILL); - gl_state_use_program(0); -} - -void GlitterEditor::GL::Wireframe::DispMesh(GlitterEditor* glt_edt, - Glitter::XRenderGroup* rg) { - Glitter::RenderElement* elem = rg->elements; - for (size_t i = rg->ctrl, j_max = 1024; i > 0; i -= j_max) { - j_max = min_def(i, j_max); - for (size_t j = j_max; j > 0; elem++) { - if (!elem->alive) - continue; - j--; - - if (!elem->disp) - continue; - - object_data* object_data = &rctx_ptr->object_data; - - Glitter::Particle* particle = rg->particle->data.particle; - object_info object_info; - object_info.set_id = (uint32_t)particle->data.mesh.object_set_name_hash; - object_info.id = (uint32_t)particle->data.mesh.object_name_hash; - obj* obj = object_storage_get_obj(object_info); - obj_mesh_vertex_buffer* obj_vertex_buffer - = object_storage_get_obj_mesh_vertex_buffer(object_info); - obj_mesh_index_buffer* obj_index_buffer - = object_storage_get_obj_mesh_index_buffer(object_info); - - mat4& mat = elem->mat_draw; - if (!obj || !obj_vertex_buffer || !obj_index_buffer || (object_data->object_culling - && !object_bounding_sphere_check_visibility(&obj->bounding_sphere, - object_data, rctx_ptr->camera, &mat))) - continue; - - shader.set("model", false, mat); - - int32_t ttc = 0; - texture_transform_struct* tt = object_data->texture_transform_array; - for (uint32_t i = 0; i < obj->num_mesh; i++) { - obj_mesh* mesh = &obj->mesh_array[i]; - - if (object_data->object_culling && !object_bounding_sphere_check_visibility( - &mesh->bounding_sphere, object_data, rctx_ptr->camera, &mat)) - continue; - - for (uint32_t j = 0; j < mesh->num_submesh; j++) { - obj_sub_mesh* sub_mesh = &mesh->submesh_array[j]; - - if (sub_mesh->attrib.m.cloth) - continue; - - if (object_data->object_culling) { - int32_t v32 = object_bounding_sphere_check_visibility( - &sub_mesh->bounding_sphere, object_data, rctx_ptr->camera, &mat); - if (v32 != 2 || (!mesh->attrib.m.billboard && !mesh->attrib.m.billboard_y_axis)) { - if (v32 == 2) { - if (object_data->object_bounding_sphere_check_func) - v32 = 1; - else - v32 = obj_axis_aligned_bounding_box_check_visibility( - &sub_mesh->axis_aligned_bounding_box, rctx_ptr->camera, &mat); - } - - if (!v32) - continue; - } - } - - GLenum mesh_draw_mode[] = { - GL_ZERO, //GL_POINTS, - GL_LINES, - GL_LINE_STRIP, - GL_LINE_LOOP, - GL_TRIANGLES, - GL_TRIANGLE_STRIP, - GL_TRIANGLE_FAN, - GL_ZERO, //GL_QUADS, - GL_ZERO, //GL_QUAD_STRIP, - GL_ZERO, //GL_POLYGON, - }; - - GLenum mesh_indices_type[] = { - GL_ZERO, - GL_UNSIGNED_SHORT, - GL_UNSIGNED_INT, - }; - - GLuint array_buffer = obj_vertex_buffer[i].get_buffer(); - gl_state_bind_array_buffer(array_buffer); - glEnableVertexAttribArray(0); - glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, mesh->size_vertex, (void*)0); - gl_state_bind_array_buffer(0); - - GLuint element_array_buffer = obj_index_buffer[i].buffer; - gl_state_bind_element_array_buffer(element_array_buffer); - if (sub_mesh->primitive_type == OBJ_PRIMITIVE_TRIANGLE_STRIP - && sub_mesh->index_format == OBJ_INDEX_U16) - glDrawRangeElements(GL_TRIANGLE_STRIP, sub_mesh->first_index, sub_mesh->last_index, - sub_mesh->indices_count, GL_UNSIGNED_SHORT, (void*)(size_t)sub_mesh->indices_offset); - else - glDrawElements(mesh_draw_mode[sub_mesh->primitive_type], sub_mesh->indices_count, - mesh_indices_type[sub_mesh->index_format], (void*)(size_t)sub_mesh->indices_offset); - gl_state_bind_element_array_buffer(0); - - glDisableVertexAttribArray(0); - } - } - } - } -} - -GlitterEditor::GL::GL() { - -} - -GlitterEditor::GL::~GL() { - -} - -void GlitterEditor::GL::Load(GlitterEditor* glt_edt) { - static const char* glitter_editor_wireframe_vert = - "#version 430 core\n" - "layout (location = 0) in vec3 a_position;\n" - "\n" - "uniform mat4 model;\n" - "\n" - "//COMMONDATA\n" - "\n" - "void main() {\n" - " vec4 pos = model * vec4(a_position, 1.0);\n" - " gl_Position = COMMON_DATA_VP * pos;\n" - "}\n"; - - static const char* glitter_editor_wireframe_frag = - "#version 430 core\n" - "layout(location = 0) out vec4 result;\n" - "\n" - "uniform vec4 color;\n" - "\n" - "//COMMONDATA\n" - "\n" - "void main(void) {\n" - " result = color;\n" - "}\n"; - - glt_edt->gl_data = new GlitterEditor::GL; - - shader_glsl_param param = {}; - param.name = "Glitter Editor Wireframe"; - glt_edt->gl_data->wireframe.shader.load(glitter_editor_wireframe_vert, - glitter_editor_wireframe_frag, 0, ¶m); -} - -void GlitterEditor::GL::Disp(GlitterEditor* glt_edt) { - if (!glt_edt->effect_group) - return; - - if (glt_edt->draw_flags & GLITTER_EDITOR_DRAW_WIREFRAME) - glt_edt->gl_data->wireframe.Disp(glt_edt); -} - -void GlitterEditor::GL::Free(GlitterEditor* glt_edt) { - if (glt_edt->gl_data) { - delete glt_edt->gl_data; - glt_edt->gl_data = 0; - } -} - GlitterEditor::GlitterEditor() : test(), create_popup(), load(), load_wait(), load_data(), load_data_wait(), load_popup(), load_data_popup(), load_error_list_popup(), save(), save_popup(), save_compress(), close(), input_play(), input_reload(), input_pause(), input_pause_temp(), input_reset(), effect_group_add(), draw_flags(), resource_flags(), effect_flags(), emitter_flags(), particle_flags(), load_glt_type(), save_glt_type(), load_data_type(), frame_counter(), old_frame_counter(), start_frame(), end_frame(), counter(), effect_group(), scene(), hash(), selected_type(), -selected_resource(), selected_effect(), selected_emitter(), selected_particle(), gl_data() { - GlitterEditor::GL::Load(this); +selected_resource(), selected_effect(), selected_emitter(), selected_particle(), +selected_edit_effect(), selected_edit_emitter(), selected_edit_particle() { + } GlitterEditor::~GlitterEditor() { - GlitterEditor::GL::Free(this); + } void GlitterEditor::Reset() { @@ -1751,6 +1296,7 @@ static void glitter_editor_select_particle(GlitterEditor* glt_edt) { break; } } + if (!sc) return; @@ -1760,17 +1306,16 @@ static void glitter_editor_select_particle(GlitterEditor* glt_edt) { Glitter::XEffectInst* eff_x = 0; Glitter::XEmitterInst* emit_x = 0; Glitter::XParticleInst* ptcl_x = 0; - for (Glitter::SceneEffect& i : sc->effects) { - if (!i.disp || !i.ptr) - continue; + if (sc->type != Glitter::X) + for (Glitter::SceneEffect& i : sc->effects) { + if (!i.disp || !i.ptr) + continue; - Glitter::EffectInst* effect = i.ptr; - if (effect->effect != glt_edt->selected_effect) - continue; + Glitter::EffectInst* effect = i.ptr; + if (effect->effect != glt_edt->selected_effect) + continue; - eff_f2 = dynamic_cast(effect); - eff_x = dynamic_cast(effect); - if (eff_f2) + eff_f2 = (Glitter::F2EffectInst*)effect; for (Glitter::F2EmitterInst*& j : eff_f2->emitters) { if (!j) continue; @@ -1792,7 +1337,17 @@ static void glitter_editor_select_particle(GlitterEditor* glt_edt) { } break; } - else if (eff_x) + } + else + for (Glitter::SceneEffect& i : sc->effects) { + if (!i.disp || !i.ptr) + continue; + + Glitter::EffectInst* effect = i.ptr; + if (effect->effect != glt_edt->selected_effect) + continue; + + eff_x = (Glitter::XEffectInst*)effect; for (Glitter::XEmitterInst*& j : eff_x->emitters) { if (!j) continue; @@ -1814,8 +1369,7 @@ static void glitter_editor_select_particle(GlitterEditor* glt_edt) { } break; } - break; - } + } Glitter::glt_particle_manager->selected_scene = sc; if (eff_f2) { @@ -1892,8 +1446,6 @@ static void glitter_editor_windows(GlitterEditor* glt_edt, class_data* data) { } if (ImGui::BeginMenu("View", true)) { - ImGui::CheckboxFlagsEnterKeyPressed("Draw Wireframe", - (uint32_t*)&glt_edt->draw_flags, GLITTER_EDITOR_DRAW_WIREFRAME); ImGui::CheckboxFlagsEnterKeyPressed("Draw Selected", (uint32_t*)&glt_edt->draw_flags, GLITTER_EDITOR_DRAW_SELECTED); ImGui::CheckboxFlagsEnterKeyPressed("No Draw", @@ -2124,11 +1676,9 @@ static void glitter_editor_open_window(GlitterEditor* glt_edt) { if (FAILED(CoInitializeEx(0, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE))) return; - wchar_t file[MAX_PATH]; - memset(&file, 0, sizeof(file)); + wchar_t file[MAX_PATH] = {}; - OPENFILENAMEW ofn; - memset(&ofn, 0, sizeof(OPENFILENAMEW)); + OPENFILENAMEW ofn = {}; ofn.lStructSize = sizeof(OPENFILENAMEW); ofn.lpstrFilter = L"Glitter Farc Files (*.farc)\0*.farc\0\0"; ofn.lpstrFile = file; @@ -2165,11 +1715,9 @@ static void glitter_editor_save_as_window(GlitterEditor* glt_edt) { return; } - wchar_t file[MAX_PATH]; - memset(&file, 0, sizeof(file)); + wchar_t file[MAX_PATH] = {}; - OPENFILENAMEW ofn; - memset(&ofn, 0, sizeof(OPENFILENAMEW)); + OPENFILENAMEW ofn = {}; ofn.lStructSize = sizeof(OPENFILENAMEW); ofn.lpstrFilter = L"Glitter Farc Files (*.farc)\0*.farc\0\0"; ofn.lpstrFile = file; @@ -2284,11 +1832,9 @@ static bool glitter_editor_list_open_window(Glitter::EffectGroup* eg) { bool ret = false; - wchar_t file[MAX_PATH]; - memset(&file, 0, sizeof(file)); + wchar_t file[MAX_PATH] = {}; - OPENFILENAMEW ofn; - memset(&ofn, 0, sizeof(OPENFILENAMEW)); + OPENFILENAMEW ofn = {}; ofn.lStructSize = sizeof(OPENFILENAMEW); ofn.lpstrFilter = L"Glitter UTF-8 List Files (*.glitter.txt)\0*.glitter.txt\0\0"; ofn.lpstrFile = file; @@ -2346,7 +1892,7 @@ static bool glitter_editor_list_open_window(Glitter::EffectGroup* eg) { continue; } - e->name = lines[j]; + e->name.assign(lines[j]); } free_def(buf); @@ -2365,11 +1911,9 @@ static bool glitter_editor_resource_import(GlitterEditor* glt_edt) { bool ret = false; - wchar_t file[MAX_PATH]; - memset(&file, 0, sizeof(file)); + wchar_t file[MAX_PATH] = {}; - OPENFILENAMEW ofn; - memset(&ofn, 0, sizeof(OPENFILENAMEW)); + OPENFILENAMEW ofn = {}; ofn.lStructSize = sizeof(OPENFILENAMEW); ofn.lpstrFilter = L"DirectDraw Sufrace Files (*.dds)\0*.dds\0\0"; ofn.lpstrFile = file; @@ -2446,11 +1990,9 @@ static bool glitter_editor_resource_export(GlitterEditor* glt_edt) { bool ret = false; - wchar_t file[MAX_PATH]; - memset(&file, 0, sizeof(file)); + wchar_t file[MAX_PATH] = {}; - OPENFILENAMEW ofn; - memset(&ofn, 0, sizeof(OPENFILENAMEW)); + OPENFILENAMEW ofn = {}; ofn.lStructSize = sizeof(OPENFILENAMEW); ofn.lpstrFilter = L"DirectDraw Sufrace Files (*.dds)\0*.dds\0\0"; ofn.lpstrFile = file; @@ -2503,7 +2045,7 @@ static void glitter_editor_test_window(GlitterEditor* glt_edt, class_data* data) float_t y; float_t w = 280.0f; - float_t h = 352.0f; + float_t h = 330.0f; ImGui::SetNextWindowPos({ 0, 0 }, ImGuiCond_FirstUseEver); ImGui::SetNextWindowSize({ w, h }, ImGuiCond_Always); @@ -2570,8 +2112,6 @@ static void glitter_editor_test_window(GlitterEditor* glt_edt, class_data* data) ImGui::Separator(); - ImGui::CheckboxFlagsEnterKeyPressed("Draw Wireframe", - (uint32_t*)&glt_edt->draw_flags, GLITTER_EDITOR_DRAW_WIREFRAME); ImGui::CheckboxFlagsEnterKeyPressed("Draw Selected", (uint32_t*)&glt_edt->draw_flags, GLITTER_EDITOR_DRAW_SELECTED); ImGui::CheckboxFlagsEnterKeyPressed("No Draw", @@ -2643,7 +2183,7 @@ static void glitter_editor_test_window(GlitterEditor* glt_edt, class_data* data) } static void glitter_editor_effects(GlitterEditor* glt_edt) { - char buf[0x100]; + char buf[0x200]; ImGuiTreeNodeFlags tree_node_base_flags = 0; tree_node_base_flags |= ImGuiTreeNodeFlags_OpenOnDoubleClick; @@ -2871,25 +2411,25 @@ static void glitter_editor_effects_context_menu(GlitterEditor* glt_edt, ImGui::Separator(); if (ImGui::MenuItem("Duplicate Effect")) { enum_or(glt_edt->effect_flags, GLITTER_EDITOR_DUPLICATE); - glt_edt->selected_effect = effect; + glt_edt->selected_edit_effect = effect; close = true; } if (ImGui::MenuItem("Delete Effect")) { enum_or(glt_edt->effect_flags, GLITTER_EDITOR_DELETE); - glt_edt->selected_effect = effect; + glt_edt->selected_edit_effect = effect; close = true; } if (ImGui::MenuItem("Move Effect Up", 0, false, i_idx > 1)) { enum_or(glt_edt->effect_flags, GLITTER_EDITOR_MOVE_UP); - glt_edt->selected_effect = effect; + glt_edt->selected_edit_effect = effect; close = true; } if (ImGui::MenuItem("Move Effect Down", 0, false, i_idx < (ssize_t)eg->effects.size())) { enum_or(glt_edt->effect_flags, GLITTER_EDITOR_MOVE_DOWN); - glt_edt->selected_effect = effect; + glt_edt->selected_edit_effect = effect; close = true; } @@ -2897,7 +2437,7 @@ static void glitter_editor_effects_context_menu(GlitterEditor* glt_edt, if (ImGui::MenuItem("Add Emitter")) { enum_or(glt_edt->emitter_flags, GLITTER_EDITOR_ADD); - glt_edt->selected_effect = effect; + glt_edt->selected_edit_effect = effect; close = true; } } break; @@ -2923,26 +2463,26 @@ static void glitter_editor_effects_context_menu(GlitterEditor* glt_edt, ImGui::Separator(); if (ImGui::MenuItem("Duplicate Emitter")) { enum_or(glt_edt->emitter_flags, GLITTER_EDITOR_DUPLICATE); - glt_edt->selected_emitter = emitter; + glt_edt->selected_edit_emitter = emitter; close = true; } if (ImGui::MenuItem("Delete Emitter")) { enum_or(glt_edt->emitter_flags, GLITTER_EDITOR_DELETE); - glt_edt->selected_emitter = emitter; + glt_edt->selected_edit_emitter = emitter; close = true; } if (ImGui::MenuItem("Move Emitter Up", 0, false, j_idx > 1)) { enum_or(glt_edt->emitter_flags, GLITTER_EDITOR_MOVE_UP); - glt_edt->selected_emitter = emitter; + glt_edt->selected_edit_emitter = emitter; close = true; } if (ImGui::MenuItem("Move Emitter Down", 0, false, j_idx < (ssize_t)sel_efct->emitters.size())) { enum_or(glt_edt->emitter_flags, GLITTER_EDITOR_MOVE_DOWN); - glt_edt->selected_emitter = emitter; + glt_edt->selected_edit_emitter = emitter; close = true; } @@ -2950,7 +2490,7 @@ static void glitter_editor_effects_context_menu(GlitterEditor* glt_edt, if (ImGui::MenuItem("Add Particle")) { enum_or(glt_edt->particle_flags, GLITTER_EDITOR_ADD); - glt_edt->selected_emitter = emitter; + glt_edt->selected_edit_emitter = emitter; close = true; } } break; @@ -2981,26 +2521,26 @@ static void glitter_editor_effects_context_menu(GlitterEditor* glt_edt, ImGui::Separator(); if (ImGui::MenuItem("Duplicate Particle")) { enum_or(glt_edt->particle_flags, GLITTER_EDITOR_DUPLICATE); - glt_edt->selected_particle = particle; + glt_edt->selected_edit_particle = particle; close = true; } if (ImGui::MenuItem("Delete Particle")) { enum_or(glt_edt->particle_flags, GLITTER_EDITOR_DELETE); - glt_edt->selected_particle = particle; + glt_edt->selected_edit_particle = particle; close = true; } if (ImGui::MenuItem("Move Particle Up", 0, false, k_idx > 1)) { enum_or(glt_edt->particle_flags, GLITTER_EDITOR_MOVE_UP); - glt_edt->selected_particle = particle; + glt_edt->selected_edit_particle = particle; close = true; } if (ImGui::MenuItem("Move Particle Down", 0, false, k_idx < (ssize_t)sel_emit->particles.size())) { enum_or(glt_edt->particle_flags, GLITTER_EDITOR_MOVE_DOWN); - glt_edt->selected_particle = particle; + glt_edt->selected_edit_particle = particle; close = true; } } break; @@ -3048,7 +2588,7 @@ End: static void glitter_editor_resources(GlitterEditor* glt_edt) { int32_t sel_rsrc = glt_edt->selected_resource; - char buf[0x100]; + char buf[0x200]; ImGuiTreeNodeFlags tree_node_base_flags = 0; tree_node_base_flags |= ImGuiTreeNodeFlags_OpenOnDoubleClick; diff --git a/src/ReDIVA/classes/graphics/fog.cpp b/src/ReDIVA/classes/graphics/fog.cpp index 8549081f..2d97405f 100644 --- a/src/ReDIVA/classes/graphics/fog.cpp +++ b/src/ReDIVA/classes/graphics/fog.cpp @@ -11,7 +11,7 @@ struct data_view_fog { int32_t group; data_view_fog(); - virtual ~data_view_fog(); + ~data_view_fog(); }; extern int32_t width; diff --git a/src/ReDIVA/classes/graphics/light.cpp b/src/ReDIVA/classes/graphics/light.cpp index 814e6f95..4f83a17b 100644 --- a/src/ReDIVA/classes/graphics/light.cpp +++ b/src/ReDIVA/classes/graphics/light.cpp @@ -16,7 +16,7 @@ struct data_view_light { int32_t stage_index_prev; data_view_light(); - virtual ~data_view_light(); + ~data_view_light(); static void column_slider_float_button(const char* label, float_t* val); }; @@ -208,7 +208,7 @@ void graphics_light_imgui(class_data* data) { ImGui::ColumnSliderFloatButton("R", &specular.x, 0.01f, 0.0f, 2.0f, 0.1f, "%4.3f", 0); ImGui::ColumnSliderFloatButton("G", &specular.y, 0.01f, 0.0f, 2.0f, 0.1f, "%4.3f", 0); ImGui::ColumnSliderFloatButton("B", &specular.z, 0.01f, 0.0f, 2.0f, 0.1f, "%4.3f", 0); - ImGui::ColumnSliderFloatButton("A", &specular.z, 0.02f, 0.0f, 4.0f, 0.2f, "%4.3f", 0); + ImGui::ColumnSliderFloatButton("A", &specular.w, 0.02f, 0.0f, 4.0f, 0.2f, "%4.3f", 0); light_data->set_specular(specular); ImGui::PopID(); diff --git a/src/ReDIVA/data_initialize.hpp b/src/ReDIVA/data_initialize.hpp index 25c0ae72..63440102 100644 --- a/src/ReDIVA/data_initialize.hpp +++ b/src/ReDIVA/data_initialize.hpp @@ -21,7 +21,7 @@ public: virtual bool Init() override; virtual bool Ctrl() override; virtual bool Dest() override; - virtual void Disp(); + virtual void Disp() override; }; extern bool task_data_init_append_task(); diff --git a/src/ReDIVA/data_test/auth_3d_test.cpp b/src/ReDIVA/data_test/auth_3d_test.cpp index c9794d26..71a60cc1 100644 --- a/src/ReDIVA/data_test/auth_3d_test.cpp +++ b/src/ReDIVA/data_test/auth_3d_test.cpp @@ -12,6 +12,7 @@ #include "../../CRE/data.hpp" #include "../../CRE/render_context.hpp" #include "../../CRE/stage.hpp" +#include "../../CRE/task_effect.hpp" #include "../imgui_helper.hpp" #include "../input.hpp" @@ -91,6 +92,9 @@ Auth3dTestWindow::Auth3dTestWindow() { frame_changed = false; last_frame = 0.0f; paused = false; + + stg_auth_display = true; + stg_display = true; } Auth3dTestWindow::~Auth3dTestWindow() { @@ -110,6 +114,9 @@ bool Auth3dTestWindow::Init() { frame_changed = false; last_frame = 0.0f; paused = false; + + stg_auth_display = true; + stg_display = true; return true; } @@ -125,6 +132,8 @@ bool Auth3dTestWindow::Ctrl() { auth_3d_uid_load = false; } } + task_stage_current_set_stage_display(stg_display, false); + task_effect_parent_set_enable(stg_auth_display); return false; } @@ -323,18 +332,8 @@ void Auth3dTestWindow::Window() { window_flags |= ImGuiWindowFlags_NoCollapse; if (ImGui::Begin("A3D STAGE", 0, window_flags)) { - ::stage* stg = task_stage_get_current_stage(); - - if (stg) { - ImGui::Checkbox("stage", &stg->stage_display); - ImGui::Checkbox("stg auth display", &stg->effect_display); - } - else { - bool stage = true; - ImGui::Checkbox("stage", &stage); - bool effects = true; - ImGui::Checkbox("stg auth display", &effects); - } + ImGui::Checkbox("stage", &stg_display); + ImGui::Checkbox("stg auth display", &stg_auth_display); int32_t stage_index = auth_3d_test_task->stage_index; @@ -364,7 +363,7 @@ void Auth3dTestWindow::Window() { window_focus |= ImGui::IsWindowFocused(); } - ImGui::Checkbox("Stage Link Change", &auth_3d_test_task->window.stage_link_change); + ImGui::Checkbox("Link Stage Change", &auth_3d_test_task->window.stage_link_change); if (auth_3d_data_check_id_not_empty(&auth_3d_test_task->auth_3d_id)) { auth_3d_data_set_enable(&auth_3d_test_task->auth_3d_id, enable); diff --git a/src/ReDIVA/data_test/auth_3d_test.hpp b/src/ReDIVA/data_test/auth_3d_test.hpp index 74524670..ba7fe22d 100644 --- a/src/ReDIVA/data_test/auth_3d_test.hpp +++ b/src/ReDIVA/data_test/auth_3d_test.hpp @@ -38,6 +38,8 @@ public: bool frame_changed; float_t last_frame; bool paused; + bool stg_auth_display; + bool stg_display; std::vector stage; std::vector category; diff --git a/src/ReDIVA/data_test/glitter_test.hpp b/src/ReDIVA/data_test/glitter_test.hpp index cfb5ed73..17a4e3c6 100644 --- a/src/ReDIVA/data_test/glitter_test.hpp +++ b/src/ReDIVA/data_test/glitter_test.hpp @@ -37,11 +37,12 @@ public: bool stage_test; TaskDataTestGlitterParticle(); - virtual ~TaskDataTestGlitterParticle(); - virtual bool Init(); - virtual bool Ctrl(); - virtual bool Dest(); - virtual void Window(); + virtual ~TaskDataTestGlitterParticle() override; + + virtual bool Init() override; + virtual bool Ctrl() override; + virtual bool Dest() override; + virtual void Window() override; void LoadFile(const char* file); }; diff --git a/src/ReDIVA/game_state.cpp b/src/ReDIVA/game_state.cpp index 95f9ee8d..1fd9742e 100644 --- a/src/ReDIVA/game_state.cpp +++ b/src/ReDIVA/game_state.cpp @@ -142,8 +142,6 @@ GameStateData game_state_data_array[] = { GAME_STATE_ADVERTISE, SUB_GAME_STATE_MAX, }, - { - }, }; SubGameStateData sub_game_state_data_array[] = { diff --git a/src/ReDIVA/input.cpp b/src/ReDIVA/input.cpp index 5b020258..4b3d55af 100644 --- a/src/ReDIVA/input.cpp +++ b/src/ReDIVA/input.cpp @@ -204,11 +204,11 @@ namespace Input { double_t freq_hist = render_timer->get_freq_hist(); double_t frame_speed = freq / freq_hist; - input_locked = false; classes_process_input(classes, classes_count); if (input_locked) { input_reset_mouse_position = true; + input_locked = false; return; } @@ -334,6 +334,7 @@ namespace Input { } else input_reset_mouse_position = true; + input_locked = false; } void SetInputs(GLFWwindow* window) { diff --git a/src/ReDIVA/main.cpp b/src/ReDIVA/main.cpp index 61772219..b4801c25 100644 --- a/src/ReDIVA/main.cpp +++ b/src/ReDIVA/main.cpp @@ -8,9 +8,12 @@ #include "../KKdLib/io/memory_stream.hpp" #include "../KKdLib/f2/struct.hpp" #include "../KKdLib/a3da.hpp" +#include "../KKdLib/aes.hpp" +#include "../KKdLib/deflate.hpp" #include "../KKdLib/dsc.hpp" #include "../KKdLib/interpolation.hpp" #include "../CRE/auth_3d.hpp" +#include "../CRE/shader_ft.hpp" #include "main.hpp" #include "shared.hpp" #include @@ -117,7 +120,7 @@ static bool a3da_to_dof_data(const char* a3da_path, dft_dsc_data& data) { } static void a3da_to_dft_dsc(int32_t pv_id) { - char buf[0x100]; + char buf[0x200]; sprintf_s(buf, sizeof(buf), "DOF\\script\\pv_%03d_hard.dsc", pv_id); file_stream s_src_dsc; @@ -307,13 +310,388 @@ static void a3da_to_dft_dsc(int32_t pv_id) { st.write(buf, true, false); } -bool close; +#if defined(ReDIVA_DEV) +void compile_shaders(farc* f, farc* of, const shader_table* shaders_table, const size_t size, + const shader_bind_func* bind_func_table, const size_t bind_func_table_size) { + if (!f || !shaders_table || !size) + return; + + wchar_t temp_path[MAX_PATH]; + GetTempPathW(MAX_PATH, temp_path); + + wchar_t glsl_vert_file_buf[MAX_PATH]; + swprintf_s(glsl_vert_file_buf, sizeof(glsl_vert_file_buf) + / sizeof(wchar_t), L"%sReDIVA.vert", temp_path); + + wchar_t glsl_frag_file_buf[MAX_PATH]; + swprintf_s(glsl_frag_file_buf, sizeof(glsl_frag_file_buf) + / sizeof(wchar_t), L"%sReDIVA.frag", temp_path); + + wchar_t spv_vert_file_buf[MAX_PATH]; + swprintf_s(spv_vert_file_buf, sizeof(spv_vert_file_buf) + / sizeof(wchar_t), L"%sReDIVA.vert.spv", temp_path); + + wchar_t spv_frag_file_buf[MAX_PATH]; + swprintf_s(spv_frag_file_buf, sizeof(spv_frag_file_buf) + / sizeof(wchar_t), L"%sReDIVA.frag.spv", temp_path); + + GLsizei buffer_size = 0x20000; + void* binary = force_malloc(buffer_size); + size_t temp_vert_size = 0x10000; + char* temp_vert = force_malloc_s(char, temp_vert_size); + size_t temp_frag_size = 0x10000; + char* temp_frag = force_malloc_s(char, temp_frag_size); + std::vector vec_vert; + std::vector vec_frag; + for (size_t i = 0; i < size; i++) { + const shader_table* shader_table = &shaders_table[i]; + + int32_t num_sub = shader_table->num_sub; + const shader_sub_table* sub_table = shaders_table[i].sub; + vec_vert.resize(shader_table->num_uniform); + vec_frag.resize(shader_table->num_uniform); + for (size_t j = 0; j < num_sub; j++, sub_table++) { + char vert_file_buf[MAX_PATH]; + strcpy_s(vert_file_buf, sizeof(vert_file_buf), sub_table->vp); + strcat_s(vert_file_buf, sizeof(vert_file_buf), ".vert"); + farc_file* vert_ff = f->read_file(vert_file_buf); + + char* vert_data = 0; + if (vert_ff && vert_ff->data) { + vert_data = force_malloc_s(char, vert_ff->size + 1); + if (vert_data) { + memcpy(vert_data, vert_ff->data, vert_ff->size); + vert_data[vert_ff->size] = 0; + } + } + + char frag_file_buf[MAX_PATH]; + strcpy_s(frag_file_buf, sizeof(frag_file_buf), sub_table->fp); + strcat_s(frag_file_buf, sizeof(frag_file_buf), ".frag"); + farc_file* frag_ff = f->read_file(frag_file_buf); + + char* frag_data = 0; + if (frag_ff && frag_ff->data) { + frag_data = force_malloc_s(char, frag_ff->size + 1); + if (frag_data) { + memcpy(frag_data, frag_ff->data, frag_ff->size); + frag_data[frag_ff->size] = 0; + } + } + + if (!vert_data || !frag_data) { + free_def(vert_data); + free_def(frag_data); + continue; + } + + vert_data = shader::parse_include(vert_data, f); + frag_data = shader::parse_include(frag_data, f); + + wchar_t cmd_temp[0x800]; + if (shader_table->num_uniform > 0) { + int32_t num_uniform = shader_table->num_uniform; + size_t unival_curr = 1; + size_t unival_count = 1; + const int32_t* vp_unival_max = sub_table->vp_unival_max; + const int32_t* fp_unival_max = sub_table->fp_unival_max; + for (size_t k = 0; k < num_uniform; k++) { + size_t unival_max = shader_table->use_permut[k] + ? max_def(vp_unival_max[k], fp_unival_max[k]) : 0; + unival_count += unival_curr * unival_max; + unival_curr *= unival_max + 1; + } + + char vert_buf[MAX_PATH]; + char frag_buf[MAX_PATH]; + + strcpy_s(vert_buf, sizeof(vert_buf), sub_table->vp); + size_t vert_buf_pos = utf8_length(vert_buf); + vert_buf[vert_buf_pos++] = '.'; + vert_buf[vert_buf_pos] = 0; + memset(&vert_buf[vert_buf_pos], '0', num_uniform); + vert_buf[vert_buf_pos + num_uniform] = 0; + strcat_s(vert_buf, sizeof(vert_buf), ".vert.spv"); + + strcpy_s(frag_buf, sizeof(frag_buf), sub_table->fp); + size_t frag_buf_pos = utf8_length(frag_buf); + frag_buf[frag_buf_pos++] = '.'; + frag_buf[frag_buf_pos] = 0; + memset(&frag_buf[frag_buf_pos], '0', num_uniform); + frag_buf[frag_buf_pos + num_uniform] = 0; + strcat_s(frag_buf, sizeof(frag_buf), ".frag.spv"); + + for (size_t k = 0; k < unival_count; k++) { + for (size_t l = 0, m = k; l < num_uniform; l++) { + size_t unival_max = (size_t)(shader_table->use_permut[l] + ? max_def(vp_unival_max[l], fp_unival_max[l]) : 0) + 1; + vec_vert[l] = (uint32_t)(min_def(m % unival_max, vp_unival_max[l])); + m /= unival_max; + vert_buf[vert_buf_pos + l] = (char)('0' + vec_vert[l]); + } + + for (size_t l = 0, m = k; l < num_uniform; l++) { + size_t unival_max = (size_t)(shader_table->use_permut[l] + ? max_def(vp_unival_max[l], fp_unival_max[l]) : 0) + 1; + vec_frag[l] = (uint32_t)(min_def(m % unival_max, fp_unival_max[l])); + m /= unival_max; + frag_buf[frag_buf_pos + l] = (char)('0' + vec_frag[l]); + } + + if (!of->has_file(vert_buf)) { + shader::parse_define(vert_data, + num_uniform, vp_unival_max, fp_unival_max, + vec_vert.data(), &temp_vert, &temp_vert_size); + + file_stream fs; + fs.open(glsl_vert_file_buf, L"wb"); + fs.write_utf8_string(temp_vert); + fs.close(); + + swprintf_s(cmd_temp, sizeof(cmd_temp) / sizeof(wchar_t), + L"E:\\C\\VulkanSDK\\1.3.231.1\\Bin\\glslc.exe -DSPIRV" + " -O --target-spv=spv1.0 -o \"%s\" \"%s\"", + spv_vert_file_buf, glsl_vert_file_buf); + + STARTUPINFO si; + PROCESS_INFORMATION pi; + + ZeroMemory(&si, sizeof(si)); + si.cb = sizeof(si); + ZeroMemory(&pi, sizeof(pi)); + CreateProcessW(0, cmd_temp, 0, 0, FALSE, CREATE_NO_WINDOW, 0, 0, &si, &pi); + WaitForSingleObject(pi.hProcess, INFINITE); + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + + farc_file* ff = of->add_file(vert_buf); + fs.open(spv_vert_file_buf, L"rb"); + ff->size = fs.get_length(); + ff->data = force_malloc(ff->size); + fs.read(ff->data, ff->size); + fs.close(); + } + + if (!of->has_file(frag_buf)) { + shader::parse_define(frag_data, + num_uniform, vp_unival_max, fp_unival_max, + vec_frag.data(), &temp_frag, &temp_frag_size); + + file_stream fs; + fs.open(glsl_frag_file_buf, L"wb"); + fs.write_utf8_string(temp_frag); + fs.close(); + + swprintf_s(cmd_temp, sizeof(cmd_temp) / sizeof(wchar_t), + L"E:\\C\\VulkanSDK\\1.3.231.1\\Bin\\glslc.exe -DSPIRV" + " -O --target-spv=spv1.0 -o \"%s\" \"%s\"", + spv_frag_file_buf, glsl_frag_file_buf); + + STARTUPINFO si; + PROCESS_INFORMATION pi; + + ZeroMemory(&si, sizeof(si)); + si.cb = sizeof(si); + ZeroMemory(&pi, sizeof(pi)); + CreateProcessW(0, cmd_temp, 0, 0, FALSE, CREATE_NO_WINDOW, 0, 0, &si, &pi); + WaitForSingleObject(pi.hProcess, INFINITE); + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + + farc_file* ff = of->add_file(frag_buf); + fs.open(spv_frag_file_buf, L"rb"); + ff->size = fs.get_length(); + ff->data = force_malloc(ff->size); + fs.read(ff->data, ff->size); + fs.close(); + } + } + } + else { + char vert_buf[MAX_PATH]; + char frag_buf[MAX_PATH]; + strcpy_s(vert_buf, sizeof(vert_buf), sub_table->vp); + strcpy_s(frag_buf, sizeof(vert_buf), sub_table->fp); + strcat_s(vert_buf, sizeof(vert_buf), "..vert"); + strcat_s(frag_buf, sizeof(vert_buf), "..frag"); + + if (!of->has_file(vert_buf)) { + shader::parse_define(vert_data, + 0, 0, 0, 0, &temp_vert, &temp_vert_size); + + file_stream fs; + fs.open(glsl_vert_file_buf, L"wb"); + fs.write_utf8_string(temp_vert); + fs.close(); + + swprintf_s(cmd_temp, sizeof(cmd_temp) / sizeof(wchar_t), + L"E:\\C\\VulkanSDK\\1.3.231.1\\Bin\\glslc.exe -DSPIRV" + " -O --target-spv=spv1.0 -o \"%s\" \"%s\"", + spv_vert_file_buf, glsl_vert_file_buf); + + STARTUPINFO si; + PROCESS_INFORMATION pi; + + ZeroMemory(&si, sizeof(si)); + si.cb = sizeof(si); + ZeroMemory(&pi, sizeof(pi)); + CreateProcessW(0, cmd_temp, 0, 0, FALSE, CREATE_NO_WINDOW, 0, 0, &si, &pi); + WaitForSingleObject(pi.hProcess, INFINITE); + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + + farc_file* ff = of->add_file(vert_buf); + fs.open(spv_vert_file_buf, L"rb"); + ff->size = fs.get_length(); + ff->data = force_malloc(ff->size); + fs.read(ff->data, ff->size); + fs.close(); + } + + if (!of->has_file(frag_buf)) { + shader::parse_define(frag_data, + 0, 0, 0, 0, &temp_frag, &temp_frag_size); + + file_stream fs; + fs.open(glsl_frag_file_buf, L"wb"); + fs.write_utf8_string(temp_frag); + fs.close(); + + swprintf_s(cmd_temp, sizeof(cmd_temp) / sizeof(wchar_t), + L"E:\\C\\VulkanSDK\\1.3.231.1\\Bin\\glslc.exe -DSPIRV" + " -O --target-spv=spv1.0 -o \"%s\" \"%s\"", + spv_frag_file_buf, glsl_frag_file_buf); + + STARTUPINFO si; + PROCESS_INFORMATION pi; + + ZeroMemory(&si, sizeof(si)); + si.cb = sizeof(si); + ZeroMemory(&pi, sizeof(pi)); + CreateProcessW(0, cmd_temp, 0, 0, FALSE, CREATE_NO_WINDOW, 0, 0, &si, &pi); + WaitForSingleObject(pi.hProcess, INFINITE); + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + + farc_file* ff = of->add_file(frag_buf); + fs.open(spv_frag_file_buf, L"rb"); + ff->size = fs.get_length(); + ff->data = force_malloc(ff->size); + fs.read(ff->data, ff->size); + fs.close(); + } + } + + free_def(vert_data); + free_def(frag_data); + } + vec_vert.clear(); + vec_frag.clear(); + } + free_def(binary); + free_def(temp_vert); + free_def(temp_frag); + + DeleteFileW(glsl_vert_file_buf); + DeleteFileW(glsl_frag_file_buf); + DeleteFileW(spv_vert_file_buf); + DeleteFileW(spv_frag_file_buf); +} + +void compile_all_shaders() { + farc f; + f.read("rom\\ft_shaders.farc", true, false); + + farc of; + compile_shaders(&f, &of, shader_ft_table, shader_ft_table_size, + shader_ft_bind_func_table, shader_ft_bind_func_table_size); + of.write("rom\\ft_shaders_spirv", FARC_COMPRESS_FArC, false); +} +#endif int32_t wmain(int32_t argc, wchar_t** argv) { //ShowWindow(GetConsoleWindow(), SW_HIDE); timeBeginPeriod(1); SetProcessDPIAware(); +#if defined(ReDIVA_DEV) + if (argc >= 2 && !wcscmp(argv[1], L"--compile-spir-v")) + compile_all_shaders(); +#endif + + /* + uint8_t key[] = { + 0xA4, 0xB7, 0x31, 0xD0, 0x33, 0xFB, 0x4A, 0x63, 0x9D, 0xD2, 0x46, 0xA5, 0x05, 0xCD, 0x4B, 0xE5, + 0xF2, 0x10, 0xEE, 0x05, 0xC3, 0x56, 0x45, 0x3A, 0xAF, 0x22, 0x5C, 0x88, 0xA0, 0x9F, 0xB6, 0x8A, + }; + + aes256_ctx aes; + aes256_init_ctx(&aes, key); + + file_stream ifs; + ifs.open("SECURE.BIN", "rb"); + + std::vector data; + data.resize(ifs.get_length()); + + ifs.read(data.data(), data.size()); + ifs.close(); + + struct savedata_header { + uint32_t signature; + uint32_t data_size; + uint32_t length; + uint32_t flags; + uint8_t unk10; + uint8_t crc8; + uint16_t crc16; + uint32_t section_size; + uint32_t unk18; + uint32_t unk1C; + uint8_t data[]; + }; + + savedata_header* head = (savedata_header*)data.data(); + + uint8_t* a1 = data.data(); + uint8_t* v5 = a1 + head->length; + uint8_t* v8 = a1; + uint8_t* v9 = v5 + head->section_size; + + uint8_t v10 = 0xA5; + while (v8 != a1 + 8) + v10 ^= *v8++; + + if (!v10 || v10 == 0xFF) + v10 = 1; + + while (v5 != v9) { + uint8_t v12 = *v5; + *v5 ^= v10; + v10 = v12; + v5++; + } + + aes256_ecb_decrypt_buffer(&aes, data.data() + head->length, data.size() - head->length); + + file_stream ofs; + ofs.open("SECURE.BIN_DEC", "wb"); + ofs.write(data.data(), data.size()); + ofs.close(); + + void* dst = 0; + size_t dst_len = head->unk1C; + deflate::decompress(data.data() + head->length, data.size() - head->length, + &dst, &dst_len, deflate::MODE_GZIP); + + file_stream ufs; + ufs.open("SECURE.BIN_DEC_DEFLATE", "wb"); + ufs.write(dst, dst_len); + ufs.close(); + + if (dst) + free(dst);*/ + int32_t cpuid_data[4] = {}; __cpuid(cpuid_data, 1); aes_ni = (cpuid_data[2] & (1 << 25)) ? true : false; diff --git a/src/ReDIVA/pv_game.cpp b/src/ReDIVA/pv_game.cpp index 2a398df8..ef8a9c6a 100644 --- a/src/ReDIVA/pv_game.cpp +++ b/src/ReDIVA/pv_game.cpp @@ -14,6 +14,7 @@ #include "../CRE/rob/rob.hpp" #include "../CRE/data.hpp" #include "../CRE/object.hpp" +#include "../CRE/pv_expression.hpp" #include "../CRE/pv_param.hpp" #include "../KKdLib/farc.hpp" #include "../KKdLib/sort.hpp" @@ -144,6 +145,8 @@ static dsc_data* pv_game_dsc_data_find_func(pv_game_old* pvgm, dsc_ft_func func_ int32_t* time, int32_t* pv_branch_mode, dsc_data* start, dsc_data* end); static void pv_game_dsc_data_find_playdata_item_anim(pv_game_old* pvgm, int32_t chara_id); static void pv_game_dsc_data_find_playdata_set_motion(pv_game_old* pvgm, int32_t chara_id); +static void pv_game_dsc_data_set_motion_max_frame(pv_game_old* pvgm, + int32_t chara_id, int32_t motion_index, int64_t disp_time); pv_play_data_motion_data::pv_play_data_motion_data() : rob_chr(), current_time(), duration(), start_pos(), end_pos(), start_rot(), end_rot() { @@ -158,8 +161,8 @@ void pv_play_data_motion_data::reset() { rob_chr = 0; current_time = 0.0f; duration = 0.0f; - start_pos = vec3_null; - end_pos = vec3_null; + start_pos = 0.0f; + end_pos = 0.0f; start_rot = 0.0f; end_rot = 0.0f; mot_smooth_len = 12.0f; @@ -414,7 +417,7 @@ pv_game_old::~pv_game_old() { } bool pv_game_old::Init() { - task_stage_load("PV_STAGE"); + task_stage_load_task("PV_STAGE"); return true; } @@ -469,10 +472,9 @@ bool pv_game_old::Ctrl() { obj* obj = &set->obj_data[i]; for (uint32_t j = 0; j < obj->num_material; j++) { obj_material* material = &obj->material_array[j].material; - vec3 spec = { 0.5f, 0.5f, 0.5f }; - if (!memcmp(&material->color.specular, &spec, sizeof(vec3))) - *(vec3*)&material->color.specular = vec3_null; - else if (memcmp(&material->color.specular, &vec3_null, sizeof(vec3))) + if (material->color.specular == 0.5f) + *(vec3*)&material->color.specular = 0.0f; + else if (material->color.specular != 0.0f) *(vec3*)&material->color.specular = { 0.1f, 0.1f, 0.1f }; } } @@ -656,11 +658,11 @@ bool pv_game_old::Ctrl() { bool pv_game_old::Dest() { Unload(); - task_stage_unload(); + task_stage_unload_task(); light_param_data_storage_data_reset(); rctx_ptr->post_process.tone_map->set_saturate_coeff(1.0f); - rctx_ptr->post_process.tone_map->set_scene_fade(vec4_null); + rctx_ptr->post_process.tone_map->set_scene_fade(0.0f); rctx_ptr->post_process.tone_map->set_scene_fade_blend_func(0); rctx_ptr->post_process.dof->data.pv.enable = false; rctx_ptr->object_data.object_culling = true; @@ -966,24 +968,6 @@ static float_t dsc_time_to_frame(int64_t time) { return (float_t)time / 1000000000.0f * 60.0f; } -static void sub_140122B60(pv_game_old* a1, int32_t chara_id, int32_t motion_index, int64_t disp_time) { - if (chara_id < 0 || chara_id > ROB_CHARA_COUNT || motion_index < 0) - return; - - pv_play_data* playdata = &a1->playdata[chara_id]; - int64_t dsc_time = a1->dsc_time; - for (dsc_set_motion& i : playdata->motion_data.set_motion) { - int64_t time = (int64_t)i.time * 10000; - if (time > dsc_time && i.motion_index == motion_index - && (!a1->branch_mode || a1->branch_mode == i.pv_branch_mode)) { - rob_chara_bone_data* rob_bone_data = playdata->rob_chr->bone_data; - rob_bone_data->motion_loaded.front()->mot_play_data.frame_data.field_14 = - roundf(dsc_time_to_frame(time - disp_time)) - 1.0f; - break; - } - } -} - static void pv_game_change_field(pv_game_old* pvgm, int32_t field, int64_t dsc_time, int64_t curr_time) { light_param_data_storage_data_set_pv_cut(field); } @@ -1082,10 +1066,10 @@ static bool pv_game_dsc_process(pv_game_old* a1, int64_t curr_time) { rob_chr->set_motion_reset_data(i.motion_id, i.dsc_frame); rob_chr->bone_data->disable_eye_motion = i.disable_eye_motion; rob_chr->data.motion.step_data.step = i.frame_speed; - //if (v45) - // pv_expression_array_set_motion(a1->chara_id, i.motion_id); + if (v45) + pv_expression_array_set_motion(hash_murmurhash_empty, a1->chara_id, i.motion_id); //if (!a1->pv_game_old->data.pv->disable_calc_motfrm_limit) - sub_140122B60(a1, a1->chara_id, i.motion_index, i.dsc_time); + pv_game_dsc_data_set_motion_max_frame(a1, a1->chara_id, i.motion_index, i.dsc_time); } playdata->set_motion.clear(); } @@ -1177,7 +1161,7 @@ static bool pv_game_dsc_process(pv_game_old* a1, int64_t curr_time) { int32_t motion_id = vector_pv_db_pv_motion_get_element_by_index_or_null(&v64->motion[a1->chara_id], v52)->id; if (pv_game_data_get()->data.pv) { pv_db_pv_motion* v76 = vector_pv_db_pv_motion_get_element_by_index_or_null(&v64->motion[a1->chara_id], v52); - motion_id = sub_1404EFA20(pv_game_data_get()->data.pv, rob_chr->chara_id, rob_chr->chara_index, v76); + motion_id = pv_game_data_get()->data.pv->get_chrmot_motion_id(ob_chr->chara_id, rob_chr->chara_index, v76); }*/ if (motion_index) { @@ -1215,10 +1199,10 @@ static bool pv_game_dsc_process(pv_game_old* a1, int64_t curr_time) { rob_chr->set_motion_skin_param(motion_id, dsc_frame); rob_chr->bone_data->disable_eye_motion = true; rob_chr->data.motion.step_data.step = v519.frame_speed; - //if (v84) - // pv_expression_array_set_motion(a1->chara_id, motion_id); + if (v84) + pv_expression_array_set_motion(hash_murmurhash_empty, a1->chara_id, motion_id); //if (!a1->pv_game_old->data.pv->disable_calc_motfrm_limit) - sub_140122B60(a1, a1->chara_id, motion_index, v56 ? v56->time : 0); + pv_game_dsc_data_set_motion_max_frame(a1, a1->chara_id, motion_index, v56 ? v56->time : 0); } else { playdata->set_motion.clear(); @@ -1348,38 +1332,6 @@ static bool pv_game_dsc_process(pv_game_old* a1, int64_t curr_time) { if (!rob_chr) break; - switch (mouth_anim_id) { - case 4: mouth_anim_id = 34; break; - case 5: mouth_anim_id = 35; break; - case 6: mouth_anim_id = 36; break; - case 7: mouth_anim_id = 37; break; - case 8: mouth_anim_id = 38; break; - case 9: mouth_anim_id = 39; break; - case 10: mouth_anim_id = 4; break; - case 11: mouth_anim_id = 5; break; - case 12: mouth_anim_id = 6; break; - case 13: mouth_anim_id = 7; break; - case 14: mouth_anim_id = 8; break; - case 15: mouth_anim_id = 9; break; - case 16: mouth_anim_id = 10; break; - case 17: mouth_anim_id = 11; break; - case 18: mouth_anim_id = 12; break; - case 19: mouth_anim_id = 13; break; - case 20: mouth_anim_id = 14; break; - case 21: mouth_anim_id = 15; break; - case 22: mouth_anim_id = 16; break; - case 23: mouth_anim_id = 17; break; - case 24: mouth_anim_id = 18; break; - case 25: mouth_anim_id = 19; break; - case 26: mouth_anim_id = 20; break; - case 27: mouth_anim_id = 21; break; - case 28: mouth_anim_id = 22; break; - case 29: mouth_anim_id = 40; break; - case 30: mouth_anim_id = 41; break; - case 31: mouth_anim_id = 42; break; - default: printf(""); break; - } - int32_t mottbl_index = mouth_anim_id_to_mottbl_index(mouth_anim_id); duration /= a1->anim_frame_speed; @@ -2121,4 +2073,23 @@ static void pv_game_dsc_data_find_playdata_set_motion(pv_game_old* pvgm, int32_t i++; } } + +static void pv_game_dsc_data_set_motion_max_frame(pv_game_old* pvgm, + int32_t chara_id, int32_t motion_index, int64_t disp_time) { + if (chara_id < 0 || chara_id > ROB_CHARA_COUNT || motion_index < 0) + return; + + pv_play_data* playdata = &pvgm->playdata[chara_id]; + rob_chara_bone_data* rob_bone_data = playdata->rob_chr->bone_data; + int64_t dsc_time = pvgm->dsc_time; + for (dsc_set_motion& i : playdata->motion_data.set_motion) { + int64_t time = (int64_t)i.time * 10000; + if (time > dsc_time && i.motion_index == motion_index + && (!pvgm->branch_mode || pvgm->branch_mode == i.pv_branch_mode)) { + playdata->rob_chr->bone_data->set_motion_max_frame( + roundf(dsc_time_to_frame(time - disp_time)) - 1.0f); + break; + } + } +} #endif diff --git a/src/ReDIVA/render.cpp b/src/ReDIVA/render.cpp index 03931a25..6b008b61 100644 --- a/src/ReDIVA/render.cpp +++ b/src/ReDIVA/render.cpp @@ -6,14 +6,6 @@ */ #include "render.hpp" -#include -#include -#define GLFW_EXPOSE_NATIVE_WIN32 -#include -#include -#include -#include -#include #include "../CRE/Glitter/glitter.hpp" #include "../CRE/rob/rob.hpp" #include "../CRE/camera.hpp" @@ -28,14 +20,17 @@ #include "../CRE/object.hpp" #include "../CRE/ogg_vorbis.hpp" #include "../CRE/pv_db.hpp" +#include "../CRE/pv_expression.hpp" #include "../CRE/random.hpp" #include "../CRE/shader.hpp" #include "../CRE/shader_ft.hpp" #include "../CRE/shader_glsl.hpp" #include "../CRE/stage.hpp" #include "../CRE/stage_modern.hpp" +#include "../CRE/stage_param.hpp" #include "../CRE/static_var.hpp" #include "../CRE/task.hpp" +#include "../CRE/task_effect.hpp" #include "../CRE/texture.hpp" #include "../CRE/timer.hpp" #include "../CRE/post_process.hpp" @@ -51,10 +46,18 @@ #include "task_window.hpp" #include "pv_game.hpp" #include "x_pv_game.hpp" +#include +#include +#define GLFW_EXPOSE_NATIVE_WIN32 +#include +#include +#include +#include +#include #include #if defined(DEBUG) -#define OPENGL_DEBUG 0 +#define OPENGL_DEBUG 1 #endif #define CUBE_LINE_SIZE (0.0025f) @@ -76,6 +79,7 @@ GLuint cube_line_vao; GLuint cube_line_vbo; GLuint cube_line_point_vao; GLuint cube_line_point_instance_vbo; +GLuint grid_vao; GLuint grid_vbo; static GLuint common_data_ubo = 0; @@ -150,7 +154,7 @@ static void APIENTRY render_debug_output(GLenum source, GLenum type, uint32_t id GLenum severity, GLsizei length, const char* message, const void* userParam); #endif -extern bool close; +bool close; bool reload_render; lock* render_lock; HWND window_handle; @@ -194,9 +198,6 @@ int32_t render_main(render_init_struct* ris) { width = 1920; height = 1080; #endif - - glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 4); - glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3); glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE); glfwWindowHint(GLFW_RESIZABLE, GLFW_TRUE); glfwWindowHint(GLFW_FOCUSED, GLFW_TRUE); @@ -208,21 +209,7 @@ int32_t render_main(render_init_struct* ris) { glfwWindowHint(GLFW_RED_BITS, mode->redBits); glfwWindowHint(GLFW_GREEN_BITS, mode->greenBits); glfwWindowHint(GLFW_BLUE_BITS, mode->blueBits); - - const char* glfw_titlelabel; -#if defined(DEBUG) -#if defined(ReDIVA_DEV) - glfw_titlelabel = "ReDIVADev Debug"; -#else - glfw_titlelabel = "ReDIVA Debug"; -#endif -#else -#if defined(ReDIVA_DEV) - glfw_titlelabel = "ReDIVADev"; -#else - glfw_titlelabel = "ReDIVA"; -#endif -#endif + glfwWindowHint(GLFW_DEPTH_BITS, 0); #if BAKE_PNG || BAKE_VIDEO bool maximized = false; @@ -231,7 +218,29 @@ int32_t render_main(render_init_struct* ris) { #endif glfwWindowHint(GLFW_MAXIMIZED, maximized ? GLFW_TRUE : GLFW_FALSE); - window = glfwCreateWindow(width, height, glfw_titlelabel, maximized ? monitor : 0, 0); + int32_t minor = 6; + window = 0; + while (!window || minor < 3) { + glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 4); + glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, minor--); + + const char* glfw_titlelabel; +#if defined(DEBUG) +#if defined(ReDIVA_DEV) + glfw_titlelabel = "ReDIVADev Debug"; +#else + glfw_titlelabel = "ReDIVA Debug"; +#endif +#else +#if defined(ReDIVA_DEV) + glfw_titlelabel = "ReDIVADev"; +#else + glfw_titlelabel = "ReDIVA"; +#endif +#endif + window = glfwCreateWindow(width, height, glfw_titlelabel, maximized ? monitor : 0, 0); + } + if (!window) { glfwTerminate(); return -2; @@ -240,6 +249,7 @@ int32_t render_main(render_init_struct* ris) { glfwMakeContextCurrent(window); if (!gladLoadGLLoader((GLADloadproc)glfwGetProcAddress)) { + glfwDestroyWindow(window); glfwTerminate(); return -3; } @@ -286,6 +296,7 @@ int32_t render_main(render_init_struct* ris) { glGetIntegerv(GL_MAX_TEXTURE_SIZE, &sv_max_texture_size); glGetIntegerv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &sv_max_texture_max_anisotropy); glHint(GL_POLYGON_SMOOTH_HINT, GL_NICEST); + glEnable(GL_TEXTURE_CUBE_MAP_SEAMLESS); #if DRAW_PASS_TIME_DISP for (std::vector& i : draw_pass_cpu_time) @@ -304,11 +315,7 @@ int32_t render_main(render_init_struct* ris) { rctx = render_load(); lock_unlock(render_lock); - data_struct* aft_data = &data_list[DATA_AFT]; - - //OggFileHandler ofh; - //aft_data->load_file(&ofh, "rom/sound/bgm/", - // "selector_verB_a_lp.ogg", OggFileHandler::LoadFile); + //sound_work_play_stream(1, "rom/sound/bgm/selector_verB_a_lp.ogg"); frame_counter = 0; @@ -317,7 +324,7 @@ int32_t render_main(render_init_struct* ris) { glfwGetFramebufferSize(window, &width, &height); #endif glViewport(0, 0, width, height); - glfwSwapInterval(1); + glfwSwapInterval(0); gl_state_disable_blend(); gl_state_disable_depth_test(); @@ -340,11 +347,11 @@ int32_t render_main(render_init_struct* ris) { close |= !!glfwWindowShouldClose(window); frame_counter++; Input::EndFrame(); - render_timer->end_of_cycle(); glfwSwapBuffers(window); + render_timer->end_of_cycle(); } - //ofh.~OggFileHandler(); + //sound_work_release_stream(1); lock_lock(render_lock); render_dispose(rctx); @@ -383,7 +390,7 @@ int32_t render_get_scale_index() { } void render_set_scale_index(int32_t index) { - scale_index = index >= 0 && index < RENDER_SCALE_MAX ? index : RENDER_SCALE_100; + scale_index = index >= 0 && index < RENDER_SCALE_MAX ? index : RENDER_SCALE_100; } float_t rob_frame = 0.0f; @@ -419,13 +426,18 @@ static render_context* render_load() { for (std::string& i : mdata_manager_get()->prefixes) { std::string osage_setting_file = i + "osage_setting.txt"; - aft_data->load_file(aft_data, "rom/skin_param/", osage_setting_file.c_str(), osage_setting_data_load_file); + aft_data->load_file(aft_data, "rom/skin_param/", + osage_setting_file.c_str(), osage_setting_data_load_file); } render_shaders_load(); sound_init(); wave_audio_storage_init(); + ogg_file_handler_storage_init(); + ogg_playback_data_init(); object_storage_init(aft_obj_db); + stage_param_data_storage_init(); + pv_expression_file_storage_init(); item_table_array_init(); rand_state_array_init(); @@ -440,6 +452,7 @@ static render_context* render_load() { dtm_stg_init(); task_stage_modern_init(); light_param_data_storage_data_init(); + task_effect_init(); task_pv_db_init(); Glitter::glt_particle_manager_init(); @@ -502,8 +515,10 @@ static render_context* render_load() { if (!tex_ff) continue; + prj::shared_ptr alloc(new alloc_data); + obj_set obj_set; - obj_set.unpack_file(obj_ff->data, obj_ff->size, false); + obj_set.unpack_file(alloc, obj_ff->data, obj_ff->size, false); if (!obj_set.ready) continue; @@ -577,8 +592,10 @@ static render_context* render_load() { if (!txi) continue; + prj::shared_ptr alloc(new alloc_data); + obj_set obj_set; - obj_set.unpack_file(osd->data, osd->size, true); + obj_set.unpack_file(alloc, osd->data, osd->size, true); if (!obj_set.ready) continue; @@ -668,8 +685,10 @@ static render_context* render_load() { if (!txi) continue; + prj::shared_ptr alloc(new alloc_data); + obj_set obj_set; - obj_set.unpack_file(osd->data, osd->size, true); + obj_set.unpack_file(alloc, osd->data, osd->size, true); if (!obj_set.ready) continue; @@ -705,7 +724,10 @@ static render_context* render_load() { glGenBuffers(1, &common_data_ubo); gl_state_bind_uniform_buffer(common_data_ubo); - glBufferData(GL_UNIFORM_BUFFER, COMMON_DATA_SIZE, 0, GL_STREAM_DRAW); + if (GLAD_GL_VERSION_4_4) + glBufferStorage(GL_UNIFORM_BUFFER, COMMON_DATA_SIZE, 0, GL_DYNAMIC_STORAGE_BIT); + else + glBufferData(GL_UNIFORM_BUFFER, COMMON_DATA_SIZE, 0, GL_STREAM_DRAW); glBindBufferRange(GL_UNIFORM_BUFFER, 0, common_data_ubo, 0, COMMON_DATA_SIZE); gl_state_bind_uniform_buffer(0); @@ -791,7 +813,7 @@ static render_context* render_load() { "\n" "uniform mat4 vp;\n" "\n" - "vec4 colors[] = {\n" + "const vec4 colors[] = {\n" " vec4(1.0, 0.0, 0.0, 1.0),\n" " vec4(0.0, 1.0, 0.0, 1.0),\n" " vec4(0.2, 0.2, 0.2, 1.0),\n" @@ -864,6 +886,7 @@ static render_context* render_load() { rctx->post_process.init_fbo(internal_3d_res.x, internal_3d_res.y, internal_2d_res.x, internal_2d_res.y, width, height); + rctx->draw_pass.resize(internal_2d_res.x, internal_2d_res.y); render_resize_fb(rctx, true); @@ -900,7 +923,10 @@ static render_context* render_load() { glGenBuffers(1, &cube_line_vbo); gl_state_bind_vertex_array(cube_line_vao); gl_state_bind_array_buffer(cube_line_vbo); - glBufferData(GL_ARRAY_BUFFER, sizeof(vec3) * 4, 0, GL_STREAM_DRAW); + if (GLAD_GL_VERSION_4_4) + glBufferStorage(GL_ARRAY_BUFFER, sizeof(vec3) * 4, 0, 0); + else + glBufferData(GL_ARRAY_BUFFER, sizeof(vec3) * 4, 0, GL_STREAM_DRAW); glEnableVertexAttribArray(0); glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, sizeof(vec3), 0); gl_state_bind_array_buffer(0); @@ -947,11 +973,30 @@ static render_context* render_load() { *(int32_t*)&grid_verts[v++] = z_color_index; } + glGenVertexArrays(1, &grid_vao); + gl_state_bind_vertex_array(grid_vao); + glGenBuffers(1, &grid_vbo); gl_state_bind_array_buffer(grid_vbo); - glBufferData(GL_ARRAY_BUFFER, sizeof(float_t) * 3 - * grid_vertex_count, grid_verts, GL_STATIC_DRAW); + if (GLAD_GL_VERSION_4_4) + glBufferStorage(GL_ARRAY_BUFFER, sizeof(float_t) * 3 + * grid_vertex_count, grid_verts, 0); + else + glBufferData(GL_ARRAY_BUFFER, sizeof(float_t) * 3 + * grid_vertex_count, grid_verts, GL_STATIC_DRAW); + + glVertexAttrib4f(0, 0.0f, 0.0f, 0.0f, 1.0f); + glVertexAttribI1i(1, 2); + + glEnableVertexAttribArray(0); + glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, + sizeof(float_t) * 3, (void*)0); // Pos + glEnableVertexAttribArray(1); + glVertexAttribIPointer(1, 1, GL_INT, + sizeof(float_t) * 3, (void*)(sizeof(float_t) * 2)); // Color + gl_state_bind_array_buffer(0); + gl_state_bind_vertex_array(0); free(grid_verts); @@ -1004,8 +1049,8 @@ static render_context* render_load() { modules[5] = 0;//31; //pv_game_data.Load(739, charas, modules); - shaders_ft.env_vert_set(3, vec4_identity); - shaders_ft.env_vert_set(4, vec4_null); + shaders_ft.env_vert_set(3, 1.0f); + shaders_ft.env_vert_set(4, 0.0f); classes_process_init(classes, classes_count, rctx); return rctx; } @@ -1163,7 +1208,7 @@ static void render_ctrl(render_context* rctx) { game_state_ctrl(); rctx->ctrl(); - char buf[0x100]; + char buf[0x200]; game_state_print(buf, sizeof(buf)); glfwSetWindowTitle(window, buf); @@ -1196,8 +1241,8 @@ static void render_ctrl(render_context* rctx) { static void cube_line_disp(shader_glsl* shader, camera* cam, vec3* trans, float_t line_size, vec4* color) { mat4 mat[2]; - mat4_translate(trans[0].x, trans[0].y, trans[0].z, &mat[0]); - mat4_translate(trans[1].x, trans[1].y, trans[1].z, &mat[1]); + mat4_translate(&trans[0], &mat[0]); + mat4_translate(&trans[1], &mat[1]); mat4_mult(&cam->view, &mat[0], &mat[0]); mat4_mult(&cam->view, &mat[1], &mat[1]); @@ -1292,7 +1337,7 @@ static void render_disp(render_context* rctx) { continue; rob_chara* rob_chr = &rob_chara_array[i]; - if (~rob_chr->data.field_0 & 1) + if (!rob_chr->get_visibility()) continue; gl_state_bind_vertex_array(cube_line_vao); @@ -1310,7 +1355,7 @@ static void render_disp(render_context* rctx) { mat4_get_translation(j.parent->mat, &trans[0]); mat4_get_translation(j.mat, &trans[1]); - if (memcmp(&trans[0], &trans[1], sizeof(vec3))) + if (trans[0] != trans[1]) cube_line_disp(cube_line_shader, cam, trans, CUBE_LINE_SIZE, &bone_color); } gl_state_bind_array_buffer(0); @@ -1378,7 +1423,7 @@ static void render_disp(render_context* rctx) { mat4_get_translation(&j.node[k.parent].model_transform.mat, &trans[0]); mat4_get_translation(&k.model_transform.mat, &trans[1]); - if (memcmp(&trans[0], &trans[1], sizeof(vec3))) + if (trans[0] != trans[1]) cube_line_disp(cube_line_shader, cam, trans, CUBE_LINE_SIZE, &osg_color); } gl_state_bind_array_buffer(0); @@ -1433,7 +1478,7 @@ static void render_disp(render_context* rctx) { continue; rob_chara* rob_chr = &rob_chara_array[i]; - if (~rob_chr->data.field_0 & 1) + if (!rob_chr->get_visibility()) continue; std::vector> cube_line_points; @@ -1528,6 +1573,17 @@ static void render_dispose(render_context* rctx) { app::TaskWork::Dest(); + sound_work_unload_farc("rom/sound/se.farc"); + sound_work_unload_farc("rom/sound/button.farc"); + sound_work_unload_farc("rom/sound/se_cmn.farc"); + sound_work_unload_farc("rom/sound/se_sel.farc"); + sound_work_unload_farc("rom/sound/se_aime.farc"); + sound_work_unload_farc("rom/sound/pvchange.farc"); + sound_work_unload_farc("rom/sound/slide_se.farc"); + sound_work_unload_farc("rom/sound/slide_long.farc"); + + object_storage_unload_set(dbg_set_id); + //rob_chara_array_free_chara_id(0); render_timer->reset(); while (app::task_work->tasks.size()) { @@ -1559,23 +1615,13 @@ static void render_dispose(render_context* rctx) { cube_line_shader = 0; } - sound_work_unload_farc("rom/sound/se.farc"); - sound_work_unload_farc("rom/sound/button.farc"); - sound_work_unload_farc("rom/sound/se_cmn.farc"); - sound_work_unload_farc("rom/sound/se_sel.farc"); - sound_work_unload_farc("rom/sound/se_aime.farc"); - sound_work_unload_farc("rom/sound/pvchange.farc"); - sound_work_unload_farc("rom/sound/slide_se.farc"); - sound_work_unload_farc("rom/sound/slide_long.farc"); - - object_storage_unload_set(dbg_set_id); - task_data_test_glitter_particle_free(); dtw_stg_free(); auth_3d_test_window_free(); Glitter::glt_particle_manager_free(); task_pv_db_free(); + task_effect_free(); light_param_data_storage_data_free(); task_stage_modern_free(); dtm_stg_free(); @@ -1588,6 +1634,7 @@ static void render_dispose(render_context* rctx) { glDeleteBuffers(1, &common_data_ubo); glDeleteBuffers(1, &grid_vbo); + glDeleteVertexArrays(1, &grid_vao); glDeleteBuffers(1, &cube_line_point_instance_vbo); glDeleteVertexArrays(1, &cube_line_point_vao); glDeleteBuffers(1, &cube_line_vbo); @@ -1597,13 +1644,15 @@ static void render_dispose(render_context* rctx) { rand_state_array_free(); item_table_array_free(); + pv_expression_file_storage_free(); + stage_param_data_storage_free(); object_storage_free(); + ogg_playback_data_free(); + ogg_file_handler_storage_free(); wave_audio_storage_free(); sound_free(); render_shaders_free(); - osage_setting_data_free(); - data_struct_free(); osage_setting_data_free(); @@ -1624,11 +1673,15 @@ static void render_imgui(render_context* rctx) { } static bool render_load_shaders(void* data, const char* path, const char* file, uint32_t hash) { - std::string s = path + std::string(file); + shader_set_data* set = (shader_set_data*)data; + std::string s; + s.assign(path); + s.append(file); farc f; f.read(s.c_str(), true, false); - shader_ft_load((shader_set_data*)data, &f, false); + set->load(&f, false, "ft", shader_ft_table, shader_ft_table_size, + shader_ft_bind_func_table, shader_ft_bind_func_table_size); return true; } @@ -1672,8 +1725,7 @@ static void render_resize_fb(render_context* rctx, bool change_fb) { internal_res.x = (int32_t)res_width; internal_res.y = (int32_t)res_height; - internal_2d_res.x = clamp_def(internal_res.x, 1, sv_max_texture_size); - internal_2d_res.y = clamp_def(internal_res.y, 1, sv_max_texture_size); + internal_2d_res = vec2i::clamp(internal_res, 1, sv_max_texture_size); #if BAKE_PNG || BAKE_VIDEO internal_3d_res.x = (int32_t)roundf((float_t)(internal_res.x * 2)); internal_3d_res.y = (int32_t)roundf((float_t)(internal_res.y * 2)); @@ -1681,8 +1733,7 @@ static void render_resize_fb(render_context* rctx, bool change_fb) { internal_3d_res.x = (int32_t)roundf((float_t)(internal_res.x * render_scale_table[scale_index])); internal_3d_res.y = (int32_t)roundf((float_t)(internal_res.y * render_scale_table[scale_index])); #endif - internal_3d_res.x = clamp_def(internal_3d_res.x, 1, sv_max_texture_size); - internal_3d_res.y = clamp_def(internal_3d_res.y, 1, sv_max_texture_size); + internal_3d_res = vec2i::clamp(internal_3d_res, 1, sv_max_texture_size); bool fb_changed = old_internal_2d_res.x != internal_2d_res.x || old_internal_2d_res.y != internal_2d_res.y @@ -1695,6 +1746,7 @@ static void render_resize_fb(render_context* rctx, bool change_fb) { if (fb_changed && change_fb) { rctx->post_process.init_fbo(internal_3d_res.x, internal_3d_res.y, internal_2d_res.x, internal_2d_res.y, width, height); + rctx->draw_pass.resize(internal_2d_res.x, internal_2d_res.y); rctx->litproj->resize(internal_3d_res.x, internal_3d_res.y); } } @@ -1710,8 +1762,7 @@ static void render_imgui_context_menu(classes_data* classes, if (c->sub_classes && c->sub_classes_count) { if (ImGui::BeginMenu(c->name, ~c->data.flags & CLASS_HIDDEN)) { - render_imgui_context_menu(c->sub_classes, - c->sub_classes_count, rctx); + render_imgui_context_menu(c->sub_classes, c->sub_classes_count, rctx); ImGui::EndMenu(); } } @@ -1740,11 +1791,11 @@ static void render_imgui_context_menu(classes_data* classes, } } -inline static void render_shaders_load() { +static void render_shaders_load() { data_list[DATA_AFT].load_file(&shaders_ft, "rom/", "ft_shaders.farc", render_load_shaders); } -inline static void render_shaders_free() { +static void render_shaders_free() { shaders_ft.unload(); } @@ -1754,74 +1805,74 @@ static void APIENTRY render_debug_output(GLenum source, GLenum type, uint32_t id if (id == 131169 || id == 131185 || id == 131218 || id == 131204) return; - printf("########################################\n"); + printf_debug("########################################\n"); switch (type) { case GL_DEBUG_TYPE_ERROR: - printf("Type: Error; "); + printf_debug("Type: Error; "); break; case GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR: - printf("Type: Deprecated Behaviour; "); + printf_debug("Type: Deprecated Behaviour; "); break; case GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR: - printf("Type: Undefined Behaviour; "); + printf_debug("Type: Undefined Behaviour; "); break; case GL_DEBUG_TYPE_PORTABILITY: - printf("Type: Portability; "); + printf_debug("Type: Portability; "); break; case GL_DEBUG_TYPE_PERFORMANCE: - printf("Type: Performance; "); + printf_debug("Type: Performance; "); break; case GL_DEBUG_TYPE_MARKER: - printf("Type: Marker; "); + printf_debug("Type: Marker; "); break; case GL_DEBUG_TYPE_PUSH_GROUP: - printf("Type: Push Group; "); + printf_debug("Type: Push Group; "); break; case GL_DEBUG_TYPE_POP_GROUP: - printf("Type: Pop Group; "); + printf_debug("Type: Pop Group; "); break; case GL_DEBUG_TYPE_OTHER: - printf("Type: Other; "); + printf_debug("Type: Other; "); break; } switch (severity) { case GL_DEBUG_SEVERITY_HIGH: - printf("Severity: high; "); + printf_debug("Severity: high; "); break; case GL_DEBUG_SEVERITY_MEDIUM: - printf("Severity: medium; "); + printf_debug("Severity: medium; "); break; case GL_DEBUG_SEVERITY_LOW: - printf("Severity: low; "); + printf_debug("Severity: low; "); break; case GL_DEBUG_SEVERITY_NOTIFICATION: - printf("Severity: notif; "); + printf_debug("Severity: notif; "); break; } switch (source) { case GL_DEBUG_SOURCE_API: - printf("Source: API\n"); + printf_debug("Source: API\n"); break; case GL_DEBUG_SOURCE_WINDOW_SYSTEM: - printf("Source: Window System\n"); + printf_debug("Source: Window System\n"); break; case GL_DEBUG_SOURCE_SHADER_COMPILER: - printf("Source: Shader Compiler\n"); + printf_debug("Source: Shader Compiler\n"); break; case GL_DEBUG_SOURCE_THIRD_PARTY: - printf("Source: Third Party\n"); + printf_debug("Source: Third Party\n"); break; case GL_DEBUG_SOURCE_APPLICATION: - printf("Source: Application\n"); + printf_debug("Source: Application\n"); break; case GL_DEBUG_SOURCE_OTHER: - printf("Source: Other\n"); + printf_debug("Source: Other\n"); break; } - printf("Debug message (%d): %s\n", id, message); - printf("########################################\n\n"); + printf_debug("Debug message (%d): %s\n", id, message); + printf_debug("########################################\n\n"); } #endif diff --git a/src/ReDIVA/system_startup.cpp b/src/ReDIVA/system_startup.cpp index ad8c6197..40a95600 100644 --- a/src/ReDIVA/system_startup.cpp +++ b/src/ReDIVA/system_startup.cpp @@ -13,7 +13,7 @@ system_startup_detail::TaskSystemStartup task_system_startup; struct system_startup_struct { int32_t state; int32_t wait; - bool field_1D; + bool ready; }; extern render_context* rctx_ptr; @@ -22,9 +22,9 @@ system_startup_struct system_startup; int32_t system_startup_ready; -static void task_pv_game_init_test_pv(); +static bool system_startup_check_ready(); -static bool sub_140672AD0(); +static void task_pv_game_init_test_pv(); namespace system_startup_detail { TaskSystemStartup::TaskSystemStartup() { @@ -38,7 +38,7 @@ namespace system_startup_detail { bool TaskSystemStartup::Init() { system_startup.state = 0; system_startup.wait = 0; - system_startup.field_1D = false; + system_startup.ready = false; return true; } @@ -59,12 +59,12 @@ namespace system_startup_detail { system_startup.state = 4; break; case 4: - //rctx_ptr->draw_pass.enable[DRAW_PASS_3D] = false; + rctx_ptr->draw_pass.set_enable(DRAW_PASS_3D, false); task_pv_game_init_test_pv(); system_startup.state = 5; break; case 5: - if (!task_pv_game_check_task_ready() && sub_140672AD0()) + if (!task_pv_game_check_task_ready() && system_startup_check_ready()) system_startup.state = 6; break; case 6: @@ -76,7 +76,7 @@ namespace system_startup_detail { system_startup.state = 8; break; case 8: - //rctx_ptr->draw_pass.enable[DRAW_PASS_3D] = true; + rctx_ptr->draw_pass.set_enable(DRAW_PASS_3D, true); system_startup_ready = 1; break; } @@ -84,7 +84,7 @@ namespace system_startup_detail { } bool TaskSystemStartup::Dest() { - if (task_pv_game_check_task_ready() && !sub_140672AD0()) + if (task_pv_game_check_task_ready() && !system_startup_check_ready()) return false; opd_make_manager_task_free(); @@ -101,6 +101,16 @@ bool task_system_startup_free_task() { return task_system_startup.SetDest(); } +static bool system_startup_check_ready() { + if (test_mode_get() || system_startup.ready) + return true; + + task_pv_game_free_task(); + if (!task_pv_game_check_task_ready() && task_rob_manager_free_task()) + system_startup.ready = true; + return system_startup.ready; +} + static void task_pv_game_init_test_pv() { if (test_mode_get()) return; @@ -122,13 +132,3 @@ static void task_pv_game_init_test_pv() { init_data.field_198 = true; task_pv_game_append_task(&init_data); } - -static bool sub_140672AD0() { - if (test_mode_get() || system_startup.field_1D) - return true; - - task_pv_game_free_task(); - if (!task_pv_game_check_task_ready() && task_rob_manager_free_task()) - system_startup.field_1D = true; - return system_startup.field_1D; -} diff --git a/src/ReDIVA/x_pv_game.cpp b/src/ReDIVA/x_pv_game.cpp index c16090ba..cae6caae 100644 --- a/src/ReDIVA/x_pv_game.cpp +++ b/src/ReDIVA/x_pv_game.cpp @@ -15,10 +15,13 @@ #include "../CRE/object.hpp" #include "../CRE/pv_expression.hpp" #include "../CRE/pv_param.hpp" +#include "../CRE/random.hpp" #include "../CRE/sound.hpp" +#include "../CRE/task_effect.hpp" #include "../KKdLib/farc.hpp" #include "../KKdLib/interpolation.hpp" #include "../KKdLib/sort.hpp" +#include "../KKdLib/str_utils.hpp" #if BAKE_PNG #include #endif @@ -208,6 +211,8 @@ struct dof_cam { dof_cam(); ~dof_cam(); + + void reset(); }; #endif @@ -225,10 +230,14 @@ static void x_pv_game_change_field(x_pv_game* xpvgm, int32_t field, int64_t dsc_ static bool x_pv_game_dsc_process(x_pv_game* xpvgm, int64_t curr_time); //static void x_pv_game_map_auth_3d_to_mot(x_pv_game* xpvgm, bool add_keys); static void x_pv_game_reset_field(x_pv_game* xpvgm); +static void x_pv_game_split_auth_3d_hrc_material_list(x_pv_game* xpvgm, + std::set& object_hrc, std::set& material_list); static void pv_game_dsc_data_find_playdata_item_anim(x_pv_game* xpvgm, int32_t chara_id); static void pv_game_dsc_data_find_playdata_set_motion(x_pv_game* xpvgm, int32_t chara_id); static void pv_game_dsc_data_find_set_motion(x_pv_game* xpvgm); +static void pv_game_dsc_data_set_motion_max_frame(x_pv_game* xpvgm, + int32_t chara_id, int32_t motion_index, int64_t disp_time); bool x_pv_bar_beat_data::compare_bar_time_less(float_t time) { return (time + 0.0001f) < bar_time; @@ -541,8 +550,8 @@ void x_pv_play_data_motion_data::reset() { rob_chr = 0; current_time = 0.0f; duration = 0.0f; - start_pos = vec3_null; - end_pos = vec3_null; + start_pos = 0.0f; + end_pos = 0.0f; start_rot = 0.0f; end_rot = 0.0f; mot_smooth_len = 12.0f; @@ -799,13 +808,13 @@ void x_pv_game_camera::ctrl(float_t curr_time) { void x_pv_game_camera::load(int32_t pv_id, int32_t stage_id, FrameRateControl* frame_rate_control) { char buf[0x200]; sprintf_s(buf, sizeof(buf), "CAMPV%03d", pv_id); - category = buf; + category.assign(buf); if ((pv_id % 100) >= 25 && (pv_id % 100) <= 30 && stage_id >= 25 && stage_id <= 30) sprintf_s(buf, sizeof(buf), "CAMPV%03d_100", pv_id); else sprintf_s(buf, sizeof(buf), "CAMPV%03d_BASE", pv_id); - file = buf; + file.assign(buf); this->frame_rate_control = frame_rate_control; } @@ -923,7 +932,7 @@ void x_pv_game_effect::ctrl(object_database* obj_db, texture_database* tex_db) { pvpp_effect& effect = play_param->effect[i]; for (pvpp_glitter& j : effect.glitter) { x_pv_game_song_effect_glitter v132; - v132.name = j.name; + v132.name.assign(j.name); v132.scene_counter = 0; v132.field_8 = !!(j.unk2 & 0x01); for (bool& i : v132.field_9) @@ -994,7 +1003,7 @@ void x_pv_game_effect::load(int32_t pv_id, pvpp* play_param, FrameRateControl* f if (!eff.auth_3d.size()) continue; - char buf[0x100]; + char buf[0x200]; size_t len = sprintf_s(buf, sizeof(buf), "A3D_EFFPV%03d", pv_id); pv_auth_3d.push_back(std::string(buf, len)); @@ -1022,7 +1031,7 @@ void x_pv_game_effect::load_data(int32_t pv_id) { if (!eff.glitter.size()) continue; - char buf[0x100]; + char buf[0x200]; size_t len = sprintf_s(buf, sizeof(buf), "eff_pv%03d_main", pv_id); uint32_t hash = (uint32_t)Glitter::glt_particle_manager->LoadFile(Glitter::X, x_data, buf, 0, -1.0f, false, 0); @@ -1050,14 +1059,16 @@ void x_pv_game_effect::reset() { frame_rate_control = 0; } -void x_pv_game_effect::set_chara_id(int32_t index, int32_t chara_id, bool a4) { +void x_pv_game_effect::set_chara_id(int32_t index, int32_t chara_id, bool chara_item) { if (index < 0 || index >= song_effect.size()) return; x_pv_game_song_effect& song_effect = this->song_effect[index]; - for (x_pv_game_song_effect_auth_3d& i : song_effect.auth_3d) + for (x_pv_game_song_effect_auth_3d& i : song_effect.auth_3d) { auth_3d_data_set_chara_id(&i.id, chara_id); + auth_3d_data_set_chara_item(&i.id, chara_item); + } song_effect.chara_id = chara_id; } @@ -1827,7 +1838,7 @@ void x_pv_game_data::load(int32_t pv_id, FrameRateControl* frame_rate_control, c effect.load(pv_id, play_param, frame_rate_control); chara_effect.load(pv_id, play_param, frame_rate_control, charas); - char buf[0x100]; + char buf[0x200]; size_t len = sprintf_s(buf, sizeof(buf), "exp_PV%03d", pv_id); exp_file = std::string(buf, len); @@ -1871,6 +1882,8 @@ void x_pv_game_data::reset() { obj_db.object_set.shrink_to_fit(); tex_db.texture.clear(); tex_db.texture.shrink_to_fit(); + + sound_work_release_stream(0); } void x_pv_game_data::stop() { @@ -2007,11 +2020,11 @@ void x_pv_game_stage_data::load(int32_t stage_id, FrameRateControl* frame_rate_c this->frame_rate_control = frame_rate_control; - char buf[0x100]; + char buf[0x200]; sprintf_s(buf, sizeof(buf), "pv_stgpv%03d.stg", stage_id); file_handler.read_file(&data_list[DATA_X], "root+/stage/", buf); - task_stage_modern_load("X_PV_STAGE"); + task_stage_modern_load_task("X_PV_STAGE"); size_t len = sprintf_s(buf, sizeof(buf), "STGPV%03d.stg", stage_id); obj_hash.push_back(hash_murmurhash(buf, len)); @@ -2045,7 +2058,8 @@ void x_pv_game_stage_data::load_objects(object_database* obj_db, texture_databas data_struct* x_data = &data_list[DATA_X]; task_stage_modern_set_data(x_data, obj_db, tex_db, &stg_db); - task_stage_modern_set_stage_hashes(&obj_hash, &stage_data); + task_stage_modern_set_stage_hashes(obj_hash, stage_data); + task_effect_parent_set_data(x_data, obj_db, tex_db, &stg_db); for (uint32_t& i : objhrc_hash) object_storage_load_set_hash(x_data, i); @@ -2096,24 +2110,20 @@ void x_pv_game_stage_data::set_stage(uint32_t hash) { task_stage_modern_set_stage(&stage_info); if (task_stage_modern_has_stage_info(&stage_info)) - task_stage_modern_set_stage_display(&stage_info, !!(flags & 0x04)); + task_stage_modern_set_stage_display(&stage_info, !!(flags & 0x04), true); else - task_stage_modern_current_set_stage_display(false); + task_stage_modern_current_set_stage_display(false, true); } void x_pv_game_stage_data::unload() { for (uint32_t& i : objhrc_hash) object_storage_unload_set(i); - task_stage_modern_unload(); + task_stage_modern_unload_task(); flags &= ~0x02; state = 0; file_handler.free_data(); - stg_db.stage_data.clear(); - stg_db.stage_data.shrink_to_fit(); - stg_db.stage_modern.clear(); - stg_db.stage_modern.shrink_to_fit(); frame_rate_control = 0; obj_hash.clear(); obj_hash.shrink_to_fit(); @@ -2123,6 +2133,13 @@ void x_pv_game_stage_data::unload() { objhrc_hash.shrink_to_fit(); } +void x_pv_game_stage_data::unload_stage_database() { + stg_db.stage_data.clear(); + stg_db.stage_data.shrink_to_fit(); + stg_db.stage_modern.clear(); + stg_db.stage_modern.shrink_to_fit(); +} + x_pv_game_stage::x_pv_game_stage() : flags(), stage_id(), field_8(), state(), stage_resource(), curr_stage_effect(), next_stage_effect(), stage_effect_transition_state() { reset(); @@ -2183,7 +2200,7 @@ void x_pv_game_stage::ctrl(float_t delta_time) { } if (has_auth_3d) { - char buf[0x100]; + char buf[0x200]; size_t len = sprintf_s(buf, sizeof(buf), "EFFSTGPV%03d", stage_id); stage_auth_3d.push_back(std::string(buf, len)); } @@ -2251,7 +2268,8 @@ void x_pv_game_stage::ctrl(float_t delta_time) { auto elem = auth_3d_ids.find(stg_eff_auth_3d.name.hash_murmurhash); if (elem == auth_3d_ids.end()) { - int32_t id = auth_3d_data_load_hash(stg_eff_auth_3d.name.hash_murmurhash, x_data, &obj_db, &tex_db); + int32_t id = auth_3d_data_load_hash(stg_eff_auth_3d + .name.hash_murmurhash, x_data, &obj_db, &tex_db); if (!auth_3d_data_check_id_not_empty(&id)) { eff_auth_3d.id = -1; continue; @@ -2286,7 +2304,7 @@ void x_pv_game_stage::ctrl(float_t delta_time) { x_pv_game_stage_effect_glitter& eff_glt = eff.glitter[i]; eff_glt.reset(); - eff_glt.name = stg_eff_glt.name; + eff_glt.name.assign(stg_eff_glt.name); eff_glt.fade_time = (float_t)stg_eff_glt.fade_time; eff_glt.force_disp = !!(stg_eff_glt.flags & PVSR_GLITTER_FORCE_DISP); } @@ -2333,7 +2351,10 @@ void x_pv_game_stage::ctrl(float_t delta_time) { ctrl_inner(); break; case 30: - state = 0; + if (!task_stage_modern_check_task_ready()) { + stage_data.unload_stage_database(); + state = 0; + } break; } @@ -2480,7 +2501,7 @@ void x_pv_game_stage::load(int32_t stage_id, FrameRateControl* frame_rate_contro stage_data.load(stage_id, frame_rate_control); - char buf[0x100]; + char buf[0x200]; sprintf_s(buf, sizeof(buf), "stgpv%03d_param.pvsr", stage_id); stage_resource_file_handler.read_file(&data_list[DATA_X], "root+/pv_stage_rsrc/", buf); state = 10; @@ -2526,7 +2547,8 @@ void x_pv_game_stage::load_change_effect(int32_t curr_stage_effect, int32_t next auto elem = auth_3d_ids.find(stg_chg_eff_auth_3d.name.hash_murmurhash); if (elem == auth_3d_ids.end()) { - int32_t id = auth_3d_data_load_hash(stg_chg_eff_auth_3d.name.hash_murmurhash, x_data, &obj_db, &tex_db); + int32_t id = auth_3d_data_load_hash(stg_chg_eff_auth_3d + .name.hash_murmurhash, x_data, &obj_db, &tex_db); if (!auth_3d_data_check_id_not_empty(&id)) { chg_eff_auth_3d.id = -1; continue; @@ -2554,7 +2576,7 @@ void x_pv_game_stage::load_change_effect(int32_t curr_stage_effect, int32_t next x_pv_game_stage_effect_glitter& chg_eff_glt = chg_eff.glitter[i]; chg_eff_glt.reset(); - chg_eff_glt.name = stg_chg_eff_glt.name; + chg_eff_glt.name.assign(stg_chg_eff_glt.name); chg_eff_glt.force_disp = !!(stg_chg_eff_glt.flags & PVSR_GLITTER_FORCE_DISP); } } @@ -2906,6 +2928,9 @@ void x_pv_game_stage::unload() { delete stage_resource; stage_resource = 0; + + stage_data.unload(); + stage_id = 0; state = 30; @@ -2913,7 +2938,7 @@ void x_pv_game_stage::unload() { x_pv_game::x_pv_game() : state(), pv_count(), pv_index(), state_old(), frame(), frame_float(), time(), rob_chara_ids(), play(), success(), chara_id(), pv_end(), playdata(), scene_rot_y(), -branch_mode(), pause(), step_frame(), pv_id(), stage_id(), charas(), modules() { +branch_mode(), task_effect_init(), pause(), step_frame(), pv_id(), stage_id(), charas(), modules() { light_auth_3d_id = -1; target_anim_fps = 60.0f; anim_frame_speed = 1.0f; @@ -2981,7 +3006,7 @@ bool x_pv_game::Ctrl() { pv_data[pv_index].pv_id = pv_id; - char buf[0x100]; + char buf[0x200]; for (int32_t i = 0; i < pv_count; i++) { x_pv_game_data& pv_data = this->pv_data[i]; @@ -3066,7 +3091,8 @@ bool x_pv_game::Ctrl() { auth_3d_database* auth_3d_db = &aft_data->data_ft.auth_3d_db; char buf[0x200]; - sprintf_s(buf, sizeof(buf), "STGPV%03d_EFF_LT_000", pv_data[pv_index].pv_id); + sprintf_s(buf, sizeof(buf), "STGPV%03d_EFF_LT_000", + pv_data[pv_index].pv_id == 832 ? 800 : pv_data[pv_index].pv_id); uint32_t light_auth_3d_hash = hash_utf8_murmurhash(buf); for (auth_3d_database_uid& i : auth_3d_db->uid) if (hash_string_murmurhash(i.name) == light_auth_3d_hash) { @@ -3254,9 +3280,9 @@ bool x_pv_game::Ctrl() { state[chara_id].set_motion_data_offset = i.data_offset; //set_motion.push_back({ time, i.data_offset }); } break; - /*case DSC_X_SET_PLAYDATA: { - set_playdata.push_back({ time, i.data_offset }); - } break;*/ + /*case DSC_X_SET_PLAYDATA: { + set_playdata.push_back({ time, i.data_offset }); + } break;*/ } } @@ -3414,6 +3440,54 @@ bool x_pv_game::Ctrl() { if (wait_load) break; + state_old = 18; + } break; + case 18: { + std::set object_hrc; + std::set material_list; + for (int32_t i = 0; i < X_PV_GAME_STAGE_EFFECT_COUNT; i++) { + x_pv_game_stage_effect& eff = stage_data.effect[i]; + for (x_pv_game_stage_effect_auth_3d& j : eff.auth_3d) { + if (!auth_3d_data_check_id_not_empty(&j.id) + || !auth_3d_data_check_id_loaded(&j.id)) + continue; + + auth_3d* auth = auth_3d_data_get_auth_3d(j.id); + if (!auth || !auth->material_list.size() || !auth->object_hrc.size()) + continue; + + for (auth_3d_material_list& k : auth->material_list) + if (k.flags & (AUTH_3D_MATERIAL_LIST_BLEND_COLOR | AUTH_3D_MATERIAL_LIST_INCANDESCENCE)) + material_list.insert(k.name); + + for (auth_3d_object_hrc& k : auth->object_hrc) + object_hrc.insert(k.object_info); + } + } + + for (int32_t i = 0; i < X_PV_GAME_STAGE_EFFECT_COUNT; i++) + for (int32_t j = 0; j < X_PV_GAME_STAGE_EFFECT_COUNT; j++) { + x_pv_game_stage_change_effect& chg_eff = stage_data.change_effect[i][j]; + for (x_pv_game_stage_effect_auth_3d& k : chg_eff.auth_3d) { + if (!auth_3d_data_check_id_not_empty(&k.id) + || !auth_3d_data_check_id_loaded(&k.id)) + continue; + + auth_3d* auth = auth_3d_data_get_auth_3d(k.id); + if (!auth || !auth->material_list.size() || !auth->object_hrc.size()) + continue; + + for (auth_3d_material_list& l : auth->material_list) + if (l.flags & (AUTH_3D_MATERIAL_LIST_BLEND_COLOR | AUTH_3D_MATERIAL_LIST_INCANDESCENCE)) + material_list.insert(l.name); + + for (auth_3d_object_hrc& l : auth->object_hrc) + object_hrc.insert(l.object_info); + } + } + + if (material_list.size()) + x_pv_game_split_auth_3d_hrc_material_list(this, object_hrc, material_list); state_old = 19; } break; case 19: { @@ -3443,8 +3517,8 @@ bool x_pv_game::Ctrl() { #if BAKE_VIDEO char buf[0x400]; - sprintf_s(buf, sizeof(buf), "ffmpeg -y -f rawvideo -pix_fmt rgb24 -s %dx%d" - " -r 60 -i - -c:v h264_nvenc -profile:v high -qp 22 -i_qfactor 1.00 -b_qfactor 1.00" + sprintf_s(buf, sizeof(buf), "ffmpeg -y -f rawvideo -pix_fmt rgb24 -s %dx%d -r 60" + " -i - -c:v h264_nvenc -gpu 0 -profile:v high -qp 22 -i_qfactor 1.00 -b_qfactor 1.00" " -bf 4 -me_range 24 -color_range 2 -colorspace bt709 -pix_fmt yuv420p" " H:\\C\\Videos\\ReDIVA_pv%03d.264", 3840, 2160, pv_data[pv_index].pv_id); pipe = _popen(buf, "wb"); @@ -3465,6 +3539,8 @@ bool x_pv_game::Ctrl() { && x_pv_game_dsc_process(this, time)) pv_data[pv_index].dsc_data.dsc_data_ptr++; + sound_work_stream_set_pause(0, pause); + //x_pv_game_map_auth_3d_to_mot(this, delta_frame != 0.0f && frame > 0); #if BAKE_PNG || BAKE_VIDEO img_write = true; @@ -3544,6 +3620,8 @@ bool x_pv_game::Ctrl() { rot_z.type = A3DA_KEY_NONE; a.write(buf); + + dof_cam_data.reset(); } #endif @@ -3569,7 +3647,7 @@ bool x_pv_game::Dest() { light_param_data_storage_data_reset(); rctx_ptr->post_process.tone_map->set_saturate_coeff(1.0f); - rctx_ptr->post_process.tone_map->set_scene_fade(vec4_null); + rctx_ptr->post_process.tone_map->set_scene_fade(0.0f); rctx_ptr->post_process.tone_map->set_scene_fade_blend_func(0); rctx_ptr->post_process.dof->data.pv.enable = false; rctx_ptr->object_data.object_culling = true; @@ -3898,6 +3976,7 @@ void x_pv_game::Load(int32_t pv_id, int32_t stage_id, ::chara_index charas[6], i scene_rot_y = 0.0f; scene_rot_mat = mat4_identity; branch_mode = 0; + task_effect_init = false; pause = false; step_frame = false; @@ -4054,7 +4133,7 @@ bool mot_write_motion(void* data, const char* path, const char* file, uint32_t h } for (auto& i : xpvgm->effchrpv_auth_3d_rob_mot_ids) { - char buf[0x100]; + char buf[0x200]; sprintf_s(buf, sizeof(buf), "PV826_OST_P%d_00", i.first + 1); int32_t motion_id = aft_mot_db->get_motion_id(buf); @@ -4338,6 +4417,7 @@ bool x_pv_game::Unload() { scene_rot_y = 0.0f; scene_rot_mat = mat4_identity; branch_mode = 0; + task_effect_init = false; pv_id = 0; stage_id = 0; @@ -4463,15 +4543,6 @@ XPVGameSelector::~XPVGameSelector() { } bool XPVGameSelector::Init() { - pv_id = 0; - stage_id = 0; - - for (chara_index& i : charas) - i = CHARA_MIKU; - - for (int32_t& i : modules) - i = 0; - start = false; exit = false; return true; @@ -4561,12 +4632,12 @@ void XPVGameSelector::Window() { ImFont* font = ImGui::GetFont(); extern int32_t height; + extern int32_t width; float_t w = 400.0f; float_t h = (float_t)height; h = min_def(h, 432.0f); - extern int32_t width; ImGui::SetNextWindowPos({ (float_t)width - w, 0.0f }, ImGuiCond_Always); ImGui::SetNextWindowSize({ w, h }, ImGuiCond_Always); @@ -4596,7 +4667,7 @@ void XPVGameSelector::Window() { ImGui::ColumnComboBox("Stage", stage_names, 32, &stage_id, 0, false, &window_focus); stage_id++; - char buf[0x100]; + char buf[0x200]; char buf1[0x100]; for (int32_t i = 0; i < ROB_CHARA_COUNT; i++) { chara_index chara_old = charas[i]; @@ -4664,6 +4735,9 @@ extern bool x_pv_game_free() { return false; } + if (app::TaskWork::HasTask(x_pv_game_ptr)) + return false; + delete x_pv_game_ptr; x_pv_game_ptr = 0; } @@ -4679,6 +4753,19 @@ dof_cam::dof_cam() { dof_cam::~dof_cam() { } + +void dof_cam::reset() { + position_x.clear(); + position_y.clear(); + position_z.clear(); + focus.clear(); + focus_range.clear(); + fuzzing_range.clear(); + ratio.clear(); + enable_frame.clear(); + frame = -999999; + enable = false; +} #endif static float_t dsc_time_to_frame(int64_t time) { @@ -4723,25 +4810,13 @@ static void x_pv_game_chara_item_alpha_callback(void* data, int32_t chara_id, in } } -static void sub_140122B60(x_pv_game* a1, int32_t chara_id, int32_t motion_index, int64_t disp_time) { - if (chara_id < 0 || chara_id > ROB_CHARA_COUNT || motion_index < 0) - return; - - x_pv_play_data* playdata = &a1->playdata[chara_id]; - int64_t dsc_time = a1->pv_data[a1->pv_index].dsc_data.time; - for (x_dsc_set_motion& i : playdata->motion_data.set_motion) { - int64_t time = (int64_t)i.time * 10000; - if (time > dsc_time && i.motion_index == motion_index - && (!a1->branch_mode || a1->branch_mode == i.pv_branch_mode)) { - rob_chara_bone_data* rob_bone_data = playdata->rob_chr->bone_data; - rob_bone_data->motion_loaded.front()->mot_play_data.frame_data.field_14 = - roundf(dsc_time_to_frame(time - disp_time)) - 1.0f; - break; - } - } -} - static void x_pv_game_change_field(x_pv_game* xpvgm, int32_t field, int64_t dsc_time, int64_t curr_time) { + if (!xpvgm->task_effect_init && (dsc_time > -1 || curr_time > -1)) { + rand_state_array_4_set_seed_1393939(); + task_effect_parent_reset(); + xpvgm->task_effect_init = true; + } + light_param_data_storage_data_set_pv_cut(field); } @@ -4836,14 +4911,14 @@ static bool x_pv_game_dsc_process(x_pv_game* a1, int64_t curr_time) { //pv_game::set_data_itmpv_visibility(a1->pv_game, a1->chara_id, true); for (x_pv_play_data_set_motion& i : playdata->set_motion) { bool v45 = rob_chr->set_motion_id(i.motion_id, i.frame, - i.duration, i.field_10, 0, i.blend_type, aft_bone_data, aft_mot_db); + i.blend_duration, i.field_10, false, i.blend_type, aft_bone_data, aft_mot_db); rob_chr->set_motion_reset_data(i.motion_id, i.dsc_frame); rob_chr->bone_data->disable_eye_motion = i.disable_eye_motion; rob_chr->data.motion.step_data.step = i.frame_speed; if (v45) pv_expression_array_set_motion(pv_data.exp_file.hash_murmurhash, a1->chara_id, i.motion_id); //if (!a1->pv_game->data.pv->disable_calc_motfrm_limit) - sub_140122B60(a1, a1->chara_id, i.motion_index, i.dsc_time); + pv_game_dsc_data_set_motion_max_frame(a1, a1->chara_id, i.motion_index, i.dsc_time); } playdata->set_motion.clear(); } @@ -4871,17 +4946,17 @@ static bool x_pv_game_dsc_process(x_pv_game* a1, int64_t curr_time) { break; int32_t motion_index = (int32_t)data[1]; - int32_t duration_int = (int32_t)data[2]; + int32_t blend_duration_int = (int32_t)data[2]; int32_t frame_speed_int = (int32_t)data[3]; - float_t duration; - if (duration_int != -1){ - duration = (float_t)duration_int * 0.001f * 60.0f; - if (duration < 0.0f) - duration = 0.0f; + float_t blend_duration; + if (blend_duration_int != -1){ + blend_duration = (float_t)blend_duration_int * 0.001f * 60.0f; + if (blend_duration < 0.0f) + blend_duration = 0.0f; } else - duration = 0.0f; + blend_duration = 0.0f; float_t frame_speed; if (frame_speed_int != -1) { @@ -4950,7 +5025,7 @@ static bool x_pv_game_dsc_process(x_pv_game* a1, int64_t curr_time) { int32_t motion_id = vector_pv_db_pv_motion_get_element_by_index_or_null(&v64->motion[a1->chara_id], v52)->id; if (pv_game_data_get()->data.pv) { pv_db_pv_motion* v76 = vector_pv_db_pv_motion_get_element_by_index_or_null(&v64->motion[a1->chara_id], v52); - motion_id = sub_1404EFA20(pv_game_data_get()->data.pv, rob_chr->chara_id, rob_chr->chara_index, v76); + motion_id = pv_game_data_get()->data.pv->get_chrmot_motion_id(rob_chr->chara_id, rob_chr->chara_index, v76); }*/ if (motion_index) { @@ -4963,15 +5038,16 @@ static bool x_pv_game_dsc_process(x_pv_game* a1, int64_t curr_time) { motion_id = rob_chr->get_rob_cmn_mottbl_motion_id(0); } - duration /= a1->anim_frame_speed; if (v11) - duration = 0.0f; + blend_duration = 0.0f; + else + blend_duration /= a1->anim_frame_speed; x_pv_play_data_set_motion set_motion; set_motion.frame_speed = frame_speed * a1->anim_frame_speed; set_motion.motion_id = motion_id; set_motion.frame = frame; - set_motion.duration = duration; + set_motion.blend_duration = blend_duration; set_motion.field_10 = v11; set_motion.blend_type = MOTION_BLEND_CROSS; set_motion.disable_eye_motion = true; @@ -4982,7 +5058,7 @@ static bool x_pv_game_dsc_process(x_pv_game* a1, int64_t curr_time) { //a1->field_2C560[a1->chara_id] = true; //a1->field_2C568[a1->chara_id] = set_motion; if (playdata->disp) { - bool v84 = rob_chr->set_motion_id(motion_id, frame, duration, + bool v84 = rob_chr->set_motion_id(motion_id, frame, blend_duration, v11, false, MOTION_BLEND_CROSS, aft_bone_data, aft_mot_db); rob_chr->set_motion_reset_data(motion_id, dsc_frame); rob_chr->set_motion_skin_param(motion_id, dsc_frame); @@ -4991,7 +5067,7 @@ static bool x_pv_game_dsc_process(x_pv_game* a1, int64_t curr_time) { if (v84) pv_expression_array_set_motion(pv_data.exp_file.hash_murmurhash, a1->chara_id, motion_id); //if (!a1->pv_game->data.pv->disable_calc_motfrm_limit) - sub_140122B60(a1, a1->chara_id, motion_index, v56 ? v56->time : 0); + pv_game_dsc_data_set_motion_max_frame(a1, a1->chara_id, motion_index, v56 ? v56->time : 0); } else { playdata->set_motion.clear(); @@ -5068,25 +5144,25 @@ static bool x_pv_game_dsc_process(x_pv_game* a1, int64_t curr_time) { x_pv_play_data* playdata = &a1->playdata[a1->chara_id]; int32_t v115 = (int32_t)data[1]; - int32_t duration_int = (int32_t)data[2]; + int32_t blend_duration_int = (int32_t)data[2]; - float_t duration; - if (duration_int != -1) - duration = (float_t)duration_int * 0.001f * 60.0f; + float_t blend_duration; + if (blend_duration_int != -1) + blend_duration = (float_t)blend_duration_int * 0.001f * 60.0f; else - duration = 6.0f; + blend_duration = 6.0f; rob_chara* rob_chr = playdata->rob_chr; if (!rob_chr) break; - duration /= a1->anim_frame_speed; + blend_duration /= a1->anim_frame_speed; - float_t offset = 0.0f; + float_t blend_offset = 0.0f; //if (a1->pv_game->data.pv->is_old_pv) - // offset = 1.0f; + // blend_offset = 1.0f; - rob_chr->set_eyelid_mottbl_motion_from_face(v115, duration, -1.0f, offset, aft_mot_db); + rob_chr->set_eyelid_mottbl_motion_from_face(v115, blend_duration, -1.0f, blend_offset, aft_mot_db); } break; case DSC_X_MOUTH_ANIM: { data_struct* aft_data = &data_list[DATA_AFT]; @@ -5096,17 +5172,17 @@ static bool x_pv_game_dsc_process(x_pv_game* a1, int64_t curr_time) { x_pv_play_data* playdata = &a1->playdata[a1->chara_id]; int32_t mouth_anim_id = (int32_t)data[2]; - int32_t duration_int = (int32_t)data[3]; + int32_t blend_duration_int = (int32_t)data[3]; int32_t value_int = (int32_t)data[4]; - float_t duration; - if (duration_int != -1) { - duration = (float_t)duration_int * 0.001f * 60.0f; - if (duration < 0.0f) - duration = 0.0f; + float_t blend_duration; + if (blend_duration_int != -1) { + blend_duration = (float_t)blend_duration_int * 0.001f * 60.0f; + if (blend_duration < 0.0f) + blend_duration = 0.0f; } else - duration = 6.0f; + blend_duration = 6.0f; float_t value; if (value_int != -1) { @@ -5150,21 +5226,20 @@ static bool x_pv_game_dsc_process(x_pv_game* a1, int64_t curr_time) { case 29: mouth_anim_id = 40; break; case 30: mouth_anim_id = 41; break; case 31: mouth_anim_id = 42; break; - default: printf(""); break; } int32_t mottbl_index = mouth_anim_id_to_mottbl_index(mouth_anim_id); - duration /= a1->anim_frame_speed; + blend_duration /= a1->anim_frame_speed; //if (a1->pv_game->data.field_2D090 && mottbl_index != 144) // value = 0.0f; - float_t offset = 0.0f; + float_t blend_offset = 0.0f; //if (a1->pv_game->data.pv->is_old_pv) - // offset = 1.0f; + // blend_offset = 1.0f; rob_chr->set_mouth_mottbl_motion(0, mottbl_index, value, - 0, duration, 0.0f, 1.0f, -1, offset, aft_mot_db); + 0, blend_duration, 0.0f, 1.0f, -1, blend_offset, aft_mot_db); } break; case DSC_X_HAND_ANIM: { data_struct* aft_data = &data_list[DATA_AFT]; @@ -5175,17 +5250,17 @@ static bool x_pv_game_dsc_process(x_pv_game* a1, int64_t curr_time) { int32_t hand_index = (int32_t)data[1]; int32_t hand_anim_id = (int32_t)data[2]; - int32_t duration_int = (int32_t)data[3]; + int32_t blend_duration_int = (int32_t)data[3]; int32_t value_int = (int32_t)data[4]; - float_t duration; - if (duration_int != -1) { - duration = (float_t)duration_int * 0.001f * 60.0f; - if (duration < 0.0f) - duration = 0.0f; + float_t blend_duration; + if (blend_duration_int != -1) { + blend_duration = (float_t)blend_duration_int * 0.001f * 60.0f; + if (blend_duration < 0.0f) + blend_duration = 0.0f; } else - duration = 0.0f; + blend_duration = 0.0f; float_t value; if (value_int != -1) { @@ -5201,20 +5276,20 @@ static bool x_pv_game_dsc_process(x_pv_game* a1, int64_t curr_time) { break; int32_t mottbl_index = hand_anim_id_to_mottbl_index(hand_anim_id); - duration /= a1->anim_frame_speed; + blend_duration /= a1->anim_frame_speed; - float_t offset = 0.0f; + float_t blend_offset = 0.0f; //if (a1->pv_game->data.pv->is_old_pv) - // offset = 1.0f; + // blend_offset = 1.0f; switch (hand_index) { case 0: rob_chr->set_hand_l_mottbl_motion(0, mottbl_index, value, - 0, duration, 0.0f, 1.0f, -1, offset, aft_mot_db); + 0, blend_duration, 0.0f, 1.0f, -1, blend_offset, aft_mot_db); break; case 1: rob_chr->set_hand_r_mottbl_motion(0, mottbl_index, value, - 0, duration, 0.0f, 1.0f, -1, offset, aft_mot_db); + 0, blend_duration, 0.0f, 1.0f, -1, blend_offset, aft_mot_db); break; } } break; @@ -5226,17 +5301,17 @@ static bool x_pv_game_dsc_process(x_pv_game* a1, int64_t curr_time) { x_pv_play_data* playdata = &a1->playdata[a1->chara_id]; int32_t look_anim_id = (int32_t)data[1]; - int32_t duration_int = (int32_t)data[2]; + int32_t blend_duration_int = (int32_t)data[2]; int32_t value_int = (int32_t)data[3]; - float_t duration; - if (duration_int != -1) { - duration = (float_t)duration_int * 0.001f * 60.0f; - if (duration < 0.0f) - duration = 0.0f; + float_t blend_duration; + if (blend_duration_int != -1) { + blend_duration = (float_t)blend_duration_int * 0.001f * 60.0f; + if (blend_duration < 0.0f) + blend_duration = 0.0f; } else - duration = 6.0f; + blend_duration = 6.0f; float_t value; if (value_int != -1) { @@ -5252,14 +5327,14 @@ static bool x_pv_game_dsc_process(x_pv_game* a1, int64_t curr_time) { break; int32_t mottbl_index = look_anim_id_to_mottbl_index(look_anim_id); - duration /= a1->anim_frame_speed; + blend_duration /= a1->anim_frame_speed; - float_t offset = 0.0f; + float_t blend_offset = 0.0f; //if (a1->pv_game->data.pv->is_old_pv) - // offset = 1.0f; + // blend_offset = 1.0f; rob_chr->set_eyes_mottbl_motion(0, mottbl_index, value, - mottbl_index == 224 ? 1 : 0, duration, 0.0f, 1.0f, -1, offset, aft_mot_db); + mottbl_index == 224 ? 1 : 0, blend_duration, 0.0f, 1.0f, -1, blend_offset, aft_mot_db); return 1; } break; case DSC_X_EXPRESSION: { @@ -5270,17 +5345,17 @@ static bool x_pv_game_dsc_process(x_pv_game* a1, int64_t curr_time) { x_pv_play_data* playdata = &a1->playdata[a1->chara_id]; int32_t expression_id = (int32_t)data[1]; - int32_t duration_int = (int32_t)data[2]; + int32_t blend_duration_int = (int32_t)data[2]; int32_t value_int = (int32_t)data[3]; - float_t duration; - if (duration_int != -1) { - duration = (float_t)duration_int * 0.001f * 60.0f; - if (duration < 0.0f) - duration = 0.0f; + float_t blend_duration; + if (blend_duration_int != -1) { + blend_duration = (float_t)blend_duration_int * 0.001f * 60.0f; + if (blend_duration < 0.0f) + blend_duration = 0.0f; } else - duration = 0.0f; + blend_duration = 0.0f; float_t value; if (value_int != -1) { @@ -5296,18 +5371,18 @@ static bool x_pv_game_dsc_process(x_pv_game* a1, int64_t curr_time) { break; int32_t mottbl_index = expression_id_to_mottbl_index(expression_id); - duration /= a1->anim_frame_speed; + blend_duration /= a1->anim_frame_speed; bool v168 = true; //if (a1->has_perf_id && (a1->pv_game->data.pv->edit - 1) <= 1) // v168 = false; - float_t offset = 0.0f; + float_t blend_offset = 0.0f; //if (a1->pv_game->data.pv->is_old_pv) - // offset = 1.0f; + // blend_offset = 1.0f; rob_chr->set_face_mottbl_motion(0, mottbl_index, value, mottbl_index >= 214 - && mottbl_index <= 223 ? 1 : 0, duration, 0.0f, 1.0f, -1, offset, v168, aft_mot_db); + && mottbl_index <= 223 ? 1 : 0, blend_duration, 0.0f, 1.0f, -1, blend_offset, v168, aft_mot_db); } break; case DSC_X_LOOK_CAMERA: { @@ -5317,7 +5392,10 @@ static bool x_pv_game_dsc_process(x_pv_game* a1, int64_t curr_time) { } break; case DSC_X_MUSIC_PLAY: { - + char buf[0x200]; + sprintf_s(buf, sizeof(buf), "rom/sound/song/pv_%03d.ogg", + a1->pv_data[a1->pv_index].pv_id == 832 ? 800 : a1->pv_data[a1->pv_index].pv_id); + sound_work_play_stream(0, buf, true); } break; case DSC_X_MODE_SELECT: { @@ -5339,9 +5417,9 @@ static bool x_pv_game_dsc_process(x_pv_game* a1, int64_t curr_time) { int32_t expression_id = (int32_t)data[0]; - float_t duration = 0.0f; + float_t blend_duration = 0.0f; //if (func == DSC_EDIT_EXPRESSION) - // duration = (float_t)(int32_t)data[1] * 0.001f * 60.0f; + // blend_duration = (float_t)(int32_t)data[1] * 0.001f * 60.0f; int32_t v234 = -1; //if (!a1->has_perf_id) @@ -5352,18 +5430,18 @@ static bool x_pv_game_dsc_process(x_pv_game* a1, int64_t curr_time) { break; int32_t mottbl_index = expression_id_to_mottbl_index(expression_id); - duration /= a1->anim_frame_speed; + blend_duration /= a1->anim_frame_speed; bool v237 = true; //if (a1->has_perf_id) // v237 = (a1->pv_game->data.pv->edit - 1) > 1; - float_t offset = 0.0f; + float_t blend_offset = 0.0f; //if (a1->pv_game->data.pv->is_old_pv) - // offset = 1.0f; + // blend_offset = 1.0f; rob_chr->set_face_mottbl_motion(0, mottbl_index, 1.0f, mottbl_index >= 214 - && mottbl_index <= 223 ? 1 : 0, duration, 0.0f, 1.0f, -1, offset, v237, aft_mot_db); + && mottbl_index <= 223 ? 1 : 0, blend_duration, 0.0f, 1.0f, -1, blend_offset, v237, aft_mot_db); /*if (!a1->has_perf_id) { int32_t mottbl_index = mouth_anim_id_to_mottbl_index(v234); @@ -5400,27 +5478,27 @@ static bool x_pv_game_dsc_process(x_pv_game* a1, int64_t curr_time) { x_pv_play_data* playdata = &a1->playdata[a1->chara_id]; int32_t mouth_anim_id = (int32_t)data[1]; - float_t duration = 0.1f; + float_t blend_duration = 0.1f; //if (func == DSC_EDIT_MOUTH_ANIM) - // duration = (float_t)(int32_t)data[2] * 0.001f; + // blend_duration = (float_t)(int32_t)data[2] * 0.001f; rob_chara* rob_chr = playdata->rob_chr; if (!rob_chr) break; int32_t mottbl_index = mouth_anim_id_to_mottbl_index(mouth_anim_id); - duration *= a1->target_anim_fps; + blend_duration *= a1->target_anim_fps; float_t value = 1.0f; //if (a1->pv_game->data.field_2D090 && mottbl_index != 144) // value = 0.0f; - float_t offset = 0.0f; + float_t blend_offset = 0.0f; //if (a1->pv_game->data.pv->is_old_pv) - // offset = 1.0f; + // blend_offset = 1.0f; rob_chr->set_mouth_mottbl_motion(0, mottbl_index, value, - 0, duration, 0.0f, 1.0f, -1, offset, aft_mot_db); + 0, blend_duration, 0.0f, 1.0f, -1, blend_offset, aft_mot_db); } break; case DSC_X_SET_CHARA: { a1->chara_id = (int32_t)data[0]; @@ -5573,7 +5651,7 @@ static bool x_pv_game_dsc_process(x_pv_game* a1, int64_t curr_time) { rob_chr->set_chara_height_adjust(height_adjust != 0); } break; case DSC_X_ITEM_ANIM: { - printf(""); + printf_debug(""); } break; case DSC_X_CHARA_POS_ADJUST: { a1->chara_id = (int32_t)data[0]; @@ -5881,9 +5959,9 @@ static bool x_pv_game_dsc_process(x_pv_game* a1, int64_t curr_time) { case DSC_X_SONG_EFFECT_ATTACH: { int32_t index = (int32_t)data[0]; int32_t chara_id = (int32_t)data[1]; - int32_t unk2 = (int32_t)data[2]; + int32_t chara_item = (int32_t)data[2]; - pv_data.effect.set_chara_id(index, chara_id, !!unk2); + pv_data.effect.set_chara_id(index, chara_id, !!chara_item); } break; case DSC_X_LIGHT_AUTH: { @@ -6116,7 +6194,7 @@ static void x_pv_game_map_auth_3d_to_mot(x_pv_game* xpvgm, bool add_keys) { vec3 data[2]; data[0] = oh->node[a2m.gblctr].model_transform.translation_value; data[0].y = oh->node[a2m.n_hara].model_transform.translation_value.y; - data[1] = vec3_null; + data[1] = 0.0f; set_bone_key_set_data(bone_data, a2m.bone_keys, a2m.sec_bone_keys, add_keys, MOTION_BONE_N_HARA_CP, key_set, data, 2); @@ -6136,7 +6214,7 @@ static void x_pv_game_map_auth_3d_to_mot(x_pv_game* xpvgm, bool add_keys) { mat4_mult_vec3(&oh->node[a2m.j_mune_wj].model_transform.mat, &data[0], &data[1]); mat4_get_translation(&oh->node[a2m.j_mune_wj].model_transform.mat, &data[0]); vec3_add(data[0], data[1], data[0]); - data[1] = vec3_null; + data[1] = 0.0f; set_bone_key_set_data(bone_data, a2m.bone_keys, a2m.sec_bone_keys, add_keys, MOTION_BONE_CL_MUNE, key_set, data, 2); @@ -6322,6 +6400,671 @@ static void x_pv_game_reset_field(x_pv_game* xpvgm) { Glitter::glt_particle_manager->FreeScenes(); } +struct x_pv_game_split_auth_3d_hrc_obj_sub_mesh { + std::vector indices; + + x_pv_game_split_auth_3d_hrc_obj_sub_mesh() { + + } + + ~x_pv_game_split_auth_3d_hrc_obj_sub_mesh() { + + } +}; + +struct x_pv_game_split_auth_3d_hrc_obj_mesh { + std::vector sub_meshes; + std::vector vertex_indices; + std::vector vertices; + + x_pv_game_split_auth_3d_hrc_obj_mesh() { + + } + + ~x_pv_game_split_auth_3d_hrc_obj_mesh() { + + } +}; + +struct x_pv_game_split_auth_3d_hrc_obj_bone { + uint32_t src_id; + std::string dst_name; + int32_t index; + std::vector meshes; + + x_pv_game_split_auth_3d_hrc_obj_bone() { + src_id = -1; + index = -1; + } + + ~x_pv_game_split_auth_3d_hrc_obj_bone() { + + } +}; + +static int x_pv_game_split_auth_3d_hrc_obj_bone_compare_func(void const* src1, void const* src2) { + x_pv_game_split_auth_3d_hrc_obj_bone* bone1 = (x_pv_game_split_auth_3d_hrc_obj_bone*)src1; + x_pv_game_split_auth_3d_hrc_obj_bone* bone2 = (x_pv_game_split_auth_3d_hrc_obj_bone*)src2; + return bone1->dst_name.compare(bone2->dst_name); +} + +static std::string x_pv_game_split_auth_3d_get_object_name( + std::string& str1, const char* str2, object_database& obj_db, bool uid_name = false) { + if (!str1.size()) + return {}; + + std::string str; + size_t str_len; + if (!str_utils_compare_length(str1.c_str(), str1.size(), "OBJHRC_", 7)) { + str_len = 0; + str.assign(str1.c_str() + 7, str1.size() - 7); + } + else if (!str_utils_compare_length(str1.c_str(), str1.size(), "gblctr", 6)) { + str.assign(str2, utf8_length(str2) - 7); + str_len = str.size(); + str.append(str1); + } + else { + str.assign(str2, utf8_length(str2) - 7); + str_len = str.size(); + str.append(str1.c_str() + 2, str1.size() - 5); + } + + size_t str_len_new = str.size(); + for (size_t i = str_len; i < str_len_new; i++) { + char c = str[i]; + if (c >= 'a' && c <= 'z') + str[i] -= 0x20; + } + + bool null = obj_db.get_object_info(str.c_str()).is_null(); + if (!uid_name) + str.insert(0, null ? "|OBJ_NULL__" : "|OBJ_"); + else if (null) + return "NULL"; + return str; +} + +static void x_pv_game_split_auth_3d_hrc_material_list(x_pv_game* xpvgm, + std::set& object_hrc, std::set& material_list) { + object_database& obj_db = xpvgm->stage_data.obj_db; + std::map> object_hrc_material_list; + for (object_info i : object_hrc) { + obj* obj = object_storage_get_obj(i); + if (!obj) + continue; + + uint32_t num_material = obj->num_material; + for (uint32_t j = 0; j < num_material; j++) { + obj_material* material = &obj->material_array[j].material; + for (std::string k : material_list) { + if (k.compare(material->name)) + continue; + + auto elem = object_hrc_material_list.find(i); + if (elem == object_hrc_material_list.end()) + elem = object_hrc_material_list.insert({ i, {} }).first; + elem->second.push_back(k); + } + } + } + + for (auto i : object_hrc_material_list) { + obj_set_handler* handler = object_storage_get_obj_set_handler(i.first.set_id); + if (!handler) + continue; + + obj_set* set = handler->obj_set; + + std::vector bones_vertices; + + uint32_t obj_num = set->obj_num; + for (uint32_t j = 0; j < obj_num; j++) { + obj* obj = &set->obj_data[j]; + if (obj->id != i.first.id) + continue; + + obj_skin* skin = obj->skin; + if (!skin) + continue; + + std::set bone_indices; + + obj_mesh* mesh = obj->mesh_array; + uint32_t num_mesh = obj->num_mesh; + for (uint32_t k = 0; k < num_mesh; k++, mesh++) { + uint32_t num_vertex = mesh->num_vertex; + obj_vertex_data* vertex = mesh->vertex_array; + for (uint32_t l = 0; l < num_vertex; l++, vertex++) { + if (vertex->bone_index.x != -1) + bone_indices.insert(vertex->bone_index.x / 3); + + if (vertex->bone_index.y != -1) + bone_indices.insert(vertex->bone_index.y / 3); + + if (vertex->bone_index.z != -1) + bone_indices.insert(vertex->bone_index.z / 3); + + if (vertex->bone_index.w != -1) + bone_indices.insert(vertex->bone_index.w / 3); + } + } + + obj_skin_bone* bone_array = skin->bone_array; + uint32_t num_bone = skin->num_bone; + + bones_vertices.resize(skin->num_bone); + for (uint32_t k = 0; k < num_bone; k++) { + std::string dst_name; + dst_name.assign(obj->name, utf8_length(obj->name) - 7); + size_t dst_name_len = dst_name.size(); + dst_name.append(bone_array[k].name + 2, utf8_length(bone_array[k].name) - 5); + size_t dst_name_len_new = dst_name.size(); + for (size_t i = dst_name_len; i < dst_name_len_new; i++) { + char c = dst_name[i]; + if (c >= 'a' && c <= 'z') + dst_name[i] -= 0x20; + } + + x_pv_game_split_auth_3d_hrc_obj_bone& bone_vertices = bones_vertices[k]; + bone_vertices.src_id = i.first.id; + bone_vertices.index = k; + bone_vertices.dst_name.assign(dst_name); + bone_vertices.meshes.resize(num_mesh); + + obj_mesh* mesh = obj->mesh_array; + for (uint32_t l = 0; l < num_mesh; l++, mesh++) { + x_pv_game_split_auth_3d_hrc_obj_mesh& bone_vertices_mesh = bone_vertices.meshes[l]; + bone_vertices_mesh.sub_meshes.resize(mesh->num_submesh); + + obj_sub_mesh* sub_mesh = mesh->submesh_array; + uint32_t num_submesh = mesh->num_submesh; + for (uint32_t m = 0; m < num_submesh; m++, sub_mesh++) { + x_pv_game_split_auth_3d_hrc_obj_sub_mesh& bone_vertices_sub_mesh + = bone_vertices_mesh.sub_meshes[m]; + } + bone_vertices_mesh.vertices.reserve(sub_mesh->num_index); + } + } + + mesh = obj->mesh_array; + for (uint32_t k = 0; k < num_mesh; k++, mesh++) { + obj_vertex_data* vertex_array = mesh->vertex_array; + uint32_t num_vertex = mesh->num_vertex; + + std::vector vtx_idx(skin->num_bone); + obj_sub_mesh* sub_mesh = mesh->submesh_array; + uint32_t num_submesh = mesh->num_submesh; + for (uint32_t l = 0; l < num_submesh; l++, sub_mesh++) { + uint16_t* bone_index_array = sub_mesh->bone_index_array; + uint32_t* index = sub_mesh->index_array; + uint32_t num_index = sub_mesh->num_index; + for (uint32_t m = 0; m < num_index; m++, index++) { + obj_vertex_data vertex = vertex_array[*index]; + int32_t bone_index = bone_index_array[vertex.bone_index.x / 3]; + x_pv_game_split_auth_3d_hrc_obj_mesh& bone_vertices_mesh + = bones_vertices[bone_index].meshes[k]; + x_pv_game_split_auth_3d_hrc_obj_sub_mesh& bone_vertices_sub_mesh + = bone_vertices_mesh.sub_meshes[l]; + + bool found = false; + uint32_t idx = *index; + for (uint32_t& n : bone_vertices_mesh.vertex_indices) + if (n == idx) { + bone_vertices_sub_mesh.indices.push_back( + (uint32_t)(&n - bone_vertices_mesh.vertex_indices.data())); + found = true; + break; + } + + if (found) + continue; + + mat4& mat = bone_array[bone_index].inv_bind_pose_mat; + vertex.bone_index = -1; + vertex.bone_weight = 0; + vec3 normal = vertex.normal; + vec3 tangent = *(vec3*)&vertex.tangent; + vec3 binormal = vec3::cross(normal, tangent) * vertex.tangent.w; + mat4_mult_vec3_trans(&mat, &vertex.position, &vertex.position); + mat4_mult_vec3(&mat, &normal, &normal); + mat4_mult_vec3(&mat, &tangent, &tangent); + mat4_mult_vec3(&mat, &binormal, &binormal); + tangent = vec3::normalize(tangent - normal * vec3::dot(normal, tangent)); + vertex.normal = normal; + *(vec3*)&vertex.tangent = tangent; + vertex.tangent.w = vec3::dot(vec3::cross(normal, tangent), binormal) < 0.0f ? -1.0f : 1.0f; + bone_vertices_mesh.vertex_indices.push_back(*index); + bone_vertices_mesh.vertices.push_back(vertex); + bone_vertices_sub_mesh.indices.push_back(vtx_idx[bone_index]++); + } + } + } + + quicksort_custom(bones_vertices.data(), bones_vertices.size(), + sizeof(x_pv_game_split_auth_3d_hrc_obj_bone), x_pv_game_split_auth_3d_hrc_obj_bone_compare_func); + } + + prj::shared_ptr& alloc = handler->alloc_handler; + + uint32_t obj_num_new = (uint32_t)(obj_num + bones_vertices.size()); + obj* obj_data_new = alloc->allocate<::obj>(obj_num_new); + memcpy(obj_data_new, set->obj_data, sizeof(obj) * obj_num); + set->obj_data = obj_data_new; + set->obj_num = obj_num_new; + obj_data_new += obj_num; + obj_num_new -= obj_num; + + for (uint32_t j = 0; j < obj_num_new; j++) { + x_pv_game_split_auth_3d_hrc_obj_bone& bone_vertices = bones_vertices[j]; + uint32_t src_id = bone_vertices.src_id; + + obj* src_obj = 0; + obj* dst_obj = &obj_data_new[j]; + for (uint32_t k = 0; k < obj_num; k++) + if (set->obj_data[k].id == src_id) { + src_obj = &set->obj_data[k]; + break; + } + + dst_obj->id = hash_murmurhash_empty; + dst_obj->hash = hash_murmurhash_empty; + + if (!src_obj) + continue; + + vec3 aabb_min_obj = vec3( 9999999.0f, 9999999.0f, 9999999.0f); + vec3 aabb_max_obj = vec3(-100000000.0f, -100000000.0f, -100000000.0f); + + obj_mesh* mesh_array = src_obj->mesh_array; + uint32_t num_mesh = src_obj->num_mesh; + obj_mesh* mesh_array_new = alloc->allocate(num_mesh); + for (uint32_t k = 0; k < num_mesh; k++) { + x_pv_game_split_auth_3d_hrc_obj_mesh& bone_vertices_mesh + = bone_vertices.meshes[k]; + + obj_mesh* src_mesh = &mesh_array[k]; + obj_mesh* dst_mesh = &mesh_array_new[k]; + + dst_mesh->flags = src_mesh->flags; + + vec3 aabb_min_mesh = vec3( 9999999.0f, 9999999.0f, 9999999.0f); + vec3 aabb_max_mesh = vec3(-100000000.0f, -100000000.0f, -100000000.0f); + + obj_sub_mesh* submesh_array = src_mesh->submesh_array; + uint32_t num_submesh = src_mesh->num_submesh; + obj_sub_mesh* submesh_array_new = alloc->allocate(num_submesh); + for (uint32_t l = 0; l < num_submesh; l++) { + x_pv_game_split_auth_3d_hrc_obj_sub_mesh& bone_vertices_sub_mesh + = bone_vertices_mesh.sub_meshes[l]; + + obj_sub_mesh* src_submesh = &submesh_array[l]; + obj_sub_mesh* dst_submesh = &submesh_array_new[l]; + + dst_submesh->flags = src_submesh->flags; + dst_submesh->material_index = src_submesh->material_index; + memcpy(dst_submesh->uv_index, src_submesh->uv_index, 0x08); + dst_submesh->bone_index_array = 0; + dst_submesh->num_bone_index = 0; + dst_submesh->bones_per_vertex = src_submesh->bones_per_vertex; + dst_submesh->primitive_type = src_submesh->primitive_type; + dst_submesh->index_format = src_submesh->index_format; + + uint32_t num_index = (uint32_t)bone_vertices_sub_mesh.indices.size(); + uint32_t* index_array_new = alloc->allocate(num_index); + memcpy(index_array_new, bone_vertices_sub_mesh.indices.data(), sizeof(uint32_t) * num_index); + dst_submesh->index_array = index_array_new; + dst_submesh->num_index = num_index; + + dst_submesh->attrib = src_submesh->attrib; + + vec3 aabb_min_submesh = vec3( 9999999.0f, 9999999.0f, 9999999.0f); + vec3 aabb_max_submesh = vec3(-100000000.0f, -100000000.0f, -100000000.0f); + + uint32_t* index = index_array_new; + obj_vertex_data* vertex_array = bone_vertices_mesh.vertices.data(); + for (uint32_t l = 0; l < num_index; l++, index++) { + vec3 pos = vertex_array[*index].position; + aabb_min_submesh = vec3::min(aabb_min_submesh, pos); + aabb_max_submesh = vec3::max(aabb_max_submesh, pos); + } + + aabb_min_mesh = vec3::min(aabb_min_mesh, aabb_min_submesh); + aabb_max_mesh = vec3::max(aabb_max_mesh, aabb_max_submesh); + + vec3 center = (aabb_max_submesh + aabb_min_submesh) * 0.5f; + vec3 size = aabb_max_submesh - center; + + dst_submesh->bounding_sphere.center = center; + dst_submesh->bounding_sphere.radius = max_def(size.x, max_def(size.y, size.z)) * (float_t)(M_SQRT2 / 2.0); + dst_submesh->axis_aligned_bounding_box.center = center; + dst_submesh->axis_aligned_bounding_box.size = size; + + + dst_submesh->first_index = 0; + dst_submesh->last_index = 0; + dst_submesh->index_offset = 0; + } + dst_mesh->submesh_array = submesh_array_new; + dst_mesh->num_submesh = num_submesh; + + aabb_min_obj = vec3::min(aabb_min_obj, aabb_min_mesh); + aabb_max_obj = vec3::max(aabb_max_obj, aabb_max_mesh); + + vec3 center = (aabb_max_mesh + aabb_min_mesh) * 0.5f; + vec3 size = aabb_max_mesh - center; + + dst_mesh->bounding_sphere.center = center; + dst_mesh->bounding_sphere.radius = max_def(size.x, max_def(size.y, size.z)) * (float_t)(M_SQRT2 / 2.0); + + dst_mesh->vertex_format = src_mesh->vertex_format; + if (src_mesh->vertex_format & OBJ_VERTEX_BONE_DATA) { + enum_and(dst_mesh->vertex_format, ~OBJ_VERTEX_BONE_DATA); + dst_mesh->size_vertex = src_mesh->size_vertex - 0x20; + } + else + dst_mesh->size_vertex = src_mesh->size_vertex; + + uint32_t num_vertex = (uint32_t)bone_vertices_mesh.vertices.size(); + obj_vertex_data* vertex_array_new = alloc->allocate(num_vertex); + memcpy(vertex_array_new, bone_vertices_mesh.vertices.data(), sizeof(obj_vertex_data) * num_vertex); + dst_mesh->vertex_array = vertex_array_new; + dst_mesh->num_vertex = num_vertex; + + dst_mesh->attrib = src_mesh->attrib; + memcpy(dst_mesh->reserved, src_mesh->reserved, sizeof(uint32_t) * 6); + memcpy(dst_mesh->name, src_mesh->name, 0x40); + } + dst_obj->mesh_array = mesh_array_new; + dst_obj->num_mesh = num_mesh; + + vec3 center = (aabb_max_obj + aabb_min_obj) * 0.5f; + vec3 size = aabb_max_obj - center; + + dst_obj->bounding_sphere.center = center; + dst_obj->bounding_sphere.radius = max_def(size.x, max_def(size.y, size.z)) * (float_t)(M_SQRT2 / 2.0); + + obj_material_data* material_array = src_obj->material_array; + uint32_t num_material = src_obj->num_material; + obj_material_data* material_array_new = alloc->allocate(num_material); + memcpy(material_array_new, material_array, sizeof(obj_material_data) * num_material); + dst_obj->material_array = material_array_new; + dst_obj->num_material = num_material; + + dst_obj->flags = src_obj->flags; + memcpy(dst_obj->reserved, src_obj->reserved, sizeof(uint32_t) * 10); + dst_obj->skin = 0; + + std::string& dst_name = bone_vertices.dst_name; + char* name = alloc->allocate(dst_name.size() + 1); + memcpy(name, dst_name.c_str(), dst_name.size()); + name[dst_name.size()] = 0; + dst_obj->name = name; + + uint32_t hash = hash_string_murmurhash(dst_name); + dst_obj->id = hash; + dst_obj->hash = hash; + + object_set_info* set_info; + if (obj_db.get_object_set_info(i.first.set_id, &set_info)) { + object_info_data* info; + if (!obj_db.get_object_info_data_by_murmurhash(hash, &info)) { + set_info->object.push_back({}); + info = &set_info->object.back(); + info->id = hash; + info->name.assign(name); + info->name_hash_fnv1a64m = hash_string_fnv1a64m(info->name); + info->name_hash_fnv1a64m_upper = hash_string_fnv1a64m(info->name, true); + info->name_hash_murmurhash = hash_string_murmurhash(info->name); + } + } + } + + handler->obj_id_data.reserve(set->obj_num); + for (uint32_t j = 0; j < obj_num_new; j++) + handler->obj_id_data.push_back({ obj_data_new[j].id, obj_num + j }); + + uint32_t _obj_num = obj_num + obj_num_new; + handler->vertex_buffer_num = _obj_num; + obj_vertex_buffer* vertex_buffer_data = new obj_vertex_buffer[_obj_num]; + handler->index_buffer_num = _obj_num; + obj_index_buffer* index_buffer_data = new obj_index_buffer[_obj_num]; + + memcpy(vertex_buffer_data, handler->vertex_buffer_data, sizeof(obj_vertex_buffer) * obj_num); + memcpy(index_buffer_data, handler->index_buffer_data, sizeof(obj_index_buffer) * obj_num); + + delete[] handler->vertex_buffer_data; + delete[] handler->index_buffer_data; + + handler->vertex_buffer_data = vertex_buffer_data; + handler->index_buffer_data = index_buffer_data; + + for (uint32_t j = 0; j < obj_num_new; j++) { + vertex_buffer_data[obj_num + j].load(obj_data_new[j]); + index_buffer_data[obj_num + j].load(obj_data_new[j]); + } + + for (uint32_t j = 0; j < obj_num; j++) { + obj* obj = &set->obj_data[j]; + if (obj->id != i.first.id) + continue; + + obj_skin* skin = obj->skin; + if (!skin) + continue; + + std::map hrc_nodes; + + obj_skin_bone* bone_array = skin->bone_array; + uint32_t num_bone = skin->num_bone; + for (std::pair k : xpvgm->stage_data.auth_3d_ids) { + auth_3d* auth = auth_3d_data_get_auth_3d(k.second); + if (!auth || !auth->object_hrc.size()) + continue; + + auth_3d_object_hrc* obj_hrc = 0; + for (auth_3d_object_hrc& n : auth->object_hrc) + if (n.object_info == i.first) { + obj_hrc = &n; + break; + } + + if (!obj_hrc) + continue; + + for (auth_3d_object_hrc*& l : auth->object_hrc_list) + if (l->object_info == i.first) { + auth->object_hrc_list.erase(auth->object_hrc_list.begin() + + (&l - auth->object_hrc_list.data())); + break; + } + + for (uint32_t l = 0; l < num_bone; l++) { + x_pv_game_split_auth_3d_hrc_obj_bone& bone_vertices = bones_vertices[l]; + const char* bone_name = bone_array[bone_vertices.index].name; + + int32_t node_index = obj_hrc->get_node_index(bone_name); + while (node_index >= 0) { + auth_3d_object_node* node = &obj_hrc->node[node_index]; + int32_t _node_index = node_index; + node_index = node->parent; + if (!node->name.compare("BONE")) + continue; + + hrc_nodes.insert({ _node_index, node->name }); + } + } + } + + for (std::pair k : xpvgm->stage_data.auth_3d_ids) { + auth_3d* auth = auth_3d_data_get_auth_3d(k.second); + if (!auth || !auth->object_hrc.size()) + continue; + + auth_3d_object_hrc* obj_hrc = 0; + for (auth_3d_object_hrc& n : auth->object_hrc) + if (n.object_info == i.first) { + obj_hrc = &n; + break; + } + + if (!obj_hrc) + continue; + + size_t object_base = (size_t)auth->object.data(); + + for (std::pair l : hrc_nodes) { + auth->object.push_back({}); + auth_3d_object& object = auth->object.back(); + object.name.assign(l.second); + } + + size_t object_new_base = (size_t)auth->object.data(); + + for (auth_3d_object*& l : auth->object_list) + l = (auth_3d_object*)((size_t)l - object_base + object_new_base); + } + + for (std::pair l : xpvgm->stage_data.auth_3d_ids) { + auth_3d* auth = auth_3d_data_get_auth_3d(l.second); + if (!auth || !auth->object_hrc.size()) + continue; + + auth_3d_object_hrc* obj_hrc = 0; + for (auth_3d_object_hrc& m : auth->object_hrc) + if (m.object_info == i.first) { + obj_hrc = &m; + break; + } + + if (!obj_hrc) + continue; + + for (std::pair m : hrc_nodes) + for (auth_3d_object& n : auth->object) { + if (n.name.compare(m.second) || m.first < 0) + continue; + + auth_3d_object_node* node = &obj_hrc->node[m.first]; + + if (!str_utils_compare_length(m.second.c_str(), m.second.size(), "OBJHRC_", 7)) + auth->object_list.push_back(&n); + + std::string name = x_pv_game_split_auth_3d_get_object_name( + m.second, obj->name, obj_db); + std::string parent_name; + std::string uid_name = x_pv_game_split_auth_3d_get_object_name( + m.second, obj->name, obj_db, true); + + auth_3d_object_node* _node = node; + int32_t parent = _node->parent; + while (parent >= 0) { + parent = _node->parent; + if (parent < 0) + break; + + _node = &obj_hrc->node[parent]; + if (!_node->name.compare("BONE")) + continue; + + std::string _parent_name = x_pv_game_split_auth_3d_get_object_name( + _node->name, obj->name, obj_db); + name.insert(0, _parent_name); + parent_name.insert(0, _parent_name); + } + + n.model_transform.translation = node->model_transform.translation; + n.model_transform.rotation = node->model_transform.rotation; + n.model_transform.scale = node->model_transform.scale; + n.model_transform.visibility = node->model_transform.visibility; + n.name.assign(name); + n.parent_name.assign(parent_name); + n.uid_name.assign(uid_name); + n.object_info = obj_db.get_object_info(n.uid_name.c_str()); + n.object_hash = hash_string_murmurhash(n.uid_name); + break; + } + } + } + } + + for (std::pair i : xpvgm->stage_data.auth_3d_ids) { + auth_3d* auth = auth_3d_data_get_auth_3d(i.second); + if (!auth || !auth->object_hrc.size()) + continue; + + for (auth_3d_object& j : auth->object) { + j.children_object.clear(); + j.children_object.shrink_to_fit(); + j.children_object_hrc.clear(); + j.children_object_hrc.shrink_to_fit(); + } + + for (auth_3d_object_hrc& j : auth->object_hrc) { + j.children_object.clear(); + j.children_object.shrink_to_fit(); + j.children_object_hrc.clear(); + j.children_object_hrc.shrink_to_fit(); + j.children_object_parent_node.clear(); + j.children_object_parent_node.shrink_to_fit(); + j.children_object_hrc_parent_node.clear(); + j.children_object_hrc_parent_node.shrink_to_fit(); + } + + for (auth_3d_object& j : auth->object) { + if (!j.parent_name.size()) + continue; + + if (j.parent_node.size()) + for (auth_3d_object_hrc& k : auth->object_hrc) { + if (j.parent_name.compare(k.name)) + continue; + + int32_t node_index = k.get_node_index(j.parent_node.c_str()); + if (node_index > -1) { + k.children_object_parent_node.push_back(node_index); + k.children_object.push_back(&j); + } + break; + } + else + for (auth_3d_object& k : auth->object) { + if (j.parent_name.compare(k.name)) + continue; + + k.children_object.push_back(&j); + break; + } + } + + for (auth_3d_object_hrc& j : auth->object_hrc) { + if (!j.parent_name.size()) + continue; + + if (j.parent_node.size()) + for (auth_3d_object_hrc& k : auth->object_hrc) { + if (j.parent_name.compare(k.name)) + continue; + + int32_t node_index = k.get_node_index(j.parent_node.c_str()); + if (node_index > -1) { + k.children_object_hrc_parent_node.push_back(node_index); + k.children_object_hrc.push_back(&j); + } + break; + } + else + for (auth_3d_object& k : auth->object) { + if (j.parent_name.compare(k.name)) + continue; + + k.children_object_hrc.push_back(&j); + break; + } + } + } +} + static void pv_game_dsc_data_find_playdata_item_anim(x_pv_game* xpvgm, int32_t chara_id) { if (chara_id < 0 || chara_id >= ROB_CHARA_COUNT) return; @@ -6501,4 +7244,22 @@ static void pv_game_dsc_data_find_set_motion(x_pv_game* xpvgm) { } } } + +static void pv_game_dsc_data_set_motion_max_frame(x_pv_game* xpvgm, + int32_t chara_id, int32_t motion_index, int64_t disp_time) { + if (chara_id < 0 || chara_id > ROB_CHARA_COUNT || motion_index < 0) + return; + + x_pv_play_data* playdata = &xpvgm->playdata[chara_id]; + int64_t dsc_time = xpvgm->pv_data[xpvgm->pv_index].dsc_data.time; + for (x_dsc_set_motion& i : playdata->motion_data.set_motion) { + int64_t time = (int64_t)i.time * 10000; + if (time > dsc_time && i.motion_index == motion_index + && (!xpvgm->branch_mode || xpvgm->branch_mode == i.pv_branch_mode)) { + playdata->rob_chr->bone_data->set_motion_max_frame( + roundf(dsc_time_to_frame(time - disp_time)) - 1.0f); + break; + } + } +} #endif diff --git a/src/ReDIVA/x_pv_game.hpp b/src/ReDIVA/x_pv_game.hpp index 21aaf431..990eefa7 100644 --- a/src/ReDIVA/x_pv_game.hpp +++ b/src/ReDIVA/x_pv_game.hpp @@ -90,7 +90,7 @@ struct x_pv_play_data_set_motion { float_t frame_speed; int32_t motion_id; float_t frame; - float_t duration; + float_t blend_duration; bool field_10; MotionBlendType blend_type; bool disable_eye_motion; @@ -287,7 +287,7 @@ struct x_pv_game_effect { void load(int32_t pv_id, pvpp* play_param, FrameRateControl* frame_rate_control); void load_data(int32_t pv_id); void reset(); - void set_chara_id(int32_t index, int32_t chara_id, bool a4); + void set_chara_id(int32_t index, int32_t chara_id, bool chara_scale); void set_song_effect(int32_t index, int64_t time); void set_song_effect_time(int32_t index, int64_t time, bool glitter); void set_song_effect_time_inner(int32_t index, int64_t time, bool glitter); @@ -465,6 +465,7 @@ struct x_pv_game_stage_data { void set_default_stage(); void set_stage(uint32_t hash); void unload(); + void unload_stage_database(); }; struct x_pv_game_stage { @@ -554,6 +555,7 @@ public: float_t scene_rot_y; mat4 scene_rot_mat; int32_t branch_mode; + bool task_effect_init; bool pause; bool step_frame;