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

481 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kearwood Gilbert
e466e38501 Implemented KRModel::setLightMap 
Implemented KRModel::getLightMap
Corrected logging bugs and crashes during fbx import pipeline

--HG--
extra : source : d3c9f1247de05d4ecb57210faa5c1809208f7a06
 2013-12-14 18:02:01 -08:00
Kearwood Gilbert
99b9716992 Implemented KRModel::setLightMap 
Implemented KRModel::getLightMap
Corrected logging bugs and crashes during fbx import pipeline

--HG--
branch : nfb
 2013-12-14 18:02:01 -08:00
Kearwood Gilbert
4f61b1f96b FBX Importer messages are now sent through the logging callbacks 
--HG--
extra : source : 5be63aaf609e05f9be60a36a95213f41e6d5f228
 2013-12-14 16:37:14 -08:00
Kearwood Gilbert
c602b12f04 FBX Importer messages are now sent through the logging callbacks 
--HG--
branch : nfb
 2013-12-14 16:37:14 -08:00
Kearwood Gilbert
14aad147fe Implemented logging callbacks for client applications that would like to implement their own GUI 
--HG--
extra : source : bf007f5c932c9110cbdc0dc651c66a02a0c68477
 2013-12-14 16:06:44 -08:00
Kearwood Gilbert
e39eebff26 Implemented logging callbacks for client applications that would like to implement their own GUI 
--HG--
branch : nfb
 2013-12-14 16:06:44 -08:00
Peter Courtemanche
0773cbc4ba Added a quick warning message macro. KRSceneManager updates to del with NULL scenes. 
--HG--
extra : source : ba524aee3db60b42cb093ef9ad76d62f11928a2f
 2013-12-14 14:20:30 -08:00
Kearwood Gilbert
33362c1c2d VBO Swapping TTY message disabled except for DEBUG builds. 
Added comment with details on what actions to take if this message appears in the TTY.
 2014-01-14 21:46:17 -08:00
Peter Courtemanche
f1bc1a52a0 Added a quick warning message macro. KRSceneManager updates to del with NULL scenes. 
--HG--
branch : nfb
 2013-12-14 14:20:30 -08:00
Peter Courtemanche
1c31eded59 removed VBO swapping printf - speeds up the render by 50% 
--HG--
branch : nfb
 2013-12-10 18:05:25 -08:00
admin8onf@admin8onfs-pro.nfbonf.nfb.ca
a0dbc8953c no message 
--HG--
branch : nfb
 2013-12-10 11:25:08 -08:00
Kearwood Gilbert
3d907e06d5 Reverb and Ambient zone visualizations are now exposed through the debug interface. 
Colliders are now imported with a prefix of collider#_ instead of collider_#_

--HG--
extra : source : 3fe036b138659b88a903859578ec9099e5ec353c
 2013-12-09 22:29:13 -08:00
Kearwood Gilbert
084c3a2788 Corrected Kraken xcode workspace. 2014-01-14 21:12:43 -08:00
Kearwood Gilbert
bea3dc61e8 Reverb and Ambient zone visualizations are now exposed through the debug interface. 
Colliders are now imported with a prefix of collider#_ instead of collider_#_

--HG--
branch : nfb
 2013-12-09 22:29:13 -08:00
Peter
7b009c114a Updates for strip_unchanging_attributes to make it act on groups of x, y, z attires 
--HG--
branch : nfb
 2013-12-09 15:35:07 -08:00
Kearwood Gilbert
736bda0ac8 Merge 2013-12-05 22:05:00 -08:00
Kearwood Gilbert
d4f16439fc No longer filling KRLocator::m_userAttributes with fbx properties that had unsupported data types 
--HG--
branch : nfb
 2013-12-05 20:15:32 -08:00
Kearwood Gilbert
5b708fa1cd Implemented KRLocator::getUserAttributes(), which returns a list of additional properties enumerated from fbx files so client code can convert locators into application-specific objects 
--HG--
branch : nfb
 2013-12-05 19:44:58 -08:00
Kearwood Gilbert
f1d23de23f Fixed compilation failure of fbx importer pipeline. 
--HG--
branch : nfb
 2013-12-05 18:46:48 -08:00
Kearwood Gilbert
2a49523fd8 - I have replaced the lines inserted in to KRResource+Fbx that look for “collider_so_” with logic to look for “collider_##_”. This means that Jonny will need to name the flare height colliders with a prefix of “collider_16_” in the Circa 1948 project. 
- The code block starting with “INTERRUPT THE NODE STUFF IN HERE” has been moved to KRImport where it should occur.  I have added an example in there on
- Removed the comments, “***** curves 1, 2, and 3 are x, y, z translation .. the first point holds the key frame in centimeters.  POSSIBLE UPGRADE .. grab the key frame and output it as the start location to the kranimation file”, as this is incorrect and misleading.  You must never depend on the order of the curves in the FBX file.  The exporting of the first point in the animation curve should be done in KRImport, after Kraken has already resolved the animation layers and attribute assignments using proper metadata in the fbx file.  You can do this using the existing Kraken API rather than modifying Kraken itself.  In addition, we can’t make any assumptions based on the first keyframe time matching the animation start time.  The actual animation start time is imported by Kraken using the FBX fields that explicitly specify it.  The reason we read animation start and end times from a text file is to split the animation into multiple animations from a single fbx file.  KRImport can already export a single animation from an fbx file automatically simply by not specifying an animation split file.
- Removed comment, “// **** this is where the assert used to happen”.  This comment adds no value and is confusing to other Kraken users, as the assert does not happen any more ;-)
- Removed comment, “// KRNode *LoadMesh parses the "collider names" and then alters the attributes (NFB HACK)”.  I have refactored this code so this is no longer a hack.

--HG--
branch : nfb
 2013-12-05 18:34:20 -08:00
Kearwood Gilbert
c9d489afab Implemented KRScene::getLocators() 
--HG--
branch : nfb
 2013-12-05 18:20:01 -08:00
admin8onf@admin8onfs-pro.nfbonf.nfb.ca
e70af54206 Merge 
--HG--
branch : nfb
 2013-12-05 15:57:13 -08:00
Peter
fef872cc6d updates to existing importer (bugs, etc.) and addition of importer audio objects skeleton code 
--HG--
branch : nfb
 2013-12-05 15:54:28 -08:00
Kearwood Gilbert
e5121e3958 Fixed syntax error in rim shader 
--HG--
branch : nfb
 2013-12-05 01:17:30 -08:00
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