Commit graph

69 commits

Author SHA1 Message Date
532382b1f9 not correct way of using normal maps but gives me some preliminary info. 2022-07-26 15:27:17 +01:00
2eabd78ed5 Changed how we track a models position.
In learning more about linear algebra I've figured out that if we have
the model matrix of an object, for the most part the objects position is
0,0,0 multiplied through the model matrix.
2022-07-26 11:33:33 +01:00
811e949def Fixed pbr issue by re reading and implementing https://learnopengl.com/PBR/Lighting 2022-07-25 14:00:19 +01:00
cd382435a8 Added method to load normal maps and moved pbr to it's own function 2022-07-25 13:43:58 +01:00
2cd954dc9a PBR is now implemented 2022-07-25 13:22:42 +01:00
4ee8d24f18 Added roughness 2022-07-25 10:56:58 +01:00
58eb18354c Got metal to work 2022-07-22 15:02:42 +01:00
3d3aaa3c3c Solved multiple texture loading problem. 2022-07-20 16:30:40 +01:00
40f12dd510 Added the ability to use renderdoc and warn when uniforms unavailable 2022-07-20 16:26:40 +01:00
1e5544ce1f Almost got metallisism working I just don't know what's up with the textures again. 2022-07-19 14:58:02 +01:00
7e3a7f0df7 Added assimp version requirement as default debian version doesn't support pbr by defualt 2022-07-18 15:41:49 +01:00
187936bea6 Added time variable to shader to see difference in different values 2022-07-18 14:36:08 +01:00
a0819a4e98 Added the camera position and the models position to pbr shader 2022-07-18 14:17:08 +01:00
b4fda4612c Re-rendered same scene with hard coded values pbr code from https://learnopengl.com/PBR/Lighting 2022-06-16 15:14:53 +01:00
3700494d84 Rotation added to model (whole system is currently dirty) 2022-06-16 14:23:12 +01:00
1f6079dd25 added ability to resize models so I don't have to tinker with gun model. 2022-06-16 14:04:18 +01:00
8ef9ef72ca Added pbr compatible model to be rendered 2022-06-16 13:36:48 +01:00
a89a5745ea Fixed camera looking at last frame's forward target. 2022-06-14 15:53:52 +01:00
cf964bf235 Unload textures when model is deleted, and remove warnings. 2022-06-14 14:34:30 +01:00
a91fc3d57d Added diffuse lighting 2022-06-13 14:07:55 +01:00
16dd10f252 Allowed user to quite the program with the escape key. 2022-06-13 13:25:04 +01:00
9e5514e5ba Fixed the texture issue. The texture was upside down. 2022-06-09 15:01:30 +01:00
3dd235397a Actually added textures to loaded texture buffer so we can skip loading already loaded texetures. 2022-06-09 13:47:55 +01:00
18a785613d The engine can now import models with textures but bugs.
More complex models have a bug where the same textures are potentially
being loaded too many times.
2022-05-31 14:43:44 +01:00
a33ff9d029 Added test cube for model loading, discovered vertices are alright it appears to be an issue with the textures. 2022-05-17 15:07:40 +01:00
037233ddf2 fixed filename issue, (WARNING next bug may brick machine) 2022-04-29 16:40:03 +01:00
685aafd45f Fixed being stuck in an infinite loop whilst loading model indecies 2022-04-29 16:28:16 +01:00
753ec9c857 Attempted to follow this tutorial to add model loading.
https://learnopengl.com/Model-Loading/Model

Currently getting an error from assimp claiming it's missing data from
the example model.
2022-04-29 15:03:35 +01:00
644ac26403 Imported tool for loading models 2022-04-29 12:30:41 +01:00
5c96f8b90d Enabled face culling 2022-04-29 11:27:32 +01:00
fd0acf3dde Models now heve their own relative position (needs optimiseation) 2022-04-22 12:43:51 +01:00
9fcc98fdf4 Added model class with the ability to hold multiple models. 2022-04-21 14:15:02 +01:00
1b82ef0556 Enabled GL Deph buffor so things render in correct order. 2022-04-21 13:36:46 +01:00
Warwick
53da829dbe Made the project work on default debian libraries (still clang only) 2022-02-23 12:54:04 +00:00
bd85989d95
We can now render multiple meshes. 2022-02-22 17:41:12 +00:00
65e7447fe3
Added mesh class (unfinished) 2022-02-22 14:53:28 +00:00
f42740d8cc
Allow the game to be run from any directory 2022-02-14 16:08:51 +00:00
5811e13f55
FInally have a working camera in the engine that can be controlled via both keyboard and mouse 2022-02-03 16:55:48 +00:00
8539780043
Using a different set of maths to manipulate the camera 2022-02-03 16:16:32 +00:00
19ad21dd7e
I dunno why it doesn't work currently be we should have a working camera 2022-01-27 16:16:04 +00:00
f364da6272
Finally shifted the camera. Now to move it to the camera class. 2022-01-24 15:18:44 +00:00
9b5cc10c1a
added glm and template for a player camera 2022-01-20 17:04:35 +00:00
f1d0f03ae4
moved over to cmake 2022-01-12 12:17:53 +00:00
ba2f426fe0 Improved method of getting data file locations 2021-05-20 12:02:16 +01:00
928efe501c The data files are now installed with the game 2021-05-19 18:01:52 +01:00
Warwick
59e32663a1 Texture loads 2021-05-18 16:39:58 +01:00
Warwick
a867321be7 Loaded image into program. (Not used yet!) 2021-05-18 14:18:17 +01:00
Warwick
31d45f5e9c Added SDL2_image library to load textures 2021-05-18 14:04:21 +01:00
Warwick
59355c8540 Removed additional froat from colour data as it will become a 2d pos on texture soon 2021-05-18 13:37:06 +01:00
Warwick
9cac126141 Removed readfile function from main 2021-05-18 13:19:43 +01:00