josh/anaglym
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
382 Commits 2 Branches 0 Tags
9fc482dbcc633c0ba7ba5a1b32cba2ec4e0ddc96
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Josh Holtrop 9fc482dbcc pass Engine ref to Engine::Object for accessing program data 2011-05-25 16:08:02 -04:00
Josh Holtrop be307c2c32 draw model-based objects using shaders 2011-05-25 15:53:43 -04:00
Josh Holtrop 6e5eafb8d9 add GL_GLEXT_PROTOTYPES to CPPFLAGS 2011-05-25 15:53:25 -04:00
Josh Holtrop 7b497c73c5 remove static loadFile() 2011-05-25 09:26:24 -04:00
Josh Holtrop 96e4a66c2c create "obj" and "obj_tex" shader programs 2011-05-25 09:26:02 -04:00
Josh Holtrop 3b940aa140 update glslUtil 2011-05-25 08:41:24 -04:00
Josh Holtrop e5c1a3075e update glslUtil 2011-05-23 15:53:46 -04:00
Josh Holtrop 00c28804f6 add glslUtil submodule 2011-05-23 11:24:44 -04:00
Josh Holtrop 826a57107e fix CFS source list: glob everything under shaders/ 2011-05-23 10:21:49 -04:00
Josh Holtrop c710dee00c add textured object shader; update names 2011-05-22 22:59:01 -04:00
Josh Holtrop be15f95560 PhyObj::load() takes const ptr 2011-05-21 23:45:13 -04:00
Josh Holtrop 5a0eea19f5 fix qualifiers again 2011-05-21 23:43:49 -04:00
Josh Holtrop 07f4162581 fix some qualifiers dealing with loadFile() 2011-05-21 23:42:52 -04:00
Josh Holtrop 15c30e0d00 fix Engine::validatePath() to accept a const ref 2011-05-21 23:40:44 -04:00
Josh Holtrop 67010e02c2 add Engine::loadWFObjFile() 2011-05-21 23:33:28 -04:00
Josh Holtrop 278867b3c8 AV::Sound copies sound buffer to avoid memory leak 2011-05-21 23:20:50 -04:00
Josh Holtrop 8f1329fed8 fix a few compilation issues 2011-05-20 13:27:40 -04:00
Josh Holtrop af88db267f fix loadSound() 2011-05-20 07:44:53 -04:00
Josh Holtrop f78c42c8c8 update WFObj construction, loadFile()/loadTexture() 2011-05-19 23:14:10 -04:00
Josh Holtrop f1bc763be2 update loadPhy() interface 2011-05-19 22:59:04 -04:00
Josh Holtrop 08dbe60b7b remove Engine::FileLoader 2011-05-19 22:55:09 -04:00
Josh Holtrop 89d98be780 remove FileLoader from PhyObj 2011-05-19 22:30:58 -04:00
Josh Holtrop e40a79435d update AV to remove FileLoader 2011-05-19 17:14:00 -04:00
Josh Holtrop 6e29f8adf6 update TextureCache submodule 2011-05-19 16:55:17 -04:00
Josh Holtrop b4cacbd05d fix getFile() usage 2011-05-19 16:46:24 -04:00
Josh Holtrop 8028654ff2 beginning migrate to shaders 
add a few submodules
generate C file store with cfs_gen
remove FileLoader/TextureLoader
add initial color shaders for wfobj objects
 2011-05-18 17:17:06 -04:00
