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
(15) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <cad...@li...> - 2005-12-23 02:23: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"><!-- #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>[295] tiki/win32: Added Code::Blocks project file</title> </head> <body> <div id=3D"msg"> <dl> <dt>Revision</dt> <dd>295</dd> <dt>Author</dt> <dd>atani</dd> <dt>Date</dt> <dd>2005-12-22 18:14:28 -0800 (Thu, 22 Dec 2005)</dd> </dl> <h3>Log Message</h3> <pre>Added Code::Blocks project file Added Tiki::setName Added Tiki::GL::showCursor stub method Added shell32.lib pragma in platgl.cpp (needed for cmdline arg support) Removing old Win32 TikiTest, TikiTest_old Removed old Win32 sound/stream cpp files Removed glut32.lib pragma in platgl.cpp</pre> <h3>Modified Paths</h3> <ul> <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> <h3>Added 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> <h3>Removed Paths</h3> <ul> <li>tiki/win32/TikiTest/</li> <li>tiki/win32/TikiTest_old/</li> <li><a href=3D"#tikiwin32srcsoundcpp">tiki/win32/src/sound.cpp</a></li> <li><a href=3D"#tikiwin32srcstreamcpp">tiki/win32/src/stream.cpp</a></li> </ul> </div> <div id=3D"patch"> <h3>Diff</h3> <a id=3D"tikiwin32srcinit_shutdowncpp"></a> <div class=3D"modfile"><h4>Modified: tiki/win32/src/init_shutdown.cpp (29= 4 =3D> 295)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/win32/src/init_shutdown.cpp 2005-12-22 02:4= 6:29 UTC (rev 294) +++ tiki/win32/src/init_shutdown.cpp 2005-12-23 02:14:28 UTC (rev 295) </span><span class=3D"lines">@@ -23,7 +23,7 @@ </span><span class=3D"cx">=20 </span><span class=3D"cx"> GL::Plxcompat::plx_mat3d_init(640, 480); </span><span class=3D"cx"> Hid::init(); </span><del>-=09 </del><ins>+ </ins><span class=3D"cx"> return true; </span><span class=3D"cx"> } </span><span class=3D"cx">=20 </span><span class=3D"lines">@@ -35,6 +35,11 @@ </span><span class=3D"cx">=20 </span><span class=3D"cx"> timeEndPeriod(1); </span><span class=3D"cx"> } </span><del>- - - </del><ins>+ +void Tiki::setName(const char *name, const char *icon) { + SetWindowText(Tiki::GetWin32Window(), name); +} + +void Tiki::GL::showCursor(bool visible) { + +} </ins></pre></div> <a id=3D"tikiwin32srcplatglcpp"></a> <div class=3D"modfile"><h4>Modified: tiki/win32/src/platgl.cpp (294 =3D> = 295)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/win32/src/platgl.cpp 2005-12-22 02:46:29 UT= C (rev 294) +++ tiki/win32/src/platgl.cpp 2005-12-23 02:14:28 UTC (rev 295) </span><span class=3D"lines">@@ -13,11 +13,11 @@ </span><span class=3D"cx"> #include "Tiki/glhdrs.h" </span><span class=3D"cx"> #include "Tiki/hid.h" </span><span class=3D"cx"> #include "Tiki/tikitime.h" </span><del>-#include "Tiki/gl.h" </del><ins>+#include "Tiki/gl.h" </ins><span class=3D"cx">=20 </span><ins>+#pragma comment(lib, "shell32.lib") </ins><span class=3D"cx"> #pragma comment(lib, "opengl32.lib") </span><span class=3D"cx"> #pragma comment(lib, "glu32.lib") </span><del>-#pragma comment(lib, "glut32.lib") </del><span class=3D"cx">=20 </span><span class=3D"cx"> using namespace Tiki::Hid; </span><span class=3D"cx">=20 </span><span class=3D"lines">@@ -47,7 +47,7 @@ </span><span class=3D"cx"> BOOL ErrorBox(LPCTSTR lpText); </span><span class=3D"cx"> DWORD WINAPI GameThread(void *obj); </span><span class=3D"cx"> void OnSize(WORD cx, WORD cy); </span><del>-} </del><ins>+} </ins><span class=3D"cx">=20 </span><span class=3D"cx"> HWND Tiki::GetWin32Window() </span><span class=3D"cx"> { </span></pre></div> <a id=3D"tikiwin32srcsoundcpp"></a> <div class=3D"delfile"><h4>Deleted: tiki/win32/src/sound.cpp (294 =3D> 29= 5)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/win32/src/sound.cpp 2005-12-22 02:46:29 UTC= (rev 294) +++ tiki/win32/src/sound.cpp 2005-12-23 02:14:28 UTC (rev 295) </span><span class=3D"lines">@@ -1,90 +0,0 @@ </span><del>-/* - Tiki - - sound.cpp - - Copyright (C)2002,2003,2004 Dan Potter - Copyright (C)2005 Cryptic Allusion, LLC -*/ - -#include "pch.h" -#include "Tiki/sound.h" -#include "Tiki/file.h" - -#include <string.h> - -/* - -XXX: just stubs right now - -*/ - -using namespace Tiki::Audio; - -TIKI_OBJECT_NAME(Sound) -TIKI_OBJECT_BEGIN(Object, Sound) -TIKI_OBJECT_END(Sound) - -////////////////////////////////////////////////////////////////////////= ////////////////// - -bool Sound::initGlobal() { - return true; -} - -void Sound::shutdownGlobal() { -} - -void Sound::stop(int ch) { -} - -void Sound::stopAll() { -} - -////////////////////////////////////////////////////////////////////////= ////////////////// - -float Sound::m_default_vol =3D 0.9; - -Sound::Sound(const string & fn) { -} - -Sound::Sound() { -} - -Sound::~Sound() { -} - -bool Sound::loadFromFile(const string & fn) { - return true; -} - -// Set the default volume value -void Sound::setDefaultVolume(float vol) { - m_default_vol =3D vol; -} - =20 -int Sound::play() { - return play(m_default_vol, 0.0); -} - -int Sound::play(float vol) { - return play(vol, 0.0); -} - -int Sound::play(float vol, float pan) { - return -1; -} - -void Sound::play(int ch, float vol, float pan) { -} - - - - - - - - - - - - </del></pre></div> <a id=3D"tikiwin32srcstreamcpp"></a> <div class=3D"delfile"><h4>Deleted: tiki/win32/src/stream.cpp (294 =3D> 2= 95)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/win32/src/stream.cpp 2005-12-22 02:46:29 UT= C (rev 294) +++ tiki/win32/src/stream.cpp 2005-12-23 02:14:28 UTC (rev 295) </span><span class=3D"lines">@@ -1,604 +0,0 @@ </span><del>-/* - Tiki - - stream.cpp - - Copyright (C)2005 Cryptic Allusion, LLC -*/ - -#include "pch.h" -#include "Tiki/stream.h" -#include "Tiki/glhdrs.h" -#include "Tiki/thread.h" - -#include <string.h> - -#include <mmreg.h> -#include <dxerr8.h> -#include <dsound.h> -#include <atlbase.h> -#include <atlcom.h> -#include <atltrace.h> - -#define ASSERT(x) assert(x) -#define VERIFY(x) do { \ - bool r =3D x; \ - ASSERT(r); \ -} while(0) -#define TRACE ATLTRACE - -// Make sure the DirectX libs we need are included in the link. -#pragma comment(lib, "dxerr8.lib") -#pragma comment(lib, "winmm.lib") -#pragma comment(lib, "dsound.lib") -#pragma comment(lib, "dxguid.lib") - -using namespace Tiki::Audio; -using Tiki::Thread::AutoLock; - -/* - -This module will use DirectAudio to stream to the audio -device. It's based loosely on the KOS snd_stream module. - -*/ - -using Stream::W32Guts; - -// Our internal "stuff" class. This actually handles most of t= he implementation. -class Stream::W32Guts { -public: - W32Guts(Stream * p); - virtual ~W32Guts(); - - void start(int channels, int freq); - void stop(); - void pause(); - void resume(); - void setVolume(float vol); - bool isPlaying(); - - // Setup our DirectSound objects - bool dsCreate(); - - // Initialize the primary buffer parameters - bool dsSetupParameters(int channels, int freq); - - // Re-initialize the DirectSound buffer pointers for sound output - bool dsReset(); - - // Thread stub (calls back into the thread method) - static unsigned int __stdcall threadStub(void *param); - void threadProc(); - void threadStart(); - void threadKill(); - void initBuffers(); - void updateBuffers(); - - // Called by initBuffers and updateBuffers to get a fixed amount - // of decoded ogg stream data back. Returns the actual number of - // bytes read. - int readStreamBytes(void *outBuffer, int reqBytes); - - // Our parent obj. - Stream * m_p; - - // Streaming driver variables - int m_lastWritePos; // Last place offset we wrote into the DS buffer - bool m_isPlaying; - - // The stream volume. This lets us set the volume without actually play= ing - // something first. 0..1 - float m_vol; - - enum ThreadCmd { // Thread commands - ThreadNone, // No command - ThreadPlaying, // Playback is in progress - ThreadTerminate // Terminate the thread - }; -volatile ThreadCmd m_thdCmd; - HANDLE m_thdCmdEvent; // Event that we'll trigger when a command is r= eady - HANDLE m_thdHandle; // Handle to the thread itself - - // DirectSound shiznat - CComPtr< IDirectSound8 > m_ds; - CComPtr< IDirectSoundBuffer > m_dsbPrimary, m_dsbSecondary; - - RefPtr<Thread::Mutex> m_mutex; -}; - -W32Guts::W32Guts(Stream * p) { - m_p =3D p; - - m_thdCmd =3D ThreadNone; - m_thdCmdEvent =3D CreateEvent(NULL, FALSE, FALSE, NULL); - m_thdHandle =3D INVALID_HANDLE_VALUE; - m_mutex =3D m_p->m_mutex; - - m_vol =3D 0.8f; - m_isPlaying =3D false; -} - -W32Guts::~W32Guts() { - stop(); - CloseHandle(m_thdCmdEvent); -} - -void W32Guts::start(int freq, int chncount) { - Thread::AutoLock lock(m_mutex); - - VERIFY( dsCreate() ); - VERIFY( dsSetupParameters(chncount, freq) ); - - m_lastWritePos =3D 0; - initBuffers(); - - m_thdCmd =3D ThreadPlaying; - SetEvent(m_thdCmdEvent); -=09 - HRESULT hr; - - hr =3D m_dsbSecondary->SetVolume(DSBVOLUME_MAX); - if (FAILED(hr)) { - DXTRACE_ERR( TEXT("SetVolume"), hr ); - return; - } - - hr =3D m_dsbSecondary->Play(0, 0, DSBPLAY_LOOPING); - if (FAILED(hr)) { - DXTRACE_ERR( TEXT("Play"), hr ); - return; - } - - // Spin here until the playback has actually started - for ( ; ; ) { - // Get the current sound position - DWORD playCursor, writeCursor; - HRESULT hr =3D m_dsbSecondary->GetCurrentPosition(&playCursor, = &writeCursor); - if (FAILED(hr)) { - DXTRACE_ERR(TEXT("GetCurrentPosition"), hr); - m_dsbSecondary->Stop(); - return; - } - - if ( playCursor > 0 ) { - m_isPlaying =3D true; - return; - } - } -} - -void W32Guts::stop() { - Thread::AutoLock lock(m_mutex); - - m_thdCmd =3D ThreadNone; - if (m_dsbSecondary) { - HRESULT hr =3D m_dsbSecondary->Stop(); - if (FAILED(hr)) { - DXTRACE_ERR( TEXT("Stop"), hr ); - } - } - m_isPlaying =3D false; -} - -void W32Guts::pause() { - stop(); -} - -void W32Guts::resume() { - Thread::AutoLock lock(m_mutex); - - m_thdCmd =3D ThreadNone; - if (m_dsbSecondary) { - HRESULT hr =3D m_dsbSecondary->Play(0, 0, DSBPLAY_LOOPING); - if (FAILED(hr)) { - DXTRACE_ERR( TEXT("Play"), hr ); - } - } -} - -void W32Guts::setVolume(float vol) { - Thread::AutoLock lock(m_mutex); - - m_vol =3D vol; - - /* if (m_dsbSecondary) { - HRESULT hr; - - int dxrange =3D (DSBVOLUME_MAX - DSBVOLUME_MIN); - int dxval =3D vol * dxrange / 255; - - hr =3D m_dsbSecondary->SetVolume(dxval); - if (FAILED(hr)) { - DXTRACE_ERR( TEXT("SetVolume"), hr ); - } - } */ -} - -bool W32Guts::isPlaying() { - return m_isPlaying && m_thdCmd =3D=3D ThreadPlaying; -} - -bool W32Guts::dsCreate() { - // If we were already initialized, throw it away and start again. - if (m_ds) { - m_dsbSecondary.Release(); - m_dsbPrimary.Release(); - m_ds.Release(); - } - - // Create an IDirectSound using the primary sound device - HRESULT hr =3D DirectSoundCreate8(NULL, &m_ds, NULL); - if (FAILED(hr)) { - DXTRACE_ERR(TEXT("DirectSoundCreate8"), hr); - return false; - } - - // Set the DirectSound coop level - hr =3D m_ds->SetCooperativeLevel(GetWin32Window(), DSSCL_PRIORITY); - if (FAILED(hr)) { - DXTRACE_ERR(TEXT("SetCooperativeLevel"), hr); - return false; - } - - return true; -} - -bool W32Guts::dsSetupParameters(int channels, int freq) { - // Make sure we're initialized. - ASSERT( m_ds ); - if (!m_ds) - return false; - - // Create the primary buffer. - DSBUFFERDESC dsbd; - memset(&dsbd, 0, sizeof(dsbd)); - dsbd.dwSize =3D sizeof(dsbd); - dsbd.dwFlags =3D DSBCAPS_PRIMARYBUFFER; - dsbd.dwBufferBytes =3D 0; - dsbd.lpwfxFormat =3D NULL; - - m_dsbPrimary =3D NULL; - HRESULT hr =3D m_ds->CreateSoundBuffer(&dsbd, &m_dsbPrimary,= NULL); - if (FAILED(hr)) { - DXTRACE_ERR(TEXT("CreateSoundBuffer"), hr); - return false; - } - - WAVEFORMATEX wfx; - memset(&wfx, 0, sizeof(wfx)); - wfx.wFormatTag =3D WAVE_FORMAT_PCM; - wfx.nChannels =3D channels; - wfx.nSamplesPerSec =3D freq; - wfx.wBitsPerSample =3D 16; - wfx.nBlockAlign =3D wfx.wBitsPerSample / 8 * wfx.nChannels; - wfx.nAvgBytesPerSec =3D wfx.nSamplesPerSec * wfx.nBlockAlign; - - hr =3D m_dsbPrimary->SetFormat(&wfx); - if (FAILED(hr)) { - DXTRACE_ERR(TEXT("SetFormat"), hr); - return false; - } - - // Create the secondary buffer. - memset(&dsbd, 0, sizeof(dsbd)); - dsbd.dwSize =3D sizeof(dsbd); - dsbd.dwFlags =3D DSBCAPS_CTRLPAN | DSBCAPS_CTRLVOLUME | DSBCAPS_CTRLFRE= QUENCY; - // DSBCAPS_CTRLPOSITIONNOTIFY | DSBCAPS_GETCURRENTPOSITION2; - dsbd.dwBufferBytes =3D 65536; - dsbd.lpwfxFormat =3D &wfx; - - m_dsbSecondary =3D NULL; - hr =3D m_ds->CreateSoundBuffer(&dsbd, &m_dsbSecondary, NULL)= ; - if (FAILED(hr)) { - DXTRACE_ERR(TEXT("CreateSoundBuffer"), hr); - return false; - } - - // Set our default volume as well. - setVolume(m_vol); - - return true; -} - -bool W32Guts::dsReset() { - return true; -} - -unsigned int W32Guts::threadStub(void *param) { - ASSERT(param !=3D NULL); - if (param) { - TRACE("OggPlayer::threadStub -- player thread starting\n"); - ((W32Guts*)param)->threadProc(); - TRACE("OggPlayer::threadStub -- player thread stopping\n"); - } - return 0; -} - -void W32Guts::threadProc() { - while (m_thdCmd !=3D ThreadTerminate) { - // Is the song playing? If so, we need to periodically check the - // circular buffer for data. Otherwise, just block until we get a - // command of some sort. - if (m_thdCmd =3D=3D ThreadPlaying) { - // Wait for 50 milliseconds or until we get a command - DWORD result =3D WaitForSingleObject(m_thdCmdEvent, 50); - - // Anything happen? If not, just update our buffers - if (result !=3D WAIT_OBJECT_0) - updateBuffers(); - } else { - WaitForSingleObject(m_thdCmdEvent, INFINITE); - } - } -} - -void W32Guts::threadStart() { - // Setup thread command - m_thdCmd =3D ThreadNone; - - // Create the thread itself - UINT thdid; - m_thdHandle =3D (HANDLE)_beginthreadex(NULL, 0, threadStub, (void *)thi= s, 0, &thdid); - ASSERT( m_thdHandle !=3D INVALID_HANDLE_VALUE ); - if (m_thdHandle =3D=3D INVALID_HANDLE_VALUE) { - TRACE("Stream::threadStart() -- Couldn't create worker thread\n&q= uot;); - return; - } -} - -void W32Guts::threadKill() { - // Shut down the thread - if (m_thdHandle !=3D INVALID_HANDLE_VALUE) { - m_thdCmd =3D ThreadTerminate; - SetEvent(m_thdCmdEvent); - - DWORD result =3D WaitForSingleObject(m_thdHandle, 30000); - if (result !=3D WAIT_OBJECT_0) { - ASSERT( false ); - TRACE("OggPlayer::threadKill() -- couldn't kill thread normally,= slaying brutally\n"); - TerminateThread(m_thdHandle, 0); - } - - CloseHandle(m_thdHandle); - m_thdHandle =3D INVALID_HANDLE_VALUE; - } -} - -void W32Guts::initBuffers() { - // Make sure we're not already playing - ASSERT( m_thdCmd =3D=3D ThreadNone ); - if (m_thdCmd !=3D ThreadNone) - return; - - // Fill half of the secondary buffer so it will be ready to play - // as soon as the user tells us to go. - void * dsBuf[2]; - DWORD dsBufSize[2]; - HRESULT hr =3D m_dsbSecondary->Lock(0, 32768, &dsBuf[0], &ds= BufSize[0], &dsBuf[1], &dsBufSize[1], 0); - if (FAILED(hr)) { - DXTRACE_ERR(TEXT("Lock"), hr); - return; - } - - // XXX This will fail if the stream fails. - int decoded =3D readStreamBytes(dsBuf[0], dsBufSize[0]); - assert( decoded >=3D 0 ); - m_lastWritePos +=3D decoded; - - hr =3D m_dsbSecondary->Unlock(dsBuf[0], dsBufSize[0], dsBuf[1], dsBu= fSize[1]); - if (FAILED(hr)) { - DXTRACE_ERR(TEXT("Unlock"), hr); - return; - } -} - -void W32Guts::updateBuffers() { - Thread::AutoLock lock(m_mutex); - - // Make sure we're still supposed to be playing. Otherwise a race condi= tion can - // happen where stop() is called, but the thread has already sent us of= f to update - // buffers... - if (m_thdCmd !=3D ThreadPlaying) - return; - - // Get the current sound position - DWORD playCursor, writeCursor; - HRESULT hr =3D m_dsbSecondary->GetCurrentPosition(&playCursor, &= amp;writeCursor); - if (FAILED(hr)) { - DXTRACE_ERR(TEXT("GetCurrentPosition"), hr); - return; - } - - // How many samples do we need? - int neededSamples; - if (m_lastWritePos <=3D (int)playCursor) - neededSamples =3D playCursor - m_lastWritePos; - else - neededSamples =3D (65536 + playCursor) - m_lastWritePos; - if (neededSamples < 1024) - return; - - // Lock down the DirectSound buffer so we can access it - void * dsLockedBuffer[2] =3D {NULL}; - DWORD dsLockedBufferSize[2] =3D {0}; - hr =3D m_dsbSecondary->Lock(m_lastWritePos, neededSamples, - &dsLockedBuffer[0], &dsLockedBufferSize[0],=20 - &dsLockedBuffer[1], &dsLockedBufferSize[1], 0); - if (FAILED(hr)) { - DXTRACE_ERR(TEXT("Lock"), hr); - return; - } - - // XXX These will fail if the stream fails. - // Decode some more ogg data - int decoded =3D readStreamBytes(dsLockedBuffer[0], dsLockedBufferSize[0= ]); - m_lastWritePos =3D (m_lastWritePos + decoded) % 65536; - if (dsLockedBuffer[1] && dsLockedBufferSize[1]) { - decoded =3D readStreamBytes(dsLockedBuffer[1], dsLockedBufferSize[1]); - m_lastWritePos =3D (m_lastWritePos + decoded) % 65536; - } - - // Unlock the buffer again - hr =3D m_dsbSecondary->Unlock(dsLockedBuffer[0], dsLockedBufferSize[= 0], - dsLockedBuffer[1], dsLockedBufferSize[1]); - if (FAILED(hr)) { - DXTRACE_ERR(TEXT("Unlock"), hr); - } - - // Did we run out of data? If so, kill the stream. - if (!m_isPlaying && !decoded) { - stop(); - } -} - -int W32Guts::readStreamBytes(void *outBuffer, int reqBytes) { - Thread::AutoLock lock(m_mutex); - - int reqSmp =3D reqBytes / (2 * m_p->m_chnCount); - uint16 * buf =3D (uint16 *)outBuffer; - - Stream::GetDataResult rv =3D m_p->getData(buf, &reqSmp); - switch(rv) { - case Stream::GDEOS: - m_isPlaying =3D false; - /* fallthru */ - case Stream::GDSuccess: - return reqSmp * 2 * m_p->m_chnCount; - case Stream::GDError: - m_isPlaying =3D false; - return -1; - } - - // Never reached... but make damned compiler happy. - assert( false ); - return 0; -} - - - -////////////////////////////////////////////////////////////////////////= //////////////////// - -TIKI_OBJECT_NAME(Stream) -TIKI_OBJECT_BEGIN(Object, Stream) -TIKI_OBJECT_END(Stream) - -bool Stream::initGlobal() { - return true; -} - -void Stream::shutdownGlobal() { -} - -Stream::Stream() { - // Default our members. - m_bufSize =3D 0x10000; - m_chnCount =3D 2; - m_freq =3D 44100; - m_queueing =3D false; -// m_isPlaying =3D false; - m_volume =3D 0.8f; - m_mutex =3D new Thread::Mutex(); - - m_guts =3D new W32Guts(this); -} - -Stream::~Stream() { - destroy(); - delete m_guts; -} - -bool Stream::create() { - m_guts->threadStart(); - return true; -} - -void Stream::destroy() { - if (m_guts) { - stop(); - m_guts->threadKill(); - } -} - -// virtual void filter(int freq, int chncount, void * buffer, int smpcnt= ) { } - -void Stream::filterAdd(Filter * f) { - AutoLock lock(m_mutex); - m_filters.insertTail(f); -} - -void Stream::filterRemove(Filter * f) { - AutoLock lock(m_mutex); - m_filters.del(f); -} - -void Stream::setQueueing(bool isQueued) { - AutoLock lock(m_mutex); - m_queueing =3D isQueued; -} - -void Stream::setFrequency(int freq) { - AutoLock lock(m_mutex); - - m_freq =3D freq; -} - -void Stream::setChannelCount(int chncount) { - AutoLock lock(m_mutex); - - m_chnCount =3D chncount; -} - -void Stream::start() { - AutoLock lock(m_mutex); - m_guts->start(m_freq, m_chnCount); -} - -void Stream::stop() { - AutoLock lock(m_mutex); - m_guts->stop(); -} - -void Stream::pause() { - AutoLock lock(m_mutex); - m_guts->pause(); -} - -void Stream::resume() { - AutoLock lock(m_mutex); - m_guts->resume(); -} - -void Stream::setVolume(float vol) { - AutoLock lock(m_mutex); - m_volume =3D vol; - m_guts->setVolume(vol); -} - -bool Stream::isPlaying() { - AutoLock lock(m_mutex); - return m_guts->isPlaying(); - //m_isPlaying =3D m_guts->isPlaying(); - //return m_isPlaying; -} - - -void Stream::processFilters(void * buffer, int smpcnt) { -} - -Stream::GetDataResult Stream::getData(uint16 * buffer, int * numSamples)= { - return GDError; -} - - - - - - - - - - - - - </del></pre></div> <a id=3D"tikiwin32tikicbp"></a> <div class=3D"addfile"><h4>Added: tiki/win32/tiki.cbp (294 =3D> 295)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/win32/tiki.cbp 2005-12-22 02:46:29 UTC (rev= 294) +++ tiki/win32/tiki.cbp 2005-12-23 02:14:28 UTC (rev 295) </span><span class=3D"lines">@@ -0,0 +1,1389 @@ </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"Tiki"/> + <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\win32\libtiki.a"/>= ; + <Option working_dir=3D""/> + <Option object_output=3D".objs"/> + <Option deps_output=3D".deps"/> + <Option type=3D"2"/> + <Option compiler=3D"1"/> + <Option projectResourceIncludeDirsRelation=3D"2"/> + </Target> + </Build> + <Compiler> + <Add directory=3D"..\include"/> + <Add directory=3D"include"/> + <Add directory=3D"..\3rdparty\libjpeg"/> + <Add directory=3D"..\3rdparty\libogg\include"/> + <Add directory=3D"..\3rdparty\libpng"/> + <Add directory=3D"..\3rdparty\libvorbis\include"/> + <Add directory=3D"..\3rdparty\zlib"/> + <Add directory=3D"C:\Program Files\OpenAL 1.1 SDK\include&quo= t;/> + <Add directory=3D"C:\Program Files\Microsoft DirectX 9.0 SDK = (February 2005)\Include"/> + </Compiler> + <Linker> + <Add directory=3D"C:\Program Files\OpenAL 1.1 SDK\libs\Win32&= quot;/> + <Add directory=3D"C:\Program Files\Microsoft DirectX 9.0 SDK = (February 2005)\Lib\x86"/> + </Linker> + <Unit filename=3D"..\3rdparty\libjpeg\jcapimin.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libjpeg\jcapistd.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libjpeg\jccoefct.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libjpeg\jccolor.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libjpeg\jcdctmgr.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libjpeg\jchuff.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libjpeg\jchuff.h"> + <Option compilerVar=3D""/> + <Option compile=3D"0"/> + <Option link=3D"0"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libjpeg\jcinit.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libjpeg\jcmainct.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libjpeg\jcmarker.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libjpeg\jcmaster.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libjpeg\jcomapi.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libjpeg\jconfig.h"> + <Option compilerVar=3D""/> + <Option compile=3D"0"/> + <Option link=3D"0"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libjpeg\jcparam.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libjpeg\jcphuff.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libjpeg\jcprepct.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libjpeg\jcsample.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libjpeg\jctrans.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libjpeg\jdapimin.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libjpeg\jdapistd.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libjpeg\jdatadst.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libjpeg\jdatasrc.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libjpeg\jdcoefct.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libjpeg\jdcolor.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libjpeg\jdct.h"> + <Option compilerVar=3D""/> + <Option compile=3D"0"/> + <Option link=3D"0"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libjpeg\jddctmgr.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libjpeg\jdhuff.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libjpeg\jdhuff.h"> + <Option compilerVar=3D""/> + <Option compile=3D"0"/> + <Option link=3D"0"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libjpeg\jdinput.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libjpeg\jdmainct.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libjpeg\jdmarker.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libjpeg\jdmaster.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libjpeg\jdmerge.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libjpeg\jdphuff.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libjpeg\jdpostct.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libjpeg\jdsample.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libjpeg\jdtrans.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libjpeg\jerror.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libjpeg\jerror.h"> + <Option compilerVar=3D""/> + <Option compile=3D"0"/> + <Option link=3D"0"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libjpeg\jfdctflt.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libjpeg\jfdctfst.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libjpeg\jfdctint.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libjpeg\jidctflt.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libjpeg\jidctfst.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libjpeg\jidctint.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libjpeg\jidctred.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libjpeg\jinclude.h"> + <Option compilerVar=3D""/> + <Option compile=3D"0"/> + <Option link=3D"0"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libjpeg\jmemmgr.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libjpeg\jmemnobs.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libjpeg\jmemsys.h"> + <Option compilerVar=3D""/> + <Option compile=3D"0"/> + <Option link=3D"0"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libjpeg\jmorecfg.h"> + <Option compilerVar=3D""/> + <Option compile=3D"0"/> + <Option link=3D"0"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libjpeg\jpegint.h"> + <Option compilerVar=3D""/> + <Option compile=3D"0"/> + <Option link=3D"0"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libjpeg\jpeglib.h"> + <Option compilerVar=3D""/> + <Option compile=3D"0"/> + <Option link=3D"0"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libjpeg\jquant1.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libjpeg\jquant2.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libjpeg\jutils.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libjpeg\jversion.h"> + <Option compilerVar=3D""/> + <Option compile=3D"0"/> + <Option link=3D"0"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libogg\include\ogg\ogg.h"&g= t; + <Option compilerVar=3D""/> + <Option compile=3D"0"/> + <Option link=3D"0"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libogg\include\ogg\os_types.h&qu= ot;> + <Option compilerVar=3D""/> + <Option compile=3D"0"/> + <Option link=3D"0"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libogg\src\bitwise.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libogg\src\framing.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libpng\png.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libpng\png.h"> + <Option compilerVar=3D""/> + <Option compile=3D"0"/> + <Option link=3D"0"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libpng\pngconf.h"> + <Option compilerVar=3D""/> + <Option compile=3D"0"/> + <Option link=3D"0"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libpng\pngerror.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libpng\pnggccrd.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libpng\pngget.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libpng\pngmem.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libpng\pngpread.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libpng\pngread.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libpng\pngrio.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libpng\pngrtran.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libpng\pngrutil.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libpng\pngset.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libpng\pngtrans.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libpng\pngvcrd.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libpng\pngwio.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libpng\pngwrite.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libpng\pngwtran.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libpng\pngwutil.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libvorbis\include\vorbis\codec.h= "> + <Option compilerVar=3D""/> + <Option compile=3D"0"/> + <Option link=3D"0"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libvorbis\include\vorbis\vorbise= nc.h"> + <Option compilerVar=3D""/> + <Option compile=3D"0"/> + <Option link=3D"0"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libvorbis\include\vorbis\vorbisf= ile.h"> + <Option compilerVar=3D""/> + <Option compile=3D"0"/> + <Option link=3D"0"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libvorbis\lib\analysis.c"&g= t; + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libvorbis\lib\backends.h"&g= t; + <Option compilerVar=3D""/> + <Option compile=3D"0"/> + <Option link=3D"0"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libvorbis\lib\barkmel.c">= ; + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libvorbis\lib\bitrate.c">= ; + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libvorbis\lib\bitrate.h">= ; + <Option compilerVar=3D""/> + <Option compile=3D"0"/> + <Option link=3D"0"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libvorbis\lib\block.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libvorbis\lib\books\coupled\res_= books_stereo.h"> + <Option compilerVar=3D""/> + <Option compile=3D"0"/> + <Option link=3D"0"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libvorbis\lib\books\floor\floor_= books.h"> + <Option compilerVar=3D""/> + <Option compile=3D"0"/> + <Option link=3D"0"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libvorbis\lib\books\uncoupled\re= s_books_uncoupled.h"> + <Option compilerVar=3D""/> + <Option compile=3D"0"/> + <Option link=3D"0"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libvorbis\lib\codebook.c"&g= t; + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libvorbis\lib\codebook.h"&g= t; + <Option compilerVar=3D""/> + <Option compile=3D"0"/> + <Option link=3D"0"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libvorbis\lib\codec_internal.h&q= uot;> + <Option compilerVar=3D""/> + <Option compile=3D"0"/> + <Option link=3D"0"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libvorbis\lib\envelope.c"&g= t; + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libvorbis\lib\envelope.h"&g= t; + <Option compilerVar=3D""/> + <Option compile=3D"0"/> + <Option link=3D"0"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libvorbis\lib\floor0.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libvorbis\lib\floor1.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libvorbis\lib\highlevel.h"&= gt; + <Option compilerVar=3D""/> + <Option compile=3D"0"/> + <Option link=3D"0"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libvorbis\lib\info.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libvorbis\lib\lookup.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libvorbis\lib\lookup.h"> + <Option compilerVar=3D""/> + <Option compile=3D"0"/> + <Option link=3D"0"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libvorbis\lib\lookup_data.h"= ;> + <Option compilerVar=3D""/> + <Option compile=3D"0"/> + <Option link=3D"0"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libvorbis\lib\lpc.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libvorbis\lib\lpc.h"> + <Option compilerVar=3D""/> + <Option compile=3D"0"/> + <Option link=3D"0"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libvorbis\lib\lsp.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libvorbis\lib\lsp.h"> + <Option compilerVar=3D""/> + <Option compile=3D"0"/> + <Option link=3D"0"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libvorbis\lib\mapping0.c"&g= t; + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libvorbis\lib\masking.h">= ; + <Option compilerVar=3D""/> + <Option compile=3D"0"/> + <Option link=3D"0"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libvorbis\lib\mdct.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libvorbis\lib\mdct.h"> + <Option compilerVar=3D""/> + <Option compile=3D"0"/> + <Option link=3D"0"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libvorbis\lib\misc.h"> + <Option compilerVar=3D""/> + <Option compile=3D"0"/> + <Option link=3D"0"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libvorbis\lib\modes\floor_all.h&= quot;> + <Option compilerVar=3D""/> + <Option compile=3D"0"/> + <Option link=3D"0"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libvorbis\lib\modes\psych_11.h&q= uot;> + <Option compilerVar=3D""/> + <Option compile=3D"0"/> + <Option link=3D"0"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libvorbis\lib\modes\psych_16.h&q= uot;> + <Option compilerVar=3D""/> + <Option compile=3D"0"/> + <Option link=3D"0"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libvorbis\lib\modes\psych_44.h&q= uot;> + <Option compilerVar=3D""/> + <Option compile=3D"0"/> + <Option link=3D"0"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libvorbis\lib\modes\psych_8.h&qu= ot;> + <Option compilerVar=3D""/> + <Option compile=3D"0"/> + <Option link=3D"0"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libvorbis\lib\modes\residue_16.h= "> + <Option compilerVar=3D""/> + <Option compile=3D"0"/> + <Option link=3D"0"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libvorbis\lib\modes\residue_44.h= "> + <Option compilerVar=3D""/> + <Option compile=3D"0"/> + <Option link=3D"0"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libvorbis\lib\modes\residue_44u.= h"> + <Option compilerVar=3D""/> + <Option compile=3D"0"/> + <Option link=3D"0"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libvorbis\lib\modes\residue_8.h&= quot;> + <Option compilerVar=3D""/> + <Option compile=3D"0"/> + <Option link=3D"0"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libvorbis\lib\modes\setup_11.h&q= uot;> + <Option compilerVar=3D""/> + <Option compile=3D"0"/> + <Option link=3D"0"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libvorbis\lib\modes\setup_16.h&q= uot;> + <Option compilerVar=3D""/> + <Option compile=3D"0"/> + <Option link=3D"0"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libvorbis\lib\modes\setup_22.h&q= uot;> + <Option compilerVar=3D""/> + <Option compile=3D"0"/> + <Option link=3D"0"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libvorbis\lib\modes\setup_32.h&q= uot;> + <Option compilerVar=3D""/> + <Option compile=3D"0"/> + <Option link=3D"0"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libvorbis\lib\modes\setup_44.h&q= uot;> + <Option compilerVar=3D""/> + <Option compile=3D"0"/> + <Option link=3D"0"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libvorbis\lib\modes\setup_44u.h&= quot;> + <Option compilerVar=3D""/> + <Option compile=3D"0"/> + <Option link=3D"0"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libvorbis\lib\modes\setup_8.h&qu= ot;> + <Option compilerVar=3D""/> + <Option compile=3D"0"/> + <Option link=3D"0"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libvorbis\lib\modes\setup_X.h&qu= ot;> + <Option compilerVar=3D""/> + <Option compile=3D"0"/> + <Option link=3D"0"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libvorbis\lib\os.h"> + <Option compilerVar=3D""/> + <Option compile=3D"0"/> + <Option link=3D"0"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libvorbis\lib\psy.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libvorbis\lib\psy.h"> + <Option compilerVar=3D""/> + <Option compile=3D"0"/> + <Option link=3D"0"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libvorbis\lib\registry.c"&g= t; + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libvorbis\lib\registry.h"&g= t; + <Option compilerVar=3D""/> + <Option compile=3D"0"/> + <Option link=3D"0"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libvorbis\lib\res0.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libvorbis\lib\scales.h"> + <Option compilerVar=3D""/> + <Option compile=3D"0"/> + <Option link=3D"0"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libvorbis\lib\sharedbook.c"= > + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libvorbis\lib\smallft.c">= ; + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libvorbis\lib\smallft.h">= ; + <Option compilerVar=3D""/> + <Option compile=3D"0"/> + <Option link=3D"0"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libvorbis\lib\synthesis.c"&= gt; + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libvorbis\lib\vorbisenc.c"&= gt; + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libvorbis\lib\vorbisfile.c"= > + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libvorbis\lib\window.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\libvorbis\lib\window.h"> + <Option compilerVar=3D""/> + <Option compile=3D"0"/> + <Option link=3D"0"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\zlib\adler32.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\zlib\compress.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\zlib\crc32.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\zlib\crc32.h"> + <Option compilerVar=3D""/> + <Option compile=3D"0"/> + <Option link=3D"0"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\zlib\deflate.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\zlib\deflate.h"> + <Option compilerVar=3D""/> + <Option compile=3D"0"/> + <Option link=3D"0"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\zlib\gzio.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\zlib\infback.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\zlib\inffast.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\zlib\inffast.h"> + <Option compilerVar=3D""/> + <Option compile=3D"0"/> + <Option link=3D"0"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\zlib\inffixed.h"> + <Option compilerVar=3D""/> + <Option compile=3D"0"/> + <Option link=3D"0"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\zlib\inflate.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\zlib\inflate.h"> + <Option compilerVar=3D""/> + <Option compile=3D"0"/> + <Option link=3D"0"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\zlib\inftrees.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\zlib\inftrees.h"> + <Option compilerVar=3D""/> + <Option compile=3D"0"/> + <Option link=3D"0"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\zlib\trees.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\zlib\trees.h"> + <Option compilerVar=3D""/> + <Option compile=3D"0"/> + <Option link=3D"0"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\zlib\uncompr.c"> + <Option compilerVar=3D"CC"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\zlib\zconf.h"> + <Option compilerVar=3D""/> + <Option compile=3D"0"/> + <Option link=3D"0"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\zlib\zlib.h"> + <Option compilerVar=3D""/> + <Option compile=3D"0"/> + <Option link=3D"0"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"..\3rdparty\zlib\zut... [truncated message content] |
|
From: <cad...@li...> - 2005-12-22 02:55:51
|
<!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>[294] tiki/src/gl: Tiki: genmenu: pass along the time since the la= st frame to drawables</title> </head> <body> <div id=3D"msg"> <dl> <dt>Revision</dt> <dd>294</dd> <dt>Author</dt> <dd>sam.steele</dd> <dt>Date</dt> <dd>2005-12-21 18:46:29 -0800 (Wed, 21 Dec 2005)</dd> </dl> <h3>Log Message</h3> <pre>Tiki: genmenu: pass along the time since the last frame to drawables= </pre> <h3>Modified Paths</h3> <ul> <li><a href=3D"#tikiincludeTikigenmenuh">tiki/include/Tiki/genmenu.h</a><= /li> <li><a href=3D"#tikisrcglgenmenucpp">tiki/src/gl/genmenu.cpp</a></li> </ul> </div> <div id=3D"patch"> <h3>Diff</h3> <a id=3D"tikiincludeTikigenmenuh"></a> <div class=3D"modfile"><h4>Modified: tiki/include/Tiki/genmenu.h (293 =3D= > 294)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/include/Tiki/genmenu.h 2005-12-22 02:45:21 = UTC (rev 293) +++ tiki/include/Tiki/genmenu.h 2005-12-22 02:46:29 UTC (rev 294) </span><span class=3D"lines">@@ -130,6 +130,12 @@ </span><span class=3D"cx"> =09 </span><span class=3D"cx"> // Our background stream, if we have on. </span><span class=3D"cx"> RefPtr<Audio::VorbisStream> m_bgm; </span><ins>+=09 + // The time at which we started + uint64 m_startTime; +=09 + // The time of the last frame rendered + uint64 m_lastTime; </ins><span class=3D"cx"> }; </span><span class=3D"cx">=20 </span><span class=3D"cx"> } </span></pre></div> <a id=3D"tikisrcglgenmenucpp"></a> <div class=3D"modfile"><h4>Modified: tiki/src/gl/genmenu.cpp (293 =3D> 29= 4)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/src/gl/genmenu.cpp 2005-12-22 02:45:21 UTC = (rev 293) +++ tiki/src/gl/genmenu.cpp 2005-12-22 02:46:29 UTC (rev 294) </span><span class=3D"lines">@@ -55,6 +55,8 @@ </span><span class=3D"cx"> m_scene =3D new Layer(); </span><span class=3D"cx">=20 </span><span class=3D"cx"> m_postDelay =3D 0; </span><ins>+=09 + m_startTime=3Dm_lastTime=3DTime::gettime(); </ins><span class=3D"cx"> } </span><span class=3D"cx">=20 </span><span class=3D"cx"> GenericMenu::~GenericMenu() { </span><span class=3D"lines">@@ -123,6 +125,8 @@ </span><span class=3D"cx"> } </span><span class=3D"cx">=20 </span><span class=3D"cx"> void GenericMenu::visualPerFrame() { </span><ins>+ uint64 frameTime=3DTime::gettime(); +=09 </ins><span class=3D"cx"> m_scene->subRemoveFinished(); </span><span class=3D"cx"> m_scene->createSceneList(); </span><span class=3D"cx">=20 </span><span class=3D"lines">@@ -142,7 +146,8 @@ </span><span class=3D"cx"> =09 </span><span class=3D"cx"> m_scene->destroySceneList(); </span><span class=3D"cx">=20 </span><del>- m_scene->nextFrame(0); </del><ins>+ m_scene->nextFrame(frameTime-m_lastTime); + m_lastTime=3DframeTime; </ins><span class=3D"cx"> } </span><span class=3D"cx">=20 </span><span class=3D"cx"> void GenericMenu::visualOpaqueList() { </span></pre> </div> </div> </body> </html> |
|
From: <cad...@li...> - 2005-12-22 02:54:28
|
<!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>[293] tiki/include/Tiki/hid.h: Tiki: Move port before key in decla= ration so g++ stops complaining</title> </head> <body> <div id=3D"msg"> <dl> <dt>Revision</dt> <dd>293</dd> <dt>Author</dt> <dd>sam.steele</dd> <dt>Date</dt> <dd>2005-12-21 18:45:21 -0800 (Wed, 21 Dec 2005)</dd> </dl> <h3>Log Message</h3> <pre>Tiki: Move port before key in declaration so g++ stops complaining</= pre> <h3>Modified Paths</h3> <ul> <li><a href=3D"#tikiincludeTikihidh">tiki/include/Tiki/hid.h</a></li> </ul> </div> <div id=3D"patch"> <h3>Diff</h3> <a id=3D"tikiincludeTikihidh"></a> <div class=3D"modfile"><h4>Modified: tiki/include/Tiki/hid.h (292 =3D> 29= 3)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/include/Tiki/hid.h 2005-12-22 01:25:42 UTC = (rev 292) +++ tiki/include/Tiki/hid.h 2005-12-22 02:45:21 UTC (rev 293) </span><span class=3D"lines">@@ -117,13 +117,13 @@ </span><span class=3D"cx"> Type type; // All: the type of event </span><span class=3D"cx"> RefPtr<Device> dev; // All: the device= that caused the event </span><span class=3D"cx"> uint64 tm; // All: the time of the event </span><ins>+ int port; // Joystick: Which port the event occured on </ins><span class=3D"cx"> int key; // Keypress </span><span class=3D"cx"> int btn; // Btnpress: which button </span><span class=3D"cx"> int axis; // Axis: which axis </span><span class=3D"cx"> float axisValue; // Axis: the new value </span><span class=3D"cx"> int userCode; // User: what is the event? </span><span class=3D"cx"> int x, y; // MouseMove: x,y position </span><del>- int port; // Joystick: Which port the event occured on </del><span class=3D"cx"> }; </span><span class=3D"cx">=20 </span><span class=3D"cx"> // If the app wants to receive event notificat= ions, it should call this </span></pre> </div> </div> </body> </html> |
|
From: <cad...@li...> - 2005-12-22 01:35:28
|
<!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>[292] tiki/win32/src/platgl.cpp: Adding support for parsing comman= d line arguments and passing down to tiki_main</title> </head> <body> <div id=3D"msg"> <dl> <dt>Revision</dt> <dd>292</dd> <dt>Author</dt> <dd>atani</dd> <dt>Date</dt> <dd>2005-12-21 17:25:42 -0800 (Wed, 21 Dec 2005)</dd> </dl> <h3>Log Message</h3> <pre>Adding support for parsing command line arguments and passing down t= o tiki_main</pre> <h3>Modified Paths</h3> <ul> <li><a href=3D"#tikiwin32srcplatglcpp">tiki/win32/src/platgl.cpp</a></li> </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 (291 =3D> = 292)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/win32/src/platgl.cpp 2005-12-22 01:23:42 UT= C (rev 291) +++ tiki/win32/src/platgl.cpp 2005-12-22 01:25:42 UTC (rev 292) </span><span class=3D"lines">@@ -97,7 +97,7 @@ </span><span class=3D"cx">=20 </span><span class=3D"cx"> ShowWindow(m_hWndMain, nCmdShow); </span><span class=3D"cx">=20 </span><del>- m_hThread =3D CreateThread(NULL, 0, GameThread, NULL, 0, &a= mp;m_dwThreadID); </del><ins>+ m_hThread =3D CreateThread(NULL, 0, GameThread, lpCmdLine, 0= , &m_dwThreadID); </ins><span class=3D"cx">=20 </span><span class=3D"cx"> while(GetMessage(&msg, NULL, 0, 0)) </span><span class=3D"cx"> { </span><span class=3D"lines">@@ -197,7 +197,7 @@ </span><span class=3D"cx"> } else { </span><span class=3D"cx"> Debug::printf("WARNING! wglSwapInterval= EXT is NULL\n"); </span><span class=3D"cx"> } </span><del>-=09 </del><ins>+ </ins><span class=3D"cx"> // Turn off the context and release the DC. </span><span class=3D"cx"> wglMakeCurrent(NULL, NULL); </span><span class=3D"cx"> ReleaseDC(m_hWndMain, hdc); </span><span class=3D"lines">@@ -226,14 +226,38 @@ </span><span class=3D"cx">=20 </span><span class=3D"cx"> DWORD WINAPI Tiki::GameThread(void *obj) </span><span class=3D"cx"> { </span><del>- Debug::printf( "GameThread beginning\n" ); </del><ins>+ Debug::printf( "GameThread beginning\n" ); </ins><span class=3D"cx">=20 </span><span class=3D"cx"> // Set up our GL context so that texture load= ing and such works as well. </span><span class=3D"cx"> m_hThreadDc =3D GetDC(m_hWndMain); </span><span class=3D"cx"> wglMakeCurrent(m_hThreadDc, m_hrc); </span><ins>+ + 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) + { + 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); </ins><span class=3D"cx">=20 </span><del>- // This will dump us down into user code. - tiki_main(0, NULL); </del><ins>+ tiki_main(argc, argv); + + // cleanup allocated memory for cmd line args + for(int i =3D 0; i < argc; i++) + { + delete [] argv[i]; + } + delete [] argv; + } + else + { + tiki_main(0, NULL); + } </ins><span class=3D"cx">=20 </span><span class=3D"cx"> ReleaseDC(m_hWndMain, m_hThreadDc); </span><span class=3D"cx"> m_hThreadDc =3D NULL; </span></pre> </div> </div> </body> </html> |
|
From: <cad...@li...> - 2005-12-22 01:33:28
|
<!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>[291] tiki/win32/include: General cleanup, added shellapi.h to pch= , for upcoming commit (command line args to tiki_main)</title> </head> <body> <div id=3D"msg"> <dl> <dt>Revision</dt> <dd>291</dd> <dt>Author</dt> <dd>atani</dd> <dt>Date</dt> <dd>2005-12-21 17:23:42 -0800 (Wed, 21 Dec 2005)</dd> </dl> <h3>Log Message</h3> <pre>General cleanup, added shellapi.h to pch, for upcoming commit (comma= nd line args to tiki_main)</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> </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 (29= 0 =3D> 291)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/win32/include/Tiki/glhdrs.h 2005-12-22 01:2= 1:57 UTC (rev 290) +++ tiki/win32/include/Tiki/glhdrs.h 2005-12-22 01:23:42 UTC (rev 291) </span><span class=3D"lines">@@ -1,31 +1,7 @@ </span><span class=3D"cx"> #pragma once </span><span class=3D"cx">=20 </span><del>-// #include <windows.h> </del><ins>+#include <windows.h> </ins><span class=3D"cx">=20 </span><del>-// We define these manually to avoid the massive namespace c= orruption -// that will result from including windows.h :( - -/* #ifndef APIENTRY - -#define APIENTRY -#if (defined(_M_IX86) || defined(_M_IA64) || defined(_M_AMD64)) &&am= p; !defined(MIDL_PASS) -#define DECLSPEC_IMPORT __declspec(dllimport) -#else -#define DECLSPEC_IMPORT -#endif -#if !defined(_GDI32_) -#define WINGDIAPI DECLSPEC_IMPORT -#else -#define WINGDIAPI -#endif - -#define CALLBACK __stdcall - -#endif */ - - -#include <windows.h> - </del><span class=3D"cx"> #include <GL/gl.h> </span><span class=3D"cx"> #include <GL/glu.h> </span><span class=3D"cx">=20 </span></pre></div> <a id=3D"tikiwin32includepchh"></a> <div class=3D"modfile"><h4>Modified: tiki/win32/include/pch.h (290 =3D> 2= 91)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/win32/include/pch.h 2005-12-22 01:21:57 UTC= (rev 290) +++ tiki/win32/include/pch.h 2005-12-22 01:23:42 UTC (rev 291) </span><span class=3D"lines">@@ -11,7 +11,8 @@ </span><span class=3D"cx"> #define VC_EXTRALEAN // Exclude rarely-used s= tuff from Windows headers </span><span class=3D"cx"> #endif </span><span class=3D"cx">=20 </span><del>-#include <windows.h> </del><ins>+#include <windows.h> +#include <shellapi.h> </ins><span class=3D"cx">=20 </span><span class=3D"cx"> #define _USE_MATH_DEFINES </span><span class=3D"cx"> #include <math.h> </span></pre> </div> </div> </body> </html> |
|
From: <cad...@li...> - 2005-12-22 01:31:34
|
<!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>[290] tiki/3rdparty/libjpeg/jconfig.h: check for _WIN32 not __WIN3= 2</title> </head> <body> <div id=3D"msg"> <dl> <dt>Revision</dt> <dd>290</dd> <dt>Author</dt> <dd>atani</dd> <dt>Date</dt> <dd>2005-12-21 17:21:57 -0800 (Wed, 21 Dec 2005)</dd> </dl> <h3>Log Message</h3> <pre>check for _WIN32 not __WIN32</pre> <h3>Modified Paths</h3> <ul> <li><a href=3D"#tiki3rdpartylibjpegjconfigh">tiki/3rdparty/libjpeg/jconfi= g.h</a></li> </ul> </div> <div id=3D"patch"> <h3>Diff</h3> <a id=3D"tiki3rdpartylibjpegjconfigh"></a> <div class=3D"modfile"><h4>Modified: tiki/3rdparty/libjpeg/jconfig.h (289= =3D> 290)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/3rdparty/libjpeg/jconfig.h 2005-12-18 20:04= :08 UTC (rev 289) +++ tiki/3rdparty/libjpeg/jconfig.h 2005-12-22 01:21:57 UTC (rev 290) </span><span class=3D"lines">@@ -1,7 +1,7 @@ </span><span class=3D"cx"> /* jconfig.vc --- jconfig.h for Microsoft Visu= al C++ on Windows 95 or NT. */ </span><span class=3D"cx"> /* see jconfig.doc for explanations */ </span><span class=3D"cx">=20 </span><del>-#ifdef __WIN32 </del><ins>+#ifdef _WIN32 </ins><span class=3D"cx"> #include <windows.h> </span><span class=3D"cx"> #else </span><span class=3D"cx"> #define FAR </span></pre> </div> </div> </body> </html> |
<!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>[289] kos/kernel/arch/dreamcast/fs/fs_iso9660.c: KOS: fs_iso9660: = fill in dirent.attr for directories, and apply Christian Grossler's patch= for opening correct filenames</title> </head> <body> <div id=3D"msg"> <dl> <dt>Revision</dt> <dd>289</dd> <dt>Author</dt> <dd>sam.steele</dd> <dt>Date</dt> <dd>2005-12-18 12:04:08 -0800 (Sun, 18 Dec 2005)</dd> </dl> <h3>Log Message</h3> <pre>KOS: fs_iso9660: fill in dirent.attr for directories, and apply Chri= stian Grossler's patch for opening correct filenames</pre> <h3>Modified Paths</h3> <ul> <li><a href=3D"#koskernelarchdreamcastfsfs_iso9660c">kos/kernel/arch/drea= mcast/fs/fs_iso9660.c</a></li> </ul> </div> <div id=3D"patch"> <h3>Diff</h3> <a id=3D"koskernelarchdreamcastfsfs_iso9660c"></a> <div class=3D"modfile"><h4>Modified: kos/kernel/arch/dreamcast/fs/fs_iso9= 660.c (288 =3D> 289)</h4> <pre class=3D"diff"> <span class=3D"info">--- kos/kernel/arch/dreamcast/fs/fs_iso9660.c 2005-1= 2-18 20:00:05 UTC (rev 288) +++ kos/kernel/arch/dreamcast/fs/fs_iso9660.c 2005-12-18 20:04:08 UTC (re= v 289) </span><span class=3D"lines">@@ -455,7 +455,7 @@ </span><span class=3D"cx"> else </span><span class=3D"cx"> fnlen =3D strlen(fn); </span><span class=3D"cx"> =09 </span><del>- if (!strnicmp(rrname, fn, fnlen)) { </del><ins>+ if (!strnicmp(rrname, fn, fnlen) && ! *(rrname += fnlen)) { </ins><span class=3D"cx"> if (!((dir << 1) ^ de->flags)) </span><span class=3D"cx"> return de; </span><span class=3D"cx"> } </span><span class=3D"lines">@@ -793,11 +793,14 @@ </span><span class=3D"cx"> } </span><span class=3D"cx"> } </span><span class=3D"cx">=20 </span><del>- if (de->flags & 2) </del><ins>+ if (de->flags & 2) { </ins><span class=3D"cx"> fh[fd].dirent.size =3D -1; </span><del>- else </del><ins>+ fh[fd].dirent.attr =3D O_DIR; + } else { </ins><span class=3D"cx"> fh[fd].dirent.size =3D iso_733(de->size); </span><del>-=09 </del><ins>+ fh[fd].dirent.attr =3D 0; + } + </ins><span class=3D"cx"> fh[fd].ptr +=3D de->length; </span><span class=3D"cx"> =09 </span><span class=3D"cx"> return &fh[fd].dirent; </span></pre> </div> </div> </body> </html> |
|
From: <cad...@li...> - 2005-12-18 21:17:59
|
<!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>[288] kos/utils/makejitter/Makefile: KOS: adjust makejitter Makefi= le so it can find the kos-ports headers</title> </head> <body> <div id=3D"msg"> <dl> <dt>Revision</dt> <dd>288</dd> <dt>Author</dt> <dd>sam.steele</dd> <dt>Date</dt> <dd>2005-12-18 12:00:05 -0800 (Sun, 18 Dec 2005)</dd> </dl> <h3>Log Message</h3> <pre>KOS: adjust makejitter Makefile so it can find the kos-ports headers= </pre> <h3>Modified Paths</h3> <ul> <li><a href=3D"#kosutilsmakejitterMakefile">kos/utils/makejitter/Makefile= </a></li> </ul> </div> <div id=3D"patch"> <h3>Diff</h3> <a id=3D"kosutilsmakejitterMakefile"></a> <div class=3D"modfile"><h4>Modified: kos/utils/makejitter/Makefile (287 =3D= > 288)</h4> <pre class=3D"diff"> <span class=3D"info">--- kos/utils/makejitter/Makefile 2005-11-29 22:33:3= 0 UTC (rev 287) +++ kos/utils/makejitter/Makefile 2005-12-18 20:00:05 UTC (rev 288) </span><span class=3D"lines">@@ -1,6 +1,6 @@ </span><span class=3D"cx"> all: makejitter </span><span class=3D"cx">=20 </span><del>-CFLAGS =3D -O2 -Wall -I../../include #-g# </del><ins>+CFLAGS =3D -O2 -Wall -I../../../kos-ports/include #-g# </ins><span class=3D"cx">=20 </span><span class=3D"cx"> makejitter: makejitter.o </span><span class=3D"cx">=20 </span></pre> </div> </div> </body> </html> |
|
From: Sam S. <sam...@gm...> - 2005-11-30 00:00:39
|
The Mac could probably use this, too. I've traced the startup- related crashes to the OpenAL library (at least, that's what the debugger's stack trace says -- the new debug on crash in XCode 2.2 is cool :) ) On Nov 29, 2005, at 5:33 PM, cadcdev-svn- co...@li... wrote: > If we fail to init OpenAL, ingore further OpenAL init calls and > allow the app to start without sound. |
|
From: <cad...@li...> - 2005-11-29 22:42: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"><!-- #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>[287] tiki/sdl/src/init_shutdown.cpp: If we fail to init OpenAL, i= ngore further OpenAL init calls and allow the app to start without sound.= </title> </head> <body> <div id=3D"msg"> <dl> <dt>Revision</dt> <dd>287</dd> <dt>Author</dt> <dd>atani</dd> <dt>Date</dt> <dd>2005-11-29 14:33:30 -0800 (Tue, 29 Nov 2005)</dd> </dl> <h3>Log Message</h3> <pre>If we fail to init OpenAL, ingore further OpenAL init calls and allo= w the app to start without sound.</pre> <h3>Modified Paths</h3> <ul> <li><a href=3D"#tikisdlsrcinit_shutdowncpp">tiki/sdl/src/init_shutdown.cp= p</a></li> </ul> </div> <div id=3D"patch"> <h3>Diff</h3> <a id=3D"tikisdlsrcinit_shutdowncpp"></a> <div class=3D"modfile"><h4>Modified: tiki/sdl/src/init_shutdown.cpp (286 = =3D> 287)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/sdl/src/init_shutdown.cpp 2005-11-28 09:07:= 26 UTC (rev 286) +++ tiki/sdl/src/init_shutdown.cpp 2005-11-29 22:33:30 UTC (rev 287) </span><span class=3D"lines">@@ -31,20 +31,23 @@ </span><span class=3D"cx"> dev =3D alcOpenDevice("sdl"); </span><span class=3D"cx"> if(dev =3D=3D NULL) </span><span class=3D"cx"> { </span><del>- fprintf(stderr, "alcOpenDevice returned NULL: %s\n&qu= ot;, alGetError()); - return false; </del><ins>+ fprintf(stderr, "Unable to initialize OpenAL: %s\n&quo= t;, alGetError()); </ins><span class=3D"cx"> } </span><del>- context =3D alcCreateContext(dev, NULL); - if(context =3D=3D NULL) </del><ins>+ else </ins><span class=3D"cx"> { </span><del>- fprintf(stderr, "alcCreateContext returned NULL: %s\n= ", alGetError()); - return false; </del><ins>+ context =3D alcCreateContext(dev, NULL); + if(context =3D=3D NULL) + { + fprintf(stderr, "alcCreateContext returned NULL: %s\n", alG= etError()); + } + else + { + alcMakeContextCurrent(context); + alutInitWithoutContext(&argc, argv); + Audio::Sound::initGlobal(); + Audio::Stream::initGlobal(); + } </ins><span class=3D"cx"> } </span><del>- alcMakeContextCurrent(context); - alutInitWithoutContext(&argc, argv); - - Audio::Sound::initGlobal(); - Audio::Stream::initGlobal(); </del><span class=3D"cx"> GL::Plxcompat::plx_mat3d_init(640, 480); </span><span class=3D"cx"> return Hid::init(); </span><span class=3D"cx"> } </span></pre> </div> </div> </body> </html> |
|
From: <cad...@li...> - 2005-11-28 09:15:43
|
<!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>[286] kos-ports/libparallax/src/font.c: KOS: libparallax: Apply Ji= m Ursetto's patch for antialiased fonts</title> </head> <body> <div id=3D"msg"> <dl> <dt>Revision</dt> <dd>286</dd> <dt>Author</dt> <dd>sam.steele</dd> <dt>Date</dt> <dd>2005-11-28 01:07:26 -0800 (Mon, 28 Nov 2005)</dd> </dl> <h3>Log Message</h3> <pre>KOS: libparallax: Apply Jim Ursetto's patch for antialiased fonts</p= re> <h3>Modified Paths</h3> <ul> <li><a href=3D"#kosportslibparallaxsrcfontc">kos-ports/libparallax/src/fo= nt.c</a></li> </ul> </div> <div id=3D"patch"> <h3>Diff</h3> <a id=3D"kosportslibparallaxsrcfontc"></a> <div class=3D"modfile"><h4>Modified: kos-ports/libparallax/src/font.c (28= 5 =3D> 286)</h4> <pre class=3D"diff"> <span class=3D"info">--- kos-ports/libparallax/src/font.c 2005-11-27 23:0= 9:06 UTC (rev 285) +++ kos-ports/libparallax/src/font.c 2005-11-28 09:07:26 UTC (rev 286) </span><span class=3D"lines">@@ -135,7 +135,7 @@ </span><span class=3D"cx"> hdr.max_ascent, hdr.max_descent, hdr.glyph_c= nt); */ </span><span class=3D"cx">=20 </span><span class=3D"cx"> /* Make sure we can allocate texture space fo= r it */ </span><del>- fnt->txr =3D plx_txr_canvas(hdr.txr_width, hdr.txr_heigh= t, PVR_TXRFMT_ARGB1555); </del><ins>+ fnt->txr =3D plx_txr_canvas(hdr.txr_width, hdr.txr_height= , PVR_TXRFMT_ARGB4444); </ins><span class=3D"cx"> if (fnt->txr =3D=3D NULL) { </span><span class=3D"cx"> dbglog(DBG_WARNING, "plx_font_load: can= 't allocate texture for '%s'\n", fn); </span><span class=3D"cx"> goto fail_2; /* bail */ </span><span class=3D"lines">@@ -249,16 +249,15 @@ </span><span class=3D"cx"> goto fail_4; /* bail */ </span><span class=3D"cx"> } </span><span class=3D"cx">=20 </span><del>- /* Convert to ARGB1555 -- go backwards so we can do it in = place */ - /* XXX Technically we should probably switch to ARGB4444 here */ </del><ins>+ /* Convert to ARGB4444 -- go backwards so we can do it in p= lace */ + /* PLIB seems to duplicate the alpha value into luminance. I think it + * looks nicer to hardcode luminance to 1.0; characters look more robu= st. */ </ins><span class=3D"cx"> bmtmp =3D (uint8 *)txrtmp; </span><span class=3D"cx"> for (x=3Dbmsize-1; x>=3D0; x--) { </span><del>- if (bmtmp[x] =3D=3D 0) - txrtmp[x] =3D 0x0000; - else { - int c =3D ((int)bmtmp[x]) >> 3; - txrtmp[x] =3D 0x8000 | (c << 10) | (c << 5) | (c <<= ; 0); - } </del><ins>+ uint8 alpha =3D (bmtmp[x] & 0xF0) >> 4; + /* uint8 lum =3D alpha; */ + uint8 lum =3D 0x0f; + txrtmp[x] =3D (alpha << 12) | (lum << 8) | (lum << = 4) | (lum << 0); </ins><span class=3D"cx"> } </span><span class=3D"cx"> bmtmp =3D NULL; </span><span class=3D"cx">=20 </span></pre> </div> </div> </body> </html> |
|
From: <cad...@li...> - 2005-11-27 23:17:15
|
<!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>[285] tiki/src/gl/drawables/pointerArrow.cpp: Tiki: Deselect textu= re before drawing PointerArrow</title> </head> <body> <div id=3D"msg"> <dl> <dt>Revision</dt> <dd>285</dd> <dt>Author</dt> <dd>sam.steele</dd> <dt>Date</dt> <dd>2005-11-27 15:09:06 -0800 (Sun, 27 Nov 2005)</dd> </dl> <h3>Log Message</h3> <pre>Tiki: Deselect texture before drawing PointerArrow</pre> <h3>Modified Paths</h3> <ul> <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"tikisrcgldrawablespointerArrowcpp"></a> <div class=3D"modfile"><h4>Modified: tiki/src/gl/drawables/pointerArrow.c= pp (284 =3D> 285)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/src/gl/drawables/pointerArrow.cpp 2005-11-2= 7 21:55:04 UTC (rev 284) +++ tiki/src/gl/drawables/pointerArrow.cpp 2005-11-27 23:09:06 UTC (rev 2= 85) </span><span class=3D"lines">@@ -8,6 +8,7 @@ </span><span class=3D"cx">=20 </span><span class=3D"cx"> #include <Tiki/tiki.h> </span><span class=3D"cx"> #include <Tiki/gl.h> </span><ins>+#include <Tiki/texture.h> </ins><span class=3D"cx"> #include <Tiki/plxcompat.h> </span><span class=3D"cx"> #include <Tiki/drawables/pointerArrow.h> </span><span class=3D"cx">=20 </span><span class=3D"lines">@@ -26,6 +27,8 @@ </span><span class=3D"cx"> plx_vertex_t vert; </span><span class=3D"cx"> const Vector & tv =3D getPosition(); </span><span class=3D"cx">=20 </span><ins>+ Texture::deselect(); +=09 </ins><span class=3D"cx"> if(list=3D=3DTrans) { </span><span class=3D"cx"> vert.argb =3D Color(0,0,0); </span><span class=3D"cx"> vert.z =3D tv.z; </span></pre> </div> </div> </body> </html> |
|
From: <cad...@li...> - 2005-11-27 22:03:16
|
<!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>[284] kos-ports/include/GL/gl.h: KGL: Set GL_TRIANGLE_FAN to 7 in = gl.h</title> </head> <body> <div id=3D"msg"> <dl> <dt>Revision</dt> <dd>284</dd> <dt>Author</dt> <dd>sam.steele</dd> <dt>Date</dt> <dd>2005-11-27 13:55:04 -0800 (Sun, 27 Nov 2005)</dd> </dl> <h3>Log Message</h3> <pre>KGL: Set GL_TRIANGLE_FAN to 7 in gl.h</pre> <h3>Modified Paths</h3> <ul> <li><a href=3D"#kosportsincludeGLglh">kos-ports/include/GL/gl.h</a></li> </ul> </div> <div id=3D"patch"> <h3>Diff</h3> <a id=3D"kosportsincludeGLglh"></a> <div class=3D"modfile"><h4>Modified: kos-ports/include/GL/gl.h (283 =3D> = 284)</h4> <pre class=3D"diff"> <span class=3D"info">--- kos-ports/include/GL/gl.h 2005-11-27 21:51:09 UT= C (rev 283) +++ kos-ports/include/GL/gl.h 2005-11-27 21:55:04 UTC (rev 284) </span><span class=3D"lines">@@ -90,7 +90,7 @@ </span><span class=3D"cx"> #define GL_LINE_STRIP 0 /*4*/ </span><span class=3D"cx"> #define GL_TRIANGLES 5 </span><span class=3D"cx"> #define GL_TRIANGLE_STRIP 6 </span><del>-#define GL_TRIANGLE_FAN 0 /*7*/ </del><ins>+#define GL_TRIANGLE_FAN 7 </ins><span class=3D"cx"> #define GL_QUADS 8 </span><span class=3D"cx"> #define GL_QUAD_STRIP 9 </span><span class=3D"cx"> #define GL_POLYGON 10 </span></pre> </div> </div> </body> </html> |
|
From: <cad...@li...> - 2005-11-27 21:59:24
|
<!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>[283] tiki/src/gl/font.cpp: Tiki: Apply Jim Ursetto's ARGB4444 fon= t patch for parallax to Tiki</title> </head> <body> <div id=3D"msg"> <dl> <dt>Revision</dt> <dd>283</dd> <dt>Author</dt> <dd>sam.steele</dd> <dt>Date</dt> <dd>2005-11-27 13:51:09 -0800 (Sun, 27 Nov 2005)</dd> </dl> <h3>Log Message</h3> <pre>Tiki: Apply Jim Ursetto's ARGB4444 font patch for parallax to Tiki</= pre> <h3>Modified Paths</h3> <ul> <li><a href=3D"#tikisrcglfontcpp">tiki/src/gl/font.cpp</a></li> </ul> </div> <div id=3D"patch"> <h3>Diff</h3> <a id=3D"tikisrcglfontcpp"></a> <div class=3D"modfile"><h4>Modified: tiki/src/gl/font.cpp (282 =3D> 283)<= /h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/src/gl/font.cpp 2005-11-27 00:55:14 UTC (re= v 282) +++ tiki/src/gl/font.cpp 2005-11-27 21:51:09 UTC (rev 283) </span><span class=3D"lines">@@ -185,7 +185,7 @@ </span><span class=3D"cx">=20 </span><span class=3D"cx"> /* Make sure we can allocate texture space fo= r it */ </span><span class=3D"cx"> m_fnt.txr =3D new Texture; </span><del>- if (!m_fnt.txr->createCanvas(hdr.txr_width, hdr.txr_heig= ht, Texture::ARGB1555)) { </del><ins>+ if (!m_fnt.txr->createCanvas(hdr.txr_width, hdr.txr_heigh= t, Texture::ARGB4444)) { </ins><span class=3D"cx"> Debug::printf("plx_font_load: can't allo= cate texture for '%s'\n", fn.c_str()); </span><span class=3D"cx"> return false; </span><span class=3D"cx"> } </span><span class=3D"lines">@@ -300,16 +300,15 @@ </span><span class=3D"cx"> return false; </span><span class=3D"cx"> } </span><span class=3D"cx">=20 </span><del>- /* Convert to ARGB1555 -- go backwards so we can do it in = place */ - /* XXX Technically we should probably switch to ARGB4444 here */ </del><ins>+ /* Convert to ARGB4444 -- go backwards so we can do it in p= lace */ + /* PLIB seems to duplicate the alpha value into luminance. I think it + * looks nicer to hardcode luminance to 1.0; characters look more robu= st. */ </ins><span class=3D"cx"> bmtmp =3D (uint8 *)txrtmp; </span><span class=3D"cx"> for (int x=3Dbmsize-1; x>=3D0; x--) { </span><del>- if (bmtmp[x] =3D=3D 0) - txrtmp[x] =3D 0x0000; - else { - int c =3D ((int)bmtmp[x]) >> 3; - txrtmp[x] =3D 0x8000 | (c << 10) | (c << 5) | (c <<= ; 0); - } </del><ins>+ uint8 alpha =3D (bmtmp[x] & 0xF0) >> 4; + /* uint8 lum =3D alpha; */ + uint8 lum =3D 0x0f; + txrtmp[x] =3D (alpha << 12) | (lum << 8) | (lum << = 4) | (lum << 0); </ins><span class=3D"cx"> } </span><span class=3D"cx">=20 </span><span class=3D"cx"> break; </span></pre> </div> </div> </body> </html> |
|
From: <cad...@li...> - 2005-11-27 01:03:22
|
<!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>[282] tiki/win32/src/platgl.cpp: TIKI: Win32: Correctly set the wi= ndow size</title> </head> <body> <div id=3D"msg"> <dl> <dt>Revision</dt> <dd>282</dd> <dt>Author</dt> <dd>sam.steele</dd> <dt>Date</dt> <dd>2005-11-26 16:55:14 -0800 (Sat, 26 Nov 2005)</dd> </dl> <h3>Log Message</h3> <pre>TIKI: Win32: Correctly set the window size</pre> <h3>Modified Paths</h3> <ul> <li><a href=3D"#tikiwin32srcplatglcpp">tiki/win32/src/platgl.cpp</a></li> </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 (281 =3D> = 282)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/win32/src/platgl.cpp 2005-11-27 00:54:24 UT= C (rev 281) +++ tiki/win32/src/platgl.cpp 2005-11-27 00:55:14 UTC (rev 282) </span><span class=3D"lines">@@ -62,7 +62,11 @@ </span><span class=3D"cx"> { </span><span class=3D"cx"> MSG msg; </span><span class=3D"cx"> WNDCLASSEX wc; </span><del>- </del><ins>+ RECT WindowRect; // Grabs Rectangle Upper Left / Lower R= ight 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 + WindowRect.bottom=3D(long)m_targetH; // Set Bottom Value To Requested = Height </ins><span class=3D"cx"> m_hInstance =3D hInst; </span><span class=3D"cx">=20 </span><span class=3D"cx"> wc.cbSize =3D sizeof(wc); </span><span class=3D"lines">@@ -81,9 +85,10 @@ </span><span class=3D"cx"> if(!RegisterClassEx(&wc)) </span><span class=3D"cx"> return FALSE; </span><span class=3D"cx">=20 </span><del>- // XXX Window is not create with the right size. It seems t= o include the title bar and frame. - m_hWndMain =3D CreateWindow(szAppName, szAppName, WS_OVERLAPPEDWINDOW, = 0, 0, m_targetW + 10, m_targetH + 40, NULL, NULL, m_hInstance, NULL); </del><ins>+ AdjustWindowRect(&WindowRect, WS_OVERLAPPEDWINDOW, FALSE= ); </ins><span class=3D"cx">=20 </span><ins>+ m_hWndMain =3D CreateWindow(szAppName, szAppName, WS_OVERLA= PPEDWINDOW, 0, 0, WindowRect.right-WindowRect.left, WindowRect.bottom-Win= dowRect.top, NULL, NULL, m_hInstance, NULL); + </ins><span class=3D"cx"> if(!m_hWndMain) </span><span class=3D"cx"> return FALSE; </span><span class=3D"cx">=20 </span></pre> </div> </div> </body> </html> |
|
From: <cad...@li...> - 2005-11-27 01:02: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"><!-- #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>[281] tiki/src/image: Win32 build fixes</title> </head> <body> <div id=3D"msg"> <dl> <dt>Revision</dt> <dd>281</dd> <dt>Author</dt> <dd>sam.steele</dd> <dt>Date</dt> <dd>2005-11-26 16:54:24 -0800 (Sat, 26 Nov 2005)</dd> </dl> <h3>Log Message</h3> <pre>Win32 build fixes</pre> <h3>Modified Paths</h3> <ul> <li><a href=3D"#tikiincludeTikisoundh">tiki/include/Tiki/sound.h</a></li> <li><a href=3D"#tikiincludeTikistreamh">tiki/include/Tiki/stream.h</a></l= i> <li><a href=3D"#tikisrcimageloadjpgcpp">tiki/src/image/loadjpg.cpp</a></l= i> </ul> </div> <div id=3D"patch"> <h3>Diff</h3> <a id=3D"tikiincludeTikisoundh"></a> <div class=3D"modfile"><h4>Modified: tiki/include/Tiki/sound.h (280 =3D> = 281)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/include/Tiki/sound.h 2005-11-22 16:53:45 UT= C (rev 280) +++ tiki/include/Tiki/sound.h 2005-11-27 00:54:24 UTC (rev 281) </span><span class=3D"lines">@@ -18,7 +18,10 @@ </span><span class=3D"cx"> #if TIKI_PLAT =3D=3D TIKI_SDL </span><span class=3D"cx"> # include <AL/al.h> </span><span class=3D"cx"> #endif </span><ins>+#if TIKI_PLAT =3D=3D TIKI_WIN32 +# include <al.h> </ins><span class=3D"cx"> #endif </span><ins>+#endif </ins><span class=3D"cx">=20 </span><span class=3D"cx"> namespace Tiki { </span><span class=3D"cx"> namespace Audio { </span></pre></div> <a id=3D"tikiincludeTikistreamh"></a> <div class=3D"modfile"><h4>Modified: tiki/include/Tiki/stream.h (280 =3D>= 281)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/include/Tiki/stream.h 2005-11-22 16:53:45 U= TC (rev 280) +++ tiki/include/Tiki/stream.h 2005-11-27 00:54:24 UTC (rev 281) </span><span class=3D"lines">@@ -15,6 +15,9 @@ </span><span class=3D"cx"> #if TIKI_PLAT =3D=3D TIKI_SDL </span><span class=3D"cx"> # include <AL/al.h> </span><span class=3D"cx"> #endif // TIKI_PLAT=3D=3DTIKI_SDL </span><ins>+#if TIKI_PLAT =3D=3D TIKI_WIN32 +# include <al.h> +#endif // TIKI_PLAT=3D=3DTIKI_WIN32 </ins><span class=3D"cx">=20 </span><span class=3D"cx"> #include "Tiki/refcnt.h" </span><span class=3D"cx"> #include "Tiki/list.h" </span></pre></div> <a id=3D"tikisrcimageloadjpgcpp"></a> <div class=3D"modfile"><h4>Modified: tiki/src/image/loadjpg.cpp (280 =3D>= 281)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/src/image/loadjpg.cpp 2005-11-22 16:53:45 U= TC (rev 280) +++ tiki/src/image/loadjpg.cpp 2005-11-27 00:54:24 UTC (rev 281) </span><span class=3D"lines">@@ -10,16 +10,21 @@ </span><span class=3D"cx"> */ </span><span class=3D"cx">=20 </span><span class=3D"cx"> #include "pch.h" </span><ins>+#include "Tiki/tiki.h" </ins><span class=3D"cx"> #include "Tiki/image.h" </span><span class=3D"cx"> #include "Tiki/imgjpg.h" </span><span class=3D"cx"> #include <assert.h> </span><ins>+#if TIKI_PLAT !=3D TIKI_WIN32 </ins><span class=3D"cx"> __BEGIN_DECLS </span><ins>+#endif </ins><span class=3D"cx"> #if TIKI_PLAT !=3D TIKI_DC </span><span class=3D"cx"> #include <jpeglib.h> </span><span class=3D"cx"> #else </span><span class=3D"cx"> #include <jpeg/jpeglib.h> </span><span class=3D"cx"> #endif </span><ins>+#if TIKI_PLAT !=3D TIKI_WIN32 </ins><span class=3D"cx"> __END_DECLS </span><ins>+#endif </ins><span class=3D"cx">=20 </span><span class=3D"cx"> /* Load a JPEG into a KOS PIImage */ </span><span class=3D"cx"> bool Tiki::jpgToImage(const string & filen= ame, int scale, RefPtr<Image> & img) { </span></pre> </div> </div> </body> </html> |
|
From: <cad...@li...> - 2005-11-22 17: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>[280] tiki/examples/TikiTest/src/Controller.m: Adding "close = after last window" method.</title> </head> <body> <div id=3D"msg"> <dl> <dt>Revision</dt> <dd>280</dd> <dt>Author</dt> <dd>atani</dd> <dt>Date</dt> <dd>2005-11-22 08:53:45 -0800 (Tue, 22 Nov 2005)</dd> </dl> <h3>Log Message</h3> <pre>Adding "close after last window" method.</pre> <h3>Modified Paths</h3> <ul> <li><a href=3D"#tikiexamplesTikiTestsrcControllerm">tiki/examples/TikiTes= t/src/Controller.m</a></li> </ul> </div> <div id=3D"patch"> <h3>Diff</h3> <a id=3D"tikiexamplesTikiTestsrcControllerm"></a> <div class=3D"modfile"><h4>Modified: tiki/examples/TikiTest/src/Controlle= r.m (279 =3D> 280)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/examples/TikiTest/src/Controller.m 2005-11-= 22 01:02:37 UTC (rev 279) +++ tiki/examples/TikiTest/src/Controller.m 2005-11-22 16:53:45 UTC (rev = 280) </span><span class=3D"lines">@@ -22,4 +22,9 @@ </span><span class=3D"cx"> return NSTerminateNow; </span><span class=3D"cx"> } </span><span class=3D"cx">=20 </span><ins>+- (BOOL) applicationShouldTerminateAfterLastWindowClosed: (N= SApplication *)theApplication +{ + return YES; +} + </ins><span class=3D"cx"> @end </span></pre> </div> </div> </body> </html> |
|
From: <cad...@li...> - 2005-11-22 01:10:33
|
<!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>[279] tiki/osx/Tiki.xcodeproj/project.pbxproj: Adding TextureTile<= /title> </head> <body> <div id=3D"msg"> <dl> <dt>Revision</dt> <dd>279</dd> <dt>Author</dt> <dd>atani</dd> <dt>Date</dt> <dd>2005-11-21 17:02:37 -0800 (Mon, 21 Nov 2005)</dd> </dl> <h3>Log Message</h3> <pre>Adding TextureTile</pre> <h3>Modified Paths</h3> <ul> <li><a href=3D"#tikiosxTikixcodeprojprojectpbxproj">tiki/osx/Tiki.xcodepr= oj/project.pbxproj</a></li> </ul> </div> <div id=3D"patch"> <h3>Diff</h3> <a id=3D"tikiosxTikixcodeprojprojectpbxproj"></a> <div class=3D"modfile"><h4>Modified: tiki/osx/Tiki.xcodeproj/project.pbxp= roj (278 =3D> 279)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/osx/Tiki.xcodeproj/project.pbxproj 2005-11-= 22 01:00:25 UTC (rev 278) +++ tiki/osx/Tiki.xcodeproj/project.pbxproj 2005-11-22 01:02:37 UTC (rev = 279) </span><span class=3D"lines">@@ -12,6 +12,8 @@ </span><span class=3D"cx"> 2290A10109302D9F00B7D80C /* cursor.h in Head= ers */ =3D {isa =3D PBXBuildFile; fileRef =3D 2290A0FF09302D9F00B7D80C /*= cursor.h */; }; </span><span class=3D"cx"> 2290A10209302D9F00B7D80C /* pointerArrow.h i= n Headers */ =3D {isa =3D PBXBuildFile; fileRef =3D 2290A10009302D9F00B7D= 80C /* pointerArrow.h */; }; </span><span class=3D"cx"> 640C2C30092EB8C40032DE40 /* alpharotate.h in= Headers */ =3D {isa =3D PBXBuildFile; fileRef =3D 640C2C2F092EB8C40032DE= 40 /* alpharotate.h */; }; </span><ins>+ 6444BEE60932A3D800A29768 /* texturetile.cpp in Sources */ = =3D {isa =3D PBXBuildFile; fileRef =3D 6444BEE50932A3D700A29768 /* textur= etile.cpp */; }; + 6444BEE80932A3F200A29768 /* texturetile.h in Headers */ =3D {isa =3D P= BXBuildFile; fileRef =3D 6444BEE70932A3F200A29768 /* texturetile.h */; }; </ins><span class=3D"cx"> 64D758F4092EB9A5002667EE /* sleep.h in Header= s */ =3D {isa =3D PBXBuildFile; fileRef =3D 64D758F3092EB9A5002667EE /* s= leep.h */; }; </span><span class=3D"cx"> 8DC2EF530486A6940098B216 /* InfoPlist.string= s in Resources */ =3D {isa =3D PBXBuildFile; fileRef =3D 089C1666FE841158= C02AAC07 /* InfoPlist.strings */; }; </span><span class=3D"cx"> 8DC2EF570486A6940098B216 /* Cocoa.framework = in Frameworks */ =3D {isa =3D PBXBuildFile; fileRef =3D 1058C7B1FEA5585E1= 1CA2CBB /* Cocoa.framework */; }; </span><span class=3D"lines">@@ -199,6 +201,8 @@ </span><span class=3D"cx"> 2290A10009302D9F00B7D80C /* pointerArrow.h *= / =3D {isa =3D PBXFileReference; fileEncoding =3D 30; lastKnownFileType =3D= sourcecode.c.h; name =3D pointerArrow.h; path =3D ../include/Tiki/drawab= les/pointerArrow.h; sourceTree =3D SOURCE_ROOT; }; </span><span class=3D"cx"> 32DBCF5E0370ADEE00C91783 /* Tiki_Prefix.pch = */ =3D {isa =3D PBXFileReference; fileEncoding =3D 4; lastKnownFileType =3D= sourcecode.c.h; path =3D Tiki_Prefix.pch; sourceTree =3D "<group= >"; }; </span><span class=3D"cx"> 640C2C2F092EB8C40032DE40 /* alpharotate.h */= =3D {isa =3D PBXFileReference; fileEncoding =3D 4; lastKnownFileType =3D= sourcecode.c.h; name =3D alpharotate.h; path =3D ../include/Tiki/anims/a= lpharotate.h; sourceTree =3D SOURCE_ROOT; }; </span><ins>+ 6444BEE50932A3D700A29768 /* texturetile.cpp */ =3D {isa =3D= PBXFileReference; fileEncoding =3D 30; lastKnownFileType =3D sourcecode.= cpp.cpp; name =3D texturetile.cpp; path =3D ../src/gl/drawables/textureti= le.cpp; sourceTree =3D SOURCE_ROOT; }; + 6444BEE70932A3F200A29768 /* texturetile.h */ =3D {isa =3D PBXFileRefer= ence; fileEncoding =3D 30; lastKnownFileType =3D sourcecode.c.h; name =3D= texturetile.h; path =3D ../include/Tiki/drawables/texturetile.h; sourceT= ree =3D SOURCE_ROOT; }; </ins><span class=3D"cx"> 64D758F3092EB9A5002667EE /* sleep.h */ =3D {i= sa =3D PBXFileReference; fileEncoding =3D 4; lastKnownFileType =3D source= code.c.h; name =3D sleep.h; path =3D ../include/Tiki/anims/sleep.h; sourc= eTree =3D SOURCE_ROOT; }; </span><span class=3D"cx"> 8DC2EF5A0486A6940098B216 /* Info.plist */ =3D= {isa =3D PBXFileReference; fileEncoding =3D 4; lastKnownFileType =3D tex= t.plist; path =3D Info.plist; sourceTree =3D "<group>"; }= ; </span><span class=3D"cx"> 8DC2EF5B0486A6940098B216 /* Tiki.framework *= / =3D {isa =3D PBXFileReference; explicitFileType =3D wrapper.framework; = includeInIndex =3D 0; path =3D Tiki.framework; sourceTree =3D BUILT_PRODU= CTS_DIR; }; </span><span class=3D"lines">@@ -884,6 +888,7 @@ </span><span class=3D"cx"> 2290A0FB09302D7500B7D80C /* cursor.cpp */, </span><span class=3D"cx"> C4F51554079A0BAE0001D0D0 /* label.cpp */, </span><span class=3D"cx"> 2290A0FC09302D7500B7D80C /* pointerArrow.c= pp */, </span><ins>+ 6444BEE50932A3D700A29768 /* texturetile.cpp */, </ins><span class=3D"cx"> ); </span><span class=3D"cx"> name =3D drawables; </span><span class=3D"cx"> sourceTree =3D "<group>"; </span><span class=3D"lines">@@ -933,6 +938,7 @@ </span><span class=3D"cx"> C4F51569079A0C4E0001D0D0 /* drawables */ =3D= { </span><span class=3D"cx"> isa =3D PBXGroup; </span><span class=3D"cx"> children =3D ( </span><ins>+ 6444BEE70932A3F200A29768 /* texturetile.h */, </ins><span class=3D"cx"> 2290A0FF09302D9F00B7D80C /* cursor.h */, </span><span class=3D"cx"> 2290A10009302D9F00B7D80C /* pointerArrow.h= */, </span><span class=3D"cx"> C4F5156F079A0C7D0001D0D0 /* banner.h */, </span><span class=3D"lines">@@ -989,6 +995,7 @@ </span><span class=3D"cx"> 64D758F4092EB9A5002667EE /* sleep.h in Hea= ders */, </span><span class=3D"cx"> 2290A10109302D9F00B7D80C /* cursor.h in He= aders */, </span><span class=3D"cx"> 2290A10209302D9F00B7D80C /* pointerArrow.h= in Headers */, </span><ins>+ 6444BEE80932A3F200A29768 /* texturetile.h in Headers */, </ins><span class=3D"cx"> ); </span><span class=3D"cx"> runOnlyForDeploymentPostprocessing =3D 0; </span><span class=3D"cx"> }; </span><span class=3D"lines">@@ -1230,6 +1237,7 @@ </span><span class=3D"cx"> C42D8E490873543200421E45 /* stream.cpp in = Sources */, </span><span class=3D"cx"> 2290A0FD09302D7500B7D80C /* cursor.cpp in = Sources */, </span><span class=3D"cx"> 2290A0FE09302D7500B7D80C /* pointerArrow.c= pp in Sources */, </span><ins>+ 6444BEE60932A3D800A29768 /* texturetile.cpp in Sources *= /, </ins><span class=3D"cx"> ); </span><span class=3D"cx"> runOnlyForDeploymentPostprocessing =3D 0; </span><span class=3D"cx"> }; </span></pre> </div> </div> </body> </html> |
|
From: <cad...@li...> - 2005-11-22 01:09:16
|
<!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>[278] tiki/osx/src/TikiMain.m: Minor adjustment to enter/exit mous= e events, on exit always unhide the cursor</title> </head> <body> <div id=3D"msg"> <dl> <dt>Revision</dt> <dd>278</dd> <dt>Author</dt> <dd>atani</dd> <dt>Date</dt> <dd>2005-11-21 17:00:25 -0800 (Mon, 21 Nov 2005)</dd> </dl> <h3>Log Message</h3> <pre>Minor adjustment to enter/exit mouse events, on exit always unhide t= he cursor</pre> <h3>Modified Paths</h3> <ul> <li><a href=3D"#tikiosxsrcTikiMainm">tiki/osx/src/TikiMain.m</a></li> </ul> </div> <div id=3D"patch"> <h3>Diff</h3> <a id=3D"tikiosxsrcTikiMainm"></a> <div class=3D"modfile"><h4>Modified: tiki/osx/src/TikiMain.m (277 =3D> 27= 8)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/osx/src/TikiMain.m 2005-11-22 00:45:01 UTC = (rev 277) +++ tiki/osx/src/TikiMain.m 2005-11-22 01:00:25 UTC (rev 278) </span><span class=3D"lines">@@ -163,7 +163,7 @@ </span><span class=3D"cx"> if(!tikiShowMouse) [NSCursor hide]; </span><span class=3D"cx"> break; </span><span class=3D"cx"> case NSMouseExited: </span><del>- if(!tikiShowMouse) [NSCursor unhide]; </del><ins>+ [NSCursor unhide]; </ins><span class=3D"cx"> break; </span><span class=3D"cx"> case NSMouseMoved: </span><span class=3D"cx"> case NSLeftMouseDown: </span></pre> </div> </div> </body> </html> |
|
From: <cad...@li...> - 2005-11-22 00:52:59
|
<!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>[277] tiki/dc: Adding TextureTile (single Texture with multiple &q= uot;tiles")</title> </head> <body> <div id=3D"msg"> <dl> <dt>Revision</dt> <dd>277</dd> <dt>Author</dt> <dd>atani</dd> <dt>Date</dt> <dd>2005-11-21 16:45:01 -0800 (Mon, 21 Nov 2005)</dd> </dl> <h3>Log Message</h3> <pre>Adding TextureTile (single Texture with multiple "tiles") Removing calls to TikiTest building</pre> <h3>Modified Paths</h3> <ul> <li><a href=3D"#tikidcMakefile">tiki/dc/Makefile</a></li> <li><a href=3D"#tikiincludeTikidrawablesbannerh">tiki/include/Tiki/drawab= les/banner.h</a></li> <li><a href=3D"#tikisdlMakefile">tiki/sdl/Makefile</a></li> </ul> <h3>Added Paths</h3> <ul> <li><a href=3D"#tikiincludeTikidrawablestexturetileh">tiki/include/Tiki/d= rawables/texturetile.h</a></li> <li><a href=3D"#tikisrcgldrawablestexturetilecpp">tiki/src/gl/drawables/t= exturetile.cpp</a></li> </ul> </div> <div id=3D"patch"> <h3>Diff</h3> <a id=3D"tikidcMakefile"></a> <div class=3D"modfile"><h4>Modified: tiki/dc/Makefile (276 =3D> 277)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/dc/Makefile 2005-11-22 00:41:30 UTC (rev 27= 6) +++ tiki/dc/Makefile 2005-11-22 00:45:01 UTC (rev 277) </span><span class=3D"lines">@@ -21,10 +21,7 @@ </span><span class=3D"cx"> $(KOS_AR) ru libtiki.a $(BASE_OBJS) </span><span class=3D"cx"> $(MAKE) tikitest_all </span><span class=3D"cx">=20 </span><del>-clean: tikitest_clean clean_subdirs </del><ins>+clean: clean_subdirs </ins><span class=3D"cx"> -rm -f $(BASE_OBJS) libtiki.a </span><span class=3D"cx">=20 </span><del>-tikitest_clean tikitest_all: - $(MAKE) -C TikiTest $(patsubst tikitest_%,%,$@) - </del><span class=3D"cx"> include Makefile.rules </span></pre></div> <a id=3D"tikiincludeTikidrawablesbannerh"></a> <div class=3D"modfile"><h4>Modified: tiki/include/Tiki/drawables/banner.h= (276 =3D> 277)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/include/Tiki/drawables/banner.h 2005-11-22 = 00:41:30 UTC (rev 276) +++ tiki/include/Tiki/drawables/banner.h 2005-11-22 00:45:01 UTC (rev 277= ) </span><span class=3D"lines">@@ -34,9 +34,10 @@ </span><span class=3D"cx">=20 </span><span class=3D"cx"> virtual void draw(ObjType t); </span><span class=3D"cx">=20 </span><ins>+protected: + RefPtr<Texture> m_texture; </ins><span class=3D"cx"> private: </span><span class=3D"cx"> ObjType m_list; </span><del>- RefPtr<Texture> m_texture; </del><span class=3D"cx">=20 </span><span class=3D"cx"> float m_u1, m_v1, m_u2, m_v2; </span><span class=3D"cx"> float m_u3, m_v3, m_u4, m_v4; </span></pre></div> <a id=3D"tikiincludeTikidrawablestexturetileh"></a> <div class=3D"addfile"><h4>Added: tiki/include/Tiki/drawables/texturetile= .h (276 =3D> 277)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/include/Tiki/drawables/texturetile.h 2005-1= 1-22 00:41:30 UTC (rev 276) +++ tiki/include/Tiki/drawables/texturetile.h 2005-11-22 00:45:01 UTC (re= v 277) </span><span class=3D"lines">@@ -0,0 +1,40 @@ </span><ins>+/* + Tiki + + tilemap.h + + Copyright (C)2005 Atani Software +*/ + +#ifndef __TIKI_DRW_TXRTILE_H +#define __TIKI_DRW_TXRTILE_H + +#include "Tiki/drawable.h" +#include "Tiki/drawables/banner.h" +#include "Tiki/texture.h" +#include "Tiki/color.h" + +namespace Tiki { +namespace GL { + +/** + * TileMap -- Renders a portion of texture as a tile + */ +class TextureTile : public Banner { +public: + TextureTile(ObjType t, Texture * texture); + virtual ~TextureTile(); + + void setTileSize(float w, float h); + void selectTile(float x, float y); + +private: + float m_tile_w, m_tile_h; + float m_sel_tile_x, m_sel_tile_y; +}; + +}; +}; + +#endif // __TIKI_DRW_TXRTILE_H + </ins><span class=3D"cx">Property changes on: tiki/include/Tiki/drawables= /texturetile.h </span><span class=3D"cx">_______________________________________________= ____________________ </span><span class=3D"cx">Name: svn:executable </span><span class=3D"cx"> + * </span></pre></div> <a id=3D"tikisdlMakefile"></a> <div class=3D"modfile"><h4>Modified: tiki/sdl/Makefile (276 =3D> 277)</h4= > <pre class=3D"diff"> <span class=3D"info">--- tiki/sdl/Makefile 2005-11-22 00:41:30 UTC (rev 2= 76) +++ tiki/sdl/Makefile 2005-11-22 00:45:01 UTC (rev 277) </span><span class=3D"lines">@@ -50,12 +50,8 @@ </span><span class=3D"cx">=20 </span><span class=3D"cx"> all: subdirs $(BASE_OBJS) $(THIRD_PARTY_OBJS) </span><span class=3D"cx"> $(AR) ru libtiki.a $(BASE_OBJS) $(THIRD_PARTY= _OBJS) </span><del>- $(MAKE) tikitest_all </del><span class=3D"cx">=20 </span><del>-clean: tikitest_clean clean_subdirs </del><ins>+clean: clean_subdirs </ins><span class=3D"cx"> -rm -f $(BASE_OBJS) libtiki.a </span><span class=3D"cx">=20 </span><del>-tikitest_clean tikitest_all: - $(MAKE) -C TikiTest $(patsubst tikitest_%,%,$@) - </del><span class=3D"cx"> include Makefile.rules </span></pre></div> <a id=3D"tikisrcgldrawablestexturetilecpp"></a> <div class=3D"addfile"><h4>Added: tiki/src/gl/drawables/texturetile.cpp (= 276 =3D> 277)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/src/gl/drawables/texturetile.cpp 2005-11-22= 00:41:30 UTC (rev 276) +++ tiki/src/gl/drawables/texturetile.cpp 2005-11-22 00:45:01 UTC (rev 27= 7) </span><span class=3D"lines">@@ -0,0 +1,44 @@ </span><ins>+/* + Tiki + + texturetile.cpp + + Copyright (C)2005 Atani Software +*/ + +#include "pch.h" + +#include "Tiki/drawables/texturetile.h" +#include "Tiki/drawables/banner.h" +#include "Tiki/plxcompat.h" + +using namespace Tiki::GL; +using namespace Tiki::GL::Plxcompat; + +TextureTile::TextureTile(ObjType t, Texture * texture) : Banner(t, textu= re) { +} + +TextureTile::~TextureTile() { +} + +void TextureTile::setTileSize(float w, float h) { + m_tile_w =3D w; + m_tile_h =3D h; +} + +void TextureTile::selectTile(float x, float y) { + m_sel_tile_x =3D x; + m_sel_tile_y =3D y; + + float start_x =3D m_tile_w * x; + float start_y =3D m_tile_h * y; + float stop_x =3D start_x + m_tile_w; + float stop_y =3D start_y + m_tile_h; + + // select region of texture that matches the x/y coord of tile in textu= re + setUV(start_x / m_texture->getW(), stop_y / m_texture->getH(), + start_x / m_texture->getW(), start_y / m_texture->getH(), + stop_x / m_texture->getW(), stop_y / m_texture->getH(), + stop_x / m_texture->getW(), start_y / m_texture->getH() + ); +} </ins><span class=3D"cx">Property changes on: tiki/src/gl/drawables/textu= retile.cpp </span><span class=3D"cx">_______________________________________________= ____________________ </span><span class=3D"cx">Name: svn:executable </span><span class=3D"cx"> + * </span></pre> </div> </div> </body> </html> |
|
From: <cad...@li...> - 2005-11-22 00:49:27
|
<!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>[276] tiki/examples/TikiTest/src/test.cpp: Tiki: TikiTest: Hide th= e mouse pointer, since it works now.</title> </head> <body> <div id=3D"msg"> <dl> <dt>Revision</dt> <dd>276</dd> <dt>Author</dt> <dd>sam.steele</dd> <dt>Date</dt> <dd>2005-11-21 16:41:30 -0800 (Mon, 21 Nov 2005)</dd> </dl> <h3>Log Message</h3> <pre>Tiki: TikiTest: Hide the mouse pointer, since it works now. Also, d= on't assume port 0 is a valid mouse on the Dreamcast, attach events work = correctly on that platform</pre> <h3>Modified Paths</h3> <ul> <li><a href=3D"#tikiexamplesTikiTestsrctestcpp">tiki/examples/TikiTest/sr= c/test.cpp</a></li> </ul> </div> <div id=3D"patch"> <h3>Diff</h3> <a id=3D"tikiexamplesTikiTestsrctestcpp"></a> <div class=3D"modfile"><h4>Modified: tiki/examples/TikiTest/src/test.cpp = (275 =3D> 276)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/examples/TikiTest/src/test.cpp 2005-11-22 0= 0:34:33 UTC (rev 275) +++ tiki/examples/TikiTest/src/test.cpp 2005-11-22 00:41:30 UTC (rev 276) </span><span class=3D"lines">@@ -234,14 +234,15 @@ </span><span class=3D"cx"> // Init Tiki </span><span class=3D"cx"> Tiki::init(argc, argv); </span><span class=3D"cx"> Tiki::setName("TikiTest", NULL); </span><del>-// dont hide the cursor on OSX since it never reappears corr= ectly -// Tiki::GL::showCursor(false); </del><ins>+ Tiki::GL::showCursor(false); </ins><span class=3D"cx"> Hid::callbackReg(tkCallback, NULL); </span><span class=3D"cx">=20 </span><ins>+#if TIKI_PLAT !=3D TIKI_DC </ins><span class=3D"cx"> //Attach events happen before we start :( </span><span class=3D"cx"> mp[0].valid=3D1; </span><span class=3D"cx"> mp[0].x=3D320; </span><span class=3D"cx"> mp[0].y=3D240; </span><ins>+#endif </ins><span class=3D"cx"> =09 </span><span class=3D"cx"> RefPtr<TestObject> test =3D new TestObj= ect("1"); </span><span class=3D"cx"> RefPtr<TestObject> test2 =3D new TestOb= ject("2"); </span></pre> </div> </div> </body> </html> |
|
From: <cad...@li...> - 2005-11-22 00:45:04
|
<!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>[275] tiki/osx/src/TikiMain.m: Tiki: OSX: enable mouseEntered and = moueExited events, show/hide cursor correctly</title> </head> <body> <div id=3D"msg"> <dl> <dt>Revision</dt> <dd>275</dd> <dt>Author</dt> <dd>sam.steele</dd> <dt>Date</dt> <dd>2005-11-21 16:34:33 -0800 (Mon, 21 Nov 2005)</dd> </dl> <h3>Log Message</h3> <pre>Tiki: OSX: enable mouseEntered and moueExited events, show/hide curs= or correctly</pre> <h3>Modified Paths</h3> <ul> <li><a href=3D"#tikiosxsrcTikiMainm">tiki/osx/src/TikiMain.m</a></li> </ul> </div> <div id=3D"patch"> <h3>Diff</h3> <a id=3D"tikiosxsrcTikiMainm"></a> <div class=3D"modfile"><h4>Modified: tiki/osx/src/TikiMain.m (274 =3D> 27= 5)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/osx/src/TikiMain.m 2005-11-21 23:37:06 UTC = (rev 274) +++ tiki/osx/src/TikiMain.m 2005-11-22 00:34:33 UTC (rev 275) </span><span class=3D"lines">@@ -82,7 +82,7 @@ </span><span class=3D"cx"> [mainWindow makeKeyAndOrderFront:nil]; </span><span class=3D"cx"> [mainWindow makeFirstResponder:mainView]; </span><span class=3D"cx"> [mainWindow setAcceptsMouseMovedEvents:true];= =20 </span><del>- </del><ins>+=09 </ins><span class=3D"cx"> NSDictionary * originalDisplayMode =3D (NSDict= ionary *) </span><span class=3D"cx"> CGDisplayCurrentMode(kCGDirectMainDisplay); </span><span class=3D"cx"> // depthBits =3D colorBits =3D [[originalDisp= layMode objectForKey: (id)kCGDisplayBitsPerPixel] intValue]; </span><span class=3D"lines">@@ -110,6 +110,8 @@ </span><span class=3D"cx"> CGLSetParameter(cglContext, kCGLCPSwapInterv= al, &param); </span><span class=3D"cx"> } </span><span class=3D"cx">=20 </span><ins>+ [mainView addTrackingRect:[mainView bounds] owner:mainView = userData:nil assumeInside:true]; +=09 </ins><span class=3D"cx"> //// [MapleEventReceiver init]; </span><span class=3D"cx">=20 </span><span class=3D"cx"> // Force us to become threaded. </span><span class=3D"lines">@@ -157,23 +159,13 @@ </span><span class=3D"cx"> // Handle the event we got </span><span class=3D"cx"> type =3D [event type]; </span><span class=3D"cx"> switch (type) { </span><ins>+ case NSMouseEntered: + if(!tikiShowMouse) [NSCursor hide]; + break; + case NSMouseExited: + if(!tikiShowMouse) [NSCursor unhide]; + break; </ins><span class=3D"cx"> case NSMouseMoved: </span><del>- { - NSPoint screenPoint =3D [NSEvent mouseLocation]; - NSRect windowRect =3D [mainWindow frame]; - float xMax =3D windowRect.origin.x + windowRect.size.width; - float yMax =3D windowRect.origin.y + windowRect.size.height; - //NSLog([NSString stringWithFormat:@"Point: (%f, %f) Frame: (%f,= %f) -> (%f, %f)\n", screenPoint.x, screenPoint.y, windowRect.ori= gin.x, windowRect.origin.y, xMax, yMax]); - if(screenPoint.x < windowRect.origin.x || screenPoint.x > xMax = || - screenPoint.y < windowRect.origin.y || screenPoint.y > yMax = || - tikiShowMouse) - { - [NSCursor unhide]; - } - else { - [NSCursor hide]; - } - } </del><span class=3D"cx"> case NSLeftMouseDown: </span><span class=3D"cx"> case NSLeftMouseUp: =09 </span><span class=3D"cx"> case NSRightMouseDown: </span><span class=3D"lines">@@ -184,7 +176,7 @@ </span><span class=3D"cx"> NSRect windowSize =3D [mainWindow frame]; </span><span class=3D"cx"> point.y -=3D windowSize.size.height; </span><span class=3D"cx"> point.y *=3D -1; </span><del>- =09 </del><ins>+ //NSLog([NSString stringWithFormat:@"MouseMove (%f, %= f)\n",point.x,point.y]); </ins><span class=3D"cx"> TikiRecvMouseEvent(event, &point); </span><span class=3D"cx"> =09 </span><span class=3D"cx"> // give the mouse event up to the app, we w= ill also process it though </span></pre> </div> </div> </body> </html> |
|
From: <cad...@li...> - 2005-11-21 23:45:01
|
<!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>[274] tiki/src/gl/drawables/cursor.cpp: Tiki: Cursor: retain our Z= value when new events come in</title> </head> <body> <div id=3D"msg"> <dl> <dt>Revision</dt> <dd>274</dd> <dt>Author</dt> <dd>sam.steele</dd> <dt>Date</dt> <dd>2005-11-21 15:37:06 -0800 (Mon, 21 Nov 2005)</dd> </dl> <h3>Log Message</h3> <pre>Tiki: Cursor: retain our Z value when new events come in</pre> <h3>Modified Paths</h3> <ul> <li><a href=3D"#tikisrcgldrawablescursorcpp">tiki/src/gl/drawables/cursor= .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 (27= 3 =3D> 274)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/src/gl/drawables/cursor.cpp 2005-11-21 23:3= 1:52 UTC (rev 273) +++ tiki/src/gl/drawables/cursor.cpp 2005-11-21 23:37:06 UTC (rev 274) </span><span class=3D"lines">@@ -51,7 +51,7 @@ </span><span class=3D"cx"> } </span><span class=3D"cx">=20 </span><span class=3D"cx"> if (evt.type=3D=3DEvent::EvtMouseMove ) { </span><del>- setTranslate(Vector(evt.x,evt.y,0)); </del><ins>+ setTranslate(Vector(evt.x,evt.y,getTranslate().z)); </ins><span class=3D"cx"> } </span><span class=3D"cx"> } </span><span class=3D"cx">=20 </span></pre> </div> </div> </body> </html> |
|
From: <cad...@li...> - 2005-11-21 23:39:46
|
<!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>[273] tiki/src/gl/drawables: Tiki: rename pointerArrow to PointerA= rrow</title> </head> <body> <div id=3D"msg"> <dl> <dt>Revision</dt> <dd>273</dd> <dt>Author</dt> <dd>sam.steele</dd> <dt>Date</dt> <dd>2005-11-21 15:31:52 -0800 (Mon, 21 Nov 2005)</dd> </dl> <h3>Log Message</h3> <pre>Tiki: rename pointerArrow to PointerArrow</pre> <h3>Modified Paths</h3> <ul> <li><a href=3D"#tikiincludeTikidrawablescursorh">tiki/include/Tiki/drawab= les/cursor.h</a></li> <li><a href=3D"#tikiincludeTikidrawablespointerArrowh">tiki/include/Tiki/= drawables/pointerArrow.h</a></li> <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"tikiincludeTikidrawablescursorh"></a> <div class=3D"modfile"><h4>Modified: tiki/include/Tiki/drawables/cursor.h= (272 =3D> 273)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/include/Tiki/drawables/cursor.h 2005-11-21 = 23:22:01 UTC (rev 272) +++ tiki/include/Tiki/drawables/cursor.h 2005-11-21 23:31:52 UTC (rev 273= ) </span><span class=3D"lines">@@ -9,7 +9,7 @@ </span><span class=3D"cx"> #ifndef __TIKI_DRW_CURSOR_H </span><span class=3D"cx"> #define __TIKI_DRW_CURSOR_H </span><span class=3D"cx">=20 </span><del>-#include <Tiki/drawable.h> </del><ins>+#include "Tiki/drawable.h" </ins><span class=3D"cx">=20 </span><span class=3D"cx"> namespace Tiki { </span><span class=3D"cx"> namespace GL { </span></pre></div> <a id=3D"tikiincludeTikidrawablespointerArrowh"></a> <div class=3D"modfile"><h4>Modified: tiki/include/Tiki/drawables/pointerA= rrow.h (272 =3D> 273)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/include/Tiki/drawables/pointerArrow.h 2005-= 11-21 23:22:01 UTC (rev 272) +++ tiki/include/Tiki/drawables/pointerArrow.h 2005-11-21 23:31:52 UTC (r= ev 273) </span><span class=3D"lines">@@ -15,14 +15,14 @@ </span><span class=3D"cx"> namespace Tiki { </span><span class=3D"cx"> namespace GL { </span><span class=3D"cx">=20 </span><del>-/* pointerArrow is an arrow-shaped Drawable, normally used a= s a Cursor pointer */ -class pointerArrow : public Tiki::GL::Drawable { </del><ins>+/* PointerArrow is an arrow-shaped Drawable, normally used as= a Cursor pointer */ +class PointerArrow : public Drawable { </ins><span class=3D"cx"> public: </span><del>- pointerArrow(); - ~pointerArrow(); </del><ins>+ PointerArrow(); + ~PointerArrow(); </ins><span class=3D"cx"> =09 </span><span class=3D"cx"> //Overloaded functions </span><del>- void draw(Tiki::GL::Drawable::ObjType list); </del><ins>+ void draw(ObjType list); </ins><span class=3D"cx"> }; </span><span class=3D"cx">=20 </span><span class=3D"cx"> }; </span></pre></div> <a id=3D"tikisrcgldrawablescursorcpp"></a> <div class=3D"modfile"><h4>Modified: tiki/src/gl/drawables/cursor.cpp (27= 2 =3D> 273)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/src/gl/drawables/cursor.cpp 2005-11-21 23:2= 2:01 UTC (rev 272) +++ tiki/src/gl/drawables/cursor.cpp 2005-11-21 23:31:52 UTC (rev 273) </span><span class=3D"lines">@@ -30,7 +30,7 @@ </span><span class=3D"cx"> subRemoveAll(); </span><span class=3D"cx"> =09 </span><span class=3D"cx"> if(pointer=3D=3DNULL) { </span><del>- subAdd(new pointerArrow()); </del><ins>+ subAdd(new PointerArrow()); </ins><span class=3D"cx"> } else { </span><span class=3D"cx"> subAdd(pointer); </span><span class=3D"cx"> } </span></pre></div> <a id=3D"tikisrcgldrawablespointerArrowcpp"></a> <div class=3D"modfile"><h4>Modified: tiki/src/gl/drawables/pointerArrow.c= pp (272 =3D> 273)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/src/gl/drawables/pointerArrow.cpp 2005-11-2= 1 23:22:01 UTC (rev 272) +++ tiki/src/gl/drawables/pointerArrow.cpp 2005-11-21 23:31:52 UTC (rev 2= 73) </span><span class=3D"lines">@@ -15,20 +15,20 @@ </span><span class=3D"cx"> using namespace Tiki::GL; </span><span class=3D"cx"> using namespace Tiki::GL::Plxcompat; </span><span class=3D"cx">=20 </span><del>-pointerArrow::pointerArrow() { </del><ins>+PointerArrow::PointerArrow() { </ins><span class=3D"cx"> setTint(Color(1.0,0.2,0.1)); </span><span class=3D"cx"> } </span><span class=3D"cx">=20 </span><del>-pointerArrow::~pointerArrow() { </del><ins>+PointerArrow::~PointerArrow() { </ins><span class=3D"cx"> } </span><span class=3D"cx">=20 </span><del>-void pointerArrow::draw(ObjType list) { </del><ins>+void PointerArrow::draw(ObjType list) { </ins><span class=3D"cx"> plx_vertex_t vert; </span><span class=3D"cx"> const Vector & tv =3D getPosition(); </span><span class=3D"cx">=20 </span><span class=3D"cx"> if(list=3D=3DTrans) { </span><span class=3D"cx"> vert.argb =3D Color(0,0,0); </span><del>- vert.z =3D 0; </del><ins>+ vert.z =3D tv.z; </ins><span class=3D"cx"> =09 </span><span class=3D"cx"> vert.flags =3D PLX_VERT; </span><span class=3D"cx"> vert.x =3D tv.x-2; </span><span class=3D"lines">@@ -46,7 +46,7 @@ </span><span class=3D"cx"> plx_prim(&vert, sizeof(vert)); </span><span class=3D"cx"> =09 </span><span class=3D"cx"> vert.argb =3D getTint(); </span><del>- vert.z =3D 0.01; </del><ins>+ vert.z =3D tv.z + 0.01; </ins><span class=3D"cx"> =09 </span><span class=3D"cx"> vert.flags =3D PLX_VERT; </span><span class=3D"cx"> vert.x =3D tv.x; </span></pre> </div> </div> </body> </html> |
|
From: <cad...@li...> - 2005-11-21 23:29:55
|
<!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>[272] tiki/src/gl/drawables/cursor.cpp: Tiki: Cursor's position no= t relative to parent</title> </head> <body> <div id=3D"msg"> <dl> <dt>Revision</dt> <dd>272</dd> <dt>Author</dt> <dd>sam.steele</dd> <dt>Date</dt> <dd>2005-11-21 15:22:01 -0800 (Mon, 21 Nov 2005)</dd> </dl> <h3>Log Message</h3> <pre>Tiki: Cursor's position not relative to parent</pre> <h3>Modified Paths</h3> <ul> <li><a href=3D"#tikisrcgldrawablescursorcpp">tiki/src/gl/drawables/cursor= .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 (27= 1 =3D> 272)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/src/gl/drawables/cursor.cpp 2005-11-21 23:2= 1:00 UTC (rev 271) +++ tiki/src/gl/drawables/cursor.cpp 2005-11-21 23:22:01 UTC (rev 272) </span><span class=3D"lines">@@ -20,7 +20,9 @@ </span><span class=3D"cx"> // Register us for HID input callbacks. </span><span class=3D"cx"> m_hidCookie =3D callbackReg(hidCallback, this= ); </span><span class=3D"cx"> assert( m_hidCookie >=3D 0 ); </span><del>- </del><ins>+=09 + //Our translation isn't relative to the parent + m_t_prelative =3D false; </ins><span class=3D"cx"> setCursor(pointer); </span><span class=3D"cx"> } </span><span class=3D"cx">=20 </span></pre> </div> </div> </body> </html> |
