summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'origin/assimp-normals'Dan Goodliffe2023-04-25
|\
| * Clear world objects explicitlyDan Goodliffe2023-04-25
| | | | | | | | Otherwise the fail to remove themselves from the VBO after the GL context is destroyed.
| * Set vertex normals from AssImp data if availableDan Goodliffe2023-04-25
| |
| * Don't update face/vertex normals if normals were provided, simply use them as isDan Goodliffe2023-04-25
| |
| * Allow setting a flag to say (vertex) normals have been providedDan Goodliffe2023-04-25
|/
* Remove duplicate Tree-01-1 definitionDan Goodliffe2023-04-25
|
* Merge branch 'instancing'Dan Goodliffe2023-04-22
|\
| * Keep the instance unused vector sorted and binary search itDan Goodliffe2023-04-22
| |
| * Don't fill the instances unused vector unnecessarilyDan Goodliffe2023-04-22
| |
| * Test instancing automatic unmap when count is called, add some nodiscardDan Goodliffe2023-04-22
| |
| * Streamline the instancing maintenanceDan Goodliffe2023-04-22
| |
| * Fix the instancing maintenanceDan Goodliffe2023-04-22
| |
| * Instances buffer data needs to be unmapped before useDan Goodliffe2023-04-21
| | | | | | | | | | Here we change quite a bit to support mapping and unmapping the buffer as required. The instance/free referencing is still broken though. We add several instances of tree in the render.
| * Switch to render trees in bulk through foliage asset renderingDan Goodliffe2023-04-20
| |
| * Expose bufferName and count from InstanceVerticesDan Goodliffe2023-04-20
| |
| * Support setting vertex attrib divisorDan Goodliffe2023-04-19
| |
| * Enable all vertex array attribs configured by vertexAttribFuncDan Goodliffe2023-04-19
| |
| * Persist vertexArrayId across multiple callsDan Goodliffe2023-04-19
| | | | | | | | Allows chaining together to build VAO from multiple buffers
| * Add basic instanced shader to those which get the viewProjection configuredDan Goodliffe2023-04-19
| |
| * Fix type of basic instanced shaderDan Goodliffe2023-04-19
| | | | | | | | | | It's now AbsolutePosProgram, which is kind of right, in that it takes no location data via uniform, it's all in the vertex data.
| * Export mesh size and primitive typeDan Goodliffe2023-04-19
| |
| * Fixup vertexAttribFunc for matricesDan Goodliffe2023-04-19
| |
| * Drop performance debug to warning and stop disabling error checking for ↵Dan Goodliffe2023-04-19
| | | | | | | | texture save
| * Fix location of model matrix in vertex shaderDan Goodliffe2023-04-18
| |
| * Specialize vertexAttribFunc for matrices because there's an upper limit of ↵Dan Goodliffe2023-04-18
| | | | | | | | size 4 on attrib pointers
| * Separate storing of mesh vertex/index data from configuring VAODan Goodliffe2023-04-17
| |
| * Revamp how VertexArrayObject configures attributes and dataDan Goodliffe2023-04-17
| |
| * Fix up the way spotlight shader worksDan Goodliffe2023-04-17
| | | | | | | | | | Was mostly through lack of understanding and coincidences. Position is now the only vertex data, direction is moved to a uniform. Instancing will address this by making everything instance data.
| * Assets moved to global game stateDan Goodliffe2023-04-17
| |
| * Create a large test forestDan Goodliffe2023-04-17
| |
| * First cut of instance vertices and proxyDan Goodliffe2023-04-17
| | | | | | | | | | Untested outside unit test, allows the use of a glBuffer as a storage container. To be combined with a vertex array and/or mesh etc for massing drawing with glDrawElementsInstanced
| * Add the dynamicPoint shader for instancingDan Goodliffe2023-04-15
|/ | | | Same as dynamicPoint, but the model matrix is a vertex input
* Rename lots of shader filesDan Goodliffe2023-04-15
| | | | Names and paths still not perfect, but better and the weird name missuse is gone
* Merge branch 'assimp'Dan Goodliffe2023-04-14
|\
| * Add an asset template and use it to define all the foliage assets in the ↵Dan Goodliffe2023-04-14
| | | | | | | | plants pack
| * Remove the old .obj load, assets and supporting stuffDan Goodliffe2023-04-14
| |
| * Load all assets in red dir with asset factoryDan Goodliffe2023-04-14
| |
| * Use asset factory models in test-renderDan Goodliffe2023-04-14
| |
| * Handle different mapmodes in basic shaderDan Goodliffe2023-04-14
| |
| * Write applicable Texture Options into texture atlas texture dataDan Goodliffe2023-04-14
| |
| * Pass texture fragment mapmode to texture atlasDan Goodliffe2023-04-14
| |
| * Adjust test render view to get a closer view of our treeDan Goodliffe2023-04-14
| |
| * Configure texture fragment mapmode from materialDan Goodliffe2023-04-14
| |
| * Define our own enum for texture mapmodeDan Goodliffe2023-04-14
| |
| * Create texture fragments from materialsDan Goodliffe2023-04-14
| |
| * Set GL_PACK_ALIGNMENT before saving texture to fit buffer correctlyDan Goodliffe2023-04-14
| |
| * Merge branch 'worker' into assimpDan Goodliffe2023-04-14
| |\
| | * Load texture images in WorkerDan Goodliffe2023-04-14
| | |
| | * Current thread partakes in work effort while waitingDan Goodliffe2023-04-14
| | | | | | | | | | | | This will prevent deadlock if the work pool is otherwise busy by ensuring work is always being done
| | * Simplify doWork, add tests for various interface usesDan Goodliffe2023-04-14
| | |