Commit Graph

Select branches

Hide Pull Requests

master

shaders_again

some_other_branch

#11

#12

#23

#25

#3

#42

#43

#47

Fonts-Pre

Prerelease-10

Prerelease-11

Prerelease-13

Prerelease-14

Prerelease-15

Prerelease-16

Prerelease-17

Prerelease-18

Prerelease-19

Prerelease-2

Prerelease-20

Prerelease-21

Prerelease-22

Prerelease-23

Prerelease-24

Prerelease-25

Prerelease-26

Prerelease-27

Prerelease-28

Prerelease-29

Prerelease-3

Prerelease-30

Prerelease-31

Prerelease-32

Prerelease-33

Prerelease-34

Prerelease-35

Prerelease-36

Prerelease-37

Prerelease-38

Prerelease-39

Prerelease-4

Prerelease-40

Prerelease-41

Prerelease-42

Prerelease-44

Prerelease-45

Prerelease-46

Prerelease-47

Prerelease-48

Prerelease-49

Prerelease-5

Prerelease-50

Prerelease-51

Prerelease-52

Prerelease-53

Prerelease-54

Prerelease-55

Prerelease-56

Prerelease-57

Prerelease-58

Prerelease-6

Prerelease-7

Prerelease-8

Prerelease-9

Release-12

pre-1

Mono Color

