Menu
▾
▴
cadcdev-svn-commits — Source Code Repository Updates
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(35) |
Dec
(2) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(37) |
Feb
(10) |
Mar
|
Apr
(2) |
May
(17) |
Jun
(1) |
Jul
(14) |
Aug
(14) |
Sep
(4) |
Oct
|
Nov
(14) |
Dec
(4) |
| 2005 |
Jan
(6) |
Feb
|
Mar
|
Apr
(6) |
May
|
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
(92) |
Dec
(12) |
| 2006 |
Jan
(3) |
Feb
(4) |
Mar
|
Apr
(5) |
May
(3) |
Jun
(15) |
Jul
(3) |
Aug
(1) |
Sep
(29) |
Oct
(1) |
Nov
(6) |
Dec
(5) |
| 2007 |
Jan
(2) |
Feb
(2) |
Mar
|
Apr
(3) |
May
(14) |
Jun
(2) |
Jul
(16) |
Aug
(73) |
Sep
(12) |
Oct
(9) |
Nov
(27) |
Dec
(3) |
| 2008 |
Jan
(4) |
Feb
(4) |
Mar
(3) |
Apr
(8) |
May
(23) |
Jun
(4) |
Jul
(1) |
Aug
(3) |
Sep
(7) |
Oct
(5) |
Nov
(1) |
Dec
(1) |
| 2009 |
Jan
|
Feb
(10) |
Mar
|
Apr
(4) |
May
(4) |
Jun
(10) |
Jul
|
Aug
(1) |
Sep
|
Oct
(7) |
Nov
|
Dec
(1) |
| 2010 |
Jan
|
Feb
(1) |
Mar
|
Apr
(6) |
May
|
Jun
(3) |
Jul
(11) |
Aug
(1) |
Sep
|
Oct
(15) |
Nov
(1) |
Dec
(5) |
| 2011 |
Jan
(4) |
Feb
(1) |
Mar
(6) |
Apr
|
May
(22) |
Jun
|
Jul
(8) |
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
(2) |
| 2012 |
Jan
|
Feb
(10) |
Mar
(1) |
Apr
(6) |
May
(27) |
Jun
(48) |
Jul
(30) |
Aug
(4) |
Sep
|
Oct
(3) |
Nov
(1) |
Dec
(11) |
| 2013 |
Jan
(4) |
Feb
(7) |
Mar
(6) |
Apr
(18) |
May
(28) |
Jun
(20) |
Jul
|
Aug
(4) |
Sep
(1) |
Oct
(1) |
Nov
(2) |
Dec
(7) |
| 2014 |
Jan
(3) |
Feb
(2) |
Mar
(4) |
Apr
(9) |
May
(11) |
Jun
(10) |
Jul
|
Aug
(18) |
Sep
(12) |
Oct
(17) |
Nov
(10) |
Dec
(16) |
| 2015 |
Jan
(5) |
Feb
(1) |
Mar
(5) |
Apr
(4) |
May
(28) |
Jun
(2) |
Jul
|
Aug
|
Sep
(6) |
Oct
|
Nov
(2) |
Dec
(1) |
| 2016 |
Jan
(14) |
Feb
|
Mar
(3) |
Apr
|
May
|
Jun
(3) |
Jul
(4) |
Aug
(4) |
Sep
(1) |
Oct
(1) |
Nov
|
Dec
(1) |
| 2017 |
Jan
(11) |
Feb
|
Mar
(21) |
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
| 2018 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
(2) |
Sep
(4) |
Oct
(4) |
Nov
|
Dec
(1) |
| 2019 |
Jan
(1) |
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
(13) |
Sep
(4) |
Oct
|
Nov
|
Dec
|
| 2020 |
Jan
(10) |
Feb
(9) |
Mar
(5) |
Apr
(4) |
May
(3) |
Jun
(18) |
Jul
(4) |
Aug
(2) |
Sep
(20) |
Oct
(2) |
Nov
|
Dec
|
| 2021 |
Jan
|
Feb
|
Mar
|
Apr
(2) |
May
(1) |
Jun
(2) |
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
(2) |
| 2022 |
Jan
(1) |
Feb
(2) |
Mar
(2) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
(5) |
Sep
|
Oct
(1) |
Nov
|
Dec
(1) |
| 2023 |
Jan
(10) |
Feb
(7) |
Mar
(29) |
Apr
(31) |
May
(29) |
Jun
(34) |
Jul
(3) |
Aug
(24) |
Sep
(22) |
Oct
(10) |
Nov
(38) |
Dec
(27) |
| 2024 |
Jan
(15) |
Feb
(8) |
Mar
(4) |
Apr
(20) |
May
(33) |
Jun
(18) |
Jul
(15) |
Aug
(23) |
Sep
(26) |
Oct
(32) |
Nov
(6) |
Dec
(4) |
| 2025 |
Jan
(7) |
Feb
(1) |
Mar
(1) |
Apr
(4) |
May
(46) |
Jun
(19) |
Jul
(26) |
Aug
(48) |
Sep
(30) |
Oct
(8) |
Nov
(9) |
Dec
|
|
From: <ba...@us...> - 2006-06-06 03:56:01
|
Revision: 336 Author: bardtx Date: 2006-06-05 20:55:57 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/cadcdev/?rev=336&view=rev Log Message: ----------- kos: Return value is optional in pthread_join Modified Paths: -------------- kos/kernel/libc/pthreads/pthread_thd.c Modified: kos/kernel/libc/pthreads/pthread_thd.c =================================================================== --- kos/kernel/libc/pthreads/pthread_thd.c 2006-06-06 03:52:50 UTC (rev 335) +++ kos/kernel/libc/pthreads/pthread_thd.c 2006-06-06 03:55:57 UTC (rev 336) @@ -25,9 +25,8 @@ int pthread_join(pthread_t thread, void **value_ptr) { assert( thread ); - assert( value_ptr ); - // XXX Need to get return value. + // XXX Need to get return value if value_ptr != NULL. if (thd_wait(thread) < 0) return ESRCH; else This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ba...@us...> - 2006-06-06 03:52:59
|
Revision: 335 Author: bardtx Date: 2006-06-05 20:52:50 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/cadcdev/?rev=335&view=rev Log Message: ----------- tiki: Switch DC port over to using pthreads instead of KOS threads Modified Paths: -------------- tiki/dc/include/Tiki/platthread.h tiki/dc/src/platthread.cpp tiki/include/Tiki/thread.h tiki/src/thread/thread.cpp Modified: tiki/dc/include/Tiki/platthread.h =================================================================== --- tiki/dc/include/Tiki/platthread.h 2006-06-06 03:51:53 UTC (rev 334) +++ tiki/dc/include/Tiki/platthread.h 2006-06-06 03:52:50 UTC (rev 335) @@ -9,18 +9,14 @@ #ifndef __TIKI_PLATTHREAD_H #define __TIKI_PLATTHREAD_H -#include <kos/thread.h> -#include <kos/sem.h> -#include <kos/mutex.h> -#include <kos/cond.h> -#include <kos/genwait.h> +#include <pthread.h> namespace Tiki { namespace Thread { -typedef ::kthread_t thread_t; -typedef ::mutex_t mutex_t; -typedef ::condvar_t cond_t; +typedef ::pthread_t thread_t; +typedef ::pthread_mutex_t mutex_t; +typedef ::pthread_cond_t cond_t; } } Modified: tiki/dc/src/platthread.cpp =================================================================== --- tiki/dc/src/platthread.cpp 2006-06-06 03:51:53 UTC (rev 334) +++ tiki/dc/src/platthread.cpp 2006-06-06 03:52:50 UTC (rev 335) @@ -1,7 +1,7 @@ /* Tiki - platthread.cpp + tikitime.cpp Copyright (C)2005 Cryptic Allusion, LLC */ @@ -12,81 +12,106 @@ #include <sys/time.h> #include <time.h> -using Tiki::Thread::mutex_t; +// +// For OSX, these pretty much thunk straight down to pthreads. +// + +//using Tiki::Thread::mutex_t; using Tiki::Thread::cond_t; -bool Thread::create(kthread_t * hndout, void (*func)(void *), void * param) { - hndout = thd_create(func, param); - return hndout != NULL; +bool Thread::create(pthread_t * out, void * (*func)(void *), void * param) { + return pthread_create(out, NULL, func, param) >= 0; } -bool Thread::join(kthread_t thd, void ** out) { - thd_wait(&thd); - return true; +bool Thread::join(pthread_t thd, void ** out) { + return pthread_join(thd, out) >= 0; } void Thread::exit(void * ptr) { - thd_exit(); + pthread_exit(ptr); } -bool Thread::equal(kthread_t t1, kthread_t t2) { - return t1.tid == t2.tid; +bool Thread::equal(pthread_t t1, pthread_t t2) { + return !!pthread_equal(t1, t2); } -kthread_t Thread::self() { - return *thd_get_current(); +pthread_t Thread::self() { + return pthread_self(); } bool Thread::mutex_create(mutex_t * out) { - out = ::mutex_create(); - return true; + pthread_mutexattr_t attrs; + if (pthread_mutexattr_init(&attrs) < 0) { + assert( false ); + return false; + } + /*if (pthread_mutexattr_settype(&attrs, PTHREAD_MUTEX_RECURSIVE) < 0) { + assert( false ); + return false; + }*/ + int rv = pthread_mutex_init(out, &attrs) >= 0; + pthread_mutexattr_destroy(&attrs); + return rv; } bool Thread::mutex_destroy(mutex_t * m) { - ::mutex_destroy(m); - return true; + return pthread_mutex_destroy(m) >= 0; } bool Thread::mutex_trylock(mutex_t * m) { - return ::mutex_trylock(m) >= 0; + return pthread_mutex_trylock(m) >= 0; } bool Thread::mutex_lock(mutex_t * m) { - return ::mutex_lock(m) >= 0; + return pthread_mutex_lock(m) >= 0; } bool Thread::mutex_unlock(mutex_t * m) { - ::mutex_unlock(m); - return true; + return pthread_mutex_unlock(m) >= 0; } bool Thread::cond_broadcast(cond_t *cond) { - ::cond_broadcast(cond); - return true; + return pthread_cond_broadcast(cond) >= 0; } bool Thread::cond_destroy(cond_t *cond) { - ::cond_destroy(cond); - return true; + return pthread_cond_destroy(cond) >= 0; } bool Thread::cond_create(cond_t *cond) { - cond = ::cond_create(); - return true; + return pthread_cond_init(cond, NULL) >= 0; } bool Thread::cond_signal(cond_t *cond) { - ::cond_signal(cond); - return true; + return pthread_cond_signal(cond) >= 0; } bool Thread::cond_wait(cond_t *cond, mutex_t *mutex, uint64 maxWaitMicros) { - ::cond_wait_timed(cond, mutex, maxWaitMicros / 1000); - return true; + struct timeval tn; + gettimeofday(&tn, NULL); + + tn.tv_sec += maxWaitMicros / 1000000; + tn.tv_usec += maxWaitMicros % 1000000; + + struct timespec ts; + ts.tv_sec = tn.tv_sec; + ts.tv_nsec = tn.tv_usec * 1000; + + return pthread_cond_timedwait(cond, mutex, &ts) >= 0; } bool Thread::cond_wait(cond_t * cond, mutex_t *mutex) { - return ::cond_wait(cond, mutex) >= 0; + return pthread_cond_wait(cond, mutex) >= 0; } + + + + + + + + + + Modified: tiki/include/Tiki/thread.h =================================================================== --- tiki/include/Tiki/thread.h 2006-06-06 03:51:53 UTC (rev 334) +++ tiki/include/Tiki/thread.h 2006-06-06 03:52:50 UTC (rev 335) @@ -23,11 +23,7 @@ // Plat should have also defined mutex_t and cond_t. -#if TIKI_PLAT == TIKI_DC -bool create(thread_t * hndout, void (*func)(void *), void * param); -#else bool create(thread_t * hndout, void * (*func)(void *), void * param); -#endif bool join(thread_t hnd, void ** out); bool equal(thread_t t1, thread_t t2); thread_t self(); @@ -50,21 +46,13 @@ class Thread : public RefCnt { public: Thread(); -#if TIKI_PLAT == TIKI_DC - Thread(void (*)(void *), void * param); -#else Thread(void* (*)(void *), void * param); -#endif virtual ~Thread(); bool operator==(const Thread & other) const; bool valid() const; -#if TIKI_PLAT == TIKI_DC - bool create(void (*func)(void *), void * param); -#else bool create(void* (*func)(void *), void * param); -#endif bool join(void ** out = NULL); protected: Modified: tiki/src/thread/thread.cpp =================================================================== --- tiki/src/thread/thread.cpp 2006-06-06 03:51:53 UTC (rev 334) +++ tiki/src/thread/thread.cpp 2006-06-06 03:52:50 UTC (rev 335) @@ -15,15 +15,9 @@ Tiki::Thread::Thread::Thread() { } -#if TIKI_PLAT == TIKI_DC -Tiki::Thread::Thread::Thread(void (* func)(void *), void * param) { - create(func, param); -} -#else Tiki::Thread::Thread::Thread(void* (* func)(void *), void * param) { create(func, param); } -#endif Tiki::Thread::Thread::~Thread() { if (valid()) @@ -35,22 +29,12 @@ } bool Tiki::Thread::Thread::valid() const { -#if TIKI_PLAT == TIKI_DC - return false; -#else return (m_hnd != NULL); -#endif } -#if TIKI_PLAT == TIKI_DC -bool Tiki::Thread::Thread::create(void (* func)(void *), void * param) { - return Tiki::Thread::create(&m_hnd, func, param); -} -#else bool Tiki::Thread::Thread::create(void* (* func)(void *), void * param) { return Tiki::Thread::create(&m_hnd, func, param); } -#endif bool Tiki::Thread::Thread::join(void ** out) { return Tiki::Thread::join(m_hnd, out); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ba...@us...> - 2006-06-06 03:51:56
|
Revision: 334 Author: bardtx Date: 2006-06-05 20:51:53 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/cadcdev/?rev=334&view=rev Log Message: ----------- tiki: Add (commented out) support for DC frame rate limiting Modified Paths: -------------- tiki/dc/src/platgl.cpp Modified: tiki/dc/src/platgl.cpp =================================================================== --- tiki/dc/src/platgl.cpp 2006-06-06 03:51:23 UTC (rev 333) +++ tiki/dc/src/platgl.cpp 2006-06-06 03:51:53 UTC (rev 334) @@ -15,6 +15,11 @@ using namespace Tiki; +static struct timeval lastFrame = { 0,0 }; +static int targetFrameRate = 60; +static uint64 firstFrame = 0; +static uint64 frameCnt = 0, totalFrameCnt = 0; + float Tiki::GL::Frame::getFrameRate() { pvr_stats_t stats; pvr_get_stats(&stats); @@ -22,12 +27,41 @@ } void Tiki::GL::Frame::setFrameRateLimit(int rate) { - (void)(rate); + targetFrameRate = rate; } extern "C" { void tiki_wait_if_needed() { +#if 0 + // Every so often we should reset the frame counters, to avoid + // having a super long term averaging effect. + if (frameCnt >= 500) { + firstFrame = 0; + frameCnt = 0; + } + + // Update frame counters. + if (!firstFrame) + firstFrame = Tiki::Time::gettime(); + frameCnt++; + totalFrameCnt++; + + if (lastFrame.tv_sec == 0) { + gettimeofday(&lastFrame, NULL); + return; + } + + struct timeval now; + gettimeofday(&now, NULL); + long long nowu = ((long long)now.tv_sec) * 1000 * 1000 + now.tv_usec; + long long lastu = ((long long)lastFrame.tv_sec) * 1000 * 1000 + lastFrame.tv_usec; + long long diffu = nowu - lastu; + if (diffu < (1000*1000 / targetFrameRate)) { + Time::sleep((1000*1000 / targetFrameRate) - diffu); + } + gettimeofday(&lastFrame, NULL); +#endif pvr_wait_ready(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ba...@us...> - 2006-06-06 03:51:26
|
Revision: 333 Author: bardtx Date: 2006-06-05 20:51:23 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/cadcdev/?rev=333&view=rev Log Message: ----------- tiki: thd_sleep() takes milliseconds, not milliseconds*10 Modified Paths: -------------- tiki/dc/src/tikitime.cpp Modified: tiki/dc/src/tikitime.cpp =================================================================== --- tiki/dc/src/tikitime.cpp 2006-06-06 03:50:33 UTC (rev 332) +++ tiki/dc/src/tikitime.cpp 2006-06-06 03:51:23 UTC (rev 333) @@ -23,16 +23,5 @@ } void Time::sleep(uint64 us) { - thd_sleep(us/10000); + thd_sleep(us/1000); } - - - - - - - - - - - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ba...@us...> - 2006-06-06 03:50:39
|
Revision: 332 Author: bardtx Date: 2006-06-05 20:50:33 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/cadcdev/?rev=332&view=rev Log Message: ----------- tiki: Fix compilation error in Texture for DC port Modified Paths: -------------- tiki/src/gl/texture.cpp Modified: tiki/src/gl/texture.cpp =================================================================== --- tiki/src/gl/texture.cpp 2006-06-04 04:17:41 UTC (rev 331) +++ tiki/src/gl/texture.cpp 2006-06-06 03:50:33 UTC (rev 332) @@ -305,10 +305,12 @@ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, gvmode); // This provides the expected behavior on newer OpenGL impls... +#if TIKI_PLAT != TIKI_DC if (gumode == GL_CLAMP) glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); if (gvmode == GL_CLAMP) glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); +#endif } void * Texture::canvasLock() { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ba...@us...> - 2006-06-06 02:04:09
|
Revision: 331 Author: bardtx Date: 2006-06-03 21:17:41 -0700 (Sat, 03 Jun 2006) ViewCVS: http://svn.sourceforge.net/cadcdev/?rev=331&view=rev Log Message: ----------- kos: Make thd_sleep(0) work properly. Modified Paths: -------------- kos/kernel/thread/thread.c Modified: kos/kernel/thread/thread.c =================================================================== --- kos/kernel/thread/thread.c 2006-05-27 14:08:53 UTC (rev 330) +++ kos/kernel/thread/thread.c 2006-06-04 04:17:41 UTC (rev 331) @@ -597,6 +597,13 @@ return; } + /* A timeout of zero is the same as thd_pass() and passing zero + down to genwait_wait() causes bad juju. */ + if (!ms) { + thd_pass(); + return; + } + /* We can genwait on a non-existant object here with a timeout and have the exact same effect; as a nice bonus, this collapses both sleep cases into a single case, which is nice for scheduling This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <c99...@us...> - 2006-05-27 14:09:05
|
Revision: 330 Author: c99koder Date: 2006-05-27 07:08:53 -0700 (Sat, 27 May 2006) ViewCVS: http://svn.sourceforge.net/cadcdev/?rev=330&view=rev Log Message: ----------- Tiki: Fix key repeating on Win32 Modified Paths: -------------- tiki/win32/src/plathid.cpp Modified: tiki/win32/src/plathid.cpp =================================================================== --- tiki/win32/src/plathid.cpp 2006-05-27 02:33:16 UTC (rev 329) +++ tiki/win32/src/plathid.cpp 2006-05-27 14:08:53 UTC (rev 330) @@ -90,9 +90,21 @@ return outkey; } +typedef struct { + /* Layout these fields according to how they are stored in the LPARAM */ + unsigned int nRepeatCount : 16; + unsigned int nScanCode : 8; + unsigned int nExtended : 1; + unsigned int nReserved : 4; + unsigned int nContextCode : 1; + unsigned int nPrevKeyState : 1; + unsigned int nTransitionState : 1; +} tKEYBOARD; + void Tiki::RecvEvent(UINT iMsg, WPARAM wParam, LPARAM lParam) { int mod = 0; + tKEYBOARD event = {0}; if(GetKeyState(VK_SHIFT) & 0x80) mod |= Event::KeyShift; if(GetKeyState(VK_CONTROL) & 0x80) mod |= Event::KeyControl; @@ -102,17 +114,20 @@ { case WM_KEYDOWN: { + memcpy(&event,&lParam,sizeof(LPARAM)); + Event evt(Event::EvtKeyDown); - if (!(lParam & (1 << 30))) + evt.dev = win32kb; + evt.key = translateFn(wParam, lParam); + evt.mod = mod; + + if (!event.nPrevKeyState) { - evt.dev = win32kb; - evt.key = translateFn(wParam, lParam); - evt.mod = mod; sendEvent(evt); } evt.type = Event::EvtKeypress; - for (int i=0; i<(lParam & 0x0f); i++) + for (int i=0; i<event.nRepeatCount; i++) sendEvent(evt); } break; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <c99...@us...> - 2006-05-27 02:33:22
|
Revision: 329 Author: c99koder Date: 2006-05-26 19:33:16 -0700 (Fri, 26 May 2006) ViewCVS: http://svn.sourceforge.net/cadcdev/?rev=329&view=rev Log Message: ----------- Tiki: correct return type on ConsoleText::getColor() Modified Paths: -------------- tiki/include/Tiki/drawables/console.h Modified: tiki/include/Tiki/drawables/console.h =================================================================== --- tiki/include/Tiki/drawables/console.h 2006-05-25 12:34:19 UTC (rev 328) +++ tiki/include/Tiki/drawables/console.h 2006-05-27 02:33:16 UTC (rev 329) @@ -77,7 +77,7 @@ return m_charData[(y*m_cols) + x]; } - char getColor(int x, int y) { + short getColor(int x, int y) { assert(x<m_cols && y<m_rows); return m_colorData[(y*m_cols) + x]; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <c99...@us...> - 2006-05-25 12:34:34
|
Revision: 328 Author: c99koder Date: 2006-05-25 05:34:19 -0700 (Thu, 25 May 2006) ViewCVS: http://svn.sourceforge.net/cadcdev/?rev=328&view=rev Log Message: ----------- Tiki: Add an additional output operator to Console Modified Paths: -------------- tiki/include/Tiki/drawables/console.h Modified: tiki/include/Tiki/drawables/console.h =================================================================== --- tiki/include/Tiki/drawables/console.h 2006-05-25 01:25:04 UTC (rev 327) +++ tiki/include/Tiki/drawables/console.h 2006-05-25 12:34:19 UTC (rev 328) @@ -92,6 +92,12 @@ m_colorData[(y*m_cols) + x] = attr; } + ConsoleText& operator <<(std::string input) { + printf("%s",input.c_str()); + + return *this; + } + ConsoleText& operator <<(const char *input) { printf("%s",input); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <cad...@li...> - 2006-04-10 02:08:00
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns=3D"http://www.w3.org/1999/xhtml"> <head><style type=3D"text/css"><!-- body {background:#ffffff;font-family:Verdana,Helvetica,Arial,sans-serif;} h3 {margin:15px 0;padding:0;line-height:0;} #msg {margin: 0 0 2em 0;} #msg dl, #msg ul, #msg pre {padding:1em;border:1px dashed black;margin: 1= 0px 0 30px 0;} #msg dl {background:#ccccff;} #msg pre {background:#ffffcc;} #msg ul {background:#cc99ff;list-style:none;} #msg dt {font-weight:bold;float:left;width: 6em;} #msg dt:after { content:':';} #patch h4 {padding: 0 10px;line-height:1.5em;margin:0;background:#ccffff;= border-bottom:1px solid black;margin:0 0 10px 0;} #patch .propset h4, #patch .binary h4 {margin: 0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {background:#eeeeee;padding: 0 0 10px 0;} #patch .propset .diff, #patch .binary .diff {padding: 10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patc= h .binary {border:1px solid black;margin:10px 0;} #patch .add {background:#ddffdd;} #patch .rem {background:#ffdddd;} #patch .lines, .info {color:#888888;background:#ffffff;} --></style> <title>[307] tiki/win32/src: tiki: fix inconsistent line endings in win32= sources</title> </head> <body> <div id=3D"msg"> <dl> <dt>Revision</dt> <dd>307</dd> <dt>Author</dt> <dd>bard</dd> <dt>Date</dt> <dd>2006-03-26 16:14:11 -0800 (Sun, 26 Mar 2006)</dd> </dl> <h3>Log Message</h3> <pre>tiki: fix inconsistent line endings in win32 sources</pre> <h3>Modified Paths</h3> <ul> <li><a href=3D"#tikiwin32includeTikiglhdrsh">tiki/win32/include/Tiki/glhd= rs.h</a></li> <li><a href=3D"#tikiwin32includepchh">tiki/win32/include/pch.h</a></li> <li><a href=3D"#tikiwin32srcinit_shutdowncpp">tiki/win32/src/init_shutdow= n.cpp</a></li> <li><a href=3D"#tikiwin32srcplatglcpp">tiki/win32/src/platgl.cpp</a></li> </ul> </div> <div id=3D"patch"> <h3>Diff</h3> <a id=3D"tikiwin32includeTikiglhdrsh"></a> <div class=3D"modfile"><h4>Modified: tiki/win32/include/Tiki/glhdrs.h (30= 6 =3D> 307)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/win32/include/Tiki/glhdrs.h 2006-02-19 21:3= 6:15 UTC (rev 306) +++ tiki/win32/include/Tiki/glhdrs.h 2006-03-27 00:14:11 UTC (rev 307) </span><span class=3D"lines">@@ -1,12 +1,12 @@ </span><span class=3D"rem">-#pragma once - </span><span class=3D"add">+#pragma once + </span><span class=3D"cx"> #include <windows.h> </span><span class=3D"rem">- -#include <GL/gl.h> -#include <GL/glu.h> - -namespace Tiki { - HWND GetWin32Window(); -}; - - </span><span class=3D"add">+ +#include <GL/gl.h> +#include <GL/glu.h> + +namespace Tiki { + HWND GetWin32Window(); +}; + + </span></pre></div> <a id=3D"tikiwin32includepchh"></a> <div class=3D"modfile"><h4>Modified: tiki/win32/include/pch.h (306 =3D> 3= 07)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/win32/include/pch.h 2006-02-19 21:36:15 UTC= (rev 306) +++ tiki/win32/include/pch.h 2006-03-27 00:14:11 UTC (rev 307) </span><span class=3D"lines">@@ -1,36 +1,36 @@ </span><span class=3D"rem">-// stdafx.h : include file for standard syste= m include files, -// or project specific include files that are used frequently, but -// are changed infrequently -// - -#pragma once - -#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows h= eaders - -#ifndef VC_EXTRALEAN -#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers -#endif - </span><span class=3D"add">+// stdafx.h : include file for standard syste= m include files, +// or project specific include files that are used frequently, but +// are changed infrequently +// + +#pragma once + +#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows h= eaders + +#ifndef VC_EXTRALEAN +#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers +#endif + </span><span class=3D"cx"> #include <windows.h> </span><span class=3D"rem">-#include <shellapi.h> - -#define _USE_MATH_DEFINES -#include <math.h> - -// This header does most of the useful work for bringing in stuff. -#include "Tiki/tiki.h" - -// Don't bother with namespace poo inside the framework itself. -using namespace Tiki; - -// This is the hand-off point in the library from WinMain, and HID callb= acks. -namespace Tiki { - int DoMain(const char * szAppName, HINSTANCE hInst, HINSTANCE hPrevInst= ance, LPSTR lpCmdLine, int nCmdShow); - void RecvQuit(); - void RecvEvent(UINT iMsg, WPARAM wParam, LPARAM lParam); -} - -// Packed structs need some compiler-specific foo. -#define PACKED_STRUCT_BEGIN #pragma pack(push, 1) -#define PACKED_STRUCT_END #pragma pack(pop) -#define PACKED_STRUCT_MEMBER </span><span class=3D"add">+#include <shellapi.h> + +#define _USE_MATH_DEFINES +#include <math.h> + +// This header does most of the useful work for bringing in stuff. +#include "Tiki/tiki.h" + +// Don't bother with namespace poo inside the framework itself. +using namespace Tiki; + +// This is the hand-off point in the library from WinMain, and HID callb= acks. +namespace Tiki { + int DoMain(const char * szAppName, HINSTANCE hInst, HINSTANCE hPrevInst= ance, LPSTR lpCmdLine, int nCmdShow); + void RecvQuit(); + void RecvEvent(UINT iMsg, WPARAM wParam, LPARAM lParam); +} + +// Packed structs need some compiler-specific foo. +#define PACKED_STRUCT_BEGIN #pragma pack(push, 1) +#define PACKED_STRUCT_END #pragma pack(pop) +#define PACKED_STRUCT_MEMBER </span></pre></div> <a id=3D"tikiwin32srcinit_shutdowncpp"></a> <div class=3D"modfile"><h4>Modified: tiki/win32/src/init_shutdown.cpp (30= 6 =3D> 307)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/win32/src/init_shutdown.cpp 2006-02-19 21:3= 6:15 UTC (rev 306) +++ tiki/win32/src/init_shutdown.cpp 2006-03-27 00:14:11 UTC (rev 307) </span><span class=3D"lines">@@ -1,45 +1,45 @@ </span><span class=3D"rem">-#include "pch.h" - -#include "Tiki/plxcompat.h" -#include "Tiki/hid.h" -#include "Tiki/sound.h" -#include "Tiki/stream.h" - -#include <al.h> -#include <alut.h> - -#include <MMSystem.h> -#pragma comment(lib, "winmm.lib") -#pragma comment(lib, "ALut.lib") -#pragma comment(lib, "OpenAL32.lib") - -bool Tiki::init(int argc, char **argv) { - // Let us run with millisecond precision if possible. - timeBeginPeriod(1); - - alutInit(&argc, argv); - Audio::Stream::initGlobal(); - Audio::Sound::initGlobal(); - - GL::Plxcompat::plx_mat3d_init(640, 480); - Hid::init(); - - return true; -} - -void Tiki::shutdown() { - Hid::shutdown(); - Audio::Sound::shutdownGlobal(); - Audio::Stream::shutdownGlobal(); - alutExit(); - - timeEndPeriod(1); -} </span><span class=3D"add">+#include "pch.h" </span><span class=3D"cx">=20 </span><span class=3D"add">+#include "Tiki/plxcompat.h" +#include "Tiki/hid.h" +#include "Tiki/sound.h" +#include "Tiki/stream.h" + +#include <al.h> +#include <alut.h> + +#include <MMSystem.h> +#pragma comment(lib, "winmm.lib") +#pragma comment(lib, "ALut.lib") +#pragma comment(lib, "OpenAL32.lib") + +bool Tiki::init(int argc, char **argv) { + // Let us run with millisecond precision if possible. + timeBeginPeriod(1); + + alutInit(&argc, argv); + Audio::Stream::initGlobal(); + Audio::Sound::initGlobal(); + + GL::Plxcompat::plx_mat3d_init(640, 480); + Hid::init(); + + return true; +} + +void Tiki::shutdown() { + Hid::shutdown(); + Audio::Sound::shutdownGlobal(); + Audio::Stream::shutdownGlobal(); + alutExit(); + + timeEndPeriod(1); +} + </span><span class=3D"cx"> void Tiki::setName(const char *name, const cha= r *icon) { SetWindowText(Tiki::GetWin32Window(), name); } =20 void Tiki::GL::showCursor(bool visible) { =20 </span><span class=3D"rem">-} </span><span class=3D"add">+} </span></pre></div> <a id=3D"tikiwin32srcplatglcpp"></a> <div class=3D"modfile"><h4>Modified: tiki/win32/src/platgl.cpp (306 =3D> = 307)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/win32/src/platgl.cpp 2006-02-19 21:36:15 UT= C (rev 306) +++ tiki/win32/src/platgl.cpp 2006-03-27 00:14:11 UTC (rev 307) </span><span class=3D"lines">@@ -1,244 +1,244 @@ </span><span class=3D"rem">-/* - Tiki - - platgl.cpp - - Copyright (C)2005 Cryptic Allusion, LLC - - Most of this file is code created by Brian Peek for TikiTest. - -*/ - -#include "pch.h" -#include "Tiki/glhdrs.h" -#include "Tiki/hid.h" -#include "Tiki/tikitime.h" </span><span class=3D"add">+/* + Tiki + + platgl.cpp + + Copyright (C)2005 Cryptic Allusion, LLC + + Most of this file is code created by Brian Peek for TikiTest. + +*/ + +#include "pch.h" +#include "Tiki/glhdrs.h" +#include "Tiki/hid.h" +#include "Tiki/tikitime.h" </span><span class=3D"cx"> #include "Tiki/gl.h" </span><span class=3D"rem">- -#pragma comment(lib, "shell32.lib") -#pragma comment(lib, "opengl32.lib") -#pragma comment(lib, "glu32.lib") - -using namespace Tiki::Hid; - -// Windows globals -static HWND m_hWndMain; -static HINSTANCE m_hInstance; -static HGLRC m_hrc; -static DWORD m_dwThreadID; -static HANDLE m_hThread; -static HDC m_hThreadDc; - -static int m_targetFrameRate =3D 60, m_targetW =3D 640, m_targetH =3D 48= 0; - -typedef int (APIENTRY * PFNWGLSWAPINTERVALEXTPROC)(int interval); -static PFNWGLSWAPINTERVALEXTPROC wglSwapIntervalEXT =3D NULL; -typedef int (APIENTRY * PFNWGLGETSWAPINTERVALEXTPROC)(void); -static PFNWGLGETSWAPINTERVALEXTPROC wglGetSwapIntervalEXT =3D NULL; - -extern "C" int tiki_main(int argc, char **argv); - -// Forward decls -namespace Tiki { - LRESULT CALLBACK WndProc(HWND hWnd, UINT iMsg, WPARAM wParam, LPARAM lP= aram); - - BOOL InitApplication(); - BOOL DestroyApplication(); - BOOL ErrorBox(LPCTSTR lpText); - DWORD WINAPI GameThread(void *obj); - void OnSize(WORD cx, WORD cy); </span><span class=3D"add">+ +#pragma comment(lib, "shell32.lib") +#pragma comment(lib, "opengl32.lib") +#pragma comment(lib, "glu32.lib") + +using namespace Tiki::Hid; + +// Windows globals +static HWND m_hWndMain; +static HINSTANCE m_hInstance; +static HGLRC m_hrc; +static DWORD m_dwThreadID; +static HANDLE m_hThread; +static HDC m_hThreadDc; + +static int m_targetFrameRate =3D 60, m_targetW =3D 640, m_targetH =3D 48= 0; + +typedef int (APIENTRY * PFNWGLSWAPINTERVALEXTPROC)(int interval); +static PFNWGLSWAPINTERVALEXTPROC wglSwapIntervalEXT =3D NULL; +typedef int (APIENTRY * PFNWGLGETSWAPINTERVALEXTPROC)(void); +static PFNWGLGETSWAPINTERVALEXTPROC wglGetSwapIntervalEXT =3D NULL; + +extern "C" int tiki_main(int argc, char **argv); + +// Forward decls +namespace Tiki { + LRESULT CALLBACK WndProc(HWND hWnd, UINT iMsg, WPARAM wParam, LPARAM lP= aram); + + BOOL InitApplication(); + BOOL DestroyApplication(); + BOOL ErrorBox(LPCTSTR lpText); + DWORD WINAPI GameThread(void *obj); + void OnSize(WORD cx, WORD cy); </span><span class=3D"cx"> } </span><span class=3D"rem">- -HWND Tiki::GetWin32Window() -{ - return m_hWndMain; -} - -//////////////////////////////////// -// Tiki::DoMain -// initialization -//////////////////////////////////// -int Tiki::DoMain(const char * szAppName, HINSTANCE hInst, HINSTANCE hPre= vInstance, LPSTR lpCmdLine, int nCmdShow) -{ - MSG msg; - WNDCLASSEX wc; </span><span class=3D"add">+ +HWND Tiki::GetWin32Window() +{ + return m_hWndMain; +} + +//////////////////////////////////// +// Tiki::DoMain +// initialization +//////////////////////////////////// +int Tiki::DoMain(const char * szAppName, HINSTANCE hInst, HINSTANCE hPre= vInstance, LPSTR lpCmdLine, int nCmdShow) +{ + MSG msg; + WNDCLASSEX wc; </span><span class=3D"cx"> RECT WindowRect; // Grabs Rectangle Upper= Left / Lower Right Values WindowRect.left=3D(long)0; // Set Left Value To 0 WindowRect.right=3D(long)m_targetW; // Set Right Value To Requested Wi= dth WindowRect.top=3D(long)0; // Set Top Value To 0 </span><span class=3D"rem">- WindowRect.bottom=3D(long)m_targetH; // Set= Bottom Value To Requested Height - m_hInstance =3D hInst; - - wc.cbSize =3D sizeof(wc); - wc.style =3D CS_HREDRAW | CS_VREDRAW; - wc.lpfnWndProc =3D (WNDPROC)WndProc; - wc.cbClsExtra =3D 0; - wc.cbWndExtra =3D 0; - wc.hInstance =3D hInst; - wc.hIcon =3D LoadIcon(hInst, IDI_APPLICATION); - wc.hCursor =3D LoadCursor(NULL, IDC_ARROW); - wc.hbrBackground =3D (HBRUSH)(COLOR_WINDOW+1); - wc.lpszMenuName =3D NULL; - wc.lpszClassName =3D szAppName; - wc.hIconSm =3D LoadIcon(m_hInstance, IDI_APPLICATION); - - if(!RegisterClassEx(&wc)) - return FALSE; - - AdjustWindowRect(&WindowRect, WS_OVERLAPPEDWINDOW, FALSE); - - m_hWndMain =3D CreateWindow(szAppName, szAppName, WS_OVERLAPPEDWINDOW, = 0, 0, WindowRect.right-WindowRect.left, WindowRect.bottom-WindowRect.top,= NULL, NULL, m_hInstance, NULL); - - if(!m_hWndMain) - return FALSE; - - if(!InitApplication()) - return FALSE; - - ShowWindow(m_hWndMain, nCmdShow); - - m_hThread =3D CreateThread(NULL, 0, GameThread, lpCmdLine, 0, &m_dw= ThreadID); - - while(GetMessage(&msg, NULL, 0, 0)) - { - TranslateMessage(&msg); - DispatchMessage(&msg); - } - - return (int)msg.wParam; -} - -//////////////////////////////////// -// WndProc -// Messages for our window are handled here -//////////////////////////////////// -LRESULT CALLBACK Tiki::WndProc(HWND hWnd, UINT iMsg, WPARAM wParam, LPAR= AM lParam) -{ - switch(iMsg) - { - case WM_KEYDOWN: - case WM_KEYUP: - case WM_MOUSEMOVE: - case WM_LBUTTONDOWN: - case WM_LBUTTONUP: - case WM_MBUTTONDOWN: - case WM_MBUTTONUP: - case WM_RBUTTONDOWN: - case WM_RBUTTONUP: - Tiki::RecvEvent(iMsg, wParam, lParam); - break; - - case WM_DESTROY: - Tiki::RecvQuit(); - DestroyApplication(); - PostQuitMessage(0); - break; - - default: - return DefWindowProc(hWnd, iMsg, wParam, lParam); - } - return 0L; -} - -BOOL Tiki::InitApplication() -{ - HDC hdc =3D GetDC(m_hWndMain); - - // Fill in a pixel format descriptor. - PIXELFORMATDESCRIPTOR pfd; - memset(&pfd, 0, sizeof(pfd)); - pfd.nSize =3D sizeof(pfd); - pfd.nVersion =3D 1; - pfd.dwFlags =3D PFD_DOUBLEBUFFER | - PFD_SUPPORT_OPENGL | - PFD_DRAW_TO_WINDOW | - PFD_GENERIC_ACCELERATED; - pfd.iPixelType =3D PFD_TYPE_RGBA; - pfd.cColorBits =3D 24; - pfd.cDepthBits =3D 32; - pfd.iLayerType =3D PFD_MAIN_PLANE; - int chosen =3D ChoosePixelFormat(hdc, &pfd); - - // Check to see if we got accelerated. - memset(&pfd, 0, sizeof(pfd)); - pfd.nSize =3D sizeof(pfd); - DescribePixelFormat(hdc, chosen, sizeof(pfd), &pfd); - if (pfd.dwFlags & PFD_GENERIC_FORMAT) { - MessageBox(NULL, "No accelerated GL seems to be available.",= "Error", MB_ICONERROR | MB_OK); - // return FALSE; - } - - // Set the format into the DC. - if (!SetPixelFormat(hdc, chosen, &pfd)) { - ErrorBox("Couldn't set pixel format into DC."); - return FALSE; - } - - // Create rendering context to use. - HGLRC hrc =3D wglCreateContext(hdc); - if (!hrc) { - ErrorBox("Couldn't create WGL context."); - return FALSE; - } - m_hrc =3D hrc; - - // Make the context current so we can do some twiddling. - wglMakeCurrent(hdc, m_hrc); - - // Query for the swap interval extensions. - wglGetSwapIntervalEXT =3D (PFNWGLGETSWAPINTERVALEXTPROC)wglGetProcAddre= ss("wglGetSwapIntervalEXT"); - wglSwapIntervalEXT =3D (PFNWGLSWAPINTERVALEXTPROC)wglGetProcAddress(&qu= ot;wglSwapIntervalEXT"); - - // If we got the Get function, display the old sync setting. - if (wglGetSwapIntervalEXT) { - Debug::printf("Vertical sync state was %d\n", wglGetSwapInte= rvalEXT()); - } else { - Debug::printf("WARNING! wglGetSwapIntervalEXT is NULL\n"); - } - - // If we got the Set function, change sync to OFF. It causes big proble= ms on - // nVidia cards. - if (wglSwapIntervalEXT) { - Debug::printf("Turning off vertical sync\n"); - wglSwapIntervalEXT(0); - } else { - Debug::printf("WARNING! wglSwapIntervalEXT is NULL\n"); - } - - // Turn off the context and release the DC. - wglMakeCurrent(NULL, NULL); - ReleaseDC(m_hWndMain, hdc); - - return TRUE; -} - -BOOL Tiki::DestroyApplication() -{ - if(WaitForSingleObject(m_hThread, INFINITE) !=3D WAIT_OBJECT_0) - ErrorBox("Couldn't wait for game thread to terminate."); - - if(!CloseHandle(m_hThread)) - ErrorBox("Couldn't terminate game thread."); - - Tiki::shutdown(); - - return TRUE; -} - -BOOL Tiki::ErrorBox(LPCTSTR lpText) -{ - MessageBox(m_hWndMain, lpText, "Error", MB_ICONERROR); - return FALSE; -} - -DWORD WINAPI Tiki::GameThread(void *obj) -{ </span><span class=3D"add">+ WindowRect.bottom=3D(long)m_targetH; // Set= Bottom Value To Requested Height + m_hInstance =3D hInst; + + wc.cbSize =3D sizeof(wc); + wc.style =3D CS_HREDRAW | CS_VREDRAW; + wc.lpfnWndProc =3D (WNDPROC)WndProc; + wc.cbClsExtra =3D 0; + wc.cbWndExtra =3D 0; + wc.hInstance =3D hInst; + wc.hIcon =3D LoadIcon(hInst, IDI_APPLICATION); + wc.hCursor =3D LoadCursor(NULL, IDC_ARROW); + wc.hbrBackground =3D (HBRUSH)(COLOR_WINDOW+1); + wc.lpszMenuName =3D NULL; + wc.lpszClassName =3D szAppName; + wc.hIconSm =3D LoadIcon(m_hInstance, IDI_APPLICATION); + + if(!RegisterClassEx(&wc)) + return FALSE; + + AdjustWindowRect(&WindowRect, WS_OVERLAPPEDWINDOW, FALSE); + + m_hWndMain =3D CreateWindow(szAppName, szAppName, WS_OVERLAPPEDWINDOW, = 0, 0, WindowRect.right-WindowRect.left, WindowRect.bottom-WindowRect.top,= NULL, NULL, m_hInstance, NULL); + + if(!m_hWndMain) + return FALSE; + + if(!InitApplication()) + return FALSE; + + ShowWindow(m_hWndMain, nCmdShow); + + m_hThread =3D CreateThread(NULL, 0, GameThread, lpCmdLine, 0, &m_dw= ThreadID); + + while(GetMessage(&msg, NULL, 0, 0)) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + + return (int)msg.wParam; +} + +//////////////////////////////////// +// WndProc +// Messages for our window are handled here +//////////////////////////////////// +LRESULT CALLBACK Tiki::WndProc(HWND hWnd, UINT iMsg, WPARAM wParam, LPAR= AM lParam) +{ + switch(iMsg) + { + case WM_KEYDOWN: + case WM_KEYUP: + case WM_MOUSEMOVE: + case WM_LBUTTONDOWN: + case WM_LBUTTONUP: + case WM_MBUTTONDOWN: + case WM_MBUTTONUP: + case WM_RBUTTONDOWN: + case WM_RBUTTONUP: + Tiki::RecvEvent(iMsg, wParam, lParam); + break; + + case WM_DESTROY: + Tiki::RecvQuit(); + DestroyApplication(); + PostQuitMessage(0); + break; + + default: + return DefWindowProc(hWnd, iMsg, wParam, lParam); + } + return 0L; +} + +BOOL Tiki::InitApplication() +{ + HDC hdc =3D GetDC(m_hWndMain); + + // Fill in a pixel format descriptor. + PIXELFORMATDESCRIPTOR pfd; + memset(&pfd, 0, sizeof(pfd)); + pfd.nSize =3D sizeof(pfd); + pfd.nVersion =3D 1; + pfd.dwFlags =3D PFD_DOUBLEBUFFER | + PFD_SUPPORT_OPENGL | + PFD_DRAW_TO_WINDOW | + PFD_GENERIC_ACCELERATED; + pfd.iPixelType =3D PFD_TYPE_RGBA; + pfd.cColorBits =3D 24; + pfd.cDepthBits =3D 32; + pfd.iLayerType =3D PFD_MAIN_PLANE; + int chosen =3D ChoosePixelFormat(hdc, &pfd); + + // Check to see if we got accelerated. + memset(&pfd, 0, sizeof(pfd)); + pfd.nSize =3D sizeof(pfd); + DescribePixelFormat(hdc, chosen, sizeof(pfd), &pfd); + if (pfd.dwFlags & PFD_GENERIC_FORMAT) { + MessageBox(NULL, "No accelerated GL seems to be available.",= "Error", MB_ICONERROR | MB_OK); + // return FALSE; + } + + // Set the format into the DC. + if (!SetPixelFormat(hdc, chosen, &pfd)) { + ErrorBox("Couldn't set pixel format into DC."); + return FALSE; + } + + // Create rendering context to use. + HGLRC hrc =3D wglCreateContext(hdc); + if (!hrc) { + ErrorBox("Couldn't create WGL context."); + return FALSE; + } + m_hrc =3D hrc; + + // Make the context current so we can do some twiddling. + wglMakeCurrent(hdc, m_hrc); + + // Query for the swap interval extensions. + wglGetSwapIntervalEXT =3D (PFNWGLGETSWAPINTERVALEXTPROC)wglGetProcAddre= ss("wglGetSwapIntervalEXT"); + wglSwapIntervalEXT =3D (PFNWGLSWAPINTERVALEXTPROC)wglGetProcAddress(&qu= ot;wglSwapIntervalEXT"); + + // If we got the Get function, display the old sync setting. + if (wglGetSwapIntervalEXT) { + Debug::printf("Vertical sync state was %d\n", wglGetSwapInte= rvalEXT()); + } else { + Debug::printf("WARNING! wglGetSwapIntervalEXT is NULL\n"); + } + + // If we got the Set function, change sync to OFF. It causes big proble= ms on + // nVidia cards. + if (wglSwapIntervalEXT) { + Debug::printf("Turning off vertical sync\n"); + wglSwapIntervalEXT(0); + } else { + Debug::printf("WARNING! wglSwapIntervalEXT is NULL\n"); + } + + // Turn off the context and release the DC. + wglMakeCurrent(NULL, NULL); + ReleaseDC(m_hWndMain, hdc); + + return TRUE; +} + +BOOL Tiki::DestroyApplication() +{ + if(WaitForSingleObject(m_hThread, INFINITE) !=3D WAIT_OBJECT_0) + ErrorBox("Couldn't wait for game thread to terminate."); + + if(!CloseHandle(m_hThread)) + ErrorBox("Couldn't terminate game thread."); + + Tiki::shutdown(); + + return TRUE; +} + +BOOL Tiki::ErrorBox(LPCTSTR lpText) +{ + MessageBox(m_hWndMain, lpText, "Error", MB_ICONERROR); + return FALSE; +} + +DWORD WINAPI Tiki::GameThread(void *obj) +{ </span><span class=3D"cx"> Debug::printf( "GameThread beginning\n&q= uot; ); </span><span class=3D"rem">- - // Set up our GL context so that texture loading and such works as well= . - m_hThreadDc =3D GetDC(m_hWndMain); - wglMakeCurrent(m_hThreadDc, m_hrc); </span><span class=3D"cx">=20 </span><span class=3D"add">+ // Set up our GL context so that texture loa= ding and such works as well. + m_hThreadDc =3D GetDC(m_hWndMain); + wglMakeCurrent(m_hThreadDc, m_hrc); + </span><span class=3D"cx"> int argc =3D 0; LPWSTR *args =3D CommandLineToArgvW(GetCommandLineW(), &argc); // if we have 1 or more command line args, pass it down nicely to tiki_= main </span><span class=3D"lines">@@ -251,7 +251,7 @@ </span><span class=3D"cx"> sprintf(argv[i], "%ws", = args[i]); } LocalFree(args); </span><span class=3D"rem">- </span><span class=3D"add">+ </span><span class=3D"cx"> tiki_main(argc, argv); =20 // cleanup allocated memory for cmd line args </span><span class=3D"lines">@@ -265,87 +265,87 @@ </span><span class=3D"cx"> { tiki_main(0, NULL); } </span><span class=3D"rem">- - ReleaseDC(m_hWndMain, m_hThreadDc); - m_hThreadDc =3D NULL; - - Debug::printf( "GameThread exiting\n" ); - return 0; -} - - -static uint64 lastFrame =3D 0; -static uint64 firstFrame =3D 0; -static uint64 frameCnt =3D 0, totalFrameCnt =3D 0; - -float Tiki::GL::Frame::getFrameRate() { - uint64 cur =3D Tiki::Time::gettime(); - - // Avoid divzero - if (cur =3D=3D firstFrame) - return 0.0f; - - return (float)((frameCnt * 1000000.0) / (cur - firstFrame)); -} - -void Tiki::GL::Frame::setFrameRateLimit(int rate) { - m_targetFrameRate =3D rate; -} - -extern "C" void tiki_scene_begin_hook() { - // Set up our GL context for painting. - wglMakeCurrent(m_hThreadDc, m_hrc); - - // Every so often we should reset the frame counters, to avoid - // having a super long term averaging effect. - if (frameCnt >=3D 500) { - firstFrame =3D 0; - frameCnt =3D 0; - } - - // Update frame counters. - if (!firstFrame) - firstFrame =3D Tiki::Time::gettime(); - frameCnt++; - totalFrameCnt++; - -#ifdef _DEBUG - if (frameCnt && !(frameCnt % 250)) { - Debug::printf("frame %d, fps =3D %.2f\n", (int)frameCnt, - (double)Tiki::GL::Frame::getFrameRate()); - } -#endif - - if (lastFrame =3D=3D 0) { - lastFrame =3D Tiki::Time::gettime(); - return; - } - - uint64 now; - now =3D Tiki::Time::gettime(); - uint64 diff =3D now - lastFrame; - if (diff < (1000*1000 / m_targetFrameRate)) { - Tiki::Time::sleep((1000*1000 / m_targetFrameRate) - diff); - } - lastFrame =3D Tiki::Time::gettime(); -} - -extern "C" void tiki_scene_finish_hook() { - // Flush any remaining GL commands and swap buffers. - glFlush(); - SwapBuffers(m_hThreadDc); - - // Deactivate GL context. - // NOTE: We do NOT do this because otherwise a lot of stuff done outsid= e - // the frame proper e.g. loading textures will not work. - // wglMakeCurrent(NULL, NULL); -} - - - - - - - - - </span><span class=3D"add">+ + ReleaseDC(m_hWndMain, m_hThreadDc); + m_hThreadDc =3D NULL; + + Debug::printf( "GameThread exiting\n" ); + return 0; +} + + +static uint64 lastFrame =3D 0; +static uint64 firstFrame =3D 0; +static uint64 frameCnt =3D 0, totalFrameCnt =3D 0; + +float Tiki::GL::Frame::getFrameRate() { + uint64 cur =3D Tiki::Time::gettime(); + + // Avoid divzero + if (cur =3D=3D firstFrame) + return 0.0f; + + return (float)((frameCnt * 1000000.0) / (cur - firstFrame)); +} + +void Tiki::GL::Frame::setFrameRateLimit(int rate) { + m_targetFrameRate =3D rate; +} + +extern "C" void tiki_scene_begin_hook() { + // Set up our GL context for painting. + wglMakeCurrent(m_hThreadDc, m_hrc); + + // Every so often we should reset the frame counters, to avoid + // having a super long term averaging effect. + if (frameCnt >=3D 500) { + firstFrame =3D 0; + frameCnt =3D 0; + } + + // Update frame counters. + if (!firstFrame) + firstFrame =3D Tiki::Time::gettime(); + frameCnt++; + totalFrameCnt++; + +#ifdef _DEBUG + if (frameCnt && !(frameCnt % 250)) { + Debug::printf("frame %d, fps =3D %.2f\n", (int)frameCnt, + (double)Tiki::GL::Frame::getFrameRate()); + } +#endif + + if (lastFrame =3D=3D 0) { + lastFrame =3D Tiki::Time::gettime(); + return; + } + + uint64 now; + now =3D Tiki::Time::gettime(); + uint64 diff =3D now - lastFrame; + if (diff < (1000*1000 / m_targetFrameRate)) { + Tiki::Time::sleep((1000*1000 / m_targetFrameRate) - diff); + } + lastFrame =3D Tiki::Time::gettime(); +} + +extern "C" void tiki_scene_finish_hook() { + // Flush any remaining GL commands and swap buffers. + glFlush(); + SwapBuffers(m_hThreadDc); + + // Deactivate GL context. + // NOTE: We do NOT do this because otherwise a lot of stuff done outsid= e + // the frame proper e.g. loading textures will not work. + // wglMakeCurrent(NULL, NULL); +} + + + + + + + + + </span> </pre> </div> </div> </body> </html> |
|
From: <cad...@li...> - 2006-04-10 02:07:48
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns=3D"http://www.w3.org/1999/xhtml"> <head><style type=3D"text/css"><!-- body {background:#ffffff;font-family:Verdana,Helvetica,Arial,sans-serif;} h3 {margin:15px 0;padding:0;line-height:0;} #msg {margin: 0 0 2em 0;} #msg dl, #msg ul, #msg pre {padding:1em;border:1px dashed black;margin: 1= 0px 0 30px 0;} #msg dl {background:#ccccff;} #msg pre {background:#ffffcc;} #msg ul {background:#cc99ff;list-style:none;} #msg dt {font-weight:bold;float:left;width: 6em;} #msg dt:after { content:':';} #patch h4 {padding: 0 10px;line-height:1.5em;margin:0;background:#ccffff;= border-bottom:1px solid black;margin:0 0 10px 0;} #patch .propset h4, #patch .binary h4 {margin: 0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {background:#eeeeee;padding: 0 0 10px 0;} #patch .propset .diff, #patch .binary .diff {padding: 10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patc= h .binary {border:1px solid black;margin:10px 0;} #patch .add {background:#ddffdd;} #patch .rem {background:#ffdddd;} #patch .lines, .info {color:#888888;background:#ffffff;} --></style> <title>[311] tiki/src/gl/texture.cpp: Tiki: twiddle Dreamcast textures lo= aded from files</title> </head> <body> <div id=3D"msg"> <dl> <dt>Revision</dt> <dd>311</dd> <dt>Author</dt> <dd>sam.steele</dd> <dt>Date</dt> <dd>2006-04-08 11:54:33 -0700 (Sat, 08 Apr 2006)</dd> </dl> <h3>Log Message</h3> <pre>Tiki: twiddle Dreamcast textures loaded from files</pre> <h3>Modified Paths</h3> <ul> <li><a href=3D"#tikisrcgltexturecpp">tiki/src/gl/texture.cpp</a></li> </ul> </div> <div id=3D"patch"> <h3>Diff</h3> <a id=3D"tikisrcgltexturecpp"></a> <div class=3D"modfile"><h4>Modified: tiki/src/gl/texture.cpp (310 =3D> 31= 1)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/src/gl/texture.cpp 2006-04-06 23:28:37 UTC = (rev 310) +++ tiki/src/gl/texture.cpp 2006-04-08 18:54:33 UTC (rev 311) </span><span class=3D"lines">@@ -49,7 +49,11 @@ </span><span class=3D"cx"> m_w =3D m_h =3D 0; m_fmt =3D None; if (!initial && m_txrdata && m_txrdata !=3D oldptr) </span><span class=3D"add">+#if TIKI_PLAT !=3D TIKI_DC </span><span class=3D"cx"> delete[] m_txrdata; </span><span class=3D"add">+#else + //glDeleteTexture frees the PVR memory for us, how nice of it! +#endif </span><span class=3D"cx"> m_txrdata =3D NULL; if (!initial && m_gltxr) glDeleteTextures(1, &m_gltxr); </span><span class=3D"lines">@@ -178,10 +182,6 @@ </span><span class=3D"cx"> memcpy(m_ptr, img->data, img->byteCoun= t); } =20 </span><span class=3D"rem">- /* We'll write the converted data into this = buffer */ - if (!m_txrdata) - m_txrdata =3D new uint8[img->w * img->h * 4]; - </span><span class=3D"cx"> m_w =3D img->w; m_h =3D img->h; m_fmt =3D (Fmt)(img->fmt); </span><span class=3D"lines">@@ -204,6 +204,10 @@ </span><span class=3D"cx"> glBindTexture(GL_TEXTURE_2D, m_gltxr); =20 #if TIKI_PLAT !=3D TIKI_DC </span><span class=3D"add">+ /* We'll write the converted data into this = buffer */ + if (!m_txrdata) + m_txrdata =3D new uint8[img->w * img->h * 4]; +=09 </span><span class=3D"cx"> convertToGl(); glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR); glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR); </span><span class=3D"lines">@@ -211,10 +215,13 @@ </span><span class=3D"cx"> =09 GLenum err =3D glGetError(); #else </span><span class=3D"add">+ m_txrdata =3D (uint8 *)pvr_mem_malloc(img-&g= t;w * img->h * 2);=09 + pvr_txr_load_ex(m_ptr, m_txrdata, img->w, img->h, PVR_TXRLOAD_16B= PP); +=09 </span><span class=3D"cx"> if(use_alpha) { </span><span class=3D"rem">- glTexImage2D(GL_TEXTURE_2D, 0, GL_ARGB4444,= m_w, m_h, 0, GL_ARGB4444, GL_UNSIGNED_BYTE, m_ptr); </span><span class=3D"add">+ glKosTex2D(GL_ARGB4444_TWID, m_w, m_h, m_tx= rdata); </span><span class=3D"cx"> } else { </span><span class=3D"rem">- glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB565, m= _w, m_h, 0, GL_RGB565, GL_UNSIGNED_BYTE, m_ptr); </span><span class=3D"add">+ glKosTex2D(GL_RGB565_TWID, m_w, m_h, m_txrd= ata); </span><span class=3D"cx"> } glTexEnvi(GL_TEXTURE_2D,GL_TEXTURE_ENV_MODE,GL_MODULATEALPHA); #endif </span> </pre> </div> </div> </body> </html> |
|
From: <cad...@li...> - 2006-04-10 02:07:48
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns=3D"http://www.w3.org/1999/xhtml"> <head><style type=3D"text/css"><!-- body {background:#ffffff;font-family:Verdana,Helvetica,Arial,sans-serif;} h3 {margin:15px 0;padding:0;line-height:0;} #msg {margin: 0 0 2em 0;} #msg dl, #msg ul, #msg pre {padding:1em;border:1px dashed black;margin: 1= 0px 0 30px 0;} #msg dl {background:#ccccff;} #msg pre {background:#ffffcc;} #msg ul {background:#cc99ff;list-style:none;} #msg dt {font-weight:bold;float:left;width: 6em;} #msg dt:after { content:':';} #patch h4 {padding: 0 10px;line-height:1.5em;margin:0;background:#ccffff;= border-bottom:1px solid black;margin:0 0 10px 0;} #patch .propset h4, #patch .binary h4 {margin: 0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {background:#eeeeee;padding: 0 0 10px 0;} #patch .propset .diff, #patch .binary .diff {padding: 10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patc= h .binary {border:1px solid black;margin:10px 0;} #patch .add {background:#ddffdd;} #patch .rem {background:#ffdddd;} #patch .lines, .info {color:#888888;background:#ffffff;} --></style> <title>[310] kos/kernel/arch/dreamcast/hardware/maple/mouse.c: Fix bitmas= k for mouse buttons so 3rd button is usable (thanks to Fragger)</title> </head> <body> <div id=3D"msg"> <dl> <dt>Revision</dt> <dd>310</dd> <dt>Author</dt> <dd>sam.steele</dd> <dt>Date</dt> <dd>2006-04-06 16:28:37 -0700 (Thu, 06 Apr 2006)</dd> </dl> <h3>Log Message</h3> <pre>Fix bitmask for mouse buttons so 3rd button is usable (thanks to Fra= gger)</pre> <h3>Modified Paths</h3> <ul> <li><a href=3D"#koskernelarchdreamcasthardwaremaplemousec">kos/kernel/arc= h/dreamcast/hardware/maple/mouse.c</a></li> </ul> </div> <div id=3D"patch"> <h3>Diff</h3> <a id=3D"koskernelarchdreamcasthardwaremaplemousec"></a> <div class=3D"modfile"><h4>Modified: kos/kernel/arch/dreamcast/hardware/m= aple/mouse.c (309 =3D> 310)</h4> <pre class=3D"diff"> <span class=3D"info">--- kos/kernel/arch/dreamcast/hardware/maple/mouse.c= 2006-03-27 00:22:02 UTC (rev 309) +++ kos/kernel/arch/dreamcast/hardware/maple/mouse.c 2006-04-06 23:28:37 = UTC (rev 310) </span><span class=3D"lines">@@ -36,7 +36,7 @@ </span><span class=3D"cx">=20 /* Fill the "nice" struct from the raw data */ cooked =3D (mouse_state_t *)(frm->dev->status); </span><span class=3D"rem">- cooked->buttons =3D (~raw->buttons) &= amp; 6; </span><span class=3D"add">+ cooked->buttons =3D (~raw->buttons) &= amp; 14; </span><span class=3D"cx"> cooked->dx =3D raw->dx - MOUSE_DELTA_C= ENTER; cooked->dy =3D raw->dy - MOUSE_DELTA_CENTER; cooked->dz =3D raw->dz - MOUSE_DELTA_CENTER; </span> </pre> </div> </div> </body> </html> |
|
From: <cad...@li...> - 2006-04-10 02:07:44
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns=3D"http://www.w3.org/1999/xhtml"> <head><style type=3D"text/css"><!-- body {background:#ffffff;font-family:Verdana,Helvetica,Arial,sans-serif;} h3 {margin:15px 0;padding:0;line-height:0;} #msg {margin: 0 0 2em 0;} #msg dl, #msg ul, #msg pre {padding:1em;border:1px dashed black;margin: 1= 0px 0 30px 0;} #msg dl {background:#ccccff;} #msg pre {background:#ffffcc;} #msg ul {background:#cc99ff;list-style:none;} #msg dt {font-weight:bold;float:left;width: 6em;} #msg dt:after { content:':';} #patch h4 {padding: 0 10px;line-height:1.5em;margin:0;background:#ccffff;= border-bottom:1px solid black;margin:0 0 10px 0;} #patch .propset h4, #patch .binary h4 {margin: 0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {background:#eeeeee;padding: 0 0 10px 0;} #patch .propset .diff, #patch .binary .diff {padding: 10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patc= h .binary {border:1px solid black;margin:10px 0;} #patch .add {background:#ddffdd;} #patch .rem {background:#ffdddd;} #patch .lines, .info {color:#888888;background:#ffffff;} --></style> <title>[309] tiki/win32: tiki: Add vs80 support (some of that got into th= e last checkin accidentally, whoops)</title> </head> <body> <div id=3D"msg"> <dl> <dt>Revision</dt> <dd>309</dd> <dt>Author</dt> <dd>bard</dd> <dt>Date</dt> <dd>2006-03-26 16:22:02 -0800 (Sun, 26 Mar 2006)</dd> </dl> <h3>Log Message</h3> <pre>tiki: Add vs80 support (some of that got into the last checkin accid= entally, whoops)</pre> <h3>Added Paths</h3> <ul> <li><a href=3D"#tikiwin32tiki_vc80sln">tiki/win32/tiki_vc80.sln</a></li> <li><a href=3D"#tikiwin32tiki_vs80vcproj">tiki/win32/tiki_vs80.vcproj</a>= </li> </ul> </div> <div id=3D"patch"> <h3>Diff</h3> <a id=3D"tikiwin32tiki_vc80sln"></a> <div class=3D"addfile"><h4>Added: tiki/win32/tiki_vc80.sln (308 =3D> 309)= </h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/win32/tiki_vc80.sln 2006-03-27 00:18:11 UTC= (rev 308) +++ tiki/win32/tiki_vc80.sln 2006-03-27 00:22:02 UTC (rev 309) </span><span class=3D"lines">@@ -0,0 +1,19 @@ </span><span class=3D"add">+Microsoft Visual Studio Solution File, Format= Version 9.00 +# Visual Studio 2005 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") =3D "ti= ki", "tiki_vs80.vcproj", "{F2816CAC-B560-4ED9-8A73-96= 35F832943C}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) =3D preSolution + Debug|Win32 =3D Debug|Win32 + Release|Win32 =3D Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) =3D postSolution + {F2816CAC-B560-4ED9-8A73-9635F832943C}.Debug|Win32.ActiveCfg =3D Debug= |Win32 + {F2816CAC-B560-4ED9-8A73-9635F832943C}.Debug|Win32.Build.0 =3D Debug|W= in32 + {F2816CAC-B560-4ED9-8A73-9635F832943C}.Release|Win32.ActiveCfg =3D Rel= ease|Win32 + {F2816CAC-B560-4ED9-8A73-9635F832943C}.Release|Win32.Build.0 =3D Relea= se|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) =3D preSolution + HideSolutionNode =3D FALSE + EndGlobalSection +EndGlobal </span><span class=3D"cx">Property changes on: tiki/win32/tiki_vc80.sln ___________________________________________________________________ Name: svn:eol-style + CRLF </span></pre></div> <a id=3D"tikiwin32tiki_vs80vcproj"></a> <div class=3D"addfile"><h4>Added: tiki/win32/tiki_vs80.vcproj (308 =3D> 3= 09)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/win32/tiki_vs80.vcproj 2006-03-27 00:18:11 = UTC (rev 308) +++ tiki/win32/tiki_vs80.vcproj 2006-03-27 00:22:02 UTC (rev 309) </span><span class=3D"lines">@@ -0,0 +1,2791 @@ </span><span class=3D"add">+<?xml version=3D"1.0" encoding=3D= "Windows-1252"?> +<VisualStudioProject + ProjectType=3D"Visual C++" + Version=3D"8.00" + Name=3D"tiki" + ProjectGUID=3D"{F2816CAC-B560-4ED9-8A73-9635F832943C}" + Keyword=3D"Win32Proj" + > + <Platforms> + <Platform + Name=3D"Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name=3D"Debug|Win32" + OutputDirectory=3D"Debug" + IntermediateDirectory=3D"Debug" + ConfigurationType=3D"4" + InheritedPropertySheets=3D"$(VCInstallDir)VCProjectDefaults\Upgr= adeFromVC71.vsprops" + UseOfMFC=3D"0" + CharacterSet=3D"2" + > + <Tool + Name=3D"VCPreBuildEventTool" + /> + <Tool + Name=3D"VCCustomBuildTool" + /> + <Tool + Name=3D"VCXMLDataGeneratorTool" + /> + <Tool + Name=3D"VCWebServiceProxyGeneratorTool" + /> + <Tool + Name=3D"VCMIDLTool" + /> + <Tool + Name=3D"VCCLCompilerTool" + Optimization=3D"0" + AdditionalIncludeDirectories=3D"include;../include;../3rdparty/= libpng;../3rdparty/zlib;../3rdparty/libjpeg;../3rdparty/libogg/include;..= /3rdparty/libvorbis/include;../../../OpenAL/include" + MinimalRebuild=3D"true" + BasicRuntimeChecks=3D"3" + RuntimeLibrary=3D"1" + UsePrecompiledHeader=3D"2" + PrecompiledHeaderThrough=3D"pch.h" + WarningLevel=3D"3" + Detect64BitPortabilityProblems=3D"true" + DebugInformationFormat=3D"4" + /> + <Tool + Name=3D"VCManagedResourceCompilerTool" + /> + <Tool + Name=3D"VCResourceCompilerTool" + /> + <Tool + Name=3D"VCPreLinkEventTool" + /> + <Tool + Name=3D"VCLibrarianTool" + OutputFile=3D"$(OutDir)/tiki.lib" + /> + <Tool + Name=3D"VCALinkTool" + /> + <Tool + Name=3D"VCXDCMakeTool" + /> + <Tool + Name=3D"VCBscMakeTool" + /> + <Tool + Name=3D"VCFxCopTool" + /> + <Tool + Name=3D"VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name=3D"Release|Win32" + OutputDirectory=3D"Release" + IntermediateDirectory=3D"Release" + ConfigurationType=3D"4" + InheritedPropertySheets=3D"$(VCInstallDir)VCProjectDefaults\Upgr= adeFromVC71.vsprops" + UseOfMFC=3D"0" + CharacterSet=3D"2" + > + <Tool + Name=3D"VCPreBuildEventTool" + /> + <Tool + Name=3D"VCCustomBuildTool" + /> + <Tool + Name=3D"VCXMLDataGeneratorTool" + /> + <Tool + Name=3D"VCWebServiceProxyGeneratorTool" + /> + <Tool + Name=3D"VCMIDLTool" + /> + <Tool + Name=3D"VCCLCompilerTool" + AdditionalIncludeDirectories=3D"include;../include;../3rdparty/= libpng;../3rdparty/zlib;../3rdparty/libjpeg;../3rdparty/libogg/include;..= /3rdparty/libvorbis/include;../../../OpenAL/include" + RuntimeLibrary=3D"0" + UsePrecompiledHeader=3D"2" + PrecompiledHeaderThrough=3D"pch.h" + WarningLevel=3D"3" + Detect64BitPortabilityProblems=3D"true" + DebugInformationFormat=3D"3" + /> + <Tool + Name=3D"VCManagedResourceCompilerTool" + /> + <Tool + Name=3D"VCResourceCompilerTool" + /> + <Tool + Name=3D"VCPreLinkEventTool" + /> + <Tool + Name=3D"VCLibrarianTool" + OutputFile=3D"$(OutDir)/tiki.lib" + /> + <Tool + Name=3D"VCALinkTool" + /> + <Tool + Name=3D"VCXDCMakeTool" + /> + <Tool + Name=3D"VCBscMakeTool" + /> + <Tool + Name=3D"VCFxCopTool" + /> + <Tool + Name=3D"VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name=3D"Portable" + > + <Filter + Name=3D"Source" + > + <Filter + Name=3D"audio" + > + <File + RelativePath=3D"..\src\audio\sound.cpp" + > + <FileConfiguration + Name=3D"Debug|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + ObjectFile=3D"$(IntDir)/$(InputName)1.obj" + /> + </FileConfiguration> + <FileConfiguration + Name=3D"Release|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + ObjectFile=3D"$(IntDir)/$(InputName)1.obj" + /> + </FileConfiguration> + </File> + <File + RelativePath=3D"..\src\audio\stream.cpp" + > + <FileConfiguration + Name=3D"Debug|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + ObjectFile=3D"$(IntDir)/$(InputName)1.obj" + /> + </FileConfiguration> + <FileConfiguration + Name=3D"Release|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + ObjectFile=3D"$(IntDir)/$(InputName)1.obj" + /> + </FileConfiguration> + </File> + <Filter + Name=3D"oggvorbis" + > + <File + RelativePath=3D"..\src\audio\oggvorbis\misc.h" + > + </File> + <File + RelativePath=3D"..\src\audio\oggvorbis\sndoggvorbis.cpp"= ; + > + </File> + </Filter> + </Filter> + <Filter + Name=3D"base" + > + <File + RelativePath=3D"..\src\base\debug.cpp" + > + </File> + <File + RelativePath=3D"..\src\base\endian.cpp" + > + </File> + <File + RelativePath=3D"..\src\base\file.cpp" + > + </File> + <File + RelativePath=3D"..\src\base\object.cpp" + > + </File> + <File + RelativePath=3D"..\src\base\timeline.cpp" + > + </File> + <File + RelativePath=3D"..\src\base\timepoint.cpp" + > + </File> + </Filter> + <Filter + Name=3D"gl" + > + <File + RelativePath=3D"..\src\gl\animation.cpp" + > + </File> + <File + RelativePath=3D"..\src\gl\drawable.cpp" + > + </File> + <File + RelativePath=3D"..\src\gl\font.cpp" + > + </File> + <File + RelativePath=3D"..\src\gl\genmenu.cpp" + > + </File> + <File + RelativePath=3D"..\src\gl\gl.cpp" + > + </File> + <File + RelativePath=3D"..\src\gl\plxcompat.cpp" + > + </File> + <File + RelativePath=3D"..\src\gl\texture.cpp" + > + </File> + <File + RelativePath=3D"..\src\gl\trigger.cpp" + > + </File> + <Filter + Name=3D"anims" + > + <File + RelativePath=3D"..\src\gl\anims\alphafader.cpp" + > + </File> + <File + RelativePath=3D"..\src\gl\anims\expxymover.cpp" + > + </File> + <File + RelativePath=3D"..\src\gl\anims\logxymover.cpp" + > + </File> + <File + RelativePath=3D"..\src\gl\anims\tintfader.cpp" + > + </File> + </Filter> + <Filter + Name=3D"drawables" + > + <File + RelativePath=3D"..\src\gl\drawables\banner.cpp" + > + </File> + <File + RelativePath=3D"..\src\gl\drawables\cursor.cpp" + > + </File> + <File + RelativePath=3D"..\src\gl\drawables\label.cpp" + > + </File> + <File + RelativePath=3D"..\src\gl\drawables\pointerArrow.cpp" + > + </File> + </Filter> + <Filter + Name=3D"triggers" + > + <File + RelativePath=3D"..\src\gl\triggers\birth.cpp" + > + </File> + <File + RelativePath=3D"..\src\gl\triggers\death.cpp" + > + </File> + </Filter> + </Filter> + <Filter + Name=3D"hid" + > + <File + RelativePath=3D"..\src\hid\eventcollector.cpp" + > + </File> + <File + RelativePath=3D"..\src\hid\hid.cpp" + > + </File> + </Filter> + <Filter + Name=3D"math" + > + <File + RelativePath=3D"..\src\math\bspline.cpp" + > + </File> + <File + RelativePath=3D"..\src\math\math.cpp" + > + </File> + <File + RelativePath=3D"..\src\math\matrix.cpp" + > + </File> + <File + RelativePath=3D"..\src\math\vector.cpp" + > + </File> + <File + RelativePath=3D"..\src\math\vector3.cpp" + > + </File> + </Filter> + <Filter + Name=3D"thread" + > + <File + RelativePath=3D"..\src\thread\thread.cpp" + > + </File> + </Filter> + <Filter + Name=3D"image" + > + <File + RelativePath=3D"..\src\image\image.cpp" + > + </File> + <File + RelativePath=3D"..\src\image\loadjpg.cpp" + > + </File> + <File + RelativePath=3D"..\src\image\loadpng.cpp" + > + </File> + </Filter> + </Filter> + <Filter + Name=3D"Include" + > + <File + RelativePath=3D"..\include\Tiki\tiki.h" + > + </File> + <File + RelativePath=3D"..\include\Tiki\TikiAll.h" + > + </File> + <Filter + Name=3D"base" + > + <File + RelativePath=3D"..\include\Tiki\debug.h" + > + </File> + <File + RelativePath=3D"..\include\Tiki\file.h" + > + </File> + <File + RelativePath=3D"..\include\Tiki\list.h" + > + </File> + <File + RelativePath=3D"..\include\Tiki\object.h" + > + </File> + <File + RelativePath=3D"..\include\Tiki\refcnt.h" + > + </File> + <File + RelativePath=3D"..\include\Tiki\scene.h" + > + </File> + <File + RelativePath=3D"..\include\Tiki\tee.h" + > + </File> + <File + RelativePath=3D"..\include\Tiki\thread.h" + > + </File> + <File + RelativePath=3D"..\include\Tiki\tikitime.h" + > + </File> + <File + RelativePath=3D"..\include\Tiki\timeline.h" + > + </File> + <File + RelativePath=3D"..\include\Tiki\timepoint.h" + > + </File> + </Filter> + <Filter + Name=3D"hid" + > + <File + RelativePath=3D"..\include\Tiki\eventcollector.h" + > + </File> + <File + RelativePath=3D"..\include\Tiki\hid.h" + > + </File> + </Filter> + <Filter + Name=3D"math" + > + <File + RelativePath=3D"..\include\Tiki\bspline.h" + > + </File> + <File + RelativePath=3D"..\include\Tiki\matrix.h" + > + </File> + <File + RelativePath=3D"..\include\Tiki\tikimath.h" + > + </File> + <File + RelativePath=3D"..\include\Tiki\vector.h" + > + </File> + <File + RelativePath=3D"..\include\Tiki\vector3.h" + > + </File> + </Filter> + <Filter + Name=3D"gl" + > + <File + RelativePath=3D"..\include\Tiki\animation.h" + > + </File> + <File + RelativePath=3D"..\include\Tiki\color.h" + > + </File> + <File + RelativePath=3D"..\include\Tiki\color3.h" + > + </File> + <File + RelativePath=3D"..\include\Tiki\drawable.h" + > + </File> + <File + RelativePath=3D"..\include\Tiki\font.h" + > + </File> + <File + RelativePath=3D"..\include\Tiki\genmenu.h" + > + </File> + <File + RelativePath=3D"..\include\Tiki\gl.h" + > + </File> + <File + RelativePath=3D"..\include\Tiki\plxcompat.h" + > + </File> + <File + RelativePath=3D"..\include\Tiki\texture.h" + > + </File> + <File + RelativePath=3D"..\include\Tiki\trigger.h" + > + </File> + <Filter + Name=3D"anims" + > + <File + RelativePath=3D"..\include\Tiki\anims\alphafader.h" + > + </File> + <File + RelativePath=3D"..\include\Tiki\anims\expxymover.h" + > + </File> + <File + RelativePath=3D"..\include\Tiki\anims\logxymover.h" + > + </File> + <File + RelativePath=3D"..\include\Tiki\anims\tintfader.h" + > + </File> + </Filter> + <Filter + Name=3D"drawables" + > + <File + RelativePath=3D"..\include\Tiki\drawables\banner.h" + > + </File> + <File + RelativePath=3D"..\include\Tiki\drawables\label.h" + > + </File> + <File + RelativePath=3D"..\include\Tiki\drawables\scene.h" + > + </File> + </Filter> + <Filter + Name=3D"triggers" + > + <File + RelativePath=3D"..\include\Tiki\triggers\birth.h" + > + </File> + <File + RelativePath=3D"..\include\Tiki\triggers\chainanim.h" + > + </File> + <File + RelativePath=3D"..\include\Tiki\triggers\death.h" + > + </File> + <File + RelativePath=3D"..\include\Tiki\triggers\oneshot.h" + > + </File> + </Filter> + </Filter> + <Filter + Name=3D"audio" + > + <File + RelativePath=3D"..\include\Tiki\oggvorbis.h" + > + </File> + <File + RelativePath=3D"..\include\Tiki\sound.h" + > + </File> + <File + RelativePath=3D"..\include\Tiki\stream.h" + > + </File> + </Filter> + <Filter + Name=3D"image" + > + <File + RelativePath=3D"..\include\Tiki\image.h" + > + </File> + <File + RelativePath=3D"..\include\Tiki\imgjpg.h" + > + </File> + <File + RelativePath=3D"..\include\Tiki\imgpng.h" + > + </File> + </Filter> + </Filter> + </Filter> + <Filter + Name=3D"Resource Files" + Filter=3D"rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;re= sx" + UniqueIdentifier=3D"{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" + > + </Filter> + <Filter + Name=3D"Plat" + > + <Filter + Name=3D"Source" + Filter=3D"cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier=3D"{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"= ; + > + <File + RelativePath=3D".\src\init_shutdown.cpp" + > + </File> + <File + RelativePath=3D".\src\platgl.cpp" + > + </File> + <File + RelativePath=3D".\src\plathid.cpp" + > + </File> + <File + RelativePath=3D".\src\platthread.cpp" + > + </File> + <File + RelativePath=3D".\stdafx.cpp" + > + <FileConfiguration + Name=3D"Debug|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"1" + /> + </FileConfiguration> + <FileConfiguration + Name=3D"Release|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"1" + /> + </FileConfiguration> + </File> + <File + RelativePath=3D".\src\tikitime.cpp" + > + </File> + </Filter> + <Filter + Name=3D"Include" + Filter=3D"h;hpp;hxx;hm;inl;inc;xsd" + UniqueIdentifier=3D"{93995380-89BD-4b04-88EB-625FBE52EBFB}"= ; + > + <File + RelativePath=3D".\include\Tiki\glhdrs.h" + > + </File> + <File + RelativePath=3D".\include\pch.h" + > + </File> + <File + RelativePath=3D".\include\Tiki\platthread.h" + > + </File> + <File + RelativePath=3D".\include\Tiki\tikitypes.h" + > + </File> + </Filter> + <Filter + Name=3D"libpng" + > + <File + RelativePath=3D"..\3rdparty\libpng\png.c" + > + <FileConfiguration + Name=3D"Debug|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + <FileConfiguration + Name=3D"Release|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + </File> + <File + RelativePath=3D"..\3rdparty\libpng\png.h" + > + </File> + <File + RelativePath=3D"..\3rdparty\libpng\pngconf.h" + > + </File> + <File + RelativePath=3D"..\3rdparty\libpng\pngerror.c" + > + <FileConfiguration + Name=3D"Debug|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + <FileConfiguration + Name=3D"Release|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + </File> + <File + RelativePath=3D"..\3rdparty\libpng\pnggccrd.c" + > + <FileConfiguration + Name=3D"Debug|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + <FileConfiguration + Name=3D"Release|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + </File> + <File + RelativePath=3D"..\3rdparty\libpng\pngget.c" + > + <FileConfiguration + Name=3D"Debug|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + <FileConfiguration + Name=3D"Release|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + </File> + <File + RelativePath=3D"..\3rdparty\libpng\pngmem.c" + > + <FileConfiguration + Name=3D"Debug|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + <FileConfiguration + Name=3D"Release|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + </File> + <File + RelativePath=3D"..\3rdparty\libpng\pngpread.c" + > + <FileConfiguration + Name=3D"Debug|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + <FileConfiguration + Name=3D"Release|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + </File> + <File + RelativePath=3D"..\3rdparty\libpng\pngread.c" + > + <FileConfiguration + Name=3D"Debug|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + <FileConfiguration + Name=3D"Release|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + </File> + <File + RelativePath=3D"..\3rdparty\libpng\pngrio.c" + > + <FileConfiguration + Name=3D"Debug|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + <FileConfiguration + Name=3D"Release|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + </File> + <File + RelativePath=3D"..\3rdparty\libpng\pngrtran.c" + > + <FileConfiguration + Name=3D"Debug|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + <FileConfiguration + Name=3D"Release|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + </File> + <File + RelativePath=3D"..\3rdparty\libpng\pngrutil.c" + > + <FileConfiguration + Name=3D"Debug|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + <FileConfiguration + Name=3D"Release|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + </File> + <File + RelativePath=3D"..\3rdparty\libpng\pngset.c" + > + <FileConfiguration + Name=3D"Debug|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + <FileConfiguration + Name=3D"Release|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + </File> + <File + RelativePath=3D"..\3rdparty\libpng\pngtrans.c" + > + <FileConfiguration + Name=3D"Debug|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + <FileConfiguration + Name=3D"Release|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + </File> + <File + RelativePath=3D"..\3rdparty\libpng\pngvcrd.c" + > + <FileConfiguration + Name=3D"Debug|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + <FileConfiguration + Name=3D"Release|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + </File> + <File + RelativePath=3D"..\3rdparty\libpng\pngwio.c" + > + <FileConfiguration + Name=3D"Debug|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + <FileConfiguration + Name=3D"Release|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + </File> + <File + RelativePath=3D"..\3rdparty\libpng\pngwrite.c" + > + <FileConfiguration + Name=3D"Debug|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + <FileConfiguration + Name=3D"Release|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + </File> + <File + RelativePath=3D"..\3rdparty\libpng\pngwtran.c" + > + <FileConfiguration + Name=3D"Debug|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + <FileConfiguration + Name=3D"Release|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + </File> + <File + RelativePath=3D"..\3rdparty\libpng\pngwutil.c" + > + <FileConfiguration + Name=3D"Debug|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + <FileConfiguration + Name=3D"Release|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + </File> + </Filter> + <Filter + Name=3D"zlib" + > + <File + RelativePath=3D"..\3rdparty\zlib\adler32.c" + > + <FileConfiguration + Name=3D"Debug|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + <FileConfiguration + Name=3D"Release|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + </File> + <File + RelativePath=3D"..\3rdparty\zlib\compress.c" + > + <FileConfiguration + Name=3D"Debug|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + <FileConfiguration + Name=3D"Release|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + </File> + <File + RelativePath=3D"..\3rdparty\zlib\crc32.c" + > + <FileConfiguration + Name=3D"Debug|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + <FileConfiguration + Name=3D"Release|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + </File> + <File + RelativePath=3D"..\3rdparty\zlib\crc32.h" + > + </File> + <File + RelativePath=3D"..\3rdparty\zlib\deflate.c" + > + <FileConfiguration + Name=3D"Debug|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + <FileConfiguration + Name=3D"Release|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + </File> + <File + RelativePath=3D"..\3rdparty\zlib\deflate.h" + > + </File> + <File + RelativePath=3D"..\3rdparty\zlib\gzio.c" + > + <FileConfiguration + Name=3D"Debug|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + <FileConfiguration + Name=3D"Release|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + </File> + <File + RelativePath=3D"..\3rdparty\zlib\infback.c" + > + <FileConfiguration + Name=3D"Debug|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + <FileConfiguration + Name=3D"Release|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + </File> + <File + RelativePath=3D"..\3rdparty\zlib\inffast.c" + > + <FileConfiguration + Name=3D"Debug|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + <FileConfiguration + Name=3D"Release|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + </File> + <File + RelativePath=3D"..\3rdparty\zlib\inffast.h" + > + </File> + <File + RelativePath=3D"..\3rdparty\zlib\inffixed.h" + > + </File> + <File + RelativePath=3D"..\3rdparty\zlib\inflate.c" + > + <FileConfiguration + Name=3D"Debug|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + <FileConfiguration + Name=3D"Release|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + </File> + <File + RelativePath=3D"..\3rdparty\zlib\inflate.h" + > + </File> + <File + RelativePath=3D"..\3rdparty\zlib\inftrees.c" + > + <FileConfiguration + Name=3D"Debug|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + <FileConfiguration + Name=3D"Release|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + </File> + <File + RelativePath=3D"..\3rdparty\zlib\inftrees.h" + > + </File> + <File + RelativePath=3D"..\3rdparty\zlib\trees.c" + > + <FileConfiguration + Name=3D"Debug|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + <FileConfiguration + Name=3D"Release|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + </File> + <File + RelativePath=3D"..\3rdparty\zlib\trees.h" + > + </File> + <File + RelativePath=3D"..\3rdparty\zlib\uncompr.c" + > + <FileConfiguration + Name=3D"Debug|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + <FileConfiguration + Name=3D"Release|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + </File> + <File + RelativePath=3D"..\3rdparty\zlib\zconf.h" + > + </File> + <File + RelativePath=3D"..\3rdparty\zlib\zlib.h" + > + </File> + <File + RelativePath=3D"..\3rdparty\zlib\zutil.c" + > + <FileConfiguration + Name=3D"Debug|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + <FileConfiguration + Name=3D"Release|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + </File> + <File + RelativePath=3D"..\3rdparty\zlib\zutil.h" + > + </File> + </Filter> + <Filter + Name=3D"libjpeg" + > + <File + RelativePath=3D"..\3rdparty\libjpeg\jcapimin.c" + > + <FileConfiguration + Name=3D"Debug|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + <FileConfiguration + Name=3D"Release|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + </File> + <File + RelativePath=3D"..\3rdparty\libjpeg\jcapistd.c" + > + <FileConfiguration + Name=3D"Debug|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + <FileConfiguration + Name=3D"Release|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + </File> + <File + RelativePath=3D"..\3rdparty\libjpeg\jccoefct.c" + > + <FileConfiguration + Name=3D"Debug|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + <FileConfiguration + Name=3D"Release|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + </File> + <File + RelativePath=3D"..\3rdparty\libjpeg\jccolor.c" + > + <FileConfiguration + Name=3D"Debug|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + <FileConfiguration + Name=3D"Release|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + </File> + <File + RelativePath=3D"..\3rdparty\libjpeg\jcdctmgr.c" + > + <FileConfiguration + Name=3D"Debug|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + <FileConfiguration + Name=3D"Release|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + </File> + <File + RelativePath=3D"..\3rdparty\libjpeg\jchuff.c" + > + <FileConfiguration + Name=3D"Debug|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + <FileConfiguration + Name=3D"Release|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + </File> + <File + RelativePath=3D"..\3rdparty\libjpeg\jchuff.h" + > + </File> + <File + RelativePath=3D"..\3rdparty\libjpeg\jcinit.c" + > + <FileConfiguration + Name=3D"Debug|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + <FileConfiguration + Name=3D"Release|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + </File> + <File + RelativePath=3D"..\3rdparty\libjpeg\jcmainct.c" + > + <FileConfiguration + Name=3D"Debug|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + <FileConfiguration + Name=3D"Release|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + </File> + <File + RelativePath=3D"..\3rdparty\libjpeg\jcmarker.c" + > + <FileConfiguration + Name=3D"Debug|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + <FileConfiguration + Name=3D"Release|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + </File> + <File + RelativePath=3D"..\3rdparty\libjpeg\jcmaster.c" + > + <FileConfiguration + Name=3D"Debug|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + <FileConfiguration + Name=3D"Release|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + </File> + <File + RelativePath=3D"..\3rdparty\libjpeg\jcomapi.c" + > + <FileConfiguration + Name=3D"Debug|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + <FileConfiguration + Name=3D"Release|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + </File> + <File + RelativePath=3D"..\3rdparty\libjpeg\jconfig.h" + > + </File> + <File + RelativePath=3D"..\3rdparty\libjpeg\jcparam.c" + > + <FileConfiguration + Name=3D"Debug|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + <FileConfiguration + Name=3D"Release|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + </File> + <File + RelativePath=3D"..\3rdparty\libjpeg\jcphuff.c" + > + <FileConfiguration + Name=3D"Debug|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + <FileConfiguration + Name=3D"Release|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + </File> + <File + RelativePath=3D"..\3rdparty\libjpeg\jcprepct.c" + > + <FileConfiguration + Name=3D"Debug|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + <FileConfiguration + Name=3D"Release|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + </File> + <File + RelativePath=3D"..\3rdparty\libjpeg\jcsample.c" + > + <FileConfiguration + Name=3D"Debug|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + <FileConfiguration + Name=3D"Release|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + </File> + <File + RelativePath=3D"..\3rdparty\libjpeg\jctrans.c" + > + <FileConfiguration + Name=3D"Debug|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + <FileConfiguration + Name=3D"Release|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + </File> + <File + RelativePath=3D"..\3rdparty\libjpeg\jdapimin.c" + > + <FileConfiguration + Name=3D"Debug|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + <FileConfiguration + Name=3D"Release|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + </File> + <File + RelativePath=3D"..\3rdparty\libjpeg\jdapistd.c" + > + <FileConfiguration + Name=3D"Debug|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + <FileConfiguration + Name=3D"Release|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + </File> + <File + RelativePath=3D"..\3rdparty\libjpeg\jdatadst.c" + > + <FileConfiguration + Name=3D"Debug|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + <FileConfiguration + Name=3D"Release|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + </File> + <File + RelativePath=3D"..\3rdparty\libjpeg\jdatasrc.c" + > + <FileConfiguration + Name=3D"Debug|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + <FileConfiguration + Name=3D"Release|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + </File> + <File + RelativePath=3D"..\3rdparty\libjpeg\jdcoefct.c" + > + <FileConfiguration + Name=3D"Debug|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + <FileConfiguration + Name=3D"Release|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + </File> + <File + RelativePath=3D"..\3rdparty\libjpeg\jdcolor.c" + > + <FileConfiguration + Name=3D"Debug|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + <FileConfiguration + Name=3D"Release|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + </File> + <File + RelativePath=3D"..\3rdparty\libjpeg\jdct.h" + > + </File> + <File + RelativePath=3D"..\3rdparty\libjpeg\jddctmgr.c" + > + <FileConfiguration + Name=3D"Debug|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + <FileConfiguration + Name=3D"Release|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + </File> + <File + RelativePath=3D"..\3rdparty\libjpeg\jdhuff.c" + > + <FileConfiguration + Name=3D"Debug|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + <FileConfiguration + Name=3D"Release|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + </File> + <File + RelativePath=3D"..\3rdparty\libjpeg\jdhuff.h" + > + </File> + <File + RelativePath=3D"..\3rdparty\libjpeg\jdinput.c" + > + <FileConfiguration + Name=3D"Debug|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + <FileConfiguration + Name=3D"Release|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + </File> + <File + RelativePath=3D"..\3rdparty\libjpeg\jdmainct.c" + > + <FileConfiguration + Name=3D"Debug|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + <FileConfiguration + Name=3D"Release|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + </File> + <File + RelativePath=3D"..\3rdparty\libjpeg\jdmarker.c" + > + <FileConfiguration + Name=3D"Debug|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + <FileConfiguration + Name=3D"Release|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + </File> + <File + RelativePath=3D"..\3rdparty\libjpeg\jdmaster.c" + > + <FileConfiguration + Name=3D"Debug|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + <FileConfiguration + Name=3D"Release|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + </File> + <File + RelativePath=3D"..\3rdparty\libjpeg\jdmerge.c" + > + <FileConfiguration + Name=3D"Debug|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + <FileConfiguration + Name=3D"Release|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + </File> + <File + RelativePath=3D"..\3rdparty\libjpeg\jdphuff.c" + > + <FileConfiguration + Name=3D"Debug|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + <FileConfiguration + Name=3D"Release|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + </File> + <File + RelativePath=3D"..\3rdparty\libjpeg\jdpostct.c" + > + <FileConfiguration + Name=3D"Debug|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + <FileConfiguration + Name=3D"Release|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + </File> + <File + RelativePath=3D"..\3rdparty\libjpeg\jdsample.c" + > + <FileConfiguration + Name=3D"Debug|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + <FileConfiguration + Name=3D"Release|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + </File> + <File + RelativePath=3D"..\3rdparty\libjpeg\jdtrans.c" + > + <FileConfiguration + Name=3D"Debug|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + <FileConfiguration + Name=3D"Release|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + </File> + <File + RelativePath=3D"..\3rdparty\libjpeg\jerror.c" + > + <FileConfiguration + Name=3D"Debug|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + <FileConfiguration + Name=3D"Release|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + </File> + <File + RelativePath=3D"..\3rdparty\libjpeg\jerror.h" + > + </File> + <File + RelativePath=3D"..\3rdparty\libjpeg\jfdctflt.c" + > + <FileConfiguration + Name=3D"Debug|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + /> + </FileConfiguration> + <FileConfiguration + Name=3D"Release|Win32" + > + <Tool + Name=3D"VCCLCompilerTool" + UsePrecompiledHeader=3D"0" + />... [truncated message content] |
|
From: <cad...@li...> - 2006-04-10 02:07:42
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns=3D"http://www.w3.org/1999/xhtml"> <head><style type=3D"text/css"><!-- body {background:#ffffff;font-family:Verdana,Helvetica,Arial,sans-serif;} h3 {margin:15px 0;padding:0;line-height:0;} #msg {margin: 0 0 2em 0;} #msg dl, #msg ul, #msg pre {padding:1em;border:1px dashed black;margin: 1= 0px 0 30px 0;} #msg dl {background:#ccccff;} #msg pre {background:#ffffcc;} #msg ul {background:#cc99ff;list-style:none;} #msg dt {font-weight:bold;float:left;width: 6em;} #msg dt:after { content:':';} #patch h4 {padding: 0 10px;line-height:1.5em;margin:0;background:#ccffff;= border-bottom:1px solid black;margin:0 0 10px 0;} #patch .propset h4, #patch .binary h4 {margin: 0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {background:#eeeeee;padding: 0 0 10px 0;} #patch .propset .diff, #patch .binary .diff {padding: 10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patc= h .binary {border:1px solid black;margin:10px 0;} #patch .add {background:#ddffdd;} #patch .rem {background:#ffdddd;} #patch .lines, .info {color:#888888;background:#ffffff;} --></style> <title>[308] tiki/win32/src: tiki: Make GL threading more proper in win32= </title> </head> <body> <div id=3D"msg"> <dl> <dt>Revision</dt> <dd>308</dd> <dt>Author</dt> <dd>bard</dd> <dt>Date</dt> <dd>2006-03-26 16:18:11 -0800 (Sun, 26 Mar 2006)</dd> </dl> <h3>Log Message</h3> <pre>tiki: Make GL threading more proper in win32</pre> <h3>Modified Paths</h3> <ul> <li><a href=3D"#tikiwin32includeTikiglhdrsh">tiki/win32/include/Tiki/glhd= rs.h</a></li> <li><a href=3D"#tikiwin32includepchh">tiki/win32/include/pch.h</a></li> <li><a href=3D"#tikiwin32srcplatglcpp">tiki/win32/src/platgl.cpp</a></li> <li><a href=3D"#tikiwin32srcplatthreadcpp">tiki/win32/src/platthread.cpp<= /a></li> </ul> </div> <div id=3D"patch"> <h3>Diff</h3> <a id=3D"tikiwin32includeTikiglhdrsh"></a> <div class=3D"modfile"><h4>Modified: tiki/win32/include/Tiki/glhdrs.h (30= 7 =3D> 308)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/win32/include/Tiki/glhdrs.h 2006-03-27 00:1= 4:11 UTC (rev 307) +++ tiki/win32/include/Tiki/glhdrs.h 2006-03-27 00:18:11 UTC (rev 308) </span><span class=3D"lines">@@ -6,7 +6,11 @@ </span><span class=3D"cx"> #include <GL/glu.h> =20 namespace Tiki { </span><span class=3D"add">+ // Returns a handle to the Win32 window. </span><span class=3D"cx"> HWND GetWin32Window(); </span><span class=3D"add">+ + // Returns a handle to the primary GL context. + HGLRC GetWin32MainHGLRC(); </span><span class=3D"cx"> }; =20 =20 </span></pre></div> <a id=3D"tikiwin32includepchh"></a> <div class=3D"modfile"><h4>Modified: tiki/win32/include/pch.h (307 =3D> 3= 08)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/win32/include/pch.h 2006-03-27 00:14:11 UTC= (rev 307) +++ tiki/win32/include/pch.h 2006-03-27 00:18:11 UTC (rev 308) </span><span class=3D"lines">@@ -11,6 +11,10 @@ </span><span class=3D"cx"> #define VC_EXTRALEAN // Exclude rarely-used s= tuff from Windows headers #endif =20 </span><span class=3D"add">+// Dumb VS8.0 stuff +#define _CRT_SECURE_NO_DEPRECATE 1 +#define _ATL_SECURE_NO_DEPRECATE 1 + </span><span class=3D"cx"> #include <windows.h> #include <shellapi.h> =20 </span></pre></div> <a id=3D"tikiwin32srcplatglcpp"></a> <div class=3D"modfile"><h4>Modified: tiki/win32/src/platgl.cpp (307 =3D> = 308)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/win32/src/platgl.cpp 2006-03-27 00:14:11 UT= C (rev 307) +++ tiki/win32/src/platgl.cpp 2006-03-27 00:18:11 UTC (rev 308) </span><span class=3D"lines">@@ -24,7 +24,7 @@ </span><span class=3D"cx"> // Windows globals static HWND m_hWndMain; static HINSTANCE m_hInstance; </span><span class=3D"rem">-static HGLRC m_hrc; </span><span class=3D"add">+static HGLRC m_hrc, m_hThreadRc; </span><span class=3D"cx"> static DWORD m_dwThreadID; static HANDLE m_hThread; static HDC m_hThreadDc; </span><span class=3D"lines">@@ -54,6 +54,10 @@ </span><span class=3D"cx"> return m_hWndMain; } =20 </span><span class=3D"add">+HGLRC Tiki::GetWin32MainHGLRC() { + return m_hrc; +} + </span><span class=3D"cx"> //////////////////////////////////// // Tiki::DoMain // initialization </span><span class=3D"lines">@@ -237,35 +241,38 @@ </span><span class=3D"cx">=20 // Set up our GL context so that texture loading and such works as well= . m_hThreadDc =3D GetDC(m_hWndMain); </span><span class=3D"rem">- wglMakeCurrent(m_hThreadDc, m_hrc); </span><span class=3D"add">+ m_hThreadRc =3D wglCreateContext(m_hThreadDc= ); + wglShareLists(m_hrc, m_hThreadRc); + wglMakeCurrent(m_hThreadDc, m_hThreadRc); </span><span class=3D"cx">=20 int argc =3D 0; LPWSTR *args =3D CommandLineToArgvW(GetCommandLineW(), &argc); // if we have 1 or more command line args, pass it down nicely to tiki_= main if(argc > 0) { </span><span class=3D"rem">- char ** argv =3D new char*[argc]; - for(int i =3D 0; i < argc; i++) - { - argv[i] =3D new char [wcslen(args[i])]; - sprintf(argv[i], "%ws", args[i]); - } - LocalFree(args); </span><span class=3D"add">+ char ** argv =3D new char*[argc]; + for(int i =3D 0; i < argc; i++) + { + argv[i] =3D new char[wcslen(args[i]) + 2]; + sprintf(argv[i], "%ws", args[i]); + } + LocalFree(args); </span><span class=3D"cx">=20 </span><span class=3D"rem">- tiki_main(argc, argv); </span><span class=3D"add">+ tiki_main(argc, argv); </span><span class=3D"cx">=20 </span><span class=3D"rem">- // cleanup allocated memory for cmd l= ine args - for(int i =3D 0; i < argc; i++) - { - delete [] argv[i]; - } - delete [] argv; </span><span class=3D"add">+ // cleanup allocated memory for cmd line ar= gs + for(int i =3D 0; i < argc; i++) + { + delete [] argv[i]; + } + delete [] argv; </span><span class=3D"cx"> } else { </span><span class=3D"rem">- tiki_main(0, NULL); </span><span class=3D"add">+ tiki_main(0, NULL); </span><span class=3D"cx"> } =20 </span><span class=3D"add">+ wglDeleteContext(m_hThreadRc); </span><span class=3D"cx"> ReleaseDC(m_hWndMain, m_hThreadDc); m_hThreadDc =3D NULL; =20 </span><span class=3D"lines">@@ -293,8 +300,10 @@ </span><span class=3D"cx"> } =20 extern "C" void tiki_scene_begin_hook() { </span><span class=3D"rem">- // Set up our GL context for painting. - wglMakeCurrent(m_hThreadDc, m_hrc); </span><span class=3D"add">+ // Set up our GL context for painting, if ne= eded. If this is another + // thread besides the main game thread, it might have its own. + if ( wglGetCurrentContext() =3D=3D NULL ) + wglMakeCurrent(m_hThreadDc, m_hrc); </span><span class=3D"cx">=20 // Every so often we should reset the frame counters, to avoid // having a super long term averaging effect. </span></pre></div> <a id=3D"tikiwin32srcplatthreadcpp"></a> <div class=3D"modfile"><h4>Modified: tiki/win32/src/platthread.cpp (307 =3D= > 308)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/win32/src/platthread.cpp 2006-03-27 00:14:1= 1 UTC (rev 307) +++ tiki/win32/src/platthread.cpp 2006-03-27 00:18:11 UTC (rev 308) </span><span class=3D"lines">@@ -1,6 +1,7 @@ </span><span class=3D"cx"> #include "pch.h" =20 #include "Tiki/thread.h" </span><span class=3D"add">+#include "Tiki/glhdrs.h" </span><span class=3D"cx">=20 struct StubInfo { void * (*func)(void *); </span><span class=3D"lines">@@ -11,8 +12,18 @@ </span><span class=3D"cx"> assert( data ); StubInfo * inf =3D (StubInfo *)data; =20 </span><span class=3D"add">+ // Set up our GL context so that texture loa= ding and such works here as well. + HDC threadDc =3D GetDC(Tiki::GetWin32Window()); + HGLRC threadRc =3D wglCreateContext(threadDc); + wglShareLists(Tiki::GetWin32MainHGLRC(), threadRc); + wglMakeCurrent(threadDc, threadRc); + </span><span class=3D"cx"> void * result =3D inf->func(inf->data); delete inf; </span><span class=3D"add">+ + wglDeleteContext(threadRc); + ReleaseDC(Tiki::GetWin32Window(), threadDc); + </span><span class=3D"cx"> return (DWORD)(DWORD_PTR)result; } =20 </span> </pre> </div> </div> </body> </html> |
|
From: <cad...@li...> - 2006-02-19 21:52:40
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns=3D"http://www.w3.org/1999/xhtml"> <head><style type=3D"text/css"><!-- body {background:#ffffff;font-family:Verdana,Helvetica,Arial,sans-serif;} h3 {margin:15px 0;padding:0;line-height:0;} #msg {margin: 0 0 2em 0;} #msg dl, #msg ul, #msg pre {padding:1em;border:1px dashed black;margin: 1= 0px 0 30px 0;} #msg dl {background:#ccccff;} #msg pre {background:#ffffcc;} #msg ul {background:#cc99ff;list-style:none;} #msg dt {font-weight:bold;float:left;width: 6em;} #msg dt:after { content:':';} #patch h4 {padding: 0 10px;line-height:1.5em;margin:0;background:#ccffff;= border-bottom:1px solid black;margin:0 0 10px 0;} #patch .propset h4, #patch .binary h4 {margin: 0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {background:#eeeeee;padding: 0 0 10px 0;} #patch .propset .diff, #patch .binary .diff {padding: 10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patc= h .binary {border:1px solid black;margin:10px 0;} #patch .add {background:#ddffdd;} #patch .rem {background:#ffdddd;} #patch .lines, .info {color:#888888;background:#ffffff;} --></style> <title>[306] tiki/src/gl/genmenu.cpp: Tiki: pass events with NULL device = through</title> </head> <body> <div id=3D"msg"> <dl> <dt>Revision</dt> <dd>306</dd> <dt>Author</dt> <dd>sam.steele</dd> <dt>Date</dt> <dd>2006-02-19 13:36:15 -0800 (Sun, 19 Feb 2006)</dd> </dl> <h3>Log Message</h3> <pre>Tiki: pass events with NULL device through</pre> <h3>Modified Paths</h3> <ul> <li><a href=3D"#tikisrcglgenmenucpp">tiki/src/gl/genmenu.cpp</a></li> </ul> </div> <div id=3D"patch"> <h3>Diff</h3> <a id=3D"tikisrcglgenmenucpp"></a> <div class=3D"modfile"><h4>Modified: tiki/src/gl/genmenu.cpp (305 =3D> 30= 6)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/src/gl/genmenu.cpp 2006-02-18 16:34:52 UTC = (rev 305) +++ tiki/src/gl/genmenu.cpp 2006-02-19 21:36:15 UTC (rev 306) </span><span class=3D"lines">@@ -217,9 +217,6 @@ </span><span class=3D"cx"> } =20 void GenericMenu::processHidEvent(const Hid::Event & evt) { </span><span class=3D"rem">- if(evt.dev =3D=3D NULL) { - return; - } </span><span class=3D"cx"> // Just pass the event down as-is first. // And why exactly C++ can't deal with making a default copy constructo= r // from a base class is anyone's guess. </span><span class=3D"lines">@@ -235,14 +232,14 @@ </span><span class=3D"cx"> newevt.x =3D evt.x; newevt.y =3D evt.y; newevt.port =3D evt.port; </span><span class=3D"rem">- if (evt.dev->getType() =3D=3D Hid::Device= ::TypeMouse) { </span><span class=3D"add">+ if (evt.dev && evt.dev->getType()= =3D=3D Hid::Device::TypeMouse) { </span><span class=3D"cx"> Vector v =3D m_scene->getTranslate(); newevt.x -=3D (int)v.x; newevt.y -=3D (int)v.y; } inputEvent(newevt); // process mouse events for possible object interaction </span><span class=3D"rem">- if (evt.dev->getType() =3D=3D Hid::Device= ::TypeMouse && </span><span class=3D"add">+ if (evt.dev && evt.dev->getType()= =3D=3D Hid::Device::TypeMouse && </span><span class=3D"cx"> (evt.type =3D=3D Event::EvtBtnPress || evt= .type =3D=3D Event::EvtBtnRelease)) { } else if (evt.type =3D=3D Event::EvtQuit) { </span> </pre> </div> </div> </body> </html> |
|
From: <cad...@li...> - 2006-02-19 21:52:40
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns=3D"http://www.w3.org/1999/xhtml"> <head><style type=3D"text/css"><!-- body {background:#ffffff;font-family:Verdana,Helvetica,Arial,sans-serif;} h3 {margin:15px 0;padding:0;line-height:0;} #msg {margin: 0 0 2em 0;} #msg dl, #msg ul, #msg pre {padding:1em;border:1px dashed black;margin: 1= 0px 0 30px 0;} #msg dl {background:#ccccff;} #msg pre {background:#ffffcc;} #msg ul {background:#cc99ff;list-style:none;} #msg dt {font-weight:bold;float:left;width: 6em;} #msg dt:after { content:':';} #patch h4 {padding: 0 10px;line-height:1.5em;margin:0;background:#ccffff;= border-bottom:1px solid black;margin:0 0 10px 0;} #patch .propset h4, #patch .binary h4 {margin: 0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {background:#eeeeee;padding: 0 0 10px 0;} #patch .propset .diff, #patch .binary .diff {padding: 10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patc= h .binary {border:1px solid black;margin:10px 0;} #patch .add {background:#ddffdd;} #patch .rem {background:#ffdddd;} #patch .lines, .info {color:#888888;background:#ffffff;} --></style> <title>[305] tiki/src/gl/drawables: Tiki: win32 build fixes</title> </head> <body> <div id=3D"msg"> <dl> <dt>Revision</dt> <dd>305</dd> <dt>Author</dt> <dd>sam.steele</dd> <dt>Date</dt> <dd>2006-02-18 08:34:52 -0800 (Sat, 18 Feb 2006)</dd> </dl> <h3>Log Message</h3> <pre>Tiki: win32 build fixes</pre> <h3>Modified Paths</h3> <ul> <li><a href=3D"#tikisrcgldrawablescursorcpp">tiki/src/gl/drawables/cursor= .cpp</a></li> <li><a href=3D"#tikisrcgldrawablespointerArrowcpp">tiki/src/gl/drawables/= pointerArrow.cpp</a></li> </ul> </div> <div id=3D"patch"> <h3>Diff</h3> <a id=3D"tikisrcgldrawablescursorcpp"></a> <div class=3D"modfile"><h4>Modified: tiki/src/gl/drawables/cursor.cpp (30= 4 =3D> 305)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/src/gl/drawables/cursor.cpp 2006-02-18 16:3= 4:24 UTC (rev 304) +++ tiki/src/gl/drawables/cursor.cpp 2006-02-18 16:34:52 UTC (rev 305) </span><span class=3D"lines">@@ -6,13 +6,12 @@ </span><span class=3D"cx"> Copyright (C)2005 Sam Steele */ =20 </span><span class=3D"rem">-#include <Tiki/tiki.h> -#include <Tiki/gl.h> -#include <Tiki/hid.h> -#include <Tiki/drawables/pointerArrow.h> -#include <Tiki/drawables/cursor.h> </span><span class=3D"add">+#include "pch.h" </span><span class=3D"cx">=20 </span><span class=3D"rem">-using namespace Tiki; </span><span class=3D"add">+#include "Tiki/hid.h" +#include "Tiki/drawables/pointerArrow.h" +#include "Tiki/drawables/cursor.h" + </span><span class=3D"cx"> using namespace Tiki::GL; using namespace Tiki::Hid; =20 </span></pre></div> <a id=3D"tikisrcgldrawablespointerArrowcpp"></a> <div class=3D"modfile"><h4>Modified: tiki/src/gl/drawables/pointerArrow.c= pp (304 =3D> 305)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/src/gl/drawables/pointerArrow.cpp 2006-02-1= 8 16:34:24 UTC (rev 304) +++ tiki/src/gl/drawables/pointerArrow.cpp 2006-02-18 16:34:52 UTC (rev 3= 05) </span><span class=3D"lines">@@ -6,13 +6,12 @@ </span><span class=3D"cx"> Copyright (C)2005 Sam Steele */ =20 </span><span class=3D"rem">-#include <Tiki/tiki.h> -#include <Tiki/gl.h> -#include <Tiki/texture.h> -#include <Tiki/plxcompat.h> -#include <Tiki/drawables/pointerArrow.h> </span><span class=3D"add">+#include "pch.h" </span><span class=3D"cx">=20 </span><span class=3D"rem">-using namespace Tiki; </span><span class=3D"add">+#include "Tiki/texture.h" +#include "Tiki/plxcompat.h" +#include "Tiki/drawables/pointerArrow.h" + </span><span class=3D"cx"> using namespace Tiki::GL; using namespace Tiki::GL::Plxcompat; =20 </span> </pre> </div> </div> </body> </html> |
|
From: <cad...@li...> - 2006-02-19 21:52:37
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns=3D"http://www.w3.org/1999/xhtml"> <head><style type=3D"text/css"><!-- body {background:#ffffff;font-family:Verdana,Helvetica,Arial,sans-serif;} h3 {margin:15px 0;padding:0;line-height:0;} #msg {margin: 0 0 2em 0;} #msg dl, #msg ul, #msg pre {padding:1em;border:1px dashed black;margin: 1= 0px 0 30px 0;} #msg dl {background:#ccccff;} #msg pre {background:#ffffcc;} #msg ul {background:#cc99ff;list-style:none;} #msg dt {font-weight:bold;float:left;width: 6em;} #msg dt:after { content:':';} #patch h4 {padding: 0 10px;line-height:1.5em;margin:0;background:#ccffff;= border-bottom:1px solid black;margin:0 0 10px 0;} #patch .propset h4, #patch .binary h4 {margin: 0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {background:#eeeeee;padding: 0 0 10px 0;} #patch .propset .diff, #patch .binary .diff {padding: 10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patc= h .binary {border:1px solid black;margin:10px 0;} #patch .add {background:#ddffdd;} #patch .rem {background:#ffdddd;} #patch .lines, .info {color:#888888;background:#ffffff;} --></style> <title>[304] tiki/win32/src: Tiki: Add win32 mouse device</title> </head> <body> <div id=3D"msg"> <dl> <dt>Revision</dt> <dd>304</dd> <dt>Author</dt> <dd>sam.steele</dd> <dt>Date</dt> <dd>2006-02-18 08:34:24 -0800 (Sat, 18 Feb 2006)</dd> </dl> <h3>Log Message</h3> <pre>Tiki: Add win32 mouse device</pre> <h3>Modified Paths</h3> <ul> <li><a href=3D"#tikiwin32srcplatglcpp">tiki/win32/src/platgl.cpp</a></li> <li><a href=3D"#tikiwin32srcplathidcpp">tiki/win32/src/plathid.cpp</a></l= i> </ul> </div> <div id=3D"patch"> <h3>Diff</h3> <a id=3D"tikiwin32srcplatglcpp"></a> <div class=3D"modfile"><h4>Modified: tiki/win32/src/platgl.cpp (303 =3D> = 304)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/win32/src/platgl.cpp 2006-02-18 16:33:59 UT= C (rev 303) +++ tiki/win32/src/platgl.cpp 2006-02-18 16:34:24 UTC (rev 304) </span><span class=3D"lines">@@ -118,6 +118,13 @@ </span><span class=3D"cx"> { case WM_KEYDOWN: case WM_KEYUP: </span><span class=3D"add">+ case WM_MOUSEMOVE: + case WM_LBUTTONDOWN: + case WM_LBUTTONUP: + case WM_MBUTTONDOWN: + case WM_MBUTTONUP: + case WM_RBUTTONDOWN: + case WM_RBUTTONUP: </span><span class=3D"cx"> Tiki::RecvEvent(iMsg, wParam, lParam); break; =20 </span></pre></div> <a id=3D"tikiwin32srcplathidcpp"></a> <div class=3D"modfile"><h4>Modified: tiki/win32/src/plathid.cpp (303 =3D>= 304)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/win32/src/plathid.cpp 2006-02-18 16:33:59 U= TC (rev 303) +++ tiki/win32/src/plathid.cpp 2006-02-18 16:34:24 UTC (rev 304) </span><span class=3D"lines">@@ -12,15 +12,28 @@ </span><span class=3D"cx"> virtual string getName() const { return "= ;Win32 Keyboard"; } }; =20 </span><span class=3D"add">+class MouseDevice : public Device { +public: + MouseDevice() { } + virtual ~MouseDevice() { } + + virtual Type getType() const { return TypeMouse; } + virtual string getName() const { return "Win32 Mouse"; } +}; + </span><span class=3D"cx"> static RefPtr<KbDevice> win32kb; </span><span class=3D"add">+static RefPtr<MouseDevice> win32mouse; </span><span class=3D"cx">=20 bool Hid::platInit() { win32kb =3D new KbDevice(); </span><span class=3D"add">+ win32mouse =3D new MouseDevice(); </span><span class=3D"cx">=20 Event evt(Event::EvtAttach); evt.dev =3D win32kb; sendEvent(evt); =20 </span><span class=3D"add">+ evt.dev =3D win32mouse; + sendEvent(evt); </span><span class=3D"cx"> return true; } =20 </span><span class=3D"lines">@@ -105,6 +118,49 @@ </span><span class=3D"cx"> sendEvent(evt); } break; </span><span class=3D"add">+ + case WM_MOUSEMOVE: + { + Event evt(Event::EvtMouseMove); + evt.dev =3D win32mouse; + evt.x =3D LOWORD(lParam);=20 + evt.y =3D HIWORD(lParam); + sendEvent(evt); + } + + case WM_LBUTTONUP: + case WM_LBUTTONDOWN: + { + Event evt(iMsg=3D=3DWM_LBUTTONDOWN?Event::EvtBtnPress:Event::EvtBtnRe= lease); + evt.dev =3D win32mouse; + evt.btn =3D Event::MouseLeftBtn; + evt.x =3D LOWORD(lParam);=20 + evt.y =3D HIWORD(lParam); + sendEvent(evt); + } + + case WM_MBUTTONUP: + case WM_MBUTTONDOWN: + { + Event evt(iMsg=3D=3DWM_MBUTTONDOWN?Event::EvtBtnPress:Event::EvtBtnRe= lease); + evt.dev =3D win32mouse; + evt.btn =3D Event::MouseMiddleBtn; + evt.x =3D LOWORD(lParam);=20 + evt.y =3D HIWORD(lParam); + sendEvent(evt); + } + + case WM_RBUTTONUP: + case WM_RBUTTONDOWN: + { + Event evt(iMsg=3D=3DWM_RBUTTONDOWN?Event::EvtBtnPress:Event::EvtBtnRe= lease); + evt.dev =3D win32mouse; + evt.btn =3D Event::MouseRightBtn; + evt.x =3D LOWORD(lParam);=20 + evt.y =3D HIWORD(lParam); + sendEvent(evt); + } + </span><span class=3D"cx"> } } =20 </span> </pre> </div> </div> </body> </html> |
|
From: <cad...@li...> - 2006-02-19 21:52:35
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns=3D"http://www.w3.org/1999/xhtml"> <head><style type=3D"text/css"><!-- body {background:#ffffff;font-family:Verdana,Helvetica,Arial,sans-serif;} h3 {margin:15px 0;padding:0;line-height:0;} #msg {margin: 0 0 2em 0;} #msg dl, #msg ul, #msg pre {padding:1em;border:1px dashed black;margin: 1= 0px 0 30px 0;} #msg dl {background:#ccccff;} #msg pre {background:#ffffcc;} #msg ul {background:#cc99ff;list-style:none;} #msg dt {font-weight:bold;float:left;width: 6em;} #msg dt:after { content:':';} #patch h4 {padding: 0 10px;line-height:1.5em;margin:0;background:#ccffff;= border-bottom:1px solid black;margin:0 0 10px 0;} #patch .propset h4, #patch .binary h4 {margin: 0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {background:#eeeeee;padding: 0 0 10px 0;} #patch .propset .diff, #patch .binary .diff {padding: 10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patc= h .binary {border:1px solid black;margin:10px 0;} #patch .add {background:#ddffdd;} #patch .rem {background:#ffdddd;} #patch .lines, .info {color:#888888;background:#ffffff;} --></style> <title>[303] tiki/win32/tiki.vcproj: Tiki: Add cursor and pointerArrow to= win32 project</title> </head> <body> <div id=3D"msg"> <dl> <dt>Revision</dt> <dd>303</dd> <dt>Author</dt> <dd>sam.steele</dd> <dt>Date</dt> <dd>2006-02-18 08:33:59 -0800 (Sat, 18 Feb 2006)</dd> </dl> <h3>Log Message</h3> <pre>Tiki: Add cursor and pointerArrow to win32 project</pre> <h3>Modified Paths</h3> <ul> <li><a href=3D"#tikiwin32tikivcproj">tiki/win32/tiki.vcproj</a></li> </ul> </div> <div id=3D"patch"> <h3>Diff</h3> <a id=3D"tikiwin32tikivcproj"></a> <div class=3D"modfile"><h4>Modified: tiki/win32/tiki.vcproj (302 =3D> 303= )</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/win32/tiki.vcproj 2006-01-07 06:32:41 UTC (= rev 302) +++ tiki/win32/tiki.vcproj 2006-02-18 16:33:59 UTC (rev 303) </span><span class=3D"lines">@@ -20,7 +20,7 @@ </span><span class=3D"cx"> <Tool Name=3D"VCCLCompilerTool" Optimization=3D"0" </span><span class=3D"rem">- AdditionalIncludeDirectories=3D"incl= ude;../include;../3rdparty/libpng;../3rdparty/zlib;../3rdparty/libjpeg;..= /3rdparty/libogg/include;../3rdparty/libvorbis/include;../../../OpenAL/in= clude" </span><span class=3D"add">+ AdditionalIncludeDirectories=3D"incl= ude;../include;../3rdparty/libpng;../3rdparty/zlib;../3rdparty/libjpeg;..= /3rdparty/libogg/include;../3rdparty/libvorbis/include;C:\OpenAL\include&= quot; </span><span class=3D"cx"> MinimalRebuild=3D"TRUE" BasicRuntimeChecks=3D"3" RuntimeLibrary=3D"1" </span><span class=3D"lines">@@ -62,7 +62,7 @@ </span><span class=3D"cx"> CharacterSet=3D"2"> <Tool Name=3D"VCCLCompilerTool" </span><span class=3D"rem">- AdditionalIncludeDirectories=3D"incl= ude;../include;../3rdparty/libpng;../3rdparty/zlib;../3rdparty/libjpeg;..= /3rdparty/libogg/include;../3rdparty/libvorbis/include;../../../OpenAL/in= clude" </span><span class=3D"add">+ AdditionalIncludeDirectories=3D"incl= ude;../include;../3rdparty/libpng;../3rdparty/zlib;../3rdparty/libjpeg;..= /3rdparty/libogg/include;../3rdparty/libvorbis/include;C:\OpenAL\include&= quot; </span><span class=3D"cx"> RuntimeLibrary=3D"0" UsePrecompiledHeader=3D"3" PrecompiledHeaderThrough=3D"pch.h" </span><span class=3D"lines">@@ -219,8 +219,14 @@ </span><span class=3D"cx"> RelativePath=3D"..\src\gl\drawable= s\banner.cpp"> </File> <File </span><span class=3D"add">+ RelativePath=3D"..\src\gl\drawabl= es\cursor.cpp"> + </File> + <File </span><span class=3D"cx"> RelativePath=3D"..\src\gl\drawable= s\label.cpp"> </File> </span><span class=3D"add">+ <File + RelativePath=3D"..\src\gl\drawables\pointerArrow.cpp"&g= t; + </File> </span><span class=3D"cx"> </Filter> <Filter Name=3D"triggers" </span> </pre> </div> </div> </body> </html> |
|
From: <cad...@li...> - 2006-01-07 06:42:21
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns=3D"http://www.w3.org/1999/xhtml"> <head><style type=3D"text/css"><!-- #msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: = #fff; } #msg dt { float: left; width: 6em; font-weight: bold; } #msg dt:after { content:':';} #msg dl, #msg dt, #msg ul, #msg li { font-family: verdana,arial,helvetica= ,sans-serif; font-size: 10pt; } #msg dl a { font-weight: bold} #msg dl a:link { color:#fc3; } #msg dl a:active { color:#ff0; } #msg dl a:visited { color:#cc6; } h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; fo= nt-weight: bold; } #msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padd= ing: 6px; } #msg ul, pre { overflow: auto; } #patch { width: 100%; } #patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt= ;padding:8px;background:#369;color:#fff;margin:0;} #patch .propset h4, #patch .binary h4 {margin:0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:aut= o;} #patch .propset .diff, #patch .binary .diff {padding:10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patc= h .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch ins {background:#dfd;text-decoration:none;display:block;padding:0 = 10px;} #patch del {background:#fdd;text-decoration:none;display:block;padding:0 = 10px;} #patch .lines, .info {color:#888;background:#fff;} --></style> <title>[302] tiki/src/gl/texture.cpp: Tiki: modulate alpha on created can= vases so text can be translucent</title> </head> <body> <div id=3D"msg"> <dl> <dt>Revision</dt> <dd>302</dd> <dt>Author</dt> <dd>sam.steele</dd> <dt>Date</dt> <dd>2006-01-06 22:32:41 -0800 (Fri, 06 Jan 2006)</dd> </dl> <h3>Log Message</h3> <pre>Tiki: modulate alpha on created canvases so text can be translucent<= /pre> <h3>Modified Paths</h3> <ul> <li><a href=3D"#tikisrcgltexturecpp">tiki/src/gl/texture.cpp</a></li> </ul> </div> <div id=3D"patch"> <h3>Diff</h3> <a id=3D"tikisrcgltexturecpp"></a> <div class=3D"modfile"><h4>Modified: tiki/src/gl/texture.cpp (301 =3D> 30= 2)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/src/gl/texture.cpp 2006-01-07 06:31:46 UTC = (rev 301) +++ tiki/src/gl/texture.cpp 2006-01-07 06:32:41 UTC (rev 302) </span><span class=3D"lines">@@ -230,6 +230,8 @@ </span><span class=3D"cx"> #if TIKI_PLAT !=3D TIKI_DC //KGL doesn't suppo= rt these </span><span class=3D"cx"> glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG= _FILTER, GL_LINEAR); </span><span class=3D"cx"> glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN= _FILTER, GL_LINEAR); </span><ins>+#else + glTexEnvi(GL_TEXTURE_2D,GL_TEXTURE_ENV_MODE,GL_MODULATEALPHA); </ins><span class=3D"cx"> #endif </span><span class=3D"cx">=20 </span><span class=3D"cx"> m_w =3D w; </span></pre> </div> </div> </body> </html> |
|
From: <cad...@li...> - 2006-01-07 06:41:29
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns=3D"http://www.w3.org/1999/xhtml"> <head><style type=3D"text/css"><!-- #msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: = #fff; } #msg dt { float: left; width: 6em; font-weight: bold; } #msg dt:after { content:':';} #msg dl, #msg dt, #msg ul, #msg li { font-family: verdana,arial,helvetica= ,sans-serif; font-size: 10pt; } #msg dl a { font-weight: bold} #msg dl a:link { color:#fc3; } #msg dl a:active { color:#ff0; } #msg dl a:visited { color:#cc6; } h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; fo= nt-weight: bold; } #msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padd= ing: 6px; } #msg ul, pre { overflow: auto; } #patch { width: 100%; } #patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt= ;padding:8px;background:#369;color:#fff;margin:0;} #patch .propset h4, #patch .binary h4 {margin:0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:aut= o;} #patch .propset .diff, #patch .binary .diff {padding:10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patc= h .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch ins {background:#dfd;text-decoration:none;display:block;padding:0 = 10px;} #patch del {background:#fdd;text-decoration:none;display:block;padding:0 = 10px;} #patch .lines, .info {color:#888;background:#fff;} --></style> <title>[301] tiki/src/gl/genmenu.cpp: Tiki: move time calculation to slig= htly increase accuracy</title> </head> <body> <div id=3D"msg"> <dl> <dt>Revision</dt> <dd>301</dd> <dt>Author</dt> <dd>sam.steele</dd> <dt>Date</dt> <dd>2006-01-06 22:31:46 -0800 (Fri, 06 Jan 2006)</dd> </dl> <h3>Log Message</h3> <pre>Tiki: move time calculation to slightly increase accuracy</pre> <h3>Modified Paths</h3> <ul> <li><a href=3D"#tikisrcglgenmenucpp">tiki/src/gl/genmenu.cpp</a></li> </ul> </div> <div id=3D"patch"> <h3>Diff</h3> <a id=3D"tikisrcglgenmenucpp"></a> <div class=3D"modfile"><h4>Modified: tiki/src/gl/genmenu.cpp (300 =3D> 30= 1)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/src/gl/genmenu.cpp 2006-01-01 18:52:26 UTC = (rev 300) +++ tiki/src/gl/genmenu.cpp 2006-01-07 06:31:46 UTC (rev 301) </span><span class=3D"lines">@@ -125,7 +125,7 @@ </span><span class=3D"cx"> } </span><span class=3D"cx">=20 </span><span class=3D"cx"> void GenericMenu::visualPerFrame() { </span><del>- uint64 frameTime=3DTime::gettime(); </del><ins>+ uint64 frameTime; </ins><span class=3D"cx"> =09 </span><span class=3D"cx"> m_scene->subRemoveFinished(); </span><span class=3D"cx"> m_scene->createSceneList(); </span><span class=3D"lines">@@ -146,6 +146,7 @@ </span><span class=3D"cx"> =09 </span><span class=3D"cx"> m_scene->destroySceneList(); </span><span class=3D"cx">=20 </span><ins>+ frameTime=3DTime::gettime(); </ins><span class=3D"cx"> m_scene->nextFrame(frameTime-m_lastTime); </span><span class=3D"cx"> m_lastTime=3DframeTime; </span><span class=3D"cx"> } </span></pre> </div> </div> </body> </html> |
|
From: <cad...@li...> - 2006-01-01 19:01:56
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns=3D"http://www.w3.org/1999/xhtml"> <head><style type=3D"text/css"><!-- #msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: = #fff; } #msg dt { float: left; width: 6em; font-weight: bold; } #msg dt:after { content:':';} #msg dl, #msg dt, #msg ul, #msg li { font-family: verdana,arial,helvetica= ,sans-serif; font-size: 10pt; } #msg dl a { font-weight: bold} #msg dl a:link { color:#fc3; } #msg dl a:active { color:#ff0; } #msg dl a:visited { color:#cc6; } h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; fo= nt-weight: bold; } #msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padd= ing: 6px; } #msg ul, pre { overflow: auto; } #patch { width: 100%; } #patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt= ;padding:8px;background:#369;color:#fff;margin:0;} #patch .propset h4, #patch .binary h4 {margin:0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:aut= o;} #patch .propset .diff, #patch .binary .diff {padding:10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patc= h .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch ins {background:#dfd;text-decoration:none;display:block;padding:0 = 10px;} #patch del {background:#fdd;text-decoration:none;display:block;padding:0 = 10px;} #patch .lines, .info {color:#888;background:#fff;} --></style> <title>[300] kos-ports/libtsunami/include/texture.h: Making m_txr protect= ed vs private so Texture can be extended and m_txr </title> </head> <body> <div id=3D"msg"> <dl> <dt>Revision</dt> <dd>300</dd> <dt>Author</dt> <dd>atani</dd> <dt>Date</dt> <dd>2006-01-01 10:52:26 -0800 (Sun, 01 Jan 2006)</dd> </dl> <h3>Log Message</h3> <pre>Making m_txr protected vs private so Texture can be extended and m_t= xr=20 accessed.</pre> <h3>Modified Paths</h3> <ul> <li><a href=3D"#kosportslibtsunamiincludetextureh">kos-ports/libtsunami/i= nclude/texture.h</a></li> </ul> </div> <div id=3D"patch"> <h3>Diff</h3> <a id=3D"kosportslibtsunamiincludetextureh"></a> <div class=3D"modfile"><h4>Modified: kos-ports/libtsunami/include/texture= .h (299 =3D> 300)</h4> <pre class=3D"diff"> <span class=3D"info">--- kos-ports/libtsunami/include/texture.h 2005-12-3= 1 04:09:54 UTC (rev 299) +++ kos-ports/libtsunami/include/texture.h 2006-01-01 18:52:26 UTC (rev 3= 00) </span><span class=3D"lines">@@ -49,7 +49,7 @@ </span><span class=3D"cx"> int getPxlfmt() const { return m_txr->fmt= ; } </span><span class=3D"cx"> operator plx_texture_t * const() { return m_t= xr; } </span><span class=3D"cx">=20 </span><del>-private: </del><ins>+protected: </ins><span class=3D"cx">=20 </span><span class=3D"cx"> plx_texture_t * m_txr; </span><span class=3D"cx"> }; </span></pre> </div> </div> </body> </html> |
|
From: <cad...@li...> - 2005-12-31 04:19:39
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns=3D"http://www.w3.org/1999/xhtml"> <head><style type=3D"text/css"><!-- #msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: = #fff; } #msg dt { float: left; width: 6em; font-weight: bold; } #msg dt:after { content:':';} #msg dl, #msg dt, #msg ul, #msg li { font-family: verdana,arial,helvetica= ,sans-serif; font-size: 10pt; } #msg dl a { font-weight: bold} #msg dl a:link { color:#fc3; } #msg dl a:active { color:#ff0; } #msg dl a:visited { color:#cc6; } h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; fo= nt-weight: bold; } #msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padd= ing: 6px; } #msg ul, pre { overflow: auto; } #patch { width: 100%; } #patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt= ;padding:8px;background:#369;color:#fff;margin:0;} #patch .propset h4, #patch .binary h4 {margin:0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:aut= o;} #patch .propset .diff, #patch .binary .diff {padding:10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patc= h .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch ins {background:#dfd;text-decoration:none;display:block;padding:0 = 10px;} #patch del {background:#fdd;text-decoration:none;display:block;padding:0 = 10px;} #patch .lines, .info {color:#888;background:#fff;} --></style> <title>[299] kos/Makefile.rules: Adding ".svn" exclude to the g= enromfs call</title> </head> <body> <div id=3D"msg"> <dl> <dt>Revision</dt> <dd>299</dd> <dt>Author</dt> <dd>atani</dd> <dt>Date</dt> <dd>2005-12-30 20:09:54 -0800 (Fri, 30 Dec 2005)</dd> </dl> <h3>Log Message</h3> <pre>Adding ".svn" exclude to the genromfs call</pre> <h3>Modified Paths</h3> <ul> <li><a href=3D"#kosMakefilerules">kos/Makefile.rules</a></li> </ul> </div> <div id=3D"patch"> <h3>Diff</h3> <a id=3D"kosMakefilerules"></a> <div class=3D"modfile"><h4>Modified: kos/Makefile.rules (298 =3D> 299)</h= 4> <pre class=3D"diff"> <span class=3D"info">--- kos/Makefile.rules 2005-12-23 02:17:09 UTC (rev = 298) +++ kos/Makefile.rules 2005-12-31 04:09:54 UTC (rev 299) </span><span class=3D"lines">@@ -36,7 +36,7 @@ </span><span class=3D"cx"> # Define KOS_ROMDISK_DIR in your Makefile if y= ou want these two handy rules. </span><span class=3D"cx"> ifdef KOS_ROMDISK_DIR </span><span class=3D"cx"> romdisk.img: </span><del>- $(KOS_GENROMFS) -f romdisk.img -d $(KOS_ROMDISK_DIR) -v </del><ins>+ $(KOS_GENROMFS) -f romdisk.img -d $(KOS_ROMDISK_DIR) -v -x .= svn </ins><span class=3D"cx">=20 </span><span class=3D"cx"> romdisk.o: romdisk.img </span><span class=3D"cx"> $(KOS_BASE)/utils/bin2o/bin2o romdisk.img rom= disk romdisk.o </span></pre> </div> </div> </body> </html> |
|
From: <cad...@li...> - 2005-12-23 02:26:17
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns=3D"http://www.w3.org/1999/xhtml"> <head><style type=3D"text/css"><!-- #msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: = #fff; } #msg dt { float: left; width: 6em; font-weight: bold; } #msg dt:after { content:':';} #msg dl, #msg dt, #msg ul, #msg li { font-family: verdana,arial,helvetica= ,sans-serif; font-size: 10pt; } #msg dl a { font-weight: bold} #msg dl a:link { color:#fc3; } #msg dl a:active { color:#ff0; } #msg dl a:visited { color:#cc6; } h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; fo= nt-weight: bold; } #msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padd= ing: 6px; } #msg ul, pre { overflow: auto; } #patch { width: 100%; } #patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt= ;padding:8px;background:#369;color:#fff;margin:0;} #patch .propset h4, #patch .binary h4 {margin:0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:aut= o;} #patch .propset .diff, #patch .binary .diff {padding:10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patc= h .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch ins {background:#dfd;text-decoration:none;display:block;padding:0 = 10px;} #patch del {background:#fdd;text-decoration:none;display:block;padding:0 = 10px;} #patch .lines, .info {color:#888;background:#fff;} --></style> <title>[298] tiki/examples/TikiTest: forgot to save project in Code::Bloc= ks before commit.</title> </head> <body> <div id=3D"msg"> <dl> <dt>Revision</dt> <dd>298</dd> <dt>Author</dt> <dd>atani</dd> <dt>Date</dt> <dd>2005-12-22 18:17:09 -0800 (Thu, 22 Dec 2005)</dd> </dl> <h3>Log Message</h3> <pre>forgot to save project in Code::Blocks before commit.</pre> <h3>Modified Paths</h3> <ul> <li><a href=3D"#tikiexamplesTikiTesttikitestcbp">tiki/examples/TikiTest/t= ikitest.cbp</a></li> <li><a href=3D"#tikiexamplesTikiTesttikitestlayout">tiki/examples/TikiTes= t/tikitest.layout</a></li> </ul> </div> <div id=3D"patch"> <h3>Diff</h3> <a id=3D"tikiexamplesTikiTesttikitestcbp"></a> <div class=3D"modfile"><h4>Modified: tiki/examples/TikiTest/tikitest.cbp = (297 =3D> 298)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/examples/TikiTest/tikitest.cbp 2005-12-23 0= 2:16:55 UTC (rev 297) +++ tiki/examples/TikiTest/tikitest.cbp 2005-12-23 02:17:09 UTC (rev 298) </span><span class=3D"lines">@@ -27,6 +27,7 @@ </span><span class=3D"cx"> <Add library=3D"user32"/> </span><span class=3D"cx"> <Add library=3D"kernel32"/> </span><span class=3D"cx"> <Add directory=3D"..\..\win32"= /> </span><ins>+ <Add directory=3D"C:\Program Files\OpenAL 1.1 SDK= \libs\Win32"/> </ins><span class=3D"cx"> </Linker> </span><span class=3D"cx"> <Unit filename=3D"src\TikiTest.cpp&q= uot;> </span><span class=3D"cx"> <Option compilerVar=3D"CPP"/&g= t; </span></pre></div> <a id=3D"tikiexamplesTikiTesttikitestlayout"></a> <div class=3D"modfile"><h4>Modified: tiki/examples/TikiTest/tikitest.layo= ut (297 =3D> 298)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/examples/TikiTest/tikitest.layout 2005-12-2= 3 02:16:55 UTC (rev 297) +++ tiki/examples/TikiTest/tikitest.layout 2005-12-23 02:17:09 UTC (rev 2= 98) </span><span class=3D"lines">@@ -2,9 +2,11 @@ </span><span class=3D"cx"> <!DOCTYPE CodeBlocks_layout_file> </span><span class=3D"cx"> <CodeBlocks_layout_file> </span><span class=3D"cx"> <File name=3D"src\TikiTest.cpp" = open=3D"0" top=3D"0"> </span><del>- <Cursor position=3D"129" topLine=3D"0&qu= ot;/> </del><ins>+ <Cursor position=3D"147" topLine=3D"0&quo= t;/> </ins><span class=3D"cx"> </File> </span><span class=3D"cx"> <File name=3D"src\test.cpp" open= =3D"0" top=3D"0"> </span><del>- <Cursor position=3D"5305" topLine=3D"211= "/> </del><ins>+ <Cursor position=3D"5471" topLine=3D"217&= quot;/> </ins><span class=3D"cx"> </File> </span><ins>+ <Expand folder=3D"/Sources/src"/> + <Expand folder=3D"/Sources"/> </ins><span class=3D"cx"> </CodeBlocks_layout_file> </span></pre> </div> </div> </body> </html> |
|
From: <cad...@li...> - 2005-12-23 02:26:05
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns=3D"http://www.w3.org/1999/xhtml"> <head><style type=3D"text/css"><!-- #msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: = #fff; } #msg dt { float: left; width: 6em; font-weight: bold; } #msg dt:after { content:':';} #msg dl, #msg dt, #msg ul, #msg li { font-family: verdana,arial,helvetica= ,sans-serif; font-size: 10pt; } #msg dl a { font-weight: bold} #msg dl a:link { color:#fc3; } #msg dl a:active { color:#ff0; } #msg dl a:visited { color:#cc6; } h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; fo= nt-weight: bold; } #msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padd= ing: 6px; } #msg ul, pre { overflow: auto; } #patch { width: 100%; } #patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt= ;padding:8px;background:#369;color:#fff;margin:0;} #patch .propset h4, #patch .binary h4 {margin:0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:aut= o;} #patch .propset .diff, #patch .binary .diff {padding:10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patc= h .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch ins {background:#dfd;text-decoration:none;display:block;padding:0 = 10px;} #patch del {background:#fdd;text-decoration:none;display:block;padding:0 = 10px;} #patch .lines, .info {color:#888;background:#fff;} --></style> <title>[297] tiki/win32: forgot to save project in Code::Blocks before co= mmit.</title> </head> <body> <div id=3D"msg"> <dl> <dt>Revision</dt> <dd>297</dd> <dt>Author</dt> <dd>atani</dd> <dt>Date</dt> <dd>2005-12-22 18:16:55 -0800 (Thu, 22 Dec 2005)</dd> </dl> <h3>Log Message</h3> <pre>forgot to save project in Code::Blocks before commit.</pre> <h3>Modified Paths</h3> <ul> <li><a href=3D"#tikiwin32tikicbp">tiki/win32/tiki.cbp</a></li> <li><a href=3D"#tikiwin32tikilayout">tiki/win32/tiki.layout</a></li> </ul> </div> <div id=3D"patch"> <h3>Diff</h3> <a id=3D"tikiwin32tikicbp"></a> <div class=3D"modfile"><h4>Modified: tiki/win32/tiki.cbp (296 =3D> 297)</= h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/win32/tiki.cbp 2005-12-23 02:15:41 UTC (rev= 296) +++ tiki/win32/tiki.cbp 2005-12-23 02:16:55 UTC (rev 297) </span><span class=3D"lines">@@ -9,7 +9,7 @@ </span><span class=3D"cx"> <Option compiler=3D"1"/> </span><span class=3D"cx"> <Build> </span><span class=3D"cx"> <Target title=3D"default"> </span><del>- <Option output=3D"C:\projects\tiki\win32\libtiki= .a"/> </del><ins>+ <Option output=3D"C:\projects\tiki\win32\tiki.lib= "/> </ins><span class=3D"cx"> <Option working_dir=3D""/> </span><span class=3D"cx"> <Option object_output=3D".objs&quo= t;/> </span><span class=3D"cx"> <Option deps_output=3D".deps"= /> </span><span class=3D"lines">@@ -1373,14 +1373,6 @@ </span><span class=3D"cx"> <Option compilerVar=3D"CPP"/&g= t; </span><span class=3D"cx"> <Option target=3D"default"/>= ; </span><span class=3D"cx"> </Unit> </span><del>- <Unit filename=3D"src\sound.cpp"> - <Option compilerVar=3D"CPP"/> - <Option target=3D"default"/> - </Unit> - <Unit filename=3D"src\stream.cpp"> - <Option compilerVar=3D"CPP"/> - <Option target=3D"default"/> - </Unit> </del><span class=3D"cx"> <Unit filename=3D"src\tikitime.cpp&qu= ot;> </span><span class=3D"cx"> <Option compilerVar=3D"CPP"/&g= t; </span><span class=3D"cx"> <Option target=3D"default"/>= ; </span></pre></div> <a id=3D"tikiwin32tikilayout"></a> <div class=3D"modfile"><h4>Modified: tiki/win32/tiki.layout (296 =3D> 297= )</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/win32/tiki.layout 2005-12-23 02:15:41 UTC (= rev 296) +++ tiki/win32/tiki.layout 2005-12-23 02:16:55 UTC (rev 297) </span><span class=3D"lines">@@ -8,36 +8,50 @@ </span><span class=3D"cx"> <Cursor position=3D"1119" topLi= ne=3D"0"/> </span><span class=3D"cx"> </File> </span><span class=3D"cx"> <File name=3D"..\include\Tiki\stream.= h" open=3D"0" top=3D"0"> </span><del>- <Cursor position=3D"115" topLine=3D"0&qu= ot;/> </del><ins>+ <Cursor position=3D"471" topLine=3D"26&qu= ot;/> </ins><span class=3D"cx"> </File> </span><ins>+ <File name=3D"..\include\Tiki\tiki.h" open=3D&= quot;0" top=3D"0"> + <Cursor position=3D"187" topLine=3D"3"/> + </File> </ins><span class=3D"cx"> <File name=3D"..\src\audio\oggvorbis\s= ndoggvorbis.cpp" open=3D"0" top=3D"0"> </span><span class=3D"cx"> <Cursor position=3D"205" topLin= e=3D"0"/> </span><span class=3D"cx"> </File> </span><ins>+ <File name=3D"..\src\gl\animation.cpp" open=3D= "0" top=3D"0"> + <Cursor position=3D"10" topLine=3D"0"/> + </File> </ins><span class=3D"cx"> <File name=3D"include\Tiki\glhdrs.h&qu= ot; open=3D"0" top=3D"0"> </span><span class=3D"cx"> <Cursor position=3D"123" topLin= e=3D"0"/> </span><span class=3D"cx"> </File> </span><ins>+ <File name=3D"include\Tiki\platthread.h" open=3D= "0" top=3D"0"> + <Cursor position=3D"298" topLine=3D"0"/> + </File> + <File name=3D"include\Tiki\tikitypes.h" open=3D"0&quo= t; top=3D"0"> + <Cursor position=3D"600" topLine=3D"5"/> + </File> </ins><span class=3D"cx"> <File name=3D"include\pch.h" open= =3D"0" top=3D"0"> </span><del>- <Cursor position=3D"173" topLine=3D"0&qu= ot;/> </del><ins>+ <Cursor position=3D"376" topLine=3D"0&quo= t;/> </ins><span class=3D"cx"> </File> </span><span class=3D"cx"> <File name=3D"src\init_shutdown.cpp&q= uot; open=3D"0" top=3D"0"> </span><del>- <Cursor position=3D"45" topLine=3D"0&quo= t;/> </del><ins>+ <Cursor position=3D"151" topLine=3D"0&quo= t;/> </ins><span class=3D"cx"> </File> </span><span class=3D"cx"> <File name=3D"src\platgl.cpp" op= en=3D"0" top=3D"0"> </span><del>- <Cursor position=3D"6220" topLine=3D"234= "/> </del><ins>+ <Cursor position=3D"43" topLine=3D"0"= ;/> </ins><span class=3D"cx"> </File> </span><span class=3D"cx"> <File name=3D"src\plathid.cpp" o= pen=3D"0" top=3D"0"> </span><del>- <Cursor position=3D"150" topLine=3D"2&qu= ot;/> </del><ins>+ <Cursor position=3D"355" topLine=3D"2&quo= t;/> </ins><span class=3D"cx"> </File> </span><span class=3D"cx"> <File name=3D"src\platthread.cpp"= ; open=3D"0" top=3D"0"> </span><span class=3D"cx"> <Cursor position=3D"2217" topLi= ne=3D"102"/> </span><span class=3D"cx"> </File> </span><del>- <File name=3D"src\sound.cpp" open=3D"0&qu= ot; top=3D"0"> - <Cursor position=3D"757" topLine=3D"45"/> - </File> - <File name=3D"src\stream.cpp" open=3D"0" top=3D&= quot;0"> - <Cursor position=3D"43" topLine=3D"0"/> - </File> </del><span class=3D"cx"> <File name=3D"src\tikitime.cpp" o= pen=3D"0" top=3D"0"> </span><span class=3D"cx"> <Cursor position=3D"161" topLin= e=3D"2"/> </span><span class=3D"cx"> </File> </span><ins>+ <Expand folder=3D"/Sources/win32/src"/> + <Expand folder=3D"/Sources/win32"/> + <Expand folder=3D"/Sources"/> + <Expand folder=3D"/Headers/include"/> + <Expand folder=3D"/Headers/win32/include/Tiki"/> + <Expand folder=3D"/Headers/win32/include"/> + <Expand folder=3D"/Headers/win32"/> + <Expand folder=3D"/Headers"/> </ins><span class=3D"cx"> </CodeBlocks_layout_file> </span></pre> </div> </div> </body> </html> |
|
From: <cad...@li...> - 2005-12-23 02:24:52
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns=3D"http://www.w3.org/1999/xhtml"> <head><style type=3D"text/css"><!-- #msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: = #fff; } #msg dt { float: left; width: 6em; font-weight: bold; } #msg dt:after { content:':';} #msg dl, #msg dt, #msg ul, #msg li { font-family: verdana,arial,helvetica= ,sans-serif; font-size: 10pt; } #msg dl a { font-weight: bold} #msg dl a:link { color:#fc3; } #msg dl a:active { color:#ff0; } #msg dl a:visited { color:#cc6; } h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; fo= nt-weight: bold; } #msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padd= ing: 6px; } #msg ul, pre { overflow: auto; } #patch { width: 100%; } #patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt= ;padding:8px;background:#369;color:#fff;margin:0;} #patch .propset h4, #patch .binary h4 {margin:0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:aut= o;} #patch .propset .diff, #patch .binary .diff {padding:10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patc= h .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch ins {background:#dfd;text-decoration:none;display:block;padding:0 = 10px;} #patch del {background:#fdd;text-decoration:none;display:block;padding:0 = 10px;} #patch .lines, .info {color:#888;background:#fff;} --></style> <title>[296] tiki/examples/TikiTest: Added Code::Blocks project file</tit= le> </head> <body> <div id=3D"msg"> <dl> <dt>Revision</dt> <dd>296</dd> <dt>Author</dt> <dd>atani</dd> <dt>Date</dt> <dd>2005-12-22 18:15:41 -0800 (Thu, 22 Dec 2005)</dd> </dl> <h3>Log Message</h3> <pre>Added Code::Blocks project file test.cpp tab->space conversion Added windows.h and pch.h to TikiTest.cpp, probably pch.h should be pulle= d in from the compiler but I could not figure out how (yet)</pre> <h3>Modified Paths</h3> <ul> <li><a href=3D"#tikiexamplesTikiTestsrcTikiTestcpp">tiki/examples/TikiTes= t/src/TikiTest.cpp</a></li> <li><a href=3D"#tikiexamplesTikiTestsrctestcpp">tiki/examples/TikiTest/sr= c/test.cpp</a></li> </ul> <h3>Added Paths</h3> <ul> <li><a href=3D"#tikiexamplesTikiTesttikitestcbp">tiki/examples/TikiTest/t= ikitest.cbp</a></li> <li><a href=3D"#tikiexamplesTikiTesttikitestlayout">tiki/examples/TikiTes= t/tikitest.layout</a></li> </ul> </div> <div id=3D"patch"> <h3>Diff</h3> <a id=3D"tikiexamplesTikiTestsrcTikiTestcpp"></a> <div class=3D"modfile"><h4>Modified: tiki/examples/TikiTest/src/TikiTest.= cpp (295 =3D> 296)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/examples/TikiTest/src/TikiTest.cpp 2005-12-= 23 02:14:28 UTC (rev 295) +++ tiki/examples/TikiTest/src/TikiTest.cpp 2005-12-23 02:15:41 UTC (rev = 296) </span><span class=3D"lines">@@ -6,9 +6,12 @@ </span><span class=3D"cx"> * </span><span class=3D"cx"> */ </span><span class=3D"cx">=20 </span><del>-#include <Tiki/Tiki.h> </del><ins>+#include <Tiki/Tiki.h> +#include <pch.h> </ins><span class=3D"cx">=20 </span><del>-#if TIKI_PLAT =3D=3D TIKI_WIN32 </del><ins>+#if TIKI_PLAT =3D=3D TIKI_WIN32 +#include <windows.h> + </ins><span class=3D"cx"> static char szAppName[] =3D "TikiTest"= ;; </span><span class=3D"cx"> int APIENTRY WinMain(HINSTANCE hInst, HINSTANC= E hPrevInstance, LPSTR lpCmdLine, int nCmdShow) </span><span class=3D"cx"> #else </span></pre></div> <a id=3D"tikiexamplesTikiTestsrctestcpp"></a> <div class=3D"modfile"><h4>Modified: tiki/examples/TikiTest/src/test.cpp = (295 =3D> 296)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/examples/TikiTest/src/test.cpp 2005-12-23 0= 2:14:28 UTC (rev 295) +++ tiki/examples/TikiTest/src/test.cpp 2005-12-23 02:15:41 UTC (rev 296) </span><span class=3D"lines">@@ -39,40 +39,40 @@ </span><span class=3D"cx"> //Draw the mouse pointer, parallax-style! </span><span class=3D"cx"> void draw_mouse(volatile mouse_pos_t *pos) { </span><span class=3D"cx"> plx_vertex_t vert; </span><del>-=09 </del><ins>+ </ins><span class=3D"cx"> plx_mat3d_identity(); </span><del>-=09 </del><ins>+ </ins><span class=3D"cx"> vert.argb =3D Color(0,0,0); </span><span class=3D"cx"> vert.z =3D 0.3; </span><del>-=09 </del><ins>+ </ins><span class=3D"cx"> vert.flags =3D PLX_VERT; </span><span class=3D"cx"> vert.x =3D pos->x-2; </span><span class=3D"cx"> vert.y =3D pos->y-4; </span><span class=3D"cx"> plx_prim(&vert, sizeof(vert)); </span><del>-=09 </del><ins>+ </ins><span class=3D"cx"> vert.flags =3D PLX_VERT; </span><span class=3D"cx"> vert.x =3D pos->x+18; </span><span class=3D"cx"> vert.y =3D pos->y+16; </span><span class=3D"cx"> plx_prim(&vert, sizeof(vert)); </span><del>-=09 </del><ins>+ </ins><span class=3D"cx"> vert.flags =3D PLX_VERT_EOS; </span><span class=3D"cx"> vert.x =3D pos->x-2; </span><span class=3D"cx"> vert.y =3D pos->y+24; </span><span class=3D"cx"> plx_prim(&vert, sizeof(vert)); </span><del>-=09 </del><ins>+ </ins><span class=3D"cx"> vert.argb =3D Color(0.8,0.2,0.1); </span><span class=3D"cx"> vert.z =3D 0.31; </span><del>-=09 </del><ins>+ </ins><span class=3D"cx"> vert.flags =3D PLX_VERT; </span><span class=3D"cx"> vert.x =3D pos->x; </span><span class=3D"cx"> vert.y =3D pos->y; </span><span class=3D"cx"> plx_prim(&vert, sizeof(vert)); </span><del>-=09 </del><ins>+ </ins><span class=3D"cx"> vert.flags =3D PLX_VERT; </span><span class=3D"cx"> vert.x =3D pos->x+15; </span><span class=3D"cx"> vert.y =3D pos->y+15; </span><span class=3D"cx"> plx_prim(&vert, sizeof(vert)); </span><del>-=09 </del><ins>+ </ins><span class=3D"cx"> vert.flags =3D PLX_VERT_EOS; </span><span class=3D"cx"> vert.x =3D pos->x; </span><span class=3D"cx"> vert.y =3D pos->y+21; </span><span class=3D"lines">@@ -126,7 +126,7 @@ </span><span class=3D"cx"> plx_vert_fnd(&dr_state, PLX_VERT, </span><span class=3D"cx"> x, y, z, 1.0f, </span><span class=3D"cx"> 0.0f, g, b); </span><del>- =20 </del><ins>+ </ins><span class=3D"cx"> /* x, y */ </span><span class=3D"cx"> x =3D radius * fcos( yaw ) * fcos( pitch ); </span><span class=3D"cx"> y =3D radius * fsin( pitch ); </span><span class=3D"lines">@@ -159,13 +159,13 @@ </span><span class=3D"cx"> // vid_border_color(0, 255, 0); </span><span class=3D"cx">=20 </span><span class=3D"cx"> //Draw the mice </span><del>-=09 </del><ins>+ </ins><span class=3D"cx"> for (i=3D0; i<4; i++) { </span><span class=3D"cx"> if(mp[i].valid) { </span><span class=3D"cx"> draw_mouse(&mp[i]); </span><span class=3D"cx"> } </span><span class=3D"cx"> } </span><del>-=09 </del><ins>+ </ins><span class=3D"cx"> plx_mat3d_identity(); </span><span class=3D"cx"> plx_mat3d_translate(0.0f, 0.0f, -12.0f); </span><span class=3D"cx"> plx_mat3d_rotate(r * 2, 0.75f, 1.0f, 0.5f); </span><span class=3D"lines">@@ -218,7 +218,7 @@ </span><span class=3D"cx"> mp[port].valid=3D1; </span><span class=3D"cx"> mp[port].x=3D320; </span><span class=3D"cx"> mp[port].y=3D240; </span><del>- } =09 </del><ins>+ } </ins><span class=3D"cx"> } </span><span class=3D"cx"> if (evt.type =3D=3D Event::EvtDetach) { </span><span class=3D"cx"> printf("Device detached: %s\n",evt= .dev->getName().c_str()); </span><span class=3D"lines">@@ -243,7 +243,7 @@ </span><span class=3D"cx"> mp[0].x=3D320; </span><span class=3D"cx"> mp[0].y=3D240; </span><span class=3D"cx"> #endif </span><del>-=09 </del><ins>+ </ins><span class=3D"cx"> RefPtr<TestObject> test =3D new TestObje= ct("1"); </span><span class=3D"cx"> RefPtr<TestObject> test2 =3D new TestOb= ject("2"); </span><span class=3D"cx"> test->connect("testevent", test2= ); </span><span class=3D"lines">@@ -262,7 +262,7 @@ </span><span class=3D"cx"> /* OggVorbis::stop(); </span><span class=3D"cx"> OggVorbis::shutdown(); */ </span><span class=3D"cx"> Tiki::shutdown(); </span><del>-=09 </del><ins>+ </ins><span class=3D"cx"> return 0; </span><span class=3D"cx"> } </span><span class=3D"cx">=20 </span></pre></div> <a id=3D"tikiexamplesTikiTesttikitestcbp"></a> <div class=3D"addfile"><h4>Added: tiki/examples/TikiTest/tikitest.cbp (29= 5 =3D> 296)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/examples/TikiTest/tikitest.cbp 2005-12-23 0= 2:14:28 UTC (rev 295) +++ tiki/examples/TikiTest/tikitest.cbp 2005-12-23 02:15:41 UTC (rev 296) </span><span class=3D"lines">@@ -0,0 +1,50 @@ </span><ins>+<?xml version=3D"1.0"?> +<!DOCTYPE CodeBlocks_project_file> +<CodeBlocks_project_file> + <FileVersion major=3D"1" minor=3D"1"/> + <Project> + <Option title=3D"TikiTest"/> + <Option makefile=3D"Makefile"/> + <Option makefile_is_custom=3D"0"/> + <Option compiler=3D"1"/> + <Build> + <Target title=3D"default"> + <Option output=3D"C:\projects\tiki\examples\TikiTest\tikites= t.exe"/> + <Option working_dir=3D"."/> + <Option object_output=3D".objs"/> + <Option deps_output=3D".deps"/> + <Option type=3D"0"/> + <Option compiler=3D"1"/> + <Option projectResourceIncludeDirsRelation=3D"0"/> + </Target> + </Build> + <Compiler> + <Add directory=3D"..\..\include"/> + <Add directory=3D"..\..\win32\include"/> + </Compiler> + <Linker> + <Add library=3D"gdi32"/> + <Add library=3D"user32"/> + <Add library=3D"kernel32"/> + <Add directory=3D"..\..\win32"/> + </Linker> + <Unit filename=3D"src\TikiTest.cpp"> + <Option compilerVar=3D"CPP"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"src\test.cpp"> + <Option compilerVar=3D"CPP"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"src\testobj.cpp"> + <Option compilerVar=3D"CPP"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"src\testobj.h"> + <Option compilerVar=3D""/> + <Option compile=3D"0"/> + <Option link=3D"0"/> + <Option target=3D"default"/> + </Unit> + </Project> +</CodeBlocks_project_file> </ins></pre></div> <a id=3D"tikiexamplesTikiTesttikitestlayout"></a> <div class=3D"addfile"><h4>Added: tiki/examples/TikiTest/tikitest.layout = (295 =3D> 296)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/examples/TikiTest/tikitest.layout 2005-12-2= 3 02:14:28 UTC (rev 295) +++ tiki/examples/TikiTest/tikitest.layout 2005-12-23 02:15:41 UTC (rev 2= 96) </span><span class=3D"lines">@@ -0,0 +1,10 @@ </span><ins>+<?xml version=3D"1.0"?> +<!DOCTYPE CodeBlocks_layout_file> +<CodeBlocks_layout_file> + <File name=3D"src\TikiTest.cpp" open=3D"0" top=3D= "0"> + <Cursor position=3D"129" topLine=3D"0"/> + </File> + <File name=3D"src\test.cpp" open=3D"0" top=3D&qu= ot;0"> + <Cursor position=3D"5305" topLine=3D"211"/> + </File> +</CodeBlocks_layout_file> </ins></pre> </div> </div> </body> </html> |
