kraken_engine/kraken
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
607 Commits 1 Branch 3 Tags
c42455e38abda243a572a6249391c18183085cc4
Commit Graph

607 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kearwood Gilbert
79abdd98d0 Implemented rim_light and rim_power shader parameters, enabling outlining of objects on a per-model basis. 
Will need to later refactor to allow for a more scalable means of adding per-model shader attributes.

--HG--
branch : nfb
 2013-12-05 01:09:31 -08:00
Peter
971dadd7f6 Bug Fix in the animation curve importer 
Added new enum constant to collider.h for layer mask 16
Added code to pull out the key frame (start location) of an animation curved .. still needs to be stored to the correct place
Added notes for parsing out audio locators

--HG--
branch : nfb
 2013-12-03 16:04:15 -08:00
Kearwood Gilbert
c7948ea314 KRSprite objects now have their own shader, rather than sharing the "Flare" shader. 
Implemented per-sprite alpha.

--HG--
branch : nfb
 2013-12-03 01:15:17 -08:00
Peter
bdb720eb96 Bug Fix in the animation curve importer + rough test code for pulling metadata out of an FbxNode (a locator in Maya) 
--HG--
branch : nfb
 2013-12-02 17:44:55 -08:00
Kearwood Gilbert
37c2eca1bc Implemented KRMeshQuad, representing a stock quad model 
Implemented KRSprite

--HG--
branch : nfb
 2013-11-30 12:46:01 -08:00
Kearwood Gilbert
70f70bc1e6 Merge 
--HG--
branch : nfb
 2013-11-30 02:03:30 -08:00
Kearwood Gilbert
a1d93d24b9 Animated textures updated for compatibility with asynchronous texture streamer 
--HG--
branch : nfb
 2013-11-30 02:01:02 -08:00
Kearwood Gilbert
c1551a8a23 Fixed bug that caused some animations to crash the FBX import pipeline. 
--HG--
branch : nfb
 2013-11-27 01:39:14 -08:00
Kearwood Gilbert
58b39a6202 When importing FBX meshes with some unmapped UV's, they are now substituted with (0,0) rather than asserting false and cancelling the import. 
--HG--
branch : nfb
 2013-11-27 00:10:29 -08:00
Kearwood Gilbert
678cea559c KRAnimation::Play() no longer seeks back to the start of the animation automatically. 
Use KRAnimation::SetTime(0.0f) to seek to the beginning manually if needed.

--HG--
branch : nfb
 2013-11-23 18:21:16 -08:00
Kearwood Gilbert
cc6c330fc0 Merged in crash fixes from default branch 
--HG--
branch : nfb
 2013-11-23 17:17:32 -08:00
Kearwood Gilbert
61fde7700b Fixed crash in fbx import pipeline 2013-11-23 17:02:17 -08:00
Kearwood Gilbert
cc5c698b13 Updated to FBX SDK 2014.2 
Nodes in the FBX file starting with so_ will no longer be decorated with fbx_##_ prefixes.
Updated import pipeline for compatibility with C++11

--HG--
branch : nfb
 2013-11-23 12:16:31 -08:00
Kearwood Gilbert
9cd9a8474c Updated to FBX SDK 2014.2 
Nodes in the FBX file starting with so_ will no longer be decorated with fbx_##_ prefixes.
Updated import pipeline for compatibility with C++11

--HG--
extra : source : 39b8803b34f432b24279d4c6ca4c05f4f505174b
 2013-11-23 12:16:31 -08:00
Kearwood Gilbert
eee9be438d Implemented KRNode::getParent() 
--HG--
branch : nfb
 2013-11-18 23:52:03 -08:00
Kearwood Gilbert
a8a8f32e77 Implemented KRNode::getParent() 
--HG--
extra : source : 1bad435929f774f4da192fba4204fd7a85b17f01
 2013-11-18 23:52:03 -08:00
Kearwood Gilbert
19bf71938d Implemented API to read and seek the audio playback position of KRAudioSource 
--HG--
branch : nfb
 2013-11-17 01:46:12 -08:00
Kearwood Gilbert
29b518610b Implemented API to read and seek the audio playback position of KRAudioSource 
--HG--
extra : source : 5ef720e0f476c72b85a7e2fc841af965d2038264
 2013-11-17 01:46:12 -08:00
Kearwood Gilbert
7f09dae997 Synced up with default branch 
--HG--
branch : nfb
 2013-11-16 16:27:23 -08:00
Kearwood Gilbert
258e66069c Merged async_streaming into nfb 
--HG--
branch : nfb
 2013-11-16 16:19:18 -08:00
Kearwood Gilbert
b0bfd6b29c Merged async_streaming branch into default. 2013-11-16 15:50:22 -08:00
Kearwood Gilbert
240d2ee278 Asynchronous streaming and memory management improvements in progress. 
Stability improved.

--HG--
branch : async_streaming
 2013-11-16 03:22:31 -08:00
Kearwood Gilbert
8b29ffab69 Asynchronous streaming and memory management improvements in progress. 
--HG--
branch : async_streaming
 2013-11-16 02:34:18 -08:00
Kearwood Gilbert
cf732a6721 Asynchronous streaming and memory management improvements in progress. 
--HG--
branch : async_streaming
 2013-11-13 23:52:17 -08:00
Kearwood Gilbert
05626214d4 Asynchronous streaming and memory management improvements in progress. 
--HG--
branch : async_streaming
 2013-11-09 16:08:08 -08:00
Kearwood Gilbert
48d3a6a2c8 Asynchronous streaming and memory management improvements in progress. 
--HG--
branch : async_streaming
 2013-11-02 16:27:24 -07:00
