Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/simple meshfile #8

Merged
merged 51 commits into from
Jul 21, 2021
Merged

Feature/simple meshfile #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
bf7b410
removed a bunch of bad vertex stuff
SArpnt Apr 10, 2021
00fbba2
mesh loading and format edits
SArpnt Apr 11, 2021
3b662cc
apparently void causes a lot of issues
SArpnt Apr 11, 2021
3c37c12
type changes
SArpnt Apr 11, 2021
9dc25f1
small typecast fix
SArpnt Apr 11, 2021
ad1e760
more type changing
SArpnt Apr 11, 2021
f659326
working compile
SArpnt Apr 11, 2021
529487a
shader edits
SArpnt Apr 11, 2021
d99daab
slight formatting
SArpnt Apr 12, 2021
7c54399
tpnt_log changes, mesh format change
SArpnt Apr 13, 2021
f2fa907
obj comment parsing
SArpnt Apr 13, 2021
e3f5a03
lots of formatting and type fixes
SArpnt Apr 13, 2021
65efb10
lots of cleanup and probably changes
SArpnt Apr 14, 2021
0c8cd9a
cleanup
SArpnt Apr 14, 2021
07d9f01
small fixes
SArpnt Apr 16, 2021
1ea5440
fixed code formatting
SArpnt Jun 4, 2021
66a61ee
Merge branch 'develop' into feature/new-vertex
SArpnt Jul 18, 2021
f3d3029
Merge branch 'develop' into feature/new-vertex
SArpnt Jul 18, 2021
d13c287
Merge branch 'develop' into feature/new-vertex
SArpnt Jul 18, 2021
fa85eb7
Merge branch 'develop' into feature/new-vertex
SArpnt Jul 18, 2021
73d928e
Merge branch 'develop' into feature/new-vertex
SArpnt Jul 18, 2021
a39617e
Merge branch 'develop' into feature/new-vertex
SArpnt Jul 18, 2021
e855081
mesh cleanup
SArpnt Jul 18, 2021
723120d
Merge branch 'develop' into feature/new-vertex
SArpnt Jul 18, 2021
b58e231
Merge branch 'develop' into feature/new-vertex
SArpnt Jul 18, 2021
f745488
remove newline
SArpnt Jul 18, 2021
c9cf983
Merge branch 'develop' into feature/new-vertex
SArpnt Jul 18, 2021
8fb01e0
fixed rendering bug and code cleanup
SArpnt Jul 18, 2021
8c69498
rename variable
SArpnt Jul 18, 2021
89c42a5
rename more variable
SArpnt Jul 18, 2021
1fe0786
Merge branch 'develop' into feature/new-vertex
SArpnt Jul 18, 2021
c4ca42e
rendering fixes
SArpnt Jul 18, 2021
649dd2f
Merge branch 'develop' into feature/new-vertex
SArpnt Jul 18, 2021
a62a139
Merge branch 'develop' into feature/simple-meshfile
SArpnt Jul 19, 2021
3f4d426
test shader
SArpnt Jul 19, 2021
d5c24d5
remove deltatime display that was left in
SArpnt Jul 19, 2021
265b157
Merge branch 'develop' into feature/simple-meshfile
SArpnt Jul 20, 2021
7e4317a
Merge branch 'develop' into feature/simple-meshfile
SArpnt Jul 20, 2021
2924b84
working model loading
SArpnt Jul 20, 2021
a0c4f6d
type accurate index string scanning
SArpnt Jul 20, 2021
c81620e
more efficient model loading
SArpnt Jul 20, 2021
fc8896f
shader cleanup
SArpnt Jul 20, 2021
4b8f5f1
floor texture / uvmap test
SArpnt Jul 20, 2021
a643331
default to missing.obj
SArpnt Jul 20, 2021
7a6dca2
mesh cleanup
SArpnt Jul 20, 2021
1bdc777
smooth blob.obj
SArpnt Jul 20, 2021
91423dd
vNormal in test shader
SArpnt Jul 20, 2021
c50bdbc
fix transform
SArpnt Jul 21, 2021
e183a8e
better blob.obj
SArpnt Jul 21, 2021
b3bda37
matcaps and remove pointcount from RenderCommand
SArpnt Jul 21, 2021
248d106
rename cube to blob and uncomment rotation
SArpnt Jul 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,13 @@ Pull requests are welcome. For major changes, please open an issue first to disc
- [x] Materials
- [x] Render System
- [x] Multiple Objects rendering at the same time
- [ ] Mesh Importing
- [x] Mesh Importing
- [x] Full UV mapping support
- [x] Full vertex color support
- [ ] Multi-texture materials
- [ ] Normals
- [x] Normals
- [ ] Normal maps
- [ ] Matcaps (SArpnt will do this)
- [x] Matcaps (SArpnt will do this)
- [ ] Simple object classes (combine assets and automatically manage render commands)
- [ ] Depth manipulation
- [ ] Skybox
Expand Down
12 changes: 0 additions & 12 deletions res/meshes/blob.mtl
View file
Open in desktop

This file was deleted.

Loading