Josh Holtrop 55fee6b9a9 use scons "Command" builder for sdl_keymap.cc 2011-05-17 16:33:38 -04:00
Josh Holtrop cd1e26318a move source files to "src" subdirectory 2011-05-17 16:11:55 -04:00
Josh Holtrop 0579235c93 completely switch build system to scons 2011-05-17 15:42:54 -04:00
Josh Holtrop cf3a986b49 add dist target to SConstruct 2011-05-17 15:33:23 -04:00
Josh Holtrop 45ebca0650 add initial SConstruct file; no dist/install yet 2011-05-17 13:17:54 -04:00
Josh Holtrop 2257c664d6 remove unnecessary WFObj/driver.cc file 2011-05-17 13:17:41 -04:00
Josh Holtrop 60b7747997 removed old wfobj directory 2011-05-16 17:05:14 -04:00
Josh Holtrop ebe4b49a7f added .gitignore 2010-12-19 00:18:11 -05:00
Josh Holtrop df91f0fe92 fix ag.pickOne documentation return value name 2010-12-19 00:11:40 -05:00
Josh Holtrop 96f62c237b cleaned up Makefile a lot 2010-12-19 00:11:40 -05:00
Josh Holtrop 4cd5a61bc4 do not ignore sdl_keymap.h 2010-12-19 00:11:39 -05:00
Josh Holtrop 0b42c42237 include correct WFObj path 2010-12-19 00:11:39 -05:00
Josh Holtrop 49ee9b12b4 gen-sdl-keymap.pl no longer generating sdl_keymap.h 2010-12-19 00:11:39 -05:00
Josh Holtrop dc6994fcbf renamed wfobj subdirectory to WFObj 2010-12-19 00:11:39 -05:00
Josh Holtrop a0d66622db added "install" target 2010-12-19 00:11:38 -05:00
Josh Holtrop 5ebff00dbc bugfix in std.createPlanePointNormal with calculation of "d" parameter 2010-12-19 00:11:38 -05:00
Josh Holtrop 7924672b69 fixed texturing on quads 2010-12-19 00:11:38 -05:00
Josh Holtrop 0417ec2c29 bugfix: correct full path being sent to Engine constructor 2010-12-19 00:11:38 -05:00
Josh Holtrop bece35d270 added setPosition() for Quads 2010-12-19 00:11:37 -05:00
Josh Holtrop 1009f91302 enhanced polygon offset for quads 2010-12-19 00:11:37 -05:00
Josh Holtrop 65ecbe0d5c bugfix in Engine::Quad() constructor -- call dCROSS() before dNormalize3() 2010-12-19 00:11:37 -05:00
Josh Holtrop eb73749f69 added Engine::Quad::setColor() and ag::quad::setColor() 2010-12-19 00:11:37 -05:00
Josh Holtrop 8585f97e91 fixed bug in ag::quad::setOffset() 2010-12-19 00:11:36 -05:00
Josh Holtrop 19a7687086 fix Lua indexing bug in ag::createQuad() 2010-12-19 00:11:36 -05:00
Josh Holtrop 8be32add54 actually register ag.createQuad with lua 2010-12-19 00:11:36 -05:00
Josh Holtrop 97530106c2 actually do the polygon offset for quads 2010-12-19 00:11:36 -05:00
Josh Holtrop dff232ec66 created frontend functionality for creating Quad objects 2010-12-19 00:11:35 -05:00
Josh Holtrop 791fb14925 added backend functionality for Quads 2010-12-19 00:11:35 -05:00
Josh Holtrop 6e35afb4ad replace local cross_product() function with dCROSS() 2010-12-19 00:11:35 -05:00
Josh Holtrop 1dda197ca3 split Engine::Object functions into their own .cc file 2010-12-19 00:11:35 -05:00
Josh Holtrop 225d147b79 ignore .swp files 2010-12-19 00:11:34 -05:00
Josh Holtrop df953ef20f subdirectories work for real this time 2010-12-19 00:11:34 -05:00
Josh Holtrop 2edea049bd allow subdirectories in Lua-specified paths separated by ":" 2010-12-19 00:11:34 -05:00
Josh Holtrop 66b0bd3da5 updated "dist" Makefile target to use cp instead of svn export; added dist to .hgignore 2010-12-19 00:11:34 -05:00
Josh Holtrop 4d726dbf62 find full path to engine in linux using /proc/self/exe 2010-12-19 00:11:33 -05:00
Josh Holtrop 9e6bb1b22d added PLATFORM definition in Makefile, added .hgignore 2010-12-19 00:11:33 -05:00
Josh Holtrop 7b057bcf86 import svn:externals 2010-12-19 00:11:13 -05:00
Josh Holtrop d3da66da4b fix typo in doc 
git-svn-id: svn://anubis/anaglym/trunk@323 99a6e188-d820-4881-8870-2d33a10e2619
 2010-10-04 00:11:07 +00:00
Josh Holtrop 2c98e88dae updated checkerpick.lua test script, moved it into lib/demo 
git-svn-id: svn://anubis/anaglym/trunk@322 99a6e188-d820-4881-8870-2d33a10e2619
 2010-09-23 17:09:35 +00:00
Josh Holtrop e265cf21b7 fixed AABB and getSize() problem for boxes 
git-svn-id: svn://anubis/anaglym/trunk@321 99a6e188-d820-4881-8870-2d33a10e2619
 2010-09-23 17:00:33 +00:00
Josh Holtrop e1aa35b4cd fixed bug in argument order in ag.loadModel() 
git-svn-id: svn://anubis/anaglym/trunk@318 99a6e188-d820-4881-8870-2d33a10e2619
 2010-09-22 02:38:07 +00:00
