Commit Graph

76 Commits

Author SHA1 Message Date
Gawaboumga 3247435e08 Fix for Linux
Former-commit-id: 8cddb6d53f658144f8659adbd7ecab67eb5a41a2
2015-12-30 15:59:08 +01:00
Lynix 1db673f9be Example: Update FirstScene for NDK
Former-commit-id: d14aad9f6a616796b92b78934e413b588a8e3185
2015-09-28 13:56:33 +02:00
Lynix f54eb0402f Examples: Fix MeshInfos
Former-commit-id: b6c5ea953f60d2b22eaa6aae06d1618efdb09bc1
2015-09-28 12:41:41 +02:00
Lynix 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
Lynix df8da275c4 Switch from Nz prefix to namespace Nz
What a huge commit


Former-commit-id: 38ac5eebf70adc1180f571f6006192d28fb99897
2015-09-25 19:20:05 +02:00
Lynix c183102784 Examples: Fix HardwareInfo
Former-commit-id: f11e0b1f012fedd2be903cc3da91af72ca036e10
2015-09-24 21:36:59 +02:00
Lynix 505f1dbb03 Merge branch 'master' into NDK
Conflicts:
	include/Nazara/Core/Algorithm.inl
	include/Nazara/Core/ByteArray.hpp
	include/Nazara/Math/Algorithm.inl
	src/Nazara/Graphics/SkyboxBackground.cpp

Former-commit-id: 42f52f71989fa805f69527fd07edb8405df06566
2015-08-21 18:55:58 +02:00
Gawaboumga 3dbcb25384 Transfert enumeration from file to enums
Former-commit-id: 0d9e191373affda50d0eb6c2376c7a23720e591b
2015-08-21 11:22:35 +02:00
Lynix f4c3ec51ed Final VS fixes
Former-commit-id: 6da44f94127f61de39710a52b8b3b73ce19c1269
2015-06-14 16:18:37 +02:00
Lynix b2a248d6f5 Merge remote-tracking branch 'origin/BuildSystem-Update' into NDK
Conflicts:
	build/scripts/common.lua
	build/scripts/module/audio.lua
	build/scripts/module/core.lua
	build/scripts/module/graphics.lua
	build/scripts/module/lua.lua
	build/scripts/module/noise.lua
	build/scripts/module/physics.lua
	build/scripts/module/renderer.lua
	build/scripts/module/utility.lua

Former-commit-id: 8374b17a214e0efbdc7d35e81ed809f8dc9d3b79
2015-06-13 23:26:34 +02:00
Lynix 0a7711d85b (Scene) Added CreateNode and Clear methods
Former-commit-id: de92f4a4be45e5cbd1d2d83191300e0b46764f0e
2015-01-23 22:35:41 +01:00
Lynix b37ec10760 Oops.
Former-commit-id: 81a0e9f5e6cf26ed18633cabbd916881ef6559f3
2015-01-22 23:45:32 +01:00
Lynix debe39501e Added experimental new build system
Former-commit-id: ab7fb35db6be4b975d0558680c840d72e38562f9
2015-01-20 23:37:49 +01:00
Lynix 8a3c410d60 Made bounding volume handing part of SceneNodes
Former-commit-id: d09d06ac4515ce09aa16fd92dd045c2a06730a99
2015-01-20 20:35:16 +01:00
Lynix 98aa804de5 Flipped texture coordinates
Nazara now use a top-left corner origin for UVs (DirectX-like)


Former-commit-id: 550dd76cf15bc731d1e23060d1af15c3cd5cb4fd
2014-08-25 22:37:36 +02:00
Lynix eceabcd241 Fixed some of the pull request code in order to merge it
Former-commit-id: 76d71f15b335535e7dfcaf986440a00e85e45c1b
2014-06-15 01:55:07 +02:00
Gawaboumga 676ed6c9d8 Correction of mathematical functions.
BoundingVolume: Add of constructor and setter OrientedBox. Extend is now
up to date.
Box: Use of <T>. Return this
Frustrum: Use of <T>
Matrix: Use of <T>
OrientedBox: m_corners is up to date
Rect: Add of operators /= and /. Return this
Sphere: Add of Intersect and Contains with box. Little corrections.
Vector2: Return

TaskSchedulerImpl: Add of include header cstdlib to compile because of
std::div
HardwareInfo/main: use of accentAigu

Former-commit-id: a5a7f8e8c45448e5683eb13bff453d6f67478d03
2014-06-14 22:10:37 +02:00
Lynix 1dd25f4e73 Fixed MeshInfos not compiling
Former-commit-id: 3e3c840402eca5eb1e3fa5104a91e41d5d669139
2013-09-06 23:27:10 +02:00
Lynix f69d2f13e5 Changed light model
Former-commit-id: bdf192bd83dbb5ae3ce8c46d6414e5b4fbc0047a
2013-08-28 02:52:09 +02:00
Lynix 1493da0466 Increased user-friendlyness
Former-commit-id: 9611bb08f0be314d65453b88d84c36299d9a22af
2013-08-23 22:05:17 +02:00
Lynix c8414a39d8 Big Graphics update
Separated LightManager
Added Sprite class
Added View class
Camera is no longer a SceneNode
Fixed Material not invalidating programs
Renamed CameraPosition uniform to EyePosition
Renamed VisibilityTest to FrustumCull