Kearwood Gilbert
06436d72f5 Asynchronous streaming and memory management improvements in progress. 
--HG--
branch : async_streaming
 2013-11-02 01:08:51 -07:00
Kearwood Gilbert
ab808fc3e1 Asynchronous streaming and memory management improvements in progress. 
--HG--
branch : async_streaming
 2013-11-01 23:17:04 -07:00
Manjit Bedi
dc574ce274 changed settings to support iOS 7 & 64 bit architecture 
--HG--
branch : nfb
 2013-11-01 17:34:51 -07:00
Kearwood Gilbert
63503393a4 Now targeting iOS 7 and enabling 64-bit ARM 
--HG--
branch : async_streaming
 2013-10-18 17:26:07 -07:00
Kearwood Gilbert
e849f55b34 Experimental optimizations, not yet ready for stable branch 
--HG--
branch : async_streaming
 2013-10-08 20:44:31 -07:00
Kearwood Gilbert
4dddec7f85 Asynchronous streaming and memory management improvements in progress. 
Note: This branch is unstable

--HG--
branch : async_streaming
 2013-10-06 18:56:23 -07:00
Kearwood Gilbert
44ea492556 Fixed bug in KROctreeNode::lineCast that would cause it to always return false 
--HG--
extra : source : a47a7a9a0b39a68629eb72aecc093400e4bb1568
 2013-09-07 17:34:06 -07:00
Kearwood Gilbert
de324ff279 Fixed bug in KROctreeNode::lineCast that would cause it to always return false 
--HG--
branch : nfb
 2013-09-07 17:34:06 -07:00
Kearwood Gilbert
8484fe95d4 Fixed shader compile error that occurred when using Reflection Map scale or offset attributes in a material. 
Fixed bug that caused the Reflection Map scale to be swapped with the Normal Map scale material parameter.
Fixed bug that caused the Reflection Map offset to be swapped with the Normal Map offset material parameter.

--HG--
extra : source : 76835810d2acad4b58299024c7d23a3d29c7ccbb
 2013-09-07 16:57:18 -07:00
Kearwood Gilbert
eb6ee6c676 Fixed shader compile error that occurred when using Reflection Map scale or offset attributes in a material. 
Fixed bug that caused the Reflection Map scale to be swapped with the Normal Map scale material parameter.
Fixed bug that caused the Reflection Map offset to be swapped with the Normal Map offset material parameter.

--HG--
branch : nfb
 2013-09-07 16:57:18 -07:00
Kearwood Gilbert
4d71287d17 More animation fixes for curves that don't start on frame 0. 
--HG--
extra : source : a70d3a871173dc2ba354825be8828d739699a2aa
 2013-08-31 19:22:37 -07:00
Kearwood Gilbert
7b3ce4d3bf More animation fixes for curves that don't start on frame 0. 
--HG--
branch : nfb
 2013-08-31 19:22:37 -07:00
Kearwood Gilbert
fdfa13fc89 Animation fixes for curves that do not start on frame 0 
--HG--
extra : source : e6f80422c39a1a6a2f5b9ee4830b65f0ad92c37a
 2013-08-31 17:38:20 -07:00
Kearwood Gilbert
0b90046aaa Animation fixes for curves that do not start on frame 0 
--HG--
branch : nfb
 2013-08-31 17:38:20 -07:00
Kearwood Gilbert
b4a3dc369f Fixed bug in animation splitting that would cause curves that don't start at frame 0 to be offset incorrectly 
--HG--
extra : source : c293b845a630673ed0a62c9855e2f295235e3e28
 2013-08-31 15:31:17 -07:00
Kearwood Gilbert
b67ae221cd Fixed bug in animation splitting that would cause curves that don't start at frame 0 to be offset incorrectly 
--HG--
branch : nfb
 2013-08-31 15:31:17 -07:00
Kearwood Gilbert
58d4bae6b6 Fixed bug in animation import that caused the attributes to be un-assigned to nodes. 
--HG--
extra : source : 9cf011cb5f014ef330dfdf4150e0523b64400e03
 2013-08-24 17:04:20 -07:00
Kearwood Gilbert
0cb3db427d Fixed bug in animation import that caused the attributes to be un-assigned to nodes. 
--HG--
branch : nfb
 2013-08-24 17:04:20 -07:00
Kearwood Gilbert
0efee25da8 Implemented animation splitting 
--HG--
extra : source : e2686eec48ec9fa9da4359ce8fb75efa6ebba62c
 2013-08-24 16:37:07 -07:00
Kearwood Gilbert
0300dcdd7e Implemented animation splitting 
--HG--
branch : nfb
 2013-08-24 16:37:07 -07:00
Kearwood Gilbert
cc78975349 Fixed an issue that caused some textures to be unloaded permanently when streaming a world. This manifested itself in cases where a texture unit would hold only a single texture for many frames, such as in scenes where only one object had a normal map in view. 
--HG--
extra : source : 5b9b6d6d1c0f9d35490f0739670d729fb6ea1c9c
 2013-07-27 14:57:50 -07:00
Kearwood Gilbert
14b6a2f56c Fixed an issue that caused some textures to be unloaded permanently when streaming a world. This manifested itself in cases where a texture unit would hold only a single texture for many frames, such as in scenes where only one object had a normal map in view. 
--HG--
branch : nfb
 2013-07-27 14:57:50 -07:00
kearwood
18e44dc835 start nfb branch 
--HG--
branch : nfb
 2013-07-13 13:18:25 -07:00
Ash Mishra
5b738a824f Merged 2013-07-12 09:59:39 -07:00