Commit Graph

899 Commits

Author SHA1 Message Date
kearwood
b2c67f5276 Specular lighting now working correctly with the deferred lighting
--HG--
extra : convert_revision : svn%3A7752d6cf-9f14-4ad2-affc-04f1e67b81a5/trunk%4051
2012-04-20 00:48:23 +00:00
kearwood
6c76335d9e Disabled debugging code
--HG--
extra : convert_revision : svn%3A7752d6cf-9f14-4ad2-affc-04f1e67b81a5/trunk%4050
2012-04-20 00:19:14 +00:00
kearwood
17e0503529 Specular calculations for deferred lighting in progress
--HG--
extra : convert_revision : svn%3A7752d6cf-9f14-4ad2-affc-04f1e67b81a5/trunk%4049
2012-04-20 00:17:15 +00:00
kearwood
21762174bf Specular calculations for deferred lighting in progress
Have integrated the position of the directional light in the scene graph (imported from fbx) with the forward renderer and deferred lighting renderer's directional light angle

--HG--
extra : convert_revision : svn%3A7752d6cf-9f14-4ad2-affc-04f1e67b81a5/trunk%4048
2012-04-19 23:39:32 +00:00
kearwood
2ead2995d5 Deferred lighting now working with directional lights
--HG--
extra : convert_revision : svn%3A7752d6cf-9f14-4ad2-affc-04f1e67b81a5/trunk%4047
2012-04-14 02:15:35 +00:00
kearwood
97d8054cd0 Deferred lighting in progress
Now able to dynamically switch between shaders for lights and objects

--HG--
extra : convert_revision : svn%3A7752d6cf-9f14-4ad2-affc-04f1e67b81a5/trunk%4046
2012-04-13 23:24:07 +00:00
kearwood
0d7cdffd24 Shader cleanup, deferred lighting in progress
--HG--
extra : convert_revision : svn%3A7752d6cf-9f14-4ad2-affc-04f1e67b81a5/trunk%4045
2012-04-13 22:48:13 +00:00
kearwood
1ebdee1b3c Implemented multi-pass framework for deferred lighting
--HG--
extra : convert_revision : svn%3A7752d6cf-9f14-4ad2-affc-04f1e67b81a5/trunk%4044
2012-04-13 06:40:53 +00:00
kearwood
b88cf8e0cb Deferred lighting implementation in progress. Now generating view-space normal fragments for the 1st pass G-buffer.
Added transpose() method to KRMat4

--HG--
extra : convert_revision : svn%3A7752d6cf-9f14-4ad2-affc-04f1e67b81a5/trunk%4043
2012-04-13 01:13:18 +00:00
kearwood
3749d3edfd Light transformation, rotation, and scaling is now imported correctly from FBX files
--HG--
extra : convert_revision : svn%3A7752d6cf-9f14-4ad2-affc-04f1e67b81a5/trunk%4042
2012-04-12 22:18:38 +00:00
kearwood
f847b89f5a Implemented KRContext class to reduce the parameter count of method calls
--HG--
extra : convert_revision : svn%3A7752d6cf-9f14-4ad2-affc-04f1e67b81a5/trunk%4041
2012-04-12 19:43:08 +00:00
kearwood
1c3ffa4d67 Removed extraneous glBind calls, added FPS debugging info
--HG--
extra : convert_revision : svn%3A7752d6cf-9f14-4ad2-affc-04f1e67b81a5/trunk%4040
2012-04-12 08:49:47 +00:00
kearwood
3ff648a08f Cleaned up warnings
--HG--
extra : convert_revision : svn%3A7752d6cf-9f14-4ad2-affc-04f1e67b81a5/trunk%4039
2012-04-12 07:30:01 +00:00
kearwood
aa5ca4ee45 Added missing #import
--HG--
extra : convert_revision : svn%3A7752d6cf-9f14-4ad2-affc-04f1e67b81a5/trunk%4038
2012-04-12 06:51:11 +00:00
kearwood
4dc1164dbe Test App controls are now frame-rate independent
--HG--
extra : convert_revision : svn%3A7752d6cf-9f14-4ad2-affc-04f1e67b81a5/trunk%4037
2012-04-12 06:41:56 +00:00
kearwood
35df6c2ec5 Refactored, renaming "shadow map" to "light map" to avoid confusion with the shadow volume maps
--HG--
extra : convert_revision : svn%3A7752d6cf-9f14-4ad2-affc-04f1e67b81a5/trunk%4036
2012-04-12 06:25:44 +00:00
kearwood
ff9bd874d3 Now using scene graph nodes for instance and bound extents management.
--HG--
extra : convert_revision : svn%3A7752d6cf-9f14-4ad2-affc-04f1e67b81a5/trunk%4035
2012-04-12 06:04:15 +00:00
kearwood
d4b80212cc Implemented persistence of lighting information through XML files
--HG--
extra : convert_revision : svn%3A7752d6cf-9f14-4ad2-affc-04f1e67b81a5/trunk%4034
2012-04-12 01:27:30 +00:00
kearwood
4215bf8b22 Set up scene graph objects required for managing light sources
--HG--
extra : convert_revision : svn%3A7752d6cf-9f14-4ad2-affc-04f1e67b81a5/trunk%4033
2012-04-12 00:43:53 +00:00
kearwood
2ea2924764 Presence of Layered Textures no longer disables texture import from FBX files
--HG--
extra : convert_revision : svn%3A7752d6cf-9f14-4ad2-affc-04f1e67b81a5/trunk%4032
2012-04-11 19:59:08 +00:00
kearwood
d0433a2b1a Fixed bug causing shadow maps to be disabled when there is no specular or per-pixel lighting
--HG--
extra : convert_revision : svn%3A7752d6cf-9f14-4ad2-affc-04f1e67b81a5/trunk%4031
2012-04-11 18:18:47 +00:00
kearwood
aadc5c840c Reversed recent shader changes that broke specular
Implementation of deferred rendering in progress

