95 Commits

Author SHA1 Message Date
Josh Holtrop
79b11ba619 updated Engine to use TextureCache
git-svn-id: svn://anubis/anaglym/trunk@95 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-18 16:33:58 +00:00
Josh Holtrop
e537e89568 fixed loading .phy files for physics information - back to working demo where i was before restructuring WFObj; need to add TextureCache support and support for placing non-physics models
git-svn-id: svn://anubis/anaglym/trunk@94 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-17 22:12:34 +00:00
Josh Holtrop
387141b506 first time recompiling successfully after WFObj restructuring!
git-svn-id: svn://anubis/anaglym/trunk@93 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-17 21:58:34 +00:00
Josh Holtrop
580788097d added TOPLEVEL to recursively find includes relative to the top level directory
git-svn-id: svn://anubis/anaglym/trunk@92 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-17 21:25:54 +00:00
Josh Holtrop
a984a625cd added a couple more externals
git-svn-id: svn://anubis/anaglym/trunk@91 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-17 19:43:06 +00:00
Josh Holtrop
d58ceeaf01 added FileLoader external
git-svn-id: svn://anubis/anaglym/trunk@90 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-16 19:21:27 +00:00
Josh Holtrop
dd00b76d50 added a textured checkerball model, but not loading textures to draw yet
git-svn-id: svn://anubis/anaglym/trunk@89 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-14 04:43:15 +00:00
Josh Holtrop
967b6ac5b5 added autoDrawObjects setting, on by default
git-svn-id: svn://anubis/anaglym/trunk@88 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-14 04:06:24 +00:00
Josh Holtrop
53e98eb57a added autoStartFrame and autoEndFrame
git-svn-id: svn://anubis/anaglym/trunk@87 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-14 04:03:04 +00:00
Josh Holtrop
3d5a5b1ecb implemented multi-sampling for full-screen anti-aliasing (FSAA)
git-svn-id: svn://anubis/anaglym/trunk@86 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-14 03:50:03 +00:00
Josh Holtrop
cc83d92c18 moved Video out of Engine
git-svn-id: svn://anubis/anaglym/trunk@85 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-14 03:45:46 +00:00
Josh Holtrop
eafeac9bf9 rolled back all changed to implement multitasking
git-svn-id: svn://anubis/anaglym/trunk@84 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-14 03:38:32 +00:00
Josh Holtrop
bf32dab70c MULTITHREADING NOT WORKING - OpenGL calls do not work properly called from a thread different from the one that OpenGL was initialized in. But, I need SDL calls to be called from the thread that SDL was initialized in, which is the thread that initializes OpenGL. That means that in order to use multithreading all OpenGL and SDL calls would have to be done from the main thread and not from the lua thread. This means that every single draw operation would have to be passed from the lua thread to the main thread for execution. This is a bad idea. So, I am going to revert all of these changes for multithreading and look into lua_sethook() for handling infinite loops instead.
git-svn-id: svn://anubis/anaglym/trunk@83 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-14 03:32:52 +00:00
Josh Holtrop
e7d5e6eed1 supposed to be swapping buffers now but only getting a black screen... not a good sign
git-svn-id: svn://anubis/anaglym/trunk@82 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-14 02:44:45 +00:00
Josh Holtrop
b9a4ce22ed reworked startFrame() and endFrame()
git-svn-id: svn://anubis/anaglym/trunk@81 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-14 01:36:18 +00:00
Josh Holtrop
59818a253d processing events in the engine thread
git-svn-id: svn://anubis/anaglym/trunk@80 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-14 01:27:54 +00:00
Josh Holtrop
917a226e0f maintaining an event queue for passing events to the engine thread from the main SDL thread
git-svn-id: svn://anubis/anaglym/trunk@79 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-14 01:20:58 +00:00
Josh Holtrop
a630609767 compiling again after refactoring SDL calls out of Engine into anaglym.cc!
git-svn-id: svn://anubis/anaglym/trunk@78 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-14 00:32:02 +00:00
Josh Holtrop
38a517174b broke Engine into its own compilation module; this will assist with multithreading later...
git-svn-id: svn://anubis/anaglym/trunk@77 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-13 16:43:28 +00:00
Josh Holtrop
1e5ebc7d7e loading dwlogo from engine library instead of tests directory
git-svn-id: svn://anubis/anaglym/trunk@76 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-12 22:16:47 +00:00
Josh Holtrop
90651eb9e8 added dwlogo library object
git-svn-id: svn://anubis/anaglym/trunk@75 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-12 22:15:17 +00:00
Josh Holtrop
fe403112c9 ballstairs.lua test script demonstrating loading model with scaling
git-svn-id: svn://anubis/anaglym/trunk@74 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-12 21:42:22 +00:00
Josh Holtrop
6864704d37 ag::loadModel and ag::loadStaticModel accepting a second optional parameter to specify the scale of the model to load
git-svn-id: svn://anubis/anaglym/trunk@73 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-12 21:40:47 +00:00
Josh Holtrop
968a35bc36 added scaling support when creating Engine::Objects
git-svn-id: svn://anubis/anaglym/trunk@72 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-12 21:30:56 +00:00
Josh Holtrop
c4f07c6c93 added an "auto physics" mode, on by default, that will call doPhysics() before update() if on, settable via ag::setAutoPhysics()
git-svn-id: svn://anubis/anaglym/trunk@71 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-12 19:48:58 +00:00
Josh Holtrop
3f407b8970 added "dist" target to produce a distributable output
git-svn-id: svn://anubis/anaglym/trunk@70 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-12 18:38:19 +00:00
Josh Holtrop
bddbf61f5f added lib directory for standard Anaglym library of models, textures, scripts, etc...
git-svn-id: svn://anubis/anaglym/trunk@69 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-12 17:44:30 +00:00
Josh Holtrop
792e087885 added visibility flag to Engine::Object and ag::object::setVisible() to control it
git-svn-id: svn://anubis/anaglym/trunk@68 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-12 16:41:42 +00:00
Josh Holtrop
207f7e628a finished implementing ag::object::destroy() so lua calls to object:destroy() will correctly remove the object from the scene
git-svn-id: svn://anubis/anaglym/trunk@67 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-12 16:16:39 +00:00
Josh Holtrop
5bf9e9f2ec moved Object contructor/destructor into .cc file, keeping track of number of references to OpenGL display list and deleting it when the last reference goes away
git-svn-id: svn://anubis/anaglym/trunk@66 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-12 15:00:46 +00:00
Josh Holtrop
bd2d3d8b25 added ag::drawObjects() to draw all objects in the scene from a lua script
git-svn-id: svn://anubis/anaglym/trunk@65 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-12 14:54:40 +00:00
Josh Holtrop
2107a67d08 set ball test object to smooth and re-exported it;
removed some old camera controls from ballstairs.lua test script

