21b7cecab1
silence weird errors from shaders
...
- somehow texturecube was getting sent to toon shader at some point down the line, simply defined register for it for now, don't know where it's getting sent
- pbr was expected Sampler not BasicSampler
2022-04-21 17:27:42 -04:00
Lightling
b5275f2b9f
Update README.md
2022-04-21 15:59:42 -04:00
Lightling
d35f4ec52c
Merge pull request #11 from xLightling/final
...
Final
2022-04-21 15:59:04 -04:00
9a0e985843
Update README.md
2022-04-21 15:41:58 -04:00
61232a9bd3
final(?) scene/code cleanup
2022-04-21 15:37:06 -04:00
601897d98c
finish implementing scene swapping
2022-04-21 15:22:32 -04:00
d179f17f18
move everything into scene methods
...
very jank way of doing this but it's just for demo'ing anyways
2022-04-21 15:08:00 -04:00
3703d3f127
first attempt at a surrealist scene
...
requirements specify a more complex scene
2022-04-21 00:22:02 -04:00
503bf34dc7
cleanup shader code and add comments
2022-04-20 01:38:19 -04:00
62256f1e96
Update Material.h
...
XML comments for non-Get/Set public methods
2022-04-20 00:55:59 -04:00
520c33b017
cleanup Game and Material .cpp
...
- regions and comments
- convert "pbr" to "mode" and have separate Activate for Toon shader
2022-04-20 00:47:06 -04:00
22c946ec1a
cleanup normal calculations
2022-04-20 00:23:34 -04:00
a3dcaebd57
implement toon ramp sampler
2022-04-20 00:12:16 -04:00
22d0253364
expose outline/rim values
2022-04-19 23:43:43 -04:00
d61aa79428
test toon shader with outline
2022-04-19 23:33:57 -04:00
a683ab21ff
support normal intensity
2022-04-19 23:15:15 -04:00
8c103bb3f9
add various shader supports
...
- standard+toon w/o albedo
- toon emission
- emission as a color
- standard+toon alpha+cutoff values (toon looks weird because of rim lighting at the moment)
2022-04-19 22:40:39 -04:00
b2a3263dbb
rim is now light dependent
2022-04-19 21:39:37 -04:00
6f84155ec3
add rim lighting to toon shader
2022-04-19 21:36:28 -04:00
d04a1afb66
implement toon shading basics
2022-04-19 21:32:18 -04:00
8a33809c73
general copy of standard shader to toon shader
2022-04-19 21:03:55 -04:00
b07b4fbda0
finish transparency work
2022-04-19 19:55:46 -04:00
bc53755242
start transparency work
2022-04-19 19:27:07 -04:00
4bd3589ba6
outline toon shader
2022-04-19 19:16:00 -04:00
Lightling
b2e003f394
Merge pull request #10 from xLightling/a10_pbr
...
A10: Gamma Correction & PBR
2022-04-09 21:26:08 -04:00
b407d9adfe
remove unused .tgas
2022-04-09 21:23:00 -04:00
761be5d9eb
corrections to lighting
2022-04-09 21:21:42 -04:00
e65a111f1f
camera adjustments
2022-04-09 21:04:28 -04:00
0517fe07dd
implement pbr
2022-04-09 21:01:08 -04:00
62a27191aa
PBR shader work
2022-04-09 20:19:44 -04:00
8eb2d7140a
Update SimplePixelShader.hlsl
...
gamma correction
2022-04-09 18:40:55 -04:00
d5a1a832e6
add pbr textures
2022-04-09 18:22:01 -04:00
Lightling
112481d412
Merge pull request #9 from xLightling/A9_NormalMapsCubeMaps
...
A9: Normal Maps & Cube Maps
2022-04-03 19:17:51 -04:00
c1946480fc
implement reflection maps
2022-04-03 19:13:57 -04:00
eeea33802a
implement skybox
2022-04-03 18:18:42 -04:00
bedfe0d5f5
define Sky.cpp / Sky.h and Game::CreateCubemap
2022-04-03 18:01:59 -04:00
e54f629637
define skybox shaders
2022-04-03 17:26:55 -04:00
d720c2072a
implement normal maps
2022-04-03 17:14:54 -04:00
e229eefbb7
add new textures to the repo
2022-04-03 16:57:53 -04:00
4a0dfebd60
define bools for handling null texture maps
2022-04-03 16:28:10 -04:00
f0ab528f13
move light code from SimplePixelShader to Lights
2022-04-03 16:08:21 -04:00
80e0790a63
calculate tangents
2022-04-03 16:05:25 -04:00
Lightling
af987ac4b0
Merge pull request #8 from xLightling/feat_cleanup
...
Cleanup
2022-04-03 15:53:34 -04:00
2d659b0646
game cleanup
2022-04-03 15:47:27 -04:00
20b3fd7d97
condense lighting creation
2022-04-03 15:40:50 -04:00
c0843b4ae0
cleanup the annoying stuff
2022-03-29 10:49:09 -04:00
51206816aa
support a dynamic number of lights
2022-03-29 10:34:00 -04:00
4c911f8348
move texture loading to material class
2022-03-29 10:20:44 -04:00
Lightling
8daa82df97
Merge pull request #7 from xLightling/a8_textures
...
A8: Textures
2022-03-27 17:02:29 -04:00
cbb05cac56
add emissive support
...
- does not effect other objects in scene
2022-03-27 16:59:40 -04:00