Josh Holtrop 283d84aa25 added documentation for ag::object::setTransparency() 
git-svn-id: svn://anubis/anaglym/trunk@317 99a6e188-d820-4881-8870-2d33a10e2619
 2010-09-17 17:10:13 +00:00
Josh Holtrop 11da99b3ad added ag::object::setTransparency() and Engine::Object::setTransparency() 
git-svn-id: svn://anubis/anaglym/trunk@316 99a6e188-d820-4881-8870-2d33a10e2619
 2010-09-17 17:02:28 +00:00
Josh Holtrop 1a2213f39c added a test box with a partly transparent texture 
git-svn-id: svn://anubis/anaglym/trunk@315 99a6e188-d820-4881-8870-2d33a10e2619
 2010-09-17 16:47:43 +00:00
Josh Holtrop 3e3ba194f9 setting texture mode when blending 
git-svn-id: svn://anubis/anaglym/trunk@314 99a6e188-d820-4881-8870-2d33a10e2619
 2010-09-17 16:42:01 +00:00
Josh Holtrop 9ea65f4e65 added enable_blending parameter to objects 
git-svn-id: svn://anubis/anaglym/trunk@313 99a6e188-d820-4881-8870-2d33a10e2619
 2010-09-17 16:37:51 +00:00
Josh Holtrop 7ea2aa3644 updated documentation for ag.pickObjects() and ag.pickOne() 
git-svn-id: svn://anubis/anaglym/trunk@312 99a6e188-d820-4881-8870-2d33a10e2619
 2010-09-17 14:57:39 +00:00
Josh Holtrop ea623bdf65 changed tests/checkerpick.lua to use ag.pickOne() instead of ag.pickObjects() for efficiency 
git-svn-id: svn://anubis/anaglym/trunk@311 99a6e188-d820-4881-8870-2d33a10e2619
 2010-09-17 14:48:24 +00:00
Josh Holtrop bfb0760ef1 added ag::pickOne() 
git-svn-id: svn://anubis/anaglym/trunk@310 99a6e188-d820-4881-8870-2d33a10e2619
 2010-09-17 14:46:54 +00:00
Josh Holtrop a43935fdd6 added Engine::pickOne() 
git-svn-id: svn://anubis/anaglym/trunk@309 99a6e188-d820-4881-8870-2d33a10e2619
 2010-09-17 14:27:34 +00:00
Josh Holtrop 89e065ebb5 added checkerpick test script with example for mouse motion selection on a grid 
git-svn-id: svn://anubis/anaglym/trunk@308 99a6e188-d820-4881-8870-2d33a10e2619
 2010-09-17 03:34:38 +00:00
Josh Holtrop 7c7609045d ag.pickObjects() now sets pick_dist, pick_pos, and pick_normal attributes on the selected objects 
git-svn-id: svn://anubis/anaglym/trunk@307 99a6e188-d820-4881-8870-2d33a10e2619
 2010-09-17 02:44:25 +00:00
Josh Holtrop d768feb8b4 updated .todo 
git-svn-id: svn://anubis/anaglym/trunk@306 99a6e188-d820-4881-8870-2d33a10e2619
 2010-09-16 21:23:37 +00:00
Josh Holtrop 4ed5b5c528 added text caption to managed_objects.lua to inform of available keys 
git-svn-id: svn://anubis/anaglym/trunk@305 99a6e188-d820-4881-8870-2d33a10e2619
 2010-09-16 21:22:01 +00:00
Josh Holtrop 59f8c7a28e changed OdeWorld::pickObjects and Engine::pickObjects to return distance, position, and normal information along with object identifier 
git-svn-id: svn://anubis/anaglym/trunk@304 99a6e188-d820-4881-8870-2d33a10e2619
 2010-09-16 21:12:38 +00:00
Josh Holtrop 23088dbdfe added libogg-0.dll, libvorbis-0.dll, libvorbisfile-3.dll to dist target 
git-svn-id: svn://anubis/anaglym/trunk@302 99a6e188-d820-4881-8870-2d33a10e2619
 2010-08-10 13:36:40 +00:00
Josh Holtrop ecb7f9f99d added VORBISLIBS in Makefile 
git-svn-id: svn://anubis/anaglym/trunk@301 99a6e188-d820-4881-8870-2d33a10e2619
 2010-08-09 22:25:03 +00:00
Josh Holtrop 8dbcc0b043 import from git: added extra usage explanation, added -s command-line option to set multisample level, added a fallback to AV::start() to try multisample level of 1 if attempting samples>1 fails, fixed audio bug for combining multiple streams getting staticky, added documentation for joint and sound Lua member methods 
git-svn-id: svn://anubis/anaglym/trunk@300 99a6e188-d820-4881-8870-2d33a10e2619
 2010-08-06 01:56:27 +00:00
