BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
886 Commits 116 Branches 0 Tags
da49dc35eef8bf1da4bc6625923006e7dda59bea
Commit Graph

50 Commits

Author SHA1 Message Date
antc13 9cb41fcebe Fixed the exported animation matrices 2016-02-02 17:21:51 +01:00
antc13 69bb17aa90 Merge branch 'Importer' of https://github.com/teamfisk/TacticalZ into Importer 
# Conflicts:
#	tools/MayaExporter/MayaExporter/Skeleton.cpp
 2016-02-02 14:50:01 +01:00
antc13 e8186a7062 Changed the way we're exporting animations. 2016-02-02 14:47:22 +01:00
Teejoon 9573958a86 Fixed Git's shitty merge in Skeleton.cpp and The Exporter now Exports meshes with and without skins 2016-02-02 10:19:00 +01:00
Teejoon bbbebe077b Merge branch 'Importer' of https://github.com/teamfisk/TacticalZ into Importer 
Conflicts:
	tools/MayaExporter/MayaExporter/Skeleton.cpp
 2016-02-01 18:06:35 +01:00
Teejoon 4d19158600 No longer need to key frame joins for exporting. Also don't save animations between exports 2016-02-01 18:04:16 +01:00
antc13 8834d5f7a0 Fixed Animation Export 2016-01-27 18:37:56 +01:00
antc13 c5b1afb0d4 Exporter Fix 2016-01-27 09:37:01 +01:00
antc13 666f1fd878 Removed temp variables & the "forced" animation in DrawFinalPass 2016-01-24 15:30:20 +01:00
antc13 b5b1140f5c Custom Animations should now work. We also save color values if there's no texture. 2016-01-24 13:28:40 +01:00
antc13 3baa988ad4 Changed .obj files to our own format. DummyScene.mesh may be broken. 2016-01-23 20:35:58 +01:00
antc13 f1835fd89c Animations PROBABLY works fine if all joints got keyframes. 2016-01-23 18:02:42 +01:00
antc13 c984f76b2f Importing & Reading Custom animation data. TODO: Shaders. 2016-01-20 18:36:03 +01:00
antc13 84b7cf165c Reduced the chance of crashing in Export. 2016-01-20 11:46:32 +01:00
antc13 e643581971 Commit in order to pull from Master. 2016-01-19 18:21:27 +01:00
antc13 3826142e94 Now supporting multiple material per mesh. Simon changed glDrawElementsBaseVertex to glDrawElements in DrawFinalPass.cpp Hallelulijah! 2016-01-19 17:40:34 +01:00
antc13 2a3009212a Importing custom mesh without material. 2016-01-18 19:37:55 +01:00
antc13 16c39df439 Merge branch 'master' of https://github.com/teamfisk/TacticalZ into Importer 
# Conflicts:
#	include/Engine/Collision/Collision.h
#	src/Engine/Rendering/Model.cpp
#	src/Engine/Rendering/RawModelAssimp.cpp
 2016-01-15 18:00:30 +01:00
antc13 8437b9c734 Commit for Pull 2016-01-15 17:58:26 +01:00
stiffly d28583ca9e Fixes for #34 (Licenses) 2016-01-15 17:20:11 +01:00
antc13 24486c314d Reworked the Exporter. 2016-01-13 14:03:58 +01:00
antc13 7b62dc19bf Spitting out Meshes & Animation Data to file. 2016-01-12 15:39:29 +01:00
antc13 0e90382fd1 Merge branch 'master' of https://github.com/teamfisk/TacticalZ into MayaExporter 2016-01-11 13:09:09 +01:00
antc13 1667358e0c We now export animations. 2016-01-08 16:47:04 +01:00
FakeShemp eb5fca898f Fix small bug with push_back order 
Commited directly from GitHub. Blame it if something explodes.
 2015-12-21 12:55:25 +01:00
antc13 c9db46564f Spitting out files WIP 2015-12-18 16:21:07 +01:00
Teejoon 509a989d3b Merge branch 'MayaExporter' of github.com:teamfisk/TacticalZ into MayaExporter 
Conflicts:
	tools/MayaExporter/MayaExporter/Menu.cpp
 2015-12-18 10:07:44 +01:00
Teejoon bc4cc5db54 Changed how we get skeletons. Made so that we could get the bind pose for each skeleton in the scene 2015-12-18 10:03:00 +01:00
antc13 73708ec706 You can now add/remove animation clips. 2015-12-17 14:58:46 +01:00
antc13 67017fcaf4 Stepping through the timeline. 2015-12-16 11:33:42 +01:00
William Moberg 04a01104b5 Merge branch 'master' into OctTree 
# Conflicts:
#	src/Engine/CMakeLists.txt
#	src/Game/Game.cpp
 2015-12-15 17:11:11 +01:00
antc13 498afb3a5e Merge branch 'MayaExporter' of https://github.com/teamfisk/TacticalZ into MayaExporter 
# Conflicts:
#	tools/MayaExporter/MayaExporter/Menu.h
 2015-12-15 15:41:18 +01:00
antc13 4e535c1102 File Writer WIP. Rework soon™ 2015-12-15 15:24:46 +01:00
FakeShemp 1689370356 Export the skeletons 
Not really tested though
 2015-12-15 11:49:59 +01:00
Jace 51dd627ae3 Added Fonts to deploy.bat 2015-12-15 09:49:43 +01:00
antc13 60b3ce89b2 Skeleton/Joints WIP 2015-12-14 12:59:54 +01:00
Jace 35624008e7 InputProxy with a KeyboardInputHandler to translate keyboard keys to input commands. Input origins are bound to commands through the BindOrigin event, or through loading them from a config file. 2015-12-12 13:42:34 +01:00
antc13 a22d086e60 Tested some of the Material Code. Seems to work. The project should now be following the code standard properly (hopefully). 2015-12-10 11:18:34 +01:00
FakeShemp c8cb0ee939 Grab all materials 2015-12-09 11:58:49 +01:00
William Moberg b87e543420 Merge branch 'master' into OctTree 2015-12-08 10:47:27 +01:00
antc13 83e2429c36 Maya Exporter WIP 2015-12-07 14:44:34 +01:00
viktorljung 0f33089039 Merge remote-tracking branch 'origin/master' into Rendering 2015-12-03 14:59:45 +01:00
verysecrethero 1f99d46a8d Merge branch 'master' into OctTree 2015-12-02 15:15:05 +01:00
William Moberg c698149bdd Added Ray, AABB structs, and basic rayVsAABB test function. 2015-12-02 14:24:21 +01:00
sippeangelo ae759654c1 Made deploy create a bin folder so it doesn't fail if it's missing 2015-12-01 11:21:33 +01:00
viktorljung 798e42999d Deploy now linking Shaders correctly 2015-12-01 10:34:53 +01:00
sippeangelo 55276c0bd2 Made path to json file relative 2015-11-25 12:53:50 +01:00
antc13 a854570bce Edit the path to the json_key in the script! 
Once you've edited that, you should be able to just run the script.
 2015-11-25 09:54:37 +01:00
sippeangelo 1a8784b4be Added resource folder for lightweight run-time resources that is also relevant to code, eg. shaders and XML schemas 2015-11-20 16:06:30 +01:00
sippeangelo 63674946ca Initial directory structure 2015-11-20 15:01:37 +01:00