060e674a6f
Picking supports skinned meshes
2016-02-08 17:37:18 +01:00
d2cfa592f0
Supports skinnd and unskinned meshes
...
ExplosionEffects now supports SplatMapping
2016-02-08 13:01:10 +01:00
92ab22e779
Splatmapping now working.
...
Rendering pipleline now support 3 different types of Material:
Basic: a material with a single color on every property (diffuse, specular, ect).
SingleTextures: a material with a single texture in all or any property. Have a single color on the rest.
SplatMapping: has a SplatMap and 0 to 5 different textures to every property. Properties with o texture uses a single color insted.
All materials with a texture has a UVRepeat, telling how many time to till in U and in V.
modelJobs now uses ShadeID, ModelID and TextureID for the Hash insted of only Texture
MayaExported exports 3 differnt types of material, the same as the piplen now supports.
2016-02-07 13:39:13 +01:00
c272857819
Merge branch 'Importer' of https://github.com/teamfisk/TacticalZ into Importer
...
Conflicts:
src/Engine/Rendering/RawModelCustom.cpp
tools/MayaExporter/MayaExporter/Skeleton.cpp
2016-02-04 15:05:00 +01:00
336b058c9f
WIP, commit to be able to pull stuff down
2016-02-04 14:58:46 +01:00
356cf72b0f
Changed the structure of the Animation Data in both Exporter & Importer.
2016-02-04 11:25:31 +01:00
9cb41fcebe
Fixed the exported animation matrices
2016-02-02 17:21:51 +01:00
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
e8186a7062
Changed the way we're exporting animations.
2016-02-02 14:47:22 +01:00
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
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
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
8834d5f7a0
Fixed Animation Export
2016-01-27 18:37:56 +01:00
c5b1afb0d4
Exporter Fix
2016-01-27 09:37:01 +01:00
666f1fd878
Removed temp variables & the "forced" animation in DrawFinalPass
2016-01-24 15:30:20 +01:00
b5b1140f5c
Custom Animations should now work. We also save color values if there's no texture.
2016-01-24 13:28:40 +01:00
3baa988ad4
Changed .obj files to our own format. DummyScene.mesh may be broken.
2016-01-23 20:35:58 +01:00
f1835fd89c
Animations PROBABLY works fine if all joints got keyframes.
2016-01-23 18:02:42 +01:00
c984f76b2f
Importing & Reading Custom animation data. TODO: Shaders.
2016-01-20 18:36:03 +01:00
84b7cf165c
Reduced the chance of crashing in Export.
2016-01-20 11:46:32 +01:00
e643581971
Commit in order to pull from Master.
2016-01-19 18:21:27 +01:00
3826142e94
Now supporting multiple material per mesh. Simon changed glDrawElementsBaseVertex to glDrawElements in DrawFinalPass.cpp Hallelulijah!
2016-01-19 17:40:34 +01:00
2a3009212a
Importing custom mesh without material.
2016-01-18 19:37:55 +01:00
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
8437b9c734
Commit for Pull
2016-01-15 17:58:26 +01:00
d28583ca9e
Fixes for #34 (Licenses)
2016-01-15 17:20:11 +01:00
24486c314d
Reworked the Exporter.
2016-01-13 14:03:58 +01:00
7b62dc19bf
Spitting out Meshes & Animation Data to file.
2016-01-12 15:39:29 +01:00
0e90382fd1
Merge branch 'master' of https://github.com/teamfisk/TacticalZ into MayaExporter
2016-01-11 13:09:09 +01:00
1667358e0c
We now export animations.
2016-01-08 16:47:04 +01:00
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
c9db46564f
Spitting out files WIP
2015-12-18 16:21:07 +01:00
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
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
73708ec706
You can now add/remove animation clips.
2015-12-17 14:58:46 +01:00
67017fcaf4
Stepping through the timeline.
2015-12-16 11:33:42 +01:00
04a01104b5
Merge branch 'master' into OctTree
...
# Conflicts:
# src/Engine/CMakeLists.txt
# src/Game/Game.cpp
2015-12-15 17:11:11 +01:00
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
4e535c1102
File Writer WIP. Rework soon™
2015-12-15 15:24:46 +01:00
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
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
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
c8cb0ee939
Grab all materials
2015-12-09 11:58:49 +01:00
b87e543420
Merge branch 'master' into OctTree
2015-12-08 10:47:27 +01:00
83e2429c36
Maya Exporter WIP
2015-12-07 14:44:34 +01:00
0f33089039
Merge remote-tracking branch 'origin/master' into Rendering
2015-12-03 14:59:45 +01:00
1f99d46a8d
Merge branch 'master' into OctTree
2015-12-02 15:15:05 +01:00
c698149bdd
Added Ray, AABB structs, and basic rayVsAABB test function.
2015-12-02 14:24:21 +01:00
Teejoon
antc13
stiffly
FakeShemp
William Moberg
FakeShemp
Jace
viktorljung
verysecrethero