48 Commits

Author SHA1 Message Date
Josh Holtrop
f7f6c83795 cleaning up text surfaces upon Engine deletion
git-svn-id: svn://anubis/anaglym/trunk@158 99a6e188-d820-4881-8870-2d33a10e2619
2009-11-08 03:27:20 +00:00
Josh Holtrop
01c65d68dd adding text surfaces to m_texts, switched floats to Uint8's for SDL_Color
git-svn-id: svn://anubis/anaglym/trunk@157 99a6e188-d820-4881-8870-2d33a10e2619
2009-11-08 03:22:33 +00:00
Josh Holtrop
4831fd7658 added FreeSans.ttf to lib folder; added Engine::renderText()
git-svn-id: svn://anubis/anaglym/trunk@156 99a6e188-d820-4881-8870-2d33a10e2619
2009-11-08 03:03:52 +00:00
Josh Holtrop
e8c5c7c5e4 added SDL_ttf boilerplate code
git-svn-id: svn://anubis/anaglym/trunk@155 99a6e188-d820-4881-8870-2d33a10e2619
2009-11-05 13:27:33 +00:00
Josh Holtrop
96ef0ef7ac drawing textures on planes now
git-svn-id: svn://anubis/anaglym/trunk@153 99a6e188-d820-4881-8870-2d33a10e2619
2009-11-03 14:38:40 +00:00
Josh Holtrop
a9ab2a2be4 added count hook to prevent infinite lua loops from running the engine forever
git-svn-id: svn://anubis/anaglym/trunk@151 99a6e188-d820-4881-8870-2d33a10e2619
2009-11-03 04:01:57 +00:00
Josh Holtrop
b83e05218a added ag::loadTexture() and ag::object::setTexture()
git-svn-id: svn://anubis/anaglym/trunk@149 99a6e188-d820-4881-8870-2d33a10e2619
2009-11-03 02:53:31 +00:00
Josh Holtrop
2ccff9db76 changed plane construction to accept 4 parameters to specify (a,b,c,d) directly (in addition to 6 parameter mode)
git-svn-id: svn://anubis/anaglym/trunk@147 99a6e188-d820-4881-8870-2d33a10e2619
2009-11-02 18:59:40 +00:00
Josh Holtrop
2081cf7277 added ag::exit() and ag::import() to exit the lua script and import other lua modules
git-svn-id: svn://anubis/anaglym/trunk@146 99a6e188-d820-4881-8870-2d33a10e2619
2009-11-01 21:27:20 +00:00
Josh Holtrop
f8b15d60ff fixed call to glNormal3fv() when dReal is a double
git-svn-id: svn://anubis/anaglym/trunk@145 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-31 21:55:34 +00:00
Josh Holtrop
acae74107a renamed CCylinder to Capsule globally
git-svn-id: svn://anubis/anaglym/trunk@139 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-29 02:58:37 +00:00
Josh Holtrop
c3d50a4f30 git-svn-id: svn://anubis/anaglym/trunk@135 99a6e188-d820-4881-8870-2d33a10e2619 2009-10-28 03:56:51 +00:00
Josh Holtrop
1d97d948fc fixed drawing of cylinders (physics with ODE doesn' work anyway), fixed re-rendering managed object when the color changes, added managed_objects demo
git-svn-id: svn://anubis/anaglym/trunk@134 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-28 03:32:07 +00:00
Josh Holtrop
e0d20f1a2b fixed bug in Engine::Object destructor
git-svn-id: svn://anubis/anaglym/trunk@133 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-28 03:02:10 +00:00
Josh Holtrop
2616100ded finished filling in ag::create<Object>() functions
git-svn-id: svn://anubis/anaglym/trunk@132 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-28 02:51:28 +00:00
Josh Holtrop
9c94186d31 added ag::object::setColor()
git-svn-id: svn://anubis/anaglym/trunk@130 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-27 23:59:08 +00:00
Josh Holtrop
e5f616b841 fixed up managed plane rendering a bit
git-svn-id: svn://anubis/anaglym/trunk@129 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-27 23:38:23 +00:00
Josh Holtrop
0d15c1a054 finished drawing managed planes (i think)
git-svn-id: svn://anubis/anaglym/trunk@128 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-27 23:34:02 +00:00
Josh Holtrop
ce1da5f7a8 working on drawing planes
git-svn-id: svn://anubis/anaglym/trunk@127 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-27 21:31:21 +00:00
Josh Holtrop
c79ff10b43 drawing managed boxes now (i think)
git-svn-id: svn://anubis/anaglym/trunk@126 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-27 15:23:20 +00:00
Josh Holtrop
3ee41bfa9f drawing capped cylinders now (i think)
git-svn-id: svn://anubis/anaglym/trunk@125 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-27 14:56:06 +00:00
Josh Holtrop
869e6465cc working on rendering managed objects
git-svn-id: svn://anubis/anaglym/trunk@124 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-26 03:20:10 +00:00
Josh Holtrop
1ade25beaa moved loadPhy() functionality from OdeWorld to Engine::Object
git-svn-id: svn://anubis/anaglym/trunk@121 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-24 01:13:43 +00:00
Josh Holtrop
f3e313acf3 fixed bug in calling update_event()
git-svn-id: svn://anubis/anaglym/trunk@119 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-21 00:11:05 +00:00
Josh Holtrop
a235db919a added getCamera()
git-svn-id: svn://anubis/anaglym/trunk@117 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-20 23:20:41 +00:00
Josh Holtrop
e1281bde17 added registerEventHandler() and clearEventHandler() Engine functions with ag:: lua interfaces
git-svn-id: svn://anubis/anaglym/trunk@115 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-20 02:19:43 +00:00
Josh Holtrop
47515f7b1c better error reporting
git-svn-id: svn://anubis/anaglym/trunk@114 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-20 00:39:41 +00:00
Josh Holtrop
f8e918526e F1 toggles fullscreen, F2 toggles mouse cursor grabbing
git-svn-id: svn://anubis/anaglym/trunk@113 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-20 00:11:58 +00:00
Josh Holtrop
66e8b9c015 added mousebutton_{up/down} and mouse_motion events, renamed "pressed" to "down" and "released" to "up" in event names
git-svn-id: svn://anubis/anaglym/trunk@112 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-19 21:50:53 +00:00
Josh Holtrop
bd4eab495c added mouse button down/up and mouse motion events
git-svn-id: svn://anubis/anaglym/trunk@111 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-19 21:44:08 +00:00
Josh Holtrop
978293a57e restructured events a bit for efficiency
git-svn-id: svn://anubis/anaglym/trunk@110 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-19 18:58:46 +00:00
Josh Holtrop
c9b0bc2d82 fixed Engine::removeObject() to destroy the OdeWorld object as well to remove it from the physics computations
git-svn-id: svn://anubis/anaglym/trunk@108 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-19 16:22:59 +00:00
Josh Holtrop
28242e159b updated Engine to use fopen instead of open so that binary files are loaded properly on Windows
git-svn-id: svn://anubis/anaglym/trunk@106 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-19 12:44:37 +00:00
Josh Holtrop
c6319a3a1b added ag::isKeyDown; Engine keeping track of which keys are currently pressed
git-svn-id: svn://anubis/anaglym/trunk@99 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-18 22:48:52 +00:00
Josh Holtrop
c63a4bb808 Engine calling update_event, key_pressed_event, and key_released_event
git-svn-id: svn://anubis/anaglym/trunk@98 99a6e188-d820-4881-8870-2d33a10e2619
2009-10-18 22:20:22 +00:00
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
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
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
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