Menu
▾
▴
csp-commits — Mailing list for CVS commit messages.
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(47) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(140) |
Feb
(98) |
Mar
(152) |
Apr
(104) |
May
(71) |
Jun
(94) |
Jul
(169) |
Aug
(83) |
Sep
(47) |
Oct
(134) |
Nov
(7) |
Dec
(20) |
| 2004 |
Jan
(41) |
Feb
(14) |
Mar
(42) |
Apr
(47) |
May
(68) |
Jun
(143) |
Jul
(65) |
Aug
(29) |
Sep
(40) |
Oct
(34) |
Nov
(33) |
Dec
(97) |
| 2005 |
Jan
(29) |
Feb
(30) |
Mar
(9) |
Apr
(37) |
May
(13) |
Jun
(31) |
Jul
(22) |
Aug
(23) |
Sep
|
Oct
(37) |
Nov
(34) |
Dec
(117) |
| 2006 |
Jan
(48) |
Feb
(6) |
Mar
(2) |
Apr
(71) |
May
(10) |
Jun
(16) |
Jul
(7) |
Aug
(1) |
Sep
(14) |
Oct
(17) |
Nov
(25) |
Dec
(26) |
| 2007 |
Jan
(8) |
Feb
(2) |
Mar
(7) |
Apr
(26) |
May
|
Jun
(12) |
Jul
(30) |
Aug
(14) |
Sep
(9) |
Oct
(4) |
Nov
(7) |
Dec
(6) |
| 2008 |
Jan
(10) |
Feb
(10) |
Mar
(6) |
Apr
(8) |
May
|
Jun
(10) |
Jul
(18) |
Aug
(15) |
Sep
(16) |
Oct
(5) |
Nov
(3) |
Dec
(10) |
| 2009 |
Jan
(11) |
Feb
(2) |
Mar
|
Apr
(15) |
May
(31) |
Jun
(18) |
Jul
(11) |
Aug
(26) |
Sep
(52) |
Oct
(17) |
Nov
(4) |
Dec
|
| 2010 |
Jan
|
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <de...@us...> - 2004-01-07 19:47:28
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Tools/ChunkTerrain/maketqt In directory sc8-pr-cvs1:/tmp/cvs-serv30550/maketqt Log Message: Directory /cvsroot/csp/APPLICATIONS/CSPSim/Tools/ChunkTerrain/maketqt added to the repository |
|
From: <de...@us...> - 2004-01-07 19:47:21
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Tools/ChunkTerrain/makebt In directory sc8-pr-cvs1:/tmp/cvs-serv30527/makebt Log Message: Directory /cvsroot/csp/APPLICATIONS/CSPSim/Tools/ChunkTerrain/makebt added to the repository |
|
From: <de...@us...> - 2004-01-07 19:47:11
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Tools/ChunkTerrain/lib In directory sc8-pr-cvs1:/tmp/cvs-serv30489/lib Log Message: Directory /cvsroot/csp/APPLICATIONS/CSPSim/Tools/ChunkTerrain/lib added to the repository |
|
From: <de...@us...> - 2004-01-07 19:47:02
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Tools/ChunkTerrain/heightfield_shader In directory sc8-pr-cvs1:/tmp/cvs-serv30413/heightfield_shader Log Message: Directory /cvsroot/csp/APPLICATIONS/CSPSim/Tools/ChunkTerrain/heightfield_shader added to the repository |
|
From: <de...@us...> - 2004-01-07 19:46:54
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Tools/ChunkTerrain/heightfield_chunker In directory sc8-pr-cvs1:/tmp/cvs-serv30341/heightfield_chunker Log Message: Directory /cvsroot/csp/APPLICATIONS/CSPSim/Tools/ChunkTerrain/heightfield_chunker added to the repository |
|
From: <de...@us...> - 2004-01-07 19:46:45
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Tools/ChunkTerrain/decimate_texture In directory sc8-pr-cvs1:/tmp/cvs-serv30309/decimate_texture Log Message: Directory /cvsroot/csp/APPLICATIONS/CSPSim/Tools/ChunkTerrain/decimate_texture added to the repository |
|
From: <de...@us...> - 2004-01-07 19:46:37
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Tools/ChunkTerrain/bin In directory sc8-pr-cvs1:/tmp/cvs-serv30283/bin Log Message: Directory /cvsroot/csp/APPLICATIONS/CSPSim/Tools/ChunkTerrain/bin added to the repository |
|
From: <de...@us...> - 2004-01-07 19:46:14
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Tools/ChunkTerrain
In directory sc8-pr-cvs1:/tmp/cvs-serv30177
Added Files:
chunkterrain.sln
Log Message:
chunkterrain vc .NET 7.1 solution
--- NEW FILE: chunkterrain.sln ---
Microsoft Visual Studio Solution File, Format Version 8.00
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "heightfield_chunker", "heightfield_chunker\heightfield_chunker.vcproj", "{EA522843-0D21-416E-8A60-315280ADDB88}"
ProjectSection(ProjectDependencies) = postProject
{EC762EE9-F401-4EB8-9212-9B08C8568A97} = {EC762EE9-F401-4EB8-9212-9B08C8568A97}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "heightfield_shader", "heightfield_shader\heightfield_shader.vcproj", "{4A346C89-EEA0-447A-9EC0-8C2844F59F69}"
ProjectSection(ProjectDependencies) = postProject
{EC762EE9-F401-4EB8-9212-9B08C8568A97} = {EC762EE9-F401-4EB8-9212-9B08C8568A97}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shader2", "shader2\shader2.vcproj", "{E1A5C9B6-3944-4F00-9E0F-4369F43D2BF9}"
ProjectSection(ProjectDependencies) = postProject
{EC762EE9-F401-4EB8-9212-9B08C8568A97} = {EC762EE9-F401-4EB8-9212-9B08C8568A97}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "merge-ppm", "merge-ppm\merge-ppm.vcproj", "{C97F95B3-1ADB-4B0F-864F-C8CEA3C3E711}"
ProjectSection(ProjectDependencies) = postProject
{EC762EE9-F401-4EB8-9212-9B08C8568A97} = {EC762EE9-F401-4EB8-9212-9B08C8568A97}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "makebt", "makebt\makebt.vcproj", "{069A7C80-5996-49A7-B708-F6F31842DF81}"
ProjectSection(ProjectDependencies) = postProject
{EC762EE9-F401-4EB8-9212-9B08C8568A97} = {EC762EE9-F401-4EB8-9212-9B08C8568A97}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "maketqt", "maketqt\maketqt.vcproj", "{6A3B3F7E-350A-4752-94C8-7E9F84C48E43}"
ProjectSection(ProjectDependencies) = postProject
{EC762EE9-F401-4EB8-9212-9B08C8568A97} = {EC762EE9-F401-4EB8-9212-9B08C8568A97}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "decimate_texture", "decimate_texture\decimate_texture.vcproj", "{FA6E1B0F-C792-4A80-A315-752ED678AB6A}"
ProjectSection(ProjectDependencies) = postProject
{EC762EE9-F401-4EB8-9212-9B08C8568A97} = {EC762EE9-F401-4EB8-9212-9B08C8568A97}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "engine", "engine\engine.vcproj", "{EC762EE9-F401-4EB8-9212-9B08C8568A97}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfiguration) = preSolution
Debug = Debug
Release = Release
EndGlobalSection
GlobalSection(ProjectConfiguration) = postSolution
{EA522843-0D21-416E-8A60-315280ADDB88}.Debug.ActiveCfg = Debug|Win32
{EA522843-0D21-416E-8A60-315280ADDB88}.Debug.Build.0 = Debug|Win32
{EA522843-0D21-416E-8A60-315280ADDB88}.Release.ActiveCfg = Release|Win32
{EA522843-0D21-416E-8A60-315280ADDB88}.Release.Build.0 = Release|Win32
{4A346C89-EEA0-447A-9EC0-8C2844F59F69}.Debug.ActiveCfg = Debug|Win32
{4A346C89-EEA0-447A-9EC0-8C2844F59F69}.Debug.Build.0 = Debug|Win32
{4A346C89-EEA0-447A-9EC0-8C2844F59F69}.Release.ActiveCfg = Release|Win32
{4A346C89-EEA0-447A-9EC0-8C2844F59F69}.Release.Build.0 = Release|Win32
{E1A5C9B6-3944-4F00-9E0F-4369F43D2BF9}.Debug.ActiveCfg = Debug|Win32
{E1A5C9B6-3944-4F00-9E0F-4369F43D2BF9}.Debug.Build.0 = Debug|Win32
{E1A5C9B6-3944-4F00-9E0F-4369F43D2BF9}.Release.ActiveCfg = Release|Win32
{E1A5C9B6-3944-4F00-9E0F-4369F43D2BF9}.Release.Build.0 = Release|Win32
{C97F95B3-1ADB-4B0F-864F-C8CEA3C3E711}.Debug.ActiveCfg = Debug|Win32
{C97F95B3-1ADB-4B0F-864F-C8CEA3C3E711}.Debug.Build.0 = Debug|Win32
{C97F95B3-1ADB-4B0F-864F-C8CEA3C3E711}.Release.ActiveCfg = Release|Win32
{C97F95B3-1ADB-4B0F-864F-C8CEA3C3E711}.Release.Build.0 = Release|Win32
{069A7C80-5996-49A7-B708-F6F31842DF81}.Debug.ActiveCfg = Debug|Win32
{069A7C80-5996-49A7-B708-F6F31842DF81}.Debug.Build.0 = Debug|Win32
{069A7C80-5996-49A7-B708-F6F31842DF81}.Release.ActiveCfg = Release|Win32
{069A7C80-5996-49A7-B708-F6F31842DF81}.Release.Build.0 = Release|Win32
{6A3B3F7E-350A-4752-94C8-7E9F84C48E43}.Debug.ActiveCfg = Debug|Win32
{6A3B3F7E-350A-4752-94C8-7E9F84C48E43}.Debug.Build.0 = Debug|Win32
{6A3B3F7E-350A-4752-94C8-7E9F84C48E43}.Release.ActiveCfg = Release|Win32
{6A3B3F7E-350A-4752-94C8-7E9F84C48E43}.Release.Build.0 = Release|Win32
{FA6E1B0F-C792-4A80-A315-752ED678AB6A}.Debug.ActiveCfg = Debug|Win32
{FA6E1B0F-C792-4A80-A315-752ED678AB6A}.Debug.Build.0 = Debug|Win32
{FA6E1B0F-C792-4A80-A315-752ED678AB6A}.Release.ActiveCfg = Release|Win32
{FA6E1B0F-C792-4A80-A315-752ED678AB6A}.Release.Build.0 = Release|Win32
{EC762EE9-F401-4EB8-9212-9B08C8568A97}.Debug.ActiveCfg = Debug|Win32
{EC762EE9-F401-4EB8-9212-9B08C8568A97}.Debug.Build.0 = Debug|Win32
{EC762EE9-F401-4EB8-9212-9B08C8568A97}.Release.ActiveCfg = Release|Win32
{EC762EE9-F401-4EB8-9212-9B08C8568A97}.Release.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
EndGlobalSection
GlobalSection(ExtensibilityAddIns) = postSolution
EndGlobalSection
EndGlobal
|
|
From: <de...@us...> - 2004-01-07 19:28:16
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Tools/ChunkTerrain/engine
In directory sc8-pr-cvs1:/tmp/cvs-serv26714
Added Files:
engine.vcproj engine.sln
Log Message:
engine vc .NET 2003 (7.1) project files
--- NEW FILE: engine.vcproj ---
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="7.10"
Name="engine"
ProjectGUID="{EC762EE9-F401-4EB8-9212-9B08C8568A97}"
Keyword="MakeFileProj">
<Platforms>
<Platform
Name="Win32"/>
</Platforms>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="Debug"
IntermediateDirectory="Debug"
ConfigurationType="4">
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=".."
PreprocessorDefinitions="WIN32"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLibrarianTool"/>
<Tool
Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="../lib"
IntermediateDirectory="Release"
ConfigurationType="4">
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=".."
PreprocessorDefinitions="WIN32"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLibrarianTool"/>
<Tool
Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Source Files"
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
RelativePath=".\bsp.cpp">
</File>
<File
RelativePath=".\cull.cpp">
</File>
<File
RelativePath=".\geometry.cpp">
</File>
<File
RelativePath=".\image.cpp">
</File>
<File
RelativePath=".\image_filters.cpp">
</File>
<File
RelativePath=".\jpeg.cpp">
</File>
<File
RelativePath=".\ogl.cpp">
</File>
<File
RelativePath=".\tqt.cpp">
</File>
<File
RelativePath=".\utility.cpp">
</File>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
<File
RelativePath=".\bsp.h">
</File>
<File
RelativePath=".\config.h">
</File>
<File
RelativePath=".\container.h">
</File>
<File
RelativePath=".\cull.h">
</File>
<File
RelativePath=".\dlmalloc.h">
</File>
<File
RelativePath=".\geometry.h">
</File>
<File
RelativePath=".\image.h">
</File>
<File
RelativePath=".\image_filters.h">
</File>
<File
RelativePath=".\jpeg.h">
</File>
<File
RelativePath=".\ogl.h">
</File>
<File
RelativePath=".\tqt.h">
</File>
<File
RelativePath=".\utility.h">
</File>
<File
RelativePath=".\view_state.h">
</File>
<File
RelativePath=".\visual.h">
</File>
</Filter>
<Filter
Name="Resource Files"
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
</Filter>
<File
RelativePath=".\readme.txt">
</File>
</Files>
<Globals>
</Globals>
</VisualStudioProject>
--- NEW FILE: engine.sln ---
Microsoft Visual Studio Solution File, Format Version 8.00
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "engine", "engine.vcproj", "{EC762EE9-F401-4EB8-9212-9B08C8568A97}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfiguration) = preSolution
Debug = Debug
Release = Release
EndGlobalSection
GlobalSection(ProjectConfiguration) = postSolution
{EC762EE9-F401-4EB8-9212-9B08C8568A97}.Debug.ActiveCfg = Debug|Win32
{EC762EE9-F401-4EB8-9212-9B08C8568A97}.Debug.Build.0 = Debug|Win32
{EC762EE9-F401-4EB8-9212-9B08C8568A97}.Release.ActiveCfg = Release|Win32
{EC762EE9-F401-4EB8-9212-9B08C8568A97}.Release.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
EndGlobalSection
GlobalSection(ExtensibilityAddIns) = postSolution
EndGlobalSection
EndGlobal
|
|
From: <de...@us...> - 2004-01-07 16:55:19
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Tools/ChunkTerrain In directory sc8-pr-cvs1:/tmp/cvs-serv19271 Modified Files: shader2.cpp merge-ppm.cpp Log Message: added a #define snprintf _snprintf for vs users Index: shader2.cpp =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Tools/ChunkTerrain/shader2.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** shader2.cpp 7 Jan 2004 09:12:07 -0000 1.1 --- shader2.cpp 7 Jan 2004 16:55:16 -0000 1.2 *************** *** 29,32 **** --- 29,36 ---- #include <iostream> + #ifdef _MSC_VER + #define snprintf _snprintf + #endif + void ReadPixel(SDL_Surface *s, int x, int y, Uint8* R, Uint8* G, Uint8* B, Uint8* A); Index: merge-ppm.cpp =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Tools/ChunkTerrain/merge-ppm.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** merge-ppm.cpp 7 Jan 2004 09:12:07 -0000 1.1 --- merge-ppm.cpp 7 Jan 2004 16:55:16 -0000 1.2 *************** *** 21,24 **** --- 21,27 ---- #include <engine/jpeg.h> + #ifdef _MSC_VER + #define snprintf _snprintf + #endif //void initialize_tileset(array<texture_tile>* tileset); |
|
From: <mk...@us...> - 2004-01-07 09:10:50
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Tools/ChunkTerrain/engine In directory sc8-pr-cvs1:/tmp/cvs-serv1148/engine Log Message: Directory /cvsroot/csp/APPLICATIONS/CSPSim/Tools/ChunkTerrain/engine added to the repository |
|
From: <mk...@us...> - 2004-01-07 09:10:42
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Tools/ChunkTerrain In directory sc8-pr-cvs1:/tmp/cvs-serv1133/ChunkTerrain Log Message: Directory /cvsroot/csp/APPLICATIONS/CSPSim/Tools/ChunkTerrain added to the repository |
|
From: <de...@us...> - 2004-01-02 21:54:07
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim
In directory sc8-pr-cvs1:/tmp/cvs-serv30040
Modified Files:
CHANGES.current
Log Message:
no message
Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/CHANGES.current,v
retrieving revision 1.80
retrieving revision 1.81
diff -C2 -d -r1.80 -r1.81
*** CHANGES.current 1 Jan 2004 22:34:52 -0000 1.80
--- CHANGES.current 2 Jan 2004 21:54:04 -0000 1.81
***************
*** 34,37 ****
--- 34,38 ----
* Added an osgFX effect (specular highlight). May produce
a warning on old generation graphic card.
+ ==========> Linux users, link onto osgFX lib.
* Reenabled texture unit 1 code in ScreenInfo.cpp.
|
|
From: <sto...@us...> - 2004-01-02 09:21:23
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Tools/HID/Maps In directory sc8-pr-cvs1:/tmp/cvs-serv31071 Added Files: SidewinderPPro.map Log Message: HID file for the Microsoft Sidewinder Precision Pro Joystick --- NEW FILE: SidewinderPPro.map --- # hid event identifier definitions for the Microsoft Sidewinder Precision Pro joystick. # primary buttons define SidewinderPPro:FireA 1 define SidewinderPPro:FireB 2 define SidewinderPPro:FireC 7 define SidewinderPPro:FireD 4 # additional buttons define SidewinderPPro:Pinkie 6 define SidewinderPPro:Launch 3 # coolie hat define SidewinderPPro:Mouse 5 define SidewinderPPro:Mouse_Up 22 define SidewinderPPro:Mouse_Right 23 define SidewinderPPro:Mouse_Down 24 define SidewinderPPro:Mouse_Left 25 # axes define SidewinderPPro:Stick_X 0 define SidewinderPPro:Stick_Y 1 define SidewinderPPro:Rudder 2 define SidewinderPPro:Throttle 3 |
|
From: <de...@us...> - 2004-01-01 23:25:32
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv3110
Modified Files:
LogoScreen.cpp
Log Message:
see CHANGES.current
Index: LogoScreen.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/LogoScreen.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** LogoScreen.cpp 1 Jan 2004 19:42:53 -0000 1.15
--- LogoScreen.cpp 1 Jan 2004 23:25:29 -0000 1.16
***************
*** 30,33 ****
--- 30,35 ----
#include "LogoScreen.h"
+ #include <ctime>
+
#include <osg/Geode>
#include <osg/Geometry>
***************
*** 91,98 ****
}
if (!file_name.empty()) {
! __time64_t ltime;
! _time64( <ime );
! unsigned int seed = static_cast<unsigned int>(ltime);
! srand(seed);
m_CurrPos = rand() % file_name.size();
setValue();
--- 93,97 ----
}
if (!file_name.empty()) {
! srand(static_cast<unsigned int>(time(0)));
m_CurrPos = rand() % file_name.size();
setValue();
|
|
From: <de...@us...> - 2004-01-01 22:34:55
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim
In directory sc8-pr-cvs1:/tmp/cvs-serv26510
Modified Files:
CHANGES.current
Log Message:
see CHANGES.current
Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/CHANGES.current,v
retrieving revision 1.79
retrieving revision 1.80
diff -C2 -d -r1.79 -r1.80
*** CHANGES.current 1 Jan 2004 19:43:36 -0000 1.79
--- CHANGES.current 1 Jan 2004 22:34:52 -0000 1.80
***************
*** 24,29 ****
characters).
==========> All users, update
! APPLICATIONS/CSPSim/Tools/HID/Maps/aircraft-core.map and
! RebuilData(.py).
2003-12-21: delta
--- 24,29 ----
characters).
==========> All users, update
! APPLICATIONS/CSPSim/Tools/HID/Maps/aircraft-core.map, rebuild
! aircraft.hid and RebuilData(.py).
2003-12-21: delta
|
|
From: <de...@us...> - 2004-01-01 22:32:51
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/VisualStudio/CSPSimDLL In directory sc8-pr-cvs1:/tmp/cvs-serv26068 Modified Files: CSPSimDLL.vcproj Log Message: see CHANGES.current Index: CSPSimDLL.vcproj =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/VisualStudio/CSPSimDLL/CSPSimDLL.vcproj,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** CSPSimDLL.vcproj 1 Jan 2004 19:45:27 -0000 1.16 --- CSPSimDLL.vcproj 1 Jan 2004 22:32:48 -0000 1.17 *************** *** 99,103 **** EnableIntrinsicFunctions="TRUE" FavorSizeOrSpeed="1" ! OptimizeForProcessor="3" AdditionalIncludeDirectories="C:/Python23/include;../../Include;../../../../THIRDPARTYLIBS/demeter;../../../../THIRDPARTYLIBS/CSPChunkLod/include" PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL;CSPSIMDLL_EXPORTS" --- 99,103 ---- EnableIntrinsicFunctions="TRUE" FavorSizeOrSpeed="1" ! OptimizeForProcessor="0" AdditionalIncludeDirectories="C:/Python23/include;../../Include;../../../../THIRDPARTYLIBS/demeter;../../../../THIRDPARTYLIBS/CSPChunkLod/include" PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL;CSPSIMDLL_EXPORTS" *************** *** 106,110 **** BufferSecurityCheck="FALSE" EnableFunctionLevelLinking="TRUE" ! EnableEnhancedInstructionSet="1" RuntimeTypeInfo="TRUE" PrecompiledHeaderFile=".\Release/CSPSimDLL.pch" --- 106,110 ---- BufferSecurityCheck="FALSE" EnableFunctionLevelLinking="TRUE" ! EnableEnhancedInstructionSet="0" RuntimeTypeInfo="TRUE" PrecompiledHeaderFile=".\Release/CSPSimDLL.pch" |
|
From: <de...@us...> - 2004-01-01 19:45:32
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/VisualStudio/CSPSimDLL In directory sc8-pr-cvs1:/tmp/cvs-serv26699 Modified Files: CSPSimDLL.vcproj Log Message: see CHANGES.current Index: CSPSimDLL.vcproj =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/VisualStudio/CSPSimDLL/CSPSimDLL.vcproj,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** CSPSimDLL.vcproj 28 Dec 2003 20:25:21 -0000 1.15 --- CSPSimDLL.vcproj 1 Jan 2004 19:45:27 -0000 1.16 *************** *** 22,31 **** <Tool Name="VCCLCompilerTool" - AdditionalOptions="/Zm1000" Optimization="0" ! AdditionalIncludeDirectories="C:\Python23\include;..\..\Include;..\..\..\..\THIRDPARTYLIBS\demeter;..\..\..\..\THIRDPARTYLIBS\CSPChunkLod\include" ! PreprocessorDefinitions="WIN32;_DEBUG;_USRDLL;CSPSIMDLL_EXPORTS" BasicRuntimeChecks="3" ! RuntimeLibrary="3" RuntimeTypeInfo="TRUE" PrecompiledHeaderFile=".\Debug/CSPSimDLL.pch" --- 22,33 ---- <Tool Name="VCCLCompilerTool" Optimization="0" ! ImproveFloatingPointConsistency="FALSE" ! AdditionalIncludeDirectories="C:/Python23/include;../../Include;../../../../THIRDPARTYLIBS/demeter;../../../../THIRDPARTYLIBS/CSPChunkLod/include" ! PreprocessorDefinitions="WIN32;_USRDLL;CSPSIMDLL_EXPORTS" ! StringPooling="FALSE" BasicRuntimeChecks="3" ! RuntimeLibrary="2" ! BufferSecurityCheck="FALSE" RuntimeTypeInfo="TRUE" PrecompiledHeaderFile=".\Debug/CSPSimDLL.pch" *************** *** 37,41 **** SuppressStartupBanner="TRUE" DebugInformationFormat="3" ! CompileAs="0"/> <Tool Name="VCCustomBuildTool"/> --- 39,43 ---- SuppressStartupBanner="TRUE" DebugInformationFormat="3" ! CompileAs="2"/> <Tool Name="VCCustomBuildTool"/> *************** *** 43,55 **** Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" ! AdditionalDependencies="sigc-1.2d.lib producerd.lib opengl32.lib SDL.lib osgDBd.lib DemeterVisualC6d.lib osgTextd.lib osgUtild.lib osgParticled.lib osgd.lib _cSimDatad.lib odbc32.lib odbccp32.lib" ! OutputFile="../../Bin/_cCSPd.dll" LinkIncremental="2" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="C:/Python23/Lib/site-packages/SimData,C:/Python23/libs, ../../../../THIRDPARTYLIBS/lib" ! IgnoreDefaultLibraryNames="msvcrt.lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\Debug/CSPSimDLL.pdb" ! ImportLibrary=".\Debug/CSPSimDLL.lib"/> <Tool Name="VCMIDLTool" --- 45,58 ---- Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" ! AdditionalDependencies="osgChunkLodd.lib osgFXd.lib sigc-1.2d.lib producerd.lib opengl32.lib SDL.lib osgDBd.lib DemeterVisualC6d.lib osgTextd.lib osgUtild.lib osgParticled.lib osgd.lib _cSimData.lib" ! OutputFile="../../Bin/_cCSP.dll" LinkIncremental="2" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="C:/Python23/Lib/site-packages/SimData,C:/Python23/libs, ../../../../THIRDPARTYLIBS/lib" ! IgnoreDefaultLibraryNames="" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\Debug/CSPSimDLL.pdb" ! ImportLibrary=".\Debug/CSPSimDLL.lib" ! TargetMachine="1"/> <Tool Name="VCMIDLTool" *************** *** 91,101 **** <Tool Name="VCCLCompilerTool" ! AdditionalOptions="/Zm1000" ! InlineFunctionExpansion="1" AdditionalIncludeDirectories="C:/Python23/include;../../Include;../../../../THIRDPARTYLIBS/demeter;../../../../THIRDPARTYLIBS/CSPChunkLod/include" PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL;CSPSIMDLL_EXPORTS" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" RuntimeTypeInfo="TRUE" PrecompiledHeaderFile=".\Release/CSPSimDLL.pch" --- 94,110 ---- <Tool Name="VCCLCompilerTool" ! Optimization="3" ! GlobalOptimizations="TRUE" ! InlineFunctionExpansion="2" ! EnableIntrinsicFunctions="TRUE" ! FavorSizeOrSpeed="1" ! OptimizeForProcessor="3" AdditionalIncludeDirectories="C:/Python23/include;../../Include;../../../../THIRDPARTYLIBS/demeter;../../../../THIRDPARTYLIBS/CSPChunkLod/include" PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL;CSPSIMDLL_EXPORTS" StringPooling="TRUE" RuntimeLibrary="2" + BufferSecurityCheck="FALSE" EnableFunctionLevelLinking="TRUE" + EnableEnhancedInstructionSet="1" RuntimeTypeInfo="TRUE" PrecompiledHeaderFile=".\Release/CSPSimDLL.pch" *************** *** 118,122 **** SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="../../../../THIRDPARTYLIBS/lib,C:/Python23/libs,C:/Python23/Lib/site-packages/SimData" ! GenerateDebugInformation="TRUE" AssemblyDebug="0" GenerateMapFile="FALSE" --- 127,131 ---- SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="../../../../THIRDPARTYLIBS/lib,C:/Python23/libs,C:/Python23/Lib/site-packages/SimData" ! GenerateDebugInformation="FALSE" AssemblyDebug="0" GenerateMapFile="FALSE" *************** *** 159,163 **** <Filter Name="Source Files" ! Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> <File RelativePath="..\..\Source\AircraftObject.cpp"> --- 168,172 ---- <Filter Name="Source Files" ! Filter="cpp;cc;c;cxx;rc;def;r;odl;idl;hpj;bat"> <File RelativePath="..\..\Source\AircraftObject.cpp"> *************** *** 200,209 **** <File RelativePath="..\..\Source\ChunkLodTerrain.cpp"> - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCCLCompilerTool"/> - </FileConfiguration> </File> <File --- 209,212 ---- |
|
From: <de...@us...> - 2004-01-01 19:43:41
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim
In directory sc8-pr-cvs1:/tmp/cvs-serv26347
Modified Files:
CHANGES.current
Log Message:
see CHANGES.current
Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/CHANGES.current,v
retrieving revision 1.78
retrieving revision 1.79
diff -C2 -d -r1.78 -r1.79
*** CHANGES.current 21 Dec 2003 10:36:15 -0000 1.78
--- CHANGES.current 1 Jan 2004 19:43:36 -0000 1.79
***************
*** 1,4 ****
--- 1,30 ----
Version 0.4.0 (in progress)
===========================
+ 2003-12-30: delta
+ * Added methods in VirtualScene to access perspective matrix.
+
+ 2003-12-29: delta
+ * More investigations on MARKERS_TOGGLE lead to
+ m_Actions[id.c_str()] from the method onCommand in
+ InputInterface and to the hash string simdata functions.
+ A string with size > 13 may lead to unexpected behaviour.
+ Not fixed yet.
+
+ * Updated CSPSimDLL.vcproj to be able to debug it. Use debug
+ built (export symbols are enabled).
+
+ 2003-12-22: delta
+ * Reimplemented LogoScreen ala osg. A sequence of screens is
+ loaded.
+ ==========> All users, update APPLICATIONS/CSPSim/Data/Images.
+
+ * MARKERS_TOGGLE string behaves weirdly with vc++. For now,
+ it is changed to MARKS_TOGGLE but it will need a complete
+ fix (problem might be similar for strings longer than N
+ characters).
+ ==========> All users, update
+ APPLICATIONS/CSPSim/Tools/HID/Maps/aircraft-core.map and
+ RebuilData(.py).
+
2003-12-21: delta
* Fixed stars at daytime on windows (GL_BLEND problem).
***************
*** 6,10 ****
* Separated gears and markers control.
! * Added an osgFX effect (specular highlight).
* Other minor changes.
--- 32,39 ----
* Separated gears and markers control.
! * Added an osgFX effect (specular highlight). May produce
! a warning on old generation graphic card.
!
! * Reenabled texture unit 1 code in ScreenInfo.cpp.
* Other minor changes.
|
|
From: <de...@us...> - 2004-01-01 19:43:19
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Tools/HID/Maps In directory sc8-pr-cvs1:/tmp/cvs-serv26304 Modified Files: aircraft-core.map Log Message: see CHANGES.current Index: aircraft-core.map =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Tools/HID/Maps/aircraft-core.map,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** aircraft-core.map 18 Jul 2003 22:00:58 -0000 1.4 --- aircraft-core.map 1 Jan 2004 19:43:15 -0000 1.5 *************** *** 25,32 **** map key:w press WHEEL_BRAKE_ON map key:w release WHEEL_BRAKE_OFF ! map key:m press MARKERS_TOGGLE map key:g press GEAR_TOGGLE map key:b press OPEN_AIRBRAKE/B|CLOSE_AIRBRAKE/B map key:SHIFT-b press INC_AIRBRAKE ! map key:CTRL-b press DEC_AIRBRAKE ! --- 25,31 ---- map key:w press WHEEL_BRAKE_ON map key:w release WHEEL_BRAKE_OFF ! map key:m press MARKS_TOGGLE map key:g press GEAR_TOGGLE map key:b press OPEN_AIRBRAKE/B|CLOSE_AIRBRAKE/B map key:SHIFT-b press INC_AIRBRAKE ! map key:CTRL-b press DEC_AIRBRAKE |
|
From: <de...@us...> - 2004-01-01 19:42:57
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv26201
Modified Files:
VirtualScene.cpp ScreenInfo.cpp ObjectModel.cpp LogoScreen.cpp
HID.cpp GameScreen.cpp EventMapIndex.cpp CSPSim.cpp
AircraftObject.cpp
Log Message:
see CHANGES.current
Index: VirtualScene.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/VirtualScene.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** VirtualScene.cpp 20 Oct 2003 00:23:23 -0000 1.15
--- VirtualScene.cpp 1 Jan 2004 19:42:53 -0000 1.16
***************
*** 175,178 ****
--- 175,180 ----
m_NearView = NULL;
m_ViewAngle = 60.0;
+ m_NearPlane = 2.0;
+ m_Aspect = static_cast<float>(g_ScreenWidth)/g_ScreenHeight;
m_ViewDistance = 30000.0;
m_SpinTheWorld = false;
***************
*** 393,398 ****
camera->setPerspective(m_ViewAngle, 1.0, 2.0f, m_ViewDistance);
#else
! float aspect = ((float)g_ScreenWidth) / g_ScreenHeight;
! m_FarView->setProjectionMatrixAsPerspective(m_ViewAngle, aspect, 2.0f, m_ViewDistance);
#endif
CullVisitor = m_FarView->getCullVisitor();
--- 395,399 ----
camera->setPerspective(m_ViewAngle, 1.0, 2.0f, m_ViewDistance);
#else
! m_FarView->setProjectionMatrixAsPerspective(m_ViewAngle, m_Aspect, m_NearPlane, m_ViewDistance);
#endif
CullVisitor = m_FarView->getCullVisitor();
***************
*** 408,412 ****
camera->setPerspective(m_ViewAngle, 1.0, 0.01f, 100.0);
#else
! m_NearView->setProjectionMatrixAsPerspective(m_ViewAngle, aspect, 0.01f, 100.0);
#endif
CullVisitor = m_NearView->getCullVisitor();
--- 409,413 ----
camera->setPerspective(m_ViewAngle, 1.0, 0.01f, 100.0);
#else
! m_NearView->setProjectionMatrixAsPerspective(m_ViewAngle, m_Aspect, 0.01f, 100.0);
#endif
CullVisitor = m_NearView->getCullVisitor();
***************
*** 480,514 ****
#endif
- /*****
- * code which could be used in replacement of osg::camera
- ******/
-
- //osgUtil::SceneView contains all the functionality of the "old"
- //osg::Camera. When you think "Camera" and "No Producer", use
- //osgUtil::SceneView and osg::RefMatrix:
- //
- //
- // osg::ref_ptr<osg::RefMatrix> projectionMatrix = new osg::RefMatrix;
- //
- // double verticalFieldOfView = 45.0; // Degrees
- // double aspectRatio = 1.0; // verticalFOV == horizontalFOV
- // double nearClip = 1.0;
- // double farClip = 1e4;
- // projectionMatrix->makeProjection( verticalFieldOfView,
- // aspectRatio,
- // nearClip, farClip );
- //
- // osg::BoundingSphere bs = rootNode->getBound();
- // osg::ref_ptr<osg::RefMatrix> modelViewMatrix = new osg::RefMatrix;
- // modelViewMatrix->setLookAt(
- // bs.center() - osg::Vec3(0.0, bs.radius()*2.5, 0.0), // Eye
- // bs.center(), // Center
- // osg::Vec3(0,0,1.0) ); // Up
- //
- // // Here it is. The next two lines is the sum total of what
- // // osgCamera did.
- // sceneView->setProjectionMatrix( projectionMatrix.get() );
- // sceneView->setModelViewMatrix( modelViewMatrix.get() );
-
m_GlobalFrame->setPosition(simdata::toOSG(-eyePos));
--- 481,484 ----
***************
*** 744,747 ****
--- 714,725 ----
{
m_ViewAngle = value;
+ }
+
+ void VirtualScene::setNearPlane(float value) {
+ m_NearPlane = value;
+ }
+
+ void VirtualScene::setAspect(float value) {
+ m_Aspect = value;
}
Index: ScreenInfo.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/ScreenInfo.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** ScreenInfo.cpp 21 Dec 2003 10:44:32 -0000 1.23
--- ScreenInfo.cpp 1 Jan 2004 19:42:53 -0000 1.24
***************
*** 81,86 ****
osg::StateSet *ss = getOrCreateStateSet();
ss->setTextureAttributeAndModes(1, new osg::Texture2D, osg::StateAttribute::OFF);
! ss->setTextureAttributeAndModes(2, new osg::Texture2D, osg::StateAttribute::OFF);
! ss->setTextureAttributeAndModes(3, new osg::Texture2D, osg::StateAttribute::OFF);
}
--- 81,86 ----
osg::StateSet *ss = getOrCreateStateSet();
ss->setTextureAttributeAndModes(1, new osg::Texture2D, osg::StateAttribute::OFF);
! //ss->setTextureAttributeAndModes(2, new osg::Texture2D, osg::StateAttribute::OFF);
! //ss->setTextureAttributeAndModes(3, new osg::Texture2D, osg::StateAttribute::OFF);
}
Index: ObjectModel.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/ObjectModel.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** ObjectModel.cpp 21 Dec 2003 10:21:03 -0000 1.24
--- ObjectModel.cpp 1 Jan 2004 19:42:53 -0000 1.25
***************
*** 608,616 ****
osg::Node *addEffect(osg::Node *model_node) {
// add an osgFX effect
! osgFX::SpecularHighlights* effect = new osgFX::SpecularHighlights;
effect->setTextureUnit(1);
effect->addChild(model_node);
return effect;
! }
SceneModel::SceneModel(simdata::Ref<ObjectModel> const & model) {
--- 608,616 ----
osg::Node *addEffect(osg::Node *model_node) {
// add an osgFX effect
! osgFX::SpecularHighlights *effect = new osgFX::SpecularHighlights;
effect->setTextureUnit(1);
effect->addChild(model_node);
return effect;
! }
SceneModel::SceneModel(simdata::Ref<ObjectModel> const & model) {
***************
*** 625,630 ****
// create a working copy
ModelCopy model_copy;
! //model_node = model_copy(model_node);
! model_node = model_copy(addEffect(model_node));
std::cout << "MODEL COPIED\n";
--- 625,631 ----
// create a working copy
ModelCopy model_copy;
! model_node = model_copy(model_node);
! // XXX add effect or not
! model_node = addEffect(model_node);
std::cout << "MODEL COPIED\n";
Index: LogoScreen.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/LogoScreen.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** LogoScreen.cpp 28 Dec 2003 19:56:15 -0000 1.14
--- LogoScreen.cpp 1 Jan 2004 19:42:53 -0000 1.15
***************
*** 132,136 ****
geom->setUseDisplayList(false);
! scale = 0.5f * 0.9f;
w = scale * m_width;
h = scale * m_height;
--- 132,136 ----
geom->setUseDisplayList(false);
! scale = 0.5f * 1.0f;
w = scale * m_width;
h = scale * m_height;
Index: HID.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/HID.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** HID.cpp 20 Oct 2003 00:23:23 -0000 1.11
--- HID.cpp 1 Jan 2004 19:42:53 -0000 1.12
***************
*** 211,215 ****
if (*id) {
if (!m_Object->onMapEvent(MapEvent::CommandEvent(id, m_MouseEventX, m_MouseEventY))) {
! std::cout << "Missing HID interface for command '" << id << "'\n";
}
}
--- 211,215 ----
if (*id) {
if (!m_Object->onMapEvent(MapEvent::CommandEvent(id, m_MouseEventX, m_MouseEventY))) {
! std::cout << "VirtualHID::onUpdate: Missing HID interface for command '" << id << "'\n";
}
}
Index: GameScreen.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/GameScreen.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** GameScreen.cpp 20 Oct 2003 00:23:23 -0000 1.28
--- GameScreen.cpp 1 Jan 2004 19:42:53 -0000 1.29
***************
*** 304,308 ****
simdata::Vector3 upVec = dynamic->getUpDirection();
simdata::Vector3 objectDir = dynamic->getDirection();
! camPos = objectPos + 500.0 * objectDir + ( 12.0 - (rand() % 5) ) * (objectDir^upVec)
+ ( 6.0 + (rand () % 3) ) * upVec;
} else {
--- 304,309 ----
simdata::Vector3 upVec = dynamic->getUpDirection();
simdata::Vector3 objectDir = dynamic->getDirection();
! double speed_level = dynamic->getSpeed()/50.0;
! camPos = objectPos + 900.0* objectDir + ( 12.0 - (rand() % 5) ) * (objectDir^upVec)
+ ( 6.0 + (rand () % 3) ) * upVec;
} else {
***************
*** 770,780 ****
}
}
!
! VirtualBattlefield *battlefield = CSPSim::theSim->getBattlefield();
! if (battlefield) {
! float h = 1.0 + battlefield->getGroundElevation(eyePos.x(), eyePos.y(), m_CameraHint);
m_CameraOnGround = (eyePos.z() <= h);
if (m_CameraOnGround) {
if (m_LookRelative) {
simdata::Vector3 adjustment = eyePos - lookPos;
double dh = h - lookPos.z();
--- 771,784 ----
}
}
! VirtualBattlefield *battlefield = CSPSim::theSim->getBattlefield();
! if (battlefield) {
! simdata::Ref<TerrainObject> const terrain = scene->getTerrain();
! simdata::Vector3 normal;
! double const SAFETY = 1.0;
! float h = SAFETY + terrain->getGroundElevation(eyePos.x(), eyePos.y(), normal, m_CameraHint);
m_CameraOnGround = (eyePos.z() <= h);
if (m_CameraOnGround) {
if (m_LookRelative) {
+
simdata::Vector3 adjustment = eyePos - lookPos;
double dh = h - lookPos.z();
***************
*** 789,795 ****
//m_CameraGroundAngle = asin(dh, m_disToObject) - asin(dz, m_disToObject);
//m_PanRateX = 0.0;
! } else {
! eyePos.z() = h;
! }
}
battlefield->updateOrigin(eyePos);
--- 793,836 ----
//m_CameraGroundAngle = asin(dh, m_disToObject) - asin(dz, m_disToObject);
//m_PanRateX = 0.0;
!
! /*double alpha_2 = simdata::toRadians(scene->getViewAngle())/2.0;
! double near_dist = scene->getNearPlane();
! double aspect = scene->getAspect();
! simdata::Vector3 eye_look = lookPos - eyePos;
! double eye_look_length = eye_look.length();
! simdata::Vector3 eye_look_unit = (1.0/eye_look_length)*eye_look;
! simdata::Vector3 up_vec_unit = upVec.normalized();
! simdata::Vector3 edge=near_dist*eye_look_unit+tan(alpha_2)*near_dist*(up_vec_unit+aspect*eye_look_unit^up_vec_unit);
! double edge_length = edge.length();
! double phi = acos(near_dist/edge_length);
! double b = sqrt(edge_length*edge_length
! +eye_look_length*eye_look_length-2.0*eye_look_length*edge_length*cos(phi));
! double sin_beta = edge_length*sin(phi)/b;
! double sin_theta = (lookPos.z()-terrain->getGroundElevation(lookPos.x(),lookPos.y(),m_CameraHint))/b;
! double gamma = asin(sin_beta)-asin(sin_theta);
! if (gamma <=0) {
! simdata::Vector3 u = -cos(gamma)*simdata::Vector3(eye_look.x(),eye_look.y(),0.0).normalized()
! +sin(gamma)*normal;
! simdata::Vector3 safe_eye_pos = lookPos + eye_look_length*u;
! safe_eye_pos.z() += SAFETY;
! if (eyePos.z() < safe_eye_pos.z()) {
! static i = 0;
! //std::cout << "\nold eyePos = " << eyePos << "\n";
! //std::cout << "ground at eyePos = " << terrain->getGroundElevation(eyePos.x(), eyePos.y(), normal, m_CameraHint) << "\n";
! if (++i%30 == 0) {
! std::cout << "edge_length = " << edge_length << "\n";
! std::cout << "cos_alpha = " << near_dist/edge_length << "\n";
! std::cout << "phi =" << phi << "\n";
! }
! eyePos = safe_eye_pos;
! //std::cout << "new eyePos = " << safe_eye_pos << "\n";
! }
! }
! if (eyePos.z() < h)
! eyePos.z() = h;*/
! } else {
! //std::cout << "eyePos.z() = h;\n";
! eyePos.z() = h;
! }
}
battlefield->updateOrigin(eyePos);
Index: EventMapIndex.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/EventMapIndex.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** EventMapIndex.cpp 20 Oct 2003 00:23:23 -0000 1.8
--- EventMapIndex.cpp 1 Jan 2004 19:42:53 -0000 1.9
***************
*** 36,40 ****
#include <SimData/FileUtility.h>
! #include <assert.h>
--- 36,40 ----
#include <SimData/FileUtility.h>
! #include <cassert>
***************
*** 65,78 ****
void EventMapIndex::loadAllMaps() {
! std::string path;
! osgDB::DirectoryContents dc;
! osgDB::DirectoryContents::iterator file;
! path = getConfigPath("InputMapPath");
CSP_LOG(APP, INFO, "Looking for human interface device mappings in '" << path << "'");
! dc = osgDB::getDirectoryContents(path);
! for (file = dc.begin(); file != dc.end(); file++) {
std::string fn = simdata::ospath::join(path, *file);
! if (osgDB::getFileExtension(fn) != "hid") continue;
! load(fn);
}
}
--- 65,75 ----
void EventMapIndex::loadAllMaps() {
! std::string path = getConfigPath("InputMapPath");
CSP_LOG(APP, INFO, "Looking for human interface device mappings in '" << path << "'");
! osgDB::DirectoryContents dc = osgDB::getDirectoryContents(path);
! for (osgDB::DirectoryContents::const_iterator file = dc.begin(); file != dc.end(); ++file) {
std::string fn = simdata::ospath::join(path, *file);
! if (osgDB::getFileExtension(fn) == "hid")
! load(fn);
}
}
Index: CSPSim.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/CSPSim.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** CSPSim.cpp 28 Dec 2003 19:56:30 -0000 1.39
--- CSPSim.cpp 1 Jan 2004 19:42:53 -0000 1.40
***************
*** 264,267 ****
--- 264,268 ----
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+ // should run in its own thread
logoScreen.onRender();
SDL_GL_SwapBuffers();
Index: AircraftObject.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/AircraftObject.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** AircraftObject.cpp 20 Oct 2003 01:27:10 -0000 1.33
--- AircraftObject.cpp 1 Jan 2004 19:42:53 -0000 1.34
***************
*** 56,60 ****
BIND_ACTION("SMOKE_OFF", SmokeOff);
BIND_ACTION("SMOKE_TOGGLE", SmokeToggle);
! BIND_ACTION("MARKERS_TOGGLE", MarkersToggle);
CSP_LOG(OBJECT, DEBUG, "... AircraftObject::AircraftObject()");
--- 56,60 ----
BIND_ACTION("SMOKE_OFF", SmokeOff);
BIND_ACTION("SMOKE_TOGGLE", SmokeToggle);
! BIND_ACTION("MARKS_TOGGLE", MarkersToggle);
CSP_LOG(OBJECT, DEBUG, "... AircraftObject::AircraftObject()");
|
|
From: <de...@us...> - 2004-01-01 19:42:32
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Include
In directory sc8-pr-cvs1:/tmp/cvs-serv26171
Modified Files:
VirtualScene.h ObjectModel.h
Log Message:
see CHANGES.current
Index: VirtualScene.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/VirtualScene.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** VirtualScene.h 24 Jul 2003 07:32:39 -0000 1.9
--- VirtualScene.h 1 Jan 2004 19:42:29 -0000 1.10
***************
*** 104,107 ****
--- 104,112 ----
inline float getViewAngle() const { return m_ViewAngle; }
void setViewAngle(float);
+ inline float getNearPlane() const {return m_NearPlane;}
+ void setNearPlane(float value);
+ inline float getAspect() const {return m_Aspect;}
+ void setAspect(float value);
+
void spinTheWorld(bool spin);
***************
*** 123,126 ****
--- 128,133 ----
float m_ViewDistance;
float m_ViewAngle;
+ float m_NearPlane; // of the near view
+ float m_Aspect; // of the near view
float m_FogStart;
Index: ObjectModel.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/ObjectModel.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** ObjectModel.h 21 Dec 2003 10:21:16 -0000 1.15
--- ObjectModel.h 1 Jan 2004 19:42:29 -0000 1.16
***************
*** 93,96 ****
--- 93,97 ----
osg::ref_ptr<osg::Node> getModel() { return m_Model.get(); }
osg::ref_ptr<osg::Node> getDebugMarkers() { return m_DebugMarkers.get(); }
+ osg::ref_ptr<osg::Node> getGearSprites() { return m_GearSprites.get(); }
std::string getModelPath() const { return m_ModelPath.getSource(); }
|
|
From: <de...@us...> - 2004-01-01 19:21:37
|
Update of /cvsroot/csp/APPLICATIONS/SimData/VisualStudio2003 In directory sc8-pr-cvs1:/tmp/cvs-serv22810 Modified Files: SimData.vcproj Log Message: see CHANGES.current Index: SimData.vcproj =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/SimData/VisualStudio2003/SimData.vcproj,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** SimData.vcproj 1 Jan 2004 16:17:14 -0000 1.6 --- SimData.vcproj 1 Jan 2004 19:21:33 -0000 1.7 *************** *** 26,30 **** EnableIntrinsicFunctions="TRUE" FavorSizeOrSpeed="1" ! OptimizeForProcessor="3" OptimizeForWindowsApplication="TRUE" AdditionalIncludeDirectories="../Include,$(PYTHONPATH)/include" --- 26,30 ---- EnableIntrinsicFunctions="TRUE" FavorSizeOrSpeed="1" ! OptimizeForProcessor="0" OptimizeForWindowsApplication="TRUE" AdditionalIncludeDirectories="../Include,$(PYTHONPATH)/include" *************** *** 34,38 **** BufferSecurityCheck="FALSE" EnableFunctionLevelLinking="TRUE" ! EnableEnhancedInstructionSet="1" RuntimeTypeInfo="TRUE" PrecompiledHeaderFile=".\Release/SimData.pch" --- 34,38 ---- BufferSecurityCheck="FALSE" EnableFunctionLevelLinking="TRUE" ! EnableEnhancedInstructionSet="0" RuntimeTypeInfo="TRUE" PrecompiledHeaderFile=".\Release/SimData.pch" *************** *** 390,394 **** <Tool Name="VCCustomBuildTool" ! CommandLine="C:\progra~1\SWIG-1.3.17\swig -c++ -python -noexcept -DWIN32 -I..\Include -o ..\Source\$(InputName)_wrap.cpp ..\Source\$(InputName).i" Outputs="..\Source\$(InputName)_wrap.cpp"/> </FileConfiguration> --- 390,395 ---- <Tool Name="VCCustomBuildTool" ! CommandLine="C:\progra~1\SWIG-1.3.17\swig -c++ -python -noexcept -DWIN32 -I..\Include -o ..\Source\$(InputName)_wrap.cpp ..\Source\$(InputName).i ! " Outputs="..\Source\$(InputName)_wrap.cpp"/> </FileConfiguration> *************** *** 397,401 **** <Tool Name="VCCustomBuildTool" ! CommandLine="C:\progra~1\SWIG-1.3.17\swig -c++ -python -noexcept -DWIN32 -I..\Include -o ..\Source\$(InputName)_wrap.cpp ..\Source\$(InputName).i" Outputs="..\Source\$(InputName)_wrap.cpp"/> </FileConfiguration> --- 398,403 ---- <Tool Name="VCCustomBuildTool" ! CommandLine="C:\progra~1\SWIG-1.3.17\swig -c++ -python -noexcept -DWIN32 -I..\Include -o ..\Source\$(InputName)_wrap.cpp ..\Source\$(InputName).i ! " Outputs="..\Source\$(InputName)_wrap.cpp"/> </FileConfiguration> |
|
From: <de...@us...> - 2004-01-01 16:17:36
|
Update of /cvsroot/csp/APPLICATIONS/SimData In directory sc8-pr-cvs1:/tmp/cvs-serv23801 Modified Files: CHANGES.current Log Message: see CHANGES.current Index: CHANGES.current =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/SimData/CHANGES.current,v retrieving revision 1.93 retrieving revision 1.94 diff -C2 -d -r1.93 -r1.94 *** CHANGES.current 2 Nov 2003 21:11:19 -0000 1.93 --- CHANGES.current 1 Jan 2004 16:17:32 -0000 1.94 *************** *** 1,4 **** --- 1,22 ---- Version 0.4.0 (in progress) =========================== + 2003-12-30: delta + * Added an environment variable to the project in lieu of + hardcoded Python path; windows users must have defined + PYTHONPATH variable pointing to the current Python install + dir root. + + * Removed link onto useless specific windows libs. Tweaked + the project file (release build) toward speed optimizations + (note: enabling sse2 optimizations leads to a dll loading + failed on an athlon XP2k+). + + 2003-12-25: delta + * Updated msvc 7.1 project file with a post built step + (PostBuild.bat) to install SimData and run tests. + + * Added const& qualifiers in hash string functor parameters + (inherited from stdext::hash_compare) for vs.net. + 2003-11-02: onsight * Added #include <algorithm> in InterfaceRegistry.cpp (as *************** *** 193,199 **** void MyClass::serialize(Archive& archive) { MyBaseClass::serialize(archive); ! archive(member_var1); ! archive(member_var2); ! ... } --- 211,217 ---- void MyClass::serialize(Archive& archive) { MyBaseClass::serialize(archive); ! archive(member_var1); ! archive(member_var2); ! ... } *************** *** 219,221 **** * Tagged r0_3_4, version 0_3_5 started. * Version 0.4.0 branch started. - --- 237,238 ---- |
|
From: <de...@us...> - 2004-01-01 16:17:17
|
Update of /cvsroot/csp/APPLICATIONS/SimData/VisualStudio2003 In directory sc8-pr-cvs1:/tmp/cvs-serv23745 Modified Files: SimData.vcproj Added Files: PostBuilt.bat Log Message: see CHANGES.current --- NEW FILE: PostBuilt.bat --- copy /Y cSimData.py ..\SimData cd .. setup.py make_install_win runtests.py Index: SimData.vcproj =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/SimData/VisualStudio2003/SimData.vcproj,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** SimData.vcproj 21 Oct 2003 13:45:07 -0000 1.5 --- SimData.vcproj 1 Jan 2004 16:17:14 -0000 1.6 *************** *** 21,38 **** <Tool Name="VCCLCompilerTool" ! InlineFunctionExpansion="1" ! AdditionalIncludeDirectories="../Include,C:/Python22/include" ! PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SIMDATA_EXPORTS" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" RuntimeTypeInfo="TRUE" PrecompiledHeaderFile=".\Release/SimData.pch" AssemblerListingLocation=".\Release/" ObjectFile=".\Release/" ProgramDataBaseFileName=".\Release/" WarningLevel="3" SuppressStartupBanner="TRUE" ! CompileAs="0"/> <Tool Name="VCCustomBuildTool"/> --- 21,49 ---- <Tool Name="VCCLCompilerTool" ! Optimization="3" ! GlobalOptimizations="TRUE" ! InlineFunctionExpansion="2" ! EnableIntrinsicFunctions="TRUE" ! FavorSizeOrSpeed="1" ! OptimizeForProcessor="3" ! OptimizeForWindowsApplication="TRUE" ! AdditionalIncludeDirectories="../Include,$(PYTHONPATH)/include" ! PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL;SIMDATA_EXPORTS" StringPooling="TRUE" RuntimeLibrary="2" + BufferSecurityCheck="FALSE" EnableFunctionLevelLinking="TRUE" + EnableEnhancedInstructionSet="1" RuntimeTypeInfo="TRUE" PrecompiledHeaderFile=".\Release/SimData.pch" + ExpandAttributedSource="FALSE" AssemblerListingLocation=".\Release/" ObjectFile=".\Release/" ProgramDataBaseFileName=".\Release/" + BrowseInformation="0" WarningLevel="3" SuppressStartupBanner="TRUE" ! DebugInformationFormat="0" ! CompileAs="2"/> <Tool Name="VCCustomBuildTool"/> *************** *** 40,50 **** Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" - AdditionalDependencies="odbc32.lib odbccp32.lib" OutputFile="../SimData/_cSimData.dll" LinkIncremental="1" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="C:/Python22/libs" ProgramDatabaseFile=".\Release/_cSimData.pdb" ! ImportLibrary="../SimData/_cSimData.lib"/> <Tool Name="VCMIDLTool" --- 51,66 ---- Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" OutputFile="../SimData/_cSimData.dll" LinkIncremental="1" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="$(PYTHONPATH)/Libs" ! GenerateDebugInformation="FALSE" ! AssemblyDebug="0" ProgramDatabaseFile=".\Release/_cSimData.pdb" ! GenerateMapFile="FALSE" ! MapExports="FALSE" ! MapLines="FALSE" ! ImportLibrary="../SimData/_cSimData.lib" ! TargetMachine="1"/> <Tool Name="VCMIDLTool" *************** *** 56,60 **** <Tool Name="VCPostBuildEventTool" ! CommandLine="copy /Y cSimData.py ..\SimData"/> <Tool Name="VCPreBuildEventTool"/> --- 72,76 ---- <Tool Name="VCPostBuildEventTool" ! CommandLine="PostBuilt.bat"/> <Tool Name="VCPreBuildEventTool"/> *************** *** 87,96 **** Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="../Include,C:/Python22/include" ! PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SIMDATA_EXPORTS" BasicRuntimeChecks="3" RuntimeLibrary="3" RuntimeTypeInfo="TRUE" PrecompiledHeaderFile=".\Debug/SimData.pch" AssemblerListingLocation=".\Debug/" ObjectFile=".\Debug/" --- 103,113 ---- Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="../Include,$(PYTHONPATH)/include" ! PreprocessorDefinitions="WIN32;_DEBUG;_USRDLL;SIMDATA_EXPORTS" BasicRuntimeChecks="3" RuntimeLibrary="3" RuntimeTypeInfo="TRUE" PrecompiledHeaderFile=".\Debug/SimData.pch" + ExpandAttributedSource="TRUE" AssemblerListingLocation=".\Debug/" ObjectFile=".\Debug/" *************** *** 98,102 **** WarningLevel="3" SuppressStartupBanner="TRUE" ! DebugInformationFormat="4" CompileAs="0"/> <Tool --- 115,119 ---- WarningLevel="3" SuppressStartupBanner="TRUE" ! DebugInformationFormat="3" CompileAs="0"/> <Tool *************** *** 105,113 **** Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" - AdditionalDependencies="odbc32.lib odbccp32.lib" OutputFile="../SimData/_cSimDatad.dll" LinkIncremental="2" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="C:/Python22/libs" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\Debug/_cSimDatad.pdb" --- 122,129 ---- Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" OutputFile="../SimData/_cSimDatad.dll" LinkIncremental="2" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="$(PYTHONPATH)/Libs" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\Debug/_cSimDatad.pdb" *************** *** 121,126 **** TypeLibraryName=".\Debug/SimData.tlb"/> <Tool ! Name="VCPostBuildEventTool" ! CommandLine="copy /Y cSimData.py ..\SimData"/> <Tool Name="VCPreBuildEventTool"/> --- 137,141 ---- TypeLibraryName=".\Debug/SimData.tlb"/> <Tool ! Name="VCPostBuildEventTool"/> <Tool Name="VCPreBuildEventTool"/> *************** *** 164,168 **** <Tool Name="VCCLCompilerTool" ! PreprocessorDefinitions="SWIG_GLOBAL"/> </FileConfiguration> </File> --- 179,184 ---- <Tool Name="VCCLCompilerTool" ! PreprocessorDefinitions="SWIG_GLOBAL" ! UndefinePreprocessorDefinitions="_DEBUG"/> </FileConfiguration> </File> *************** *** 334,340 **** </File> <File - RelativePath="..\Include\SimData\Pack.h"> - </File> - <File RelativePath="..\Include\SimData\Path.h"> </File> --- 350,353 ---- *************** *** 377,382 **** <Tool Name="VCCustomBuildTool" ! CommandLine="C:\progra~1\SWIG-1.3.17\swig -c++ -python -noexcept -DWIN32 -I..\Include -o ..\Source\$(InputName)_wrap.cpp ..\Source\$(InputName).i ! " Outputs="..\Source\$(InputName)_wrap.cpp"/> </FileConfiguration> --- 390,394 ---- <Tool Name="VCCustomBuildTool" ! CommandLine="C:\progra~1\SWIG-1.3.17\swig -c++ -python -noexcept -DWIN32 -I..\Include -o ..\Source\$(InputName)_wrap.cpp ..\Source\$(InputName).i" Outputs="..\Source\$(InputName)_wrap.cpp"/> </FileConfiguration> *************** *** 385,390 **** <Tool Name="VCCustomBuildTool" ! CommandLine="C:\progra~1\SWIG-1.3.17\swig -c++ -python -noexcept -DWIN32 -I..\Include -o ..\Source\$(InputName)_wrap.cpp ..\Source\$(InputName).i ! " Outputs="..\Source\$(InputName)_wrap.cpp"/> </FileConfiguration> --- 397,401 ---- <Tool Name="VCCustomBuildTool" ! CommandLine="C:\progra~1\SWIG-1.3.17\swig -c++ -python -noexcept -DWIN32 -I..\Include -o ..\Source\$(InputName)_wrap.cpp ..\Source\$(InputName).i" Outputs="..\Source\$(InputName)_wrap.cpp"/> </FileConfiguration> |
