Josh Holtrop
|
e53e626a63
|
build mipmaps with GLU for texture shader
|
2011-05-16 16:26:07 -04:00 |
|
Josh Holtrop
|
ab56320889
|
pass uniforms to texture program correctly
|
2011-05-16 16:12:41 -04:00 |
|
Josh Holtrop
|
e12a86f858
|
add texture shaders
|
2011-05-16 16:09:29 -04:00 |
|
Josh Holtrop
|
10b945dd6b
|
only two texture coordinates
|
2011-05-16 16:05:34 -04:00 |
|
Josh Holtrop
|
1c5b95a9fd
|
build and use texture program/shaders
|
2011-05-16 16:04:22 -04:00 |
|
Josh Holtrop
|
1a1bdf64ce
|
import glslUtil; use for creating shaders/program
|
2011-05-16 15:55:22 -04:00 |
|
Josh Holtrop
|
f672782921
|
preparing for textures
|
2011-05-16 15:43:54 -04:00 |
|
Josh Holtrop
|
0a8691414e
|
use swizzle syntax
|
2011-05-16 15:38:04 -04:00 |
|
Josh Holtrop
|
5f55756a08
|
inlined renderMaterial()
|
2011-05-16 15:37:14 -04:00 |
|
Josh Holtrop
|
f0e4bbd3b1
|
loading textures properly, not rendering yet
|
2011-05-16 15:33:23 -04:00 |
|
Josh Holtrop
|
913e8f6287
|
build with loadTexture(), not rendering textures yet
|
2011-05-16 15:25:03 -04:00 |
|
Josh Holtrop
|
834f0c59c9
|
update wfobj
|
2011-05-16 15:02:12 -04:00 |
|
Josh Holtrop
|
96d6bd9e17
|
compile with -Wall
|
2011-05-16 14:59:18 -04:00 |
|
Josh Holtrop
|
816e1fad8c
|
add loadTexture submodule
|
2011-05-16 14:56:11 -04:00 |
|
Josh Holtrop
|
46372edc67
|
update wfobj
|
2011-05-16 13:43:14 -04:00 |
|
Josh Holtrop
|
f3be2efddc
|
tone down ambient light a bit
|
2011-05-05 14:04:09 -04:00 |
|
Josh Holtrop
|
59d0d66c44
|
fix shaders for proper lighting computation
|
2011-05-05 13:56:57 -04:00 |
|
Josh Holtrop
|
2e2b8225be
|
glUniform4fv() wants a count of 1 for a vec4 update
|
2011-05-05 13:45:20 -04:00 |
|
Josh Holtrop
|
0d70153bf9
|
update correct uniforms
|
2011-05-05 13:39:03 -04:00 |
|
Josh Holtrop
|
b2fdaedf70
|
set shader uniform variables for material properties
|
2011-05-05 13:33:48 -04:00 |
|
Josh Holtrop
|
fb1d90e168
|
add initial shaders, draw using vertex attributes
|
2011-05-05 13:07:14 -04:00 |
|
Josh Holtrop
|
f3d9a3b437
|
add renderMaterial(), call glDrawElements()
|
2011-05-04 20:05:06 -04:00 |
|
Josh Holtrop
|
aafacfb3f9
|
set up vertex array pointers
|
2011-05-04 19:49:21 -04:00 |
|
Josh Holtrop
|
e8776bb719
|
new wfobj
|
2011-05-04 19:46:34 -04:00 |
|
Josh Holtrop
|
66c58b1f9a
|
update wfobj to new version, remove draw() call
|
2011-05-04 16:26:38 -04:00 |
|
Josh Holtrop
|
6a8e7b4b4b
|
warn when submodules are not initialized
|
2011-04-26 09:10:04 -04:00 |
|
Josh Holtrop
|
b06bef6351
|
update wfobj
|
2011-04-25 17:23:03 -04:00 |
|
Josh Holtrop
|
132d481fef
|
update wfobj to latest v2.0 version
|
2011-04-25 17:20:46 -04:00 |
|
Josh Holtrop
|
54e3970362
|
retabbed
|
2011-04-25 16:32:41 -04:00 |
|
Josh Holtrop
|
bead7f9690
|
display error on failure to load .obj file
|
2011-04-25 16:29:55 -04:00 |
|
Josh Holtrop
|
698c7e99b7
|
build with scons; update to v2.0 interface
|
2011-04-25 15:28:04 -04:00 |
|
Josh Holtrop
|
e305a264f1
|
rm FileLoader/TextureCache/TextureLoader; update wfobj to v2.0
|
2011-04-25 15:22:39 -04:00 |
|
Josh Holtrop
|
5e4860f266
|
update wfobj submodule to a new commit
|
2011-03-08 13:46:40 -05:00 |
|
Josh Holtrop
|
1d208c434a
|
add .git suffix for wfobj submodule
|
2011-03-08 13:46:10 -05:00 |
|
Josh Holtrop
|
8a208ece9e
|
added .gitignore
|
2011-03-08 13:40:44 -05:00 |
|
Josh Holtrop
|
4d873b1296
|
add TextureLoader, FileLoader submodules; update to compile again
|
2011-03-08 13:40:29 -05:00 |
|