--HG--
extra : convert_revision : svn%3A7752d6cf-9f14-4ad2-affc-04f1e67b81a5/trunk%4030
2012-04-06 01:07:23 +00:00
kearwood
33c5b754de Creating object model to store lights returned by FBX import in preparation of deferred rendering.
--HG--
extra : convert_revision : svn%3A7752d6cf-9f14-4ad2-affc-04f1e67b81a5/trunk%4029
2012-04-05 23:09:41 +00:00
kearwood
384068eb9c Shader speed optimization
--HG--
extra : convert_revision : svn%3A7752d6cf-9f14-4ad2-affc-04f1e67b81a5/trunk%4028
2012-04-05 21:52:09 +00:00
kearwood
03b749b93c Optimization of specular calculation in fragment shader
--HG--
extra : convert_revision : svn%3A7752d6cf-9f14-4ad2-affc-04f1e67b81a5/trunk%4027
2012-04-05 21:47:49 +00:00
kearwood
75e42c08fd KRObjView now automatically loads any models it finds in the "Documents" folder and assigns light maps that have the same name as the model appended with "_lightmap".
Lightmapping now enabled by default.

--HG--
extra : convert_revision : svn%3A7752d6cf-9f14-4ad2-affc-04f1e67b81a5/trunk%4026
2012-04-05 21:18:25 +00:00
kearwood
ee3fbb8a8a Fixed 2nd UV set import issues. Lightmapping now fully functional
--HG--
extra : convert_revision : svn%3A7752d6cf-9f14-4ad2-affc-04f1e67b81a5/trunk%4025
2012-04-05 20:12:39 +00:00
kearwood
f2845b2456 Implemented texture scale and offset material parameters
--HG--
extra : convert_revision : svn%3A7752d6cf-9f14-4ad2-affc-04f1e67b81a5/trunk%4024
2012-03-30 00:54:44 +00:00
kearwood
5498499b51 Light mapping implemented
--HG--
extra : convert_revision : svn%3A7752d6cf-9f14-4ad2-affc-04f1e67b81a5/trunk%4023
2012-03-29 19:39:28 +00:00
kearwood
35d138c31c Corrected tangent and normal import from FBX files. FBX Import now functional.
--HG--
extra : convert_revision : svn%3A7752d6cf-9f14-4ad2-affc-04f1e67b81a5/trunk%4022
2012-03-28 23:34:39 +00:00
kearwood
d457991ed0 FBX File Import - Materials and texture map names now imported
--HG--
extra : convert_revision : svn%3A7752d6cf-9f14-4ad2-affc-04f1e67b81a5/trunk%4021
2012-03-28 21:58:55 +00:00
kearwood
b7c8ae001b FBX File import now re-orders vertices and batches all materials together to reduce draw calls
--HG--
extra : convert_revision : svn%3A7752d6cf-9f14-4ad2-affc-04f1e67b81a5/trunk%4020
2012-03-28 19:34:52 +00:00
kearwood
6edc77e32b Now importing multiple submeshes / materials per object during FBX import
--HG--
extra : convert_revision : svn%3A7752d6cf-9f14-4ad2-affc-04f1e67b81a5/trunk%4019
2012-03-28 19:06:23 +00:00
kearwood
67fee4a291 Implementation of FBX import workflow in progress
--HG--
extra : convert_revision : svn%3A7752d6cf-9f14-4ad2-affc-04f1e67b81a5/trunk%4018
2012-03-23 02:28:46 +00:00
kearwood
d305bd1438 Implemented logic to track the source of the mesh data and perform appropriate cleanup depending on if it was malloc'ed or mmap'ed.
Implemented writePack method

