diff --git a/data/assets/big-violet.png b/data/assets/big-violet.png new file mode 100644 index 0000000..84f5f75 --- /dev/null +++ b/data/assets/big-violet.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c7c91f67e8bd93e1abf6f40ee14a72cd0990d2e25ae30eca9c553bc1e2381af8 +size 77981 diff --git a/src/private/textures.h b/src/private/textures.h index 6f5d727..3ea2ca3 100644 --- a/src/private/textures.h +++ b/src/private/textures.h @@ -14,7 +14,6 @@ struct texture { SDL_Surface *data; /* original image data */ int atlas_index; GLuint loner_texture; /* stored directly for loners, == 0 means atlas_index should be used*/ - int8_t layer; }; diff --git a/src/rendering.h b/src/rendering.h index 99b0a4f..5f348e4 100644 --- a/src/rendering.h +++ b/src/rendering.h @@ -39,7 +39,6 @@ void push_circle(t_fvec2 position, float radius, t_color color); /* vertices are in absolute coordinates, relative to world origin */ /* texture coordinates are in pixels */ void unfurl_triangle(const char *path, - /* */ t_fvec3 v0, t_fvec3 v1, t_fvec3 v2, @@ -47,7 +46,6 @@ void unfurl_triangle(const char *path, t_shvec2 uv1, t_shvec2 uv2); -/* TODO: */ /* pushes a colored textured 3d triangle onto the render queue */ // void unfurl_colored_triangle(const char *path, // t_fvec3 v0, @@ -60,8 +58,12 @@ void unfurl_triangle(const char *path, // t_color c1, // t_color c2); -/* TODO: billboarding */ +// TODO: // http://www.lighthouse3d.com/opengl/billboarding/index.php?billCheat2 +// void unfurl_billboard(const char *path, +// t_fvec3 position, +// t_fvec2 scaling, +// t_frect uvs); /* renders the background, then the primitives in all render queues */ void render(void);