From: <phe...@us...> - 2012-04-16 06:21:23
|
Revision: 13357 http://vegastrike.svn.sourceforge.net/vegastrike/?rev=13357&view=rev Author: pheonixstorm Date: 2012-04-16 06:21:17 +0000 (Mon, 16 Apr 2012) Log Message: ----------- Updated VC9 solution files and vegastrike binaries Modified Paths: -------------- trunk/vega-vc9/vegastrike/vegastrike.vcproj trunk/vega-vc9/vsserver/vsserver.aps trunk/vega-vc9/vsserver/vsserver.rc trunk/vegastrike/Resources.rc trunk/vegastrike/setup/vega.rc trunk/win32/bin/setup.exe trunk/win32/bin/vegaserver.exe trunk/win32/bin/vegastrike.exe Added Paths: ----------- trunk/vega-vc9/InstallScript/vegasetup51r1.iss Added: trunk/vega-vc9/InstallScript/vegasetup51r1.iss =================================================================== --- trunk/vega-vc9/InstallScript/vegasetup51r1.iss (rev 0) +++ trunk/vega-vc9/InstallScript/vegasetup51r1.iss 2012-04-16 06:21:17 UTC (rev 13357) @@ -0,0 +1,59 @@ +; Script generated by the Inno Setup Script Wizard. +; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! + +#define MyAppName "Vega Strike" +#define MyAppVersion ".5.1" +#define MyAppPublisher "Vega Strike Project" +#define MyAppURL "http://www.vega-strike.org" +#define MyAppExeName "vegastrike.exe" + +[Setup] +; NOTE: The value of AppId uniquely identifies this application. +; Do not use the same AppId value in installers for other applications. +; (To generate a new GUID, click Tools | Generate GUID inside the IDE.) +AppID={{10E0724C-11ED-45C8-AD4D-2D6FC6B304BF} +AppName={#MyAppName} +AppVersion={#MyAppVersion} +;AppVerName={#MyAppName} {#MyAppVersion} +AppPublisher={#MyAppPublisher} +AppPublisherURL={#MyAppURL} +AppSupportURL={#MyAppURL} +AppUpdatesURL={#MyAppURL} +DefaultDirName={pf}\{#MyAppName} +DefaultGroupName={#MyAppName} +AllowNoIcons=true +OutputDir=E:\vsdone +OutputBaseFilename=VS Setup .5.1 r1 +SetupIconFile=E:\vsinstall\vegastrike.ico +Compression=lzma2/Ultra +SolidCompression=true + +[Languages] +Name: "english"; MessagesFile: "compiler:Default.isl" +Name: "french"; MessagesFile: "compiler:Languages\French.isl" +Name: "german"; MessagesFile: "compiler:Languages\German.isl" +Name: "russian"; MessagesFile: "compiler:Languages\Russian.isl" +Name: "spanish"; MessagesFile: "compiler:Languages\Spanish.isl" + +[Tasks] +Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked +Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked; OnlyBelowVersion: 0,6.1 + +[Files] +Source: "E:\vsinstall\vegastrike.exe"; DestDir: "{app}"; Flags: ignoreversion +Source: "E:\vsinstall\vcredist_x86.exe"; DestDir: "{app}"; Flags: ignoreversion +Source: "E:\vsinstall\oalinst.exe"; DestDir: "{app}"; Flags: ignoreversion +Source: "E:\vsinstall\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs +; NOTE: Don't use "Flags: ignoreversion" on any shared system files + +[Icons] +Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}" +Name: "{group}\{cm:ProgramOnTheWeb,{#MyAppName}}"; Filename: "{#MyAppURL}" +Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}" +Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon +Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: quicklaunchicon + +[Run] +Filename: "{app}\vcredist_x86.exe"; Description: "MS Visual C++ 2008 runtime files"; StatusMsg: "Installing Visual C++ 9 Runtime Files..."; Flags: nowait +Filename: "{app}\oalinst.exe"; Description: "Creative Labs OpenAL Runtime Files"; StatusMsg: "Installing OpenAL Runtime Files..."; Flags: nowait +Filename: {app}\{#MyAppExeName}; Flags: postinstall skipifsilent WaitUntilIdle; Modified: trunk/vega-vc9/vegastrike/vegastrike.vcproj =================================================================== --- trunk/vega-vc9/vegastrike/vegastrike.vcproj 2012-04-16 06:10:09 UTC (rev 13356) +++ trunk/vega-vc9/vegastrike/vegastrike.vcproj 2012-04-16 06:21:17 UTC (rev 13357) @@ -188,10 +188,11 @@ PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;HAVE_AL;HAVE_SDL;YY_ALWAYS_INTERACTIVE;SDL_WINDOWING;HAVE_OGG;HAVE_BOOST;HAVE_PYTHON;JPEG_SUPPORT;BOOST_PYTHON_NO_PY_SIGNATURES;BOOST_PYTHON_STATIC_LIB;BOOST_ALL_NO_LIB;NV_CUBE_MAP;OPCODE_COLLIDER;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE" StringPooling="true" RuntimeLibrary="2" - BufferSecurityCheck="false" + BufferSecurityCheck="true" EnableFunctionLevelLinking="false" EnableEnhancedInstructionSet="2" WarningLevel="1" + Detect64BitPortabilityProblems="true" DebugInformationFormat="3" CompileAs="0" DisableSpecificWarnings="4100;4244;4290;4512" @@ -221,7 +222,7 @@ SubSystem="2" OptimizeReferences="0" EnableCOMDATFolding="0" - OptimizeForWindows98="0" + OptimizeForWindows98="1" LinkTimeCodeGeneration="0" RandomizedBaseAddress="1" DataExecutionPrevention="0" Modified: trunk/vega-vc9/vsserver/vsserver.aps =================================================================== (Binary files differ) Modified: trunk/vega-vc9/vsserver/vsserver.rc =================================================================== --- trunk/vega-vc9/vsserver/vsserver.rc 2012-04-16 06:10:09 UTC (rev 13356) +++ trunk/vega-vc9/vsserver/vsserver.rc 2012-04-16 06:21:17 UTC (rev 13357) @@ -62,8 +62,8 @@ // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,5,1,13324 - PRODUCTVERSION 0,5,1,13324 + FILEVERSION 0,5,1,13356 + PRODUCTVERSION 0,5,1,13356 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x9L @@ -81,13 +81,13 @@ VALUE "Comments", "Vega Strike is the 3D Space Simulator that allows you to trade and bounty hunt in a vast universe. Can you face the dangers and decisions that await..." VALUE "CompanyName", "Vega Strike Project" VALUE "FileDescription", "Vega Strike standalone server" - VALUE "FileVersion", "0.5.1.13324" + VALUE "FileVersion", "0.5.1.13356" VALUE "InternalName", "vegaserver" VALUE "LegalCopyright", "\xA9 Copyright 1998-2011 Vega Strike Project. All rights reserved. See the vega-licence.txt for details." - VALUE "OriginalFilename", "vegaserver.exe" - VALUE "PrivateBuild", "13324" + VALUE "OriginalFilename", "Vegaserver.exe" + VALUE "PrivateBuild", "13356" VALUE "ProductName", "Vega Strike" - VALUE "ProductVersion", "0.5.1.13324" + VALUE "ProductVersion", "0.5.1.13356" END END BLOCK "VarFileInfo" Modified: trunk/vegastrike/Resources.rc =================================================================== --- trunk/vegastrike/Resources.rc 2012-04-16 06:10:09 UTC (rev 13356) +++ trunk/vegastrike/Resources.rc 2012-04-16 06:21:17 UTC (rev 13357) @@ -62,8 +62,8 @@ // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,5,1,13324 - PRODUCTVERSION 0,5,1,13324 + FILEVERSION 0,5,1,13356 + PRODUCTVERSION 0,5,1,13356 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x9L @@ -81,13 +81,13 @@ VALUE "Comments", "Vega Strike is the 3D Space Simulator that allows you to trade and bounty hunt in a vast universe. Can you face the dangers and decisions that await..." VALUE "CompanyName", "Vega Strike Project" VALUE "FileDescription", "Vega Strike Open Source Space Simulator" - VALUE "FileVersion", "0.5.1.13324" + VALUE "FileVersion", "0.5.1.13356" VALUE "InternalName", "vegastrike" VALUE "LegalCopyright", "\xA9 Copyright 1998-2011 Vega Strike Project. All rights reserved. See the vega-licence.txt for details." - VALUE "OriginalFilename", "vegastrike.exe" - VALUE "PrivateBuild", "13310" + VALUE "OriginalFilename", "Vegastrike.exe" + VALUE "PrivateBuild", "13356" VALUE "ProductName", "Vega Strike" - VALUE "ProductVersion", "0.5.1.13324" + VALUE "ProductVersion", "0.5.1.13356" END END BLOCK "VarFileInfo" Modified: trunk/vegastrike/setup/vega.rc =================================================================== --- trunk/vegastrike/setup/vega.rc 2012-04-16 06:10:09 UTC (rev 13356) +++ trunk/vegastrike/setup/vega.rc 2012-04-16 06:21:17 UTC (rev 13357) @@ -62,13 +62,13 @@ // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,5,1,13324 - PRODUCTVERSION 0,5,1,13324 + FILEVERSION 0,5,1,13356 + PRODUCTVERSION 0,5,1,13356 FILEFLAGSMASK 0x3fL #ifdef _DEBUG - FILEFLAGS 0x1L + FILEFLAGS 0x9L #else - FILEFLAGS 0x0L + FILEFLAGS 0x8L #endif FILEOS 0x40004L FILETYPE 0x1L @@ -81,12 +81,13 @@ VALUE "Comments", "Vega Strike is the 3D Space Simulator that allows you to trade and bounty hunt in a vast universe. Can you face the dangers and decisions that await..." VALUE "CompanyName", "Vega Strike Project" VALUE "FileDescription", "Vega Strike Configurator" - VALUE "FileVersion", "0.5.1.13324" + VALUE "FileVersion", "0.5.1.13356" VALUE "InternalName", "vegastrike" VALUE "LegalCopyright", "\xA9 Copyright 1998-2008 Vega Strike Project. All rights reserved. See the vega-licence.txt for details." VALUE "OriginalFilename", "setup.exe" + VALUE "PrivateBuild", "13356" VALUE "ProductName", "Vega Strike" - VALUE "ProductVersion", "0.5.1.13324" + VALUE "ProductVersion", "0.5.1.13356" END END BLOCK "VarFileInfo" Modified: trunk/win32/bin/setup.exe =================================================================== (Binary files differ) Modified: trunk/win32/bin/vegaserver.exe =================================================================== (Binary files differ) Modified: trunk/win32/bin/vegastrike.exe =================================================================== (Binary files differ) |
From: <phe...@us...> - 2012-04-16 23:01:37
|
Revision: 13359 http://vegastrike.svn.sourceforge.net/vegastrike/?rev=13359&view=rev Author: pheonixstorm Date: 2012-04-16 23:01:30 +0000 (Mon, 16 Apr 2012) Log Message: ----------- Updated binary and resource file for VC9. Changes: homedir for windows changed outside install dir. Modified Paths: -------------- trunk/vegastrike/Resources.rc trunk/win32/bin/vegastrike.exe Modified: trunk/vegastrike/Resources.rc =================================================================== --- trunk/vegastrike/Resources.rc 2012-04-16 22:16:29 UTC (rev 13358) +++ trunk/vegastrike/Resources.rc 2012-04-16 23:01:30 UTC (rev 13359) @@ -62,8 +62,8 @@ // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,5,1,13356 - PRODUCTVERSION 0,5,1,13356 + FILEVERSION 0,5,1,13358 + PRODUCTVERSION 0,5,1,13358 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x9L @@ -81,13 +81,13 @@ VALUE "Comments", "Vega Strike is the 3D Space Simulator that allows you to trade and bounty hunt in a vast universe. Can you face the dangers and decisions that await..." VALUE "CompanyName", "Vega Strike Project" VALUE "FileDescription", "Vega Strike Open Source Space Simulator" - VALUE "FileVersion", "0.5.1.13356" + VALUE "FileVersion", "0.5.1.1338" VALUE "InternalName", "vegastrike" VALUE "LegalCopyright", "\xA9 Copyright 1998-2011 Vega Strike Project. All rights reserved. See the vega-licence.txt for details." VALUE "OriginalFilename", "Vegastrike.exe" - VALUE "PrivateBuild", "13356" + VALUE "PrivateBuild", "13358" VALUE "ProductName", "Vega Strike" - VALUE "ProductVersion", "0.5.1.13356" + VALUE "ProductVersion", "0.5.1.13358" END END BLOCK "VarFileInfo" Modified: trunk/win32/bin/vegastrike.exe =================================================================== (Binary files differ) |
From: <phe...@us...> - 2012-05-06 06:55:09
|
Revision: 13370 http://vegastrike.svn.sourceforge.net/vegastrike/?rev=13370&view=rev Author: pheonixstorm Date: 2012-05-06 06:55:02 +0000 (Sun, 06 May 2012) Log Message: ----------- Updating binary to latest changes. 0.5.2.13370 Modified Paths: -------------- trunk/vega-vc9/vegastrike/vegastrike.vcproj trunk/win32/bin/vegastrike.exe Property Changed: ---------------- trunk/vega-vc9/ Property changes on: trunk/vega-vc9 ___________________________________________________________________ Modified: svn:ignore - *.suo DevTools.ncb Release vegastrike.ncb + *.suo Debug DevTools.ncb Release vegastrike.ncb Modified: trunk/vega-vc9/vegastrike/vegastrike.vcproj =================================================================== --- trunk/vega-vc9/vegastrike/vegastrike.vcproj 2012-05-06 05:59:12 UTC (rev 13369) +++ trunk/vega-vc9/vegastrike/vegastrike.vcproj 2012-05-06 06:55:02 UTC (rev 13370) @@ -191,8 +191,8 @@ BufferSecurityCheck="true" EnableFunctionLevelLinking="false" EnableEnhancedInstructionSet="2" - WarningLevel="1" - Detect64BitPortabilityProblems="true" + WarningLevel="4" + Detect64BitPortabilityProblems="false" DebugInformationFormat="3" CompileAs="0" DisableSpecificWarnings="4100;4244;4290;4512" @@ -227,6 +227,7 @@ RandomizedBaseAddress="1" DataExecutionPrevention="0" TargetMachine="1" + CLRThreadAttribute="0" /> <Tool Name="VCALinkTool" Modified: trunk/win32/bin/vegastrike.exe =================================================================== (Binary files differ) |
From: <kla...@us...> - 2012-07-16 03:51:02
|
Revision: 13388 http://vegastrike.svn.sourceforge.net/vegastrike/?rev=13388&view=rev Author: klaussfreire Date: 2012-07-16 03:50:55 +0000 (Mon, 16 Jul 2012) Log Message: ----------- issue #3435204: expand cockpit sounds Modified Paths: -------------- trunk/data/cockpits/disabled-cockpit.cpt/disabled-cockpit.cpt trunk/vegastrike/CMakeLists.txt trunk/vegastrike/Makefile.am trunk/vegastrike/src/SharedPool.h trunk/vegastrike/src/accountserver.cpp trunk/vegastrike/src/cmd/container.h trunk/vegastrike/src/cmd/images.h trunk/vegastrike/src/cmd/unit_generic.cpp trunk/vegastrike/src/cmd/unit_generic.h trunk/vegastrike/src/gfx/cockpit.cpp trunk/vegastrike/src/gfx/cockpit.h trunk/vegastrike/src/gfx/cockpit_generic.cpp trunk/vegastrike/src/gfx/cockpit_generic.h trunk/vegastrike/src/gfx/cockpit_xml.cpp trunk/vegastrike/src/gfx/vid_file.cpp trunk/vegastrike/src/vegastrike.h trunk/vegastrike/src/vs_globals.cpp trunk/vegastrike/src/vsfilesystem.cpp Added Paths: ----------- trunk/data/sounds/asap.wav trunk/data/sounds/lockwarning.wav trunk/data/sounds/missilelockwarning.wav trunk/masters/sounds/lockwarning.tar.gz trunk/masters/sounds/missilelockwarning.tar.gz trunk/vegastrike/src/gfx/soundcontainer.cpp trunk/vegastrike/src/gfx/soundcontainer.h trunk/vegastrike/src/gfx/soundcontainer_aldrv.cpp trunk/vegastrike/src/gfx/soundcontainer_aldrv.h trunk/vegastrike/src/gfx/soundcontainer_generic.cpp trunk/vegastrike/src/gfx/soundcontainer_generic.h Modified: trunk/data/cockpits/disabled-cockpit.cpt/disabled-cockpit.cpt =================================================================== --- trunk/data/cockpits/disabled-cockpit.cpt/disabled-cockpit.cpt 2012-07-11 08:18:51 UTC (rev 13387) +++ trunk/data/cockpits/disabled-cockpit.cpt/disabled-cockpit.cpt 2012-07-16 03:50:55 UTC (rev 13388) @@ -63,4 +63,11 @@ <VDU TextRows="14" TextCols="100" type="Message" file="mvdu.sprite" /> <VDU TextRows="30" TextCols="30" type="Objectives" file="objvdu.sprite"/> <VDU TextRows="15" TextCols="30" type="Comm" file ="commvdu.sprite" /> + + <!-- Sounds --> + <Event event="JumpAvailable" soundfile="electricity.wav" /> + <Event event="ASAPEngaged" soundfile="asap.wav" /> + <Event event="ASAPDisengaged" soundfile="lockingbak.wav" /> + <Event event="Lock" soundfile="lockwarning.wav" looping="true" /> + <Event event="MissileLock" soundfile="missilelockwarning.wav" looping="true" /> </Cockpit> \ No newline at end of file Added: trunk/data/sounds/asap.wav =================================================================== (Binary files differ) Property changes on: trunk/data/sounds/asap.wav ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/data/sounds/lockwarning.wav =================================================================== (Binary files differ) Property changes on: trunk/data/sounds/lockwarning.wav ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/data/sounds/missilelockwarning.wav =================================================================== (Binary files differ) Property changes on: trunk/data/sounds/missilelockwarning.wav ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/masters/sounds/lockwarning.tar.gz =================================================================== (Binary files differ) Property changes on: trunk/masters/sounds/lockwarning.tar.gz ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/masters/sounds/missilelockwarning.tar.gz =================================================================== (Binary files differ) Property changes on: trunk/masters/sounds/missilelockwarning.tar.gz ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/vegastrike/CMakeLists.txt =================================================================== --- trunk/vegastrike/CMakeLists.txt 2012-07-11 08:18:51 UTC (rev 13387) +++ trunk/vegastrike/CMakeLists.txt 2012-07-16 03:50:55 UTC (rev 13388) @@ -233,6 +233,7 @@ src/gfx/mesh_xml.cpp src/gfx/mesh.cpp src/gfx/quaternion.cpp + src/gfx/soundcontainer_generic.cpp src/gfx/sphere_generic.cpp src/gfx/vec.cpp ) @@ -294,6 +295,8 @@ src/gfx/quadtree.cpp src/gfx/ring.cpp src/gfx/screenshot.cpp + src/gfx/soundcontainer.cpp + src/gfx/soundcontainer_aldrv.cpp src/gfx/sphere.cpp src/gfx/sprite.cpp src/gfx/star.cpp Modified: trunk/vegastrike/Makefile.am =================================================================== --- trunk/vegastrike/Makefile.am 2012-07-11 08:18:51 UTC (rev 13387) +++ trunk/vegastrike/Makefile.am 2012-07-16 03:50:55 UTC (rev 13388) @@ -558,6 +558,8 @@ src/gfx/mesh.h \ src/gfx/quaternion.cpp \ src/gfx/quaternion.h \ + src/gfx/soundcontainer_generic.h \ + src/gfx/soundcontainer_generic.cpp \ src/gfx/sphere_generic.cpp \ src/gfx/vec.cpp \ src/gfx/vec.h \ @@ -660,6 +662,10 @@ src/gfx/ring.h \ src/gfx/screenshot.cpp \ src/gfx/screenshot.h \ + src/gfx/soundcontainer.h \ + src/gfx/soundcontainer.cpp \ + src/gfx/soundcontainer_aldrv.h \ + src/gfx/soundcontainer_aldrv.cpp \ src/gfx/sphere.cpp \ src/gfx/sphere.h \ src/gfx/sprite.cpp \ Modified: trunk/vegastrike/src/SharedPool.h =================================================================== --- trunk/vegastrike/src/SharedPool.h 2012-07-11 08:18:51 UTC (rev 13387) +++ trunk/vegastrike/src/SharedPool.h 2012-07-16 03:50:55 UTC (rev 13388) @@ -58,7 +58,8 @@ ++(_it->second); } -public: Reference() : + public: + Reference() : _it( SharedPool::getSingleton().referenceCounter.end() ) , _rc( &SharedPool::getSingleton().referenceCounter ) {} Modified: trunk/vegastrike/src/accountserver.cpp =================================================================== --- trunk/vegastrike/src/accountserver.cpp 2012-07-11 08:18:51 UTC (rev 13387) +++ trunk/vegastrike/src/accountserver.cpp 2012-07-16 03:50:55 UTC (rev 13388) @@ -42,6 +42,7 @@ char SERVER = 2; float simulation_atom_var = (float) 1.0/10.0; +float audio_atom_var = (float) 1.0/18.0; class NetClient {}; NetClient *Network; Modified: trunk/vegastrike/src/cmd/container.h =================================================================== --- trunk/vegastrike/src/cmd/container.h 2012-07-11 08:18:51 UTC (rev 13387) +++ trunk/vegastrike/src/cmd/container.h 2012-07-16 03:50:55 UTC (rev 13388) @@ -41,6 +41,11 @@ ~UnitContainer(); void SetUnit( Unit* ); Unit * GetUnit(); + + const Unit * GetConstUnit() const + { + return unit; + } }; #endif Modified: trunk/vegastrike/src/cmd/images.h =================================================================== --- trunk/vegastrike/src/cmd/images.h 2012-07-11 08:18:51 UTC (rev 13387) +++ trunk/vegastrike/src/cmd/images.h 2012-07-16 03:50:55 UTC (rev 13388) @@ -348,7 +348,7 @@ //target gauges TARGETSHIELDF, TARGETSHIELDB, TARGETSHIELDR, TARGETSHIELDL, KPS, //KEEP KPS HERE - it marks the start of text-based gauges - SETKPS, COCKPIT_FPS, WARPFIELDSTRENGTH, MAXKPS, MAXCOMBATKPS, MAXCOMBATABKPS, MASSEFFECT, + SETKPS, COCKPIT_FPS, WARPFIELDSTRENGTH, MAXWARPFIELDSTRENGTH, MAXKPS, MAXCOMBATKPS, MAXCOMBATABKPS, MASSEFFECT, AUTOPILOT_MODAL, //KEEP first multimodal gauge HERE -- it marks the start of multi-modal gauges SPEC_MODAL, FLIGHTCOMPUTER_MODAL, TURRETCONTROL_MODAL, ECM_MODAL, CLOAK_MODAL, TRAVELMODE_MODAL, RECIEVINGFIRE_MODAL, RECEIVINGMISSILES_MODAL, RECEIVINGMISSILELOCK_MODAL, RECEIVINGTARGETLOCK_MODAL, Modified: trunk/vegastrike/src/cmd/unit_generic.cpp =================================================================== --- trunk/vegastrike/src/cmd/unit_generic.cpp 2012-07-11 08:18:51 UTC (rev 13387) +++ trunk/vegastrike/src/cmd/unit_generic.cpp 2012-07-16 03:50:55 UTC (rev 13388) @@ -166,6 +166,23 @@ maxenergy = maxen; } +Vector Unit::GetWarpRefVelocity() const +{ + //Velocity + Vector VelocityRef( 0, 0, 0 ); + { + const Unit *vr = computer.velocity_ref.GetConstUnit(); + if (vr) + VelocityRef = vr->cumulative_velocity; + } + Vector v = Velocity-VelocityRef; + float len = v.Magnitude(); + if (len > .01) //only get velocity going in DIRECTIOn of cumulative transformation for warp calc... + v = v*( cumulative_transformation_matrix.getR().Dot( v*(1./len) ) ); + + return v; +} + Vector Unit::GetWarpVelocity() const { Vector VelocityRef( 0, 0, 0 ); @@ -2661,25 +2678,50 @@ return minmultiplier; } +float Unit::GetMaxWarpFieldStrength( float rampmult ) const +{ + Vector v = GetWarpRefVelocity(); + + //Pi^2 + static float warpMultiplierMin = + XMLSupport::parse_float( vs_config->getVariable( "physics", "warpMultiplierMin", "9.86960440109" ) ); + //C + static float warpMultiplierMax = + XMLSupport::parse_float( vs_config->getVariable( "physics", "warpMultiplierMax", "300000000" ) ); + //Pi^2 * C + static float warpMaxEfVel = XMLSupport::parse_float( vs_config->getVariable( "physics", "warpMaxEfVel", "2960881320" ) ); + //inverse fractional effect of ship vs real big object + float minmultiplier = warpMultiplierMax*graphicOptions.MaxWarpMultiplier; + Unit *nearest_unit = NULL; + minmultiplier = CalculateNearestWarpUnit( this, minmultiplier, &nearest_unit, true ); + float minWarp = warpMultiplierMin*graphicOptions.MinWarpMultiplier; + float maxWarp = warpMultiplierMax*graphicOptions.MaxWarpMultiplier; + if (minmultiplier < minWarp) + minmultiplier = minWarp; + if (minmultiplier > maxWarp) + minmultiplier = maxWarp; //SOFT LIMIT + minmultiplier *= rampmult; + if (minmultiplier < 1) + minmultiplier = 1; + v *= minmultiplier; + float vmag = sqrt( v.i*v.i+v.j*v.j+v.k*v.k ); + if (vmag > warpMaxEfVel) { + v *= warpMaxEfVel/vmag; //HARD LIMIT + minmultiplier *= warpMaxEfVel/vmag; + } + return minmultiplier; +} + void Unit::AddVelocity( float difficulty ) { - Vector VelocityRef( 0, 0, 0 ); - { - Unit *vr = computer.velocity_ref.GetUnit(); - if (vr) - VelocityRef = vr->cumulative_velocity; - } //for the heck of it. static float humanwarprampuptime = XMLSupport::parse_float( vs_config->getVariable( "physics", "warprampuptime", "5" ) ); //for the heck of it. static float compwarprampuptime = XMLSupport::parse_float( vs_config->getVariable( "physics", "computerwarprampuptime", "10" ) ); static float warprampdowntime = XMLSupport::parse_float( vs_config->getVariable( "physics", "warprampdowntime", "0.5" ) ); - Vector v = Velocity-VelocityRef; - float len = v.Magnitude(); float lastWarpField = graphicOptions.WarpFieldStrength; - if (len > .01) //only get velocity going in DIRECTIOn of cumulative transformation for warp calc... - v = v*( cumulative_transformation_matrix.getR().Dot( v*(1./len) ) ); + bool playa = _Universe->isPlayerStarship( this ) ? true : false; float warprampuptime = playa ? humanwarprampuptime : compwarprampuptime; //Warp Turning on/off @@ -2693,19 +2735,7 @@ graphicOptions.WarpRamping = 0; } if (graphicOptions.InWarp == 1 || graphicOptions.RampCounter != 0) { - //Pi^2 - static float warpMultiplierMin = - XMLSupport::parse_float( vs_config->getVariable( "physics", "warpMultiplierMin", "9.86960440109" ) ); - //C - static float warpMultiplierMax = - XMLSupport::parse_float( vs_config->getVariable( "physics", "warpMultiplierMax", "300000000" ) ); - //Pi^2 * C - static float warpMaxEfVel = XMLSupport::parse_float( vs_config->getVariable( "physics", "warpMaxEfVel", "2960881320" ) ); - //inverse fractional effect of ship vs real big object - float minmultiplier = warpMultiplierMax*graphicOptions.MaxWarpMultiplier; - Unit *nearest_unit = NULL; - minmultiplier = CalculateNearestWarpUnit( this, minmultiplier, &nearest_unit, true ); - float rampmult = 1; + float rampmult = 1.f; if (graphicOptions.RampCounter != 0) { graphicOptions.RampCounter -= SIMULATION_ATOM; if (graphicOptions.RampCounter <= 0) @@ -2715,32 +2745,18 @@ if (graphicOptions.InWarp == 1 && graphicOptions.RampCounter > warprampuptime) graphicOptions.RampCounter = warprampuptime; rampmult = (graphicOptions.InWarp) ? 1.0 - -( (graphicOptions.RampCounter - /warprampuptime) - *(graphicOptions.RampCounter - /warprampuptime) ) : (graphicOptions.RampCounter - /warprampdowntime)*(graphicOptions.RampCounter/warprampdowntime); + -( (graphicOptions.RampCounter + /warprampuptime) + *(graphicOptions.RampCounter + /warprampuptime) ) : (graphicOptions.RampCounter + /warprampdowntime)*(graphicOptions.RampCounter/warprampdowntime); } - float minWarp = warpMultiplierMin*graphicOptions.MinWarpMultiplier; - float maxWarp = warpMultiplierMax*graphicOptions.MaxWarpMultiplier; - if (minmultiplier < minWarp) - minmultiplier = minWarp; - if (minmultiplier > maxWarp) - minmultiplier = maxWarp; //SOFT LIMIT - minmultiplier *= rampmult; - if (minmultiplier < 1) - minmultiplier = 1; - v *= minmultiplier; - float vmag = sqrt( v.i*v.i+v.j*v.j+v.k*v.k ); - if (vmag > warpMaxEfVel) { - v *= warpMaxEfVel/vmag; //HARD LIMIT - minmultiplier *= warpMaxEfVel/vmag; - } - graphicOptions.WarpFieldStrength = minmultiplier; + graphicOptions.WarpFieldStrength = GetMaxWarpFieldStrength(rampmult); } else { graphicOptions.WarpFieldStrength = 1; } //not any more? lastWarpField=1; + Vector v; if (graphicOptions.WarpFieldStrength != 1.0) v = GetWarpVelocity(); else Modified: trunk/vegastrike/src/cmd/unit_generic.h =================================================================== --- trunk/vegastrike/src/cmd/unit_generic.h 2012-07-11 08:18:51 UTC (rev 13387) +++ trunk/vegastrike/src/cmd/unit_generic.h 2012-07-16 03:50:55 UTC (rev 13388) @@ -923,6 +923,7 @@ { return warpenergy; } + float GetMaxWarpFieldStrength( float rampmult = 1.f ) const; void DecreaseWarpEnergy( bool insystem, float time = 1.0f ); void IncreaseWarpEnergy( bool insystem, float time = 1.0f ); bool RefillWarpEnergy(); @@ -1108,6 +1109,7 @@ return cumulative_velocity; } Vector GetWarpVelocity() const; + Vector GetWarpRefVelocity() const; void SetVelocity( const Vector& ); void SetAngularVelocity( const Vector& ); float GetMoment() const Modified: trunk/vegastrike/src/gfx/cockpit.cpp =================================================================== --- trunk/vegastrike/src/gfx/cockpit.cpp 2012-07-11 08:18:51 UTC (rev 13387) +++ trunk/vegastrike/src/gfx/cockpit.cpp 2012-07-16 03:50:55 UTC (rev 13388) @@ -55,6 +55,7 @@ #include <string> #include "cmd/unit_const_cache.h" #include "options.h" +#include "soundcontainer_aldrv.h" extern vs_options game_options; @@ -1141,6 +1142,9 @@ case UnitImages< void >::WARPFIELDSTRENGTH: return target->graphicOptions.WarpFieldStrength; + + case UnitImages< void >::MAXWARPFIELDSTRENGTH: + return target->GetMaxWarpFieldStrength(); case UnitImages< void >::JUMP: return jumpok ? 1 : 0; @@ -1386,6 +1390,167 @@ return; } +GameCockpit::LastState::LastState() +{ + processing_time = 0; + + jumpok = jumpnotok = + specon = specoff = + asapon = asapoff = + asap_dockon = asap_dockoff = + asap_dock_avail = + dock = + dock_avail = + lock = missilelock = + eject = + flightcompon = flightcompoff = false; +} + +void GameCockpit::TriggerEvents( Unit *un ) +{ + double curtime = UniverseUtil::GetGameTime(); + if ((curtime - AUDIO_ATOM) < last.processing_time) + return; + else + last.processing_time = curtime; + + VSFileSystem::vs_dprintf(3, "Processing events\n"); + for (EVENTID event = EVENTID_FIRST; event < NUM_EVENTS; event = (EVENTID)(event+1)) { + GameSoundContainer *sound = static_cast<GameSoundContainer*>(GetSoundForEvent(event)); + if (sound != NULL) { + #define MODAL_TRIGGER(name, _triggervalue, _curvalue, lastvar) \ + do { \ + bool triggervalue = _triggervalue; \ + bool curvalue = _curvalue; \ + VSFileSystem::vs_dprintf(3, "Processing event " name " (cur=%d last=%d)\n", \ + int(curvalue), int(last.lastvar) ); \ + \ + if (curvalue != last.lastvar) { \ + VSFileSystem::vs_dprintf(2, "Triggering event edge " name " (cur=%d last=%d on=%d)\n", \ + int(curvalue), int(last.lastvar), int(triggervalue) ); \ + last.lastvar = curvalue; \ + if (curvalue == triggervalue) \ + sound->play(); \ + else \ + sound->stop(); \ + } \ + } while(0) + + #define MODAL_IMAGE_TRIGGER(image, itrigger, btrigger, lastvar) \ + MODAL_TRIGGER(#image, btrigger, LookupUnitStat(UnitImages< void >::image, un) == UnitImages< void >::itrigger, lastvar) + + #define MODAL_RAWIMAGE_TRIGGER(image, itrigger, btrigger, lastvar) \ + MODAL_TRIGGER(#image, btrigger, LookupUnitStat(UnitImages< void >::image, un) itrigger, lastvar) + + switch(event) { + case WARP_READY: + MODAL_RAWIMAGE_TRIGGER(MAXWARPFIELDSTRENGTH, >= 2, true, warpready); + break; + case WARP_UNREADY: + MODAL_RAWIMAGE_TRIGGER(MAXWARPFIELDSTRENGTH, >= 2, false, warpunready); + break; + case WARP_ENGAGED: + MODAL_IMAGE_TRIGGER(SPEC_MODAL, OFF, false, specon); + break; + case WARP_DISENGAGED: + MODAL_IMAGE_TRIGGER(SPEC_MODAL, OFF, true, specoff); + break; + case FLIGHT_COMPUTER_ENABLED: + MODAL_IMAGE_TRIGGER(FLIGHTCOMPUTER_MODAL, OFF, false, flightcompon); + break; + case FLIGHT_COMPUTER_DISABLED: + MODAL_IMAGE_TRIGGER(FLIGHTCOMPUTER_MODAL, OFF, true, flightcompoff); + break; + case ASAP_ENGAGED: + MODAL_TRIGGER("ASAP_ENGAGED", true, un->autopilotactive, asapon); + break; + case ASAP_DISENGAGED: + MODAL_TRIGGER("ASAP_DISENGAGED", false, un->autopilotactive, asapoff); + break; + case DOCK_AVAILABLE: + MODAL_IMAGE_TRIGGER(CANDOCK_MODAL, READY, true, dock_avail); + break; + case ASAP_DOCKING_AVAILABLE: + MODAL_IMAGE_TRIGGER(CANDOCK_MODAL, AUTOREADY, true, asap_dock_avail); + break; + case ASAP_DOCKING_ENGAGED: + { + UnitImages< void >::GAUGES candock = (UnitImages< void >::GAUGES)LookupUnitStat(UnitImages< void >::CANDOCK_MODAL, un); + MODAL_TRIGGER("ASAP_DOCKING", true, + (un->autopilotactive && ( candock == UnitImages< void >::READY + || candock == UnitImages< void >::AUTOREADY)), + asap_dockon); + } + break; + case ASAP_DOCKING_DISENGAGED: + { + UnitImages< void >::GAUGES candock = (UnitImages< void >::GAUGES)LookupUnitStat(UnitImages< void >::CANDOCK_MODAL, un); + MODAL_TRIGGER("ASAP_DOCKING", false, + (un->autopilotactive && ( candock == UnitImages< void >::READY + || candock == UnitImages< void >::AUTOREADY)), + asap_dockoff); + } + break; + case JUMP_AVAILABLE: + MODAL_TRIGGER("JUMP_AVAILABLE", true, ((jumpok) ? true : false), jumpok); + break; + case JUMP_UNAVAILABLE: + MODAL_TRIGGER("JUMP_UNAVAILABLE", false, ((jumpok) ? true : false), jumpnotok); + break; + case LOCK_WARNING: + MODAL_RAWIMAGE_TRIGGER(LOCK, >= 1, true, lock); + break; + case MISSILELOCK_WARNING: + MODAL_RAWIMAGE_TRIGGER(MISSILELOCK, >= 1, true, missilelock); + break; + case EJECT_WARNING: + MODAL_RAWIMAGE_TRIGGER(EJECT, >= 1, true, eject); + break; + case WARP_LOOP0: + case WARP_LOOP0+1: + case WARP_LOOP0+2: + case WARP_LOOP0+3: + case WARP_LOOP0+4: + case WARP_LOOP0+5: + case WARP_LOOP0+6: + case WARP_LOOP0+7: + case WARP_LOOP0+8: + case WARP_LOOP0+9: + { + float warpfieldstrength = LookupUnitStat(UnitImages< void >::WARPFIELDSTRENGTH, un); + int warpreflevel = event - WARP_LOOP0; + int warplevel = int(log(warpfieldstrength)/log(10)); + MODAL_TRIGGER("WARP_LOOP", warpreflevel, warplevel, warplooplevel); + } + break; + case WARP_SKIP0: + case WARP_SKIP0+1: + case WARP_SKIP0+2: + case WARP_SKIP0+3: + case WARP_SKIP0+4: + case WARP_SKIP0+5: + case WARP_SKIP0+6: + case WARP_SKIP0+7: + case WARP_SKIP0+8: + case WARP_SKIP0+9: + { + float warpfieldstrength = LookupUnitStat(UnitImages< void >::WARPFIELDSTRENGTH, un); + int warpreflevel = event - WARP_SKIP0; + int warplevel = int(log(warpfieldstrength)/log(10)); + MODAL_TRIGGER("WARP_SKIP", warpreflevel, warplevel, warpskiplevel); + } + break; + case JUMP_FAILED: + case DOCK_FAILED: + // TODO + break; + default: + break; + } + } + } +} + void GameCockpit::DrawGauges( Unit *un ) { int i; @@ -2427,6 +2592,18 @@ } //draw unit gauges if ( ( un = parent.GetUnit() ) ) { + switch (view) { + case CP_FRONT: + case CP_LEFT: + case CP_RIGHT: + case CP_BACK: + case CP_VIEWTARGET: + case CP_PANINSIDE: + TriggerEvents( un ); + break; + default: + break; + }; if ( view == CP_FRONT || (view == CP_CHASE && drawChaseVDU) @@ -3374,3 +3551,7 @@ insidePanPitchSpeed = speed; } +SoundContainer* GameCockpit::soundImpl(const SoundContainer &specs) +{ + return new AldrvSoundContainer(specs); +} Modified: trunk/vegastrike/src/gfx/cockpit.h =================================================================== --- trunk/vegastrike/src/gfx/cockpit.h 2012-07-11 08:18:51 UTC (rev 13387) +++ trunk/vegastrike/src/gfx/cockpit.h 2012-07-16 03:50:55 UTC (rev 13388) @@ -111,6 +111,27 @@ //colors of blips/targetting boxes GFXColor friendly, enemy, neutral, targeted, targetting, planet; + // Last observed values for edge-triggered events + struct LastState { + double processing_time; + int warplooplevel; + int warpskiplevel; + + bool jumpok:1, jumpnotok:1; + bool specon:1, specoff:1; + bool asapon:1, asapoff:1; + bool asap_dockon:1, asap_dockoff:1; + bool asap_dock_avail:1; + bool dock:1; + bool dock_avail:1; + bool lock:1, missilelock:1; + bool eject:1; + bool flightcompon:1, flightcompoff:1; + bool warpready:1, warpunready:1; + + LastState(); + } last; + /// Used to display the arrow pointing to the currently selected target. float projection_limit_x, projection_limit_y; float inv_screen_aspect_ratio; //Precomputed division 1 / g_game.aspect. @@ -138,6 +159,8 @@ void DrawTargetGauges( Unit *target ); ///Draws unit gauges void DrawGauges( Unit *un ); + ///Trigger scripted events + void TriggerEvents( Unit *un ); NavigationSystem ThisNav; //Draw the arrow pointing to the target. void DrawArrowToTarget(const Radar::Sensor&, Unit*); @@ -233,6 +256,10 @@ // Ship is jumping void OnJumpBegin(Unit *unit); void OnJumpEnd(Unit *unit); + +protected: + /// Override to use a specific kind of sound implementation + SoundContainer* soundImpl(const SoundContainer &specs); }; #endif Modified: trunk/vegastrike/src/gfx/cockpit_generic.cpp =================================================================== --- trunk/vegastrike/src/gfx/cockpit_generic.cpp 2012-07-11 08:18:51 UTC (rev 13387) +++ trunk/vegastrike/src/gfx/cockpit_generic.cpp 2012-07-16 03:50:55 UTC (rev 13388) @@ -955,4 +955,24 @@ std::replace(name.begin(), name.end(), ' ', '_'); return name; -} \ No newline at end of file +} + +SoundContainer* Cockpit::GetSoundForEvent(Cockpit::EVENTID eventId) const +{ + if (eventId < sounds.size()) + return sounds[eventId]; + else + return NULL; +} + +void Cockpit::SetSoundForEvent(Cockpit::EVENTID eventId, const SoundContainer &soundSpecs) +{ + while (eventId >= sounds.size()) + sounds.push_back(NULL); + sounds[eventId] = soundImpl(soundSpecs); +} + +SoundContainer* Cockpit::soundImpl(const SoundContainer &specs) +{ + return new SoundContainer(specs); +} Modified: trunk/vegastrike/src/gfx/cockpit_generic.h =================================================================== --- trunk/vegastrike/src/gfx/cockpit_generic.h 2012-07-11 08:18:51 UTC (rev 13387) +++ trunk/vegastrike/src/gfx/cockpit_generic.h 2012-07-16 03:50:55 UTC (rev 13388) @@ -26,6 +26,7 @@ } #include "in.h" #include "cmd/images.h" +#include "soundcontainer_generic.h" /** * The Cockpit Contains all displayable information about a particular Unit * * Gauges are used to indicate analog controls, and some diagital ones @@ -33,6 +34,87 @@ */ class Cockpit { +public: + ///cockpit events + enum EVENTID { + EVENTID_FIRST, + + /// Warp is possible at this time + WARP_READY = EVENTID_FIRST, + + /// Warp ceased to be possible at this time + WARP_UNREADY, + + /// Warp started + WARP_ENGAGED, + + /// Warp stopped + WARP_DISENGAGED, + + /// Asap autopilot engaged + ASAP_ENGAGED, + + /// Asap autopilot disengaged + ASAP_DISENGAGED, + + /// Asap docking available + ASAP_DOCKING_AVAILABLE, + + /// Asap docking engaged + ASAP_DOCKING_ENGAGED, + + /// Asap docking disengaged + ASAP_DOCKING_DISENGAGED, + + /// Docking ready + DOCK_AVAILABLE, + + /// Docking no longer ready + DOCK_UNAVAILABLE, + + /// Docking triggered yet not ready + DOCK_FAILED, + + /// Jump ready + JUMP_AVAILABLE, + + /// Jump no longer ready + JUMP_UNAVAILABLE, + + /// Jump triggered yet not ready + JUMP_FAILED, + + /// Weapons lock warning active + LOCK_WARNING, + + /// Missile lock warning acgive + MISSILELOCK_WARNING, + + /// Eject light + EJECT_WARNING, + + /// Governor enabled + FLIGHT_COMPUTER_ENABLED, + + /// Governor disabled + FLIGHT_COMPUTER_DISABLED, + + /// Warp loop, warp speed 0 (+1 = warp 1, +2 = warp 2, etc...) + WARP_LOOP0, + WARP_LOOP9 = WARP_LOOP0 + 9, + /// Last warp level + WRAP_LOOPLAST = WARP_LOOP9, + + /// Warp threshold, warp speed 0 (+1 = warp 1, +2 = warp 2, etc...) + WARP_SKIP0, + WARP_SKIP9 = WARP_SKIP0 + 9, + /// Last warp level + WRAP_SKIPLAST = WARP_SKIP9, + + /// Just after all valid values + NUM_EVENTS + }; + protected: ///style of current view (chase cam, inside) enum VIEWSTYLE view; @@ -112,6 +194,7 @@ std::vector< std::string > unitfilename; std::vector< std::string > unitsystemname; std::vector< std::string > unitbasename; + std::vector< SoundContainer* > sounds; public: double secondsWithZeroEnergy; @@ -252,6 +335,19 @@ static void TurretControl( const KBData&, KBSTATE ) {} virtual void SetCommAnimation( Animation *ani, Unit *un ) {} virtual void SetStaticAnimation() {} + + /** + * Retrieves the sound associated to the given event. + * Returns NULL if no sound has been associated + */ + SoundContainer* GetSoundForEvent(EVENTID eventId) const; + + /** + * Sets the sound associated to the given event to match the given specs + * (the actual container will be a different, implementation-specific one) + */ + void SetSoundForEvent(EVENTID eventId, const SoundContainer &soundSpecs); + class SaveGame*savegame; ///Accesses the current navigationsystem @@ -304,6 +400,10 @@ virtual void OnDockEnd(Unit *, Unit *) {} virtual void OnJumpBegin(Unit *) {} virtual void OnJumpEnd(Unit *) {} + +protected: + /// Override to use a specific kind of sound implementation + virtual SoundContainer* soundImpl(const SoundContainer &specs); }; #endif Modified: trunk/vegastrike/src/gfx/cockpit_xml.cpp =================================================================== --- trunk/vegastrike/src/gfx/cockpit_xml.cpp 2012-07-11 08:18:51 UTC (rev 13387) +++ trunk/vegastrike/src/gfx/cockpit_xml.cpp 2012-07-16 03:50:55 UTC (rev 13388) @@ -78,7 +78,9 @@ G_LEFT, G_RIGHT, G_TIME, - ALPH + ALPH, + EVENT, + LOOPING }; const EnumMap::Pair element_names[] = { @@ -91,6 +93,7 @@ EnumMap::Pair( "RightVDU", RVDU ), EnumMap::Pair( "Panel", PANEL ), EnumMap::Pair( "Crosshairs", CROSSHAIRS ), + EnumMap::Pair( "Event", EVENT ), EnumMap::Pair( "ArmorF", UnitImages< void >::ARMORF ), EnumMap::Pair( "ArmorR", UnitImages< void >::ARMORR ), EnumMap::Pair( "ArmorL", UnitImages< void >::ARMORL ), @@ -180,7 +183,56 @@ EnumMap::Pair( "g", GREEN ), EnumMap::Pair( "b", BLUE ), EnumMap::Pair( "type", VDUTYPE ), - EnumMap::Pair( "a", ALPH ) + EnumMap::Pair( "a", ALPH ), + EnumMap::Pair( "event", EVENT ), + EnumMap::Pair( "looping", LOOPING ), + + + // Cockpit events + EnumMap::Pair( "WarpReady", Cockpit::WARP_READY ), + EnumMap::Pair( "WarpUnready", Cockpit::WARP_UNREADY ), + EnumMap::Pair( "WarpEngaged", Cockpit::WARP_ENGAGED ), + EnumMap::Pair( "WarpDisengaged",Cockpit::WARP_DISENGAGED ), + EnumMap::Pair( "WarpLoop0", Cockpit::WARP_LOOP0 ), + EnumMap::Pair( "WarpLoop1", Cockpit::WARP_LOOP0+1 ), + EnumMap::Pair( "WarpLoop2", Cockpit::WARP_LOOP0+2 ), + EnumMap::Pair( "WarpLoop3", Cockpit::WARP_LOOP0+3 ), + EnumMap::Pair( "WarpLoop4", Cockpit::WARP_LOOP0+4 ), + EnumMap::Pair( "WarpLoop5", Cockpit::WARP_LOOP0+5 ), + EnumMap::Pair( "WarpLoop6", Cockpit::WARP_LOOP0+6 ), + EnumMap::Pair( "WarpLoop7", Cockpit::WARP_LOOP0+7 ), + EnumMap::Pair( "WarpLoop8", Cockpit::WARP_LOOP0+8 ), + EnumMap::Pair( "WarpLoop9", Cockpit::WARP_LOOP0+9 ), + EnumMap::Pair( "WarpSkip0", Cockpit::WARP_LOOP0 ), + EnumMap::Pair( "WarpSkip1", Cockpit::WARP_LOOP0+1 ), + EnumMap::Pair( "WarpSkip2", Cockpit::WARP_LOOP0+2 ), + EnumMap::Pair( "WarpSkip3", Cockpit::WARP_LOOP0+3 ), + EnumMap::Pair( "WarpSkip4", Cockpit::WARP_LOOP0+4 ), + EnumMap::Pair( "WarpSkip5", Cockpit::WARP_LOOP0+5 ), + EnumMap::Pair( "WarpSkip6", Cockpit::WARP_LOOP0+6 ), + EnumMap::Pair( "WarpSkip7", Cockpit::WARP_LOOP0+7 ), + EnumMap::Pair( "WarpSkip8", Cockpit::WARP_LOOP0+8 ), + EnumMap::Pair( "WarpSkip9", Cockpit::WARP_LOOP0+9 ), + + EnumMap::Pair( "ASAPEngaged", Cockpit::ASAP_ENGAGED ), + EnumMap::Pair( "ASAPDisengaged",Cockpit::ASAP_DISENGAGED ), + EnumMap::Pair( "ASAPDockingAvailable", Cockpit::ASAP_DOCKING_AVAILABLE ), + EnumMap::Pair( "ASAPDockingEngaged", Cockpit::ASAP_DOCKING_ENGAGED ), + EnumMap::Pair( "ASAPDockingDisengaged", Cockpit::ASAP_DOCKING_DISENGAGED ), + EnumMap::Pair( "FlightComputerEnabled", Cockpit::FLIGHT_COMPUTER_ENABLED ), + EnumMap::Pair( "FlightComputerDisabled", Cockpit::FLIGHT_COMPUTER_DISABLED ), + + EnumMap::Pair( "DockAvailable", Cockpit::DOCK_AVAILABLE ), + EnumMap::Pair( "DockUnavailable", Cockpit::DOCK_UNAVAILABLE ), + EnumMap::Pair( "DockFailed", Cockpit::DOCK_FAILED ), + EnumMap::Pair( "JumpAvailable", Cockpit::JUMP_AVAILABLE ), + EnumMap::Pair( "JumpUnavailable", Cockpit::JUMP_UNAVAILABLE ), + EnumMap::Pair( "JumpFailed", Cockpit::JUMP_FAILED ), + + EnumMap::Pair( "Lock", Cockpit::LOCK_WARNING ), + EnumMap::Pair( "MissileLock", Cockpit::MISSILELOCK_WARNING ), + EnumMap::Pair( "Eject", Cockpit::EJECT_WARNING ), + }; const EnumMap element_map( element_names, sizeof (element_names)/sizeof (element_names[0]) ); @@ -571,6 +623,34 @@ Panel.erase( Panel.end()-1 ); //don't want null panels } break; + case EVENT: + { + std::string soundfile; + bool looping = false; + EVENTID event = Cockpit::NUM_EVENTS; + + for (iter = attributes.begin(); iter != attributes.end(); iter++) { + switch ( attribute_map.lookup( (*iter).name ) ) + { + case SOUNDFILE: + soundfile = (*iter).value; + break; + case LOOPING: + looping = XMLSupport::parse_bool( (*iter).value ); + break; + case EVENT: + event = (Cockpit::EVENTID) attribute_map.lookup( (*iter).value ); + break; + default: + break; + } + } + + if (!soundfile.empty() && (event > 0) && (event < Cockpit::NUM_EVENTS)) { + SetSoundForEvent(event, SoundContainer(soundfile, looping)); + } + } + break; default: break; } Added: trunk/vegastrike/src/gfx/soundcontainer.cpp =================================================================== --- trunk/vegastrike/src/gfx/soundcontainer.cpp (rev 0) +++ trunk/vegastrike/src/gfx/soundcontainer.cpp 2012-07-16 03:50:55 UTC (rev 13388) @@ -0,0 +1,60 @@ +#include "config.h" + +#include <string> + +#include "soundcontainer.h" + +GameSoundContainer::GameSoundContainer( const SoundContainer &other ) + : SoundContainer( other ) + , triggered( false ) + , loaded( false ) +{ +} + +GameSoundContainer::~GameSoundContainer() +{ + unload(); +} + +void GameSoundContainer::load() +{ + if (!loaded) { + loadImpl(); + loaded = true; + } +} + +void GameSoundContainer::unload() +{ + if (loaded) { + unloadImpl(); + loaded = false; + } +} + +void GameSoundContainer::play() +{ + if (!loaded) + load(); + + if (!isLooping() || !isPlaying()) { + playImpl(); + triggered = true; + } +} + +void GameSoundContainer::stop() +{ + if (loaded && triggered) { + stopImpl(); + triggered = false; + } +} + +bool GameSoundContainer::isPlaying() const +{ + if (!loaded || !triggered) + return false; + else + return isPlayingImpl(); +} Added: trunk/vegastrike/src/gfx/soundcontainer.h =================================================================== --- trunk/vegastrike/src/gfx/soundcontainer.h (rev 0) +++ trunk/vegastrike/src/gfx/soundcontainer.h 2012-07-16 03:50:55 UTC (rev 13388) @@ -0,0 +1,89 @@ +#ifndef _SOUNDCONTAINER_H_ +#define _SOUNDCONTAINER_H_ + +#include <string> + +#include "soundcontainer_generic.h" + +/** + * A reference to a soundfile that can be lazily loaded. + * + * This abstract base class specifies the common interface + * for all implementations of sound containers, see + * concrete implementations for more details. + */ +class GameSoundContainer : public SoundContainer +{ + bool triggered; + bool loaded; + +public: + /** + * Create a refernece to an optionally-looping sound file. + */ + GameSoundContainer( const SoundContainer &other ); + + virtual ~GameSoundContainer(); + + /** + * Forced loading of the resource. It's not necessary to call it, + * but useful if you know you'll need it later and want to avoid + * the latency of loading it on-demand. + */ + void load(); + + /** + * Forced unloading of the resource. It's not necessary to call it, + * but useful if you know you won't be needing the resource for a while. + */ + void unload(); + + /** + * Start playing. For a looping source, it starts the loop if not already + * playing. For a non-looping source, it will start playing from time 0 + * even if it's already playing. + */ + void play(); + + /** + * Stop playing. + */ + void stop(); + + /** + * Return whether or not the sound is really playing now. + */ + bool isPlaying() const; + + /** + * Return whether or not the sound was triggered with play(). + * Will return true after play(), false after stop() and right + * after creation. + */ + bool isTriggered() const + { + return triggered; + } + + // Concrete classes implement the following: +protected: + virtual void loadImpl() = 0; + virtual void unloadImpl() = 0; + + /** + * Start playing. Needs not account for loopgin vs non-looping, + * just start playing the sound. + */ + virtual void playImpl() = 0; + + virtual void stopImpl() = 0; + + /** + * Return whether or not the sound is really playing now. + */ + virtual bool isPlayingImpl() const = 0; + +}; + +#endif + Added: trunk/vegastrike/src/gfx/soundcontainer_aldrv.cpp =================================================================== --- trunk/vegastrike/src/gfx/soundcontainer_aldrv.cpp (rev 0) +++ trunk/vegastrike/src/gfx/soundcontainer_aldrv.cpp 2012-07-16 03:50:55 UTC (rev 13388) @@ -0,0 +1,45 @@ +#include "config.h" + +#include "soundcontainer_aldrv.h" +#include "audiolib.h" + +AldrvSoundContainer::AldrvSoundContainer( const SoundContainer &other ) + : GameSoundContainer(other) + , sound(-2) +{ +} + +AldrvSoundContainer::~AldrvSoundContainer() +{ + // unload already takes care +} + +void AldrvSoundContainer::loadImpl() +{ + sound = AUDCreateSoundWAV( getSoundFile(), isLooping() ); +} + +void AldrvSoundContainer::unloadImpl() +{ + if (sound >= 0) { + stopImpl(); + AUDDeleteSound( sound, false ); + sound = -2; + } +} + +void AldrvSoundContainer::playImpl() +{ + AUDStartPlaying(sound); +} + +void AldrvSoundContainer::stopImpl() +{ + AUDStopPlaying(sound); +} + +bool AldrvSoundContainer::isPlayingImpl() const +{ + return AUDIsPlaying(sound); +} + Added: trunk/vegastrike/src/gfx/soundcontainer_aldrv.h =================================================================== --- trunk/vegastrike/src/gfx/soundcontainer_aldrv.h (rev 0) +++ trunk/vegastrike/src/gfx/soundcontainer_aldrv.h 2012-07-16 03:50:55 UTC (rev 13388) @@ -0,0 +1,35 @@ +#ifndef _SOUNDCONTAINER_ALDRV_H_ +#define _SOUNDCONTAINER_ALDRV_H_ + +#include <string> + +#include "soundcontainer.h" + +/** + * A reference to a soundfile that can be lazily loaded. + * + * This class implements the operations on sounds using aldrv + */ +class AldrvSoundContainer : public GameSoundContainer +{ +private: + int sound; + +public: + /** + * Create a refernece to an optionally-looping sound file. + */ + AldrvSoundContainer( const SoundContainer &other ); + + virtual ~AldrvSoundContainer(); + +protected: + virtual void loadImpl(); + virtual void unloadImpl(); + virtual void playImpl(); + virtual void stopImpl(); + virtual bool isPlayingImpl() const; +}; + +#endif + Added: trunk/vegastrike/src/gfx/soundcontainer_generic.cpp =================================================================== --- trunk/vegastrike/src/gfx/soundcontainer_generic.cpp (rev 0) +++ trunk/vegastrike/src/gfx/soundcontainer_generic.cpp 2012-07-16 03:50:55 UTC (rev 13388) @@ -0,0 +1,32 @@ +#include "config.h" + +#include <string> + +#include "soundcontainer_generic.h" + +#include "SharedPool.h" + +void SoundContainer::init( const StringPool::Reference &_soundfile, bool _looping ) +{ + this->soundFile = _soundfile; + this->looping = _looping; +} + +SoundContainer::SoundContainer( const SoundContainer &other ) +{ + init(other.soundFile, other.looping); +} + +SoundContainer::SoundContainer( const std::string &_soundfile, bool _looping ) +{ + init(stringPool.get(_soundfile), _looping); +} + +SoundContainer::SoundContainer( const StringPool::Reference &_soundfile, bool _looping ) +{ + init(_soundfile, _looping); +} + +SoundContainer::~SoundContainer() +{ +} Added: trunk/vegastrike/src/gfx/soundcontainer_generic.h =================================================================== --- trunk/vegastrike/src/gfx/soundcontainer_generic.h (rev 0) +++ trunk/vegastrike/src/gfx/soundcontainer_generic.h 2012-07-16 03:50:55 UTC (rev 13388) @@ -0,0 +1,45 @@ +#ifndef _SOUNDCONTAINER_GENERIC_H_ +#define _SOUNDCONTAINER_GENERIC_H_ + +#include <string> + +#include "SharedPool.h" + +/** + * A reference to a soundfile that can be lazily loaded. + * + * This base class implement no actions on it, see concrete subclasses for that, + * but it does contain all common data points. + */ +class SoundContainer +{ +private: + StringPool::Reference soundFile; + bool looping; + +protected: + void init( const StringPool::Reference &soundfile, bool looping ); + +public: + /** + * Create a refernece to an optionally-looping sound file. + */ + SoundContainer( const SoundContainer &other ); + explicit SoundContainer( const std::string &soundfile, bool looping = false ); + explicit SoundContainer( const StringPool::Reference &soundfile, bool looping = false ); + + const std::string& getSoundFile() const + { + return soundFile.get(); + } + + const bool isLooping() const + { + return looping; + } + + virtual ~SoundContainer(); +}; + +#endif + Modified: trunk/vegastrike/src/gfx/vid_file.cpp =================================================================== --- trunk/vegastrike/src/gfx/vid_file.cpp 2012-07-11 08:18:51 UTC (rev 13387) +++ trunk/vegastrike/src/gfx/vid_file.cpp 2012-07-16 03:50:55 UTC (rev 13388) @@ -213,7 +213,7 @@ //Open file std::string npath = std::string( "vsfile:" )+path; std::string errbase = std::string( "Cannot open URL \"" )+npath+"\""; - if ( ( 0 != av_open_input_file( &pFormatCtx, npath.c_str(), NULL, BUFFER_SIZE, NULL ) ) + if ( ( 0 != avformat_open_input( &pFormatCtx, npath.c_str(), NULL, NULL ) ) || ( 0 > av_find_stream_info( pFormatCtx ) ) ) throw VidFile::FileOpenException( errbase+" (wrong format or)" ); //Dump format info in case we want to know... #ifdef VS_DEBUG Modified: trunk/vegastrike/src/vegastrike.h =================================================================== --- trunk/vegastrike/src/vegastrike.h 2012-07-11 08:18:51 UTC (rev 13387) +++ trunk/vegastrike/src/vegastrike.h 2012-07-16 03:50:55 UTC (rev 13388) @@ -25,13 +25,10 @@ #ifndef _VEGASTRIKE_H_ #define _VEGASTRIKE_H_ -#if 0 -static const float SIMULATION_ATOM = (float) (1.0/10.0); -extern float simulation_atom_var; //not used, just dummy to compile -#else extern float simulation_atom_var; +extern float audio_atom_var; #define SIMULATION_ATOM (simulation_atom_var) -#endif +#define AUDIO_ATOM (audio_atom_var) #include "vs_math.h" Modified: trunk/vegastrike/src/vs_globals.cpp =================================================================== --- trunk/vegastrike/src/vs_globals.cpp 2012-07-11 08:18:51 UTC (rev 13387) +++ trunk/vegastrike/src/vs_globals.cpp 2012-07-16 03:50:55 UTC (rev 13388) @@ -15,6 +15,7 @@ FILE *fpread = NULL; float simulation_atom_var = (float) (1.0/10.0); +float audio_atom_var = (float) (1.0/18.0); Mission *mission = NULL; double benchmark = -1.0; Modified: trunk/vegastrike/src/vsfilesystem.cpp =================================================================== --- trunk/vegastrike/src/vsfilesystem.cpp 2012-07-11 08:18:51 UTC (rev 13387) +++ trunk/vegastrike/src/vsfilesystem.cpp 2012-07-16 03:50:55 UTC (rev 13388) @@ -877,7 +877,8 @@ Directories[PythonFile] = "bases"; Directories[AccountFile] = "accounts"; - simulation_atom_var = atof( vs_config->getVariable( "general", "simulation_atom", "0.1" ).c_str() ); + SIMULATION_ATOM = atof( vs_config->getVariable( "general", "simulation_atom", "0.1" ).c_str() ); + AUDIO_ATOM = atof( vs_config->getVariable( "general", "audio_atom", "0.05555555556" ).c_str() ); cout<<"SIMULATION_ATOM: "<<SIMULATION_ATOM<<endl; /************************* Home directory subdirectories creation ************************/ |
From: <phe...@us...> - 2012-07-24 20:50:55
|
Revision: 13394 http://vegastrike.svn.sourceforge.net/vegastrike/?rev=13394&view=rev Author: pheonixstorm Date: 2012-07-24 20:50:49 +0000 (Tue, 24 Jul 2012) Log Message: ----------- Updating VC9 project files and resource files Modified Paths: -------------- trunk/vega-vc9/Mesher/Mesher.vcproj trunk/vega-vc9/mission/mission.vcproj trunk/vega-vc9/mission/resource.h trunk/vega-vc9/vegastrike/vegastrike.vcproj trunk/vega-vc9/vsserver/vsserver.aps trunk/vega-vc9/vsserver/vsserver.rc trunk/vega-vc9/vsserver/vsserver.vcproj trunk/vega-vc9/vssetup/vssetup.vcproj trunk/vegastrike/Resources.rc trunk/vegastrike/setup/vega.rc Added Paths: ----------- trunk/vega-vc9/mission/mission.rc Property Changed: ---------------- trunk/vega-vc9/mission/ trunk/vegastrike/src/ Modified: trunk/vega-vc9/Mesher/Mesher.vcproj =================================================================== --- trunk/vega-vc9/Mesher/Mesher.vcproj 2012-07-24 20:21:47 UTC (rev 13393) +++ trunk/vega-vc9/Mesher/Mesher.vcproj 2012-07-24 20:50:49 UTC (rev 13394) @@ -244,11 +244,11 @@ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" > <File - RelativePath="..\..\vegastrike\objconv\mesher\Converter.h" + RelativePath="..\..\vegastrike\objconv\mesher\PrecompiledHeaders\Converter.h" > </File> <File - RelativePath="..\..\vegastrike\objconv\mesher\PrecompiledHeaders\Converter.h" + RelativePath="..\..\vegastrike\objconv\mesher\Converter.h" > </File> <File @@ -297,14 +297,6 @@ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > - <File - RelativePath="..\..\vegastrike\icon3.ico" - > - </File> - <File - RelativePath=".\mesher.rc" - > - </File> </Filter> </Files> <Globals> Property changes on: trunk/vega-vc9/mission ___________________________________________________________________ Added: svn:ignore + Debug mission.aps Added: trunk/vega-vc9/mission/mission.rc =================================================================== --- trunk/vega-vc9/mission/mission.rc (rev 0) +++ trunk/vega-vc9/mission/mission.rc 2012-07-24 20:50:49 UTC (rev 13394) @@ -0,0 +1,110 @@ +// Microsoft Visual C++ generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "afxres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource1.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_ICON1 ICON "E:\\SCM\\VegaStrike\\trunk\\vegastrike\\icon2.ico" + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 1,0,0,1 + PRODUCTVERSION 1,0,0,1 + FILEFLAGSMASK 0x17L +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x4L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "FileDescription", "mission Application" + VALUE "FileVersion", "1, 0, 0, 1" + VALUE "InternalName", "mission" + VALUE "LegalCopyright", "Copyright (C) 2012" + VALUE "OriginalFilename", "mission.exe" + VALUE "ProductName", "mission Application" + VALUE "ProductVersion", "1, 0, 0, 1" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#endif // English (U.S.) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + Modified: trunk/vega-vc9/mission/mission.vcproj =================================================================== --- trunk/vega-vc9/mission/mission.vcproj 2012-07-24 20:21:47 UTC (rev 13393) +++ trunk/vega-vc9/mission/mission.vcproj 2012-07-24 20:50:49 UTC (rev 13394) @@ -40,6 +40,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" + AdditionalIncludeDirectories="../include;../include/glib;../include/gtk;../include/gdk" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -57,6 +58,7 @@ /> <Tool Name="VCLinkerTool" + AdditionalDependencies="../lib/gdk-1.3.lib ../lib/gtk-1.3.lib ../lib/glib-1.3.lib ../lib/expat.lib" GenerateDebugInformation="true" TargetMachine="1" /> @@ -236,6 +238,10 @@ > </File> <File + RelativePath=".\resource1.h" + > + </File> + <File RelativePath="..\..\vegastrike\mission\include\xml_support.h" > </File> @@ -250,7 +256,7 @@ > </File> <File - RelativePath=".\missionSelect.rc" + RelativePath=".\mission.rc" > </File> </Filter> Modified: trunk/vega-vc9/mission/resource.h =================================================================== --- trunk/vega-vc9/mission/resource.h 2012-07-24 20:21:47 UTC (rev 13393) +++ trunk/vega-vc9/mission/resource.h 2012-07-24 20:50:49 UTC (rev 13394) @@ -2,13 +2,13 @@ // Microsoft Visual C++ generated include file. // Used by missionSelect.rc // -#define IDI_ICON1 101 +#define IDI_ICON1 102 // Next default values for new objects // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 102 +#define _APS_NEXT_RESOURCE_VALUE 103 #define _APS_NEXT_COMMAND_VALUE 40001 #define _APS_NEXT_CONTROL_VALUE 1001 #define _APS_NEXT_SYMED_VALUE 101 Modified: trunk/vega-vc9/vegastrike/vegastrike.vcproj =================================================================== --- trunk/vega-vc9/vegastrike/vegastrike.vcproj 2012-07-24 20:21:47 UTC (rev 13393) +++ trunk/vega-vc9/vegastrike/vegastrike.vcproj 2012-07-24 20:50:49 UTC (rev 13394) @@ -185,13 +185,13 @@ FavorSizeOrSpeed="1" WholeProgramOptimization="false" AdditionalIncludeDirectories="../;../include;../include/python;"../jpeg-6b";../../vegastrike/src;../../vegastrike/src/cmd;../../vegastrike/src/cmd/collide2;../../vegastrike/src/python;../../vegastrike/boost/1_45;../../vegastrike/boost/1_45/boost" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;HAVE_AL;HAVE_SDL;YY_ALWAYS_INTERACTIVE;SDL_WINDOWING;HAVE_OGG;HAVE_BOOST;HAVE_PYTHON;JPEG_SUPPORT;BOOST_PYTHON_NO_PY_SIGNATURES;BOOST_PYTHON_STATIC_LIB;BOOST_ALL_NO_LIB;NV_CUBE_MAP;OPCODE_COLLIDER;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE" + PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;CLIENT;HAVE_AL;HAVE_SDL;YY_ALWAYS_INTERACTIVE;SDL_WINDOWING;HAVE_OGG;HAVE_BOOST;HAVE_PYTHON;JPEG_SUPPORT;BOOST_PYTHON_NO_PY_SIGNATURES;BOOST_PYTHON_STATIC_LIB;BOOST_ALL_NO_LIB;NV_CUBE_MAP;OPCODE_COLLIDER;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE" StringPooling="true" RuntimeLibrary="2" BufferSecurityCheck="true" EnableFunctionLevelLinking="false" EnableEnhancedInstructionSet="2" - WarningLevel="4" + WarningLevel="1" Detect64BitPortabilityProblems="false" DebugInformationFormat="3" CompileAs="0" @@ -222,7 +222,7 @@ SubSystem="2" OptimizeReferences="0" EnableCOMDATFolding="0" - OptimizeForWindows98="1" + OptimizeForWindows98="0" LinkTimeCodeGeneration="0" RandomizedBaseAddress="1" DataExecutionPrevention="0" @@ -1974,6 +1974,18 @@ > </File> <File + RelativePath="..\..\vegastrike\src\gfx\soundcontainer.cpp" + > + </File> + <File + RelativePath="..\..\vegastrike\src\gfx\soundcontainer_aldrv.cpp" + > + </File> + <File + RelativePath="..\..\vegastrike\src\gfx\soundcontainer_generic.cpp" + > + </File> + <File RelativePath="..\..\vegastrike\src\gfx\sphere.cpp" > </File> @@ -3742,6 +3754,18 @@ > </File> <File + RelativePath="..\..\vegastrike\src\gfx\soundcontainer.h" + > + </File> + <File + RelativePath="..\..\vegastrike\src\gfx\soundcontainer_aldrv.h" + > + </File> + <File + RelativePath="..\..\vegastrike\src\gfx\soundcontainer_generic.h" + > + </File> + <File RelativePath="..\..\vegastrike\src\gfx\sphere.h" > </File> Modified: trunk/vega-vc9/vsserver/vsserver.aps =================================================================== (Binary files differ) Modified: trunk/vega-vc9/vsserver/vsserver.rc =================================================================== --- trunk/vega-vc9/vsserver/vsserver.rc 2012-07-24 20:21:47 UTC (rev 13393) +++ trunk/vega-vc9/vsserver/vsserver.rc 2012-07-24 20:50:49 UTC (rev 13394) @@ -62,8 +62,8 @@ // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,5,1,13356 - PRODUCTVERSION 0,5,1,13356 + FILEVERSION 0,5,2,13392 + PRODUCTVERSION 0,5,2,13392 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x9L @@ -81,13 +81,13 @@ VALUE "Comments", "Vega Strike is the 3D Space Simulator that allows you to trade and bounty hunt in a vast universe. Can you face the dangers and decisions that await..." VALUE "CompanyName", "Vega Strike Project" VALUE "FileDescription", "Vega Strike standalone server" - VALUE "FileVersion", "0.5.1.13356" + VALUE "FileVersion", "0, 5, 2, 13392" VALUE "InternalName", "vegaserver" VALUE "LegalCopyright", "\xA9 Copyright 1998-2011 Vega Strike Project. All rights reserved. See the vega-licence.txt for details." VALUE "OriginalFilename", "Vegaserver.exe" - VALUE "PrivateBuild", "13356" + VALUE "PrivateBuild", "0, 5, 1, 13392" VALUE "ProductName", "Vega Strike" - VALUE "ProductVersion", "0.5.1.13356" + VALUE "ProductVersion", "0, 5, 2, 13392" END END BLOCK "VarFileInfo" Modified: trunk/vega-vc9/vsserver/vsserver.vcproj =================================================================== --- trunk/vega-vc9/vsserver/vsserver.vcproj 2012-07-24 20:21:47 UTC (rev 13393) +++ trunk/vega-vc9/vsserver/vsserver.vcproj 2012-07-24 20:50:49 UTC (rev 13394) @@ -183,7 +183,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" AdditionalIncludeDirectories="../include;../include/python;../../vegastrike/src;../../vegastrike/src/cmd/;../../vegastrike/src/cmd/collide2;../../vegastrike/boost/1_45" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_UDP_PROTO;_CRT_SECURE_NO_WARNINGS;YY_NEVER_INTERACTIVE;YY_ALWAYS_INTERACTIVE;NO_GFX;OPCODE_COLLIDER;HAVE_PYTHON;HAVE_BOOST;BOOST_PYTHON_NO_PY_SIGNATURES;BOOST_PYTHON_STATIC_LIB;BOOST_ALL_NO_LIB;BOOST_DEBUG_PYTHON" + PreprocessorDefinitions="WIN32;NDEBUG;_SERVER;_CONSOLE;_UDP_PROTO;_CRT_SECURE_NO_WARNINGS;YY_NEVER_INTERACTIVE;YY_ALWAYS_INTERACTIVE;NO_GFX;OPCODE_COLLIDER;HAVE_PYTHON;HAVE_BOOST;BOOST_PYTHON_NO_PY_SIGNATURES;BOOST_PYTHON_STATIC_LIB;BOOST_ALL_NO_LIB;BOOST_DEBUG_PYTHON" StringPooling="true" RuntimeLibrary="0" EnableFunctionLevelLinking="true" @@ -1245,6 +1245,18 @@ > </File> <File + RelativePath="..\..\vegastrike\src\gfx\soundcontainer.cpp" + > + </File> + <File + RelativePath="..\..\vegastrike\src\gfx\soundcontainer_aldrv.cpp" + > + </File> + <File + RelativePath="..\..\vegastrike\src\gfx\soundcontainer_generic.cpp" + > + </File> + <File RelativePath="..\..\vegastrike\src\gfx\sphere_generic.cpp" > </File> @@ -1939,11 +1951,11 @@ > </File> <File - RelativePath="..\..\vegastrike\src\cmd\collide2\Ice\Stdafx.h" + RelativePath="..\..\vegastrike\src\cmd\collide2\Stdafx.h" > </File> <File - RelativePath="..\..\vegastrike\src\cmd\collide2\Stdafx.h" + RelativePath="..\..\vegastrike\src\cmd\collide2\Ice\Stdafx.h" > </File> </Filter> @@ -2163,6 +2175,18 @@ > </File> <File + RelativePath="..\..\vegastrike\src\gfx\soundcontainer.h" + > + </File> + <File + RelativePath="..\..\vegastrike\src\gfx\soundcontainer_aldrv.h" + > + </File> + <File + RelativePath="..\..\vegastrike\src\gfx\soundcontainer_generic.h" + > + </File> + <File RelativePath="..\..\vegastrike\src\gfx\vec.h" > </File> Modified: trunk/vega-vc9/vssetup/vssetup.vcproj =================================================================== --- trunk/vega-vc9/vssetup/vssetup.vcproj 2012-07-24 20:21:47 UTC (rev 13393) +++ trunk/vega-vc9/vssetup/vssetup.vcproj 2012-07-24 20:50:49 UTC (rev 13394) @@ -90,12 +90,11 @@ /> </Configuration> <Configuration - Name="Release|Win32" - OutputDirectory="$(SolutionDir)$(ConfigurationName)" - IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)" + Name="Debug|x64" + OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="1" CharacterSet="2" - WholeProgramOptimization="1" > <Tool Name="VCPreBuildEventTool" @@ -111,16 +110,16 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" - Optimization="2" - EnableIntrinsicFunctions="true" + Optimization="0" AdditionalIncludeDirectories="..\include;..\include\glib;..\include\gtk;..\include\gdk;..\..\vegastrike\src" PreprocessorDefinitions="NDEBUG;_G_ALL;WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;GTK" - StringPooling="true" - RuntimeLibrary="2" - EnableFunctionLevelLinking="true" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" WarningLevel="3" DebugInformationFormat="3" /> @@ -136,14 +135,9 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="glib-1.3.lib gdk-1.3.lib gtk-1.3.lib gspawn-win32-helper.lib expat.lib" - OutputFile="$(OutDir)\setup.exe" AdditionalLibraryDirectories="..\lib" GenerateDebugInformation="true" - ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb" - OptimizeReferences="2" - EnableCOMDATFolding="2" - LinkTimeCodeGeneration="1" - TargetMachine="1" + TargetMachine="17" /> <Tool Name="VCALinkTool" @@ -156,7 +150,6 @@ /> <Tool Name="VCBscMakeTool" - OutputFile="$(IntDir)\$(ProjectName).bsc" /> <Tool Name="VCFxCopTool" @@ -169,11 +162,12 @@ /> </Configuration> <Configuration - Name="Debug|x64" - OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" + Name="Release|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)" ConfigurationType="1" CharacterSet="2" + WholeProgramOptimization="1" > <Tool Name="VCPreBuildEventTool" @@ -189,16 +183,16 @@ /> <Tool Name="VCMIDLTool" - TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" - Optimization="0" + Optimization="2" + EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="..\include;..\include\glib;..\include\gtk;..\include\gdk;..\..\vegastrike\src" PreprocessorDefinitions="NDEBUG;_G_ALL;WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;GTK" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="3" + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" WarningLevel="3" DebugInformationFormat="3" /> @@ -214,9 +208,14 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="glib-1.3.lib gdk-1.3.lib gtk-1.3.lib gspawn-win32-helper.lib expat.lib" + OutputFile="$(OutDir)\$(ProjectName).exe" AdditionalLibraryDirectories="..\lib" GenerateDebugInformation="true" - TargetMachine="17" + ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb" + OptimizeReferences="2" + EnableCOMDATFolding="2" + LinkTimeCodeGeneration="1" + TargetMachine="1" /> <Tool Name="VCALinkTool" @@ -229,6 +228,7 @@ /> <Tool Name="VCBscMakeTool" + OutputFile="$(IntDir)\$(ProjectName).bsc" /> <Tool Name="VCFxCopTool" Modified: trunk/vegastrike/Resources.rc =================================================================== --- trunk/vegastrike/Resources.rc 2012-07-24 20:21:47 UTC (rev 13393) +++ trunk/vegastrike/Resources.rc 2012-07-24 20:50:49 UTC (rev 13394) @@ -62,8 +62,8 @@ // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,5,1,13358 - PRODUCTVERSION 0,5,1,13358 + FILEVERSION 0,5,2,13392 + PRODUCTVERSION 0,5,2,13392 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x9L @@ -81,13 +81,13 @@ VALUE "Comments", "Vega Strike is the 3D Space Simulator that allows you to trade and bounty hunt in a vast universe. Can you face the dangers and decisions that await..." VALUE "CompanyName", "Vega Strike Project" VALUE "FileDescription", "Vega Strike Open Source Space Simulator" - VALUE "FileVersion", "0.5.1.1338" + VALUE "FileVersion", "0, 5, 2, 13392" VALUE "InternalName", "vegastrike" VALUE "LegalCopyright", "\xA9 Copyright 1998-2011 Vega Strike Project. All rights reserved. See the vega-licence.txt for details." VALUE "OriginalFilename", "Vegastrike.exe" - VALUE "PrivateBuild", "13358" + VALUE "PrivateBuild", "13370" VALUE "ProductName", "Vega Strike" - VALUE "ProductVersion", "0.5.1.13358" + VALUE "ProductVersion", "0, 5, 2, 13392" END END BLOCK "VarFileInfo" Modified: trunk/vegastrike/setup/vega.rc =================================================================== --- trunk/vegastrike/setup/vega.rc 2012-07-24 20:21:47 UTC (rev 13393) +++ trunk/vegastrike/setup/vega.rc 2012-07-24 20:50:49 UTC (rev 13394) @@ -62,13 +62,13 @@ // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,5,1,13356 - PRODUCTVERSION 0,5,1,13356 - FILEFLAGSMASK 0x3fL + FILEVERSION 0,5,2,13392 + PRODUCTVERSION 0,5,2,13392 + FILEFLAGSMASK 0x37L #ifdef _DEBUG - FILEFLAGS 0x9L + FILEFLAGS 0x1L #else - FILEFLAGS 0x8L + FILEFLAGS 0x0L #endif FILEOS 0x40004L FILETYPE 0x1L @@ -81,13 +81,12 @@ VALUE "Comments", "Vega Strike is the 3D Space Simulator that allows you to trade and bounty hunt in a vast universe. Can you face the dangers and decisions that await..." VALUE "CompanyName", "Vega Strike Project" VALUE "FileDescription", "Vega Strike Configurator" - VALUE "FileVersion", "0.5.1.13356" + VALUE "FileVersion", "0, 5, 2, 13392" VALUE "InternalName", "vegastrike" VALUE "LegalCopyright", "\xA9 Copyright 1998-2008 Vega Strike Project. All rights reserved. See the vega-licence.txt for details." VALUE "OriginalFilename", "setup.exe" - VALUE "PrivateBuild", "13356" VALUE "ProductName", "Vega Strike" - VALUE "ProductVersion", "0.5.1.13356" + VALUE "ProductVersion", "0, 5, 2, 13392" END END BLOCK "VarFileInfo" Property changes on: trunk/vegastrike/src ___________________________________________________________________ Modified: svn:ignore - posh.cpp.new posh.h.new + networking.7z posh.cpp.new posh.h.new |
From: <phe...@us...> - 2012-11-05 16:03:56
|
Revision: 13432 http://vegastrike.svn.sourceforge.net/vegastrike/?rev=13432&view=rev Author: pheonixstorm Date: 2012-11-05 16:03:44 +0000 (Mon, 05 Nov 2012) Log Message: ----------- Update to binary and project files Modified Paths: -------------- trunk/vega-vc9/vegastrike/vegastrike.vcproj trunk/vegastrike/Resources.rc trunk/win32/bin/vegastrike.exe Property Changed: ---------------- trunk/ Property changes on: trunk ___________________________________________________________________ Modified: svn:ignore - Factionxml Ignoreme Install master_part_list1.csv master_part_list12515.csv memleak3.diff new diffs units.csv units12890.csv units12890A.csv v5.5_rebalance v5.5_rebalance.zip vega-vc10 vegaserver vegastrike.rar + Factionxml Ignoreme Install data4.x master_part_list1.csv master_part_list12515.csv memleak3.diff new diffs units.csv units12890.csv units12890A.csv v5.5_rebalance v5.5_rebalance.zip vega-vc10 vegaserver vegastrike.rar Modified: trunk/vega-vc9/vegastrike/vegastrike.vcproj =================================================================== --- trunk/vega-vc9/vegastrike/vegastrike.vcproj 2012-10-31 17:11:48 UTC (rev 13431) +++ trunk/vega-vc9/vegastrike/vegastrike.vcproj 2012-11-05 16:03:44 UTC (rev 13432) @@ -1930,6 +1930,10 @@ > </File> <File + RelativePath="..\..\vegastrike\src\gfx\occlusion.cpp" + > + </File> + <File RelativePath="..\..\vegastrike\src\gfx\particle.cpp" > </File> @@ -3722,6 +3726,10 @@ > </File> <File + RelativePath="..\..\vegastrike\src\gfx\occlusion.h" + > + </File> + <File RelativePath="..\..\vegastrike\src\gfx\particle.h" > </File> Modified: trunk/vegastrike/Resources.rc =================================================================== --- trunk/vegastrike/Resources.rc 2012-10-31 17:11:48 UTC (rev 13431) +++ trunk/vegastrike/Resources.rc 2012-11-05 16:03:44 UTC (rev 13432) @@ -62,8 +62,8 @@ // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,5,2,13392 - PRODUCTVERSION 0,5,2,13392 + FILEVERSION 0,5,2,13431 + PRODUCTVERSION 0,5,2,13431 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x9L @@ -81,13 +81,13 @@ VALUE "Comments", "Vega Strike is the 3D Space Simulator that allows you to trade and bounty hunt in a vast universe. Can you face the dangers and decisions that await..." VALUE "CompanyName", "Vega Strike Project" VALUE "FileDescription", "Vega Strike Open Source Space Simulator" - VALUE "FileVersion", "0, 5, 2, 13392" + VALUE "FileVersion", "0, 5, 2, 13431" VALUE "InternalName", "vegastrike" VALUE "LegalCopyright", "\xA9 Copyright 1998-2011 Vega Strike Project. All rights reserved. See the vega-licence.txt for details." VALUE "OriginalFilename", "Vegastrike.exe" VALUE "PrivateBuild", "13370" VALUE "ProductName", "Vega Strike" - VALUE "ProductVersion", "0, 5, 2, 13392" + VALUE "ProductVersion", "0, 5, 2, 13431" END END BLOCK "VarFileInfo" Modified: trunk/win32/bin/vegastrike.exe =================================================================== (Binary files differ) |
From: <phe...@us...> - 2012-11-15 21:27:22
|
Revision: 13447 http://vegastrike.svn.sourceforge.net/vegastrike/?rev=13447&view=rev Author: pheonixstorm Date: 2012-11-15 21:27:16 +0000 (Thu, 15 Nov 2012) Log Message: ----------- Updated binary to r13446 of trunk Revision Links: -------------- http://vegastrike.svn.sourceforge.net/vegastrike/?rev=13446&view=rev Modified Paths: -------------- trunk/vegastrike/Resources.rc trunk/win32/bin/vegastrike.exe Modified: trunk/vegastrike/Resources.rc =================================================================== --- trunk/vegastrike/Resources.rc 2012-11-13 19:02:17 UTC (rev 13446) +++ trunk/vegastrike/Resources.rc 2012-11-15 21:27:16 UTC (rev 13447) @@ -62,8 +62,8 @@ // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,5,2,13431 - PRODUCTVERSION 0,5,2,13431 + FILEVERSION 0,5,2,13446 + PRODUCTVERSION 0,5,2,13446 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x9L @@ -81,13 +81,13 @@ VALUE "Comments", "Vega Strike is the 3D Space Simulator that allows you to trade and bounty hunt in a vast universe. Can you face the dangers and decisions that await..." VALUE "CompanyName", "Vega Strike Project" VALUE "FileDescription", "Vega Strike Open Source Space Simulator" - VALUE "FileVersion", "0, 5, 2, 13431" + VALUE "FileVersion", "0, 5, 2, 13446" VALUE "InternalName", "vegastrike" VALUE "LegalCopyright", "\xA9 Copyright 1998-2011 Vega Strike Project. All rights reserved. See the vega-licence.txt for details." VALUE "OriginalFilename", "Vegastrike.exe" VALUE "PrivateBuild", "13370" VALUE "ProductName", "Vega Strike" - VALUE "ProductVersion", "0, 5, 2, 13431" + VALUE "ProductVersion", "0, 5, 2, 13446" END END BLOCK "VarFileInfo" Modified: trunk/win32/bin/vegastrike.exe =================================================================== (Binary files differ) |
From: <phe...@us...> - 2012-11-28 04:23:32
|
Revision: 13453 http://vegastrike.svn.sourceforge.net/vegastrike/?rev=13453&view=rev Author: pheonixstorm Date: 2012-11-28 04:23:12 +0000 (Wed, 28 Nov 2012) Log Message: ----------- Adding VC10 Solution, updated binaries and libraries. Adding new dll_ver file to track lib versions. Modified Paths: -------------- trunk/vegastrike/Resources.rc trunk/win32/bin/SDL.dll trunk/win32/bin/SDL_d.dll trunk/win32/bin/expat.dll trunk/win32/bin/python27.dll trunk/win32/bin/python27_d.dll trunk/win32/bin/vegastrike.exe Added Paths: ----------- trunk/vega-vc10/ trunk/vega-vc10/DevTools.sln trunk/vega-vc10/InstallScript/ trunk/vega-vc10/InstallScript/ReadME.txt trunk/vega-vc10/InstallScript/Vegasetup.iss trunk/vega-vc10/InstallScript/vegasetup51r1.iss trunk/vega-vc10/Mesher/ trunk/vega-vc10/Mesher/Mesher.vcxproj trunk/vega-vc10/Mesher/Mesher.vcxproj.filters trunk/vega-vc10/Mesher/config.h trunk/vega-vc10/Mesher/mesher.rc trunk/vega-vc10/Mesher/resource.h trunk/vega-vc10/ReadMe.txt trunk/vega-vc10/basemaker/ trunk/vega-vc10/basemaker/basemaker.rc trunk/vega-vc10/basemaker/basemaker.vcxproj trunk/vega-vc10/basemaker/basemaker.vcxproj.filters trunk/vega-vc10/basemaker/resource.h trunk/vega-vc10/dll_ver.txt trunk/vega-vc10/include/ trunk/vega-vc10/include/al/ trunk/vega-vc10/include/al/al.h trunk/vega-vc10/include/al/alc.h trunk/vega-vc10/include/al/alut.h trunk/vega-vc10/include/config.h trunk/vega-vc10/include/dsound.h trunk/vega-vc10/include/expat.h trunk/vega-vc10/include/expat_external.h trunk/vega-vc10/include/gdk/ trunk/vega-vc10/include/gdk/gdk.def trunk/vega-vc10/include/gdk/gdk.h trunk/vega-vc10/include/gdk/gdkcc.h trunk/vega-vc10/include/gdk/gdkcolor.h trunk/vega-vc10/include/gdk/gdkcompat.h trunk/vega-vc10/include/gdk/gdkconfig.h trunk/vega-vc10/include/gdk/gdkcursor.h trunk/vega-vc10/include/gdk/gdkcursors.h trunk/vega-vc10/include/gdk/gdkdnd.h trunk/vega-vc10/include/gdk/gdkdrawable.h trunk/vega-vc10/include/gdk/gdkevents.h trunk/vega-vc10/include/gdk/gdkfont.h trunk/vega-vc10/include/gdk/gdkgc.h trunk/vega-vc10/include/gdk/gdki18n.h trunk/vega-vc10/include/gdk/gdkim.h trunk/vega-vc10/include/gdk/gdkimage.h trunk/vega-vc10/include/gdk/gdkinput.h trunk/vega-vc10/include/gdk/gdkkeysyms.h trunk/vega-vc10/include/gdk/gdkpixmap.h trunk/vega-vc10/include/gdk/gdkprivate.h trunk/vega-vc10/include/gdk/gdkproperty.h trunk/vega-vc10/include/gdk/gdkregion.h trunk/vega-vc10/include/gdk/gdkrgb.h trunk/vega-vc10/include/gdk/gdkselection.h trunk/vega-vc10/include/gdk/gdktypes.h trunk/vega-vc10/include/gdk/gdkvisual.h trunk/vega-vc10/include/gdk/gdkwindow.h trunk/vega-vc10/include/gl/ trunk/vega-vc10/include/gl/Gl.h trunk/vega-vc10/include/gl/Glaux.h trunk/vega-vc10/include/gl/Glexts.h trunk/vega-vc10/include/gl/Glu.h trunk/vega-vc10/include/gl/glext.h trunk/vega-vc10/include/gl/glut.h trunk/vega-vc10/include/glib/ trunk/vega-vc10/include/glib/galloca.h trunk/vega-vc10/include/glib/garray.h trunk/vega-vc10/include/glib/gasyncqueue.h trunk/vega-vc10/include/glib/gbacktrace.h trunk/vega-vc10/include/glib/gcache.h trunk/vega-vc10/include/glib/gcompat.h trunk/vega-vc10/include/glib/gcompletion.h trunk/vega-vc10/include/glib/gconvert.h trunk/vega-vc10/include/glib/gdataset.h trunk/vega-vc10/include/glib/gdate.h trunk/vega-vc10/include/glib/gerror.h trunk/vega-vc10/include/glib/gfileutils.h trunk/vega-vc10/include/glib/ghash.h trunk/vega-vc10/include/glib/ghook.h trunk/vega-vc10/include/glib/giochannel.h trunk/vega-vc10/include/glib/glib-object.h trunk/vega-vc10/include/glib/glib.def trunk/vega-vc10/include/glib/glib.h trunk/vega-vc10/include/glib/glibconfig.h trunk/vega-vc10/include/glib/glist.h trunk/vega-vc10/include/glib/glob.h trunk/vega-vc10/include/glib/gmacros.h trunk/vega-vc10/include/glib/gmain.h trunk/vega-vc10/include/glib/gmarkup.h trunk/vega-vc10/include/glib/gmem.h trunk/vega-vc10/include/glib/gmessages.h trunk/vega-vc10/include/glib/gnode.h trunk/vega-vc10/include/glib/gprimes.h trunk/vega-vc10/include/glib/gqsort.h trunk/vega-vc10/include/glib/gquark.h trunk/vega-vc10/include/glib/gqueue.h trunk/vega-vc10/include/glib/grand.h trunk/vega-vc10/include/glib/grel.h trunk/vega-vc10/include/glib/gscanner.h trunk/vega-vc10/include/glib/gshell.h trunk/vega-vc10/include/glib/gslist.h trunk/vega-vc10/include/glib/gspawn.h trunk/vega-vc10/include/glib/gstrfuncs.h trunk/vega-vc10/include/glib/gstring.h trunk/vega-vc10/include/glib/gthread.h trunk/vega-vc10/include/glib/gthreadpool.h trunk/vega-vc10/include/glib/gtimer.h trunk/vega-vc10/include/glib/gtree.h trunk/vega-vc10/include/glib/gtypes.h trunk/vega-vc10/include/glib/gunibreak.h trunk/vega-vc10/include/glib/gunichartables.h trunk/vega-vc10/include/glib/gunicode.h trunk/vega-vc10/include/glib/gunidecomp.h trunk/vega-vc10/include/glib/gutils.h trunk/vega-vc10/include/glib/gwin32.h trunk/vega-vc10/include/gtk/ trunk/vega-vc10/include/gtk/fnmatch.h trunk/vega-vc10/include/gtk/gtk.def trunk/vega-vc10/include/gtk/gtk.h trunk/vega-vc10/include/gtk/gtkaccelgroup.h trunk/vega-vc10/include/gtk/gtkaccellabel.h trunk/vega-vc10/include/gtk/gtkadjustment.h trunk/vega-vc10/include/gtk/gtkalignment.h trunk/vega-vc10/include/gtk/gtkarg.h trunk/vega-vc10/include/gtk/gtkarrow.h trunk/vega-vc10/include/gtk/gtkaspectframe.h trunk/vega-vc10/include/gtk/gtkbbox.h trunk/vega-vc10/include/gtk/gtkbin.h trunk/vega-vc10/include/gtk/gtkbindings.h trunk/vega-vc10/include/gtk/gtkbox.h trunk/vega-vc10/include/gtk/gtkbutton.h trunk/vega-vc10/include/gtk/gtkcalendar.h trunk/vega-vc10/include/gtk/gtkcheckbutton.h trunk/vega-vc10/include/gtk/gtkcheckmenuitem.h trunk/vega-vc10/include/gtk/gtkclist.h trunk/vega-vc10/include/gtk/gtkcolorsel.h trunk/vega-vc10/include/gtk/gtkcombo.h trunk/vega-vc10/include/gtk/gtkcompat.h trunk/vega-vc10/include/gtk/gtkcontainer.h trunk/vega-vc10/include/gtk/gtkctree.h trunk/vega-vc10/include/gtk/gtkcurve.h trunk/vega-vc10/include/gtk/gtkdata.h trunk/vega-vc10/include/gtk/gtkdebug.h trunk/vega-vc10/include/gtk/gtkdialog.h trunk/vega-vc10/include/gtk/gtkdnd.h trunk/vega-vc10/include/gtk/gtkdrawingarea.h trunk/vega-vc10/include/gtk/gtkeditable.h trunk/vega-vc10/include/gtk/gtkentry.h trunk/vega-vc10/include/gtk/gtkenums.h trunk/vega-vc10/include/gtk/gtkeventbox.h trunk/vega-vc10/include/gtk/gtkfeatures.h trunk/vega-vc10/include/gtk/gtkfilesel.h trunk/vega-vc10/include/gtk/gtkfixed.h trunk/vega-vc10/include/gtk/gtkfontsel.h trunk/vega-vc10/include/gtk/gtkframe.h trunk/vega-vc10/include/gtk/gtkgamma.h trunk/vega-vc10/include/gtk/gtkgc.h trunk/vega-vc10/include/gtk/gtkhandlebox.h trunk/vega-vc10/include/gtk/gtkhbbox.h trunk/vega-vc10/include/gtk/gtkhbox.h trunk/vega-vc10/include/gtk/gtkhpaned.h trunk/vega-vc10/include/gtk/gtkhruler.h trunk/vega-vc10/include/gtk/gtkhscale.h trunk/vega-vc10/include/gtk/gtkhscrollbar.h trunk/vega-vc10/include/gtk/gtkhseparator.h trunk/vega-vc10/include/gtk/gtkimage.h trunk/vega-vc10/include/gtk/gtkinputdialog.h trunk/vega-vc10/include/gtk/gtkintl.h trunk/vega-vc10/include/gtk/gtkinvisible.h trunk/vega-vc10/include/gtk/gtkitem.h trunk/vega-vc10/include/gtk/gtkitemfactory.h trunk/vega-vc10/include/gtk/gtklabel.h trunk/vega-vc10/include/gtk/gtklayout.h trunk/vega-vc10/include/gtk/gtklist.h trunk/vega-vc10/include/gtk/gtklistitem.h trunk/vega-vc10/include/gtk/gtkmain.h trunk/vega-vc10/include/gtk/gtkmarshal.h trunk/vega-vc10/include/gtk/gtkmenu.h trunk/vega-vc10/include/gtk/gtkmenubar.h trunk/vega-vc10/include/gtk/gtkmenufactory.h trunk/vega-vc10/include/gtk/gtkmenuitem.h trunk/vega-vc10/include/gtk/gtkmenushell.h trunk/vega-vc10/include/gtk/gtkmisc.h trunk/vega-vc10/include/gtk/gtknotebook.h trunk/vega-vc10/include/gtk/gtkobject.h trunk/vega-vc10/include/gtk/gtkoptionmenu.h trunk/vega-vc10/include/gtk/gtkpacker.h trunk/vega-vc10/include/gtk/gtkpaned.h trunk/vega-vc10/include/gtk/gtkpixmap.h trunk/vega-vc10/include/gtk/gtkplug.h trunk/vega-vc10/include/gtk/gtkpreview.h trunk/vega-vc10/include/gtk/gtkprivate.h trunk/vega-vc10/include/gtk/gtkprogress.h trunk/vega-vc10/include/gtk/gtkprogressbar.h trunk/vega-vc10/include/gtk/gtkradiobutton.h trunk/vega-vc10/include/gtk/gtkradiomenuitem.h trunk/vega-vc10/include/gtk/gtkrange.h trunk/vega-vc10/include/gtk/gtkrc.h trunk/vega-vc10/include/gtk/gtkruler.h trunk/vega-vc10/include/gtk/gtkscale.h trunk/vega-vc10/include/gtk/gtkscrollbar.h trunk/vega-vc10/include/gtk/gtkscrolledwindow.h trunk/vega-vc10/include/gtk/gtkselection.h trunk/vega-vc10/include/gtk/gtkseparator.h trunk/vega-vc10/include/gtk/gtksignal.h trunk/vega-vc10/include/gtk/gtksocket.h trunk/vega-vc10/include/gtk/gtkspinbutton.h trunk/vega-vc10/include/gtk/gtkstatusbar.h trunk/vega-vc10/include/gtk/gtkstyle.h trunk/vega-vc10/include/gtk/gtktable.h trunk/vega-vc10/include/gtk/gtktearoffmenuitem.h trunk/vega-vc10/include/gtk/gtktext.h trunk/vega-vc10/include/gtk/gtkthemes.h trunk/vega-vc10/include/gtk/gtktipsquery.h trunk/vega-vc10/include/gtk/gtktogglebutton.h trunk/vega-vc10/include/gtk/gtktoolbar.h trunk/vega-vc10/include/gtk/gtktooltips.h trunk/vega-vc10/include/gtk/gtktree.h trunk/vega-vc10/include/gtk/gtktreeitem.h trunk/vega-vc10/include/gtk/gtktypebuiltins.h trunk/vega-vc10/include/gtk/gtktypeutils.h trunk/vega-vc10/include/gtk/gtkvbbox.h trunk/vega-vc10/include/gtk/gtkvbox.h trunk/vega-vc10/include/gtk/gtkviewport.h trunk/vega-vc10/include/gtk/gtkvpaned.h trunk/vega-vc10/include/gtk/gtkvruler.h trunk/vega-vc10/include/gtk/gtkvscale.h trunk/vega-vc10/include/gtk/gtkvscrollbar.h trunk/vega-vc10/include/gtk/gtkvseparator.h trunk/vega-vc10/include/gtk/gtkwidget.h trunk/vega-vc10/include/gtk/gtkwindow.h trunk/vega-vc10/include/gtk/makeenums.h trunk/vega-vc10/include/jconfig.h trunk/vega-vc10/include/jmorecfg.h trunk/vega-vc10/include/jpeglib.h trunk/vega-vc10/include/ogg/ trunk/vega-vc10/include/ogg/ogg.h trunk/vega-vc10/include/ogg/os_types.h trunk/vega-vc10/include/png.h trunk/vega-vc10/include/pngconf.h trunk/vega-vc10/include/pnglibconf.h trunk/vega-vc10/include/python/ trunk/vega-vc10/include/python/Python-ast.h trunk/vega-vc10/include/python/Python.h trunk/vega-vc10/include/python/abstract.h trunk/vega-vc10/include/python/asdl.h trunk/vega-vc10/include/python/ast.h trunk/vega-vc10/include/python/bitset.h trunk/vega-vc10/include/python/boolobject.h trunk/vega-vc10/include/python/bufferobject.h trunk/vega-vc10/include/python/bytearrayobject.h trunk/vega-vc10/include/python/bytes_methods.h trunk/vega-vc10/include/python/bytesobject.h trunk/vega-vc10/include/python/cStringIO.h trunk/vega-vc10/include/python/cellobject.h trunk/vega-vc10/include/python/ceval.h trunk/vega-vc10/include/python/classobject.h trunk/vega-vc10/include/python/cobject.h trunk/vega-vc10/include/python/code.h trunk/vega-vc10/include/python/codecs.h trunk/vega-vc10/include/python/compile.h trunk/vega-vc10/include/python/complexobject.h trunk/vega-vc10/include/python/datetime.h trunk/vega-vc10/include/python/descrobject.h trunk/vega-vc10/include/python/dictobject.h trunk/vega-vc10/include/python/dtoa.h trunk/vega-vc10/include/python/enumobject.h trunk/vega-vc10/include/python/errcode.h trunk/vega-vc10/include/python/eval.h trunk/vega-vc10/include/python/fileobject.h trunk/vega-vc10/include/python/floatobject.h trunk/vega-vc10/include/python/frameobject.h trunk/vega-vc10/include/python/funcobject.h trunk/vega-vc10/include/python/genobject.h trunk/vega-vc10/include/python/graminit.h trunk/vega-vc10/include/python/grammar.h trunk/vega-vc10/include/python/import.h trunk/vega-vc10/include/python/intobject.h trunk/vega-vc10/include/python/intrcheck.h trunk/vega-vc10/include/python/iterobject.h trunk/vega-vc10/include/python/listobject.h trunk/vega-vc10/include/python/longintrepr.h trunk/vega-vc10/include/python/longobject.h trunk/vega-vc10/include/python/marshal.h trunk/vega-vc10/include/python/memoryobject.h trunk/vega-vc10/include/python/metagrammar.h trunk/vega-vc10/include/python/methodobject.h trunk/vega-vc10/include/python/modsupport.h trunk/vega-vc10/include/python/moduleobject.h trunk/vega-vc10/include/python/node.h trunk/vega-vc10/include/python/object.h trunk/vega-vc10/include/python/objimpl.h trunk/vega-vc10/include/python/opcode.h trunk/vega-vc10/include/python/osdefs.h trunk/vega-vc10/include/python/parsetok.h trunk/vega-vc10/include/python/patchlevel.h trunk/vega-vc10/include/python/pgen.h trunk/vega-vc10/include/python/pgenheaders.h trunk/vega-vc10/include/python/py_curses.h trunk/vega-vc10/include/python/pyarena.h trunk/vega-vc10/include/python/pycapsule.h trunk/vega-vc10/include/python/pyconfig.h trunk/vega-vc10/include/python/pyctype.h trunk/vega-vc10/include/python/pydebug.h trunk/vega-vc10/include/python/pyerrors.h trunk/vega-vc10/include/python/pyexpat.h trunk/vega-vc10/include/python/pyfpe.h trunk/vega-vc10/include/python/pygetopt.h trunk/vega-vc10/include/python/pymacconfig.h trunk/vega-vc10/include/python/pymactoolbox.h trunk/vega-vc10/include/python/pymath.h trunk/vega-vc10/include/python/pymem.h trunk/vega-vc10/include/python/pyport.h trunk/vega-vc10/include/python/pystate.h trunk/vega-vc10/include/python/pystrcmp.h trunk/vega-vc10/include/python/pystrtod.h trunk/vega-vc10/include/python/pythonrun.h trunk/vega-vc10/include/python/pythread.h trunk/vega-vc10/include/python/rangeobject.h trunk/vega-vc10/include/python/setobject.h trunk/vega-vc10/include/python/sliceobject.h trunk/vega-vc10/include/python/stringobject.h trunk/vega-vc10/include/python/structmember.h trunk/vega-vc10/include/python/structseq.h trunk/vega-vc10/include/python/symtable.h trunk/vega-vc10/include/python/sysmodule.h trunk/vega-vc10/include/python/timefuncs.h trunk/vega-vc10/include/python/token.h trunk/vega-vc10/include/python/traceback.h trunk/vega-vc10/include/python/tupleobject.h trunk/vega-vc10/include/python/ucnhash.h trunk/vega-vc10/include/python/unicodeobject.h trunk/vega-vc10/include/python/warnings.h trunk/vega-vc10/include/python/weakrefobject.h trunk/vega-vc10/include/sdl/ trunk/vega-vc10/include/sdl/SDL.h trunk/vega-vc10/include/sdl/SDL_active.h trunk/vega-vc10/include/sdl/SDL_audio.h trunk/vega-vc10/include/sdl/SDL_byteorder.h trunk/vega-vc10/include/sdl/SDL_cdrom.h trunk/vega-vc10/include/sdl/SDL_config.h trunk/vega-vc10/include/sdl/SDL_config_win32.h trunk/vega-vc10/include/sdl/SDL_copying.h trunk/vega-vc10/include/sdl/SDL_cpuinfo.h trunk/vega-vc10/include/sdl/SDL_endian.h trunk/vega-vc10/include/sdl/SDL_error.h trunk/vega-vc10/include/sdl/SDL_events.h trunk/vega-vc10/include/sdl/SDL_getenv.h trunk/vega-vc10/include/sdl/SDL_joystick.h trunk/vega-vc10/include/sdl/SDL_keyboard.h trunk/vega-vc10/include/sdl/SDL_keysym.h trunk/vega-vc10/include/sdl/SDL_loadso.h trunk/vega-vc10/include/sdl/SDL_main.h trunk/vega-vc10/include/sdl/SDL_mouse.h trunk/vega-vc10/include/sdl/SDL_mutex.h trunk/vega-vc10/include/sdl/SDL_name.h trunk/vega-vc10/include/sdl/SDL_opengl.h trunk/vega-vc10/include/sdl/SDL_platform.h trunk/vega-vc10/include/sdl/SDL_quit.h trunk/vega-vc10/include/sdl/SDL_rwops.h trunk/vega-vc10/include/sdl/SDL_stdinc.h trunk/vega-vc10/include/sdl/SDL_syswm.h trunk/vega-vc10/include/sdl/SDL_thread.h trunk/vega-vc10/include/sdl/SDL_timer.h trunk/vega-vc10/include/sdl/SDL_types.h trunk/vega-vc10/include/sdl/SDL_version.h trunk/vega-vc10/include/sdl/SDL_video.h trunk/vega-vc10/include/sdl/begin_code.h trunk/vega-vc10/include/sdl/close_code.h trunk/vega-vc10/include/unistd.h trunk/vega-vc10/include/vorbis/ trunk/vega-vc10/include/vorbis/codec.h trunk/vega-vc10/include/vorbis/vorbisenc.h trunk/vega-vc10/include/vorbis/vorbisfile.h trunk/vega-vc10/include/zconf.h trunk/vega-vc10/include/zlib.h trunk/vega-vc10/include/zutil.h trunk/vega-vc10/jpeg-6b/ trunk/vega-vc10/jpeg-6b/Resource.h trunk/vega-vc10/jpeg-6b/ansi2knr.cpp trunk/vega-vc10/jpeg-6b/cderror.h trunk/vega-vc10/jpeg-6b/cdjpeg.cpp trunk/vega-vc10/jpeg-6b/cdjpeg.h trunk/vega-vc10/jpeg-6b/cjpeg.cpp trunk/vega-vc10/jpeg-6b/ckconfig.cpp trunk/vega-vc10/jpeg-6b/djpeg.cpp trunk/vega-vc10/jpeg-6b/example.cpp trunk/vega-vc10/jpeg-6b/jcapimin.cpp trunk/vega-vc10/jpeg-6b/jcapistd.cpp trunk/vega-vc10/jpeg-6b/jccoefct.cpp trunk/vega-vc10/jpeg-6b/jccolor.cpp trunk/vega-vc10/jpeg-6b/jcdctmgr.cpp trunk/vega-vc10/jpeg-6b/jchuff.cpp trunk/vega-vc10/jpeg-6b/jchuff.h trunk/vega-vc10/jpeg-6b/jcinit.cpp trunk/vega-vc10/jpeg-6b/jcmainct.cpp trunk/vega-vc10/jpeg-6b/jcmarker.cpp trunk/vega-vc10/jpeg-6b/jcmaster.cpp trunk/vega-vc10/jpeg-6b/jcomapi.cpp trunk/vega-vc10/jpeg-6b/jconfig.cfg trunk/vega-vc10/jpeg-6b/jcparam.cpp trunk/vega-vc10/jpeg-6b/jcphuff.cpp trunk/vega-vc10/jpeg-6b/jcprepct.cpp trunk/vega-vc10/jpeg-6b/jcsample.cpp trunk/vega-vc10/jpeg-6b/jctrans.cpp trunk/vega-vc10/jpeg-6b/jdapimin.cpp trunk/vega-vc10/jpeg-6b/jdapistd.cpp trunk/vega-vc10/jpeg-6b/jdatadst.cpp trunk/vega-vc10/jpeg-6b/jdatasrc.cpp trunk/vega-vc10/jpeg-6b/jdcoefct.cpp trunk/vega-vc10/jpeg-6b/jdcolor.cpp trunk/vega-vc10/jpeg-6b/jdct.h trunk/vega-vc10/jpeg-6b/jddctmgr.cpp trunk/vega-vc10/jpeg-6b/jdhuff.cpp trunk/vega-vc10/jpeg-6b/jdhuff.h trunk/vega-vc10/jpeg-6b/jdinput.cpp trunk/vega-vc10/jpeg-6b/jdmainct.cpp trunk/vega-vc10/jpeg-6b/jdmarker.cpp trunk/vega-vc10/jpeg-6b/jdmaster.cpp trunk/vega-vc10/jpeg-6b/jdmerge.cpp trunk/vega-vc10/jpeg-6b/jdphuff.cpp trunk/vega-vc10/jpeg-6b/jdpostct.cpp trunk/vega-vc10/jpeg-6b/jdsample.cpp trunk/vega-vc10/jpeg-6b/jdtrans.cpp trunk/vega-vc10/jpeg-6b/jerror.cpp trunk/vega-vc10/jpeg-6b/jerror.h trunk/vega-vc10/jpeg-6b/jfdctflt.cpp trunk/vega-vc10/jpeg-6b/jfdctfst.cpp trunk/vega-vc10/jpeg-6b/jfdctint.cpp trunk/vega-vc10/jpeg-6b/jidctflt.cpp trunk/vega-vc10/jpeg-6b/jidctfst.cpp trunk/vega-vc10/jpeg-6b/jidctint.cpp trunk/vega-vc10/jpeg-6b/jidctred.cpp trunk/vega-vc10/jpeg-6b/jinclude.h trunk/vega-vc10/jpeg-6b/jmemansi.cpp trunk/vega-vc10/jpeg-6b/jmemdos.cpp trunk/vega-vc10/jpeg-6b/jmemmac.cpp trunk/vega-vc10/jpeg-6b/jmemmgr.cpp trunk/vega-vc10/jpeg-6b/jmemname.cpp trunk/vega-vc10/jpeg-6b/jmemnobs.cpp trunk/vega-vc10/jpeg-6b/jmemsys.h trunk/vega-vc10/jpeg-6b/jpeg-6b.cpp trunk/vega-vc10/jpeg-6b/jpeg-6b.h trunk/vega-vc10/jpeg-6b/jpegint.h trunk/vega-vc10/jpeg-6b/jpegtran.cpp trunk/vega-vc10/jpeg-6b/jquant1.cpp trunk/vega-vc10/jpeg-6b/jquant2.cpp trunk/vega-vc10/jpeg-6b/jutils.cpp trunk/vega-vc10/jpeg-6b/jversion.h trunk/vega-vc10/jpeg-6b/makefile.cfg trunk/vega-vc10/jpeg-6b/rdbmp.cpp trunk/vega-vc10/jpeg-6b/rdcolmap.cpp trunk/vega-vc10/jpeg-6b/rdgif.cpp trunk/vega-vc10/jpeg-6b/rdjpgcom.cpp trunk/vega-vc10/jpeg-6b/rdppm.cpp trunk/vega-vc10/jpeg-6b/rdrle.cpp trunk/vega-vc10/jpeg-6b/rdswitch.cpp trunk/vega-vc10/jpeg-6b/rdtarga.cpp trunk/vega-vc10/jpeg-6b/stdafx.cpp trunk/vega-vc10/jpeg-6b/stdafx.h trunk/vega-vc10/jpeg-6b/transupp.cpp trunk/vega-vc10/jpeg-6b/transupp.h trunk/vega-vc10/jpeg-6b/wrbmp.cpp trunk/vega-vc10/jpeg-6b/wrgif.cpp trunk/vega-vc10/jpeg-6b/wrjpgcom.cpp trunk/vega-vc10/jpeg-6b/wrppm.cpp trunk/vega-vc10/jpeg-6b/wrrle.cpp trunk/vega-vc10/jpeg-6b/wrtarga.cpp trunk/vega-vc10/lib/ trunk/vega-vc10/lib/OpenAL32.lib trunk/vega-vc10/lib/SDL.lib trunk/vega-vc10/lib/SDL_d.lib trunk/vega-vc10/lib/SDLmain_static.lib trunk/vega-vc10/lib/SDLmainx64.lib trunk/vega-vc10/lib/SDLx64.lib trunk/vega-vc10/lib/alut_static.lib trunk/vega-vc10/lib/expat.lib trunk/vega-vc10/lib/expat_d.lib trunk/vega-vc10/lib/expatw.lib trunk/vega-vc10/lib/expatw_x64.lib trunk/vega-vc10/lib/expatx64.lib trunk/vega-vc10/lib/freeglut.lib trunk/vega-vc10/lib/freeglut_d.lib trunk/vega-vc10/lib/gdk-1.3.lib trunk/vega-vc10/lib/glib-1.3.lib trunk/vega-vc10/lib/glut32.lib trunk/vega-vc10/lib/gspawn-win32-helper.lib trunk/vega-vc10/lib/gtk-1.3.lib trunk/vega-vc10/lib/jpeg-static.lib trunk/vega-vc10/lib/libjpeg.lib trunk/vega-vc10/lib/libogg_static.lib trunk/vega-vc10/lib/libpng_static.lib trunk/vega-vc10/lib/libpng_static_d.lib trunk/vega-vc10/lib/libvorbis_static.lib trunk/vega-vc10/lib/libvorbisfile_static.lib trunk/vega-vc10/lib/python27.lib trunk/vega-vc10/lib/python27_d.lib trunk/vega-vc10/lib/python27x64.lib trunk/vega-vc10/lib/python27x64_d.lib trunk/vega-vc10/lib/zlib.lib trunk/vega-vc10/lib/zlib_d.lib trunk/vega-vc10/lib/zlib_static.lib trunk/vega-vc10/lib/zlib_static_d.lib trunk/vega-vc10/lib/zlib_static_new.lib trunk/vega-vc10/mission/ trunk/vega-vc10/mission/mission.rc trunk/vega-vc10/mission/mission.vcxproj trunk/vega-vc10/mission/mission.vcxproj.filters trunk/vega-vc10/mission/missionSelect.rc trunk/vega-vc10/mission/resource.h trunk/vega-vc10/mission/resource1.h trunk/vega-vc10/vegastrike/ trunk/vega-vc10/vegastrike/vegastrike.vcxproj trunk/vega-vc10/vegastrike/vegastrike.vcxproj.filters trunk/vega-vc10/vegastrike.sln trunk/vega-vc10/vsserver/ trunk/vega-vc10/vsserver/resource.h trunk/vega-vc10/vsserver/vsserver.ico trunk/vega-vc10/vsserver/vsserver.rc trunk/vega-vc10/vsserver/vsserver.vcxproj trunk/vega-vc10/vsserver/vsserver.vcxproj.filters trunk/vega-vc10/vssetup/ trunk/vega-vc10/vssetup/resource.h trunk/vega-vc10/vssetup/vssetup.vcxproj trunk/vega-vc10/vssetup/vssetup.vcxproj.filters Property changes on: trunk/vega-vc10 ___________________________________________________________________ Added: svn:ignore + Debug Release ipch vegastrike.opensdf vegastrike.sdf vegastrike.suo vsacctserver Added: trunk/vega-vc10/DevTools.sln =================================================================== --- trunk/vega-vc10/DevTools.sln (rev 0) +++ trunk/vega-vc10/DevTools.sln 2012-11-28 04:23:12 UTC (rev 13453) @@ -0,0 +1,35 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mission", "mission\mission.vcxproj", "{CEF355E6-6D70-4F58-A09A-FF148A14E854}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "basemaker", "basemaker\basemaker.vcxproj", "{769293BE-B003-42E8-A98A-4818944E6A45}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mesher", "Mesher\Mesher.vcxproj", "{513A290A-C77B-4F9D-AF72-F98009997AC7}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {CEF355E6-6D70-4F58-A09A-FF148A14E854}.Debug|Win32.ActiveCfg = Debug|Win32 + {CEF355E6-6D70-4F58-A09A-FF148A14E854}.Debug|Win32.Build.0 = Debug|Win32 + {CEF355E6-6D70-4F58-A09A-FF148A14E854}.Release|Win32.ActiveCfg = Release|Win32 + {CEF355E6-6D70-4F58-A09A-FF148A14E854}.Release|Win32.Build.0 = Release|Win32 + {769293BE-B003-42E8-A98A-4818944E6A45}.Debug|Win32.ActiveCfg = Debug|Win32 + {769293BE-B003-42E8-A98A-4818944E6A45}.Debug|Win32.Build.0 = Debug|Win32 + {769293BE-B003-42E8-A98A-4818944E6A45}.Release|Win32.ActiveCfg = Release|Win32 + {769293BE-B003-42E8-A98A-4818944E6A45}.Release|Win32.Build.0 = Release|Win32 + {513A290A-C77B-4F9D-AF72-F98009997AC7}.Debug|Win32.ActiveCfg = Debug|Win32 + {513A290A-C77B-4F9D-AF72-F98009997AC7}.Debug|Win32.Build.0 = Debug|Win32 + {513A290A-C77B-4F9D-AF72-F98009997AC7}.Release|Win32.ActiveCfg = Release|Win32 + {513A290A-C77B-4F9D-AF72-F98009997AC7}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + AMDCaProjectFile = E:\Visual Studio 2008\Projects\Vegastrike\vega-vc9\CodeAnalyst\DevTools.caw + EndGlobalSection +EndGlobal Added: trunk/vega-vc10/InstallScript/ReadME.txt =================================================================== --- trunk/vega-vc10/InstallScript/ReadME.txt (rev 0) +++ trunk/vega-vc10/InstallScript/ReadME.txt 2012-11-28 04:23:12 UTC (rev 13453) @@ -0,0 +1,3 @@ +Install scripts for: + +InnoSetup \ No newline at end of file Added: trunk/vega-vc10/InstallScript/Vegasetup.iss =================================================================== --- trunk/vega-vc10/InstallScript/Vegasetup.iss (rev 0) +++ trunk/vega-vc10/InstallScript/Vegasetup.iss 2012-11-28 04:23:12 UTC (rev 13453) @@ -0,0 +1,75 @@ +; Script generated by the Inno Setup Script Wizard. +; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! + +#define MyAppName "Vegastrike" +#define MyAppVersion "0.5.1.13139" +#define MyAppPublisher "VegaStrike Project" +#define MyAppURL "http://vegastrike.sourceforge.net" +#define MyAppExeName "vegastrike.exe" + +[Setup] +; NOTE: The value of AppId uniquely identifies this application. +; Do not use the same AppId value in installers for other applications. +; (To generate a new GUID, click Tools | Generate GUID inside the IDE.) +AppId={{C3A869E2-B643-479C-BB33-57A981F99F7A} +AppName={#MyAppName} +AppVersion={#MyAppVersion} +;AppVerName={#MyAppName} {#MyAppVersion} +AppPublisher={#MyAppPublisher} +AppPublisherURL={#MyAppURL} +AppSupportURL={#MyAppURL} +AppUpdatesURL={#MyAppURL} +DefaultDirName={pf}\{#MyAppName} +DefaultGroupName={#MyAppName} +AllowNoIcons=yes +OutputBaseFilename=VSSetup 0.5.1 beta 1 +SetupIconFile=E:\SCM\VegaStrike\vegastrike\icon4.ico +Compression=lzma +SolidCompression=yes + +[Languages] +Name: "english"; MessagesFile: "compiler:Default.isl" + +[Tasks] +Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked +Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked; OnlyBelowVersion: 0,6.1 + +[Files] +Source: "E:\SCM\VegaStrike\Install\vegastrike.exe"; DestDir: "{app}"; Flags: ignoreversion +Source: "E:\SCM\VegaStrike\Install\expat.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "E:\SCM\VegaStrike\Install\gdk-1.3.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "E:\SCM\VegaStrike\Install\glib-1.3.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "E:\SCM\VegaStrike\Install\glut32.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "E:\SCM\VegaStrike\Install\gmodule-1.3.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "E:\SCM\VegaStrike\Install\gnu-intl.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "E:\SCM\VegaStrike\Install\gtk-1.3.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "E:\SCM\VegaStrike\Install\iconv-1.3.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "E:\SCM\VegaStrike\Install\mesher.exe"; DestDir: "{app}"; Flags: ignoreversion +Source: "E:\SCM\VegaStrike\Install\normal_mapping.exe"; DestDir: "{app}"; Flags: ignoreversion +Source: "E:\SCM\VegaStrike\Install\oalinst.exe"; DestDir: "{app}"; Flags: ignoreversion +Source: "E:\SCM\VegaStrike\Install\OpenAL32.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "E:\SCM\VegaStrike\Install\python25.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "E:\SCM\VegaStrike\Install\python26.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "E:\SCM\VegaStrike\Install\python26_d.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "E:\SCM\VegaStrike\Install\SDL.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "E:\SCM\VegaStrike\Install\setup.exe"; DestDir: "{app}"; Flags: ignoreversion +Source: "E:\SCM\VegaStrike\Install\vcredist_x86.exe"; DestDir: "{app}"; Flags: ignoreversion +Source: "E:\SCM\VegaStrike\Install\vegaserver.exe"; DestDir: "{app}"; Flags: ignoreversion +Source: "E:\SCM\VegaStrike\Install\vegastrike.exe"; DestDir: "{app}"; Flags: ignoreversion +Source: "E:\SCM\VegaStrike\Install\vegastrike.exe.manifest"; DestDir: "{app}"; Flags: ignoreversion +Source: "E:\SCM\VegaStrike\Install\wrap_oal.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "E:\SCM\VegaStrike\Install\xmlparse.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "E:\SCM\VegaStrike\Install\data\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs +; NOTE: Don't use "Flags: ignoreversion" on any shared system files + +[Icons] +Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}" +Name: "{group}\{cm:ProgramOnTheWeb,{#MyAppName}}"; Filename: "{#MyAppURL}" +Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}" +Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon +Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: quicklaunchicon + +[Run] +Filename: "{app}\vcredist_x86.exe"; Description: "MS Visual C++ 2008 runtime files"; StatusMsg: "Installing Visual C++ 9 Runtime Files..."; Flags: nowait +Filename: "{app}\oalinst.exe"; Description: "Creative Labs OpenAL Runtime Files"; StatusMsg: "Installing OpenAL Runtime Files..."; Flags: nowait +Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, "&", "&&")}}"; Flags: nowait postinstall skipifsilent Added: trunk/vega-vc10/InstallScript/vegasetup51r1.iss =================================================================== --- trunk/vega-vc10/InstallScript/vegasetup51r1.iss (rev 0) +++ trunk/vega-vc10/InstallScript/vegasetup51r1.iss 2012-11-28 04:23:12 UTC (rev 13453) @@ -0,0 +1,59 @@ +; Script generated by the Inno Setup Script Wizard. +; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! + +#define MyAppName "Vega Strike" +#define MyAppVersion ".5.1" +#define MyAppPublisher "Vega Strike Project" +#define MyAppURL "http://www.vega-strike.org" +#define MyAppExeName "vegastrike.exe" + +[Setup] +; NOTE: The value of AppId uniquely identifies this application. +; Do not use the same AppId value in installers for other applications. +; (To generate a new GUID, click Tools | Generate GUID inside the IDE.) +AppID={{10E0724C-11ED-45C8-AD4D-2D6FC6B304BF} +AppName={#MyAppName} +AppVersion={#MyAppVersion} +;AppVerName={#MyAppName} {#MyAppVersion} +AppPublisher={#MyAppPublisher} +AppPublisherURL={#MyAppURL} +AppSupportURL={#MyAppURL} +AppUpdatesURL={#MyAppURL} +DefaultDirName={pf}\{#MyAppName} +DefaultGroupName={#MyAppName} +AllowNoIcons=true +OutputDir=E:\vsdone +OutputBaseFilename=VS Setup .5.1 r1 +SetupIconFile=E:\vsinstall\vegastrike.ico +Compression=lzma2/Ultra +SolidCompression=true + +[Languages] +Name: "english"; MessagesFile: "compiler:Default.isl" +Name: "french"; MessagesFile: "compiler:Languages\French.isl" +Name: "german"; MessagesFile: "compiler:Languages\German.isl" +Name: "russian"; MessagesFile: "compiler:Languages\Russian.isl" +Name: "spanish"; MessagesFile: "compiler:Languages\Spanish.isl" + +[Tasks] +Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked +Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked; OnlyBelowVersion: 0,6.1 + +[Files] +Source: "E:\vsinstall\vegastrike.exe"; DestDir: "{app}"; Flags: ignoreversion +Source: "E:\vsinstall\vcredist_x86.exe"; DestDir: "{app}"; Flags: ignoreversion +Source: "E:\vsinstall\oalinst.exe"; DestDir: "{app}"; Flags: ignoreversion +Source: "E:\vsinstall\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs +; NOTE: Don't use "Flags: ignoreversion" on any shared system files + +[Icons] +Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}" +Name: "{group}\{cm:ProgramOnTheWeb,{#MyAppName}}"; Filename: "{#MyAppURL}" +Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}" +Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon +Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: quicklaunchicon + +[Run] +Filename: "{app}\vcredist_x86.exe"; Description: "MS Visual C++ 2008 runtime files"; StatusMsg: "Installing Visual C++ 9 Runtime Files..."; Flags: nowait +Filename: "{app}\oalinst.exe"; Description: "Creative Labs OpenAL Runtime Files"; StatusMsg: "Installing OpenAL Runtime Files..."; Flags: nowait +Filename: {app}\{#MyAppExeName}; Flags: postinstall skipifsilent WaitUntilIdle; Property changes on: trunk/vega-vc10/Mesher ___________________________________________________________________ Added: svn:ignore + Mesher.vcproj Mesher.vcproj.ANONYMOUS.Owner.user Mesher.vcxproj.user mesher.aps Added: trunk/vega-vc10/Mesher/Mesher.vcxproj =================================================================== --- trunk/vega-vc10/Mesher/Mesher.vcxproj (rev 0) +++ trunk/vega-vc10/Mesher/Mesher.vcxproj 2012-11-28 04:23:12 UTC (rev 13453) @@ -0,0 +1,121 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{513A290A-C77B-4F9D-AF72-F98009997AC7}</ProjectGuid> + <RootNamespace>Mesher</RootNamespace> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <WholeProgramOptimization>true</WholeProgramOptimization> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\$(ProjectName)\</IntDir> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <Optimization>Disabled</Optimization> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + </ClCompile> + <Link> + <GenerateDebugInformation>true</GenerateDebugInformation> + <TargetMachine>MachineX86</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <Optimization>MaxSpeed</Optimization> + <IntrinsicFunctions>true</IntrinsicFunctions> + <AdditionalIncludeDirectories>\;..\..\vegastrike\src;..\..\vegastrike\objconv\mesher;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FunctionLevelLinking>true</FunctionLevelLinking> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + </ClCompile> + <Link> + <AdditionalDependencies>..\..\vegastrike\objconv\mesher\expat.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalLibraryDirectories>../vegastrike/objconv/mesher;../vegastrike/src;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <GenerateDebugInformation>true</GenerateDebugInformation> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <TargetMachine>MachineX86</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="..\..\vegastrike\objconv\mesher\Modules\BFXM_to_Wavefront.cpp" /> + <ClCompile Include="..\..\vegastrike\objconv\mesher\Modules\BFXM_to_XMesh.cpp" /> + <ClCompile Include="..\..\vegastrike\objconv\mesher\Modules\Convert.cpp" /> + <ClCompile Include="..\..\vegastrike\objconv\mesher\Converter.cpp" /> + <ClCompile Include="..\..\vegastrike\objconv\mesher\PrecompiledHeaders\Converter.cpp" /> + <ClCompile Include="..\..\vegastrike\objconv\mesher\Modules\Dims.cpp" /> + <ClCompile Include="..\..\vegastrike\objconv\mesher\from_BFXM.cpp" /> + <ClCompile Include="..\..\vegastrike\objconv\mesher\from_obj.cpp" /> + <ClCompile Include="..\..\vegastrike\src\hashtable.cpp" /> + <ClCompile Include="..\..\vegastrike\objconv\mesher\main.cpp" /> + <ClCompile Include="..\..\vegastrike\objconv\mesher\Modules\OldSyntax.cpp" /> + <ClCompile Include="..\..\vegastrike\objconv\mesher\to_BFXM.cpp" /> + <ClCompile Include="..\..\vegastrike\objconv\mesher\to_obj.cpp" /> + <ClCompile Include="..\..\vegastrike\objconv\mesher\to_OgreMesh.cpp" /> + <ClCompile Include="..\..\vegastrike\objconv\mesher\Modules\Wavefront_to_BFXM.cpp" /> + <ClCompile Include="..\..\vegastrike\objconv\mesher\Modules\XMesh_to_BFXM.cpp" /> + <ClCompile Include="..\..\vegastrike\objconv\mesher\Modules\XMesh_to_Ogre.cpp" /> + <ClCompile Include="..\..\vegastrike\src\xml_support.cpp" /> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\vegastrike\objconv\mesher\PrecompiledHeaders\Converter.h" /> + <ClInclude Include="..\..\vegastrike\objconv\mesher\Converter.h" /> + <ClInclude Include="..\..\vegastrike\objconv\mesher\from_BFXM.h" /> + <ClInclude Include="..\..\vegastrike\objconv\mesher\from_obj.h" /> + <ClInclude Include="..\..\vegastrike\src\gnuhash.h" /> + <ClInclude Include="..\..\vegastrike\src\hashtable.h" /> + <ClInclude Include="..\..\vegastrike\objconv\mesher\mesh_io.h" /> + <ClInclude Include="resource.h" /> + <ClInclude Include="..\..\vegastrike\objconv\mesher\to_BFXM.h" /> + <ClInclude Include="..\..\vegastrike\objconv\mesher\to_obj.h" /> + <ClInclude Include="..\..\vegastrike\objconv\mesher\to_OgreMesh.h" /> + <ClInclude Include="..\..\vegastrike\src\xml_support.h" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> \ No newline at end of file Added: trunk/vega-vc10/Mesher/Mesher.vcxproj.filters =================================================================== --- trunk/vega-vc10/Mesher/Mesher.vcxproj.filters (rev 0) +++ trunk/vega-vc10/Mesher/Mesher.vcxproj.filters 2012-11-28 04:23:12 UTC (rev 13453) @@ -0,0 +1,111 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <Filter Include="Source Files"> + <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> + <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> + </Filter> + <Filter Include="Header Files"> + <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier> + <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions> + </Filter> + <Filter Include="Resource Files"> + <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier> + <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions> + </Filter> + </ItemGroup> + <ItemGroup> + <ClCompile Include="..\..\vegastrike\objconv\mesher\Modules\BFXM_to_Wavefront.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\vegastrike\objconv\mesher\Modules\BFXM_to_XMesh.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\vegastrike\objconv\mesher\Modules\Convert.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\vegastrike\objconv\mesher\Converter.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\vegastrike\objconv\mesher\PrecompiledHeaders\Converter.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\vegastrike\objconv\mesher\Modules\Dims.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\vegastrike\objconv\mesher\from_BFXM.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\vegastrike\objconv\mesher\from_obj.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\vegastrike\src\hashtable.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\vegastrike\objconv\mesher\main.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\vegastrike\objconv\mesher\Modules\OldSyntax.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\vegastrike\objconv\mesher\to_BFXM.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\vegastrike\objconv\mesher\to_obj.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\vegastrike\objconv\mesher\to_OgreMesh.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\vegastrike\objconv\mesher\Modules\Wavefront_to_BFXM.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\vegastrike\objconv\mesher\Modules\XMesh_to_BFXM.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\vegastrike\objconv\mesher\Modules\XMesh_to_Ogre.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\vegastrike\src\xml_support.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\vegastrike\objconv\mesher\PrecompiledHeaders\Converter.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\vegastrike\objconv\mesher\Converter.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\vegastrike\objconv\mesher\from_BFXM.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\vegastrike\objconv\mesher\from_obj.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\vegastrike\src\gnuhash.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\vegastrike\src\hashtable.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\vegastrike\objconv\mesher\mesh_io.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="resource.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\vegastrike\objconv\mesher\to_BFXM.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\vegastrike\objconv\mesher\to_obj.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\vegastrike\objconv\mesher\to_OgreMesh.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\vegastrike\src\xml_support.h"> + <Filter>Header Files</Filter> + </ClInclude> + </ItemGroup> +</Project> \ No newline at end of file Added: trunk/vega-vc10/Mesher/config.h =================================================================== --- trunk/vega-vc10/Mesher/config.h (rev 0) +++ trunk/vega-vc10/Mesher/config.h 2012-11-28 04:23:12 UTC (rev 13453) @@ -0,0 +1 @@ +#pragma warning(disable: 4786) Added: trunk/vega-vc10/Mesher/mesher.rc =================================================================== --- trunk/vega-vc10/Mesher/mesher.rc (rev 0) +++ trunk/vega-vc10/Mesher/mesher.rc 2012-11-28 04:23:12 UTC (rev 13453) @@ -0,0 +1,112 @@ +// Microsoft Visual C++ generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "afxres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 0,0,1,5 + PRODUCTVERSION 0,0,1,5 + FILEFLAGSMASK 0x17L +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x4L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "Comments", "3D model conversion utility." + VALUE "CompanyName", "Vega Strike Project" + VALUE "FileDescription", "Mesher3D Utility" + VALUE "FileVersion", "0, 0, 1, 5" + VALUE "InternalName", "Mesher" + VALUE "LegalCopyright", "\xA9 Copyright 1998-2010 Vega Strike Project. All rights reserved. See the vega-licence.txt for details." + VALUE "OriginalFilename", "Mesher.exe" + VALUE "ProductName", "Mesher3D" + VALUE "ProductVersion", "0, 0, 1, 5" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_ICON1 ICON "E:\\Visual Studio 2008\\Projects\\Vegastrike\\vegastrike\\icon3.ico" +#endif // English (U.S.) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + Added: trunk/vega-vc10/Mesher/resource.h =================================================================== --- trunk/vega-vc10/Mesher/resource.h (rev 0) +++ trunk/vega-vc10/Mesher/resource.h 2012-11-28 04:23:12 UTC (rev 13453) @@ -0,0 +1,16 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by mesher.rc +// +#define IDI_ICON1 101 + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 102 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1001 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif Added: trunk/vega-vc10/ReadMe.txt =================================================================== --- trunk/vega-vc10/ReadMe.txt (rev 0) +++ trunk/vega-vc10/ReadMe.txt 2012-11-28 04:23:12 UTC (rev 13453) @@ -0,0 +1,9 @@ +15th Dec 2010: + +Current solution(s) Will build working binaries. +Solutions may change again in the new further to split vegaserver into its own solution. This is not certain though. +New icons needed for mesher, basemaker, and mission selector. If you would like to contribute send me a PM on the forums @ pheonixstorm + +Express users, if you have any issues please use the VCExpress.diff to update your resource (.rc) files for the project causing problems. Also, you will need to use the 2008 SDK or higher. + +If you use a version of Visual C++ higher than the current solution/project submit your current versions project/solution files to the forums for inclusion here. \ No newline at end of file Property changes on: trunk/vega-vc10/basemaker ___________________________________________________________________ Added: svn:ignore + basemaker.aps basemaker.vcproj basemaker.vcproj.ANONYMOUS.Owner.user basemaker.vcxproj.user Added: trunk/vega-vc10/basemaker/basemaker.rc =================================================================== --- trunk/vega-vc10/basemaker/basemaker.rc (rev 0) +++ trunk/vega-vc10/basemaker/basemaker.rc 2012-11-28 04:23:12 UTC (rev 13453) @@ -0,0 +1,101 @@ +// Microsoft Visual C++ generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "afxres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 1,0,0,1 + PRODUCTVERSION 1,0,0,1 + FILEFLAGSMASK 0x17L +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x4L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "FileDescription", "basemake Application" + VALUE "FileVersion", "1, 0, 0, 1" + VALUE "InternalName", "basemake" + VALUE "LegalCopyright", "Copyright (C) 2010" + VALUE "OriginalFilename", "basemake.exe" + VALUE "ProductName", "basemake Application" + VALUE "ProductVersion", "1, 0, 0, 1" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#endif // English (U.S.) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + Added: trunk/vega-vc10/basemaker/basemaker.vcxproj =================================================================== --- trunk/vega-vc10/basemaker/basemaker.vcxproj (rev 0) +++ trunk/vega-vc10/basemaker/basemaker.vcxproj 2012-11-28 04:23:12 UTC (rev 13453) @@ -0,0 +1,170 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{769293BE-B003-42E8-A98A-4818944E6A45}</ProjectGuid> + <RootNamespace>basemaker</RootNamespace> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <WholeProgramOptimization>true</WholeProgramOptimization> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\$(ProjectName)\</IntDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\$(ProjectName)\</IntDir> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>..\include;..\include\gl;..\..\vegastrike\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <StringPooling>true</StringPooling> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <BrowseInformation>true</BrowseInformation> + <WarningLevel>Level1</WarningLevel> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <CompileAs>Default</CompileAs> + </ClCompile> + <Link> + <AdditionalDependencies>glut32.lib;libpng_static.lib;zlib_static.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>$(OutDir)BaseMaker-d.exe</OutputFile> + <AdditionalLibraryDirectories>..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <IgnoreSpecificDefaultLibraries>LIBCMT;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> + <GenerateDebugInformation>true</GenerateDebugInformation> + <AssemblyDebug>true</AssemblyDebug> + <GenerateMapFile>true</GenerateMapFile> + <MapFileName>$(TargetName)</MapFileName> + <MapExports>true</MapExports> + <TargetMachine>MachineX86</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <Optimization>Disabled</Optimization> + <IntrinsicFunctions>false</IntrinsicFunctions> + <WholeProgramOptimization>false</WholeProgramOptimization> + <AdditionalIncludeDirectories>..\include;..\include\gl;..\..\vegastrike\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FunctionLevelLinking>true</FunctionLevelLinking> + <WarningLevel>Level3</WarningLevel> + <DebugI... [truncated message content] |
From: <phe...@us...> - 2012-12-01 05:41:37
|
Revision: 13454 http://vegastrike.svn.sourceforge.net/vegastrike/?rev=13454&view=rev Author: pheonixstorm Date: 2012-12-01 05:41:30 +0000 (Sat, 01 Dec 2012) Log Message: ----------- Reverted cockpit_generic.cpp/h back to r13388 and added sound_container to vegaserver project Revision Links: -------------- http://vegastrike.svn.sourceforge.net/vegastrike/?rev=13388&view=rev Modified Paths: -------------- trunk/vega-vc10/vsserver/vsserver.vcxproj trunk/vega-vc10/vsserver/vsserver.vcxproj.filters trunk/vegastrike/src/gfx/cockpit_generic.cpp trunk/vegastrike/src/gfx/cockpit_generic.h Modified: trunk/vega-vc10/vsserver/vsserver.vcxproj =================================================================== --- trunk/vega-vc10/vsserver/vsserver.vcxproj 2012-11-28 04:23:12 UTC (rev 13453) +++ trunk/vega-vc10/vsserver/vsserver.vcxproj 2012-12-01 05:41:30 UTC (rev 13454) @@ -203,6 +203,7 @@ <ClCompile Include="..\..\vegastrike\src\galaxy_gen.cpp" /> <ClCompile Include="..\..\vegastrike\src\galaxy_xml.cpp" /> <ClCompile Include="..\..\vegastrike\src\gfxlib_struct_server.cpp" /> + <ClCompile Include="..\..\vegastrike\src\gfx\soundcontainer_generic.cpp" /> <ClCompile Include="..\..\vegastrike\src\gldrv\gl_sphere_list_server.cpp" /> <ClCompile Include="..\..\vegastrike\src\gldrv\gl_vertex_list.cpp" /> <ClCompile Include="..\..\vegastrike\src\hashtable.cpp" /> @@ -450,6 +451,7 @@ <ClInclude Include="..\..\vegastrike\src\faction_generic.h" /> <ClInclude Include="..\..\vegastrike\src\galaxy_gen.h" /> <ClInclude Include="..\..\vegastrike\src\galaxy_xml.h" /> + <ClInclude Include="..\..\vegastrike\src\gfx\soundcontainer_generic.h" /> <ClInclude Include="..\..\vegastrike\src\hashtable.h" /> <ClInclude Include="..\..\vegastrike\src\lin_time.h" /> <ClInclude Include="..\..\vegastrike\src\load_mission.h" /> Modified: trunk/vega-vc10/vsserver/vsserver.vcxproj.filters =================================================================== --- trunk/vega-vc10/vsserver/vsserver.vcxproj.filters 2012-11-28 04:23:12 UTC (rev 13453) +++ trunk/vega-vc10/vsserver/vsserver.vcxproj.filters 2012-12-01 05:41:30 UTC (rev 13454) @@ -819,6 +819,9 @@ <ClCompile Include="..\..\vegastrike\boost\1_45\src\wrapper.cpp"> <Filter>Source Files\Boost</Filter> </ClCompile> + <ClCompile Include="..\..\vegastrike\src\gfx\soundcontainer_generic.cpp"> + <Filter>Source Files</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\vegastrike\src\configxml.h"> @@ -1385,6 +1388,9 @@ <ClInclude Include="..\..\vegastrike\src\gfx\vec.h"> <Filter>Header Files\GFX</Filter> </ClInclude> + <ClInclude Include="..\..\vegastrike\src\gfx\soundcontainer_generic.h"> + <Filter>Header Files</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <None Include="vsserver.ico"> Modified: trunk/vegastrike/src/gfx/cockpit_generic.cpp =================================================================== --- trunk/vegastrike/src/gfx/cockpit_generic.cpp 2012-11-28 04:23:12 UTC (rev 13453) +++ trunk/vegastrike/src/gfx/cockpit_generic.cpp 2012-12-01 05:41:30 UTC (rev 13454) @@ -957,7 +957,6 @@ return name; } -#ifdef CLIENT SoundContainer* Cockpit::GetSoundForEvent(Cockpit::EVENTID eventId) const { if (eventId < sounds.size()) @@ -977,4 +976,4 @@ { return new SoundContainer(specs); } -#endif + Modified: trunk/vegastrike/src/gfx/cockpit_generic.h =================================================================== --- trunk/vegastrike/src/gfx/cockpit_generic.h 2012-11-28 04:23:12 UTC (rev 13453) +++ trunk/vegastrike/src/gfx/cockpit_generic.h 2012-12-01 05:41:30 UTC (rev 13454) @@ -35,8 +35,7 @@ class Cockpit { public: - ///cockpit events. Not needed in server -#ifdef CLIENT + ///cockpit events. enum EVENTID { EVENTID_FIRST, @@ -115,8 +114,8 @@ /// Just after all valid values NUM_EVENTS }; -#endif + protected: ///style of current view (chase cam, inside) enum VIEWSTYLE view; @@ -338,7 +337,7 @@ virtual void SetCommAnimation( Animation *ani, Unit *un ) {} virtual void SetStaticAnimation() {} -#ifdef CLIENT + /** * Retrieves the sound associated to the given event. * Returns NULL if no sound has been associated @@ -350,8 +349,8 @@ * (the actual container will be a different, implementation-specific one) */ void SetSoundForEvent(EVENTID eventId, const SoundContainer &soundSpecs); -#endif + class SaveGame*savegame; ///Accesses the current navigationsystem @@ -405,11 +404,9 @@ virtual void OnJumpBegin(Unit *) {} virtual void OnJumpEnd(Unit *) {} -#ifdef CLIENT protected: /// Override to use a specific kind of sound implementation virtual SoundContainer* soundImpl(const SoundContainer &specs); -#endif }; #endif |
From: <phe...@us...> - 2013-01-01 20:28:22
|
Revision: 13474 http://vegastrike.svn.sourceforge.net/vegastrike/?rev=13474&view=rev Author: pheonixstorm Date: 2013-01-01 20:28:11 +0000 (Tue, 01 Jan 2013) Log Message: ----------- Updating windows binary and resource file for r13473 Revision Links: -------------- http://vegastrike.svn.sourceforge.net/vegastrike/?rev=13473&view=rev Modified Paths: -------------- trunk/vegastrike/Resources.rc trunk/win32/bin/vegastrike.exe Modified: trunk/vegastrike/Resources.rc =================================================================== --- trunk/vegastrike/Resources.rc 2013-01-01 07:03:37 UTC (rev 13473) +++ trunk/vegastrike/Resources.rc 2013-01-01 20:28:11 UTC (rev 13474) @@ -60,8 +60,8 @@ // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,5,2,13451 - PRODUCTVERSION 0,5,2,13451 + FILEVERSION 0,5,2,13473 + PRODUCTVERSION 0,5,2,13473 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x9L @@ -79,13 +79,13 @@ VALUE "Comments", "Vega Strike is the 3D Space Simulator that allows you to trade and bounty hunt in a vast universe. Can you face the dangers and decisions that await..." VALUE "CompanyName", "Vega Strike Project" VALUE "FileDescription", "Vega Strike Open Source Space Simulator" - VALUE "FileVersion", "0.5.2.13451" + VALUE "FileVersion", "0.5.2.13473" VALUE "InternalName", "vegastrike" VALUE "LegalCopyright", "\xA9 Copyright 1998-2011 Vega Strike Project. All rights reserved. See the vega-licence.txt for details." VALUE "OriginalFilename", "Vegastrike.exe" - VALUE "PrivateBuild", "13370" + VALUE "PrivateBuild", "13473" VALUE "ProductName", "Vega Strike" - VALUE "ProductVersion", "0.5.2.13451" + VALUE "ProductVersion", "0.5.2.13473" END END BLOCK "VarFileInfo" Modified: trunk/win32/bin/vegastrike.exe =================================================================== (Binary files differ) |
From: <phe...@us...> - 2013-03-04 14:45:55
|
Revision: 13556 http://vegastrike.svn.sourceforge.net/vegastrike/?rev=13556&view=rev Author: pheonixstorm Date: 2013-03-04 14:45:47 +0000 (Mon, 04 Mar 2013) Log Message: ----------- Updating binary and win32 project file to r13555 Revision Links: -------------- http://vegastrike.svn.sourceforge.net/vegastrike/?rev=13555&view=rev Modified Paths: -------------- trunk/vega-vc10/vegastrike/vegastrike.vcxproj trunk/vega-vc10/vegastrike/vegastrike.vcxproj.filters trunk/vegastrike/Resources.rc trunk/win32/bin/vegastrike.exe Modified: trunk/vega-vc10/vegastrike/vegastrike.vcxproj =================================================================== --- trunk/vega-vc10/vegastrike/vegastrike.vcxproj 2013-03-04 02:01:33 UTC (rev 13555) +++ trunk/vega-vc10/vegastrike/vegastrike.vcxproj 2013-03-04 14:45:47 UTC (rev 13556) @@ -123,17 +123,18 @@ <IntrinsicFunctions>true</IntrinsicFunctions> <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> <WholeProgramOptimization>false</WholeProgramOptimization> - <AdditionalIncludeDirectories>../;../include;../include/python;../jpeg-6b;../../vegastrike/src;../../vegastrike/src/cmd;../../vegastrike/src/cmd/collide2;../../vegastrike/src/python;../../vegastrike/boost/1_45;../../vegastrike/boost/1_45/boost;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>../;../include;../include/python;../jpeg-6b;../../vegastrike/src;../../vegastrike/src/cmd;../../vegastrike/src/cmd/collide2;../../vegastrike/src/python;../../vegastrike/boost/1_53;../../vegastrike/boost/1_535/boost;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;HAVE_AL;HAVE_SDL;YY_ALWAYS_INTERACTIVE;SDL_WINDOWING;HAVE_OGG;HAVE_BOOST;HAVE_PYTHON;JPEG_SUPPORT;BOOST_PYTHON_NO_PY_SIGNATURES;BOOST_PYTHON_STATIC_LIB;BOOST_ALL_NO_LIB;NV_CUBE_MAP;OPCODE_COLLIDER;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <BufferSecurityCheck>true</BufferSecurityCheck> <FunctionLevelLinking>false</FunctionLevelLinking> <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> - <WarningLevel>Level4</WarningLevel> + <WarningLevel>Level1</WarningLevel> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <CompileAs>Default</CompileAs> <DisableSpecificWarnings>4100;4244;4290;4512;%(DisableSpecificWarnings)</DisableSpecificWarnings> + <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <ResourceCompile> <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> @@ -218,6 +219,34 @@ </Bscmake> </ItemDefinitionGroup> <ItemGroup> + <ClCompile Include="..\..\vegastrike\boost\1_53\src\converter\arg_to_python_base.cpp" /> + <ClCompile Include="..\..\vegastrike\boost\1_53\src\converter\builtin_converters.cpp" /> + <ClCompile Include="..\..\vegastrike\boost\1_53\src\converter\from_python.cpp" /> + <ClCompile Include="..\..\vegastrike\boost\1_53\src\converter\registry.cpp" /> + <ClCompile Include="..\..\vegastrike\boost\1_53\src\converter\type_id.cpp" /> + <ClCompile Include="..\..\vegastrike\boost\1_53\src\dict.cpp" /> + <ClCompile Include="..\..\vegastrike\boost\1_53\src\errors.cpp" /> + <ClCompile Include="..\..\vegastrike\boost\1_53\src\exec.cpp" /> + <ClCompile Include="..\..\vegastrike\boost\1_53\src\import.cpp" /> + <ClCompile Include="..\..\vegastrike\boost\1_53\src\list.cpp" /> + <ClCompile Include="..\..\vegastrike\boost\1_53\src\long.cpp" /> + <ClCompile Include="..\..\vegastrike\boost\1_53\src\module.cpp" /> + <ClCompile Include="..\..\vegastrike\boost\1_53\src\numeric.cpp" /> + <ClCompile Include="..\..\vegastrike\boost\1_53\src\object\class.cpp" /> + <ClCompile Include="..\..\vegastrike\boost\1_53\src\object\enum.cpp" /> + <ClCompile Include="..\..\vegastrike\boost\1_53\src\object\function.cpp" /> + <ClCompile Include="..\..\vegastrike\boost\1_53\src\object\function_doc_signature.cpp" /> + <ClCompile Include="..\..\vegastrike\boost\1_53\src\object\inheritance.cpp" /> + <ClCompile Include="..\..\vegastrike\boost\1_53\src\object\iterator.cpp" /> + <ClCompile Include="..\..\vegastrike\boost\1_53\src\object\life_support.cpp" /> + <ClCompile Include="..\..\vegastrike\boost\1_53\src\object\pickle_support.cpp" /> + <ClCompile Include="..\..\vegastrike\boost\1_53\src\object\stl_iterator.cpp" /> + <ClCompile Include="..\..\vegastrike\boost\1_53\src\object_operators.cpp" /> + <ClCompile Include="..\..\vegastrike\boost\1_53\src\object_protocol.cpp" /> + <ClCompile Include="..\..\vegastrike\boost\1_53\src\slice.cpp" /> + <ClCompile Include="..\..\vegastrike\boost\1_53\src\str.cpp" /> + <ClCompile Include="..\..\vegastrike\boost\1_53\src\tuple.cpp" /> + <ClCompile Include="..\..\vegastrike\boost\1_53\src\wrapper.cpp" /> <ClCompile Include="..\..\vegastrike\src\cg_global.cpp" /> <ClCompile Include="..\..\vegastrike\src\command.cpp" /> <ClCompile Include="..\..\vegastrike\src\config_xml.cpp" /> @@ -271,34 +300,6 @@ <ClCompile Include="..\..\vegastrike\src\xml_serializer.cpp" /> <ClCompile Include="..\..\vegastrike\src\xml_support.cpp" /> <ClCompile Include="..\..\vegastrike\src\XMLDocument.cpp" /> - <ClCompile Include="..\..\vegastrike\boost\1_45\src\converter\arg_to_python_base.cpp" /> - <ClCompile Include="..\..\vegastrike\boost\1_45\src\converter\builtin_converters.cpp" /> - <ClCompile Include="..\..\vegastrike\boost\1_45\src\object\class.cpp" /> - <ClCompile Include="..\..\vegastrike\boost\1_45\src\dict.cpp" /> - <ClCompile Include="..\..\vegastrike\boost\1_45\src\object\enum.cpp" /> - <ClCompile Include="..\..\vegastrike\boost\1_45\src\errors.cpp" /> - <ClCompile Include="..\..\vegastrike\boost\1_45\src\exec.cpp" /> - <ClCompile Include="..\..\vegastrike\boost\1_45\src\converter\from_python.cpp" /> - <ClCompile Include="..\..\vegastrike\boost\1_45\src\object\function.cpp" /> - <ClCompile Include="..\..\vegastrike\boost\1_45\src\object\function_doc_signature.cpp" /> - <ClCompile Include="..\..\vegastrike\boost\1_45\src\import.cpp" /> - <ClCompile Include="..\..\vegastrike\boost\1_45\src\object\inheritance.cpp" /> - <ClCompile Include="..\..\vegastrike\boost\1_45\src\object\iterator.cpp" /> - <ClCompile Include="..\..\vegastrike\boost\1_45\src\object\life_support.cpp" /> - <ClCompile Include="..\..\vegastrike\boost\1_45\src\list.cpp" /> - <ClCompile Include="..\..\vegastrike\boost\1_45\src\long.cpp" /> - <ClCompile Include="..\..\vegastrike\boost\1_45\src\module.cpp" /> - <ClCompile Include="..\..\vegastrike\boost\1_45\src\numeric.cpp" /> - <ClCompile Include="..\..\vegastrike\boost\1_45\src\object_operators.cpp" /> - <ClCompile Include="..\..\vegastrike\boost\1_45\src\object_protocol.cpp" /> - <ClCompile Include="..\..\vegastrike\boost\1_45\src\object\pickle_support.cpp" /> - <ClCompile Include="..\..\vegastrike\boost\1_45\src\converter\registry.cpp" /> - <ClCompile Include="..\..\vegastrike\boost\1_45\src\slice.cpp" /> - <ClCompile Include="..\..\vegastrike\boost\1_45\src\object\stl_iterator.cpp" /> - <ClCompile Include="..\..\vegastrike\boost\1_45\src\str.cpp" /> - <ClCompile Include="..\..\vegastrike\boost\1_45\src\tuple.cpp" /> - <ClCompile Include="..\..\vegastrike\boost\1_45\src\converter\type_id.cpp" /> - <ClCompile Include="..\..\vegastrike\boost\1_45\src\wrapper.cpp" /> <ClCompile Include="..\..\vegastrike\src\audio\CodecRegistry.cpp" /> <ClCompile Include="..\..\vegastrike\src\audio\Listener.cpp" /> <ClCompile Include="..\..\vegastrike\src\audio\RenderableListener.cpp" /> Modified: trunk/vega-vc10/vegastrike/vegastrike.vcxproj.filters =================================================================== --- trunk/vega-vc10/vegastrike/vegastrike.vcxproj.filters 2013-03-04 02:01:33 UTC (rev 13555) +++ trunk/vega-vc10/vegastrike/vegastrike.vcxproj.filters 2013-03-04 14:45:47 UTC (rev 13556) @@ -279,90 +279,6 @@ <ClCompile Include="..\..\vegastrike\src\XMLDocument.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\vegastrike\boost\1_45\src\converter\arg_to_python_base.cpp"> - <Filter>Source Files\Boost</Filter> - </ClCompile> - <ClCompile Include="..\..\vegastrike\boost\1_45\src\converter\builtin_converters.cpp"> - <Filter>Source Files\Boost</Filter> - </ClCompile> - <ClCompile Include="..\..\vegastrike\boost\1_45\src\object\class.cpp"> - <Filter>Source Files\Boost</Filter> - </ClCompile> - <ClCompile Include="..\..\vegastrike\boost\1_45\src\dict.cpp"> - <Filter>Source Files\Boost</Filter> - </ClCompile> - <ClCompile Include="..\..\vegastrike\boost\1_45\src\object\enum.cpp"> - <Filter>Source Files\Boost</Filter> - </ClCompile> - <ClCompile Include="..\..\vegastrike\boost\1_45\src\errors.cpp"> - <Filter>Source Files\Boost</Filter> - </ClCompile> - <ClCompile Include="..\..\vegastrike\boost\1_45\src\exec.cpp"> - <Filter>Source Files\Boost</Filter> - </ClCompile> - <ClCompile Include="..\..\vegastrike\boost\1_45\src\converter\from_python.cpp"> - <Filter>Source Files\Boost</Filter> - </ClCompile> - <ClCompile Include="..\..\vegastrike\boost\1_45\src\object\function.cpp"> - <Filter>Source Files\Boost</Filter> - </ClCompile> - <ClCompile Include="..\..\vegastrike\boost\1_45\src\object\function_doc_signature.cpp"> - <Filter>Source Files\Boost</Filter> - </ClCompile> - <ClCompile Include="..\..\vegastrike\boost\1_45\src\import.cpp"> - <Filter>Source Files\Boost</Filter> - </ClCompile> - <ClCompile Include="..\..\vegastrike\boost\1_45\src\object\inheritance.cpp"> - <Filter>Source Files\Boost</Filter> - </ClCompile> - <ClCompile Include="..\..\vegastrike\boost\1_45\src\object\iterator.cpp"> - <Filter>Source Files\Boost</Filter> - </ClCompile> - <ClCompile Include="..\..\vegastrike\boost\1_45\src\object\life_support.cpp"> - <Filter>Source Files\Boost</Filter> - </ClCompile> - <ClCompile Include="..\..\vegastrike\boost\1_45\src\list.cpp"> - <Filter>Source Files\Boost</Filter> - </ClCompile> - <ClCompile Include="..\..\vegastrike\boost\1_45\src\long.cpp"> - <Filter>Source Files\Boost</Filter> - </ClCompile> - <ClCompile Include="..\..\vegastrike\boost\1_45\src\module.cpp"> - <Filter>Source Files\Boost</Filter> - </ClCompile> - <ClCompile Include="..\..\vegastrike\boost\1_45\src\numeric.cpp"> - <Filter>Source Files\Boost</Filter> - </ClCompile> - <ClCompile Include="..\..\vegastrike\boost\1_45\src\object_operators.cpp"> - <Filter>Source Files\Boost</Filter> - </ClCompile> - <ClCompile Include="..\..\vegastrike\boost\1_45\src\object_protocol.cpp"> - <Filter>Source Files\Boost</Filter> - </ClCompile> - <ClCompile Include="..\..\vegastrike\boost\1_45\src\object\pickle_support.cpp"> - <Filter>Source Files\Boost</Filter> - </ClCompile> - <ClCompile Include="..\..\vegastrike\boost\1_45\src\converter\registry.cpp"> - <Filter>Source Files\Boost</Filter> - </ClCompile> - <ClCompile Include="..\..\vegastrike\boost\1_45\src\slice.cpp"> - <Filter>Source Files\Boost</Filter> - </ClCompile> - <ClCompile Include="..\..\vegastrike\boost\1_45\src\object\stl_iterator.cpp"> - <Filter>Source Files\Boost</Filter> - </ClCompile> - <ClCompile Include="..\..\vegastrike\boost\1_45\src\str.cpp"> - <Filter>Source Files\Boost</Filter> - </ClCompile> - <ClCompile Include="..\..\vegastrike\boost\1_45\src\tuple.cpp"> - <Filter>Source Files\Boost</Filter> - </ClCompile> - <ClCompile Include="..\..\vegastrike\boost\1_45\src\converter\type_id.cpp"> - <Filter>Source Files\Boost</Filter> - </ClCompile> - <ClCompile Include="..\..\vegastrike\boost\1_45\src\wrapper.cpp"> - <Filter>Source Files\Boost</Filter> - </ClCompile> <ClCompile Include="..\..\vegastrike\src\audio\CodecRegistry.cpp"> <Filter>Source Files\Audio</Filter> </ClCompile> @@ -1527,6 +1443,90 @@ <ClCompile Include="..\..\vegastrike\src\gfx\occlusion.cpp"> <Filter>Source Files\Gfx</Filter> </ClCompile> + <ClCompile Include="..\..\vegastrike\boost\1_53\src\dict.cpp"> + <Filter>Source Files\Boost</Filter> + </ClCompile> + <ClCompile Include="..\..\vegastrike\boost\1_53\src\errors.cpp"> + <Filter>Source Files\Boost</Filter> + </ClCompile> + <ClCompile Include="..\..\vegastrike\boost\1_53\src\exec.cpp"> + <Filter>Source Files\Boost</Filter> + </ClCompile> + <ClCompile Include="..\..\vegastrike\boost\1_53\src\import.cpp"> + <Filter>Source Files\Boost</Filter> + </ClCompile> + <ClCompile Include="..\..\vegastrike\boost\1_53\src\list.cpp"> + <Filter>Source Files\Boost</Filter> + </ClCompile> + <ClCompile Include="..\..\vegastrike\boost\1_53\src\long.cpp"> + <Filter>Source Files\Boost</Filter> + </ClCompile> + <ClCompile Include="..\..\vegastrike\boost\1_53\src\module.cpp"> + <Filter>Source Files\Boost</Filter> + </ClCompile> + <ClCompile Include="..\..\vegastrike\boost\1_53\src\numeric.cpp"> + <Filter>Source Files\Boost</Filter> + </ClCompile> + <ClCompile Include="..\..\vegastrike\boost\1_53\src\object_operators.cpp"> + <Filter>Source Files\Boost</Filter> + </ClCompile> + <ClCompile Include="..\..\vegastrike\boost\1_53\src\object_protocol.cpp"> + <Filter>Source Files\Boost</Filter> + </ClCompile> + <ClCompile Include="..\..\vegastrike\boost\1_53\src\slice.cpp"> + <Filter>Source Files\Boost</Filter> + </ClCompile> + <ClCompile Include="..\..\vegastrike\boost\1_53\src\str.cpp"> + <Filter>Source Files\Boost</Filter> + </ClCompile> + <ClCompile Include="..\..\vegastrike\boost\1_53\src\tuple.cpp"> + <Filter>Source Files\Boost</Filter> + </ClCompile> + <ClCompile Include="..\..\vegastrike\boost\1_53\src\wrapper.cpp"> + <Filter>Source Files\Boost</Filter> + </ClCompile> + <ClCompile Include="..\..\vegastrike\boost\1_53\src\object\class.cpp"> + <Filter>Source Files\Boost</Filter> + </ClCompile> + <ClCompile Include="..\..\vegastrike\boost\1_53\src\object\enum.cpp"> + <Filter>Source Files\Boost</Filter> + </ClCompile> + <ClCompile Include="..\..\vegastrike\boost\1_53\src\object\function.cpp"> + <Filter>Source Files\Boost</Filter> + </ClCompile> + <ClCompile Include="..\..\vegastrike\boost\1_53\src\object\function_doc_signature.cpp"> + <Filter>Source Files\Boost</Filter> + </ClCompile> + <ClCompile Include="..\..\vegastrike\boost\1_53\src\object\inheritance.cpp"> + <Filter>Source Files\Boost</Filter> + </ClCompile> + <ClCompile Include="..\..\vegastrike\boost\1_53\src\object\iterator.cpp"> + <Filter>Source Files\Boost</Filter> + </ClCompile> + <ClCompile Include="..\..\vegastrike\boost\1_53\src\object\life_support.cpp"> + <Filter>Source Files\Boost</Filter> + </ClCompile> + <ClCompile Include="..\..\vegastrike\boost\1_53\src\object\pickle_support.cpp"> + <Filter>Source Files\Boost</Filter> + </ClCompile> + <ClCompile Include="..\..\vegastrike\boost\1_53\src\object\stl_iterator.cpp"> + <Filter>Source Files\Boost</Filter> + </ClCompile> + <ClCompile Include="..\..\vegastrike\boost\1_53\src\converter\arg_to_python_base.cpp"> + <Filter>Source Files\Boost</Filter> + </ClCompile> + <ClCompile Include="..\..\vegastrike\boost\1_53\src\converter\builtin_converters.cpp"> + <Filter>Source Files\Boost</Filter> + </ClCompile> + <ClCompile Include="..\..\vegastrike\boost\1_53\src\converter\from_python.cpp"> + <Filter>Source Files\Boost</Filter> + </ClCompile> + <ClCompile Include="..\..\vegastrike\boost\1_53\src\converter\registry.cpp"> + <Filter>Source Files\Boost</Filter> + </ClCompile> + <ClCompile Include="..\..\vegastrike\boost\1_53\src\converter\type_id.cpp"> + <Filter>Source Files\Boost</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="..\jpeg-6b\jchuff.h"> Modified: trunk/vegastrike/Resources.rc =================================================================== --- trunk/vegastrike/Resources.rc 2013-03-04 02:01:33 UTC (rev 13555) +++ trunk/vegastrike/Resources.rc 2013-03-04 14:45:47 UTC (rev 13556) @@ -60,8 +60,8 @@ // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,5,2,13473 - PRODUCTVERSION 0,5,2,13473 + FILEVERSION 0,5,2,13555 + PRODUCTVERSION 0,5,2,13555 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x9L @@ -79,13 +79,13 @@ VALUE "Comments", "Vega Strike is the 3D Space Simulator that allows you to trade and bounty hunt in a vast universe. Can you face the dangers and decisions that await..." VALUE "CompanyName", "Vega Strike Project" VALUE "FileDescription", "Vega Strike Open Source Space Simulator" - VALUE "FileVersion", "0.5.2.13473" + VALUE "FileVersion", "0.5.2.13555" VALUE "InternalName", "vegastrike" VALUE "LegalCopyright", "\xA9 Copyright 1998-2011 Vega Strike Project. All rights reserved. See the vega-licence.txt for details." VALUE "OriginalFilename", "Vegastrike.exe" VALUE "PrivateBuild", "13473" VALUE "ProductName", "Vega Strike" - VALUE "ProductVersion", "0.5.2.13473" + VALUE "ProductVersion", "0.5.2.13555" END END BLOCK "VarFileInfo" Modified: trunk/win32/bin/vegastrike.exe =================================================================== (Binary files differ) |
From: <kla...@us...> - 2013-07-27 18:10:36
|
Revision: 13640 http://sourceforge.net/p/vegastrike/code/13640 Author: klaussfreire Date: 2013-07-27 18:10:33 +0000 (Sat, 27 Jul 2013) Log Message: ----------- Patch #59 by Vincent Legoll: fix clearence->clearance typos Modified Paths: -------------- trunk/data/bases/bartender.py trunk/vegastrike/src/cmd/ai/communication.cpp Modified: trunk/data/bases/bartender.py =================================================================== --- trunk/data/bases/bartender.py 2013-07-27 18:05:23 UTC (rev 13639) +++ trunk/data/bases/bartender.py 2013-07-27 18:10:33 UTC (rev 13640) @@ -56,7 +56,7 @@ "Hey, why don't you see if there are any in-system bounty missions available? People around here would really appreciate any help in cleaning this system up.", "The jump drive is the key to the galaxy. Without one, you can't access the network of jump points we use for interstellar travel.", "The best tool for interplanetary trade is common sense. What does an agricultural colony have that a space station probably needs? That's right, food - and booze!.", - "You have to open your communications menu and request docking clearence before a planet or station will let you land.", + "You have to open your communications menu and request docking clearance before a planet or station will let you land.", "There is a commodity exchange at every civilized (and most uncivilized) port in the known galaxy. Why? Because trading is a great way to make honest money.", "When dogfighting, you can match speeds with your target (HOME key).", "You can cycle through the screens on your HUD (V key), and communicate with your targets. You can taunt them or hold a conversation!", Modified: trunk/vegastrike/src/cmd/ai/communication.cpp =================================================================== --- trunk/vegastrike/src/cmd/ai/communication.cpp 2013-07-27 18:05:23 UTC (rev 13639) +++ trunk/vegastrike/src/cmd/ai/communication.cpp 2013-07-27 18:10:33 UTC (rev 13640) @@ -31,7 +31,7 @@ nodes.push_back( Node::MakeNode( "No contraband detected: You may proceed.", 0 ) ); nodes.push_back( Node::MakeNode( "Contraband detected! All units close and engage!", 0 ) ); nodes.push_back( Node::MakeNode( "Your Course is deviating! Maintain Course!", 0 ) ); - nodes.push_back( Node::MakeNode( "Request Clearence To Land.", 0 ) ); + nodes.push_back( Node::MakeNode( "Request Clearance To Land.", 0 ) ); nodes.push_back( Node::MakeNode( "*hit*", -.2 ) ); vector< unsigned int >edges; unsigned int i; @@ -299,7 +299,7 @@ static bool print_docking = XMLSupport::parse_bool( vs_config->getVariable( "graphics", "hud", "print_request_docking", "true" ) ); if (print_docking) - retval += "0. Request Docking Clearence"; + retval += "0. Request Docking Clearance"; return retval; } |
From: <phe...@us...> - 2013-09-04 19:36:58
|
Revision: 13657 http://sourceforge.net/p/vegastrike/code/13657 Author: pheonixstorm Date: 2013-09-04 19:36:42 +0000 (Wed, 04 Sep 2013) Log Message: ----------- Update glext.h to fix a compile error. VS now compiles though I have not been able to get it to run for more than a few seconds. Backup your old binary before using this release Modified Paths: -------------- trunk/vega-vc10/include/gl/glext.h trunk/vegastrike/Resources.rc trunk/win32/bin/vegastrike.exe Modified: trunk/vega-vc10/include/gl/glext.h =================================================================== --- trunk/vega-vc10/include/gl/glext.h 2013-09-04 12:13:26 UTC (rev 13656) +++ trunk/vega-vc10/include/gl/glext.h 2013-09-04 19:36:42 UTC (rev 13657) @@ -1,7144 +1,11013 @@ -#ifndef __glext_h_ -#define __glext_h_ - -#ifdef __cplusplus -extern "C" { -#endif - -/****************************************************************************** - - Copyright NVIDIA Corporation 2006 - - TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, THIS SOFTWARE IS PROVIDED - *AS IS* AND NVIDIA AND ITS SUPPLIERS DISCLAIM ALL WARRANTIES, EITHER EXPRESS - OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, IMPLIED WARRANTIES OF - MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL - NVIDIA OR ITS SUPPLIERS BE LIABLE FOR ANY SPECIAL, INCIDENTAL, INDIRECT, OR - CONSEQUENTIAL DAMAGES WHATSOEVER (INCLUDING, WITHOUT LIMITATION, DAMAGES FOR - LOSS OF BUSINESS PROFITS, BUSINESS INTERRUPTION, LOSS OF BUSINESS INFORMATION, - OR ANY OTHER PECUNIARY LOSS) ARISING OUT OF THE USE OF OR INABILITY TO USE - THIS SOFTWARE, EVEN IF NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - DAMAGES. - -******************************************************************************/ - -/* -** License Applicability. Except to the extent portions of this file are -** made subject to an alternative license as permitted in the SGI Free -** Software License B, Version 1.1 (the "License"), the contents of this -** file are subject only to the provisions of the License. You may not use -** this file except in compliance with the License. You may obtain a copy -** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600 -** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at: -** -** http://oss.sgi.com/projects/FreeB -** -** Note that, as provided in the License, the Software is distributed on an -** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS -** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND -** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A -** PARTICULAR PURPOSE, AND NON-INFRINGEMENT. -** -** Original Code. The Original Code is: OpenGL Sample Implementation, -** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics, -** Inc. The Original Code is Copyright (c) 1991-2004 Silicon Graphics, Inc. -** Copyright in any portions created by third parties is as indicated -** elsewhere herein. All Rights Reserved. -** -** Additional Notice Provisions: This software was created using the -** OpenGL(R) version 1.2.1 Sample Implementation published by SGI, but has -** not been independently verified as being compliant with the OpenGL(R) -** version 1.2.1 Specification. -*/ - -#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) -#define WIN32_LEAN_AND_MEAN 1 -#include <windows.h> -#endif - -#ifndef APIENTRY -#define APIENTRY -#endif -#ifndef APIENTRYP -#define APIENTRYP APIENTRY * -#endif -#ifndef extern -#define extern extern -#endif - -/*************************************************************/ - -/* Header file version number, required by OpenGL ABI for Linux */ -/* glext.h last updated 2005/06/06 */ -/* Current version at http://oss.sgi.com/projects/ogl-sample/registry/ */ -#define GL_GLEXT_VERSION 28 - -#ifndef GL_VERSION_1_2 -#define GL_UNSIGNED_BYTE_3_3_2 0x8032 -#define GL_UNSIGNED_SHORT_4_4_4_4 0x8033 -#define GL_UNSIGNED_SHORT_5_5_5_1 0x8034 -#define GL_UNSIGNED_INT_8_8_8_8 0x8035 -#define GL_UNSIGNED_INT_10_10_10_2 0x8036 -#define GL_RESCALE_NORMAL 0x803A -#define GL_TEXTURE_BINDING_3D 0x806A -#define GL_PACK_SKIP_IMAGES 0x806B -#define GL_PACK_IMAGE_HEIGHT 0x806C -#define GL_UNPACK_SKIP_IMAGES 0x806D -#define GL_UNPACK_IMAGE_HEIGHT 0x806E -#define GL_TEXTURE_3D 0x806F -#define GL_PROXY_TEXTURE_3D 0x8070 -#define GL_TEXTURE_DEPTH 0x8071 -#define GL_TEXTURE_WRAP_R 0x8072 -#define GL_MAX_3D_TEXTURE_SIZE 0x8073 -#define GL_UNSIGNED_BYTE_2_3_3_REV 0x8362 -#define GL_UNSIGNED_SHORT_5_6_5 0x8363 -#define GL_UNSIGNED_SHORT_5_6_5_REV 0x8364 -#define GL_UNSIGNED_SHORT_4_4_4_4_REV 0x8365 -#define GL_UNSIGNED_SHORT_1_5_5_5_REV 0x8366 -#define GL_UNSIGNED_INT_8_8_8_8_REV 0x8367 -#define GL_UNSIGNED_INT_2_10_10_10_REV 0x8368 -#define GL_BGR 0x80E0 -#define GL_BGRA 0x80E1 -#define GL_MAX_ELEMENTS_VERTICES 0x80E8 -#define GL_MAX_ELEMENTS_INDICES 0x80E9 -#define GL_CLAMP_TO_EDGE 0x812F -#define GL_TEXTURE_MIN_LOD 0x813A -#define GL_TEXTURE_MAX_LOD 0x813B -#define GL_TEXTURE_BASE_LEVEL 0x813C -#define GL_TEXTURE_MAX_LEVEL 0x813D -#define GL_LIGHT_MODEL_COLOR_CONTROL 0x81F8 -#define GL_SINGLE_COLOR 0x81F9 -#define GL_SEPARATE_SPECULAR_COLOR 0x81FA -#define GL_SMOOTH_POINT_SIZE_RANGE 0x0B12 -#define GL_SMOOTH_POINT_SIZE_GRANULARITY 0x0B13 -#define GL_SMOOTH_LINE_WIDTH_RANGE 0x0B22 -#define GL_SMOOTH_LINE_WIDTH_GRANULARITY 0x0B23 -#define GL_ALIASED_POINT_SIZE_RANGE 0x846D -#define GL_ALIASED_LINE_WIDTH_RANGE 0x846E -#endif - -#ifndef GL_ARB_imaging -#define GL_CONSTANT_COLOR 0x8001 -#define GL_ONE_MINUS_CONSTANT_COLOR 0x8002 -#define GL_CONSTANT_ALPHA 0x8003 -#define GL_ONE_MINUS_CONSTANT_ALPHA 0x8004 -#define GL_BLEND_COLOR 0x8005 -#define GL_FUNC_ADD 0x8006 -#define GL_MIN 0x8007 -#define GL_MAX 0x8008 -#define GL_BLEND_EQUATION 0x8009 -#define GL_FUNC_SUBTRACT 0x800A -#define GL_FUNC_REVERSE_SUBTRACT 0x800B -#define GL_CONVOLUTION_1D 0x8010 -#define GL_CONVOLUTION_2D 0x8011 -#define GL_SEPARABLE_2D 0x8012 -#define GL_CONVOLUTION_BORDER_MODE 0x8013 -#define GL_CONVOLUTION_FILTER_SCALE 0x8014 -#define GL_CONVOLUTION_FILTER_BIAS 0x8015 -#define GL_REDUCE 0x8016 -#define GL_CONVOLUTION_FORMAT 0x8017 -#define GL_CONVOLUTION_WIDTH 0x8018 -#define GL_CONVOLUTION_HEIGHT 0x8019 -#define GL_MAX_CONVOLUTION_WIDTH 0x801A -#define GL_MAX_CONVOLUTION_HEIGHT 0x801B -#define GL_POST_CONVOLUTION_RED_SCALE 0x801C -#define GL_POST_CONVOLUTION_GREEN_SCALE 0x801D -#define GL_POST_CONVOLUTION_BLUE_SCALE 0x801E -#define GL_POST_CONVOLUTION_ALPHA_SCALE 0x801F -#define GL_POST_CONVOLUTION_RED_BIAS 0x8020 -#define GL_POST_CONVOLUTION_GREEN_BIAS 0x8021 -#define GL_POST_CONVOLUTION_BLUE_BIAS 0x8022 -#define GL_POST_CONVOLUTION_ALPHA_BIAS 0x8023 -#define GL_HISTOGRAM 0x8024 -#define GL_PROXY_HISTOGRAM 0x8025 -#define GL_HISTOGRAM_WIDTH 0x8026 -#define GL_HISTOGRAM_FORMAT 0x8027 -#define GL_HISTOGRAM_RED_SIZE 0x8028 -#define GL_HISTOGRAM_GREEN_SIZE 0x8029 -#define GL_HISTOGRAM_BLUE_SIZE 0x802A -#define GL_HISTOGRAM_ALPHA_SIZE 0x802B -#define GL_HISTOGRAM_LUMINANCE_SIZE 0x802C -#define GL_HISTOGRAM_SINK 0x802D -#define GL_MINMAX 0x802E -#define GL_MINMAX_FORMAT 0x802F -#define GL_MINMAX_SINK 0x8030 -#define GL_TABLE_TOO_LARGE 0x8031 -#define GL_COLOR_MATRIX 0x80B1 -#define GL_COLOR_MATRIX_STACK_DEPTH 0x80B2 -#define GL_MAX_COLOR_MATRIX_STACK_DEPTH 0x80B3 -#define GL_POST_COLOR_MATRIX_RED_SCALE 0x80B4 -#define GL_POST_COLOR_MATRIX_GREEN_SCALE 0x80B5 -#define GL_POST_COLOR_MATRIX_BLUE_SCALE 0x80B6 -#define GL_POST_COLOR_MATRIX_ALPHA_SCALE 0x80B7 -#define GL_POST_COLOR_MATRIX_RED_BIAS 0x80B8 -#define GL_POST_COLOR_MATRIX_GREEN_BIAS 0x80B9 -#define GL_POST_COLOR_MATRIX_BLUE_BIAS 0x80BA -#define GL_POST_COLOR_MATRIX_ALPHA_BIAS 0x80BB -#define GL_COLOR_TABLE 0x80D0 -#define GL_POST_CONVOLUTION_COLOR_TABLE 0x80D1 -#define GL_POST_COLOR_MATRIX_COLOR_TABLE 0x80D2 -#define GL_PROXY_COLOR_TABLE 0x80D3 -#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE 0x80D4 -#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE 0x80D5 -#define GL_COLOR_TABLE_SCALE 0x80D6 -#define GL_COLOR_TABLE_BIAS 0x80D7 -#define GL_COLOR_TABLE_FORMAT 0x80D8 -#define GL_COLOR_TABLE_WIDTH 0x80D9 -#define GL_COLOR_TABLE_RED_SIZE 0x80DA -#define GL_COLOR_TABLE_GREEN_SIZE 0x80DB -#define GL_COLOR_TABLE_BLUE_SIZE 0x80DC -#define GL_COLOR_TABLE_ALPHA_SIZE 0x80DD -#define GL_COLOR_TABLE_LUMINANCE_SIZE 0x80DE -#define GL_COLOR_TABLE_INTENSITY_SIZE 0x80DF -#define GL_CONSTANT_BORDER 0x8151 -#define GL_REPLICATE_BORDER 0x8153 -#define GL_CONVOLUTION_BORDER_COLOR 0x8154 -#endif - -#ifndef GL_VERSION_1_3 -#define GL_TEXTURE0 0x84C0 -#define GL_TEXTURE1 0x84C1 -#define GL_TEXTURE2 0x84C2 -#define GL_TEXTURE3 0x84C3 -#define GL_TEXTURE4 0x84C4 -#define GL_TEXTURE5 0x84C5 -#define GL_TEXTURE6 0x84C6 -#define GL_TEXTURE7 0x84C7 -#define GL_TEXTURE8 0x84C8 -#define GL_TEXTURE9 0x84C9 -#define GL_TEXTURE10 0x84CA -#define GL_TEXTURE11 0x84CB -#define GL_TEXTURE12 0x84CC -#define GL_TEXTURE13 0x84CD -#define GL_TEXTURE14 0x84CE -#define GL_TEXTURE15 0x84CF -#define GL_TEXTURE16 0x84D0 -#define GL_TEXTURE17 0x84D1 -#define GL_TEXTURE18 0x84D2 -#define GL_TEXTURE19 0x84D3 -#define GL_TEXTURE20 0x84D4 -#define GL_TEXTURE21 0x84D5 -#define GL_TEXTURE22 0x84D6 -#define GL_TEXTURE23 0x84D7 -#define GL_TEXTURE24 0x84D8 -#define GL_TEXTURE25 0x84D9 -#define GL_TEXTURE26 0x84DA -#define GL_TEXTURE27 0x84DB -#define GL_TEXTURE28 0x84DC -#define GL_TEXTURE29 0x84DD -#define GL_TEXTURE30 0x84DE -#define GL_TEXTURE31 0x84DF -#define GL_ACTIVE_TEXTURE 0x84E0 -#define GL_CLIENT_ACTIVE_TEXTURE 0x84E1 -#define GL_MAX_TEXTURE_UNITS 0x84E2 -#define GL_TRANSPOSE_MODELVIEW_MATRIX 0x84E3 -#define GL_TRANSPOSE_PROJECTION_MATRIX 0x84E4 -#define GL_TRANSPOSE_TEXTURE_MATRIX 0x84E5 -#define GL_TRANSPOSE_COLOR_MATRIX 0x84E6 -#define GL_MULTISAMPLE 0x809D -#define GL_SAMPLE_ALPHA_TO_COVERAGE 0x809E -#define GL_SAMPLE_ALPHA_TO_ONE 0x809F -#define GL_SAMPLE_COVERAGE 0x80A0 -#define GL_SAMPLE_BUFFERS 0x80A8 -#define GL_SAMPLES 0x80A9 -#define GL_SAMPLE_COVERAGE_VALUE 0x80AA -#define GL_SAMPLE_COVERAGE_INVERT 0x80AB -#define GL_MULTISAMPLE_BIT 0x20000000 -#define GL_NORMAL_MAP 0x8511 -#define GL_REFLECTION_MAP 0x8512 -#define GL_TEXTURE_CUBE_MAP 0x8513 -#define GL_TEXTURE_BINDING_CUBE_MAP 0x8514 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_X 0x8515 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X 0x8516 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y 0x8517 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y 0x8518 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z 0x8519 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z 0x851A -#define GL_PROXY_TEXTURE_CUBE_MAP 0x851B -#define GL_MAX_CUBE_MAP_TEXTURE_SIZE 0x851C -#define GL_COMPRESSED_ALPHA 0x84E9 -#define GL_COMPRESSED_LUMINANCE 0x84EA -#define GL_COMPRESSED_LUMINANCE_ALPHA 0x84EB -#define GL_COMPRESSED_INTENSITY 0x84EC -#define GL_COMPRESSED_RGB 0x84ED -#define GL_COMPRESSED_RGBA 0x84EE -#define GL_TEXTURE_COMPRESSION_HINT 0x84EF -#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE 0x86A0 -#define GL_TEXTURE_COMPRESSED 0x86A1 -#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2 -#define GL_COMPRESSED_TEXTURE_FORMATS 0x86A3 -#define GL_CLAMP_TO_BORDER 0x812D -#define GL_COMBINE 0x8570 -#define GL_COMBINE_RGB 0x8571 -#define GL_COMBINE_ALPHA 0x8572 -#define GL_SOURCE0_RGB 0x8580 -#define GL_SOURCE1_RGB 0x8581 -#define GL_SOURCE2_RGB 0x8582 -#define GL_SOURCE0_ALPHA 0x8588 -#define GL_SOURCE1_ALPHA 0x8589 -#define GL_SOURCE2_ALPHA 0x858A -#define GL_OPERAND0_RGB 0x8590 -#define GL_OPERAND1_RGB 0x8591 -#define GL_OPERAND2_RGB 0x8592 -#define GL_OPERAND0_ALPHA 0x8598 -#define GL_OPERAND1_ALPHA 0x8599 -#define GL_OPERAND2_ALPHA 0x859A -#define GL_RGB_SCALE 0x8573 -#define GL_ADD_SIGNED 0x8574 -#define GL_INTERPOLATE 0x8575 -#define GL_SUBTRACT 0x84E7 -#define GL_CONSTANT 0x8576 -#define GL_PRIMARY_COLOR 0x8577 -#define GL_PREVIOUS 0x8578 -#define GL_DOT3_RGB 0x86AE -#define GL_DOT3_RGBA 0x86AF -#endif - -#ifndef GL_VERSION_1_4 -#define GL_BLEND_DST_RGB 0x80C8 -#define GL_BLEND_SRC_RGB 0x80C9 -#define GL_BLEND_DST_ALPHA 0x80CA -#define GL_BLEND_SRC_ALPHA 0x80CB -#define GL_POINT_SIZE_MIN 0x8126 -#define GL_POINT_SIZE_MAX 0x8127 -#define GL_POINT_FADE_THRESHOLD_SIZE 0x8128 -#define GL_POINT_DISTANCE_ATTENUATION 0x8129 -#define GL_GENERATE_MIPMAP 0x8191 -#define GL_GENERATE_MIPMAP_HINT 0x8192 -#define GL_DEPTH_COMPONENT16 0x81A5 -#define GL_DEPTH_COMPONENT24 0x81A6 -#define GL_DEPTH_COMPONENT32 0x81A7 -#define GL_MIRRORED_REPEAT 0x8370 -#define GL_FOG_COORDINATE_SOURCE 0x8450 -#define GL_FOG_COORDINATE 0x8451 -#define GL_FRAGMENT_DEPTH 0x8452 -#define GL_CURRENT_FOG_COORDINATE 0x8453 -#define GL_FOG_COORDINATE_ARRAY_TYPE 0x8454 -#define GL_FOG_COORDINATE_ARRAY_STRIDE 0x8455 -#define GL_FOG_COORDINATE_ARRAY_POINTER 0x8456 -#define GL_FOG_COORDINATE_ARRAY 0x8457 -#define GL_COLOR_SUM 0x8458 -#define GL_CURRENT_SECONDARY_COLOR 0x8459 -#define GL_SECONDARY_COLOR_ARRAY_SIZE 0x845A -#define GL_SECONDARY_COLOR_ARRAY_TYPE 0x845B -#define GL_SECONDARY_COLOR_ARRAY_STRIDE 0x845C -#define GL_SECONDARY_COLOR_ARRAY_POINTER 0x845D -#define GL_SECONDARY_COLOR_ARRAY 0x845E -#define GL_MAX_TEXTURE_LOD_BIAS 0x84FD -#define GL_TEXTURE_FILTER_CONTROL 0x8500 -#define GL_TEXTURE_LOD_BIAS 0x8501 -#define GL_INCR_WRAP 0x8507 -#define GL_DECR_WRAP 0x8508 -#define GL_TEXTURE_DEPTH_SIZE 0x884A -#define GL_DEPTH_TEXTURE_MODE 0x884B -#define GL_TEXTURE_COMPARE_MODE 0x884C -#define GL_TEXTURE_COMPARE_FUNC 0x884D -#define GL_COMPARE_R_TO_TEXTURE 0x884E -#endif - -#ifndef GL_VERSION_1_5 -#define GL_BUFFER_SIZE 0x8764 -#define GL_BUFFER_USAGE 0x8765 -#define GL_QUERY_COUNTER_BITS 0x8864 -#define GL_CURRENT_QUERY 0x8865 -#define GL_QUERY_RESULT 0x8866 -#define GL_QUERY_RESULT_AVAILABLE 0x8867 -#define GL_ARRAY_BUFFER 0x8892 -#define GL_ELEMENT_ARRAY_BUFFER 0x8893 -#define GL_ARRAY_BUFFER_BINDING 0x8894 -#define GL_ELEMENT_ARRAY_BUFFER_BINDING 0x8895 -#define GL_VERTEX_ARRAY_BUFFER_BINDING 0x8896 -#define GL_NORMAL_ARRAY_BUFFER_BINDING 0x8897 -#define GL_COLOR_ARRAY_BUFFER_BINDING 0x8898 -#define GL_INDEX_ARRAY_BUFFER_BINDING 0x8899 -#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING 0x889A -#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING 0x889B -#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING 0x889C -#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING 0x889D -#define GL_WEIGHT_ARRAY_BUFFER_BINDING 0x889E -#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING 0x889F -#define GL_READ_ONLY 0x88B8 -#define GL_WRITE_ONLY 0x88B9 -#define GL_READ_WRITE 0x88BA -#define GL_BUFFER_ACCESS 0x88BB -#define GL_BUFFER_MAPPED 0x88BC -#define GL_BUFFER_MAP_POINTER 0x88BD -#define GL_STREAM_DRAW 0x88E0 -#define GL_STREAM_READ 0x88E1 -#define GL_STREAM_COPY 0x88E2 -#define GL_STATIC_DRAW 0x88E4 -#define GL_STATIC_READ 0x88E5 -#define GL_STATIC_COPY 0x88E6 -#define GL_DYNAMIC_DRAW 0x88E8 -#define GL_DYNAMIC_READ 0x88E9 -#define GL_DYNAMIC_COPY 0x88EA -#define GL_SAMPLES_PASSED 0x8914 -#define GL_FOG_COORD_SRC GL_FOG_COORDINATE_SOURCE -#define GL_FOG_COORD GL_FOG_COORDINATE -#define GL_CURRENT_FOG_COORD GL_CURRENT_FOG_COORDINATE -#define GL_FOG_COORD_ARRAY_TYPE GL_FOG_COORDINATE_ARRAY_TYPE -#define GL_FOG_COORD_ARRAY_STRIDE GL_FOG_COORDINATE_ARRAY_STRIDE -#define GL_FOG_COORD_ARRAY_POINTER GL_FOG_COORDINATE_ARRAY_POINTER -#define GL_FOG_COORD_ARRAY GL_FOG_COORDINATE_ARRAY -#define GL_FOG_COORD_ARRAY_BUFFER_BINDING GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING -#define GL_SRC0_RGB GL_SOURCE0_RGB -#define GL_SRC1_RGB GL_SOURCE1_RGB -#define GL_SRC2_RGB GL_SOURCE2_RGB -#define GL_SRC0_ALPHA GL_SOURCE0_ALPHA -#define GL_SRC1_ALPHA GL_SOURCE1_ALPHA -#define GL_SRC2_ALPHA GL_SOURCE2_ALPHA -#endif - -#ifndef GL_VERSION_2_0 -#define GL_BLEND_EQUATION_RGB GL_BLEND_EQUATION -#define GL_VERTEX_ATTRIB_ARRAY_ENABLED 0x8622 -#define GL_VERTEX_ATTRIB_ARRAY_SIZE 0x8623 -#define GL_VERTEX_ATTRIB_ARRAY_STRIDE 0x8624 -#define GL_VERTEX_ATTRIB_ARRAY_TYPE 0x8625 -#define GL_CURRENT_VERTEX_ATTRIB 0x8626 -#define GL_VERTEX_PROGRAM_POINT_SIZE 0x8642 -#define GL_VERTEX_PROGRAM_TWO_SIDE 0x8643 -#define GL_VERTEX_ATTRIB_ARRAY_POINTER 0x8645 -#define GL_STENCIL_BACK_FUNC 0x8800 -#define GL_STENCIL_BACK_FAIL 0x8801 -#define GL_STENCIL_BACK_PASS_DEPTH_FAIL 0x8802 -#define GL_STENCIL_BACK_PASS_DEPTH_PASS 0x8803 -#define GL_MAX_DRAW_BUFFERS 0x8824 -#define GL_DRAW_BUFFER0 0x8825 -#define GL_DRAW_BUFFER1 0x8826 -#define GL_DRAW_BUFFER2 0x8827 -#define GL_DRAW_BUFFER3 0x8828 -#define GL_DRAW_BUFFER4 0x8829 -#define GL_DRAW_BUFFER5 0x882A -#define GL_DRAW_BUFFER6 0x882B -#define GL_DRAW_BUFFER7 0x882C -#define GL_DRAW_BUFFER8 0x882D -#define GL_DRAW_BUFFER9 0x882E -#define GL_DRAW_BUFFER10 0x882F -#define GL_DRAW_BUFFER11 0x8830 -#define GL_DRAW_BUFFER12 0x8831 -#define GL_DRAW_BUFFER13 0x8832 -#define GL_DRAW_BUFFER14 0x8833 -#define GL_DRAW_BUFFER15 0x8834 -#define GL_BLEND_EQUATION_ALPHA 0x883D -#define GL_POINT_SPRITE 0x8861 -#define GL_COORD_REPLACE 0x8862 -#define GL_MAX_VERTEX_ATTRIBS 0x8869 -#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED 0x886A -#define GL_MAX_TEXTURE_COORDS 0x8871 -#define GL_MAX_TEXTURE_IMAGE_UNITS 0x8872 -#define GL_FRAGMENT_SHADER 0x8B30 -#define GL_VERTEX_SHADER 0x8B31 -#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS 0x8B49 -#define GL_MAX_VERTEX_UNIFORM_COMPONENTS 0x8B4A -#define GL_MAX_VARYING_FLOATS 0x8B4B -#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS 0x8B4C -#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS 0x8B4D -#define GL_SHADER_TYPE 0x8B4F -#define GL_FLOAT_VEC2 0x8B50 -#define GL_FLOAT_VEC3 0x8B51 -#define GL_FLOAT_VEC4 0x8B52 -#define GL_INT_VEC2 0x8B53 -#define GL_INT_VEC3 0x8B54 -#define GL_INT_VEC4 0x8B55 -#define GL_BOOL 0x8B56 -#define GL_BOOL_VEC2 0x8B57 -#define GL_BOOL_VEC3 0x8B58 -#define GL_BOOL_VEC4 0x8B59 -#define GL_FLOAT_MAT2 0x8B5A -#define GL_FLOAT_MAT3 0x8B5B -#define GL_FLOAT_MAT4 0x8B5C -#define GL_SAMPLER_1D 0x8B5D -#define GL_SAMPLER_2D 0x8B5E -#define GL_SAMPLER_3D 0x8B5F -#define GL_SAMPLER_CUBE 0x8B60 -#define GL_SAMPLER_1D_SHADOW 0x8B61 -#define GL_SAMPLER_2D_SHADOW 0x8B62 -#define GL_DELETE_STATUS 0x8B80 -#define GL_COMPILE_STATUS 0x8B81 -#define GL_LINK_STATUS 0x8B82 -#define GL_VALIDATE_STATUS 0x8B83 -#define GL_INFO_LOG_LENGTH 0x8B84 -#define GL_ATTACHED_SHADERS 0x8B85 -#define GL_ACTIVE_UNIFORMS 0x8B86 -#define GL_ACTIVE_UNIFORM_MAX_LENGTH 0x8B87 -#define GL_SHADER_SOURCE_LENGTH 0x8B88 -#define GL_ACTIVE_ATTRIBUTES 0x8B89 -#define GL_ACTIVE_ATTRIBUTE_MAX_LENGTH 0x8B8A -#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT 0x8B8B -#define GL_SHADING_LANGUAGE_VERSION 0x8B8C -#define GL_CURRENT_PROGRAM 0x8B8D -#define GL_POINT_SPRITE_COORD_ORIGIN 0x8CA0 -#define GL_LOWER_LEFT 0x8CA1 -#define GL_UPPER_LEFT 0x8CA2 -#define GL_STENCIL_BACK_REF 0x8CA3 -#define GL_STENCIL_BACK_VALUE_MASK 0x8CA4 -#define GL_STENCIL_BACK_WRITEMASK 0x8CA5 -#endif - -#ifndef GL_VERSION_2_1 -#define GL_PIXEL_PACK_BUFFER 0x88EB -#define GL_PIXEL_UNPACK_BUFFER 0x88EC -#define GL_PIXEL_PACK_BUFFER_BINDING 0x88ED -#define GL_PIXEL_UNPACK_BUFFER_BINDING 0x88EF -#define GL_SRGB 0x8C40 -#define GL_SRGB8 0x8C41 -#define GL_SRGB_ALPHA 0x8C42 -#define GL_SRGB8_ALPHA8 0x8C43 -#define GL_SLUMINANCE_ALPHA 0x8C44 -#define GL_SLUMINANCE8_ALPHA8 0x8C45 -#define GL_SLUMINANCE 0x8C46 -#define GL_SLUMINANCE8 0x8C47 -#define GL_COMPRESSED_SRGB 0x8C48 -#define GL_COMPRESSED_SRGB_ALPHA 0x8C49 -#define GL_COMPRESSED_SLUMINANCE 0x8C4A -#define GL_COMPRESSED_SLUMINANCE_ALPHA 0x8C4B -#define GL_FLOAT_MAT2x3 0x8B65 -#define GL_FLOAT_MAT2x4 0x8B66 -#define GL_FLOAT_MAT3x2 0x8B67 -#define GL_FLOAT_MAT3x4 0x8B68 -#define GL_FLOAT_MAT4x2 0x8B69 -#define GL_FLOAT_MAT4x3 0x8B6A -#define GL_CURRENT_RASTER_SECONDARY_COLOR 0x845F -#endif - -#ifndef GL_ARB_multitexture -#define GL_TEXTURE0_ARB 0x84C0 -#define GL_TEXTURE1_ARB 0x84C1 -#define GL_TEXTURE2_ARB 0x84C2 -#define GL_TEXTURE3_ARB 0x84C3 -#define GL_TEXTURE4_ARB 0x84C4 -#define GL_TEXTURE5_ARB 0x84C5 -#define GL_TEXTURE6_ARB 0x84C6 -#define GL_TEXTURE7_ARB 0x84C7 -#define GL_TEXTURE8_ARB 0x84C8 -#define GL_TEXTURE9_ARB 0x84C9 -#define GL_TEXTURE10_ARB 0x84CA -#define GL_TEXTURE11_ARB 0x84CB -#define GL_TEXTURE12_ARB 0x84CC -#define GL_TEXTURE13_ARB 0x84CD -#define GL_TEXTURE14_ARB 0x84CE -#define GL_TEXTURE15_ARB 0x84CF -#define GL_TEXTURE16_ARB 0x84D0 -#define GL_TEXTURE17_ARB 0x84D1 -#define GL_TEXTURE18_ARB 0x84D2 -#define GL_TEXTURE19_ARB 0x84D3 -#define GL_TEXTURE20_ARB 0x84D4 -#define GL_TEXTURE21_ARB 0x84D5 -#define GL_TEXTURE22_ARB 0x84D6 -#define GL_TEXTURE23_ARB 0x84D7 -#define GL_TEXTURE24_ARB 0x84D8 -#define GL_TEXTURE25_ARB 0x84D9 -#define GL_TEXTURE26_ARB 0x84DA -#define GL_TEXTURE27_ARB 0x84DB -#define GL_TEXTURE28_ARB 0x84DC -#define GL_TEXTURE29_ARB 0x84DD -#define GL_TEXTURE30_ARB 0x84DE -#define GL_TEXTURE31_ARB 0x84DF -#define GL_ACTIVE_TEXTURE_ARB 0x84E0 -#define GL_CLIENT_ACTIVE_TEXTURE_ARB 0x84E1 -#define GL_MAX_TEXTURE_UNITS_ARB 0x84E2 -#endif - -#ifndef GL_ARB_transpose_matrix -#define GL_TRANSPOSE_MODELVIEW_MATRIX_ARB 0x84E3 -#define GL_TRANSPOSE_PROJECTION_MATRIX_ARB 0x84E4 -#define GL_TRANSPOSE_TEXTURE_MATRIX_ARB 0x84E5 -#define GL_TRANSPOSE_COLOR_MATRIX_ARB 0x84E6 -#endif - -#ifndef GL_ARB_multisample -#define GL_MULTISAMPLE_ARB 0x809D -#define GL_SAMPLE_ALPHA_TO_COVERAGE_ARB 0x809E -#define GL_SAMPLE_ALPHA_TO_ONE_ARB 0x809F -#define GL_SAMPLE_COVERAGE_ARB 0x80A0 -#define GL_SAMPLE_BUFFERS_ARB 0x80A8 -#define GL_SAMPLES_ARB 0x80A9 -#define GL_SAMPLE_COVERAGE_VALUE_ARB 0x80AA -#define GL_SAMPLE_COVERAGE_INVERT_ARB 0x80AB -#define GL_MULTISAMPLE_BIT_ARB 0x20000000 -#endif - -#ifndef GL_ARB_texture_env_add -#endif - -#ifndef GL_ARB_texture_cube_map -#define GL_NORMAL_MAP_ARB 0x8511 -#define GL_REFLECTION_MAP_ARB 0x8512 -#define GL_TEXTURE_CUBE_MAP_ARB 0x8513 -#define GL_TEXTURE_BINDING_CUBE_MAP_ARB 0x8514 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB 0x8515 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB 0x8516 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB 0x8517 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB 0x8518 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB 0x8519 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB 0x851A -#define GL_PROXY_TEXTURE_CUBE_MAP_ARB 0x851B -#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB 0x851C -#endif - -#ifndef GL_ARB_texture_compression -#define GL_COMPRESSED_ALPHA_ARB 0x84E9 -#define GL_COMPRESSED_LUMINANCE_ARB 0x84EA -#define GL_COMPRESSED_LUMINANCE_ALPHA_ARB 0x84EB -#define GL_COMPRESSED_INTENSITY_ARB 0x84EC -#define GL_COMPRESSED_RGB_ARB 0x84ED -#define GL_COMPRESSED_RGBA_ARB 0x84EE -#define GL_TEXTURE_COMPRESSION_HINT_ARB 0x84EF -#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB 0x86A0 -#define GL_TEXTURE_COMPRESSED_ARB 0x86A1 -#define GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A2 -#define GL_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A3 -#endif - -#ifndef GL_ARB_texture_border_clamp -#define GL_CLAMP_TO_BORDER_ARB 0x812D -#endif - -#ifndef GL_ARB_point_parameters -#define GL_POINT_SIZE_MIN_ARB 0x8126 -#define GL_POINT_SIZE_MAX_ARB 0x8127 -#define GL_POINT_FADE_THRESHOLD_SIZE_ARB 0x8128 -#define GL_POINT_DISTANCE_ATTENUATION_ARB 0x8129 -#endif - -#ifndef GL_ARB_vertex_blend -#define GL_MAX_VERTEX_UNITS_ARB 0x86A4 -#define GL_ACTIVE_VERTEX_UNITS_ARB 0x86A5 -#define GL_WEIGHT_SUM_UNITY_ARB 0x86A6 -#define GL_VERTEX_BLEND_ARB 0x86A7 -#define GL_CURRENT_WEIGHT_ARB 0x86A8 -#define GL_WEIGHT_ARRAY_TYPE_ARB 0x86A9 -#define GL_WEIGHT_ARRAY_STRIDE_ARB 0x86AA -#define GL_WEIGHT_ARRAY_SIZE_ARB 0x86AB -#define GL_WEIGHT_ARRAY_POINTER_ARB 0x86AC -#define GL_WEIGHT_ARRAY_ARB 0x86AD -#define GL_MODELVIEW0_ARB 0x1700 -#define GL_MODELVIEW1_ARB 0x850A -#define GL_MODELVIEW2_ARB 0x8722 -#define GL_MODELVIEW3_ARB 0x8723 -#define GL_MODELVIEW4_ARB 0x8724 -#define GL_MODELVIEW5_ARB 0x8725 -#define GL_MODELVIEW6_ARB 0x8726 -#define GL_MODELVIEW7_ARB 0x8727 -#define GL_MODELVIEW8_ARB 0x8728 -#define GL_MODELVIEW9_ARB 0x8729 -#define GL_MODELVIEW10_ARB 0x872A -#define GL_MODELVIEW11_ARB 0x872B -#define GL_MODELVIEW12_ARB 0x872C -#define GL_MODELVIEW13_ARB 0x872D -#define GL_MODELVIEW14_ARB 0x872E -#define GL_MODELVIEW15_ARB 0x872F -#define GL_MODELVIEW16_ARB 0x8730 -#define GL_MODELVIEW17_ARB 0x8731 -#define GL_MODELVIEW18_ARB 0x8732 -#define GL_MODELVIEW19_ARB 0x8733 -#define GL_MODELVIEW20_ARB 0x8734 -#define GL_MODELVIEW21_ARB 0x8735 -#define GL_MODELVIEW22_ARB 0x8736 -#define GL_MODELVIEW23_ARB 0x8737 -#define GL_MODELVIEW24_ARB 0x8738 -#define GL_MODELVIEW25_ARB 0x8739 -#define GL_MODELVIEW26_ARB 0x873A -#define GL_MODELVIEW27_ARB 0x873B -#define GL_MODELVIEW28_ARB 0x873C -#define GL_MODELVIEW29_ARB 0x873D -#define GL_MODELVIEW30_ARB 0x873E -#define GL_MODELVIEW31_ARB 0x873F -#endif - -#ifndef GL_ARB_matrix_palette -#define GL_MATRIX_PALETTE_ARB 0x8840 -#define GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB 0x8841 -#define GL_MAX_PALETTE_MATRICES_ARB 0x8842 -#define GL_CURRENT_PALETTE_MATRIX_ARB 0x8843 -#define GL_MATRIX_INDEX_ARRAY_ARB 0x8844 -#define GL_CURRENT_MATRIX_INDEX_ARB 0x8845 -#define GL_MATRIX_INDEX_ARRAY_SIZE_ARB 0x8846 -#define GL_MATRIX_INDEX_ARRAY_TYPE_ARB 0x8847 -#define GL_MATRIX_INDEX_ARRAY_STRIDE_ARB 0x8848 -#define GL_MATRIX_INDEX_ARRAY_POINTER_ARB 0x8849 -#endif - -#ifndef GL_ARB_texture_env_combine -#define GL_COMBINE_ARB 0x8570 -#define GL_COMBINE_RGB_ARB 0x8571 -#define GL_COMBINE_ALPHA_ARB 0x8572 -#define GL_SOURCE0_RGB_ARB 0x8580 -#define GL_SOURCE1_RGB_ARB 0x8581 -#define GL_SOURCE2_RGB_ARB 0x8582 -#define GL_SOURCE0_ALPHA_ARB 0x8588 -#define GL_SOURCE1_ALPHA_ARB 0x8589 -#define GL_SOURCE2_ALPHA_ARB 0x858A -#define GL_OPERAND0_RGB_ARB 0x8590 -#define GL_OPERAND1_RGB_ARB 0x8591 -#define GL_OPERAND2_RGB_ARB 0x8592 -#define GL_OPERAND0_ALPHA_ARB 0x8598 -#define GL_OPERAND1_ALPHA_ARB 0x8599 -#define GL_OPERAND2_ALPHA_ARB 0x859A -#define GL_RGB_SCALE_ARB 0x8573 -#define GL_ADD_SIGNED_ARB 0x8574 -#define GL_INTERPOLATE_ARB 0x8575 -#define GL_SUBTRACT_ARB 0x84E7 -#define GL_CONSTANT_ARB 0x8576 -#define GL_PRIMARY_COLOR_ARB 0x8577 -#define GL_PREVIOUS_ARB 0x8578 -#endif - -#ifndef GL_ARB_texture_env_crossbar -#endif - -#ifndef GL_ARB_texture_env_dot3 -#define GL_DOT3_RGB_ARB 0x86AE -#define GL_DOT3_RGBA_ARB 0x86AF -#endif - -#ifndef GL_ARB_texture_mirrored_repeat -#define GL_MIRRORED_REPEAT_ARB 0x8370 -#endif - -#ifndef GL_ARB_depth_texture -#define GL_DEPTH_COMPONENT16_ARB 0x81A5 -#define GL_DEPTH_COMPONENT24_ARB 0x81A6 -#define GL_DEPTH_COMPONENT32_ARB 0x81A7 -#define GL_TEXTURE_DEPTH_SIZE_ARB 0x884A -#define GL_DEPTH_TEXTURE_MODE_ARB 0x884B -#endif - -#ifndef GL_ARB_shadow -#define GL_TEXTURE_COMPARE_MODE_ARB 0x884C -#define GL_TEXTURE_COMPARE_FUNC_ARB 0x884D -#define GL_COMPARE_R_TO_TEXTURE_ARB 0x884E -#endif - -#ifndef GL_ARB_shadow_ambient -#define GL_TEXTURE_COMPARE_FAIL_VALUE_ARB 0x80BF -#endif - -#ifndef GL_ARB_window_pos -#endif - -#ifndef GL_ARB_vertex_program -#define GL_COLOR_SUM_ARB 0x8458 -#define GL_VERTEX_PROGRAM_ARB 0x8620 -#define GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB 0x8622 -#define GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB 0x8623 -#define GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB 0x8624 -#define GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB 0x8625 -#define GL_CURRENT_VERTEX_ATTRIB_ARB 0x8626 -#define GL_PROGRAM_LENGTH_ARB 0x8627 -#define GL_PROGRAM_STRING_ARB 0x8628 -#define GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB 0x862E -#define GL_MAX_PROGRAM_MATRICES_ARB 0x862F -#define GL_CURRENT_MATRIX_STACK_DEPTH_ARB 0x8640 -#define GL_CURRENT_MATRIX_ARB 0x8641 -#define GL_VERTEX_PROGRAM_POINT_SIZE_ARB 0x8642 -#define GL_VERTEX_PROGRAM_TWO_SIDE_ARB 0x8643 -#define GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB 0x8645 -#define GL_PROGRAM_ERROR_POSITION_ARB 0x864B -#define GL_PROGRAM_BINDING_ARB 0x8677 -#define GL_MAX_VERTEX_ATTRIBS_ARB 0x8869 -#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB 0x886A -#define GL_PROGRAM_ERROR_STRING_ARB 0x8874 -#define GL_PROGRAM_FORMAT_ASCII_ARB 0x8875 -#define GL_PROGRAM_FORMAT_ARB 0x8876 -#define GL_PROGRAM_INSTRUCTIONS_ARB 0x88A0 -#define GL_MAX_PROGRAM_INSTRUCTIONS_ARB 0x88A1 -#define GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB 0x88A2 -#define GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB 0x88A3 -#define GL_PROGRAM_TEMPORARIES_ARB 0x88A4 -#define GL_MAX_PROGRAM_TEMPORARIES_ARB 0x88A5 -#define GL_PROGRAM_NATIVE_TEMPORARIES_ARB 0x88A6 -#define GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB 0x88A7 -#define GL_PROGRAM_PARAMETERS_ARB 0x88A8 -#define GL_MAX_PROGRAM_PARAMETERS_ARB 0x88A9 -#define GL_PROGRAM_NATIVE_PARAMETERS_ARB 0x88AA -#define GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB 0x88AB -#define GL_PROGRAM_ATTRIBS_ARB 0x88AC -#define GL_MAX_PROGRAM_ATTRIBS_ARB 0x88AD -#define GL_PROGRAM_NATIVE_ATTRIBS_ARB 0x88AE -#define GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB 0x88AF -#define GL_PROGRAM_ADDRESS_REGISTERS_ARB 0x88B0 -#define GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB 0x88B1 -#define GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB 0x88B2 -#define GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB 0x88B3 -#define GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB 0x88B4 -#define GL_MAX_PROGRAM_ENV_PARAMETERS_ARB 0x88B5 -#define GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB 0x88B6 -#define GL_TRANSPOSE_CURRENT_MATRIX_ARB 0x88B7 -#define GL_MATRIX0_ARB 0x88C0 -#define GL_MATRIX1_ARB 0x88C1 -#define GL_MATRIX2_ARB 0x88C2 -#define GL_MATRIX3_ARB 0x88C3 -#define GL_MATRIX4_ARB 0x88C4 -#define GL_MATRIX5_ARB 0x88C5 -#define GL_MATRIX6_ARB 0x88C6 -#define GL_MATRIX7_ARB 0x88C7 -#define GL_MATRIX8_ARB 0x88C8 -#define GL_MATRIX9_ARB 0x88C9 -#define GL_MATRIX10_ARB 0x88CA -#define GL_MATRIX11_ARB 0x88CB -#define GL_MATRIX12_ARB 0x88CC -#define GL_MATRIX13_ARB 0x88CD -#define GL_MATRIX14_ARB 0x88CE -#define GL_MATRIX15_ARB 0x88CF -#define GL_MATRIX16_ARB 0x88D0 -#define GL_MATRIX17_ARB 0x88D1 -#define GL_MATRIX18_ARB 0x88D2 -#define GL_MATRIX19_ARB 0x88D3 -#define GL_MATRIX20_ARB 0x88D4 -#define GL_MATRIX21_ARB 0x88D5 -#define GL_MATRIX22_ARB 0x88D6 -#define GL_MATRIX23_ARB 0x88D7 -#define GL_MATRIX24_ARB 0x88D8 -#define GL_MATRIX25_ARB 0x88D9 -#define GL_MATRIX26_ARB 0x88DA -#define GL_MATRIX27_ARB 0x88DB -#define GL_MATRIX28_ARB 0x88DC -#define GL_MATRIX29_ARB 0x88DD -#define GL_MATRIX30_ARB 0x88DE -#define GL_MATRIX31_ARB 0x88DF -#endif - -#ifndef GL_ARB_fragment_program -#define GL_FRAGMENT_PROGRAM_ARB 0x8804 -#define GL_PROGRAM_ALU_INSTRUCTIONS_ARB 0x8805 -#define GL_PROGRAM_TEX_INSTRUCTIONS_ARB 0x8806 -#define GL_PROGRAM_TEX_INDIRECTIONS_ARB 0x8807 -#define GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB 0x8808 -#define GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB 0x8809 -#define GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB 0x880A -#define GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB 0x880B -#define GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB 0x880C -#define GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB 0x880D -#define GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB 0x880E -#define GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB 0x880F -#define GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB 0x8810 -#define GL_MAX_TEXTURE_COORDS_ARB 0x8871 -#define GL_MAX_TEXTURE_IMAGE_UNITS_ARB 0x8872 -#endif - -#ifndef GL_ARB_vertex_buffer_object -#define GL_BUFFER_SIZE_ARB 0x8764 -#define GL_BUFFER_USAGE_ARB 0x8765 -#define GL_ARRAY_BUFFER_ARB 0x8892 -#define GL_ELEMENT_ARRAY_BUFFER_ARB 0x8893 -#define GL_ARRAY_BUFFER_BINDING_ARB 0x8894 -#define GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB 0x8895 -#define GL_VERTEX_ARRAY_BUFFER_BINDING_ARB 0x8896 -#define GL_NORMAL_ARRAY_BUFFER_BINDING_ARB 0x8897 -#define GL_COLOR_ARRAY_BUFFER_BINDING_ARB 0x8898 -#define GL_INDEX_ARRAY_BUFFER_BINDING_ARB 0x8899 -#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB 0x889A -#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB 0x889B -#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB 0x889C -#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB 0x889D -#define GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB 0x889E -#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB 0x889F -#define GL_READ_ONLY_ARB 0x88B8 -#define GL_WRITE_ONLY_ARB 0x88B9 -#define GL_READ_WRITE_ARB 0x88BA -#define GL_BUFFER_ACCESS_ARB 0x88BB -#define GL_BUFFER_MAPPED_ARB 0x88BC -#define GL_BUFFER_MAP_POINTER_ARB 0x88BD -#define GL_STREAM_DRAW_ARB 0x88E0 -#define GL_STREAM_READ_ARB 0x88E1 -#define GL_STREAM_COPY_ARB 0x88E2 -#define GL_STATIC_DRAW_ARB 0x88E4 -#define GL_STATIC_READ_ARB 0x88E5 -#define GL_STATIC_COPY_ARB 0x88E6 -#define GL_DYNAMIC_DRAW_ARB 0x88E8 -#define GL_DYNAMIC_READ_ARB 0x88E9 -#define GL_DYNAMIC_COPY_ARB 0x88EA -#endif - -#ifndef GL_ARB_occlusion_query -#define GL_QUERY_COUNTER_BITS_ARB 0x8864 -#define GL_CURRENT_QUERY_ARB 0x8865 -#define GL_QUERY_RESULT_ARB 0x8866 -#define GL_QUERY_RESULT_AVAILABLE_ARB 0x8867 -#define GL_SAMPLES_PASSED_ARB 0x8914 -#endif - -#ifndef GL_ARB_shader_objects -#define GL_PROGRAM_OBJECT_ARB 0x8B40 -#define GL_SHADER_OBJECT_ARB 0x8B48 -#define GL_OBJECT_TYPE_ARB 0x8B4E -#define GL_OBJECT_SUBTYPE_ARB 0x8B4F -#define GL_FLOAT_VEC2_ARB 0x8B50 -#define GL_FLOAT_VEC3_ARB 0x8B51 -#define GL_FLOAT_VEC4_ARB 0x8B52 -#define GL_INT_VEC2_ARB 0x8B53 -#define GL_INT_VEC3_ARB 0x8B54 -#define GL_INT_VEC4_ARB 0x8B55 -#define GL_BOOL_ARB 0x8B56 -#define GL_BOOL_VEC2_ARB 0x8B57 -#define GL_BOOL_VEC3_ARB 0x8B58 -#define GL_BOOL_VEC4_ARB 0x8B59 -#define GL_FLOAT_MAT2_ARB 0x8B5A -#define GL_FLOAT_MAT3_ARB 0x8B5B -#define GL_FLOAT_MAT4_ARB 0x8B5C -#define GL_SAMPLER_1D_ARB 0x8B5D -#define GL_SAMPLER_2D_ARB 0x8B5E -#define GL_SAMPLER_3D_ARB 0x8B5F -#define GL_SAMPLER_CUBE_ARB 0x8B60 -#define GL_SAMPLER_1D_SHADOW_ARB 0x8B61 -#define GL_SAMPLER_2D_SHADOW_ARB 0x8B62 -#define GL_SAMPLER_2D_RECT_ARB 0x8B63 -#define GL_SAMPLER_2D_RECT_SHADOW_ARB 0x8B64 -#define GL_OBJECT_DELETE_STATUS_ARB 0x8B80 -#define GL_OBJECT_COMPILE_STATUS_ARB 0x8B81 -#define GL_OBJECT_LINK_STATUS_ARB 0x8B82 -#define GL_OBJECT_VALIDATE_STATUS_ARB 0x8B83 -#define GL_OBJECT_INFO_LOG_LENGTH_ARB 0x8B84 -#define GL_OBJECT_ATTACHED_OBJECTS_ARB 0x8B85 -#define GL_OBJECT_ACTIVE_UNIFORMS_ARB 0x8B86 -#define GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB 0x8B87 -#define GL_OBJECT_SHADER_SOURCE_LENGTH_ARB 0x8B88 -#endif - -#ifndef GL_ARB_vertex_shader -#define GL_VERTEX_SHADER_ARB 0x8B31 -#define GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB 0x8B4A -#define GL_MAX_VARYING_FLOATS_ARB 0x8B4B -#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB 0x8B4C -#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB 0x8B4D -#define GL_OBJECT_ACTIVE_ATTRIBUTES_ARB 0x8B89 -#define GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB 0x8B8A -#endif - -#ifndef GL_ARB_fragment_shader -#define GL_FRAGMENT_SHADER_ARB 0x8B30 -#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB 0x8B49 -#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB 0x8B8B -#endif - -#ifndef GL_ARB_shading_language_100 -#define GL_SHADING_LANGUAGE_VERSION_ARB 0x8B8C -#endif - -#ifndef GL_ARB_texture_non_power_of_two -#endif - -#ifndef GL_ARB_point_sprite -#define GL_POINT_SPRITE_ARB 0x8861 -#define GL_COORD_REPLACE_ARB 0x8862 -#endif - -#ifndef GL_ARB_fragment_program_shadow -#endif - -#ifndef GL_ARB_draw_buffers -#define GL_MAX_DRAW_BUFFERS_ARB 0x8824 -#define GL_DRAW_BUFFER0_ARB 0x8825 -#define GL_DRAW_BUFFER1_ARB 0x8826 -#define GL_DRAW_BUFFER2_ARB 0x8827 -#define GL_DRAW_BUFFER3_ARB 0x8828 -#define GL_DRAW_BUFFER4_ARB 0x8829 -#define GL_DRAW_BUFFER5_ARB 0x882A -#define GL_DRAW_BUFFER6_ARB 0x882B -#define GL_DRAW_BUFFER7_ARB 0x882C -#define GL_DRAW_BUFFER8_ARB 0x882D -#define GL_DRAW_BUFFER9_ARB 0x882E -#define GL_DRAW_BUFFER10_ARB 0x882F -#define GL_DRAW_BUFFER11_ARB 0x8830 -#define GL_DRAW_BUFFER12_ARB 0x8831 -#define GL_DRAW_BUFFER13_ARB 0x8832 -#define GL_DRAW_BUFFER14_ARB 0x8833 -#define GL_DRAW_BUFFER15_ARB 0x8834 -#endif - -#ifndef GL_ARB_texture_rectangle -#define GL_TEXTURE_RECTANGLE_ARB 0x84F5 -#define GL_TEXTURE_BINDING_RECTANGLE_ARB 0x84F6 -#define GL_PROXY_TEXTURE_RECTANGLE_ARB 0x84F7 -#define GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB 0x84F8 -#endif - -#ifndef GL_ARB_color_buffer_float -#define GL_RGBA_FLOAT_MODE_ARB 0x8820 -#define GL_CLAMP_VERTEX_COLOR_ARB 0x891A -#define GL_CLAMP_FRAGMENT_COLOR_ARB 0x891B -#define GL_CLAMP_READ_COLOR_ARB 0x891C -#define GL_FIXED_ONLY_ARB 0x891D -#endif - -#ifndef GL_ARB_half_float_pixel -#define GL_HALF_FLOAT_ARB 0x140B -#endif - -#ifndef GL_ARB_texture_float -#define GL_TEXTURE_RED_TYPE_ARB 0x8C10 -#define GL_TEXTURE_GREEN_TYPE_ARB 0x8C11 -#define GL_TEXTURE_BLUE_TYPE_ARB 0x8C12 -#define GL_TEXTURE_ALPHA_TYPE_ARB 0x8C13 -#define GL_TEXTURE_LUMINANCE_TYPE_ARB 0x8C14 -#define GL_TEXTURE_INTENSITY_TYPE_ARB 0x8C15 -#define GL_TEXTURE_DEPTH_TYPE_ARB 0x8C16 -#define GL_UNSIGNED_NORMALIZED_ARB 0x8C17 -#define GL_RGBA32F_ARB 0x8814 -#define GL_RGB32F_ARB 0x8815 -#define GL_ALPHA32F_ARB 0x8816 -#define GL_INTENSITY32F_ARB 0x8817 -#define GL_LUMINANCE32F_ARB 0x8818 -#define GL_LUMINANCE_ALPHA32F_ARB 0x8819 -#define GL_RGBA16F_ARB 0x881A -#define GL_RGB16F_ARB 0x881B -#define GL_ALPHA16F_ARB 0x881C -#define GL_INTENSITY16F_ARB 0x881D -#define GL_LUMINANCE16F_ARB 0x881E -#define GL_LUMINANCE_ALPHA16F_ARB 0x881F -#endif - -#ifndef GL_ARB_pixel_buffer_object -#define GL_PIXEL_PACK_BUFFER_ARB 0x88EB -#define GL_PIXEL_UNPACK_BUFFER_ARB 0x88EC -#define GL_PIXEL_PACK_BUFFER_BINDING_ARB 0x88ED -#define GL_PIXEL_UNPACK_BUFFER_BINDING_ARB 0x88EF -#endif - -#ifndef GL_EXT_abgr -#define GL_ABGR_EXT 0x8000 -#endif - -#ifndef GL_EXT_blend_color -#define GL_CONSTANT_COLOR_EXT 0x8001 -#define GL_ONE_MINUS_CONSTANT_COLOR_EXT 0x8002 -#define GL_CONSTANT_ALPHA_EXT 0x8003 -#define GL_ONE_MINUS_CONSTANT_ALPHA_EXT 0x8004 -#define GL_BLEND_COLOR_EXT 0x8005 -#endif - -#ifndef GL_EXT_polygon_offset -#define GL_POLYGON_OFFSET_EXT 0x8037 -#define GL_POLYGON_OFFSET_FACTOR_EXT 0x8038 -#define GL_POLYGON_OFFSET_BIAS_EXT 0x8039 -#endif - -#ifndef GL_EXT_texture -#define GL_ALPHA4_EXT 0x803B -#define GL_ALPHA8_EXT 0x803C -#define GL_ALPHA12_EXT 0x803D -#define GL_ALPHA16_EXT 0x803E -#define GL_LUMINANCE4_EXT 0x803F -#define GL_LUMINANCE8_EXT 0x8040 -#define GL_LUMINANCE12_EXT 0x8041 -#define GL_LUMINANCE16_EXT 0x8042 -#define GL_LUMINANCE4_ALPHA4_EXT 0x8043 -#define GL_LUMINANCE6_ALPHA2_EXT 0x8044 -#define GL_LUMINANCE8_ALPHA8_EXT 0x8045 -#define GL_LUMINANCE12_ALPHA4_EXT 0x8046 -#define GL_LUMINANCE12_ALPHA12_EXT 0x8047 -#define GL_LUMINANCE16_ALPHA16_EXT 0x8048 -#define GL_INTENSITY_EXT 0x8049 -#define GL_INTENSITY4_EXT 0x804A -#define GL_INTENSITY8_EXT 0x804B -#define GL_INTENSITY12_EXT 0x804C -#define GL_INTENSITY16_EXT 0x804D -#define GL_RGB2_EXT 0x804E -#define GL_RGB4_EXT 0x804F -#define GL_RGB5_EXT 0x8050 -#define GL_RGB8_EXT 0x8051 -#define GL_RGB10_EXT 0x8052 -#define GL_RGB12_EXT 0x8053 -#define GL_RGB16_EXT 0x8054 -#define GL_RGBA2_EXT 0x8055 -#define GL_RGBA4_EXT 0x8056 -#define GL_RGB5_A1_EXT 0x8057 -#define GL_RGBA8_EXT 0x8058 -#define GL_RGB10_A2_EXT 0x8059 -#define GL_RGBA12_EXT 0x805A -#define GL_RGBA16_EXT 0x805B -#define GL_TEXTURE_RED_SIZE_EXT 0x805C -#define GL_TEXTURE_GREEN_SIZE_EXT 0x805D -#define GL_TEXTURE_BLUE_SIZE_EXT 0x805E -#define GL_TEXTURE_ALPHA_SIZE_EXT 0x805F -#define GL_TEXTURE_LUMINANCE_SIZE_EXT 0x8060 -#define GL_TEXTURE_INTENSITY_SIZE_EXT 0x8061 -#define GL_REPLACE_EXT 0x8062 -#define GL_PROXY_TEXTURE_1D_EXT 0x8063 -#define GL_PROXY_TEXTURE_2D_EXT 0x8064 -#define GL_TEXTURE_TOO_LARGE_EXT 0x8065 -#endif - -#ifndef GL_EXT_texture3D -#define GL_PACK_SKIP_IMAGES_EXT 0x806B -#define GL_PACK_IMAGE_HEIGHT_EXT 0x806C -#define GL_UNPACK_SKIP_IMAGES_EXT 0x806D -#define GL_UNPACK_IMAGE_HEIGHT_EXT 0x806E -#define GL_TEXTURE_3D_EXT 0x806F -#define GL_PROXY_TEXTURE_3D_EXT 0x8070 -#define GL_TEXTURE_DEPTH_EXT 0x8071 -#define GL_TEXTURE_WRAP_R_EXT 0x8072 -#define GL_MAX_3D_TEXTURE_SIZE_EXT 0x8073 -#endif - -#ifndef GL_SGIS_texture_filter4 -#define GL_FILTER4_SGIS 0x8146 -#define GL_TEXTURE_FILTER4_SIZE_SGIS 0x8147 -#endif - -#ifndef GL_EXT_subtexture -#endif - -#ifndef GL_EXT_copy_texture -#endif - -#ifndef GL_EXT_histogram -#define GL_HISTOGRAM_EXT 0x8024 -#define GL_PROXY_HISTOGRAM_EXT 0x8025 -#define GL_HISTOGRAM_WIDTH_EXT 0x8026 -#define GL_HISTOGRAM_FORMAT_EXT 0x8027 -#define GL_HISTOGRAM_RED_SIZE_EXT 0x8028 -#define GL_HISTOGRAM_GREEN_SIZE_EXT 0x8029 -#define GL_HISTOGRAM_BLUE_SIZE_EXT 0x802A -#define GL_HISTOGRAM_ALPHA_SIZE_EXT 0x802B -#define GL_HISTOGRAM_LUMINANCE_SIZE_EXT 0x802C -#define GL_HISTOGRAM_SINK_EXT 0x802D -#define GL_MINMAX_EXT 0x802E -#define GL_MINMAX_FORMAT_EXT 0x802F -#define GL_MINMAX_SINK_EXT 0x8030 -#define GL_TABLE_TOO_LARGE_EXT 0x8031 -#endif - -#ifndef GL_EXT_convolution -#define GL_CONVOLUTION_1D_EXT 0x8010 -#define GL_CONVOLUTION_2D_EXT 0x8011 -#define GL_SEPARABLE_2D_EXT 0x8012 -#define GL_CONVOLUTION_BORDER_MODE_EXT 0x8013 -#define GL_CONVOLUTION_FILTER_SCALE_EXT 0x8014 -#define GL_CONVOLUTION_FILTER_BIAS_EXT 0x8015 -#define GL_REDUCE_EXT 0x8016 -#define GL_CONVOLUTION_FORMAT_EXT 0x8017 -#define GL_CONVOLUTION_WIDTH_EXT 0x8018 -#define GL_CONVOLUTION_HEIGHT_EXT 0x8019 -#define GL_MAX_CONVOLUTION_WIDTH_EXT 0x801A -#define GL_MAX_CONVOLUTION_HEIGHT_EXT 0x801B -#define GL_POST_CONVOLUTION_RED_SCALE_EXT 0x801C -#define GL_POST_CONVOLUTION_GREEN_SCALE_EXT 0x801D -#define GL_POST_CONVOLUTION_BLUE_SCALE_EXT 0x801E -#define GL_POST_CONVOLUTION_ALPHA_SCALE_EXT 0x801F -#define GL_POST_CONVOLUTION_RED_BIAS_EXT 0x8020 -#define GL_POST_CONVOLUTION_GREEN_BIAS_EXT 0x8021 -#define GL_POST_CONVOLUTION_BLUE_BIAS_EXT 0x8022 -#define GL_POST_CONVOLUTION_ALPHA_BIAS_EXT 0x8023 -#endif - -#ifndef GL_SGI_color_matrix -#define GL_COLOR_MATRIX_SGI 0x80B1 -#define GL_COLOR_MATRIX_STACK_DEPTH_SGI 0x80B2 -#define GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI 0x80B3 -#define GL_POST_COLOR_MATRIX_RED_SCALE_SGI 0x80B4 -#define GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI 0x80B5 -#define GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI 0x80B6 -#define GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI 0x80B7 -#define GL_POST_COLOR_MATRIX_RED_BIAS_SGI 0x80B8 -#define GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI 0x80B9 -#define GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI 0x80BA -#define GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI 0x80BB -#endif - -#ifndef GL_SGI_color_table -#define GL_COLOR_TABLE_SGI 0x80D0 -#define GL_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D1 -#define GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D2 -#define GL_PROXY_COLOR_TABLE_SGI 0x80D3 -#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D4 -#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D5 -#define GL_COLOR_TABLE_SCALE_SGI 0x80D6 -#define GL_COLOR_TABLE_BIAS_SGI 0x80D7 -#define GL_COLOR_TABLE_FORMAT_SGI 0x80D8 -#define GL_COLOR_TABLE_WIDTH_SGI 0x80D9 -#define GL_COLOR_TABLE_RED_SIZE_SGI 0x80DA -#define GL_COLOR_TABLE_GREEN_SIZE_SGI 0x80DB -#define GL_COLOR_TABLE_BLUE_SIZE_SGI 0x80DC -#define GL_COLOR_TABLE_ALPHA_SIZE_SGI 0x80DD -#define GL_COLOR_TABLE_LUMINANCE_SIZE_SGI 0x80DE -#define GL_COLOR_TABLE_INTENSITY_SIZE_SGI 0x80DF -#endif - -#ifndef GL_SGIS_pixel_texture -#define GL_PIXEL_TEXTURE_SGIS 0x8353 -#define GL_PIXEL_FRAGMENT_RGB_SOURCE_SGIS 0x8354 -#define GL_PIXEL_FRAGMENT_ALPHA_SOURCE_SGIS 0x8355 -#define GL_PIXEL_GROUP_COLOR_SGIS 0x8356 -#endif - -#ifndef GL_SGIX_pixel_texture -#define GL_PIXEL_TEX_GEN_SGIX 0x8139 -#define GL_PIXEL_TEX_GEN_MODE_SGIX 0x832B -#endif - -#ifndef GL_SGIS_texture4D -#define GL_PACK_SKIP_VOLUMES_SGIS 0x8130 -#define GL_PACK_IMAGE_DEPTH_SGIS 0x8131 -#define GL_UNPACK_SKIP_VOLUMES_SGIS 0x8132 -#define GL_UNPACK_IMAGE_DEPTH_SGIS 0x8133 -#define GL_TEXTURE_4D_SGIS 0x8134 -#define GL_PROXY_TEXTURE_4D_SGIS 0x8135 -#define GL_TEXTURE_4DSIZE_SGIS 0x8136 -#define GL_TEXTURE_WRAP_Q_SGIS 0x8137 -#define GL_MAX_4D_TEXTURE_SIZE_SGIS 0x8138 -#define GL_TEXTURE_4D_BINDING_SGIS 0x814F -#endif - -#ifndef GL_SGI_texture_color_table -#define GL_TEXTURE_COLOR_TABLE_SGI 0x80BC -#define GL_PROXY_TEXTURE_COLOR_TABLE_SGI 0x80BD -#endif - -#ifndef GL_EXT_cmyka -#define GL_CMYK_EXT 0x800C -#define GL_CMYKA_EXT 0x800D -#define GL_PACK_CMYK_HINT_EXT 0x800E -#define GL_UNPACK_CMYK_HINT_EXT 0x800F -#endif - -#ifndef GL_EXT_texture_object -#define GL_TEXTURE_PRIORITY_EXT 0x8066 -#define GL_TEXTURE_RESIDENT_EXT 0x8067 -#define GL_TEXTURE_1D_BINDING_EXT 0x8068 -#define GL_TEXTURE_2D_BINDING_EXT 0x8069 -#define GL_TEXTURE_3D_BINDING_EXT 0x806A -#endif - -#ifndef GL_SGIS_detail_texture -#define GL_DETAIL_TEXTURE_2D_SGIS 0x8095 -#define GL_DETAIL_TEXTURE_2D_BINDING_SGIS 0x8096 -#define GL_LINEAR_DETAIL_SGIS 0x8097 -#define GL_LINEAR_DETAIL_ALPHA_SGIS 0x8098 -#define GL_LINEAR_DETAIL_COLOR_SGIS 0x8099 -#define GL_DETAIL_TEXTURE_LEVEL_SGIS 0x809A -#define GL_DETAIL_TEXTURE_MODE_SGIS 0x809B -#define GL_DETAIL_TEXTURE_FUNC_POINTS_SGIS 0x809C -#endif - -#ifndef GL_SGIS_sharpen_texture -#define GL_LINEAR_SHARPEN_SGIS 0x80AD -#define GL_LINEAR_SHARPEN_ALPHA_SGIS 0x80AE -#define GL_LINEAR_SHARPEN_COLOR_SGIS 0x80AF -#define GL_SHARPEN_TEXTURE_FUNC_POINTS_SGIS 0x80B0 -#endif - -#ifndef GL_EXT_packed_pixels -#define GL_UNSIGNED_BYTE_3_3_2_EXT 0x8032 -#define GL_UNSIGNED_SHORT_4_4_4_4_EXT 0x8033 -#define GL_UNSIGNED_SHORT_5_5_5_1_EXT 0x8034 -#define GL_UNSIGNED_INT_8_8_8_8_EXT 0x8035 -#define GL_UNSIGNED_INT_10_10_10_2_EXT 0x8036 -#endif - -#ifndef GL_SGIS_texture_lod -#define GL_TEXTURE_MIN_LOD_SGIS 0x813A -#define GL_TEXTURE_MAX_LOD_SGIS 0x813B -#define GL_TEXTURE_BASE_LEVEL_SGIS 0x813C -#define GL_TEXTURE_MAX_LEVEL_SGIS 0x813D -#endif - -#ifndef GL_SGIS_multisample -#define GL_MULTISAMPLE_SGIS 0x809D -#define GL_SAMPLE_ALPHA_TO_MASK_SGIS 0x809E -#define GL_SAMPLE_ALPHA_TO_ONE_SGIS 0x809F -#define GL_SAMPLE_MASK_SGIS 0x80A0 -#define GL_1PASS_SGIS 0x80A1 -#define GL_2PASS_0_SGIS 0x80A2 -#define GL_2PASS_1_SGIS 0x80A3 -#define GL_4PASS_0_SGIS 0x80A4 -#define GL_4PASS_1_SGIS 0x80A5 -#define GL_4PASS_2_SGIS 0x80A6 -#define GL_4PASS_3_SGIS 0x80A7 -#define GL_SAMPLE_BUFFERS_SGIS 0x80A8 -#define GL_SAMPLES_SGIS 0x80A9 -#define GL_SAMPLE_MASK_VALUE_SGIS 0x80AA -#define GL_SAMPLE_MASK_INVERT_SGIS 0x80AB -#define GL_SAMPLE_PATTERN_SGIS 0x80AC -#endif - -#ifndef GL_EXT_rescale_normal -#define GL_RESCALE_NORMAL_EXT 0x803A -#endif - -#ifndef GL_EXT_vertex_array -#define GL_VERTEX_ARRAY_EXT 0x8074 -#define GL_NORMAL_ARRAY_EXT 0x8075 -#define GL_COLOR_ARRAY_EXT 0x8076 -#define GL_INDEX_ARRAY_EXT 0x8077 -#define GL_TEXTURE_COORD_ARRAY_EXT 0x8078 -#define GL_EDGE_FLAG_ARRAY_EXT 0x8079 -#define GL_VERTEX_ARRAY_SIZE_EXT 0x807A -#define GL_VERTEX_ARRAY_TYPE_EXT 0x807B -#define GL_VERTEX_ARRAY_STRIDE_EXT 0x807C -#define GL_VERTEX_ARRAY_COUNT_EXT 0x807D -#define GL_NORMAL_ARRAY_TYPE_EXT 0x807E -#define GL_NORMAL_ARRAY_STRIDE_EXT 0x807F -#define GL_NORMAL_ARRAY_COUNT_EXT 0x8080 -#define GL_COLOR_ARRAY_SIZE_EXT 0x8081 -#define GL_COLOR_ARRAY_TYPE_EXT 0x8082 -#define GL_COLOR_ARRAY_STRIDE_EXT 0x8083 -#define GL_COLOR_ARRAY_COUNT_EXT 0x8084 -#define GL_INDEX_ARRAY_TYPE_EXT 0x8085 -#define GL_INDEX_ARRAY_STRIDE_EXT 0x8086 -#define GL_INDEX_ARRAY_COUNT_EXT 0x8087 -#define GL_TEXTURE_COORD_ARRAY_SIZE_EXT 0x8088 -#define GL_TEXTURE_COORD_ARRAY_TYPE_EXT 0x8089 -#define GL_TEXTURE_COORD_ARRAY_STRIDE_EXT 0x808A -#define GL_TEXTURE_COORD_ARRAY_COUNT_EXT 0x808B -#define GL_EDGE_FLAG_ARRAY_STRIDE_EXT 0x808C -#define GL_EDGE_FLAG_ARRAY_COUNT_EXT 0x808D -#define GL_VERTEX_ARRAY_POINTER_EXT 0x808E -#define GL_NORMAL_ARRAY_POINTER_EXT 0x808F -#define GL_COLOR_ARRAY_POINTER_EXT 0x8090 -#define GL_INDEX_ARRAY_POINTER_EXT 0x8091 -#define GL_TEXTURE_COORD_ARRAY_POINTER_EXT 0x8092 -#define GL_EDGE_FLAG_ARRAY_POINTER_EXT 0x8093 -#endif - -#ifndef GL_EXT_misc_attribute -#endif - -#ifndef GL_SGIS_generate_mipmap -#define GL_GENERATE_MIPMAP_SGIS 0x8191 -#define GL_GENERATE_MIPMAP_HINT_SGIS 0x8192 -#endif - -#ifndef GL_SGIX_clipmap -#define GL_LINEAR_CLIPMAP_LINEAR_SGIX 0x8170 -#define GL_TEXTURE_CLIPMAP_CENTER_SGIX 0x8171 -#define GL_TEXTURE_CLIPMAP_FRAME_SGIX 0x8172 -#define GL_TEXTURE_CLIPMAP_OFFSET_SGIX 0x8173 -#define GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX 0x8174 -#define GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX 0x8175 -#define GL_TEXTURE_CLIPMAP_DEPTH_SGIX 0x8176 -#define GL_MAX_CLIPMAP_DEPTH_SGIX 0x8177 -#define GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX 0x8178 -#define GL_NEAREST_CLIPMAP_NEAREST_SGIX 0x844D -#define GL_NEAREST_CLIPMAP_LINEAR_SGIX 0x844E -#define GL_LINEAR_CLIPMAP_NEAREST_SGIX 0x844F -#endif - -#ifndef GL_SGIX_shadow -#define GL_TEXTURE_COMPARE_SGIX 0x819A -#define GL_TEXTURE_COMPARE_OPERATOR_SGIX 0x819B -#define GL_TEXTURE_LEQUAL_R_SGIX 0x819C -#define GL_TEXTURE_GEQUAL_R_SGIX 0x819D -#endif - -#ifndef GL_SGIS_texture_edge_clamp -#define GL_CLAMP_TO_EDGE_SGIS 0x812F -#endif - -#ifndef GL_SGIS_texture_border_clamp -#define GL_CLAMP_TO_BORDER_SGIS 0x812D -#endif - -#ifndef GL_EXT_blend_minmax -#define GL_FUNC_ADD_EXT 0x8006 -#define GL_MIN_EXT 0x8007 -#define GL_MAX_EXT 0x8008 -#define GL_BLEND_EQUATION_EXT 0x8009 -#endif - -#ifndef GL_EXT_blend_subtract -#define GL_FUNC_SUBTRACT_EXT 0x800A -#define GL_FUNC_REVERSE_SUBTRACT_EXT 0x800B -#endif - -#ifndef GL_EXT_blend_logic_op -#endif - -#ifndef GL_SGIX_interlace -#define GL_INTERLACE_SGIX 0x8094 -#endif - -#ifndef GL_SGIX_pixel_tiles -#define GL_PIXEL_TILE_BEST_ALIGNMENT_SGIX 0x813E -#define GL_PIXEL_TILE_CACHE_INCREMENT_SGIX 0x813F -#define GL_PIXEL_TILE_WIDTH_SGIX 0x8140 -#define GL_PIXEL_TILE_HEIGHT_SGIX 0x8141 -#define GL_PIXEL_TILE_GRID_WIDTH_SGIX 0x8142 -#define GL_PIXEL_TILE_GRID_HEIGHT_SGIX 0x8143 -#define GL_PIXEL_TILE_GRID_DEPTH_SGIX 0x8144 -#define GL_PIXEL_TILE_CACHE_SIZE_SGIX 0x8145 -#endif - -#ifndef GL_SGIS_texture_select -#define GL_DUAL_ALPHA4_SGIS 0x8110 -#define GL_DUAL_ALPHA8_SGIS 0x8111 -#define GL_DUAL_ALPHA12_SGIS 0x8112 -#define GL_DUAL_ALPHA16_SGIS 0x8113 -#define GL_DUAL_LUMINANCE4_SGIS 0x8114 -#define GL_DUAL_LUMINANCE8_SGIS 0x8115 -#define GL_DUAL_LUMINANCE12_SGIS 0x8116 -#define GL_DUAL_LUMINANCE16_SGIS 0x8117 -#define GL_DUAL_INTENSITY4_SGIS... [truncated message content] |
From: <pyr...@us...> - 2020-02-06 14:18:59
|
Revision: 13732 http://sourceforge.net/p/vegastrike/code/13732 Author: pyramid3d Date: 2020-02-06 14:18:57 +0000 (Thu, 06 Feb 2020) Log Message: ----------- archiving all code since main repo moved to github after r13698 on 2015-08-04 23:02:01 +0000 Added Paths: ----------- branches/0.5.2alpha-archive/ tags/0.5.2alpha-archive/ trunk/ trunk/README.md Removed Paths: ------------- trunk/ Added: trunk/README.md =================================================================== --- trunk/README.md (rev 0) +++ trunk/README.md 2020-02-06 14:18:57 UTC (rev 13732) @@ -0,0 +1,38 @@ +```markdown +# @file : README.md +# @version: 2020-02-06 +# @created: 2020-02-06 +# @author : pyramid +# @brief : repo moved notice +``` + +**Vega Strike Space Simulation Engine** +===================================== + + +**Repository Moved** +===================================== + +This [Vega Strike code repository]() has been moved to Github. + +[https://github.com/vegastrike/Vega-Strike-Engine-Source](https://github.com/vegastrike/Vega-Strike-Engine-Source) + +The move has been concluded after this repo svn commit revision r13698 on 2015-08-04 23:02:01 +0000 also code named + > "version 0.5.2-alpha" + +There were commits in this repo up to revision r13731 on 2017-06-21 20:11:56. + +Those commits have been merged with the new [Github Vegastrike project repo](https://github.com/vegastrike/). + +All code from the local [trunk](#trunk) has been archived to both + +- [branches/0.5.2alpha-archive](branches/0.5.2alpha-archive) +- [tags/0.5.2alpha-archive](tags/0.5.2alpha-archive) + +No code or data has been removed and as long as the repository is available, it will remain accessible for historical research and forensics. + +Please do however refrain from future commits to this repository to focus your contributions on the [Github Vegastrike project repo](https://github.com/vegastrike/) repository. + + + +```EOF``` |