--HG--
extra : convert_revision : svn%3A7752d6cf-9f14-4ad2-affc-04f1e67b81a5/trunk%4017
2012-03-16 00:53:15 +00:00
kearwood
d43989cd88 Resolved linker errors, now able to cross-compile the OSX framework and iOS library from the same source
--HG--
extra : convert_revision : svn%3A7752d6cf-9f14-4ad2-affc-04f1e67b81a5/trunk%4016
2012-03-15 23:58:37 +00:00
kearwood
bb38ede18e Renamed Vector3 class to KRVector3
KRObjPacker project updated to use KREngine_osx framework rather than having a copy of the files

--HG--
extra : convert_revision : svn%3A7752d6cf-9f14-4ad2-affc-04f1e67b81a5/trunk%4015
2012-03-15 22:57:20 +00:00
kearwood
a9786b80e6 Created target for KREngine to compile as a framework for OSX.
--HG--
extra : convert_revision : svn%3A7752d6cf-9f14-4ad2-affc-04f1e67b81a5/trunk%4014
2012-03-15 22:34:08 +00:00
kearwood
9c66c28025 Removed old test flight version
--HG--
extra : convert_revision : svn%3A7752d6cf-9f14-4ad2-affc-04f1e67b81a5/trunk%4013
2012-03-15 21:57:14 +00:00
kearwood
bb7bc1cba8 Added test flight to the project
--HG--
extra : convert_revision : svn%3A7752d6cf-9f14-4ad2-affc-04f1e67b81a5/trunk%4012
2012-03-15 21:55:05 +00:00
kearwood
fca472721b Optimized further to reduce redundant GL state changes
--HG--
extra : convert_revision : svn%3A7752d6cf-9f14-4ad2-affc-04f1e67b81a5/trunk%4011
2012-03-15 20:44:57 +00:00
kearwood
4511d71e1d Optimized to reduce redundant GL state changes
Updated header copyright dates
Further refactoring to prepare for FBX file compatibility

--HG--
extra : convert_revision : svn%3A7752d6cf-9f14-4ad2-affc-04f1e67b81a5/trunk%4010
2012-03-15 20:09:01 +00:00
kearwood
e60aac615a Refactored in preparation for FBX file format support
--HG--
extra : convert_revision : svn%3A7752d6cf-9f14-4ad2-affc-04f1e67b81a5/trunk%409
2012-03-15 19:19:23 +00:00
kearwood
459f37521b Added glViewPort call to stop popping of scale when shadow maps are enabled and disabled
--HG--
extra : convert_revision : svn%3A7752d6cf-9f14-4ad2-affc-04f1e67b81a5/trunk%408
2012-03-15 17:22:48 +00:00
kearwood
ecc233ddb3 First commit of the KRWorldBuilder project. Nothing functional yet
--HG--
extra : convert_revision : svn%3A7752d6cf-9f14-4ad2-affc-04f1e67b81a5/trunk%407
2012-03-15 17:15:28 +00:00
kearwood
26c5a29b29 --HG--
extra : convert_revision : svn%3A7752d6cf-9f14-4ad2-affc-04f1e67b81a5/trunk%406
2012-02-10 05:48:59 +00:00
kearwood
fe0fd86896 Added header with Simplified BSD License to all source files.
--HG--
extra : convert_revision : svn%3A7752d6cf-9f14-4ad2-affc-04f1e67b81a5/trunk%405
2011-10-25 06:16:47 +00:00
kearwood
cece608881 Initial import of KREngine
--HG--
extra : convert_revision : svn%3A7752d6cf-9f14-4ad2-affc-04f1e67b81a5/trunk%404
2011-10-25 05:03:10 +00:00
kearwood
5937288f78 Creating subversion repository
--HG--
extra : convert_revision : svn%3A7752d6cf-9f14-4ad2-affc-04f1e67b81a5/trunk%403
2011-10-25 00:44:32 +00:00