Josh Holtrop 82254ff82c updated cratestack test script 
git-svn-id: svn://anubis/anaglym/trunk@299 99a6e188-d820-4881-8870-2d33a10e2619
 2010-07-27 20:43:06 +00:00
Josh Holtrop 8d8f753652 corrected sound mixing for lower bound in addition to upper bound, but algorithm is still incorrect 
git-svn-id: svn://anubis/anaglym/trunk@298 99a6e188-d820-4881-8870-2d33a10e2619
 2010-07-27 16:54:44 +00:00
Josh Holtrop 219b3f1f40 updated cratestack test script 
git-svn-id: svn://anubis/anaglym/trunk@297 99a6e188-d820-4881-8870-2d33a10e2619
 2010-07-27 15:34:06 +00:00
Josh Holtrop a2ecd9bbd3 updated .todo 
git-svn-id: svn://anubis/anaglym/trunk@296 99a6e188-d820-4881-8870-2d33a10e2619
 2010-07-27 15:11:00 +00:00
Josh Holtrop 957552e5b9 added ag::sound::{set,get}Volume() Lua interfaces 
git-svn-id: svn://anubis/anaglym/trunk@295 99a6e188-d820-4881-8870-2d33a10e2619
 2010-07-27 15:09:36 +00:00
Josh Holtrop 9cdf2a4243 minimize time in mutex 
git-svn-id: svn://anubis/anaglym/trunk@294 99a6e188-d820-4881-8870-2d33a10e2619
 2010-07-27 15:01:01 +00:00
Josh Holtrop 854f14bf82 added volume parameter to AV::Sound objects, fixed playCallback mixing code 
git-svn-id: svn://anubis/anaglym/trunk@293 99a6e188-d820-4881-8870-2d33a10e2619
 2010-07-27 14:55:27 +00:00
Josh Holtrop 8b8a7eee1f AV now decodes sounds directly into a new buffer and then mixes that buffer into the final audio stream 
git-svn-id: svn://anubis/anaglym/trunk@292 99a6e188-d820-4881-8870-2d33a10e2619
 2010-06-25 20:14:36 +00:00
Josh Holtrop 5bed8a2dfd replaced AV::Sound::pause() with AV::Sound::resume() -- play and loop now rewind but resume does not 
git-svn-id: svn://anubis/anaglym/trunk@291 99a6e188-d820-4881-8870-2d33a10e2619
 2010-06-24 03:10:44 +00:00
Josh Holtrop d4d44dea86 added AV::Sound::pause(), added Lua interface for sounds (play/pause/stop/loop/loopForever) 
git-svn-id: svn://anubis/anaglym/trunk@290 99a6e188-d820-4881-8870-2d33a10e2619
 2010-06-24 02:46:28 +00:00
Josh Holtrop ed1f9c8f7f rewrote AV::Sound::decode() to be much more scalable and handle looping without small breaks 
git-svn-id: svn://anubis/anaglym/trunk@289 99a6e188-d820-4881-8870-2d33a10e2619
 2010-06-24 02:14:37 +00:00
Josh Holtrop 8a49a5089e implemented sound looping, need to clean up decode() to handle it more smoothly 
git-svn-id: svn://anubis/anaglym/trunk@288 99a6e188-d820-4881-8870-2d33a10e2619
 2010-06-23 19:32:05 +00:00
Josh Holtrop e3c19daa47 Makefile updates: Lua flags trying pkg-config first, then lua-config, then hard-coded; added smpeg flags 
git-svn-id: svn://anubis/anaglym/trunk@287 99a6e188-d820-4881-8870-2d33a10e2619
 2010-06-23 16:13:17 +00:00
Josh Holtrop cfffe1873c updated Makefile to use pkg-config for lua5.1 instead of lua-config 
git-svn-id: svn://anubis/anaglym/trunk@286 99a6e188-d820-4881-8870-2d33a10e2619
 2010-06-23 14:13:03 +00:00
Josh Holtrop 1705af029d fixed audio decoding bug, sounds can play now! 
git-svn-id: svn://anubis/anaglym/trunk@285 99a6e188-d820-4881-8870-2d33a10e2619
 2010-06-23 03:47:08 +00:00
Josh Holtrop a4024bfd2c samples_decoded was not necessary 
git-svn-id: svn://anubis/anaglym/trunk@284 99a6e188-d820-4881-8870-2d33a10e2619
 2010-06-22 03:53:32 +00:00