git-svn-id: svn://anubis/anaglym/trunk@64 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-12 14:48:14 +00:00
Josh Holtrop
e6556d8bf3 finished implementing object cloning support; added dwlogo.phy; removed .blend1 backup files; added DEBUG parameter to Makefile
git-svn-id: svn://anubis/anaglym/trunk@63 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-11 23:42:16 +00:00
Josh Holtrop
f237390761 refactoring for object cloning
git-svn-id: svn://anubis/anaglym/trunk@62 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-11 14:32:34 +00:00
Josh Holtrop
9ca4338d32 updated ballstairs.lua test so the camera follows the ball!
git-svn-id: svn://anubis/anaglym/trunk@61 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-09 20:42:03 +00:00
Josh Holtrop
0035a690a7 updated boxarena.phy with correct sizes from new phy_export.py
git-svn-id: svn://anubis/anaglym/trunk@60 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-09 20:38:32 +00:00
Josh Holtrop
aff4d93989 added ball object, incorporated into ballstairs.lua
git-svn-id: svn://anubis/anaglym/trunk@59 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-09 20:16:21 +00:00
Josh Holtrop
426d046dbc fixed m_inputGrabbed initialization
git-svn-id: svn://anubis/anaglym/trunk@58 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-09 17:27:20 +00:00
Josh Holtrop
a34e96d73f exported normals on boxarena.obj, still looks funny though
git-svn-id: svn://anubis/anaglym/trunk@57 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-09 17:25:09 +00:00
Josh Holtrop
0373aa75d1 added grab_input parameter to Video::start()
git-svn-id: svn://anubis/anaglym/trunk@56 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-09 03:02:18 +00:00
Josh Holtrop
f260d83d47 added Engine::createObject() factory method, using new OdeWorld::Object interface
git-svn-id: svn://anubis/anaglym/trunk@55 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-08 04:12:09 +00:00
Josh Holtrop
d595278039 migrating some Engine::Object functionality to OdeWorld::Object
git-svn-id: svn://anubis/anaglym/trunk@54 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-08 00:46:57 +00:00
Josh Holtrop
8f7fc49436 updated svn:ignore properties, added dwlogo object in tests directory
git-svn-id: svn://anubis/anaglym/trunk@53 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-07 20:57:51 +00:00
Josh Holtrop
a3073efb89 enabling smooth shading model
git-svn-id: svn://anubis/anaglym/trunk@52 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-07 20:38:37 +00:00
Josh Holtrop
7fc07f1bf1 added tests folder with a demo
git-svn-id: svn://anubis/anaglym/trunk@51 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-05 22:02:30 +00:00
Josh Holtrop
452b8fe3f3 moved Engine::Object::draw() into .cc file as it got bigger
git-svn-id: svn://anubis/anaglym/trunk@50 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-05 20:03:14 +00:00
Josh Holtrop
4b34a2e565 fixed bug popping when i shouldnt have been and registering doPhysics()
git-svn-id: svn://anubis/anaglym/trunk@49 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-05 19:44:55 +00:00
Josh Holtrop
6a52215247 added doPhysics()
git-svn-id: svn://anubis/anaglym/trunk@48 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-05 19:06:42 +00:00
Josh Holtrop
fccfb572e2 moved video start and stop functionality into Engine, calling update() lua function on redraw events
git-svn-id: svn://anubis/anaglym/trunk@47 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-05 16:52:12 +00:00
Josh Holtrop
5eac13339f fixed offset bug in lua_type() call in ag::object::setPosition()
git-svn-id: svn://anubis/anaglym/trunk@46 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-01 04:02:36 +00:00