Commit graph

Select branches

Hide pull requests

master

Mono Color

• b26bec76da Fix the normals!!1! master Eryn Wells 2018-11-26 17:26:09 -08:00
• 5d3276ab03 Playin with the camera an the roughness Eryn Wells 2018-11-26 08:37:53 -08:00
• 1a32b8e085 Don't recurse to size 2; only average corner of particular side you're on Eryn Wells 2018-11-26 08:36:53 -08:00
• 240499ced8 Reduce randomness spread every time Diamond-Squre reduces the grid size Eryn Wells 2018-11-23 13:18:05 -07:00
• ac7ae15ceb Make sure we dispatch a height update for every vertex Eryn Wells 2018-11-23 13:17:27 -07:00
• 9c4163909c Finally clean up this warning Eryn Wells 2018-11-23 10:27:10 -07:00
• c71a4c4b66 Redo all the lighting code -- still not great :\ Eryn Wells 2018-11-23 10:25:31 -07:00
• 8917289c05 Split out algorithms into separate files Eryn Wells 2018-11-23 09:52:15 -07:00
• c3432af621 Remove updateNormals() call Eryn Wells 2018-11-23 09:37:57 -07:00
• 4e848091bb Soften the Diamond-Square roughness Eryn Wells 2018-11-23 09:20:18 -07:00
• 54bb20feef Fix the shimmering Eryn Wells 2018-11-23 09:19:51 -07:00
• b314738ccb 35mm camera Eryn Wells 2018-11-23 09:19:39 -07:00
• 6262fc924d Show surfaces by default now Eryn Wells 2018-11-23 08:59:52 -07:00
• 552864eb09 Plug in an MDLCamera in place of hard coded transforms Eryn Wells 2018-11-23 08:59:04 -07:00
• 44b5f46c9a These are the default render parameters Eryn Wells 2018-11-23 08:15:37 -07:00
• e1ec7701ba Get the normals sorted out; enable lighting from multiple lights Eryn Wells 2018-11-23 08:15:19 -07:00
• a72309ec09 Fix the off-by-ones Eryn Wells 2018-11-22 11:14:34 -07:00
• 6c0792fc9c Implement Emily's algorithm for computing vertex normals Eryn Wells 2018-11-22 10:53:02 -07:00
• 3cd9aca62b Schedule the vertex normal update kernel Eryn Wells 2018-11-22 09:35:01 -07:00
• 55e63cd2cc Pass through uniforms for normals, which means different colors for vertex and face normals! Eryn Wells 2018-11-22 08:52:15 -07:00
• d3298f11a7 Rename unforms -> geometryUniforms Eryn Wells 2018-11-22 08:30:19 -07:00
• 907a0845a7 Factor out per-frame stuff into a PerFrameObject<T> class; use it for the rendering Uniforms Eryn Wells 2018-11-22 08:29:14 -07:00
• 65ffec18e9 A couple small random tweaks while I play with lighting Eryn Wells 2018-11-22 08:12:15 -07:00
• 30d7386805 Tweak lighting and material Eryn Wells 2018-11-22 08:11:49 -07:00
• 5584e2eb37 Move math functions to Math module Eryn Wells 2018-11-22 08:11:30 -07:00
• cd9bf6c1a9 Move PRNG to Random.hh Eryn Wells 2018-11-22 07:58:36 -07:00
• 18f8c141af Disable normals; remove dead code Eryn Wells 2018-11-21 22:11:03 -07:00
• 91c92c9675 Rewrite lighting shader to use Light and Material objects Eryn Wells 2018-11-21 22:10:03 -07:00
• 2ef3781935 Move ShaderTypes.h to Shaders group Eryn Wells 2018-11-21 09:11:24 -07:00
• 023d50a791 Remove colorMap texture Eryn Wells 2018-11-21 09:06:01 -07:00
• d72992c26f Add Light and Material objects to ShaderTypes.h Eryn Wells 2018-11-21 08:58:31 -07:00
• 261a768ae5 Remove RandomGenerator Eryn Wells 2018-11-21 08:57:59 -07:00
• 4e5dfcf20b Remove the Uniforms.c file Eryn Wells 2018-11-21 08:42:17 -07:00
• 73d162337c Attempt to do Phong shading in the fragment shader Eryn Wells 2018-11-21 08:19:41 -07:00
• 59697dbb51 Per-pixel shading in the fragment shader instead of per-vertex in the vertex shader Eryn Wells 2018-11-20 20:14:43 -07:00
• 4d61d05f4d A few misc cleanup things Eryn Wells 2018-11-20 17:31:07 -07:00
• 08094b4302 Toggle rendering normals with 'n'; move Next iteration key to 'space' Eryn Wells 2018-11-20 17:24:02 -07:00
• 296af144ce Get face normals rendering Eryn Wells 2018-11-20 17:13:31 -07:00
• f28e6e08df Clean up some logging Eryn Wells 2018-11-20 16:22:43 -07:00
• a02726404c Pass in the faceNormals Eryn Wells 2018-11-20 11:24:43 -07:00
• 952204a5b6 Pass the normal matrix through and multiply the normal by it Eryn Wells 2018-11-20 11:24:28 -07:00
• e99cd03446 Adjust segments of terrain Eryn Wells 2018-11-20 11:02:49 -07:00
• ebac808683 Update tests to pass in progress objects Eryn Wells 2018-11-20 11:02:33 -07:00
• 97c31c7548 Add normalMatrix uniform Eryn Wells 2018-11-20 11:01:46 -07:00
• 55f7c6fe78 Add Math module and an extension to float4 to make a float3 Eryn Wells 2018-11-20 11:00:59 -07:00
• 43e42f5374 Get face normals updated Eryn Wells 2018-11-19 21:52:53 -07:00
• 764b772fd9 Scale the normal line down Eryn Wells 2018-11-19 21:34:44 -07:00
• c3cc0c7fe4 Render normals at each vertex Eryn Wells 2018-11-19 13:17:06 -07:00
• bd696eac1c Write a quick pair of shaders for rendering normals Eryn Wells 2018-11-19 11:27:21 -07:00
• 95fe543efc Fix progress accounting: make it out of 1 instead of out of 3 tasks Eryn Wells 2018-11-19 10:57:06 -07:00
• 7ff2d3ed6e Move terrain update encoding to Terrain type Eryn Wells 2018-11-19 10:53:33 -07:00
• db1b0185e2 Parameterize dimensions and segments Eryn Wells 2018-11-19 10:22:46 -07:00
• e56f94dc56 Fix up indentation Eryn Wells 2018-11-18 21:17:52 -07:00
• 2b2539d7df Implement progress tracking Eryn Wells 2018-11-18 21:15:20 -07:00
• 58f59baaf5 Reduce the texture size to 129 square Eryn Wells 2018-11-14 08:09:41 -08:00
• 8e9f88faad Add some os_signposts to track terrain generation Eryn Wells 2018-11-14 07:55:03 -08:00
• ebfe3b5d57 Instead of using map(), try just modifying the Points directly for diamond corners Eryn Wells 2018-11-11 22:13:52 -05:00
• 50d895afa1 Add a performance test for the Diamond-Square renderer Eryn Wells 2018-11-11 22:11:15 -05:00
• f0d6177567 Move the render queue to the Diamond-Square object Eryn Wells 2018-11-11 22:12:25 -05:00
• e62dd1b0f2 Work in the normal calculations Eryn Wells 2018-11-11 21:04:03 -05:00
• f6f01b6419 Toggle filled and lines mode with z key Eryn Wells 2018-11-11 20:34:04 -05:00
• dc3de77a59 Debug modifying the geometry Eryn Wells 2018-11-11 20:16:08 -05:00
• 3462fa2458 Update heights of plane geometry in a shader kernel Eryn Wells 2018-11-11 19:50:43 -05:00
• e5678f291b Pass normals through to the fragment shader Eryn Wells 2018-11-10 21:46:32 -05:00
• 6a86368d3a Include the normals in the generated Plane geometry Eryn Wells 2018-11-10 21:10:03 -05:00
• cb16b84ab9 Dispatch the Diamond-Square render pass onto a worker queue to keep the main thread free Eryn Wells 2018-11-10 20:57:23 -05:00
• 6a43c10b9f Add a roughness control Eryn Wells 2018-11-10 17:52:37 -05:00
• 7658210da4 Fix an off by one bug... the tests didn't catch this one :\ Eryn Wells 2018-11-10 17:43:10 -05:00
• 63cad2404c Expand the map calls to help with debugging Eryn Wells 2018-11-10 17:42:42 -05:00
• 47df42c8e5 Add a basic Queue data structure Eryn Wells 2018-11-10 17:40:37 -05:00
• 4e4b6b9bca Render the terrain Eryn Wells 2018-11-10 17:08:24 -05:00
• 4a236bf6d6 Instantiate a DiamondSquare generator Eryn Wells 2018-11-10 17:06:14 -05:00
• 5233a94fec Oops fix my algorithm and update the tests Eryn Wells 2018-11-10 17:05:54 -05:00
• 359c7ef987 Rename DiamondSquareAlgorithm -> DiamondSquareGenerator Eryn Wells 2018-11-10 16:05:30 -05:00
• dce01100cc Complete migrating the algorithm implementation to the Algorithm object Eryn Wells 2018-11-10 16:03:53 -05:00
• e50a36f7d1 Test point->index conversion Eryn Wells 2018-11-10 16:03:38 -05:00
• 045842c20a Tests for diamondCorners and a lot of debugging Eryn Wells 2018-11-10 15:33:12 -05:00
• 6b6e317a9c Make Point and Size honest to goodness structs Eryn Wells 2018-11-10 13:50:28 -05:00
• 5607f01ac1 Finish renaming algorithm -> generator Eryn Wells 2018-11-10 13:22:01 -05:00
• a58241cd13 Rename Algorithm -> TerrainGenerator Eryn Wells 2018-11-10 13:16:22 -05:00
• c62ae41fc0 Tests for side midpoints; move BFS test to BoxTests Eryn Wells 2018-11-10 12:54:34 -05:00
• 48425d5cb8 Tests for breadth first search Eryn Wells 2018-11-10 12:47:04 -05:00
• 8d6c48466b Remove all the explicit type names from the tests Eryn Wells 2018-11-10 10:40:44 -05:00
• 25abb91476 Move BFS stuff to use the new helper method Eryn Wells 2018-11-10 10:40:29 -05:00
• cd48797fa9 Fix the build; test box subdivisions Eryn Wells 2018-11-10 10:30:07 -05:00
• 8e2a873edf Move shader files to Shaders group Eryn Wells 2018-11-10 09:54:17 -05:00
• cce59a45dc Get down an initial diamond-squares implementation Eryn Wells 2018-11-10 09:53:37 -05:00
• a390cbc584 Add unit test target for Terrain2 Eryn Wells 2018-11-08 20:19:31 -05:00
• 7343f0a83a Wrap algorithm iteration flag in a semaphore Eryn Wells 2018-11-07 17:11:30 -05:00
• 1a5ed92c14 Regeneration on ever 'n' now, but it gets scheduled on every frame in that semaphore group Eryn Wells 2018-11-07 17:05:28 -05:00
• 11b9cba8ac Add a Uniform object for RandomAlgorithm Eryn Wells 2018-11-07 16:47:07 -05:00
• 76f0065d8b Generate some pseudo-random numbers with a PRNG class in the shaders. Eryn Wells 2018-11-04 22:30:06 -05:00
• bd9cba2886 Get rid of an unused static let Eryn Wells 2018-11-04 14:26:15 -05:00
• 8ffb0a1cfe Generate terrain on a keypress Eryn Wells 2018-11-04 14:19:02 -05:00
• 55a134882d Proof of concept for Algorithm objects Eryn Wells 2018-11-04 13:44:47 -05:00
• 96730ecd41 Use a fixed size 512x512 texture for the height map Eryn Wells 2018-11-04 11:34:25 -05:00
• af5e5a6123 Generate some random heights to fill the height map texture and ... it works! Eryn Wells 2018-11-04 08:25:01 -05:00
• 18e9d078b0 TODO Eryn Wells 2018-11-04 08:07:17 -05:00
• 4803620d4b Read texture data from the heights texture Eryn Wells 2018-11-04 08:06:48 -05:00
• 753e8eb311 Give the grid coordinate vertex attribute a nice name Eryn Wells 2018-11-03 16:35:46 -04:00