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
093d0ab0b5
Changed default material ambient color
...
Former-commit-id: ad2260abbe06940413ee2cdabd58176364b54365
2013-01-08 17:31:59 +01:00
e6cef2ddbf
Added move constructor/operator to Shader
...
Former-commit-id: b947e0ac0dcddcfe64c83b63cf89df0e0850cbd2
2013-01-08 17:31:42 +01:00
e194d11374
Fixed color alpha not being sent
...
Former-commit-id: 0f7d355b22790aa5487ff69b325c41613a94961e
2013-01-06 02:47:46 +01:00
da341001ab
Made shader uniforms less verbose
...
Former-commit-id: aa77b9be3f84cad30b13ebe5d47bb9febd17631e
2013-01-06 01:06:55 +01:00
d177971810
Merged changes
...
Former-commit-id: 3431062688bcc29574e7611391d8cd356d484e9b
2013-01-06 00:21:49 +01:00
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
492d01cc09
Fixed HardwareInfo OpenGL include
...
Former-commit-id: d45ca9ac45a883a5378d527ef3ffe6594dcd02f1
2013-01-05 23:42:13 +01:00
f294372b72
Updated credits
...
Former-commit-id: 35969a749f3478f256d3379c4a4ce0f11dd602f8
2013-01-05 19:51:52 +01:00
62d238d236
Fixed spaces
...
Former-commit-id: 2045fa2b37d3f0cbcd9d9d9cdcadb962ea07ecd0
2013-01-05 19:51:40 +01:00
e6198f6b3d
Fixed default value of shininess
...
Former-commit-id: c640ed5b74cc56bf9b4acf8af4fad40be1c55e76
2013-01-05 19:51:28 +01:00
07aa5d095c
Fixed matrices not being updated in the shader
...
Former-commit-id: 8eb208b656bec0d63163d2a00768a4216979a8b0
2013-01-05 19:51:01 +01:00
78b6874d08
Merge pull request #10 from danman5555/master
...
Fix compilation error for POSIX files.
Former-commit-id: 4b4afe42ae8b43015bedf5a9ce215358e21840bc
2013-01-04 17:02:52 -08:00
29755989fd
Fixed specular color not being applied
...
Former-commit-id: ab41e431e2f9ec0f9b3cd81d032f6218c7114c5b
2013-01-05 01:54:14 +01:00
c2e197bda5
Fix compilation errors for POSIX files and make premake4-linux executable.
...
Former-commit-id: bb094585a678b983e25b55c4fab00665e66f64c5
2013-01-05 01:53:54 +01:00
9e0d263694
Merge from DigitalPulseSoftware.
...
Former-commit-id: 17a2c31780b5e9b000a953d3a21fdfc8080bd21d
2013-01-05 01:17:58 +01:00
dba9470baf
Fixed POSIX DynLib implementation
...
Former-commit-id: 17142fc657e5f6332f980ab9180c071e9de20280
2013-01-04 23:23:32 +01:00
bedd0bc152
Added premake binaries for Linux and MacOS X
...
Former-commit-id: 8b58750a2b4e101cc5f3b622a1be13fa5a3b6e8b
2013-01-04 23:13:26 +01:00
80d4159faa
Added DebugDrawer::DrawTangents
...
Former-commit-id: 9116b5a878752ff193073ac6c156ddca54f8c501
2013-01-04 22:02:47 +01:00
e00779ebe0
[Core] Added POSIX support (Experimental)
...
Thanks to Danman
I don't think it actually compile although tried my best to correct
code.
Former-commit-id: c3366c2c924f7392f4d46824dafca63ecf7f1fea
2013-01-04 22:01:06 +01:00
aaac162d12
Fix merge conflict with DigitalPulseSoftware.
...
Former-commit-id: 5c7fa12d8461b1b1600cad0a657ad7f6d3932cc7
2013-01-04 20:47:48 +01:00
b8bc59988f
Merge branch 'master' of git://github.com/DigitalPulseSoftware/NazaraEngine
...
Former-commit-id: 4d6ef07eaae20b252db101910a9528a9aad606da
2013-01-04 20:44:13 +01:00
eab132e187
Merge branch 'merging'
...
Former-commit-id: df8fe7c6c673848922ffa2f6ebd3b1549bd1429b
2013-01-04 19:52:38 +01:00
9ea7817502
Little fixes for git.
...
Former-commit-id: 3fac0c3a4402184bfca89fd7e0b954ccbb6bc1da
2013-01-04 19:47:16 +01:00
58e0071626
Fix prepocessor condition in File.cpp again (patch problem).
...
Former-commit-id: c4fcc1265917ef17b78a7ed1a315c41dea6d0dc0
2013-01-04 19:18:04 +01:00
7785516f85
Fixed POSIX build
...
Former-commit-id: 51c9eec6b1bff341d0e80971da26c05f4224ac60
2013-01-04 18:35:24 +01:00
77a87ce2c9
Add Posix hardware infos support.
...
Former-commit-id: adbdeb13349dfea4d962f0df6668f51937803fc4
2013-01-04 18:30:10 +01:00
cf85e22c30
Add Posix directory support.
...
Former-commit-id: 308d7ce06c694cb869064ab2d2a5628475febf88
2013-01-04 18:22:13 +01:00
1b9a86d993
Add Posix semaphore support.
...
Former-commit-id: 1148708ccb60bf385a8b21da4c5ed1b9a0108441
2013-01-04 18:21:45 +01:00
1d224d23f6
Add Posix clock support.
...
Former-commit-id: 1631e1028e94a88f7d19d7c217d83b8ae17936d7
2013-01-04 18:21:19 +01:00
50870b9a2d
Add Posix condition variable support.
...
Former-commit-id: 2af214aa206f2f9486c96750ccd412ac672ef62d
2013-01-04 18:20:42 +01:00
3677401319
Add posix thread support.
...
Former-commit-id: fcab7f0b38965e4435abe683d9edc7de27df2621
2013-01-04 18:19:44 +01:00
cb5c8d7bdc
Fixes.
...
Former-commit-id: 85f7bb85e33acdd84d19191c845a1cc59bbb2138
2013-01-04 18:19:13 +01:00
45bf5f1f43
Renamed VertexMapper::GetTotalVertexCount
...
To GetVertexCount
Former-commit-id: fa876c5499664bce31d438ef596373d908c6977c
2013-01-04 16:33:26 +01:00
5eac4de406
Added TriangleIterator::Unmap()
...
Former-commit-id: 8ef858c5374c6701c087d0f4b1644bb6704e1131
2013-01-04 16:32:14 +01:00
be7afed144
Fixed BufferMapper::Unmap crash when called twice
...
Former-commit-id: aaf7ead6e93c74c79d6d3e6c3cb743030634eacd
2013-01-04 16:29:53 +01:00
d4030f666b
Added TriangleIterator (experimental)
...
Former-commit-id: b94f4d4a26a92f4acecf4c53291db80756feb289
2013-01-04 16:27:22 +01:00
22d9e98422
Add posix DynLibImpl support.
...
Former-commit-id: c80dcc31c0935916082d5f19a7cf2dbe15da7b2f
2013-01-04 16:02:21 +01:00
ce6a63647f
Forgot to close files after copy or error.
...
Former-commit-id: 157ea611926a5d70d1b469714b6b27b78d513f4b
2013-01-04 15:54:39 +01:00
9415096975
Add Posix file support.
...
Former-commit-id: 7bff867c4e43f3755455217887e77c7634d82ca5
2013-01-04 15:52:15 +01:00
82b8b2cbf1
Add Posix pthread mutex support.
...
Former-commit-id: 1a6c8002e3fc70e557f0798a1cc78c3d430b853a
2013-01-04 13:20:12 +01:00
1f6cac042b
Updated global headers
...
Former-commit-id: 6d87916542e3ae90e49b326c81a1efdc99eea3fd
2013-01-04 11:50:38 +01:00
cd80905c0f
Removed resolved Fixme comment
...
Former-commit-id: f65bcdeb368f3b3de6fef0f1d378945c108860aa
2013-01-04 02:38:53 +01:00
be70e48118
Fixed Model::SetMesh bug with static meshs
...
Former-commit-id: 5fcccf6ac485528bcdd4f1250a2ba948a50ca456
2013-01-04 02:36:03 +01:00
24af375694
Fixed static MD2 mesh loader ( Close #4 )
...
Former-commit-id: a894211c7222f64b47efc3d31cb90fc86f944683
2013-01-04 02:34:16 +01:00
ef5f4617c8
Added IndexMapper::GetBuffer()
...
Former-commit-id: 5b203ea56f2201f5ff3c6bbdbc7a6573ed59f136
2013-01-03 23:28:41 +01:00
23edd637dd
Fixed IndexMapper const constructor
...
Former-commit-id: c8f46bc8b29ff6bcfdbc7fa9b0a01eef68d07a7e
2013-01-03 22:21:15 +01:00
ab93fb802b
Added support to sequential index buffers
...
Former-commit-id: 68a566ab9bfe0490ba25aeb1c7486722b4a4ed01
2013-01-03 22:08:22 +01:00
ef0dd580f5
Fixed (Index|Vertex)Mapper header guards
...
Former-commit-id: e304886a8b439007ded9dc5af2542910f742ec39
2013-01-03 22:04:06 +01:00
837f0b52a3
Fixed BufferMapper crash when buffer is nullptr
...
Former-commit-id: 4f77a158cf93a4d7acbce50ac0454c38ea6cf412
2013-01-03 22:03:46 +01:00
Lynix
Alexandre Janniaux