ad47350499
Utility/OBJParser: Fix failure to load some OBJ because of their "high error rate"
...
Former-commit-id: b843560802e9e94693e3009a2bb2fa5b999943b2 [formerly f8d90aced86d82320c6b204df6095d4e90d5d096] [formerly 71eae479386c14f1a849f5298a4273b777591668 [formerly 91000e7d5641e27fce88710737d0fd0852a467fa]]
Former-commit-id: 45a6f0bf8ecf22fbbf9413f8d915ccd3010b4556 [formerly 1a1cc33d6ec5afef38988f9b12331ca52c24213b]
Former-commit-id: 55c29ffe310d91590fb39c2894817dd8ff862cdb
2016-08-09 00:08:31 +02:00
0c533d378f
Utility/MaterialData: Remove CustomDefined
...
Former-commit-id: 3dc61fac4aa014daa8ccb2732bd3010c9b7a3013 [formerly 911c0c99570971d97e69d4a7d544ec1666432c26] [formerly cd5daaf8eb34d687da378f2531714d794b193a42 [formerly 5f58954832a234a14396585247dd18e1101f2918]]
Former-commit-id: 22a69eb53fb4e400203bcbf0222a7b338de70ab1 [formerly 3f66b581a5b1c55c288a9226a7791981877ea68e]
Former-commit-id: 921e4fe70ce1240e92c0c057ffe4a7678fc58a0b
2016-08-04 01:12:06 +02:00
5b83ac044b
Improved declarations
...
Former-commit-id: 19169e7acc6fd5d7ea7399ec9b2614c028a1dfd2 [formerly c383d9fbf62f8868d0834dcdd08a1f7b7f3ff81a] [formerly 4633f0bfb8c049bc2ce10ea2aa47684c7ae7a030 [formerly 4a92fd2e96b20daedf2d04006053e7600c60cd79]]
Former-commit-id: fcb2bfac13cdc0d6cf5d7b9c19a5cf11b04874c1 [formerly b631d69d2d2795c3bd60bc89085579087df6b73b]
Former-commit-id: 105a4d1bb3e05266c8c5cde7f87e14444a5de49c
2016-08-02 13:31:09 +02:00
76818335ff
Revert "Core/RefCounted: Remove persistent boolean"
...
This reverts commit db2ef3e90c3871290d114a9e6437b412e96c65aa [formerly a3f6ff88a25e63374eb6ce5b18269da2ba743b06] [formerly cfa12604fbb0da76fc27288b210ee1254a8b3a38 [formerly dee6ce858398e2de38ef1af00c1c630fd0126e09]] [formerly 1a23f0fddcd80ac33030061b7a00a3cfd43cb7fe [formerly d3cb17069c71449ae3f1cba6de55ea70f509e7a4] [formerly b2f8f82e9f3427310204f2e8a61d7bdfd96202d2 [formerly 5d117720d08d6d6243b3428d4b3f8aea1abef845]]].
Former-commit-id: fcbfc6cb2fac86f6f10ff5def148cc5635082c83 [formerly 6bcf746c9b6f35aff6786da950001da11cedfc48] [formerly 9d219f350ddebbfa60eaa9c382d8d811d963ac15 [formerly 75f534e850802526877b811e8f6ca510bb7f2c16]]
Former-commit-id: b5ca8fa1bde036ccb4f7be17a98ef8275ab5cf2a [formerly ee166858dad5c8cd00249894266b13e8ce1a153e]
Former-commit-id: 2a601076664aebc1107654dd80f3b53f7acbc044
2016-08-02 13:20:34 +02:00
b7a08a6aa7
Core/RefCounted: Remove persistent boolean
...
Former-commit-id: b5681c26fc30db38b94f9c1ecc9c12ee699af767 [formerly aeebf599245261644fd5fb54fe9f64067a63afc9]
Former-commit-id: f7bcc658c93cc3977ffa91a617b7ca4d463b4aca
2016-08-02 12:52:49 +02:00
df828cd0df
Utility/OBJParser: Abort parsing when there's more than one error per two line
...
Former-commit-id: 5b4cad994aa57293e8099c006619d3fb0c7429b1 [formerly 79c2ce8fe15176f91d2078866798ddd6f78ce044]
Former-commit-id: 12e75819f8d65b980199a803f0f8138061ea644d
2016-07-29 13:37:44 +02:00
9bd6d07d04
Delete Image.inl.save-failed
...
Former-commit-id: 830baf88d81513f7cbf498d728186f896077d0ed [formerly edf52cb3946dbe72e007fa5d3c895903f01758b8]
Former-commit-id: 4d6cdde8c24c8692569fc5bac03a44997a173607
2016-07-12 17:16:20 +02:00
b99e945ef3
Utility/Mesh: Add MeshSaver properly
...
Former-commit-id: 1f6f19faaa6b7cbd978dbdee1351683e2ba05a2b [formerly 1ea64fb952d6eb8b5ba0d6cbe672767a6e7c703d]
Former-commit-id: 9e84e1c65ef9acebf90ca58d861cb118ea201c8d
2016-07-12 08:14:05 +02:00
b44cf8d361
Utility: Add MTL exporting
...
Former-commit-id: 6174df9379702cac1eac0b348143004022bc6c59 [formerly 8efc71bc323e64c88a1927d4d88453db41786b55]
Former-commit-id: d713cb74ac26873e6ac6664145e78eed286c022f
2016-07-12 08:14:05 +02:00
09ea615c8a
Utility/Mesh: Fix error
...
Former-commit-id: 5d4c7ae3741ec59a0463775290f7878310e7c9e7 [formerly 371cf43770cd57a4a0c2ac25ad9bc7d0f1ef844d]
Former-commit-id: a10d6777c4f7e5400f1f231b511b591528aa9a7f
2016-07-08 12:40:25 +02:00
3b57197e44
Utility/Mesh: Add MeshSaver
...
Former-commit-id: 2fa56a6f6a1ea10ae93613e57d8355055d46c798 [formerly c74c834ef594c16356d58a458d68d2e528f1aa78]
Former-commit-id: c47fcbeeeac1a98e9c0cc52244b7220e7ce03234
2016-07-08 08:37:22 +02:00
f9901561ac
Utility: Allow TriangleIterator and VertexMapper to take constant submesh
...
Former-commit-id: aa0b6deee520437f5b484428e077df95983df117 [formerly 5464cd28f30dc4305368fedd5639ad216ba43a49]
Former-commit-id: 01a16afe0218787fe5edd7b9078908297452b453
2016-07-08 08:36:42 +02:00
7460131cdb
Utility/IndexMapper: Makes it work without index buffers (sequential mode)
...
Former-commit-id: 805f95b42ef40b122074eb0b8305d5d52cc019fd [formerly bdc844eb63e4f0fe94c42c714a8d5ec8d0032da4]
Former-commit-id: 0eb451037196a079228def2549e9ca7c194fd3f1
2016-07-08 08:35:36 +02:00
77b2badcbc
Utility/OBJParser: Prepare for saving
...
Former-commit-id: ae724ed4c7f89e6b4a4b096eada8551297f07b79 [formerly 287cf1712a73656613a6cf03ce92e6d78c528102]
Former-commit-id: 0bd0cab46f1865e0b719e7fc7675146b28e69a0f
2016-07-08 08:34:45 +02:00
62ae81821e
Utility/OBJParser: Add saving
...
Former-commit-id: 5fa9694afeed1cdb19b17dca2642d391e628a25e [formerly 47991e12efca44a545a464f7d623019687e9bfa9]
Former-commit-id: 4635953b18b9b1a48c1375f55a0d907536de3c85
2016-07-07 09:00:50 +02:00
00a3818489
Utility/OBJParser: Optimized loading
...
Former-commit-id: 5cdc92ab6636438e5bd24f9bc51ebe78786792ea [formerly f1ae2ff8233cc96f4abf098f8d9d17eedbfbab3e]
Former-commit-id: c896b757f7b0bda31763ce69ba20a65671c0243d
2016-07-07 09:00:35 +02:00
57b03bd9ed
Utility/MaterialData: Fix FaceCulling being used for FaceSide
...
Former-commit-id: 7529332749a01512188dce36ec0486354e0e7e8f [formerly 7154109a1a828509720e5a0039b8efc3fde4727d]
Former-commit-id: f9e43b017d8750abf43ba83f6565c1dcbab4cef6
2016-07-07 08:57:11 +02:00
086de1f71c
Fix a shitload of warnings in 64 bits mode
...
Former-commit-id: d3d40b9f364a0a27a3411586e62a16443ee5de00 [formerly 71282c40087232985fa19b8dcbd0d75bd4fcd97b]
Former-commit-id: c11c69d4c1f40bdd33f721cb33c68c4144771510
2016-06-13 21:09:55 +02:00
03494f21e6
Utility/MaterialData: Add Material name information
...
Former-commit-id: 3336fab5ebf757eaf57efcf67b06161af6ce3b32 [formerly 536e0c8e4f3759ccd2c66998d90f94c7e8811b5a]
Former-commit-id: 32dd536b3e3c5193271b85a8487b51b4079afa24
2016-06-09 08:47:08 +02:00
33dbf6ffa0
Utility/Mesh: Replace scale by transform matrix
...
Former-commit-id: 5f1d121a44a86fac59e32b993a015c4e0d464618 [formerly 2ba88d2c6c0a6913fee3d8945ab5870b163d654a]
Former-commit-id: 84b306c8bf7abaee0161eb4a8e4e2d46da7698ac
2016-06-09 08:46:44 +02:00
a3d681b802
Utility/PixelFormat: Fix ComputeSize for DXT formats
...
Former-commit-id: fbc4390a2ff6747a2e7047a10d0a47c64fa59d1c [formerly d9df1b4535857c96ab396b8afcb69658528093f7]
Former-commit-id: cb591414508a1d4b5ebc217b4b063a795020309e
2016-06-02 19:10:41 +02:00
b2f1762148
Fix some GCC warnings
...
Former-commit-id: fc3fa0fba08f558fc78eae72efdd150da9110a31
2016-05-25 13:52:10 +02:00
8a38bb767d
Utility: Rework PixelFormat (WIP)
...
Former-commit-id: bb48562e5f5caac023fcfca7840931aaae7a7821
2016-05-17 14:23:45 +02:00
6c8d2ed03a
Merge branch 'NDK-ShadowMapping'
...
Former-commit-id: 0fcd92b113069d2ee1edc74cf9be471cd6d97267
2016-05-13 13:06:23 +02:00
2b04a4722f
Utility/*TextDrawer: Fix bounds starting at a negative position
...
Former-commit-id: 06ac76189b5c36e108b5fc80b3c54d01068deadd
2016-05-11 12:27:18 +02:00
3b5d6e9cde
Make mesh able to carry material informations
...
- Move OBJ Loader to Utility module, where it belongs
- Change Mesh material informations from a path to a parameterlist
- Improve Mesh code
Former-commit-id: f16f48f8b6399188a09797cec3707ab6726bdbca
2016-04-30 18:44:33 +02:00
d1e12a6d2e
Sdk/Binding: Bind Font::GetDefault
...
Former-commit-id: 5245ada09cd376dfaf69f06ca982c89dc438fae8
2016-04-23 22:48:14 +02:00
de76b48fdd
Utility/Loaders: Fix and enable DDS loader (experimental)
...
Former-commit-id: 647e4527d47bc82b25eb713b8e6ffc4f424ba6c3
2016-04-21 13:23:11 +02:00
718713dbdd
Utility/PixelFormat: Add experimental IdentifyFormat method
...
Only supports RGBA8 for now
Former-commit-id: 8661dc7cab767de5d66efebe5e7038807ba712f7
2016-04-21 13:22:31 +02:00
e5f5d7ed11
Utility/PixelFormat: Add ComputeSize method
...
Former-commit-id: 8d9017541a812c98ba96c694cbd10da895338d1d
2016-04-21 13:21:39 +02:00
37aa00b2e7
Merge branch 'master' into NDK-ShadowMapping
...
Former-commit-id: e2be28b65207dfbb81efe58f31ca31548afecee7
2016-04-17 19:57:15 +02:00
c935c1a293
Graphics/OBJLoader: Allow users to specifiy a vertex count cache when loading
...
Former-commit-id: 87ebc2aefe2c2091fd483793f880724e1ed6ac3d
2016-03-08 13:39:08 +01:00
dce587bd63
Add support for custom resource parameters
...
And allow users to skip a precise loader using them
Former-commit-id: 297af2e4a24ad67c343aae5d89352abf4ea05f63
2016-03-08 13:37:17 +01:00
d6ff7d065e
Utility/Image: Add saver (allowing to save images)
...
Former-commit-id: df78d657256f8a6b7dad5ab11877aae7402608b3
2016-03-08 13:11:09 +01:00
36067e31c4
Utility/Window: Make Window moveable
...
Former-commit-id: 8c780562acc61d15437ed21c16eed92b6dd97373
2016-03-01 14:00:53 +01:00
4562243c5f
Utility/SimpleTextDrawer: Update SetColor method (will no longer force full regeneration)
...
Former-commit-id: 3f3043ea5c5d3add1358d50eb3f92e452d931dbf
2016-01-08 14:00:54 +01:00
ae6ba51380
Utility: Remove useless file
...
Former-commit-id: e3b885151fe47d60bc4904605859b98d7b4c4110
2016-01-07 18:07:51 +01:00
b9ec4a4fc4
Utility/SimpleTextDrawer: Add Clear method
...
Former-commit-id: 10f7c36edb7f0d1705709b070e78792708cdbebf
2016-01-06 19:05:26 +01:00
235fbf1877
Utility/SimpleTextDrawer: Add optimized AppendText method
...
Former-commit-id: 4608e95d19fe5256d205a0d02b75b1f496f629cc
2016-01-05 13:50:52 +01:00
7f4a7c1012
Add override where missing
...
Former-commit-id: 2a876a280bc29f45ba81cedff5a3efeb5b70efab
2015-12-30 15:15:20 +01:00
4619099a01
Core/SimpleTextDrawer: Fix assignment operator
...
Former-commit-id: 52aa69ef0712d142ab36eae6dedf084c32a08012
2015-11-25 18:20:02 +01:00
bbe8a776e8
Fix a shitloads of warnings on VS
...
Former-commit-id: fca61118f4e0530ed2eaaf9ff96de29806aa5aa8
2015-11-25 18:19:26 +01:00
ed961f5ba8
Core: Merge InputStream and OutputStream to Stream
...
Remove serialization support from Stream
Former-commit-id: 7a761e4fcd07cab561f13e4709c4492ed18da88a
2015-11-20 13:52:49 +01:00
7db9be3cfb
Disable memory manager for every module
...
Former-commit-id: 4c6e0a87de57bf55780cc9dfee280cc198d06704
2015-09-28 00:41:24 +02:00
37586e7283
Switch from Nz prefix to namespace Nz for linux
...
Former-commit-id: 64eeaf3c633254b04910ebd4576fd9e910002be0
2015-09-27 15:58:49 +02:00
eaf1bb3601
Merge branch 'NDK-Refactor' into NDK
...
Conflicts:
examples/HardwareInfo/main.cpp
include/Nazara/Renderer/Enums.hpp
include/Nazara/Renderer/GpuQuery.hpp
include/Nazara/Renderer/OpenGL.hpp
include/Nazara/Renderer/RenderBuffer.hpp
include/Nazara/Renderer/RenderTexture.hpp
include/Nazara/Renderer/Texture.hpp
src/Nazara/Graphics/AbstractRenderTechnique.cpp
src/Nazara/Graphics/DeferredRenderTechnique.cpp
src/Nazara/Graphics/Material.cpp
src/Nazara/Graphics/SkyboxBackground.cpp
src/Nazara/Renderer/GpuQuery.cpp
src/Nazara/Renderer/OpenGL.cpp
src/Nazara/Renderer/RenderBuffer.cpp
src/Nazara/Renderer/RenderTexture.cpp
src/Nazara/Renderer/Renderer.cpp
src/Nazara/Renderer/Shader.cpp
src/Nazara/Renderer/ShaderStage.cpp
src/Nazara/Renderer/Texture.cpp
Former-commit-id: 2f1c7e9f9766f59ab83d9405856a1898ac4ab48f
2015-09-25 23:16:58 +02:00
df8da275c4
Switch from Nz prefix to namespace Nz
...
What a huge commit
Former-commit-id: 38ac5eebf70adc1180f571f6006192d28fb99897
2015-09-25 19:20:05 +02:00
dea3fb4e39
Convert spaces to tabs
...
Former-commit-id: b459cfe0c83f651cc660d42f7d3014c3b146f345
2015-09-24 00:55:57 +02:00
2fd3872099
Core: Remove NonCopyable
...
Former-commit-id: f8c6d10ad0b1abb4a32e3c867b7f24fd4bde68a4
2015-09-24 00:37:21 +02:00
b16abf0d09
Merge branch 'master' into NDK
...
Conflicts:
build/scripts/module/renderer.lua
build/scripts/module/utility.lua
include/Nazara/Renderer/OpenGL.hpp
src/Nazara/Core/String.cpp
Former-commit-id: 0a8054be56f01b12c604c88b829cb10b490a9d6f
2015-09-20 23:41:21 +02:00
Lynix
Gawaboumga