 Teejoon
|
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 |
|
|
Teejoon
|
336b058c9f
|
WIP, commit to be able to pull stuff down
|
2016-02-04 14:58:46 +01:00 |
|
 antc13
|
84499665d0
|
Changed vertices to skinnedVertices in RawModelCustom.cpp
|
2016-02-04 11:53:17 +01:00 |
|
|
antc13
|
356cf72b0f
|
Changed the structure of the Animation Data in both Exporter & Importer.
|
2016-02-04 11:25:31 +01:00 |
|
|
Teejoon
|
4357759715
|
Merge branch 'Importer' of https://github.com/teamfisk/TacticalZ into Importer
|
2016-02-02 17:18:54 +01:00 |
|
|
Teejoon
|
bb4a65a1db
|
Non-skined mesh WIP
|
2016-02-02 17:18:42 +01:00 |
|
|
antc13
|
e8186a7062
|
Changed the way we're exporting animations.
|
2016-02-02 14:47:22 +01:00 |
|
|
antc13
|
96a735c542
|
Changed .obj to .mesh for all meshes.
|
2016-01-24 16:12:31 +01:00 |
|
|
antc13
|
666f1fd878
|
Removed temp variables & the "forced" animation in DrawFinalPass
|
2016-01-24 15:30:20 +01:00 |
|
|
antc13
|
8286d052b3
|
Changed color values from floats to glm::vec4
|
2016-01-24 14:38:17 +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
|
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
|
8437b9c734
|
Commit for Pull
|
2016-01-15 17:58:26 +01:00 |
|