Commit Graph

216 Commits

Author SHA1 Message Date
Jack 4cf7c4d102 Remove UNIX check 2024-08-23 22:18:32 -04:00
Jack 6b06d8651a Try adding FreeImage to source files 2024-08-23 22:16:19 -04:00
Jack 2df0bff067 Link to installed rather than packages 2024-08-23 22:12:53 -04:00
Jack a13219484c Directly link to FreeImage headers 2024-08-23 22:05:54 -04:00
Jack Christensen 54333998a3 Update .gitlab-ci.yml file 2024-08-24 02:03:23 +00:00
Jack Christensen 5a61870048 Update .gitlab-ci.yml file 2024-08-24 02:02:26 +00:00
Jack 9ef7a32957 Switch test build from release to debug 2024-08-23 21:58:56 -04:00
Jack 3f923e5a2f Move FreeImage.h include from header to main file
Test couldn't find FreeImage functions so I'm trying moving it
2024-08-23 21:56:12 -04:00
Jack d12a32f162 Point CMake to base lib directory
Just want to check if this works. Not the best way to do things.
2024-08-23 21:53:27 -04:00
Jack 347d46c900 Start load texture logic
I just wanted to get something in here to make sure the branch is working with automatic tests and that FreeImage wouldn't throw errors now that I'm actually using it.
2024-08-23 21:47:37 -04:00
Jack Christensen c3508f28a5 Remove mention of macOS in README.md 2024-08-24 00:16:02 +00:00
Jack Christensen 0ee8c79db3 Update README.md 2024-08-24 00:14:43 +00:00
Jack Christensen b077d09589 Update CMakeLists.txt 2024-08-23 23:00:12 +00:00
Jack Christensen 3bcf6bac4f Update CMakeLists.txt 2024-08-23 22:59:16 +00:00
Jack Christensen ab8e9d3310 Update CMakeLists.txt 2024-08-23 22:57:02 +00:00
Jack Christensen 8cc35731bb Update CMakeLists.txt 2024-08-23 22:51:43 +00:00
Jack Christensen 43e95ead77 Update CMakePresets.json 2024-08-23 22:51:01 +00:00
Jack Christensen 7be114a1f3 Update .gitlab-ci.yml file 2024-08-23 22:50:36 +00:00
Jack Christensen 752e125c91 Test FreeImage on Linux 2024-08-22 16:59:53 -04:00
Jack Christensen 958da0d730 Updated .gitlab-ci.yml 2024-08-22 16:57:03 -04:00
Jack Christensen 40af53ad1a Updated .gitlab-ci.yml 2024-08-22 16:54:10 -04:00
Jack Christensen d2e859d35b Test FreeImage inclusion 2024-08-22 16:50:38 -04:00
Jack Christensen 59bd0c30b1 Add camera controls 2024-08-21 17:14:35 -04:00
Jack Christensen e3a67c6d00 Add anonymous namespace and add bind and unbind functions to fbo file 2024-08-20 01:35:19 -04:00
Jack Christensen ca26a4f068 Got rid of load_texture due to errors 2024-08-20 01:01:41 -04:00
Jack Christensen 4078dc9943 Update CMakeLists.txt 2024-08-20 00:55:04 -04:00
Jack Christensen 0a4cf689e5 Replaced once thought redundant find_package for freeimage 2024-08-20 00:53:53 -04:00
Jack Christensen 2d14a6011d Add include to platform_utils.h to load_texture 2024-08-20 00:52:09 -04:00
Jack Christensen b58b89d884 Removed unnecessary find_package for freeimage 2024-08-20 00:48:04 -04:00
Jack Christensen d144434f59 Refactor fbo to make for functional, less OOP 2024-08-20 00:47:41 -04:00
Jack Christensen 25147837fc Add load_texture 2024-08-20 00:47:03 -04:00
Jack Christensen 6f2c239094 Testing include of FreeImage 2024-08-19 15:48:55 -04:00
Jack Christensen 0e7051e083 Merge branch 'main' of https://git.jackmchristensen.com/jack/terravisor 2024-08-19 15:44:16 -04:00
Jack Christensen d56f32ebfb Delete FreeImage in Linux link libraries 2024-08-19 15:44:10 -04:00
Jack Christensen abea7884b7 Update .gitlab-ci.yml file 2024-08-19 19:29:53 +00:00
Jack Christensen 010dbc0e7a Update .gitlab-ci.yml file 2024-08-19 19:28:49 +00:00
Jack Christensen 742f77503b Directly link to freeimage library 2024-08-19 15:20:26 -04:00
Jack Christensen 8ac1a8d732 Put vcpkg command in correct stage 2024-08-19 13:56:25 -04:00
Jack Christensen bc1fae35a7 Update .gitlab-ci.yml to hopefully get freeimage working 2024-08-19 13:55:16 -04:00
Jack Christensen d1d2c677db Add freeimage to dependencies 2024-08-19 13:51:04 -04:00
Jack Christensen 3c37e349dd Fix typo 2024-08-19 11:06:50 -04:00
Jack Christensen 9acc0a8be9 Test if shader bug trips CI/CD 2024-08-19 11:05:31 -04:00
Jack Christensen 513fc61d34 Add test loop in main.cpp 2024-08-19 10:43:07 -04:00
Jack Christensen bb1e8ee3e1 Update CMakeLists.txt 2024-08-19 14:28:26 +00:00
Jack Christensen 9b7d5b23c8 Update .gitlab-ci.yml file 2024-08-19 14:24:27 +00:00
Jack Christensen f042d0e385 Update .gitignore to include /hgt directory for testing purposes 2024-08-19 10:19:55 -04:00
Jack Christensen 25e35fed78 Update .gitlab-ci.yml file 2024-08-19 14:16:27 +00:00
Jack Christensen d302e5a01f Update CMakeLists.txt 2024-08-19 14:14:24 +00:00
Jack Christensen 0ba217fd09 Update .gitlab-ci.yml file 2024-08-19 14:12:57 +00:00
Jack Christensen f3f46bf858 Update .gitlab-ci.yml file 2024-08-19 14:10:38 +00:00