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: <sv...@ww...> - 2007-08-27 18:28:00
|
Author: nsmoooose Date: 2007-08-27 11:27:51 -0700 (Mon, 27 Aug 2007) New Revision: 2176 Modified: branches/first_tutorial/csp/cspsim/wf/CheckBox.cpp branches/first_tutorial/csp/cspsim/wf/Container.cpp branches/first_tutorial/csp/cspsim/wf/Control.cpp branches/first_tutorial/csp/cspsim/wf/Control.h branches/first_tutorial/csp/cspsim/wf/ControlGeometryBuilder.cpp branches/first_tutorial/csp/cspsim/wf/ControlGeometryBuilder.h branches/first_tutorial/csp/cspsim/wf/ListBox.cpp branches/first_tutorial/csp/cspsim/wf/ListBoxItem.cpp branches/first_tutorial/csp/cspsim/wf/ListBoxItem.h branches/first_tutorial/csp/cspsim/wf/Serialization.cpp branches/first_tutorial/csp/cspsim/wf/SingleControlContainer.cpp branches/first_tutorial/csp/cspsim/wf/Style.cpp branches/first_tutorial/csp/cspsim/wf/Style.h branches/first_tutorial/csp/cspsim/wf/StyleBuilder.cpp branches/first_tutorial/csp/cspsim/wf/StyleBuilder.h branches/first_tutorial/csp/cspsim/wf/Tab.cpp branches/first_tutorial/csp/cspsim/wf/TableControlContainer.cpp branches/first_tutorial/csp/cspsim/wf/Window.cpp branches/first_tutorial/csp/cspsim/wf/Window.h branches/first_tutorial/csp/cspsim/wf/WindowManager.cpp Log: Changes to the csp::wf::Style object: * Converted to a class from a struct. * Now inherits from the csp::Referenced * All style members are now accessed with set and get methods. These changes makes it possible for the Style object to send signals when something change (not implemented yet). The Control that owns the style object can listen to these signals and rebuild the geometry when width, background color etc changes. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2176 Diff omitted (68442 bytes). |
|
From: <sv...@ww...> - 2007-08-24 19:47:50
|
Author: nsmoooose Date: 2007-08-24 12:47:38 -0700 (Fri, 24 Aug 2007) New Revision: 2175 Modified: branches/first_tutorial/csp/data/ui/localization/english/global.xml branches/first_tutorial/csp/data/ui/localization/german/global.xml branches/first_tutorial/csp/data/ui/localization/svenska/global.xml branches/first_tutorial/csp/data/ui/themes/default/messagebox.xml branches/first_tutorial/csp/data/ui/themes/default/styles.xml branches/first_tutorial/csp/data/ui/window_document.xsd Log: * Added missing information about left and top in window_document.xsd. * Moved some style information from a messagebox.xml file into the styles.xml document. * Added a missing translation for the tutorial. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2175 Modified: branches/first_tutorial/csp/data/ui/localization/english/global.xml =================================================================== --- branches/first_tutorial/csp/data/ui/localization/english/global.xml 2007-08-24 06:52:10 UTC (rev 2174) +++ branches/first_tutorial/csp/data/ui/localization/english/global.xml 2007-08-24 19:47:38 UTC (rev 2175) @@ -29,6 +29,7 @@ <String key="screen_resolution">Resolution</String> <String key="start_simulation">Start</String> <String key="tutorials">Tutorials</String> + <String key="tutorials_takeoff">Takeoff (F16)</String> <String key="ui_theme">Theme</String> <String key="ui_language">Language</String> </Strings> Modified: branches/first_tutorial/csp/data/ui/localization/german/global.xml =================================================================== --- branches/first_tutorial/csp/data/ui/localization/german/global.xml 2007-08-24 06:52:10 UTC (rev 2174) +++ branches/first_tutorial/csp/data/ui/localization/german/global.xml 2007-08-24 19:47:38 UTC (rev 2175) @@ -29,6 +29,7 @@ <String key="screen_resolution">Auflösung</String> <String key="start_simulation">Starten</String> <String key="tutorials">Tutorials</String> + <String key="tutorials_takeoff">Abheben (F16)</String> <String key="ui_theme">Theme</String> <String key="ui_language">Sprache</String> </Strings> Modified: branches/first_tutorial/csp/data/ui/localization/svenska/global.xml =================================================================== --- branches/first_tutorial/csp/data/ui/localization/svenska/global.xml 2007-08-24 06:52:10 UTC (rev 2174) +++ branches/first_tutorial/csp/data/ui/localization/svenska/global.xml 2007-08-24 19:47:38 UTC (rev 2175) @@ -23,12 +23,13 @@ <String key="options_userinterface">Användargränssnitt</String> <String key="pause">Paus</String> <String key="quit">Avsluta</String> - <String key="restart_required">Omstart krävs fär att ändring skall gälla.</String> + <String key="restart_required">Omstart krävs för att ändring skall gälla.</String> <String key="resume">Återgå</String> <String key="screen_resolution">Upplösning</String> <String key="singleplayer">1 spelare</String> <String key="start_simulation">Starta</String> <String key="tutorials">Handledning</String> + <String key="tutorials_takeoff">Start (F16)</String> <String key="ui_theme">Tema</String> <String key="ui_language">Språk</String> </Strings> Modified: branches/first_tutorial/csp/data/ui/themes/default/messagebox.xml =================================================================== --- branches/first_tutorial/csp/data/ui/themes/default/messagebox.xml 2007-08-24 06:52:10 UTC (rev 2174) +++ branches/first_tutorial/csp/data/ui/themes/default/messagebox.xml 2007-08-24 19:47:38 UTC (rev 2175) @@ -5,14 +5,14 @@ <StyleInclude>styles.xml</StyleInclude> <StringTableInclude>global.xml</StringTableInclude> </Includes> - <Window CssClass="window_default" SizeWidth="500" SizeHeight="200" LocationZ="50" > + <Window CssClass="messagebox" LocationZ="50" > <Control> <MultiControlContainer> <Controls> - <Label Id="caption" CssClass="window_caption" Text="Combat Simulator Project" /> + <Label Id="caption" CssClass="window_caption" Text="${csp}" /> <Label CssClass="stripe" /> - <Label Id="message" LocationX="10" LocationY="55" SizeWidth="489" SizeHeight="30" Text="Combat Simulator Project" /> + <Label Id="message" CssClass="messagebox_message" Text="Place your text here" /> <Button Id="ok" LocationX="170" LocationY="150" SizeWidth="120" SizeHeight="35" Text="OK" /> </Controls> Modified: branches/first_tutorial/csp/data/ui/themes/default/styles.xml =================================================================== --- branches/first_tutorial/csp/data/ui/themes/default/styles.xml 2007-08-24 06:52:10 UTC (rev 2174) +++ branches/first_tutorial/csp/data/ui/themes/default/styles.xml 2007-08-24 19:47:38 UTC (rev 2175) @@ -255,7 +255,27 @@ <VerticalAlign>middle</VerticalAlign> <HorizontalAlign>center</HorizontalAlign> </Style> - + + <!-- This style should be used on a standard message box. --> + <Style Name="messagebox"> + <BorderLeftWidth>10</BorderLeftWidth> + <BorderLeftColor>7b8698ff</BorderLeftColor> + <VerticalAlign>middle</VerticalAlign> + <HorizontalAlign>center</HorizontalAlign> + <Height>200</Height> + <Width>500</Width> + </Style> + + <!-- Use to place the message within a message box. --> + <Style Name="messagebox_message"> + <Left>10</Left> + <Top>55</Top> + <Height>30</Height> + <Width>489</Width> + </Style> + + <!-- This style is used on the label that represents the caption + of a window. --> <Style Name="window_caption"> <Left>10</Left> <Top>2</Top> Modified: branches/first_tutorial/csp/data/ui/window_document.xsd =================================================================== --- branches/first_tutorial/csp/data/ui/window_document.xsd 2007-08-24 06:52:10 UTC (rev 2174) +++ branches/first_tutorial/csp/data/ui/window_document.xsd 2007-08-24 19:47:38 UTC (rev 2175) @@ -74,6 +74,8 @@ <xsd:element name="Visible" type="xsd:boolean" minOccurs="0" /> + <xsd:element name="Left" type="xsd:string" minOccurs="0" /> + <xsd:element name="Top" type="xsd:string" minOccurs="0" /> <xsd:element name="Height" type="xsd:string" minOccurs="0" /> <xsd:element name="Width" type="xsd:string" minOccurs="0" /> </xsd:sequence> |
|
From: <sv...@ww...> - 2007-08-24 06:52:20
|
Author: nsmoooose Date: 2007-08-23 23:52:10 -0700 (Thu, 23 Aug 2007) New Revision: 2174 Added: branches/first_tutorial/csp/data/ui/themes/default/css_help.xml branches/first_tutorial/csp/data/ui/themes/default/css_top.xml Modified: branches/first_tutorial/csp/cspsim/wf/CheckBox.cpp branches/first_tutorial/csp/cspsim/wf/Container.h branches/first_tutorial/csp/cspsim/wf/Control.cpp branches/first_tutorial/csp/cspsim/wf/Control.h branches/first_tutorial/csp/cspsim/wf/ControlGeometryBuilder.cpp branches/first_tutorial/csp/cspsim/wf/ControlGeometryBuilder.h branches/first_tutorial/csp/cspsim/wf/Image.h branches/first_tutorial/csp/cspsim/wf/Label.h branches/first_tutorial/csp/cspsim/wf/ListBox.cpp branches/first_tutorial/csp/cspsim/wf/ListBox.h branches/first_tutorial/csp/cspsim/wf/ListBoxItem.cpp branches/first_tutorial/csp/cspsim/wf/ListBoxItem.h branches/first_tutorial/csp/cspsim/wf/ResourceLocator.h branches/first_tutorial/csp/cspsim/wf/Serialization.cpp branches/first_tutorial/csp/cspsim/wf/SingleControlContainer.cpp branches/first_tutorial/csp/cspsim/wf/Style.h branches/first_tutorial/csp/cspsim/wf/StyleBuilder.cpp branches/first_tutorial/csp/cspsim/wf/StyleBuilder.h branches/first_tutorial/csp/cspsim/wf/Tab.cpp branches/first_tutorial/csp/cspsim/wf/TableControlContainer.cpp branches/first_tutorial/csp/cspsim/wf/Window.cpp branches/first_tutorial/csp/cspsim/wf/Window.h branches/first_tutorial/csp/cspsim/wf/WindowManager.cpp branches/first_tutorial/csp/data/ui/help/aircraft_controls.xml branches/first_tutorial/csp/data/ui/help/f16_first_steps.xml branches/first_tutorial/csp/data/ui/help/index.xml branches/first_tutorial/csp/data/ui/help/joystick.xml branches/first_tutorial/csp/data/ui/help/mouse.xml branches/first_tutorial/csp/data/ui/help/view_controls.xml branches/first_tutorial/csp/data/ui/library/index.xml branches/first_tutorial/csp/data/ui/themes/default/messagebox.xml branches/first_tutorial/csp/data/ui/themes/default/options.xml branches/first_tutorial/csp/data/ui/themes/default/pause.xml branches/first_tutorial/csp/data/ui/themes/default/quit_resume.xml branches/first_tutorial/csp/data/ui/themes/default/styles.xml branches/first_tutorial/csp/data/ui/themes/default/topmenu.xml branches/first_tutorial/csp/data/ui/tutorials/index.xml branches/first_tutorial/csp/data/ui/tutorials/takeoff/help.xml branches/first_tutorial/csp/data/ui/tutorials/takeoff/mission.xml Log: Changes to the window framework: * Height, width, top and left can now be placed in the css document. * Height, width, top and left can be set with percentage. For example 30% width. * Removed some common width, height and position from window xml files and placed them in css document. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2174 Diff omitted (64880 bytes). |
|
From: <sv...@ww...> - 2007-08-16 22:41:36
|
Author: nsmoooose Date: 2007-08-16 15:41:29 -0700 (Thu, 16 Aug 2007) New Revision: 2173 Added: branches/first_tutorial/csp/cspsim/wf/Style.cpp Modified: branches/first_tutorial/csp/cspsim/SConscript branches/first_tutorial/csp/cspsim/wf/Style.h branches/first_tutorial/csp/cspsim/wf/StyleBuilder.cpp branches/first_tutorial/csp/cspsim/wf/StyleBuilder.h branches/first_tutorial/csp/data/ui/window_document.xsd Log: * Added width and height to the Style object. * The style object now uses the serialize method when comparing style objects. * The StyleBuilder class is also using the serialize method to build the new style object. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2173 Diff omitted (10759 bytes). |
|
From: <sv...@ww...> - 2007-08-14 18:30:15
|
Author: nsmoooose Date: 2007-08-14 11:30:05 -0700 (Tue, 14 Aug 2007) New Revision: 2172 Modified: branches/first_tutorial/csp/data/ui/themes/default/styles.xml branches/first_tutorial/csp/data/ui/tutorials/takeoff/help.xml Log: Adjusted positions of tutorial images and added the tutorial name to the help page. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2172 Modified: branches/first_tutorial/csp/data/ui/themes/default/styles.xml =================================================================== --- branches/first_tutorial/csp/data/ui/themes/default/styles.xml 2007-08-13 23:15:47 UTC (rev 2171) +++ branches/first_tutorial/csp/data/ui/themes/default/styles.xml 2007-08-14 18:30:05 UTC (rev 2172) @@ -240,6 +240,13 @@ <BackgroundColor>fdfdfdff</BackgroundColor> <BorderBottomWidth>1</BorderBottomWidth> <BorderLeftWidth>1</BorderLeftWidth> + </Style> + + <Style Name="tutorial_help"> + <BorderLeftWidth>10</BorderLeftWidth> + <BorderLeftColor>7b8698ff</BorderLeftColor> + <VerticalAlign>middle</VerticalAlign> + <HorizontalAlign>right</HorizontalAlign> </Style> </NamedStyles> </StyleDocument> Modified: branches/first_tutorial/csp/data/ui/tutorials/takeoff/help.xml =================================================================== --- branches/first_tutorial/csp/data/ui/tutorials/takeoff/help.xml 2007-08-13 23:15:47 UTC (rev 2171) +++ branches/first_tutorial/csp/data/ui/tutorials/takeoff/help.xml 2007-08-14 18:30:05 UTC (rev 2172) @@ -4,63 +4,63 @@ <!-- This include will set the default behaviour on all controls. --> <StyleInclude>styles.xml</StyleInclude> <StringTableInclude>global.xml</StringTableInclude> - </Includes> - <Window CssClass="help" LocationZ="-10" SizeWidth="300" SizeHeight="700"> - <Style> - <HorizontalAlign>right</HorizontalAlign> - </Style> + </Includes> + <Window CssClass="tutorial_help" LocationZ="-20" SizeWidth="300" SizeHeight="700"> <Control> <MultiControlContainer> <Controls> - <Label LocationX="20" LocationY="10" SizeWidth="270" SizeHeight="100"> + <Label LocationX="10" LocationY="2" SizeWidth="278" SizeHeight="30" Text="${tutorials_takeoff}" /> + <Label CssClass="stripe" LocationX="0" LocationY="35" SizeWidth="289" SizeHeight="10" /> + + <Label LocationX="10" LocationY="60" SizeWidth="270" SizeHeight="100"> <Style> <TextVerticalAlign>top</TextVerticalAlign> <TextHorizontalAlign>left</TextHorizontalAlign> </Style> - <Text>* Increase throttle to full afterburner. + <Text>1. Increase throttle to full afterburner. -* Pitch up the nose when you reach 150 kts. +2. Pitch up the nose when you reach 150 kts. -* Raise landing gear when you are in the air.</Text> +3. Raise landing gear when you are in the air.</Text> </Label> <!-- Increase / decrease throttle --> - <Image LocationX="20" LocationY="150" SizeHeight="32" SizeWidth="32"> + <Image LocationX="10" LocationY="190" SizeHeight="32" SizeWidth="32"> <Style> <BackgroundColor>ffffffff</BackgroundColor> <BackgroundImage>images/input-keyboard-button-equals.png</BackgroundImage> </Style> </Image> - <Label LocationX="60" LocationY="150" SizeHeight="32" SizeWidth="220" Text="Hold to increase throttle" /> - <Image LocationX="20" LocationY="190" SizeHeight="32" SizeWidth="32"> + <Label LocationX="50" LocationY="190" SizeHeight="32" SizeWidth="220" Text="Hold to increase throttle" /> + <Image LocationX="10" LocationY="230" SizeHeight="32" SizeWidth="32"> <Style> <BackgroundColor>ffffffff</BackgroundColor> <BackgroundImage>images/input-keyboard-button-minus.png</BackgroundImage> </Style> </Image> - <Label LocationX="60" LocationY="190" SizeHeight="32" SizeWidth="220" Text="Hold to decrease throttle" /> + <Label LocationX="50" LocationY="230" SizeHeight="32" SizeWidth="220" Text="Hold to decrease throttle" /> <!-- Pitch up the nose. --> - <Image LocationX="20" LocationY="230" SizeHeight="32" SizeWidth="32"> + <Image LocationX="10" LocationY="270" SizeHeight="32" SizeWidth="32"> <Style> <BackgroundColor>ffffffff</BackgroundColor> <BackgroundImage>images/input-keyboard-button-arrowup.png</BackgroundImage> </Style> </Image> - <Label LocationX="60" LocationY="230" SizeHeight="32" SizeWidth="220" Text="Pitch up the nose" /> + <Label LocationX="50" LocationY="270" SizeHeight="32" SizeWidth="220" Text="Pitch up the nose" /> <!-- Raise / lower landing gear. --> - <Image LocationX="20" LocationY="270" SizeHeight="32" SizeWidth="32"> + <Image LocationX="10" LocationY="310" SizeHeight="32" SizeWidth="32"> <Style> <BackgroundColor>ffffffff</BackgroundColor> <BackgroundImage>images/input-keyboard-button-g.png</BackgroundImage> </Style> </Image> - <Label LocationX="60" LocationY="270" SizeHeight="32" SizeWidth="220" Text="Raise / lower landing gear" /> + <Label LocationX="50" LocationY="310" SizeHeight="32" SizeWidth="220" Text="Raise / lower landing gear" /> <!-- Airspeed indicator --> - <Label LocationX="20" LocationY="310" SizeHeight="32" SizeWidth="220" Text="Airspeed indicator on HUD" /> - <Image LocationX="40" LocationY="340" SizeHeight="151" SizeWidth="151"> + <Label LocationX="10" LocationY="350" SizeHeight="32" SizeWidth="220" Text="Airspeed indicator on HUD" /> + <Image LocationX="30" LocationY="380" SizeHeight="151" SizeWidth="151"> <Style> <BackgroundColor>ffffffff</BackgroundColor> <BackgroundImage>tutorials/takeoff/takeoff_speed.png</BackgroundImage> @@ -69,5 +69,7 @@ </Controls> </MultiControlContainer> </Control> + <Styles> + </Styles> </Window> </WindowDocument> |
|
From: <sv...@ww...> - 2007-08-13 23:15:57
|
Author: nsmoooose Date: 2007-08-13 16:15:47 -0700 (Mon, 13 Aug 2007) New Revision: 2171 Added: branches/first_tutorial/csp/data/ui/themes/default/images/input-keyboard-button-arrowup.png branches/first_tutorial/csp/data/ui/themes/default/images/input-keyboard-button-arrowup.svg branches/first_tutorial/csp/data/ui/themes/default/images/input-keyboard-button-g.png branches/first_tutorial/csp/data/ui/themes/default/images/input-keyboard-button-minus.png Modified: branches/first_tutorial/csp/cspsim/GameScreen.cpp branches/first_tutorial/csp/data/ui/themes/default/styles.xml branches/first_tutorial/csp/data/ui/tutorials/takeoff/help.xml branches/first_tutorial/csp/data/ui/tutorials/takeoff/takeoff.py Log: * General and object statistics isn't displayed as default. They are still available using F12 key. * Added images and text for the first tutorial. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2171 Diff omitted (22675 bytes). |
|
From: <sv...@ww...> - 2007-08-13 21:14:32
|
Author: nsmoooose Date: 2007-08-13 14:14:20 -0700 (Mon, 13 Aug 2007) New Revision: 2170 Added: branches/first_tutorial/csp/data/ui/tutorials/ branches/first_tutorial/csp/data/ui/tutorials/__init__.py branches/first_tutorial/csp/data/ui/tutorials/index.xml branches/first_tutorial/csp/data/ui/tutorials/takeoff/ branches/first_tutorial/csp/data/ui/tutorials/takeoff/__init__.py branches/first_tutorial/csp/data/ui/tutorials/takeoff/help.xml branches/first_tutorial/csp/data/ui/tutorials/takeoff/mission.xml branches/first_tutorial/csp/data/ui/tutorials/takeoff/takeoff.py branches/first_tutorial/csp/data/ui/tutorials/takeoff/takeoff_speed.png Log: Added takeoff tutorial mission Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2170 Added: branches/first_tutorial/csp/data/ui/tutorials/__init__.py =================================================================== Added: branches/first_tutorial/csp/data/ui/tutorials/index.xml =================================================================== --- branches/first_tutorial/csp/data/ui/tutorials/index.xml (rev 0) +++ branches/first_tutorial/csp/data/ui/tutorials/index.xml 2007-08-13 21:14:20 UTC (rev 2170) @@ -0,0 +1,29 @@ +<?xml version="1.0"?> +<WindowDocument xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation='../window_document.xsd'> + <Includes> + <!-- This include will set the default behaviour on all controls. --> + <StyleInclude>styles.xml</StyleInclude> + <StringTableInclude>global.xml</StringTableInclude> + </Includes> + <Window LocationZ="10" CssClass="help" SizeWidth="900" SizeHeight="650"> + <Control> + <MultiControlContainer> + <Controls> + <Button Id="close" CssClass="close_button" SizeHeight="32" SizeWidth="32" /> + <Label LocationX="10" LocationY="2" SizeWidth="569" SizeHeight="30" Text="${tutorials}" /> + <Label CssClass="stripe" LocationX="0" LocationY="35" SizeWidth="889" SizeHeight="10" /> + <ListBox Id="missions" LocationX="10" LocationY="55" SizeWidth="150" SizeHeight="585" /> + <Label LocationX="170" LocationY="55" SizeWidth="709" SizeHeight="40" Text="${tutorials}" CssClass="heading" /> + <Label LocationX="170" LocationY="95" SizeWidth="709" SizeHeight="505" CssClass="multiline"> + <Text> + Select a tutorial from the list to the left. + </Text> + </Label> + <Button Id="start" Text="${start_simulation}" + LocationX="760" LocationY="600" SizeWidth="120" + SizeHeight="40" Enabled="false" /> + </Controls> + </MultiControlContainer> + </Control> + </Window> +</WindowDocument> Added: branches/first_tutorial/csp/data/ui/tutorials/takeoff/__init__.py =================================================================== Added: branches/first_tutorial/csp/data/ui/tutorials/takeoff/help.xml =================================================================== --- branches/first_tutorial/csp/data/ui/tutorials/takeoff/help.xml (rev 0) +++ branches/first_tutorial/csp/data/ui/tutorials/takeoff/help.xml 2007-08-13 21:14:20 UTC (rev 2170) @@ -0,0 +1,26 @@ +<?xml version="1.0"?> +<WindowDocument xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation='../../window_document.xsd'> + <Includes> + <!-- This include will set the default behaviour on all controls. --> + <StyleInclude>styles.xml</StyleInclude> + <StringTableInclude>global.xml</StringTableInclude> + </Includes> + <Window CssClass="help" LocationZ="-10" SizeWidth="300" SizeHeight="700"> + <Style> + <HorizontalAlign>right</HorizontalAlign> + </Style> + <Control> + <MultiControlContainer> + <Controls> + <Image SizeHeight="151" SizeWidth="151"> + <Style> + <BackgroundColor>ffffffff</BackgroundColor> + <BackgroundImage>tutorials/takeoff/takeoff_speed.png</BackgroundImage> + </Style> + </Image> + <Label Text="Increase throttle to.." /> + </Controls> + </MultiControlContainer> + </Control> + </Window> +</WindowDocument> Added: branches/first_tutorial/csp/data/ui/tutorials/takeoff/mission.xml =================================================================== --- branches/first_tutorial/csp/data/ui/tutorials/takeoff/mission.xml (rev 0) +++ branches/first_tutorial/csp/data/ui/tutorials/takeoff/mission.xml 2007-08-13 21:14:20 UTC (rev 2170) @@ -0,0 +1,29 @@ +<?xml version="1.0"?> +<WindowDocument xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation='../window_document.xsd'> + <Includes> + <!-- This include will set the default behaviour on all controls. --> + <StyleInclude>styles.xml</StyleInclude> + <StringTableInclude>global.xml</StringTableInclude> + </Includes> + <Window LocationZ="10" CssClass="help" SizeWidth="900" SizeHeight="650"> + <Control> + <MultiControlContainer> + <Controls> + <Button Id="close" CssClass="close_button" SizeHeight="32" SizeWidth="32" /> + <Label LocationX="10" LocationY="2" SizeWidth="569" SizeHeight="30" Text="${tutorials}" /> + <Label CssClass="stripe" LocationX="0" LocationY="35" SizeWidth="889" SizeHeight="10" /> + <ListBox Id="missions" LocationX="10" LocationY="55" SizeWidth="150" SizeHeight="585" /> + <Label LocationX="170" LocationY="55" SizeWidth="709" SizeHeight="40" CssClass="heading" Text="${tutorials_takeoff}" /> + <Label LocationX="170" LocationY="95" SizeWidth="709" SizeHeight="505" CssClass="multiline"> + <Text> + The first flying lesson with a F16. You will learn some basic skills of this simulator and to take off. + </Text> + </Label> + <Button Id="start" Text="${start_simulation}" + LocationX="760" LocationY="600" SizeWidth="120" + SizeHeight="40" /> + </Controls> + </MultiControlContainer> + </Control> + </Window> +</WindowDocument> Added: branches/first_tutorial/csp/data/ui/tutorials/takeoff/takeoff.py =================================================================== --- branches/first_tutorial/csp/data/ui/tutorials/takeoff/takeoff.py (rev 0) +++ branches/first_tutorial/csp/data/ui/tutorials/takeoff/takeoff.py 2007-08-13 21:14:20 UTC (rev 2170) @@ -0,0 +1,90 @@ +#!/usr/bin/python + +# Combat Simulator Project +# Copyright (C) 2002-2005 The Combat Simulator Project +# http://csp.sourceforge.net +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +""" +Combat Simulator Project : Take off script +""" + +import csp.cspsim +from csp.data.ui.scripts.gamescreenmanager import GameScreenManager +from csp.data.ui.scripts.utils import SlotManager + +class Mission: + def __init__(self, cspsim): + self.cspsim = cspsim + + def name(self): + # Provides a name to the mission. + return "No name set" + + def theatre(self): + # Informs about what theatre to load. + return "No theatre set" + + def startMission(self): + currentScreen = self.cspsim.getCurrentScreen() + windowManager = currentScreen.getWindowManager() + windowManager.closeAll() + self.cspsim.displayLogoScreen() + self.cspsim.loadSimulation() + + self.modifyTheatreForMission() + gameScreenManager = GameScreenManager(self.cspsim) + + self.onStart() + + def modifyTheatreForMission(self): + return + + def onStart(self): + return + + +class TakeOff(Mission): + def __init__(self, cspsim): + Mission.__init__(self, cspsim) + + def startMission(self): + Mission.startMission(self) + + def modifyTheatreForMission(self): + # We add a single aircraft at the airport. + vec = csp.csplib.Vector3 + f16dj = "sim:vehicles.aircraft.f16dj" + self.cspsim.createVehicle(f16dj, vec(-29495, -10530, 91.3), vec(0, 0, 0), vec(0.0, 0.0, 180.0)) + + # Set the date and time. We want daylight for the first mission. + date = csp.csplib.SimDate(2007,6,12,10,0,0) + self.cspsim.setCurrentTime(date) + + def onStart(self): + currentScreen = self.cspsim.getCurrentScreen() + windowManager = currentScreen.getWindowManager() + + print('Hej') + window = csp.cspsim.Window() + print('Hej') + serializer = csp.cspsim.Serialization() + print('Hej') + serializer.load(window, 'tutorials/takeoff/help.xml') + print('Hej') + windowManager.show(window) + print('Hej') + \ No newline at end of file Added: branches/first_tutorial/csp/data/ui/tutorials/takeoff/takeoff_speed.png =================================================================== (Binary files differ) Property changes on: branches/first_tutorial/csp/data/ui/tutorials/takeoff/takeoff_speed.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream |
|
From: <sv...@ww...> - 2007-08-12 08:13:56
|
Author: mkrose Date: 2007-08-12 01:13:48 -0700 (Sun, 12 Aug 2007) New Revision: 2169 Modified: trunk/csp/cspsim/test/test_PhysicsModel.cpp Log: Test time dependenent inertia for a spinning body. Changes to inertia are made between timesteps such that angular velocity remains constant. This covers the common case of stores release, for which angular momentum of the primary vehicle is not conserved, but neglects internal configuration changes such as fuel redistribution and variable geometry. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2169 Modified: trunk/csp/cspsim/test/test_PhysicsModel.cpp =================================================================== --- trunk/csp/cspsim/test/test_PhysicsModel.cpp 2007-08-10 12:46:55 UTC (rev 2168) +++ trunk/csp/cspsim/test/test_PhysicsModel.cpp 2007-08-12 08:13:48 UTC (rev 2169) @@ -315,6 +315,49 @@ CSP_EXPECT_FEQ(0, vdiff(object->angularVelocity(), Vector3(1, 2, 3))); } + CSP_TESTCASE(ForceFreeTop) { + // force free motion of a symmetric top, with I3 / I12 = sqrt(7) / 2. + object->setInertia(Matrix3(1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.5 * sqrt(7))); + // w(0) is 30 degrees from z, in the x-z plane. + object->setAngularVelocity(Vector3(0.5, 0, 1) * sqrt(5)); + // w should precess about z with angular frequency omega, and |w| + // should remain constant. + double omega = (0.5 * sqrt(7) - 1.0) * sqrt(5); + + const double dt = 5.0 / 1000.0; + double t = 0.0; + for (int i = 0; i < 1000; ++i) { + physics->doSimStep(dt); t += dt; + Vector3 w = object->angularVelocityBody(); + double phase = atan2(w.y(), w.x()); + CSP_ENSURE_GT(0.00001, fabs(fmod(phase - omega * t, 2*PI))); + CSP_ENSURE_GT(0.00001, fabs(w.z() - sqrt(5))); + } + } + + CSP_TESTCASE(ScratchSpin) { + object->setInertia(Matrix3(1, 0, 0, 0, 1, 0, 0, 0, 1)); + object->setAngularVelocity(Vector3(0, 0, 1)); + + // force-free spin, with decreasing moment of inertia. angular + // momentum should decrease as well, since PhysicsModel treats all + // inertia changes as external (i.e., as a result of shedding or + // gaining mass as opposed to internal reconfigurations of mass). this + // is appropriate, for example, to the release of external stores, but + // not correct for mass reconfigurations such as fuel redistribution or + // geometry changes. the latter are effects tend to be small compared + // to typical forces, and are thus neglected in the simulation. + + const double dt = 5.0 / 1000.0; + double t = 0.0; + for (int i = 0; i < 1000; ++i) { + double Iz = 1.0 / (1.0 + t); // Iz reduction over time. + object->setInertia(Matrix3(1, 0, 0, 0, 1, 0, 0, 0, Iz)); + physics->doSimStep(dt); t += dt; + CSP_ENSURE_GT(0.00001, vdiff(object->angularVelocity(), Vector3(0, 0, 1))); + } + } + private: Ref<PhysicsModel> physics; Ref<SystemsModel> systems; |
Author: kondzik Date: 2007-08-10 05:46:55 -0700 (Fri, 10 Aug 2007) New Revision: 2168 Added: trunk/csp/cspsim/stores/FuelTank.cpp trunk/csp/cspsim/stores/FuelTank.h trunk/csp/cspsim/stores/Hardpoint.cpp trunk/csp/cspsim/stores/Hardpoint.h trunk/csp/cspsim/stores/Missile.cpp trunk/csp/cspsim/stores/Missile.h trunk/csp/cspsim/stores/Rack.cpp trunk/csp/cspsim/stores/Rack.h trunk/csp/data/models/stores/f16/lau129.osg trunk/csp/data/models/stores/missiles/agm65a/ trunk/csp/data/models/stores/missiles/agm65a/agm65a.osg trunk/csp/data/xml/stores/missiles/agm65a.xml trunk/csp/data/xml/stores/racks/f16/lau129.xml trunk/csp/tools/hid/maps/tr-jf2.map Modified: trunk/csp/cspsim/FuelManagementSystem.cpp trunk/csp/cspsim/SConscript trunk/csp/cspsim/stores/DragProfile.cpp trunk/csp/cspsim/stores/DragProfile.h trunk/csp/cspsim/stores/Projectile.cpp trunk/csp/cspsim/stores/Projectile.h trunk/csp/cspsim/stores/Stores.cpp trunk/csp/cspsim/stores/Stores.h trunk/csp/cspsim/stores/StoresDatabase.cpp trunk/csp/cspsim/stores/StoresDatabase.h trunk/csp/cspsim/stores/StoresDefinition.cpp trunk/csp/cspsim/stores/StoresDefinition.h trunk/csp/cspsim/stores/StoresDynamics.h trunk/csp/cspsim/stores/StoresManagementSystem.cpp trunk/csp/cspsim/stores/StoresManagementSystem.h trunk/csp/data/xml/stores/missiles/aim9.xml trunk/csp/data/xml/stores/racks/f16/wingfuel.xml trunk/csp/data/xml/vehicles/aircraft/f16/sms.xml Log: Splitted up cspsim/stores/Stores.h into multiple headers/sources Added hid map for Tracer Jet Force V2 (5 axis, 12 buttons) Added temporary model for lau129 launcher and agm65a maverick Added two new hardpoints to f16 sms.xml (HP3 and HP7) Data in wingfuel.xml modified for testing purposes of new launcher and missile. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2168 Diff omitted (655874 bytes). |
|
From: <sv...@ww...> - 2007-08-09 06:43:34
|
Author: nsmoooose Date: 2007-08-08 23:43:27 -0700 (Wed, 08 Aug 2007) New Revision: 2167 Added: branches/first_tutorial/csp/data/ui/scripts/windows/tutorials.py branches/first_tutorial/csp/data/ui/themes/default/images/input-keyboard-button-a.png branches/first_tutorial/csp/data/ui/themes/default/images/input-keyboard-button-equals.png branches/first_tutorial/csp/data/ui/themes/default/images/input-keyboard-button.svg Log: Added missing images and python scripts that is going to be used by the tutorial. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2167 Diff omitted (18972 bytes). |
Author: nsmoooose Date: 2007-08-08 23:26:01 -0700 (Wed, 08 Aug 2007) New Revision: 2166 Added: branches/first_tutorial/ Removed: branches/first_tutorial/csp/data/ui/themes/default/images/Thumbs.db Modified: branches/first_tutorial/csp/bin/sim.ini branches/first_tutorial/csp/cspsim/CSPSim.cpp branches/first_tutorial/csp/cspsim/CSPSim.h branches/first_tutorial/csp/cspsim/swig/CSPSim.i branches/first_tutorial/csp/cspsim/wf/ControlGeometryBuilder.cpp branches/first_tutorial/csp/cspsim/wf/Label.cpp branches/first_tutorial/csp/cspsim/wf/Label.h branches/first_tutorial/csp/cspsim/wf/ListBoxItem.cpp branches/first_tutorial/csp/cspsim/wf/Style.h branches/first_tutorial/csp/cspsim/wf/StyleBuilder.cpp branches/first_tutorial/csp/data/ui/help/aircraft_controls.xml branches/first_tutorial/csp/data/ui/help/f16_first_steps.xml branches/first_tutorial/csp/data/ui/help/index.xml branches/first_tutorial/csp/data/ui/help/joystick.xml branches/first_tutorial/csp/data/ui/help/mouse.xml branches/first_tutorial/csp/data/ui/help/view_controls.xml branches/first_tutorial/csp/data/ui/localization/english/global.xml branches/first_tutorial/csp/data/ui/localization/german/global.xml branches/first_tutorial/csp/data/ui/localization/svenska/global.xml branches/first_tutorial/csp/data/ui/scripts/gamescreenmanager.py branches/first_tutorial/csp/data/ui/scripts/windows/mainmenu.py branches/first_tutorial/csp/data/ui/themes/default/main_menu.xml branches/first_tutorial/csp/data/ui/themes/default/options.xml branches/first_tutorial/csp/data/ui/themes/default/styles.xml branches/first_tutorial/csp/data/ui/window_document.xsd branches/first_tutorial/csp/tools/hid/maps/aircraft-core.map Log: A branch for the development of a first tutorial (takeoff) Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2166 Diff omitted (35945 bytes). |
|
From: <sv...@ww...> - 2007-08-07 05:27:11
|
Author: mkrose Date: 2007-08-06 22:27:03 -0700 (Mon, 06 Aug 2007) New Revision: 2165 Modified: branches/curvature/ Log: Initialized merge tracking via "svnmerge" with revisions "1-2163" from https://solo/svn/csp/trunk Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2165 Property changes on: branches/curvature ___________________________________________________________________ Name: svnmerge-integrated + /trunk:1-2163 |
|
From: <sv...@ww...> - 2007-08-07 05:22:51
|
Author: mkrose Date: 2007-08-06 22:22:41 -0700 (Mon, 06 Aug 2007) New Revision: 2164 Added: branches/curvature/ Log: Create a new branch to experiment with converting from a flat earth model to a spherical earth model. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2164 Copied: branches/curvature (from rev 2163, trunk) |
Author: nsmoooose Date: 2007-08-01 00:02:24 -0700 (Wed, 01 Aug 2007) New Revision: 2163 Removed: trunk/csp/cspsim/wf/TabPage.cpp trunk/csp/cspsim/wf/TabPage.h Modified: trunk/csp/cspsim/SConscript trunk/csp/cspsim/wf/ControlGeometryBuilder.cpp trunk/csp/cspsim/wf/ControlGeometryBuilder.h trunk/csp/cspsim/wf/ListBoxItem.cpp trunk/csp/cspsim/wf/Tab.cpp trunk/csp/cspsim/wf/Tab.h trunk/csp/data/ui/help/aircraft_controls.xml trunk/csp/data/ui/localization/english/global.xml trunk/csp/data/ui/localization/german/global.xml trunk/csp/data/ui/localization/svenska/global.xml trunk/csp/data/ui/themes/default/desktop.xml trunk/csp/data/ui/themes/default/options.xml trunk/csp/data/ui/themes/default/styles.xml Log: Fixed the tab control implementation that has been broken for some time. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2163 Diff omitted (36585 bytes). |
|
From: <sv...@ww...> - 2007-07-31 06:44:49
|
Author: mkrose Date: 2007-07-30 23:43:40 -0700 (Mon, 30 Jul 2007) New Revision: 2162 Modified: trunk/csp/SConstruct trunk/csp/tools/build/registry.py Log: Register runtests and dir.runtests as scons aliases so that they can be used when calling 'scons -u' from a subdirectory. Add a directory runtests example to the build help message. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2162 Modified: trunk/csp/SConstruct =================================================================== --- trunk/csp/SConstruct 2007-07-31 06:42:27 UTC (rev 2161) +++ trunk/csp/SConstruct 2007-07-31 06:43:40 UTC (rev 2162) @@ -109,12 +109,13 @@ """ COMMON TARGETS: - scons config check for necessary headers and libraries - scons all build everything - scons cspsim build the main flight simulator client - scons indexserver build the master server needed for multiplayer - scons dox generate doxygen documentation - scons runtests build and run all unittests + scons config check for necessary headers and libraries + scons all build everything + scons cspsim build the main flight simulator client + scons indexserver build the master server needed for multiplayer + scons dox generate doxygen documentation + scons runtests build and run all unittests + scons csplib.runtests build and run all unittests in csplib """ INCLUDE = ['#/..', build.GetPythonInclude()] Modified: trunk/csp/tools/build/registry.py =================================================================== --- trunk/csp/tools/build/registry.py 2007-07-31 06:42:27 UTC (rev 2161) +++ trunk/csp/tools/build/registry.py 2007-07-31 06:43:40 UTC (rev 2162) @@ -127,10 +127,11 @@ self._dir_tests[target._path] = [] self._dir_tests[target._path].append(object) run_alias = os.path.join(target._path, target._name) + '.run' - env.Command(run_alias, object, util.SilentAction(self._RunOneTest)) - env.Command('runtests', self._tests, util.SilentAction(self._RunTests)) + env.Alias(run_alias, env.Command(run_alias, object, util.SilentAction(self._RunOneTest))) + env.Alias('runtests', env.Command('runtests', self._tests, util.SilentAction(self._RunTests))) for path, targets in self._dir_tests.items(): - env.Command(path + '.runtests', targets, util.SilentAction(self._RunTests)) + alias = path + '.runtests' + env.Alias(alias, env.Command(alias, targets, util.SilentAction(self._RunTests))) # sample aliases for running tests: # $ scons runtests # $ scons cspsim.runtests |
|
From: <sv...@ww...> - 2007-07-31 06:43:37
|
Author: mkrose Date: 2007-07-30 23:42:27 -0700 (Mon, 30 Jul 2007) New Revision: 2161 Modified: trunk/csp/tools/runtests.py Log: Simplify runtests.py tool and add a usage message to indicate that scons should be used instead to build and run tests. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2161 Modified: trunk/csp/tools/runtests.py =================================================================== --- trunk/csp/tools/runtests.py 2007-07-31 06:09:18 UTC (rev 2160) +++ trunk/csp/tools/runtests.py 2007-07-31 06:42:27 UTC (rev 2161) @@ -23,10 +23,6 @@ import os import sys -MODULES = [ - 'csplib/.bin/csplib_tests', -] - try: import csp os.environ.setdefault('CSPLOG_FILE', os.path.join(csp.dir, '.testlog')) @@ -36,17 +32,7 @@ print 'bootstrap module has been installed. See README for details.' sys.exit(0) - def LoadOneModule(path): - # this code is not very portable (e.g., .sl on hpux); prefer 'scons runtests' - if sys.platform.startswith('win'): - pre = '' - ext = '.dll' - else: - pre = 'lib' - ext = '.so' - lib = pre + os.path.basename(path) + ext - path = os.path.join(csp.dir, os.path.dirname(path), lib) if not csp.csplib.TestRegistry.loadTestModule(path): print 'Unable to load test module "%s". Check that it has been built.' % path sys.exit(0) @@ -55,15 +41,15 @@ for module in modules: LoadOneModule(module) -def runall(): - LoadModules(MODULES) - csp.csplib.TestRegistry.runAll() - if __name__ == '__main__': - LoadModules(MODULES) if len(sys.argv) > 1: - for path in sys.argv[1:]: - csp.csplib.TestRegistry.runOnePath(path) - else: + LoadModules(sys.argv[1:]) csp.csplib.TestRegistry.runAll() + else: + print 'A simple utility to run CSP test modules manually.' + print + print 'Note that scons is generally a better tool for running tests (e.g.,' + print 'use "scons runtests" to build and run all tests).' + print + print 'Usage: %s test_module [test_module ...]' % sys.argv[0] |
|
From: <sv...@ww...> - 2007-07-31 06:10:28
|
Author: mkrose Date: 2007-07-30 23:09:18 -0700 (Mon, 30 Jul 2007) New Revision: 2160 Modified: trunk/csp/tools/svn/subcmd.py Log: Adjust subset diff output to work with newer versions of konqueror and python. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2160 Modified: trunk/csp/tools/svn/subcmd.py =================================================================== --- trunk/csp/tools/svn/subcmd.py 2007-07-31 06:07:30 UTC (rev 2159) +++ trunk/csp/tools/svn/subcmd.py 2007-07-31 06:09:18 UTC (rev 2160) @@ -430,7 +430,7 @@ if makeindex: diffindex = os.path.join(tmproot, 'index.html') index = open(diffindex, 'w') - index.write('<html><body><small>\n') + index.write('<html><head><meta http-equiv="Content-Type" content="text/html;charset=utf-8"/></head><body><small>\n') if cs: index.write('<h3>Changeset %s</h3>\n' % cs.name()) index.write('<i>Created on: %s</i><p/>' % cs.date()) @@ -445,7 +445,8 @@ if info is not None: index.write('<p/><i>Submitted by: %s<br/>\n' % info.author) index.write('Submitted on: %s</i><p/>\n' % info.date) - index.write('%s\n' % str(info.msg).replace('\n', '<br/>\n')) + index.write(info.msg.text.replace('\n', '<br/>\n').encode('utf-8')) + index.write('\n') cleanup.append(diffindex) if revision: index.write('<b>diff to revision %s</b>' % revision) |
|
From: <sv...@ww...> - 2007-07-31 06:08:42
|
Author: mkrose Date: 2007-07-30 23:07:30 -0700 (Mon, 30 Jul 2007) New Revision: 2159 Modified: trunk/csp/cspsim/AnimationSequence.cpp trunk/csp/cspsim/AnimationSequence.h trunk/csp/cspsim/LandingGear.cpp trunk/csp/data/xml/vehicles/aircraft/f16/gear.xml Log: Minor fixes to the landing gear simulation related to wheel hop and retraction animation. The main gear animation should work correctly, without discontinuities, when the gear is raised immediately after takeoff. Also increase the damping coeff. of the F16 main gear. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2159 Modified: trunk/csp/cspsim/AnimationSequence.cpp =================================================================== --- trunk/csp/cspsim/AnimationSequence.cpp 2007-07-30 06:43:48 UTC (rev 2158) +++ trunk/csp/cspsim/AnimationSequence.cpp 2007-07-31 06:07:30 UTC (rev 2159) @@ -91,12 +91,9 @@ update(); } -void SharedSequence::update(bool force) { - const double value = b_SequenceKey->value(); - if (force || (value >= m_InitialKey && value <= m_FinalKey)) { - if (b_NormalizedKey.valid()) b_NormalizedKey->value() = m_NormalizedKey; - b_SequenceKey->value() = m_SequenceKey; - } +void SharedSequence::update() { + if (b_NormalizedKey.valid()) b_NormalizedKey->value() = m_NormalizedKey; + b_SequenceKey->value() = m_SequenceKey; } CSP_NAMESPACE_END Modified: trunk/csp/cspsim/AnimationSequence.h =================================================================== --- trunk/csp/cspsim/AnimationSequence.h 2007-07-30 06:43:48 UTC (rev 2158) +++ trunk/csp/cspsim/AnimationSequence.h 2007-07-31 06:07:30 UTC (rev 2159) @@ -97,7 +97,7 @@ /** Activate this sequence. All other sequences sharing the output * channel will be disabled. */ - virtual void enable() { update(true); } + virtual void enable() { update(); } protected: typedef DataChannel<double>::RefT KeyChannel; @@ -109,7 +109,7 @@ void setSequenceKey(double key); private: - void update(bool force=false); + void update(); std::string m_SequenceChannel; std::string m_NormalizedChannel; Modified: trunk/csp/cspsim/LandingGear.cpp =================================================================== --- trunk/csp/cspsim/LandingGear.cpp 2007-07-30 06:43:48 UTC (rev 2158) +++ trunk/csp/cspsim/LandingGear.cpp 2007-07-31 06:07:30 UTC (rev 2159) @@ -284,16 +284,13 @@ Vector3 max_position = getMaxPosition(); if (motionNormal > 0.0) { compression = - (dot(max_position, normalGroundBody) + height) / motionNormal; + compression = std::max(compression, 0.0); } - // at (or past) max extension? - if (compression <= 0.0) { - // limit travel and clear weight-on-wheels (WOW) - double v_extend = (m_K * m_Compression) / m_Beta; - m_Compression = std::max(0.0, m_Compression - v_extend * dt); - m_Position = max_position; + // at max extension and not in contact? + if (compression == 0.0 && m_Compression == 0.0) { b_WOW->value() = false; - // no ground reaction force + m_Position = max_position; } else { // FIXME in computing vCompression, only the normal force is taken into // account, but other components can matter if m_Motion isn't vertical. @@ -322,22 +319,18 @@ m_Compression = compression; } - // update wheel position - m_Position = max_position + m_Motion * m_Compression; - - // determine reaction force - // ground support (in response to strut compression + damping) double normalForce = (m_K * compression + m_Beta * vCompression) * motionNormal; - if (normalForce < 0.0) { - normalForce = 0.0; // wheel hop - double v_extend = (m_K * old_compression) / m_Beta; + if (normalForce > 0.0) { + m_NormalForce += normalForce * normalGroundBody; + } else { + double v_extend = std::max(0.5, (m_K * m_Compression) / m_Beta); m_Compression = std::max(old_compression - v_extend * dt, 0.0); } - m_NormalForce += normalForce * normalGroundBody; - assert(!isNaN(normalForce)); - assert(normalGroundBody.valid()); + + // update wheel position + m_Position = max_position + m_Motion * m_Compression; } } @@ -396,7 +389,7 @@ void LandingGear::updateAnimation(double dt) { if (m_GearAnimation.valid()) { m_GearAnimation->update(dt); - m_GearAnimation->setCompression(m_Compression / m_CompressionLimit); + if (m_Compression > 0.0) m_GearAnimation->setCompression(m_Compression / m_CompressionLimit); m_GearAnimation->setTireRotation(fmod(m_TireRotation, 2.0*PI) - PI); if (m_SteeringLimit > 0.0) { m_GearAnimation->setSteeringAngle(toRadians(m_SteeringAngle)); Modified: trunk/csp/data/xml/vehicles/aircraft/f16/gear.xml =================================================================== --- trunk/csp/data/xml/vehicles/aircraft/f16/gear.xml 2007-07-30 06:43:48 UTC (rev 2158) +++ trunk/csp/data/xml/vehicles/aircraft/f16/gear.xml 2007-07-31 06:07:30 UTC (rev 2159) @@ -50,7 +50,7 @@ <!-- 0.191 --> <Float name="compression_limit">0.223</Float> <Float name="K">350000.0</Float> - <Float name="beta">240000.0</Float> + <Float name="beta">320000.0</Float> <Float name="brake_limit">50000.0</Float> <Float name="brake_slip">0.8</Float> <Float name="tire_radius">0.4</Float> @@ -81,7 +81,7 @@ <Real name="damage_limit">80000.0:10000.0</Real> <Float name="compression_limit">0.223</Float> <Float name="K">350000.0</Float> - <Float name="beta">240000.0</Float> + <Float name="beta">320000.0</Float> <Float name="brake_limit">50000.0</Float> <Float name="brake_slip">0.8</Float> <Float name="tire_radius">0.4</Float> |
|
From: <sv...@ww...> - 2007-07-30 06:44:56
|
Author: mkrose Date: 2007-07-29 23:43:48 -0700 (Sun, 29 Jul 2007) New Revision: 2158 Modified: trunk/csp/cspsim/GameScreen.cpp Log: Fix minor style issue. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2158 Modified: trunk/csp/cspsim/GameScreen.cpp =================================================================== --- trunk/csp/cspsim/GameScreen.cpp 2007-07-30 06:40:43 UTC (rev 2157) +++ trunk/csp/cspsim/GameScreen.cpp 2007-07-30 06:43:48 UTC (rev 2158) @@ -243,12 +243,12 @@ } wf::InputInterfaceManager* GameScreen::getInputInterfaceManager() { - if(m_InputInterfaceManager.valid()) { + if (m_InputInterfaceManager.valid()) { return m_InputInterfaceManager.get(); } - + m_InputInterfaceManager = new wf::InputInterfaceManager(this); - return m_InputInterfaceManager.get(); + return m_InputInterfaceManager.get(); } void GameScreen::on_View1() { |
Author: mkrose Date: 2007-07-29 23:40:43 -0700 (Sun, 29 Jul 2007) New Revision: 2157 Added: trunk/csp/cspsim/test/ trunk/csp/cspsim/test/test_PhysicsModel.cpp Removed: trunk/csp/cspsim/AircraftPhysicsModel.cpp trunk/csp/cspsim/AircraftPhysicsModel.h trunk/csp/cspsim/DynamicalSystem.cpp trunk/csp/cspsim/DynamicalSystem.h Modified: trunk/csp/bin/test_objects trunk/csp/csplib/numeric/NumericalMethod.cpp trunk/csp/csplib/numeric/NumericalMethod.h trunk/csp/csplib/numeric/Vector.h trunk/csp/csplib/numeric/VectorField.h trunk/csp/cspsim/BaseDynamics.cpp trunk/csp/cspsim/BaseDynamics.h trunk/csp/cspsim/CSPSim.cpp trunk/csp/cspsim/Collision.cpp trunk/csp/cspsim/Collision.h trunk/csp/cspsim/Engine.cpp trunk/csp/cspsim/FlightDynamics.cpp trunk/csp/cspsim/LandingGear.cpp trunk/csp/cspsim/LandingGear.h trunk/csp/cspsim/PhysicsModel.cpp trunk/csp/cspsim/PhysicsModel.h trunk/csp/cspsim/SConscript trunk/csp/cspsim/System.h trunk/csp/cspsim/SystemsModel.h trunk/csp/data/ui/scripts/windows/mainmenu.py trunk/csp/data/xml/objects/freefall_systems.xml trunk/csp/data/xml/vehicles/aircraft/f16/agent.xml trunk/csp/data/xml/vehicles/aircraft/f16/systems.xml trunk/csp/data/xml/vehicles/aircraft/m2k/agent.xml trunk/csp/data/xml/vehicles/aircraft/m2k/systems.xml Log: Update, simplify, and fix various minor issues with the aircraft physics model. This change eliminates DynamicalSystem and AircraftPhysicsModel, making PhysicsModel the physics engine for all vehicles. Quite a few other changes were made as well: * merge DynamicalSystem and AircraftPhysicsModel into PhysicsModel, which should work for all vehicles. * rewrite the physics solution in terms of position, velocity, angular momentum, and attitude, where position and velocity are in the global coordinate frame and angular momentum is in the body frame. angular momentum is initialized from angular velocity at the start of each timestep and is not exposed outside of PhysicsModel. this corrects errors in the treatment of the position integration, which was previously done in body coordinates. the correction is subtle under most circumstances and probably not noticeable in the simulation. tests have been added to help verify the physics model and prevent regressions. * eliminate custom valarray implementation (which I *think* was not being used on any platform). valarray itself could be replaced by a simpler class since this change also unrolls all of the valarray expressions to improve performance, at a small cost to readability. * add toBody and fromBody helper methods to BaseDynamics to make coordinate conversions clearer in several dynamics routines. * rename positionlocal and velocitylocal to position and velocity, respectively. the name "PositionLocal" is now used internally by PhysicsModel to represent motion of the center of mass relative to its position at the start of the timestep. * in the gear simulation, update height, ground normal in body coordinates, and wind velocity in body coordinates at each call to computeForceAndMoment rather than only at preSimulationStep. previously these values neglected aircraft motion during the integration, leading to discontinuities in the response between frames. on the downside, the f16 aircraft is noticeably less stable on landing, rocking back and forth between the main gear. not sure yet which update caused this change, but it needs to be investigated and (most likely) fixed. * workaround uninitialized contact point of the gear simulation during the first frame. * fix possible NaN's in gear simulation due to incorrect inequality tests. * fix sim time at high frame rates (time was running too fast when the frame rate exceeded 100 Hz). * increase minimum frame rate from 10 Hz to 20 Hz * various tweaks to GroundCollisionDynamics to try to improve stability and make the response on impact less unrealistic (in the absense of damage modeling). * increase the initial height of the test aircraft so that they settle more gracefully onto the runway. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2157 Diff omitted (133336 bytes). |
|
From: <sv...@ww...> - 2007-07-28 00:34:16
|
Author: nsmoooose Date: 2007-07-27 17:33:09 -0700 (Fri, 27 Jul 2007) New Revision: 2156 Added: trunk/csp/cspsim/wf/Check.cpp trunk/csp/cspsim/wf/Check.h trunk/csp/data/ui/themes/default/images/checked.png trunk/csp/data/ui/themes/default/images/checked.svg trunk/csp/data/ui/themes/default/images/checked_hover.png trunk/csp/data/ui/themes/default/images/checked_hover.svg trunk/csp/data/ui/themes/default/images/unchecked.png trunk/csp/data/ui/themes/default/images/unchecked.svg Modified: trunk/csp/cspsim/SConscript trunk/csp/cspsim/swig/wf.i trunk/csp/cspsim/wf/CheckBox.cpp trunk/csp/cspsim/wf/CheckBox.h trunk/csp/cspsim/wf/ControlGeometryBuilder.cpp trunk/csp/cspsim/wf/ControlGeometryBuilder.h trunk/csp/cspsim/wf/Serialization.cpp trunk/csp/cspsim/wf/WindowManager.cpp trunk/csp/data/ui/themes/default/styles.xml trunk/csp/data/ui/window_document.xsd Log: Added a new ui control named Check. This control represents the check part of a checkbox. By making the Check as an own class makes it possible to style it using images or other means. The CheckBox control has been changed into an SingleControlContainer which makes it possible to use any other control instead of the new Check control. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2156 Diff omitted (81310 bytes). |
|
From: <sv...@ww...> - 2007-07-27 22:38:47
|
Author: nsmoooose Date: 2007-07-27 15:37:40 -0700 (Fri, 27 Jul 2007) New Revision: 2155 Modified: trunk/csp/cspsim/GameScreen.cpp trunk/csp/cspsim/GameScreen.h Log: Fixed hover effects on user interface elements like buttons. This didn't work due to the fact that the window manager didn't receive mouse movement events. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2155 Modified: trunk/csp/cspsim/GameScreen.cpp =================================================================== --- trunk/csp/cspsim/GameScreen.cpp 2007-07-27 21:49:18 UTC (rev 2154) +++ trunk/csp/cspsim/GameScreen.cpp 2007-07-27 22:37:40 UTC (rev 2155) @@ -505,5 +505,10 @@ } } +bool GameScreen::onMouseMove(SDL_MouseMotionEvent const &event) { + // Let the window manager process the input interface events. + return getWindowManager()->onMouseMove(event.x, event.y, event.xrel, event.yrel); +} + CSP_NAMESPACE_END Modified: trunk/csp/cspsim/GameScreen.h =================================================================== --- trunk/csp/cspsim/GameScreen.h 2007-07-27 21:49:18 UTC (rev 2154) +++ trunk/csp/cspsim/GameScreen.h 2007-07-27 22:37:40 UTC (rev 2155) @@ -190,6 +190,10 @@ // Handles signals to be emitted to the python gui code. For example player QUIT action. Ref<wf::InputInterfaceManager> m_InputInterfaceManager; + + // Receives mouse move events from the input interface and sends + // them on to the window framework for processing. + bool onMouseMove(SDL_MouseMotionEvent const &event); }; CSP_NAMESPACE_END |
|
From: <sv...@ww...> - 2007-07-27 21:50:24
|
Author: nsmoooose Date: 2007-07-27 14:49:18 -0700 (Fri, 27 Jul 2007) New Revision: 2154 Modified: trunk/csp/cspsim/wf/Control.cpp trunk/csp/cspsim/wf/ControlGeometryBuilder.cpp trunk/csp/cspsim/wf/WindowManager.cpp trunk/csp/data/ui/help/aircraft_controls.xml trunk/csp/data/ui/help/f16_first_steps.xml trunk/csp/data/ui/help/index.xml trunk/csp/data/ui/help/joystick.xml trunk/csp/data/ui/help/mouse.xml trunk/csp/data/ui/help/view_controls.xml Log: Transparent effects on windows and controls now works much better. Removed a lot of unnecessary code in ControlGeometryBuilder class. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2154 Diff omitted (13633 bytes). |
|
From: <sv...@ww...> - 2007-07-26 22:12:29
|
Author: Herkules Date: 2007-07-26 15:11:22 -0700 (Thu, 26 Jul 2007) New Revision: 2153 Added: doc/dynamics/WorldIntegrationMath.pdf Log: some math for integration in the world/inertial coordinate system Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2153 Added: doc/dynamics/WorldIntegrationMath.pdf =================================================================== (Binary files differ) Property changes on: doc/dynamics/WorldIntegrationMath.pdf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream |
|
From: <sv...@ww...> - 2007-07-25 22:00:55
|
Author: Herkules Date: 2007-07-25 14:59:44 -0700 (Wed, 25 Jul 2007) New Revision: 2152 Added: doc/dynamics/DynamicsPipelineProposal.jpg Log: proposal for a dynamics pipeline Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2152 Added: doc/dynamics/DynamicsPipelineProposal.jpg =================================================================== (Binary files differ) Property changes on: doc/dynamics/DynamicsPipelineProposal.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream |
