Lynix
abb806f27b
Updated ShaderBuilder to support lighting
...
Compile into 150 core GLSL (or 110 if not supported)
When the ShaderBuild fails to build a shader, it returns the default
shader
Former-commit-id: ca04a6968bb104b9a63d40025d7eeba813a588b0
2013-01-08 18:38:00 +01:00
Lynix
093d0ab0b5
Changed default material ambient color
...
Former-commit-id: ad2260abbe06940413ee2cdabd58176364b54365
2013-01-08 17:31:59 +01:00
Lynix
e6cef2ddbf
Added move constructor/operator to Shader
...
Former-commit-id: b947e0ac0dcddcfe64c83b63cf89df0e0850cbd2
2013-01-08 17:31:42 +01:00
Lynix
e194d11374
Fixed color alpha not being sent
...
Former-commit-id: 0f7d355b22790aa5487ff69b325c41613a94961e
2013-01-06 02:47:46 +01:00
Lynix
da341001ab
Made shader uniforms less verbose
...
Former-commit-id: aa77b9be3f84cad30b13ebe5d47bb9febd17631e
2013-01-06 01:06:55 +01:00
Lynix
c93e8eb585
Updated shader convention
...
Vertex input are now prefixed by "Vertex" (VertexPosition, VertexNormal,
..)
Same for Material input (MaterialAmbientColor, MaterialShininess, ...)
Former-commit-id: 1fbf8b8b32546a21ee23ff83714c860a9a8fce4f
2013-01-05 23:52:41 +01:00
Lynix
e6198f6b3d
Fixed default value of shininess
...
Former-commit-id: c640ed5b74cc56bf9b4acf8af4fad40be1c55e76
2013-01-05 19:51:28 +01:00
Lynix
07aa5d095c
Fixed matrices not being updated in the shader
...
Former-commit-id: 8eb208b656bec0d63163d2a00768a4216979a8b0
2013-01-05 19:51:01 +01:00
Lynix
29755989fd
Fixed specular color not being applied
...
Former-commit-id: ab41e431e2f9ec0f9b3cd81d032f6218c7114c5b
2013-01-05 01:54:14 +01:00
Lynix
80d4159faa
Added DebugDrawer::DrawTangents
...
Former-commit-id: 9116b5a878752ff193073ac6c156ddca54f8c501
2013-01-04 22:02:47 +01:00
Lynix
182c667603
Added DebugDrawer::DrawNormals(submesh)
...
Former-commit-id: 9a2100f8df288b63d3b64c05871ae42c1fad97f6
2013-01-03 19:41:23 +01:00
Lynix
844ab809d3
Fixed warning
...
Former-commit-id: 93cbeb5f38e5663a0d8960b139c6cd5fc530e695
2013-01-03 03:50:30 +01:00
Lynix
27dcd15d26
Fixed ShaderBuilder requirement
...
Former-commit-id: 39ddf1db5bec377afd478dcf557925d70925401c
2013-01-02 21:51:37 +01:00
Lynix
520643140c
Fixed last commit
...
Former-commit-id: 5034392dbdab232be71f8537638ed75c1c81eab8
2013-01-02 13:41:26 +01:00
Lynix
15888b0f42
Fixed debug line width not applied
...
Former-commit-id: 374173039602080e82e0e4ce0967caea90599155
2012-12-28 23:08:37 +01:00
Lynix
e5650698d2
Added copy/move constructor/operator to Material
...
Former-commit-id: a96676391754ee027bdd6c7b04118db3ea044eb3
2012-12-27 22:22:11 +01:00
Lynix
91b85589d9
Simplified code
...
Former-commit-id: f80280c30dad6c0a2dd1b5ff36ace6825963fc4c
2012-12-27 02:36:39 +01:00
Lynix
0a11e82432
DebugDrawer now use ShaderBuilder
...
Fixed demo not initializing debug drawer
Former-commit-id: a14612a374507501496f895ef6ba94886db98ec9
2012-12-25 12:29:19 +01:00
Lynix
c65e3d5def
It is now possible to use const shaders
...
A non-constant shader is no longer required to bind or to send uniform
Former-commit-id: 8fd7c03b65a2d9fcea69516c023fee034299148c
2012-12-25 12:26:40 +01:00
Lynix
df7b11d1d2
Added ShaderBuilder
...
Former-commit-id: 0eee75821b7bb4b2b69a020c8e79f3cbe18b522f
2012-12-25 12:14:57 +01:00
Lynix
a9e82f6014
Changed Shader conventions
...
Uniform variable are now CamelCase
Former-commit-id: 7b08fb6b7d32f0f9a92b5086719f3e9981483e16
2012-12-25 12:14:32 +01:00
Lynix
ea1275e4f5
Fixed camelcase
...
Former-commit-id: 1f94fefc2f0ce07720ff19538903b9795605795a
2012-12-25 12:02:16 +01:00
Lynix
1a4400facf
Fixed module initialisation failure bug
...
If a module initialisation failed, then it resources may or may not be
freed.
This is fixed.
Former-commit-id: 029e0844e392685a31b3afc02c5bf772e015a372
2012-12-25 01:56:49 +01:00
Lynix
dc3cfa40ec
Made Texture constructor consistent
...
Former-commit-id: 92be798524a48cb979c09fa04558602bf3717391
2012-12-24 20:38:20 +01:00
Lynix
1a5cf8cc0f
Fixed static variable in Renderer
...
Could not be used because of GPU-switching technologies like NVidia
Optimus
Former-commit-id: 7602e81747a40b1aceacc6b7d728ba269a30e333
2012-12-24 19:06:55 +01:00
Lynix
84496ee8b6
Fixed typo
...
Former-commit-id: f9c38ea20c5afe8b4656c04c2ac3543ee94fc1d4
2012-12-24 18:08:10 +01:00
Lynix
0e6215a47e
(Material) Added non-constant sampler access
...
Former-commit-id: d2799fc353628afda09fdc45b04134aa541ee480
2012-12-19 00:38:06 +01:00
Lynix
10730de74e
Refactored materials
...
(Renderer) Removed Apply function
(Renderer) Renamed SetTextureSampling to SetTextureSampler
Updated demo
Former-commit-id: d40a9ce05df35b078e645927451093da44eec314
2012-12-18 16:17:31 +01:00
Lynix
8b67d17e38
Added texture samplers
...
I hate Git branchs
Former-commit-id: 6978f1489cdc841d36fbcd6f1a8e01a4adbfcb8a
2012-12-17 14:56:29 +01:00
Lynix
025ed1cfd0
Renderer update
...
-Added Renderer::GetRendererName()
-Added Renderer::GetVendorName()
-Renamed VertexArrayObject to VertexArrayObjects
Former-commit-id: 93489d5f93f8258dec0c4d8bcf72185abd7f75a8
2012-12-13 20:16:09 +01:00
Lynix
68c6aa664a
Replaced OpenGL namespace with static class
...
Fixed OpenGL functions not being exported
It is also more consistent
Former-commit-id: 3eddcb6f72412443eb56580180d0b9544ae4a9df
2012-12-13 15:47:29 +01:00
Lynix
73fdb9baaf
Added TextureWrap enum<->OpenGL association
...
Also made array syntax consistent
Former-commit-id: 65794e3eec2ea326da0ee71bcd7b8c31632ab71c
2012-12-13 11:39:15 +01:00
Lynix
feda7eec4d
Changed default debug line width to 1.5f
...
Former-commit-id: 15b1858aa40eb5d7b562f5ea8562b69f7aecf3cf
2012-12-13 11:38:19 +01:00
Lynix
8376fb38cf
Module can now initialize optionnal classes
...
Former-commit-id: 899007b7879451d15d0808a03b8dfea0cd3413a4
2012-12-08 22:21:20 +01:00
Lynix
dc9f202155
Fixed calling Uninitialize when not Initialized
...
Former-commit-id: 1d0bb01f881be76e163a5ac27c91d7fb6a873bb7
2012-12-08 21:51:43 +01:00
Lynix
eb585116b1
Shader::SendTexture can now return texture unit
...
Former-commit-id: 38d5e5dedf94113933bb2090040feec602a4716c
2012-12-08 11:49:07 +01:00
Lynix
119a1420d1
Fixed OpenGL 4 not loading sampler objets
...
Also fixed file encoding
Former-commit-id: 51683c2d9dff8a56c96ad972c8b6d6006004f1f2
2012-12-08 11:48:30 +01:00
Lynix
dc3af6ae69
Fixed typo
...
Former-commit-id: 3cd820fe6778c6731b051ff707ef576c3344451e
2012-12-06 12:05:56 +01:00
Lynix
e699969b64
Added OpenGL support for sampler objects
...
Also prevented an exception launch by the SeparateShaderObjects code to
escape.
Former-commit-id: ae594e16a85c02f0c649ef573189b4b722f713c3
2012-12-04 13:50:08 +01:00
Lynix
700a09b9c9
Fixed typo
...
Former-commit-id: a2a050220608320d0b13c7bb69b0752a36a253ae
2012-12-03 23:50:18 +01:00
Lynix
86c4899100
Fixed debug drawer not setting line width
...
Former-commit-id: 2fd8f6e6c4b3e42183955e047aaaf4c95e12841a
2012-12-03 23:50:11 +01:00
Lynix
780da2cfa5
Resolved conflicts
...
Former-commit-id: 4bd4e4f8435d701d16d3864dd030a6c1cff48c47
2012-12-02 21:49:14 +01:00
Lynix
0a88b6531c
Added Texture::HasMipmaps()
...
Former-commit-id: 4d21c32579e26e95a9376a4352fd50edd4ba0ed3
2012-12-02 17:01:57 +01:00
Lynix
b06acfcffd
Index buffer no longer permit 8 bits index size
...
Modern graphics cards don't like 8 bits index size, so I introduced
"Large indices" option, it means 32 bits indices when used otherwise the
index size is 16 bits
Former-commit-id: 213902de6704ceef16c6ea311ba0c6c5d2f6e665
2012-12-02 17:01:02 +01:00
Lynix
a2eb55e74a
Fixed repo
...
Former-commit-id: 5992da5ec759f05dabf82009e660ec58eed96365
2012-11-29 10:15:10 +01:00
Lynix
0a2e19fa22
Merge remote-tracking branch 'origin/3D-Engine'
...
Former-commit-id: 1781615fc780accbe6c11d55fd896038d97ffec9
2012-11-29 10:11:30 +01:00
Lynix
f48b9ba370
(Material) Added methods to loads and get default
...
Former-commit-id: 9169e84208b0cddbe698daa9286c8b7eb6a8244c
2012-11-27 21:37:14 +01:00
Lynix
38c1cf2ad0
Added Texture-to-Material loader
...
Former-commit-id: 789185ca38b4a995c67dfd054306cb920ca56b74
2012-11-25 19:33:58 +01:00
Lynix
18baa6b8c1
Fixed typo
...
Former-commit-id: 4254892b447457b57cf9657f87ecf32a1ec899fe
2012-11-25 16:12:57 +01:00
Lynix
b662bca33d
Added Material class
...
Former-commit-id: db16249b1ecbfdc59ecdca709cb75f4bf1b6d10b
2012-11-25 14:32:19 +01:00
