From d03d7187c1881237b1a98404a125507d33d85a0e Mon Sep 17 00:00:00 2001 From: Fox Caminiti Date: Sun, 21 Aug 2022 22:05:10 -0400 Subject: a bit of housekeeping --- main.h | 91 ++++++------------------------------------------------------------ 1 file changed, 8 insertions(+), 83 deletions(-) (limited to 'main.h') diff --git a/main.h b/main.h index 122c380..50242c3 100644 --- a/main.h +++ b/main.h @@ -8,24 +8,6 @@ enum instruction_mode { #endif }; -struct cache { - void *Address; - bool32 Cached; -}; - -enum whattocallthis { - Inactive, - Active, - Clear -}; - -struct cache_pool { - cache Frame[2048]; - cache Intermediate[3]; - whattocallthis Interact; - int16 InteractIndex; -}; - enum memory_table_list { // F = file attributes @@ -111,12 +93,6 @@ struct memory { struct property_channel; struct project_layer; -enum display_type -{ - standard, - levels -}; - enum keyframe_type { linear, @@ -166,45 +142,6 @@ enum blend_mode }; -struct gl_effect { - uint32 ShaderProgram; -}; - -struct gl_vertex_shader { - uint32 VertexArrayObject; - uint32 VertexBufferObject; -}; - -struct default_gl_vertex_object { - uint32 VertexArrayObject; - uint32 VertexBufferObject; - uint32 ElementBufferObject; -}; - -static default_gl_vertex_object DefaultVerts; -static uint32 DefaultVertexShader; -static uint32 DefaultShaderProgram; -static uint32 MaskShaderProgram; - -float DefaultVertices[] = { - 1.0f, 1.0f, 0.0f, 1.0f, 1.0f, - 1.0f, -1.0f, 0.0f, 1.0f, 0.0f, - -1.0f, -1.0f, 0.0f, 0.0f, 0.0f, - -1.0f, 1.0f, 0.0f, 0.0f, 1.0f, -}; - - -struct gl_effect_layer { - bool32 Initialized; - GLuint Texture; - GLuint FramebufferObject; - uint32 Color_Renderbuffer; - uint32 Stencil_Renderbuffer; -}; - -static gl_vertex_shader GL_Vertices; - - union val { real32 f; v4 col; @@ -285,12 +222,20 @@ struct source { // Bitmaps from files are loaded into these temporary cache blocks. +struct gl_effect_layer { + bool32 Initialized; + GLuint Texture; + GLuint FramebufferObject; + uint32 Color_Renderbuffer; + uint32 Stencil_Renderbuffer; +}; struct layer_bitmap_info { // Image and video void *BitmapBuffer; // Each layer has a persistent bitmap that the source data gets packed into. int32 FrameOffset; // The "true" position of the layer, separate from StartFrame. Starts at zero and only gets incremented when the layer is moved. bool32 ToUpdate = 1; + gl_effect_layer Test; gl_effect_layer TestM; @@ -314,26 +259,6 @@ struct comp_buffer { void *UnpackedBuffer; }; -struct effect_header -{ - char *Name; - void (*func)(source *, layer_bitmap_info *, memory *, property_channel []); - uint16 NumberOfProperties; - display_type DisplayType; - property_header PropertyHeader[MAX_PROPERTIES_PER_EFFECT]; -}; - -struct effect { - char *Name; - void (*func)(source *, layer_bitmap_info *, memory *, property_channel []); - uint16 NumberOfProperties; - display_type DisplayType; - gl_effect GL_Effect; - property_channel Property[MAX_PROPERTIES_PER_EFFECT]; - bool32 UIIsCollapsed = 0; - bool32 IsActive = 1; -}; - struct transform_info { real32 XAxisPX; real32 XAxisPY; -- cgit v1.2.3