• 9f9191a9db Temp patch for text size bounds. Needs to be fixed properly. master Prerelease-58 josh 2025-06-09 15:54:48 -05:00
• 2d536cd611 Merged several branches, fixed small error, updated dependency packages. Prerelease-57 josh 2025-06-06 13:02:29 -05:00
• 40412a300a Merge pull request 'Completed Shaders Task' (#47) from shaders_again into master josh 2025-06-06 13:44:47 -04:00
• 819539247e Merge pull request 'shader_preprocessor' (#43) from shader_preprocessor into shaders_again shaders_again josh 2025-06-06 13:38:29 -04:00
• ee90e7f95b Fix measure string. Prerelease-56 Redacted 2025-05-29 22:58:25 -04:00
• ad3b451659 BatchFillOutlineRect Redacted 2025-05-25 16:33:58 -04:00
• 74ab9d25db BatchFillRoundedRect Redacted 2025-05-18 00:07:58 -04:00
• a5424eb370 BatchFillCircle Instanced Rendering. Redacted 2025-05-17 17:04:27 -04:00
• 6f99689add Performance optimization. Redacted 2025-05-12 11:38:28 -04:00
• 7ea4b8696e cleanup & performance optimization. Redacted 2025-05-11 13:49:07 -04:00
• 6d37cd93e3 BatchFillRect instanced rendering. Redacted 2025-05-09 16:41:29 -04:00
• 7875b777e5 Demonstrate GLSL custom preprocessor. dawsh 2025-05-09 13:50:18 -05:00
• ede11131fe Change gradient rect to accept 4x color4 Redacted 2025-05-06 11:55:01 -04:00
• 347b9cb278 Performance optimization Redacted 2025-05-05 11:25:49 -04:00
• 1a2f7627d3 custom behavior per draw function Redacted 2025-05-04 23:19:49 -04:00
• b3fb28be38 Package Maintenance - Update mcolor to 7.1 Prerelease-55 josh 2025-04-22 17:19:00 -04:00
• d2497d64a2 Performance Optimization Redacted 2025-04-20 04:17:05 -04:00
• f7eff123be Fix alpha masking when using shader. Redacted 2025-04-18 11:59:17 -04:00
• a1ca7ace77 Flip order of J2D::DrawString argument, so that we can default scale to 1, and add vector2 overload. josh 2025-04-17 13:57:03 -04:00
• 02370c6bfa work on the default shader. Redacted 2025-04-17 13:33:08 -04:00
• 2f13be9dd8 Merge branch 'shader_preprocessor' into shaders_again Redacted 2025-04-16 01:44:27 -04:00
• 4c798ea76a shader with state stack. Redacted 2025-04-16 01:43:00 -04:00
• af31b41782 Implement testing GLSL preprocessing and #include support. josh 2025-04-16 01:36:39 -04:00
• 4374b83464 Add Shader::OnCompilationErrorMessag Prerelease-54 josh 2025-04-15 19:11:07 -05:00
• 147123b202 Working on the default shader Redacted 2025-04-15 12:18:14 -04:00
• 2a2410e9bf Merge pull request 'Shader Implementation' (#42) from shaders_again into master Prerelease-53 josh 2025-04-15 01:21:42 -04:00
• fdabbe866f Implement doxygen annotation for Shader class. josh 2025-04-14 22:12:28 -04:00
• dac830fc7c Implement ineffectual shader for basis testing. josh 2025-04-14 21:45:42 -04:00
• 019b4aa5ae Implement Shader::UseDefault() josh 2025-04-14 21:44:33 -04:00
• 3a293a2e0c Even Epicer josh 2025-04-14 21:37:27 -04:00
• 73de143ec5 Epic Color Transition Fragment Shader josh 2025-04-14 21:36:08 -04:00
• 5068b4660e Josh Attempts Shaders josh 2025-04-14 21:28:06 -04:00
• 1e350ee039 idk what i was doing some_other_branch Redacted 2025-04-03 11:53:26 -04:00
• fd656cd543 Upgrade mcolor version. josh 2025-02-26 15:19:46 -05:00
• 291b3f3778 Fix the wireframe AABB not rendering correctly. Redacted 2025-02-23 22:04:20 -05:00
• 4ee84d6442 Fix OpenGL 1280 on Windoze Prerelease-52 Redacted 2025-02-19 21:06:38 -05:00
• 59df950e11 Add draw commands to support the texture atlas. Redacted 2025-02-18 14:10:59 -05:00
• 03a687179c Texture Atlas constructors. Redacted 2025-02-18 13:52:43 -05:00
• ae84a68e11 Fix typo josh 2025-02-13 21:49:32 -05:00
• c5490cb321 Made a naming choice for will <3. josh 2025-02-13 21:47:53 -05:00
• 04b7cc9544 Anisotropic filtering. Redacted 2025-02-13 03:18:23 -05:00
• 7498390180 Add the ability to use mipmaps with RenderTargets. Prerelease-51 Redacted 2025-02-11 18:48:15 -05:00
• 4ac28a2c10 Fixed a regression that causes MSAA to not work. Redacted 2025-02-11 16:25:59 -05:00
• 61c1c3245c Fixed a case where resizing the render target was no good Prerelease-50 Redacted 2025-02-07 01:56:34 -05:00
• cb9fe4e5c9 Update J2D.cpp Redacted 2025-02-06 12:01:49 -05:00
• c7e7aa6fb5 Batch FillRect & Batch FillCircle. Redacted 2025-02-06 11:43:03 -05:00
• 1261321992 Merge branch 'master' of https://git.redacted.cc/Josh/JGL Redacted 2025-02-06 10:26:35 -05:00
• 6d1ddad428 Add a way to query the max texture size. Redacted 2025-02-06 10:26:34 -05:00
• eae3c794fa Update README.md josh 2025-02-04 15:51:52 -05:00
• db7a37d647 Allow the user to have J2D states inside of J2D states. Prerelease-49 Redacted 2025-02-03 15:30:05 -05:00
• 26600915db Update Texture.cpp Prerelease-48 Redacted 2025-02-02 21:21:33 -05:00
• 7bc87d00ef Cleanup & remove ReImage Redacted 2025-02-02 06:12:56 -05:00
• 5e65f17a90 Update RenderTarget.cpp Prerelease-47 Redacted 2025-01-31 00:08:55 -05:00
• 426498d53c Performance optimization Redacted 2025-01-30 23:16:30 -05:00
• 28bdc7f667 Fix GL error 1280 on windoze. Redacted 2025-01-30 14:18:42 -05:00
• e8bfa7b6f0 Update .gitea/workflows/buildtest.yml Redacted 2025-01-29 19:17:12 -05:00
• d60620ef7c Update J2D.cpp Redacted 2025-01-28 19:06:17 -05:00
• 8cb470ad1c Update ReWindow & don't link to OpenGL. Redacted 2025-01-27 11:57:55 -05:00
• 575a4a0f9b 🤷 Redacted 2025-01-20 20:42:19 -05:00
• e9bdaf54b6 Update CMakeLists.txt Redacted 2025-01-20 16:33:00 -05:00
• 7b2f7de032 Small restructure. Redacted 2025-01-20 16:32:09 -05:00
• e8245c4442 Latest ReWindow Prerelease-46 Redacted 2025-01-15 23:47:58 -05:00
• bd918aa351 Creating a texture atlas from multiple small textures. Redacted 2025-01-10 20:48:13 -05:00
• a0cc8524d9 J2D DrawLines Redacted 2025-01-05 12:18:18 -05:00
• 1964aeae86 Bugfix Prerelease-45 Redacted 2025-01-03 22:22:37 -05:00
• b84e2ee2c5 Just pushing what I have. Redacted 2025-01-03 22:16:27 -05:00
• 1597662e2e Just pushing what I have. Prerelease-44 Redacted 2024-12-22 00:38:16 -05:00
• 0823730e82 Better Wavefront OBJ loader. Redacted 2024-12-20 10:12:11 -05:00
• 6cbd369d51 Fixed one side of the cube looking weird Redacted 2024-12-18 11:11:26 -05:00
• 926ae06834 Merge branch 'master' of https://git.redacted.cc/Josh/JGL Redacted 2024-12-17 21:40:06 -05:00
• d5fd68eba8 Light test 1 Redacted 2024-12-17 21:39:58 -05:00
• 08b2dfbecc Update internals.h Redacted 2024-12-17 13:58:07 -05:00
• e33a51b7d4 Materials. Redacted 2024-12-16 22:25:36 -05:00
• 7f5ee5cf0c Pushing what I have. Redacted 2024-12-16 16:33:16 -05:00
• 401e2c0883 Minor edits. josh 2024-12-09 18:46:24 -05:00
• e5bdc441d1 Merge branch 'master' of https://git.redacted.cc/Josh/JGL Redacted 2024-12-09 14:21:44 -05:00
• 392375e56c small refactor Redacted 2024-12-09 14:21:34 -05:00
• b007c78cfe Roll back to code from prelease-41. Fix segfault later maxine 2024-12-09 13:15:46 -05:00
• 512dc3cb1a Separate J2D and J3D. Redacted 2024-12-08 10:27:30 -05:00
• a22a83d2f8 Fix out-of-date ReWindow API usage. Prerelease-42 josh 2024-12-06 12:05:29 -05:00
• 76cd48c9b7 Update Font.cpp Redacted 2024-12-06 11:34:38 -05:00
• 38bb1b22ce Include Jupiteroid as a default font Redacted 2024-12-04 16:14:38 -05:00
• 122644a013 Update repositories Prerelease-41 Redacted 2024-12-04 14:25:48 -05:00
• 641f2de8d0 Update CMakeLists.txt Prerelease-40 Redacted 2024-12-04 11:16:20 -05:00
• 6618aa5e6b just pushing what I have Redacted 2024-12-01 11:00:48 -05:00
• 3970aa2718 Update GLAD Redacted 2024-11-25 16:53:20 -05:00
• fb5ca55fda Alpha masked sprite. Redacted 2024-11-22 07:46:48 -05:00
• bcca6285af J2D DottedLine & DashedLine Redacted 2024-11-20 18:04:21 -05:00
• f8395726cd Improve performance of single-pixel blit. Redacted 2024-11-20 09:23:09 -05:00
• ca7abb3044 DrawPartialRenderTarget Prerelease-39 Redacted 2024-11-19 19:55:08 -05:00
• 14c45ab0f1 Merge branch 'master' of https://git.redacted.cc/Josh/JGL Redacted 2024-11-14 18:22:29 -05:00
• 1ca5e5a694 Fix for Windows. Redacted 2024-11-14 18:20:57 -05:00
• 25fc3f8698 Fix for Windows. Redacted 2024-11-14 18:20:57 -05:00
• a836fc7b32 More batching & performance optimization. Redacted 2024-11-14 16:14:18 -05:00
• e6dcc9d61e Reformatting Redacted 2024-11-14 10:57:00 -05:00
• 6dff2f97c1 BatchWireframeAABB Redacted 2024-11-13 21:07:21 -05:00
• dbcc3e11e1 Update CMakeLists.txt Prerelease-38 Redacted 2024-11-13 15:16:29 -05:00
• b2bc1170df Blit single pixel onto target RenderTarget (cave-game) Redacted 2024-11-13 11:51:20 -05:00
• 5d7fe84bd0 BatchWireframeRevoSphere Redacted 2024-11-13 10:04:32 -05:00
• 627a047a9b Batching for WireframeSphere. Redacted 2024-11-12 22:49:27 -05:00