Former-commit-id: ff7fbe4d9b31a3c269baab0b48c6faa347a12161
2013-08-21 20:05:33 +02:00
Lynix 43b455bacd Removed 16bits rendering demo
Former-commit-id: a1dffd557b64e868597420852e37338eed329c87
2013-07-02 01:23:31 +02:00
Lynix a5fb0c804f Small improvements to FirstScene's camera
Former-commit-id: 80545964ee9ab8693f43992b4c4a2610e93e78c9
2013-06-18 16:56:49 +02:00
Lynix e9fe3440e5 Added header to demos
Former-commit-id: fd9b0ddd666a99ba67e519b41186828fb4272cc4
2013-06-13 20:37:42 +02:00
Lynix bb99d044bb Nazara now use meters as units
Added scale mesh parameter
Added smooth camera to FirstScene demo


Former-commit-id: b3985e10d84512e3b32f2569ac034ba63ace589a
2013-06-13 19:29:59 +02:00
Lynix 9870a2249b Added Lua extern library
Former-commit-id: 597a37211727803de7c8816a23154d71b8446cea
2013-04-12 16:51:04 +02:00
Lynix 793a3388c7 Fixed FirstScene model not having normal map
Former-commit-id: b8ee4ff55625de707590986cd8dd06e560d0e793
2013-04-09 21:04:10 +02:00
Lynix 978e6bba26 Improved FirstScene
Former-commit-id: bd84c63fee10cb603212fe89b59057bcb27c5aeb
2013-04-09 19:46:10 +02:00
Lynix ac1b69c62b Fixed missing skybox
Oops


Former-commit-id: f2c6f5e7e3e76bceed7d5f1b523d31758240cbb6
2013-04-09 14:38:21 +02:00
Lynix 98fa4abc40 Improved FirstScene demo
Former-commit-id: d252c37835d130d83ced925980f8329e1e771e65
2013-04-09 14:31:02 +02:00
Lynix 2c7744af41 Fixed last commit
Yep, forgot to test it :D

It should be okay now


Former-commit-id: 3392523240affb4151f5121decb0e458500878a3
2013-04-03 01:25:57 +02:00
Lynix 34dbd19385 Merged 2D and 3D modules into Graphics module
Former-commit-id: 33bf0fbe727e50e864bc52680c95a106ada508e9
2013-04-03 01:14:55 +02:00
Lynix c56c1b10dd Updated MeshInfos code
Former-commit-id: c0162cdec26d2dbc4a2ebe8e4595e3c6974c755d
2013-03-30 18:04:50 +01:00
Lynix 60e9d14a92 Improved comment
Former-commit-id: d9a47456146b8812f73beb58d1e5f94b2c88f668
2013-03-29 23:13:17 +01:00
Lynix 0603590549 Added 16bits demo
Former-commit-id: 2ee4535da2d068366f00be9aeff93d2205b40dcb
2013-03-22 18:16:01 +01:00
Lynix ccea00b12e Added backgrounds
Former-commit-id: e3959b04a124978c473bd6330047b5fd6ac27b19
2013-03-21 23:02:11 +01:00
Lynix 23b760139e Completed Vector3 vectors
Former-commit-id: 73c16102c22fe1d01b9b9411aa3e1bf82949542c
2013-03-21 22:52:19 +01:00
Lynix 90f056739d Improved some comments
Former-commit-id: f9d3267677196952d17c52d5f31ebacdb50eb899
2013-03-13 16:54:25 +01:00
Lynix 278963973a Improved FirstScene comments
Former-commit-id: 7506db9b0a64714533c51a2eda6d8eac41a81356
2013-03-08 12:17:32 +01:00
Lynix 39e54474dd Added Window::Close (soft way to close window)
Former-commit-id: 9d47ed3ed38d62928f3cb6356fed07501b5e92d5
2013-03-08 01:20:26 +01:00
Lynix 9b7a0ff4d7 Fixed MeshInfos
Former-commit-id: 1eeec63c065b2faf44703a500149e9c0dd58f10a
2013-03-06 01:06:36 +01:00
Lynix 16a6a78299 Added new scene demo
Removed bugged demo AnimatedMesh


Former-commit-id: 312e27e65ebff620e03733b317c52b3857d1faf9
2013-03-06 01:01:22 +01:00
Lynix f53f556e58 Fixed HardwareInfo
Former-commit-id: 49ac30c152913f6ace3732c394fc4a38cccd87c4
2013-03-02 00:32:55 +01:00
Lynix 668288265e Removed useless braces
Former-commit-id: f43934e0a2a0c125820f3bcea0a923165ca0ade3
2013-02-16 20:07:10 +01:00
Lynix be12026a30 Fixed HardwareInfo not compiling
Former-commit-id: 70f193cc041f431970c4dd6a0d9993ff5fedc659
2013-02-13 01:33:40 +01:00
Lynix 692c578673 Fixed comment
Former-commit-id: cc18a8a6fa5b7e58cca26910a83c42e81aead576
2013-01-30 01:35:47 +01:00
Lynix 0671154f29 Added HardwareInfo demo
Former-commit-id: 8b7bc7f4d45d11702bf28c1aa76fa2c2b47f0918
2012-12-29 14:59:32 +01:00
Lynix 3b5cf9c60b Fixed MeshInfos
Former-commit-id: 85ad82b3d70a3239cb76c6d7ff70f6c56942e952
2012-12-29 01:37:58 +01:00
Lynix 49f37e17ae AxisAlignedBox::Transform now apply translation
Added an optionnal argument to prevent translation from being applied
Updated demo


Former-commit-id: c56cb04733379eb6dda98b150931fb0e496ef889
2012-12-28 22:57:40 +01:00
Lynix 21b60809ad Updated global headers
Former-commit-id: 024667d27905a561eebd9e38e8b141bcb0323339
2012-12-27 02:36:26 +01:00