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: <mk...@us...> - 2003-06-20 17:45:51
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Data/XML/vehicles/aircraft/m2k
In directory sc8-pr-cvs1:/tmp/cvs-serv31201
Modified Files:
thrust.xml
Log Message:
fixed thrust units and x,y ordering
Index: thrust.xml
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Data/XML/vehicles/aircraft/m2k/thrust.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** thrust.xml 19 Jun 2003 19:32:36 -0000 1.1
--- thrust.xml 20 Jun 2003 17:45:48 -0000 1.2
***************
*** 11,65 ****
<Object class="ThrustData" static="1">
<Table name='idle_thrust'>
! <XBreaks spacing='1000.0'>
! 0.0 3048.0 6096.0 9144.0 12192.0 15240.0 18288.0 30480.0
! </XBreaks>
! <YBreaks spacing='0.1'>
0.0 0.2 0.4 0.6 0.8 0.9 1.0 1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 1.9 2.0 2.1 2.2
</YBreaks>
<Values>
! 363.6 288.6075 27.27 -463.59 -1227.15 -1749.825 -1636.2 136.35 2272.5 3954.15 4761.342 4368.654 3926.88 3436.02 2932.8885 2405.214 1840.725 1276.236 736.29
! 277.245 193.1625 11.3625 -322.695 -863.55 -965.8125 -636.3 795.375 2454.3 3681.45 4272.3 4104.135 3865.5225 3579.1875 3245.13 2863.35 2481.57 2004.345 1574.8425
! 359.055 313.605 156.8025 -136.35 -590.85 -636.3 -270.4275 931.725 2272.5 3386.025 3999.6 4025.961 4025.961 4025.961 4021.416 3979.1475 3932.334 3885.5205 3838.707
! 527.22 459.045 343.1475 159.075 -112.2615 -295.425 -155.439 772.65 1954.35 2999.7 3726.9 4067.775 4408.65 4726.8 5113.125 5499.45 5908.5 6340.275 6817.5
! 663.57 604.485 513.585 413.595 272.7 -11.3625 -90.9 454.5 1318.05 2090.7 2658.825 2972.43 3269.673 3566.916 3817.8 3999.6 4067.775 4056.867 3986.874
! 818.1 772.65 693.1125 618.12 499.95 363.6 318.15 681.75 1181.7 1704.375 2079.3375 2317.95 2420.2125 2448.3915 2462.0265 2462.0265 2462.0265 2448.3915 2378.3985
! 409.05 386.325 346.7835 309.06 249.975 181.8 159.075 340.875 590.85 852.1875 1039.896 1158.975 1209.879 1223.9685 1231.2405 1231.2405 1231.2405 1223.9685 1188.972
! 25.452 24.0885 21.816 19.5435 15.453 11.3625 9.999 21.3615 36.8145 53.1765 64.9935 72.2655 75.447 76.356 76.8105 76.8105 76.8105 76.356 74.538
</Values>
</Table>
<Table name='mil_thrust'>
! <XBreaks spacing='1000.0'>
! 0.0 3048.0 6096.0 9144.0 12192.0 15240.0 18288.0 30480.0
! </XBreaks>
! <YBreaks spacing='0.1'>
0.0 0.2 0.4 0.6 0.8 0.9 1.0 1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 1.9 2.0 2.1 2.2
</YBreaks>
<Values>
! 6344.3655 6223.923 6189.8355 6204.3795 6317.55 6363.0 6340.275 6067.575 5658.525 5181.3 4761.342 4368.654 3926.88 3436.02 2932.8885 2405.214 1840.725 1276.236 736.29
! 4533.6375 4366.836 4444.101 4695.894 4867.695 4867.695 4819.9725 4772.25 4676.805 4510.0035 4319.1135 4104.135 3865.5225 3579.1875 3245.13 2863.35 2481.57 2004.345 1574.8425
! 3089.691 2955.159 3094.236 3319.2135 3628.2735 3721.9005 3756.897 3850.524 3932.334 3979.1475 4021.416 4025.961 4025.961 4025.961 4021.416 3979.1475 3932.334 3885.5205 3838.707
! 1863.45 1836.18 1949.805 2117.97 2417.94 2579.2875 2772.45 2999.7 3226.95 3499.65 3772.35 4067.775 4408.65 4726.8 5113.125 5499.45 5908.5 6340.275 6817.5
! 1263.51 1223.514 1288.053 1407.132 1610.2935 1733.9175 1882.539 2056.158 2254.32 2477.025 2675.187 2972.43 3269.673 3566.916 3817.8 3999.6 4067.775 4056.867 3986.874
! 825.8265 811.2825 904.0005 962.1765 1118.5245 1217.151 1338.5025 1477.5795 1651.653 1854.36 2086.155 2317.95 2420.2125 2448.3915 2462.0265 2462.0265 2462.0265 2448.3915 2378.3985
! 412.686 405.8685 452.2275 480.861 559.035 608.5755 669.4785 739.017 825.8265 927.18 1043.0775 1158.975 1209.879 1223.9685 1231.2405 1231.2405 1231.2405 1223.9685 1188.972
! 25.9065 25.452 28.179 29.997 34.9965 38.178 41.814 46.359 51.813 58.176 64.9935 72.2655 75.447 76.356 76.8105 76.8105 76.8105 76.356 74.538
</Values>
</Table>
<Table name='ab_thrust'>
! <XBreaks spacing='1000.0'>
! 0.0 3048.0 6096.0 9144.0 12192.0 15240.0 18288.0 30480.0
! </XBreaks>
! <YBreaks spacing='0.1'>
0.0 0.2 0.4 0.6 0.8 0.9 1.0 1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 1.9 2.0 2.1 2.2
</YBreaks>
<Values>
! 10226.25 9735.39 10317.15 11017.08 11848.815 12498.75 13128.687 14316.75 15225.75 15453.0 15680.25 15680.25 15680.25 15453.0 15112.125 14771.25 14203.125 13635.0 13180.5
! 7272.0 7135.65 7662.87 8594.595 9578.5875 9999.0 10598.4855 11817.0 12953.25 13635.0 14089.5 14203.125 14089.5 13862.25 13521.375 13180.5 12839.625 12385.125 11817.0
! 5226.75 5101.7625 5567.625 6253.92 7260.6375 7726.5 8317.35 9203.625 9999.0 10680.75 11135.25 11362.5 11476.125 11476.125 11476.125 11362.5 11248.875 10908.0 10453.5
! 3329.2125 3328.3035 3705.993 4220.0325 5051.7675 5567.625 6128.478 6931.125 7726.5 8408.25 8862.75 9203.625 9317.25 9317.25 9317.25 9203.625 8976.375 8749.125 8635.5
! 2011.1625 2015.7075 2272.5 2590.65 3117.87 3522.375 3927.789 4658.625 5340.375 5908.5 6249.375 6590.25 6703.875 6817.5 6817.5 6817.5 6703.875 6590.25 6476.625
! 1181.7 1181.7 1288.5075 1461.2175 1795.275 2045.25 2298.4065 2727.0 3181.5 3522.375 3749.625 3863.25 3931.425 3976.875 3999.6 3999.6 3999.6 3976.875 3863.25
! 590.85 590.85 644.481 730.836 897.6375 1022.625 1149.4305 1363.5 1590.75 1761.1875 1874.8125 1931.625 1965.7125 1988.4375 1999.8 1999.8 1999.8 1988.4375 1931.625
! 74.0835 74.0835 80.4465 91.3545 112.2615 127.7145 143.622 170.4375 199.071 219.978 234.522 241.3395 245.8845 248.6115 249.975 249.975 249.975 248.6115 241.3395
</Values>
</Table>
--- 11,65 ----
<Object class="ThrustData" static="1">
<Table name='idle_thrust'>
! <XBreaks spacing='0.1'>
0.0 0.2 0.4 0.6 0.8 0.9 1.0 1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 1.9 2.0 2.1 2.2
+ </XBreaks>
+ <YBreaks spacing='1000.0'>
+ 0.0 3048.0 6096.0 9144.0 12192.0 15240.0 18288.0 30480.0
</YBreaks>
<Values>
! 3636.0 2886.075 272.7 -4635.9 -12271.5 -17498.25 -16362.0 1363.5 22725.0 39541.5 47613.42 43686.54 39268.8 34360.2 29328.885 24052.14 18407.25 12762.36 7362.9
! 2772.45 1931.625 113.625 -3226.95 -8635.5 -9658.125 -6363.0 7953.75 24543.0 36814.5 42723.0 41041.35 38655.225 35791.875 32451.3 28633.5 24815.7 20043.45 15748.425
! 3590.55 3136.05 1568.025 -1363.5 -5908.5 -6363.0 -2704.275 9317.25 22725.0 33860.25 39996.0 40259.61 40259.61 40259.61 40214.16 39791.475 39323.34 38855.205 38387.07
! 5272.2 4590.45 3431.475 1590.75 -1122.615 -2954.25 -1554.39 7726.5 19543.5 29997.0 37269.0 40677.75 44086.5 47268.0 51131.25 54994.5 59085.0 63402.75 68175.0
! 6635.7 6044.85 5135.85 4135.95 2727.0 -113.625 -909.0 4545.0 13180.5 20907.0 26588.25 29724.3 32696.73 35669.16 38178.0 39996.0 40677.75 40568.67 39868.74
! 8181.0 7726.5 6931.125 6181.2 4999.5 3636.0 3181.5 6817.5 11817.0 17043.75 20793.375 23179.5 24202.125 24483.915 24620.265 24620.265 24620.265 24483.915 23783.985
! 4090.5 3863.25 3467.835 3090.6 2499.75 1818.0 1590.75 3408.75 5908.5 8521.875 10398.96 11589.75 12098.79 12239.685 12312.405 12312.405 12312.405 12239.685 11889.72
! 254.52 240.885 218.16 195.435 154.53 113.625 99.99 213.615 368.145 531.765 649.935 722.655 754.47 763.56 768.105 768.105 768.105 763.56 745.38
</Values>
</Table>
<Table name='mil_thrust'>
! <XBreaks spacing='0.1'>
0.0 0.2 0.4 0.6 0.8 0.9 1.0 1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 1.9 2.0 2.1 2.2
+ </XBreaks>
+ <YBreaks spacing='1000.0'>
+ 0.0 3048.0 6096.0 9144.0 12192.0 15240.0 18288.0 30480.0
</YBreaks>
<Values>
! 63443.655 62239.23 61898.355 62043.795 63175.5 63630.0 63402.75 60675.75 56585.25 51813.0 47613.42 43686.54 39268.8 34360.2 29328.885 24052.14 18407.25 12762.36 7362.9
! 45336.375 43668.36 44441.01 46958.94 48676.95 48676.95 48199.725 47722.5 46768.05 45100.035 43191.135 41041.35 38655.225 35791.875 32451.3 28633.5 24815.7 20043.45 15748.425
! 30896.91 29551.59 30942.36 33192.135 36282.735 37219.005 37568.97 38505.24 39323.34 39791.475 40214.16 40259.61 40259.61 40259.61 40214.16 39791.475 39323.34 38855.205 38387.07
! 18634.5 18361.8 19498.05 21179.7 24179.4 25792.875 27724.5 29997.0 32269.5 34996.5 37723.5 40677.75 44086.5 47268.0 51131.25 54994.5 59085.0 63402.75 68175.0
! 12635.1 12235.14 12880.53 14071.32 16102.935 17339.175 18825.39 20561.58 22543.2 24770.25 26751.87 29724.3 32696.73 35669.16 38178.0 39996.0 40677.75 40568.67 39868.74
! 8258.265 8112.825 9040.005 9621.765 11185.245 12171.51 13385.025 14775.795 16516.53 18543.6 20861.55 23179.5 24202.125 24483.915 24620.265 24620.265 24620.265 24483.915 23783.985
! 4126.86 4058.685 4522.275 4808.61 5590.35 6085.755 6694.785 7390.17 8258.265 9271.8 10430.775 11589.75 12098.79 12239.685 12312.405 12312.405 12312.405 12239.685 11889.72
! 259.065 254.52 281.79 299.97 349.965 381.78 418.14 463.59 518.13 581.76 649.935 722.655 754.47 763.56 768.105 768.105 768.105 763.56 745.38
</Values>
</Table>
<Table name='ab_thrust'>
! <XBreaks spacing='0.1'>
0.0 0.2 0.4 0.6 0.8 0.9 1.0 1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 1.9 2.0 2.1 2.2
+ </XBreaks>
+ <YBreaks spacing='1000.0'>
+ 0.0 3048.0 6096.0 9144.0 12192.0 15240.0 18288.0 30480.0
</YBreaks>
<Values>
! 102262.5 97353.9 103171.5 110170.8 118488.15 124987.5 131286.87 143167.5 152257.5 154530.0 156802.5 156802.5 156802.5 154530.0 151121.25 147712.5 142031.25 136350.0 131805.0
! 72720.0 71356.5 76628.7 85945.95 95785.875 99990.0 105984.855 118170.0 129532.5 136350.0 140895.0 142031.25 140895.0 138622.5 135213.75 131805.0 128396.25 123851.25 118170.0
! 52267.5 51017.625 55676.25 62539.2 72606.375 77265.0 83173.5 92036.25 99990.0 106807.5 111352.5 113625.0 114761.25 114761.25 114761.25 113625.0 112488.75 109080.0 104535.0
! 33292.125 33283.035 37059.93 42200.325 50517.675 55676.25 61284.78 69311.25 77265.0 84082.5 88627.5 92036.25 93172.5 93172.5 93172.5 92036.25 89763.75 87491.25 86355.0
! 20111.625 20157.075 22725.0 25906.5 31178.7 35223.75 39277.89 46586.25 53403.75 59085.0 62493.75 65902.5 67038.75 68175.0 68175.0 68175.0 67038.75 65902.5 64766.25
! 11817.0 11817.0 12885.075 14612.175 17952.75 20452.5 22984.065 27270.0 31815.0 35223.75 37496.25 38632.5 39314.25 39768.75 39996.0 39996.0 39996.0 39768.75 38632.5
! 5908.5 5908.5 6444.81 7308.36 8976.375 10226.25 11494.305 13635.0 15907.5 17611.875 18748.125 19316.25 19657.125 19884.375 19998.0 19998.0 19998.0 19884.375 19316.25
! 740.835 740.835 804.465 913.545 1122.615 1277.145 1436.22 1704.375 1990.71 2199.78 2345.22 2413.395 2458.845 2486.115 2499.75 2499.75 2499.75 2486.115 2413.395
</Values>
</Table>
|
|
From: <mk...@us...> - 2003-06-20 17:45:30
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Data/XML/vehicles/aircraft/m2k In directory sc8-pr-cvs1:/tmp/cvs-serv31118 Modified Files: fm.xml Log Message: increased roll authority, decreased pitch authority Index: fm.xml =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Data/XML/vehicles/aircraft/m2k/fm.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** fm.xml 19 Jun 2003 18:10:21 -0000 1.4 --- fm.xml 20 Jun 2003 17:45:27 -0000 1.5 *************** *** 49,53 **** <Float name="cm_adot">-3.61</Float> <Float name="cm_q">-24.58</Float><!-- <0 --> ! <Float name="cm_de">1.75</Float> <!-- Side Force Parameters --> --- 49,53 ---- <Float name="cm_adot">-3.61</Float> <Float name="cm_q">-24.58</Float><!-- <0 --> ! <Float name="cm_de">1.25</Float> <!-- Side Force Parameters --> *************** *** 62,66 **** <Float name="ci_p">-1.86</Float><!-- <0 --> <Float name="ci_r">0.33</Float> ! <Float name="ci_da">0.29</Float> <Float name="ci_dr">-0.03</Float> --- 62,67 ---- <Float name="ci_p">-1.86</Float><!-- <0 --> <Float name="ci_r">0.33</Float> ! <!--Float name="ci_da">0.29</Float--> ! <Float name="ci_da">1.46</Float> <Float name="ci_dr">-0.03</Float> |
|
From: <mk...@us...> - 2003-06-20 03:44:40
|
Update of /cvsroot/csp/APPLICATIONS/SimData/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv15151/Source
Modified Files:
Link.cpp
Log Message:
Index: Link.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/Link.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Link.cpp 20 Jun 2003 02:37:19 -0000 1.3
--- Link.cpp 20 Jun 2003 03:44:37 -0000 1.4
***************
*** 64,69 ****
Object *pobj = archive->_createObject(class_id);
pobj->unpack(p);
! pobj->postCreate();
_assign_safe(pobj);
// XXX should we also check that 'static' is not set?
// (it makes no sense to have a static immediate object)
--- 64,72 ----
Object *pobj = archive->_createObject(class_id);
pobj->unpack(p);
! // start reference counting before postCreate!
_assign_safe(pobj);
+ if (p._loadAll()) {
+ pobj->postCreate();
+ }
// XXX should we also check that 'static' is not set?
// (it makes no sense to have a static immediate object)
|
|
From: <mk...@us...> - 2003-06-20 02:37:22
|
Update of /cvsroot/csp/APPLICATIONS/SimData/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv8554/Source
Modified Files:
Link.cpp
Log Message:
see CHANGES.current
Index: Link.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/Link.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Link.cpp 2 May 2003 20:59:05 -0000 1.2
--- Link.cpp 20 Jun 2003 02:37:19 -0000 1.3
***************
*** 64,68 ****
--- 64,71 ----
Object *pobj = archive->_createObject(class_id);
pobj->unpack(p);
+ pobj->postCreate();
_assign_safe(pobj);
+ // XXX should we also check that 'static' is not set?
+ // (it makes no sense to have a static immediate object)
} else {
if (p._loadAll()) {
|
|
From: <mk...@us...> - 2003-06-20 02:37:22
|
Update of /cvsroot/csp/APPLICATIONS/SimData In directory sc8-pr-cvs1:/tmp/cvs-serv8554 Modified Files: CHANGES.current Log Message: see CHANGES.current Index: CHANGES.current =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/SimData/CHANGES.current,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** CHANGES.current 10 Jun 2003 23:45:20 -0000 1.39 --- CHANGES.current 20 Jun 2003 02:37:19 -0000 1.40 *************** *** 2,5 **** --- 2,13 ---- =========================== + 2003-06-19: onsight + Fixed a bug in Link::unpack(). The Object::postCreate() method + was not being called correctly for immediate Objects (those + declared directly in the XML stream rather than by reference to + an external xml file). This primarily affected Link<T>::vector + members, where T was a class derived from Object and the <Object> + tag occured inside the <List> tag in a single XML file. + 2003-06-11: delta Removed help methods ... from Math.h. |
|
From: <de...@us...> - 2003-06-19 19:32:39
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Data/XML/vehicles/aircraft/m2k
In directory sc8-pr-cvs1:/tmp/cvs-serv4952
Added Files:
gear.xml thrust.xml
Log Message:
no message
--- NEW FILE: gear.xml ---
<?xml version="1.0" standalone="no"?>
<!--
Mirage 2000 gear
-->
<Object class="GearDynamics" name="gear_dynamics">
<List name="gear_set">
<!-- all of these values are complete guesses for testing only! -->
<Object class="LandingGear"> <!-- nosewheel -->
<Vector name="max_position">0.0 4.75 -2.0</Vector>
<Vector name="motion">0 0 1.0</Vector>
<Real name="damage_limit">80000.0:10000.0</Real>
<Float name="compression_limit">0.5</Float>
<Float name="K">200000.0</Float>
<Float name="beta">10000.0</Float>
<Float name="brake_limit">3000.0</Float>
<Float name="static_friction">0.7</Float>
<Float name="dynamic_friction">0.5</Float>
<Float name="steering_limit">45.0</Float>
<Float name="tire_K">200000.0</Float>
</Object>
<Object class="LandingGear"> <!-- left main -->
<Vector name="max_position">-1.75 -0.7 -2.0</Vector>
<Vector name="motion">0 0 1.0</Vector>
<Real name="damage_limit">80000.0</Real>
<Float name="compression_limit">0.5</Float>
<Float name="K">300000.0</Float>
<Float name="beta">10000.0</Float>
<Float name="brake_limit">3000.0</Float>
<Float name="static_friction">0.7</Float>
<Float name="dynamic_friction">0.5</Float>
<Float name="tire_K">200000.0</Float>
</Object>
<Object class="LandingGear"> <!-- right main -->
<Vector name="max_position">1.75 -0.7 -2.0</Vector>
<Vector name="motion">0 0 1.0</Vector>
<Real name="damage_limit">80000.0:10000.0</Real>
<Float name="compression_limit">0.5</Float>
<Float name="K">300000.0</Float>
<Float name="beta">10000.0</Float>
<Float name="brake_limit">3000.0</Float>
<Float name="static_friction">0.7</Float>
<Float name="dynamic_friction">0.5</Float>
<Float name="tire_K">200000.0</Float>
</Object>
</List>
</Object>
--- NEW FILE: thrust.xml ---
<!--
Extracted from F4/SP3: f16cj.dat
NOTE: double check that XBreaks and YBreaks are
correct... I may have reversed these. X is altitude
in meters, Y is mach number.
-->
<Object class="ThrustData" static="1">
<Table name='idle_thrust'>
<XBreaks spacing='1000.0'>
0.0 3048.0 6096.0 9144.0 12192.0 15240.0 18288.0 30480.0
</XBreaks>
<YBreaks spacing='0.1'>
0.0 0.2 0.4 0.6 0.8 0.9 1.0 1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 1.9 2.0 2.1 2.2
</YBreaks>
<Values>
363.6 288.6075 27.27 -463.59 -1227.15 -1749.825 -1636.2 136.35 2272.5 3954.15 4761.342 4368.654 3926.88 3436.02 2932.8885 2405.214 1840.725 1276.236 736.29
277.245 193.1625 11.3625 -322.695 -863.55 -965.8125 -636.3 795.375 2454.3 3681.45 4272.3 4104.135 3865.5225 3579.1875 3245.13 2863.35 2481.57 2004.345 1574.8425
359.055 313.605 156.8025 -136.35 -590.85 -636.3 -270.4275 931.725 2272.5 3386.025 3999.6 4025.961 4025.961 4025.961 4021.416 3979.1475 3932.334 3885.5205 3838.707
527.22 459.045 343.1475 159.075 -112.2615 -295.425 -155.439 772.65 1954.35 2999.7 3726.9 4067.775 4408.65 4726.8 5113.125 5499.45 5908.5 6340.275 6817.5
663.57 604.485 513.585 413.595 272.7 -11.3625 -90.9 454.5 1318.05 2090.7 2658.825 2972.43 3269.673 3566.916 3817.8 3999.6 4067.775 4056.867 3986.874
818.1 772.65 693.1125 618.12 499.95 363.6 318.15 681.75 1181.7 1704.375 2079.3375 2317.95 2420.2125 2448.3915 2462.0265 2462.0265 2462.0265 2448.3915 2378.3985
409.05 386.325 346.7835 309.06 249.975 181.8 159.075 340.875 590.85 852.1875 1039.896 1158.975 1209.879 1223.9685 1231.2405 1231.2405 1231.2405 1223.9685 1188.972
25.452 24.0885 21.816 19.5435 15.453 11.3625 9.999 21.3615 36.8145 53.1765 64.9935 72.2655 75.447 76.356 76.8105 76.8105 76.8105 76.356 74.538
</Values>
</Table>
<Table name='mil_thrust'>
<XBreaks spacing='1000.0'>
0.0 3048.0 6096.0 9144.0 12192.0 15240.0 18288.0 30480.0
</XBreaks>
<YBreaks spacing='0.1'>
0.0 0.2 0.4 0.6 0.8 0.9 1.0 1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 1.9 2.0 2.1 2.2
</YBreaks>
<Values>
6344.3655 6223.923 6189.8355 6204.3795 6317.55 6363.0 6340.275 6067.575 5658.525 5181.3 4761.342 4368.654 3926.88 3436.02 2932.8885 2405.214 1840.725 1276.236 736.29
4533.6375 4366.836 4444.101 4695.894 4867.695 4867.695 4819.9725 4772.25 4676.805 4510.0035 4319.1135 4104.135 3865.5225 3579.1875 3245.13 2863.35 2481.57 2004.345 1574.8425
3089.691 2955.159 3094.236 3319.2135 3628.2735 3721.9005 3756.897 3850.524 3932.334 3979.1475 4021.416 4025.961 4025.961 4025.961 4021.416 3979.1475 3932.334 3885.5205 3838.707
1863.45 1836.18 1949.805 2117.97 2417.94 2579.2875 2772.45 2999.7 3226.95 3499.65 3772.35 4067.775 4408.65 4726.8 5113.125 5499.45 5908.5 6340.275 6817.5
1263.51 1223.514 1288.053 1407.132 1610.2935 1733.9175 1882.539 2056.158 2254.32 2477.025 2675.187 2972.43 3269.673 3566.916 3817.8 3999.6 4067.775 4056.867 3986.874
825.8265 811.2825 904.0005 962.1765 1118.5245 1217.151 1338.5025 1477.5795 1651.653 1854.36 2086.155 2317.95 2420.2125 2448.3915 2462.0265 2462.0265 2462.0265 2448.3915 2378.3985
412.686 405.8685 452.2275 480.861 559.035 608.5755 669.4785 739.017 825.8265 927.18 1043.0775 1158.975 1209.879 1223.9685 1231.2405 1231.2405 1231.2405 1223.9685 1188.972
25.9065 25.452 28.179 29.997 34.9965 38.178 41.814 46.359 51.813 58.176 64.9935 72.2655 75.447 76.356 76.8105 76.8105 76.8105 76.356 74.538
</Values>
</Table>
<Table name='ab_thrust'>
<XBreaks spacing='1000.0'>
0.0 3048.0 6096.0 9144.0 12192.0 15240.0 18288.0 30480.0
</XBreaks>
<YBreaks spacing='0.1'>
0.0 0.2 0.4 0.6 0.8 0.9 1.0 1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 1.9 2.0 2.1 2.2
</YBreaks>
<Values>
10226.25 9735.39 10317.15 11017.08 11848.815 12498.75 13128.687 14316.75 15225.75 15453.0 15680.25 15680.25 15680.25 15453.0 15112.125 14771.25 14203.125 13635.0 13180.5
7272.0 7135.65 7662.87 8594.595 9578.5875 9999.0 10598.4855 11817.0 12953.25 13635.0 14089.5 14203.125 14089.5 13862.25 13521.375 13180.5 12839.625 12385.125 11817.0
5226.75 5101.7625 5567.625 6253.92 7260.6375 7726.5 8317.35 9203.625 9999.0 10680.75 11135.25 11362.5 11476.125 11476.125 11476.125 11362.5 11248.875 10908.0 10453.5
3329.2125 3328.3035 3705.993 4220.0325 5051.7675 5567.625 6128.478 6931.125 7726.5 8408.25 8862.75 9203.625 9317.25 9317.25 9317.25 9203.625 8976.375 8749.125 8635.5
2011.1625 2015.7075 2272.5 2590.65 3117.87 3522.375 3927.789 4658.625 5340.375 5908.5 6249.375 6590.25 6703.875 6817.5 6817.5 6817.5 6703.875 6590.25 6476.625
1181.7 1181.7 1288.5075 1461.2175 1795.275 2045.25 2298.4065 2727.0 3181.5 3522.375 3749.625 3863.25 3931.425 3976.875 3999.6 3999.6 3999.6 3976.875 3863.25
590.85 590.85 644.481 730.836 897.6375 1022.625 1149.4305 1363.5 1590.75 1761.1875 1874.8125 1931.625 1965.7125 1988.4375 1999.8 1999.8 1999.8 1988.4375 1931.625
74.0835 74.0835 80.4465 91.3545 112.2615 127.7145 143.622 170.4375 199.071 219.978 234.522 241.3395 245.8845 248.6115 249.975 249.975 249.975 248.6115 241.3395
</Values>
</Table>
</Object>
|
|
From: <de...@us...> - 2003-06-19 19:15:31
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/VisualStudio/CSPSimDLL In directory sc8-pr-cvs1:/tmp/cvs-serv2139 Modified Files: CSPSimDLL.vcproj Log Message: no message Index: CSPSimDLL.vcproj =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/VisualStudio/CSPSimDLL/CSPSimDLL.vcproj,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** CSPSimDLL.vcproj 4 May 2003 11:29:04 -0000 1.9 --- CSPSimDLL.vcproj 19 Jun 2003 19:15:28 -0000 1.10 *************** *** 59,63 **** TypeLibraryName=".\Debug/CSPSimDLL.tlb"/> <Tool ! Name="VCPostBuildEventTool"/> <Tool Name="VCPreBuildEventTool"/> --- 59,64 ---- TypeLibraryName=".\Debug/CSPSimDLL.tlb"/> <Tool ! Name="VCPostBuildEventTool" ! CommandLine="copy /Y cCSP.py ..\..\Bin"/> <Tool Name="VCPreBuildEventTool"/> *************** *** 117,121 **** TypeLibraryName=".\Release/CSPSimDLL.tlb"/> <Tool ! Name="VCPostBuildEventTool"/> <Tool Name="VCPreBuildEventTool"/> --- 118,123 ---- TypeLibraryName=".\Release/CSPSimDLL.tlb"/> <Tool ! Name="VCPostBuildEventTool" ! CommandLine="copy /Y cCSP.py ..\..\Bin"/> <Tool Name="VCPreBuildEventTool"/> *************** *** 137,149 **** Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> <File - RelativePath="..\..\Source\AeroDynamics.cpp"> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="../../Include"/> - </FileConfiguration> - </File> - <File RelativePath="..\..\Source\AircraftModel.cpp"> <FileConfiguration --- 139,142 ---- *************** *** 164,170 **** --- 157,169 ---- </File> <File + RelativePath="..\..\Source\AircraftPhysicModel.cpp"> + </File> + <File RelativePath="..\..\Source\Atmosphere.cpp"> </File> <File + RelativePath="..\..\Source\BaseDynamics.cpp"> + </File> + <File RelativePath="..\..\Source\BaseScreen.cpp"> </File> *************** *** 173,176 **** --- 172,178 ---- </File> <File + RelativePath="..\..\Source\Collision.cpp"> + </File> + <File RelativePath="..\..\Source\Colorspace.cpp"> </File> *************** *** 191,194 **** --- 193,199 ---- </File> <File + RelativePath="..\..\Source\Engine.cpp"> + </File> + <File RelativePath="..\..\Source\EventMapIndex.cpp"> </File> *************** *** 233,236 **** --- 238,247 ---- </File> <File + RelativePath="..\..\Source\PhysicModel.cpp"> + </File> + <File + RelativePath="..\..\Source\PrimaryAeroDynamics.cpp"> + </File> + <File RelativePath="..\..\Source\ScreenInfo.cpp"> </File> *************** *** 285,291 **** Filter="h;hpp;hxx;hm;inl"> <File - RelativePath="..\..\Include\AeroDynamics.h"> - </File> - <File RelativePath="..\..\Include\AircraftObject.h"> </File> --- 296,299 ---- *************** *** 297,300 **** --- 305,311 ---- </File> <File + RelativePath="..\..\Include\BaseDynamics.h"> + </File> + <File RelativePath="..\..\Include\BasePhysics.h"> </File> *************** *** 306,309 **** --- 317,323 ---- </File> <File + RelativePath="..\..\Include\Collision.h"> + </File> + <File RelativePath="..\..\Include\Colorspace.h"> </File> *************** *** 321,324 **** --- 335,341 ---- </File> <File + RelativePath="..\..\Include\Engine.h"> + </File> + <File RelativePath="..\..\Include\EventMapIndex.h"> </File> *************** *** 360,366 **** </File> <File - RelativePath="..\..\Include\OGLText.h"> - </File> - <File RelativePath="..\..\Include\ObjectModel.h"> </File> --- 377,380 ---- *************** *** 369,372 **** --- 383,392 ---- </File> <File + RelativePath="..\..\Include\PhysicModel.h"> + </File> + <File + RelativePath="..\..\Include\PrimaryAeroDynamics.h"> + </File> + <File RelativePath="..\..\Include\ScreenInfo.h"> </File> *************** *** 379,382 **** --- 399,405 ---- <File RelativePath="..\..\Include\SimpleConfig.h"> + </File> + <File + RelativePath="..\..\Include\Sky.h"> </File> <File |
|
From: <de...@us...> - 2003-06-19 19:15:19
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/VisualStudio/CSPSimAppli In directory sc8-pr-cvs1:/tmp/cvs-serv2090 Modified Files: CSPSimAppli.vcproj Log Message: no message Index: CSPSimAppli.vcproj =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/VisualStudio/CSPSimAppli/CSPSimAppli.vcproj,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** CSPSimAppli.vcproj 4 May 2003 11:29:25 -0000 1.7 --- CSPSimAppli.vcproj 19 Jun 2003 19:15:16 -0000 1.8 *************** *** 21,25 **** <Tool Name="VCCLCompilerTool" ! AdditionalOptions="/Zm1000" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../Include,../../../../THIRDPARTYLIBS/include,../../../../THIRDPARTYLIBS/Demeter,C:/Python22/include" --- 21,25 ---- <Tool Name="VCCLCompilerTool" ! AdditionalOptions="/Zm200" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../Include,../../../../THIRDPARTYLIBS/include,../../../../THIRDPARTYLIBS/Demeter,C:/Python22/include" *************** *** 55,59 **** TypeLibraryName=".\Release/CSPSimAppli.tlb"/> <Tool ! Name="VCPostBuildEventTool"/> <Tool Name="VCPreBuildEventTool"/> --- 55,60 ---- TypeLibraryName=".\Release/CSPSimAppli.tlb"/> <Tool ! Name="VCPostBuildEventTool" ! CommandLine="copy /Y cCSP.py ..\..\Bin"/> <Tool Name="VCPreBuildEventTool"/> *************** *** 79,83 **** <Tool Name="VCCLCompilerTool" ! AdditionalOptions="/Zm1000" Optimization="0" AdditionalIncludeDirectories="../../Include,../../../../THIRDPARTYLIBS/include,../../../../THIRDPARTYLIBS/Demeter,C:/Python22/include" --- 80,84 ---- <Tool Name="VCCLCompilerTool" ! AdditionalOptions="/Zm200" Optimization="0" AdditionalIncludeDirectories="../../Include,../../../../THIRDPARTYLIBS/include,../../../../THIRDPARTYLIBS/Demeter,C:/Python22/include" *************** *** 118,122 **** TypeLibraryName=".\../../Bin/CSPSimAppli.tlb"/> <Tool ! Name="VCPostBuildEventTool"/> <Tool Name="VCPreBuildEventTool"/> --- 119,124 ---- TypeLibraryName=".\../../Bin/CSPSimAppli.tlb"/> <Tool ! Name="VCPostBuildEventTool" ! CommandLine="copy /Y cCSP.py ..\..\Bin"/> <Tool Name="VCPreBuildEventTool"/> *************** *** 138,144 **** Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> <File - RelativePath="..\..\Source\AeroDynamics.cpp"> - </File> - <File RelativePath="..\..\Source\AircraftModel.cpp"> <FileConfiguration --- 140,143 ---- *************** *** 159,165 **** --- 158,170 ---- </File> <File + RelativePath="..\..\Source\AircraftPhysicModel.cpp"> + </File> + <File RelativePath="..\..\Source\Atmosphere.cpp"> </File> <File + RelativePath="..\..\Source\BaseDynamics.cpp"> + </File> + <File RelativePath="..\..\Source\BaseScreen.cpp"> </File> *************** *** 168,171 **** --- 173,179 ---- </File> <File + RelativePath="..\..\Source\Collision.cpp"> + </File> + <File RelativePath="..\..\Source\Colorspace.cpp"> </File> *************** *** 186,189 **** --- 194,200 ---- </File> <File + RelativePath="..\..\Source\Engine.cpp"> + </File> + <File RelativePath="..\..\Source\EventMapIndex.cpp"> </File> *************** *** 228,231 **** --- 239,248 ---- </File> <File + RelativePath="..\..\Source\PhysicModel.cpp"> + </File> + <File + RelativePath="..\..\Source\PrimaryAeroDynamics.cpp"> + </File> + <File RelativePath="..\..\Source\ScreenInfo.cpp"> </File> *************** *** 283,290 **** Filter="h;hpp;hxx;hm;inl"> <File ! RelativePath="..\..\Include\AeroDynamics.h"> </File> <File ! RelativePath="..\..\Include\AircraftObject.h"> </File> <File --- 300,310 ---- Filter="h;hpp;hxx;hm;inl"> <File ! RelativePath="..\..\Include\AircraftObject.h"> </File> <File ! RelativePath="..\..\Include\AircraftPhysicModel.h"> ! </File> ! <File ! RelativePath="..\..\Include\Atmosphere.h"> </File> <File *************** *** 292,295 **** --- 312,318 ---- </File> <File + RelativePath="..\..\Include\BaseDynamics.h"> + </File> + <File RelativePath="..\..\Include\BasePhysics.h"> </File> *************** *** 301,304 **** --- 324,330 ---- </File> <File + RelativePath="..\..\Include\Collision.h"> + </File> + <File RelativePath="..\..\Include\Colorspace.h"> </File> *************** *** 322,325 **** --- 348,354 ---- </File> <File + RelativePath="..\..\Include\Engine.h"> + </File> + <File RelativePath="..\..\Include\EventMapIndex.h"> </File> *************** *** 367,370 **** --- 396,405 ---- </File> <File + RelativePath="..\..\Include\PhysicModel.h"> + </File> + <File + RelativePath="..\..\Include\PrimaryAeroDynamics.h"> + </File> + <File RelativePath="..\..\Include\ScreenInfo.h"> </File> *************** *** 409,412 **** --- 444,450 ---- </File> <File + RelativePath="..\..\Include\VirtualScene.h"> + </File> + <File RelativePath="..\..\Include\compiler.h"> </File> *************** *** 427,431 **** CommandLine="C:\progra~1\SWIG-1.3.19\swig -c++ -python -noexcept -DWIN32 -I..\..\Include -IC:\Python22\include -o ..\..\Source\$(InputName)_wrap.cpp ..\..\Source\$(InputName).i " ! Outputs="..\..\Source\$(InputName)_wrap.cpp ..\..\Bin\$(InputName).py"/> </FileConfiguration> <FileConfiguration --- 465,469 ---- CommandLine="C:\progra~1\SWIG-1.3.19\swig -c++ -python -noexcept -DWIN32 -I..\..\Include -IC:\Python22\include -o ..\..\Source\$(InputName)_wrap.cpp ..\..\Source\$(InputName).i " ! Outputs="..\..\Source\$(InputName)_wrap.cpp"/> </FileConfiguration> <FileConfiguration |
|
From: <de...@us...> - 2003-06-19 18:10:24
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Data/XML/vehicles/aircraft/m2k In directory sc8-pr-cvs1:/tmp/cvs-serv23628 Modified Files: model.xml fm.xml Log Message: see CHANGES.current Index: model.xml =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Data/XML/vehicles/aircraft/m2k/model.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** model.xml 3 May 2003 11:24:13 -0000 1.8 --- model.xml 19 Jun 2003 18:10:21 -0000 1.9 *************** *** 3,7 **** <Object class="ObjectModel" static="1"> <!--External name="model_path">f35.3DS</External--> - <!--External name="model_path">f35.3DS</External--> <External name="model_path">m2k2g.3ds</External> <Vector name="axis_0">1 0 0</Vector> --- 3,6 ---- *************** *** 10,16 **** <Vector name="view_point">0.0 4.5 0.65</Vector> <List name="contacts"> - <Vector>0.0 4.75 -2.0</Vector> - <Vector>-1.75 -0.7 -2.0</Vector> - <Vector>1.75 -0.7 -2.0</Vector> <Vector>0.0 8.55 -0.4</Vector> <Vector>0.0 5.0 0.9</Vector> --- 9,12 ---- *************** *** 24,27 **** --- 20,29 ---- <!-- view point --> <Vector>0.0 4.5 0.65</Vector> + </List> + <List name="landing_gear"> + <!-- this needs to be fixed to reflect real positions ...--> + <Vector>0.0 4.75 -2.0</Vector> + <Vector>-1.7 -0.05 -2.0</Vector> + <Vector>1.7 -0.05 -2.0</Vector> </List> </Object> Index: fm.xml =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Data/XML/vehicles/aircraft/m2k/fm.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** fm.xml 26 Mar 2003 10:18:53 -0000 1.3 --- fm.xml 19 Jun 2003 18:10:21 -0000 1.4 *************** *** 2,13 **** <!-- - Mirage 2000 aerodynamics model ! many parameters are estimates. ! --> ! <Object class="AeroDynamics"> <!-- Wing geometry --> --- 2,11 ---- <!-- Mirage 2000 aerodynamics model ! many parameters are estimates. --> ! <Object class="PrimaryAeroDynamics"> <!-- Wing geometry --> *************** *** 17,93 **** <!-- Control surfaces min/max angles --> ! <Float name="de_max">25.0</Float> ! <Float name="de_min">-16.0</Float> ! <Float name="da_max">+17.5</Float> ! <Float name="da_min">-17.5</Float> ! <Float name="dr_max">+20.0</Float> ! <Float name="dr_min">-20.0</Float> ! ! <!-- A=0.9 10^4 kg m^2 A -F -E --> ! <!-- C=6.0 10^4 kg m^2 I = -F B -D --> ! <!-- B=5.4 10^4 Kg m^2 -E -D C --> ! <!-- E=1.8 10^3 kg m^2 --> ! ! <!-- Mass/Inertial properties --> ! <!-- max mass --> ! <!-- <Float name="Mass">17500.0</Float> --> ! <!-- interceptor mass with a central tank ! <Float name="mass">12000.0</Float> --> ! <!-- interceptor mass --> ! <!-- <Float name="Mass">7500.0</Float> --> ! ! <!-- ! <Matrix name="inertia"> ! 20354.0 0.0 6785.0 ! 0.0 135691.0 0.0 ! 6785.0 0.0 135691.0 ! </Matrix> --> ! <Float name="g_min">-3.0</Float> <Float name="g_max">9.0</Float> ! <!-- ! <Float name="thrust_max">9700.0</Float> --> ! ! <!-- Drag Parameters cx0 = 2 *">0.074 / ( rc^0.2 ) ; Cx=Cx0+KiCz^2 Ki(trainee induite) 1/pi*AR --> ! <Float name="cd0">0.02</Float> ! <Float name="cd_a">0.3</Float> ! <Float name="cd_de">0.02</Float> <!-- Lift Parameters --> <Float name="stall_aoa">31.0</Float> <Float name="cl0">0.14</Float> ! <Float name="cl_a">4.2</Float> <Float name="cl_adot">1.29</Float> ! <Float name="cl_q">1.5</Float> ! <Float name="cl_de">0.4</Float> <!-- Pitch Moment Parameters --> ! <Float name="cm0">-0.002</Float> ! <Float name="cm_a">-0.02</Float> ! <Float name="cm_adot">-1.73</Float> ! <Float name="cm_q">-3.6</Float> ! <Float name="cm_de">0.3</Float> <!-- Side Force Parameters --> <Float name="cy_beta">-0.29</Float> <Float name="cy_p">0.11</Float> ! <Float name="cy_r">0.0</Float> <Float name="cy_da">0.0</Float> ! <Float name="cy_dr">-0.01</Float> <!-- Roll moment parameters --> ! <Float name="ci_beta">-0.1</Float> ! <Float name="ci_p">-0.3</Float> ! <Float name="ci_r">0.3</Float> ! <Float name="ci_da">0.2</Float> <Float name="ci_dr">-0.03</Float> <!-- Yaw Moment Parameters --> ! <Float name="cn_beta">0.3</Float> ! <Float name="cn_p">0.03</Float> ! <Float name="cn_r">-0.04</Float> ! <Float name="cn_da">0.03</Float> ! <Float name="cn_dr">0.08</Float> </Object> --- 15,74 ---- <!-- Control surfaces min/max angles --> ! <!-- these values come from a FS2k2 add-on --> ! <Float name="de_max">+27.5</Float> ! <Float name="de_min">-20.6</Float> ! <Float name="da_max">+19.5</Float> ! <Float name="da_min">-15</Float> ! <Float name="dr_max">+23.5</Float> ! <Float name="dr_min">-23.5</Float> ! <Float name="g_min">-3.2</Float> <Float name="g_max">9.0</Float> ! <!-- Drag Parameters --> ! <Float name="cd0">0.06</Float> ! <Float name="cd_a">0.07</Float> ! <Float name="cd_de">0.0</Float> ! <!--Float name="cd_df">0.07</Float--> ! <!--Float name="cd_ds">0.14</Float--> <!-- Lift Parameters --> <Float name="stall_aoa">31.0</Float> <Float name="cl0">0.14</Float> ! <Float name="cl_a">5.16</Float> <Float name="cl_adot">1.29</Float> ! <Float name="cl_q">-1.51</Float> ! <Float name="cl_de">0.0</Float> ! <!--Float name="cl_df">0.4</Float--> ! <!--Float name="cl_ds">0.0</Float--> ! <!--Float name="cl_dh">0.62</Float--> <!-- Pitch Moment Parameters --> ! <Float name="cm0">0.0</Float> ! <Float name="cm_a">-1.33</Float> ! <Float name="cm_adot">-3.61</Float> ! <Float name="cm_q">-24.58</Float><!-- <0 --> ! <Float name="cm_de">1.75</Float> <!-- Side Force Parameters --> <Float name="cy_beta">-0.29</Float> <Float name="cy_p">0.11</Float> ! <Float name="cy_r">-0.81</Float> <Float name="cy_da">0.0</Float> ! <Float name="cy_dr">-0.15</Float> <!-- Roll moment parameters --> ! <Float name="ci_beta">-0.17</Float> ! <Float name="ci_p">-1.86</Float><!-- <0 --> ! <Float name="ci_r">0.33</Float> ! <Float name="ci_da">0.29</Float> <Float name="ci_dr">-0.03</Float> <!-- Yaw Moment Parameters --> ! <Float name="cn_beta">0.36</Float> ! <Float name="cn_p">0.11</Float> ! <Float name="cn_r">-0.81</Float><!-- <0 --> ! <Float name="cn_da">-0.03</Float> ! <Float name="cn_dr">0.15</Float> </Object> |
|
From: <de...@us...> - 2003-06-19 18:09:42
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Data/XML/vehicles/aircraft In directory sc8-pr-cvs1:/tmp/cvs-serv23483 Modified Files: m2k.xml Log Message: see CHANGES.current Index: m2k.xml =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Data/XML/vehicles/aircraft/m2k.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** m2k.xml 18 Apr 2003 12:07:10 -0000 1.4 --- m2k.xml 19 Jun 2003 18:09:37 -0000 1.5 *************** *** 2,82 **** <!-- ! ! Mirage 2000 ! --> <Object class="AircraftObject"> ! <Path name="model">m2k.model</Path> ! <Path name="flight_model">m2k.fm</Path> ! <Bool name="complex_physics">true</Bool> ! ! <Float name="aileron_min">-25.0</Float> ! <Float name="aileron_max">25.0</Float> ! <Float name="elevator_min">-25.0</Float> ! <Float name="elevator_max">25.0</Float> ! <Float name="rudder_min">-25.0</Float> ! <Float name="rudder_max">25.0</Float> ! <!-- Mass/Inertial properties --> ! <!-- ! <Float name="mass">7500.0</Float> ! <Matrix name="inertia"> ! 135691.0 0.0 0.0 ! 0.0 20354.0 6785.0 ! 0.0 6785.0 135691.0 ! </Matrix> ! --> ! <Float name="mass">10000.0</Float> ! <Matrix name="inertia"> ! 100000.0 0.0 0.0 ! 0.0 25000.0 6785.0 ! 0.0 6785.0 120000.0 ! </Matrix> ! <Object class="LandingGearSet" name="landing_gear"> ! <List name="gear_set"> ! <!-- all of these values are complete guesses for testing only! --> ! <Object class="LandingGear"> <!-- nosewheel --> ! <Vector name="max_position">0.0 3.3 -2.0</Vector> ! <Vector name="motion">0 0 1.0</Vector> ! <Real name="damage_limit">80000.0:10000.0</Real> ! <Float name="compression_limit">0.5</Float> ! <Float name="K">200000.0</Float> ! <Float name="beta">10000.0</Float> ! <Float name="brake_limit">3000.0</Float> ! <Float name="static_friction">0.7</Float> ! <Float name="dynamic_friction">0.5</Float> ! <Float name="steering_limit">45.0</Float> ! <Float name="tire_K">200000.0</Float> ! </Object> ! <Object class="LandingGear"> <!-- left main --> ! <Vector name="max_position">-1.4 -0.7 -2.0</Vector> ! <Vector name="motion">0 0 1.0</Vector> ! <Real name="damage_limit">80000.0</Real> ! <Float name="compression_limit">0.5</Float> ! <Float name="K">200000.0</Float> ! <Float name="beta">10000.0</Float> ! <Float name="brake_limit">3000.0</Float> ! <Float name="static_friction">0.7</Float> ! <Float name="dynamic_friction">0.5</Float> ! <Float name="tire_K">200000.0</Float> ! </Object> ! <Object class="LandingGear"> <!-- right main --> ! <Vector name="max_position">1.4 -0.7 -2.0</Vector> ! <Vector name="motion">0 0 1.0</Vector> ! <Real name="damage_limit">80000.0:10000.0</Real> ! <Float name="compression_limit">0.5</Float> ! <Float name="K">200000.0</Float> ! <Float name="beta">10000.0</Float> ! <Float name="brake_limit">3000.0</Float> ! <Float name="static_friction">0.7</Float> ! <Float name="dynamic_friction">0.5</Float> ! <Float name="tire_K">200000.0</Float> ! </Object> ! </List> ! </Object> </Object> - --- 2,50 ---- <!-- ! Mirage 2000 --> <Object class="AircraftObject"> ! <Path name="model">m2k.model</Path> ! <Bool name="complex_physics">true</Bool> ! <!-- these values come from a FS2k2 add-on --> ! <Float name="aileron_min">-15.0</Float> ! <Float name="aileron_max">+19.5</Float> ! <Float name="elevator_min">-20.6</Float> ! <Float name="elevator_max">+27.5</Float> ! <Float name="rudder_min">-23.5</Float> ! <Float name="rudder_max">+23.5</Float> ! <!-- Mass/Inertial properties --> ! <!-- these values come from a FS2k2 add-on --> ! <Float name="mass">15000.0</Float> ! <Matrix name="inertia"> ! 171554.0 0.0 0.0 ! 0.0 55427.0 1764.0 ! 0.0 1764.0 252326.0 ! </Matrix> + <Object class="AircraftDynamics" name="aircraft_dynamics"> + + <Path name="primary_aero_dynamics">m2k.fm</Path> + + <Path name="gear_dynamics">m2k.gear</Path> + + <Object class="EngineDynamics" name="engine_dynamics"> + <List name="engine_set"> + <!-- real engine power is 9700 kg --> + <!-- thrustdata values comes from F4SP3: f16.dat --> + <Object class="Engine"> + <Path name="thrust_data">m2k.thrust</Path> + <Float name="engine_idle_rpm">0.68</Float> + <Float name="engine_ab_thrust">0.95</Float> + <Vector name="thrust_direction">0.0 1.0 0.0</Vector> + <Vector name="engine_offset">0.0 0.0 0.0</Vector> + <Vector name="smoke_emitter_location">0.0 -5.5 0.0></Vector> + </Object> + </List> + </Object> + </Object> </Object> |
|
From: <de...@us...> - 2003-06-19 18:08:22
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Tools/HID/Maps In directory sc8-pr-cvs1:/tmp/cvs-serv23289 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.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** aircraft-core.map 11 Apr 2003 19:07:44 -0000 1.2 --- aircraft-core.map 19 Jun 2003 18:08:20 -0000 1.3 *************** *** 10,28 **** mode base ! map key:DOWN press INC_ELEVATOR ! map key:DOWN release STOP_INC_ELEVATOR ! map key:UP press DEC_ELEVATOR ! map key:UP release STOP_DEC_ELEVATOR ! map key:RIGHT press INC_AILERON ! map key:RIGHT release STOP_INC_AILERON ! map key:LEFT press DEC_AILERON ! map key:LEFT release STOP_DEC_AILERON ! map key:EQUALS press INC_THROTTLE ! map key:EQUALS release STOP_INC_THROTTLE ! map key:MINUS press DEC_THROTTLE ! map key:MINUS release STOP_DEC_THROTTLE ! map key:s press SMOKE_TOGGLE ! map key:w press WHEEL_BRAKE_ON ! map key:w release WHEEL_BRAKE_OFF ! map key:g press GEAR_TOGGLE ! --- 10,28 ---- mode base ! map key:DOWN press INC_ELEVATOR ! map key:DOWN release STOP_INC_ELEVATOR ! map key:UP press DEC_ELEVATOR ! map key:UP release STOP_DEC_ELEVATOR ! map key:RIGHT press INC_AILERON ! map key:RIGHT release STOP_INC_AILERON ! map key:LEFT press DEC_AILERON ! map key:LEFT release STOP_DEC_AILERON ! map key:EQUALS press INC_THROTTLE ! map key:EQUALS release STOP_INC_THROTTLE ! map key:MINUS press DEC_THROTTLE ! map key:MINUS release STOP_DEC_THROTTLE ! map key:s press SMOKE_TOGGLE ! 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 |
|
From: <de...@us...> - 2003-06-19 18:04:14
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim In directory sc8-pr-cvs1:/tmp/cvs-serv22630 Modified Files: CHANGES.current Log Message: no message Index: CHANGES.current =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/CHANGES.current,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** CHANGES.current 4 May 2003 11:28:49 -0000 1.31 --- CHANGES.current 19 Jun 2003 18:04:11 -0000 1.32 *************** *** 2,5 **** --- 2,51 ---- =========================== + 2003-06-19: delta + + ==========> GCC USERS: add Engine.cpp, BaseDynamics.cpp, Collision.cpp, + PrimaryAeroDynamics.cpp (and remove AeroDynamics.cpp from), + PhysicModel.cpp, AircraftPhysicModel.cpp to the project. + + ==========> ALL USERS: update APPLICATIONS/CSPSim/Tools/HID/Maps/aircraft-core.map + and APPLICATIONS/CSPSim/Data/XML/vehicles/aircraft directory then + (python) map2hid aircraft.map and RebuildData(.py). + + Fixed a depth buffer bug on info view. + Added some optimize calls in VirtualScene.cpp and ObjectModel.cpp. + Added a basic Engine class (it uses F4 data from SP3). + Added BaseDynamics.cpp to the project which is a base class for + dynamics. + Added a GearDynamics class (and removed old one). + Added a post built step in .net project to copy + VisualStudio/CSPSim*/cCSP.py to Bin. + Added a basic ground Collision class. + Added #ifndef CSP_NDEBUG/#endif blocks to avoid warnings in case + it s defined in CSPSim.cpp (due to macro CSP_LOG). + Added an altitude information in GeneralStats. + Added a premice of multi smoke_emitter_location support (see + Engine class). + Hacked debug markers code to gear up/down 'g', and toggle markers + with 'm'. + Added PrimaryAeroDynamics classes in replacement to AeroDynamics. + Added AircraftPhysicModel.cpp to the project (it is not entirely + clear if this derived class will subsist). + Added a serialized class AircraftDynamics which encapsulates + dynamic aircraft classes. + Distinguished between air speed and speed in aircraft stats and + general stats. + In an attempt to limit fps drop with info on screen, InfoView will + be updated only every x (at the moment 5) frame and a + setDisplayList(false) has + been added to every text on screen. Need feedback from users about + that. Also, some "static" osgText::Texts take place in Framerate ... + Removed #include "windows.h" in CSPSim.cpp. + Changed position - attitude initialization. + Changed /Zm1000 to 200. + Moved enabling/disabling smoke osg code into SceneModel. + Made SceneModel to derive from simdata::Referenced. + Made ~ScreenInfo() protected (and its subsequent children); same for + ~SmokeTrailSystem() and ~SceneModel(). + 2003-05-04: delta Added a naive control of camera such that it keeps above ground. |
|
From: <mk...@us...> - 2003-06-19 17:50:58
|
Update of /cvsroot/csp/THIRDPARTYLIBS/CSPChunkLod/src/osgChunkLod In directory sc8-pr-cvs1:/tmp/cvs-serv20540 Modified Files: Makefile Log Message: Index: Makefile =================================================================== RCS file: /cvsroot/csp/THIRDPARTYLIBS/CSPChunkLod/src/osgChunkLod/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile 19 Jun 2003 17:42:57 -0000 1.1 --- Makefile 19 Jun 2003 17:50:55 -0000 1.2 *************** *** 24,28 **** RayStrip.cpp \ TextureQuadTree.cpp \ - TriangleIntersection.cpp \ Version.cpp --- 24,27 ---- |
|
From: <mk...@us...> - 2003-06-19 17:49:02
|
Update of /cvsroot/csp/THIRDPARTYLIBS/CSPChunkLod/src/osgChunkLod In directory sc8-pr-cvs1:/tmp/cvs-serv20233 Added Files: RegisterCombinerDetails.cpp Log Message: --- NEW FILE: RegisterCombinerDetails.cpp --- /* * RegisterCombinerDetails.cpp * * Copyright 2003 Mark Rose <mk...@us...> * * The osgChunkLod library is open source and may be redistributed and/or modified * under the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. * * This library 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 * OpenSceneGraph Public License for more details. * * Modifications by Mark Rose <mk...@us...>, May 2003, * see include/osgChunkLod/ChunkLod for details. * */ #include <osg/Texture2D> #include <osg/Image> #include <osg/TexGen> #ifdef USE_NV #include <osgNV/Version> #include <osgNV/RegisterCombiners> #include <osgNV/CombinerInput> #include <osgNV/CombinerOutput> #include <osgNV/FinalCombinerInput> #endif #include <osgDB/ReadFile> #include <string> #include <osgChunkLod/MultiTextureDetails> namespace osgChunkLod { class RegisterCombinerDetails: public MultiTextureDetails { public: #ifdef USE_NV RegisterCombinerDetails() { glGetIntegerv(GL_MAX_TEXTURE_UNITS_ARB, &_textureUnitCount); } void init(osg::StateSet *ss) { _rc = new osgNV::RegisterCombiners; _rc->setNumCombiners(2); osg::Vec3 light_dir(0.0, 0.707, 0.707); _rc->setConstantColor0(osg::Vec4(light_dir, 0)); _rc->setConstantColor1(osg::Vec4(1,1,1,1)); _rc->addParameter(new osgNV::CombinerInput(0, "RGB A CONSTANT_COLOR_0 SIGNED_IDENTITY NORMAL RGB")); // L _rc->addParameter(new osgNV::CombinerInput(0, "RGB B TEXTURE_1 EXPAND NORMAL RGB")); // NORMAL _rc->addParameter(new osgNV::CombinerInput(0, "RGB C PRIMARY_COLOR EXPAND NORMAL RGB")); // H _rc->addParameter(new osgNV::CombinerInput(0, "RGB D TEXTURE_1 EXPAND NORMAL RGB")); // NORMAL _rc->addParameter(new osgNV::CombinerOutput(0, "RGB SPARE_0 SPARE_1 DISCARD SCALE_NONE BIAS_NONE 1 1 0")); _rc->addParameter(new osgNV::CombinerInput(1, "RGB A TEXTURE_0 EXPAND NORMAL RGB")); // DIFFUSE _rc->addParameter(new osgNV::CombinerInput(1, "RGB B SPARE_0 UNSIGNED_IDENTITY NORMAL RGB")); // N.L _rc->addParameter(new osgNV::CombinerInput(1, "RGB C SPARE_1 UNSIGNED_IDENTITY NORMAL RGB")); // N.H _rc->addParameter(new osgNV::CombinerInput(1, "RGB D SPARE_1 UNSIGNED_IDENTITY NORMAL RGB")); // N.H _rc->addParameter(new osgNV::CombinerOutput(1, "RGB SPARE_0 SPARE_1 DISCARD SCALE_NONE BIAS_NONE 0 0 0")); // TODO alpha mux //_rc->addParameter(new osgNV::CombinerInput(1, "ALPHA A SPARE_1 UNSIGNED_IDENTITY NORMAL RGB")); // N.H _rc->addParameter(new osgNV::FinalCombinerInput("A CONSTANT_COLOR_1 UNSIGNED_IDENTITY RGB")); _rc->addParameter(new osgNV::FinalCombinerInput("B E_TIMES_F UNSIGNED_IDENTITY RGB")); _rc->addParameter(new osgNV::FinalCombinerInput("C ZERO UNSIGNED_IDENTITY RGB")); _rc->addParameter(new osgNV::FinalCombinerInput("D SPARE_0 UNSIGNED_IDENTITY RGB")); _rc->addParameter(new osgNV::FinalCombinerInput("E SPARE_1 UNSIGNED_IDENTITY RGB")); _rc->addParameter(new osgNV::FinalCombinerInput("F SPARE_1 UNSIGNED_IDENTITY RGB")); _rc->addParameter(new osgNV::FinalCombinerInput("G ZERO UNSIGNED_INVERT ALPHA")); ss->setAttributeAndModes(_rc.get()); } void enable(osg::State &state) const { int n = static_cast<int>(_detailTextures.size()); for (int i = 0; i < n; i++) { state.applyTextureAttribute (i+1, _detailTextures[i].get()); state.applyTextureMode (i+1, GL_TEXTURE_2D, true); // new // glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); // glTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_RGB_EXT, GL_ADD); state.applyTextureMode (i+1, GL_TEXTURE_GEN_S, true); // new state.applyTextureMode (i+1, GL_TEXTURE_GEN_T, true); // new } } void disable(osg::State &state) const { int n = static_cast<int>(_detailTextures.size()); for (int i = 0; i < n; i++) { state.applyTextureMode (i+1, GL_TEXTURE_2D, false); // new state.applyTextureMode (i+1, GL_TEXTURE_GEN_S, false); // new state.applyTextureMode (i+1, GL_TEXTURE_GEN_T, false); // new } } void setMode(osg::State &state, bool enabled) const { int n = static_cast<int>(_detailTextures.size()); for (int i = 0; i < n; i++) { state.applyTextureMode(i+1, GL_TEXTURE_2D, enabled); } } protected: osg::ref_ptr<osgNV::RegisterCombiners> _rc; #endif }; } // namespace osgChunkLod |
|
From: <mk...@us...> - 2003-06-19 17:39:36
|
Update of /cvsroot/csp/THIRDPARTYLIBS/CSPChunkLod/include/osgChunkLod In directory sc8-pr-cvs1:/tmp/cvs-serv18772/osgChunkLod Log Message: Directory /cvsroot/csp/THIRDPARTYLIBS/CSPChunkLod/include/osgChunkLod added to the repository |
|
From: <mk...@us...> - 2003-06-19 17:39:23
|
Update of /cvsroot/csp/THIRDPARTYLIBS/CSPChunkLod/src/osgChunkLod In directory sc8-pr-cvs1:/tmp/cvs-serv18729/osgChunkLod Log Message: Directory /cvsroot/csp/THIRDPARTYLIBS/CSPChunkLod/src/osgChunkLod added to the repository |
|
From: <mk...@us...> - 2003-06-19 17:38:48
|
Update of /cvsroot/csp/THIRDPARTYLIBS/CSPChunkLod
In directory sc8-pr-cvs1:/tmp/cvs-serv18644
Added Files:
LICENSE.osgchunklod Makefile
Log Message:
--- NEW FILE: LICENSE.osgchunklod ---
OpenSceneGraph Public License, Version 0.0
==========================================
Copyright (C) 2002 Robert Osfield.
Everyone is permitted to copy and distribute verbatim copies
of this licence document, but changing it is not allowed.
OPENSCENEGRAPH LIBRARY LICENCE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
This library is free software; you can redistribute it and/or modify it
under the terms of the OpenSceneGraph Public License (OSGPL) version 0.0
or later.
Notes: the OSGPL is based on the LGPL, with the 4 exceptions laid in in
the wxWindows section below. The LGPL in the final section of this
license.
-------------------------------------------------------------------------------
wxWindows Library Licence, Version 3
====================================
Copyright (C) 1998 Julian Smart, Robert Roebling [, ...]
Everyone is permitted to copy and distribute verbatim copies
of this licence document, but changing it is not allowed.
WXWINDOWS LIBRARY LICENCE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Library General Public Licence as published by
the Free Software Foundation; either version 2 of the Licence, or (at
your option) any later version.
This library 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 Library
General Public Licence for more details.
You should have received a copy of the GNU Library General Public Licence
along with this software, usually in a file named COPYING.LIB. If not,
write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
Boston, MA 02111-1307 USA.
EXCEPTION NOTICE
1. As a special exception, the copyright holders of this library give
permission for additional uses of the text contained in this release of
the library as licenced under the wxWindows Library Licence, applying
either version 3 of the Licence, or (at your option) any later version of
the Licence as published by the copyright holders of version 3 of the
Licence document.
2. The exception is that you may use, copy, link, modify and distribute
under the user's own terms, binary object code versions of works based
on the Library.
3. If you copy code from files distributed under the terms of the GNU
General Public Licence or the GNU Library General Public Licence into a
copy of this library, as this licence permits, the exception does not
apply to the code that you add in this way. To avoid misleading anyone as
to the status of such modified files, you must delete this exception
notice from such code and/or adjust the licensing conditions notice
accordingly.
4. If you write modifications of your own for this library, it is your
choice whether to permit this exception to apply to your modifications.
If you do not wish that, you must delete the exception notice from such
code and/or adjust the licensing conditions notice accordingly.
------------------------------------------------------------------------------
--- NEW FILE: Makefile ---
SUBDIRS = src/osgChunkLod
#SUBDIRS = src/Demos src/osgChunkLod
export GDEBUGF = -g -Wall
export GCFLAGS = -fPIC -O2# -DSWIG_GLOBAL #-march=athon-tbird
export GLDOPTS = -shared
export GSWOPTS = -c -c++ -python -noexcept
export CXX = g++
export SWIG = swig
.PHONY: all clean clean-deps swig default
default: all
all clean clean-deps: Makefile
@for dir in $(SUBDIRS); do \
$(MAKE) -C $${dir} $@ || exit 1; \
done
#Makefile: Makefile.in configure.in acinclude.m4
# aclocal ; autoconf
# ./configure
|
|
From: <mk...@us...> - 2003-06-19 17:38:36
|
Update of /cvsroot/csp/THIRDPARTYLIBS/CSPChunkLod/src In directory sc8-pr-cvs1:/tmp/cvs-serv18608/src Log Message: Directory /cvsroot/csp/THIRDPARTYLIBS/CSPChunkLod/src added to the repository |
|
From: <mk...@us...> - 2003-06-19 17:38:36
|
Update of /cvsroot/csp/THIRDPARTYLIBS/CSPChunkLod/lib In directory sc8-pr-cvs1:/tmp/cvs-serv18608/lib Log Message: Directory /cvsroot/csp/THIRDPARTYLIBS/CSPChunkLod/lib added to the repository |
|
From: <mk...@us...> - 2003-06-19 17:38:36
|
Update of /cvsroot/csp/THIRDPARTYLIBS/CSPChunkLod/include In directory sc8-pr-cvs1:/tmp/cvs-serv18608/include Log Message: Directory /cvsroot/csp/THIRDPARTYLIBS/CSPChunkLod/include added to the repository |
|
From: <mk...@us...> - 2003-06-19 17:37:57
|
Update of /cvsroot/csp/THIRDPARTYLIBS/CSPChunkLod In directory sc8-pr-cvs1:/tmp/cvs-serv18521/CSPChunkLod Log Message: Directory /cvsroot/csp/THIRDPARTYLIBS/CSPChunkLod added to the repository |
|
From: <de...@us...> - 2003-06-10 23:45:23
|
Update of /cvsroot/csp/APPLICATIONS/SimData In directory sc8-pr-cvs1:/tmp/cvs-serv9134 Modified Files: CHANGES.current Log Message: no message Index: CHANGES.current =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/SimData/CHANGES.current,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** CHANGES.current 10 Jun 2003 23:31:29 -0000 1.38 --- CHANGES.current 10 Jun 2003 23:45:20 -0000 1.39 *************** *** 2,5 **** --- 2,10 ---- =========================== + 2003-06-11: delta + Removed help methods ... from Math.h. + Added help methods to Conversions.h. + Added Conversions.h to .net project ;) + 2003-05-24: delta Added help methods to convert feet to meters and pounds to newtons |
|
From: <de...@us...> - 2003-06-10 23:42:56
|
Update of /cvsroot/csp/APPLICATIONS/SimData/VisualStudio In directory sc8-pr-cvs1:/tmp/cvs-serv7948 Modified Files: SimData.vcproj Log Message: no message Index: SimData.vcproj =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/SimData/VisualStudio/SimData.vcproj,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** SimData.vcproj 13 May 2003 07:27:08 -0000 1.7 --- SimData.vcproj 10 Jun 2003 23:42:53 -0000 1.8 *************** *** 227,230 **** --- 227,233 ---- </File> <File + RelativePath="..\Include\SimData\Conversions.h"> + </File> + <File RelativePath="..\Include\SimData\DataArchive.h"> </File> |
|
From: <de...@us...> - 2003-06-10 23:42:43
|
Update of /cvsroot/csp/APPLICATIONS/SimData/Include/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv7866
Modified Files:
Math.h Conversions.h
Log Message:
no message
Index: Math.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Math.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Math.h 10 Jun 2003 22:31:00 -0000 1.5
--- Math.h 10 Jun 2003 23:42:39 -0000 1.6
***************
*** 52,78 ****
- double const FtInM = 0.3048;
- double const MInFt = 3.2808;
-
- inline double FeetToMeters(double feet) {
- return FtInM * feet;
- }
-
- inline double MetersToFeet(double meters) {
- return MInFt * meters;
- }
-
- double const PdsToN = 4.44822;
-
- double const NToPds = 0.22481;
-
- inline double PoundsToNewtons(double pds) {
- return PdsToN * pds;
- }
-
- inline double NewtonsToPounds(double newtonw) {
- return NToPds * newtonw;
- }
-
NAMESPACE_END // namespace simdata
--- 52,55 ----
Index: Conversions.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Conversions.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Conversions.h 12 Apr 2003 08:56:37 -0000 1.2
--- Conversions.h 10 Jun 2003 23:42:40 -0000 1.3
***************
*** 123,126 ****
--- 123,139 ----
SIMDATA_CVT(mmhg_pa)
+ /**
+ * pounds to newtons
+ */
+ template <typename T>
+ T lb_n(T x) { return x * 4.44822; }
+ SIMDATA_CVT(lb_n)
+
+ /**
+ * newtons to pounds
+ */
+ template <typename T>
+ T n_lb(T x) { return x * 0.22481; }
+ SIMDATA_CVT(n_lb)
} // namespace convert
|
|
From: <mk...@us...> - 2003-06-10 23:32:05
|
Update of /cvsroot/csp/APPLICATIONS/SimData/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv2480/Source
Modified Files:
GeoPos.cpp LogStream.cpp
Log Message:
see CHANGES.current
Index: GeoPos.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/GeoPos.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** GeoPos.cpp 11 Apr 2003 18:06:39 -0000 1.2
--- GeoPos.cpp 10 Jun 2003 23:31:31 -0000 1.3
***************
*** 27,42 ****
#include <SimData/GeoPos.h>
#include <SimData/GlibCsp.h>
#include <cmath>
- #ifndef min
- #define min(a, b) ((a)<(b) ? (a) : (b))
- #endif
-
- #ifndef max
- #define max(a, b) ((a)>(b) ? (a) : (b))
- #endif
NAMESPACE_SIMDATA
--- 27,37 ----
+ #include <SimData/Math.h>
#include <SimData/GeoPos.h>
#include <SimData/GlibCsp.h>
+ #include <SimData/Pack.h>
#include <cmath>
NAMESPACE_SIMDATA
***************
*** 53,56 ****
--- 48,366 ----
}
+
+ ////////////////////////////////////////////////////////////////////////////////
+ // Geospacial Library Functions
+
+ void _iterateECEF(double &_lat, double &_alt, double p, double z_, double x_, double y_, double z, ReferenceEllipsoid const &_ref, int iter=0) {
+ x_ *= _ref.A;
+ y_ *= _ref.B;
+ double alt = sqrt((z_-y_)*(z_-y_)+(p-x_)*(p-x_));
+ double sy = _ref.A2_B2 * y_;
+ double h = 1.0/sqrt(sy*sy + x_*x_);
+ double dz = z - y_ - alt * sy * h;
+ double dp = p - x_ - alt * x_ * h;
+ if (iter > 15) {
+ _lat = atan2(sy, x_);
+ _alt = alt;
+ } else {
+ y_ = _ref.A_B * (y_ + dz);
+ x_ = x_ + dp;
+ double h = 1.0 / sqrt(y_*y_ + x_*x_);
+ _iterateECEF(_lat, _alt, p, z_, x_*h, y_*h, z, _ref, iter+1);
+ }
+ }
+
+ LLA ECEFtoLLA(ECEF const &ecef, ReferenceEllipsoid const &_ref)
+ {
+ double _lon = atan2(ecef.y, ecef.x);
+ double _lat, _alt;
+ double p = sqrt(ecef.x*ecef.x+ecef.y*ecef.y);
+ double q = _ref.A_B * ecef.z;
+ double h = 1.0 / sqrt(p*p+q*q);
+ _iterateECEF(_lat, _alt, p, ecef.z, p*h, q*h, ecef.z, _ref);
+ return LLA(_lon, _lat, _alt);
+ }
+
+ ECEF LLAtoECEF(LLA const &lla, ReferenceEllipsoid const &_ref)
+ {
+ double latp = atan2(_ref.B_A * tan(lla.latitude()), 1.0);
+ double c_latp = cos(latp);
+ double s_lon = sin(lla.longitude());
+ double c_lon = cos(lla.longitude());
+ double x0 = _ref.A * c_lon * c_latp;
+ double y0 = _ref.A * s_lon * c_latp;
+ double z0 = _ref.B * sin(latp);
+ double z_delta = lla.altitude() * sin(lla.latitude());
+ double p_delta = lla.altitude() * cos(lla.latitude());
+ return ECEF(x0 + p_delta * c_lon, y0 + p_delta * s_lon, z0 + z_delta);
+ }
+
+ ECEF UTMtoECEF(UTM const &utm, ReferenceEllipsoid const &_ref)
+ {
+ return LLAtoECEF(UTMtoLLA(utm, _ref), _ref);
+ }
+
+ UTM ECEFtoUTM(ECEF const &ecef, ReferenceEllipsoid const &_ref)
+ {
+ return LLAtoUTM(ECEFtoLLA(ecef, _ref), _ref);
+ }
+
+ LLA UTMtoLLA(UTM const &utm, ReferenceEllipsoid const &_ref)
+ {
+ // central-meridian scale factor
+ static double k0 = 0.9996;
+
+ double nu, T, T2, S, C, CP, SP, R, D, D2, M;
+ double mu, phi;
+ double x, y;
+
+ x = utm.easting() - 500000.0; //remove 500,000 meter offset for longitude
+ y = utm.northing();
+
+ if ((utm.designator() - 'N') < 0) {
+ y -= 10000000.0; //remove 10,000,000 meter offset used for southern hemisphere
+ }
+
+ double lon0 = D2R * ((utm.zone() - 1) * 6 - 180 + 3); //+3 puts origin in middle of zone
+
+ M = y / k0;
+
+ mu = M * _ref.m_f;
+
+ phi = mu + _ref.m_a*sin(2.0*mu) + _ref.m_b*sin(4.0*mu) + _ref.m_c*sin(6.0*mu);
+
+ C = cos(phi);
+ S = sin(phi);
+ T = S/C;
+ nu = _ref.A/sqrt(1.0-_ref.e2*S*S);
+ T2 = T * T;
+ CP = C * C * _ref.ep2;
+ SP = 1.0 - S * S * _ref.e2;
+ R = _ref.A * _ref.B2_A2 / (SP*sqrt(SP));
+ D = x/(nu*k0);
+ D2 = D*D;
+
+ double lat, lon;
+
+ lat = phi - (nu*T/R)*(D2*(0.5 - D2*((120.0+90.0*T2+CP*(300.0-120.0*CP)-270.0*_ref.ep2)
+ +(61.0+90.0*T2+298.0*CP+45.0*T2*T2-252.0*_ref.ep2-3.0*CP*CP)*D2)/720.0));
+
+ lon = D * ( 1.0 -
+ D2*( (1.0+2.0*T2+CP)/6.0 -
+ ( 5.0 -
+ CP*(2.0 + 3.0*CP) +
+ 8.0*_ref.ep2 +
+ T2*(28.0 + 24.0*T2)
+ )*D2/120.0
+ )
+ ) / C;
+
+ lon += lon0;
+
+ return LLA(lat, lon, utm.altitude());
+ }
+
+
+ UTM LLAtoUTM(LLA const &lla, ReferenceEllipsoid const &_ref, char _zone)
+ {
+ // central-meridian scale factor
+ static double k0 = 0.9996;
+ double lon = lla.longitude();
+ double lat = lla.latitude();
+ double lon0 = 0.0;
+ double nu, T, T2, C, CP, A, A2, A4, M, S;
+
+ //Make sure the longitude is between -180.00 .. 179.9
+ if (lon >= G_PI) {
+ int n = (int) (0.5 * lon / G_PI + 0.5);
+ lon -= n * 2.0 * G_PI;
+ } else
+ if (lon < -G_PI) {
+ int n = (int) (0.5 * lon / G_PI - 0.5);
+ lon -= n * 2.0 * G_PI;
+ }
+
+ if (_zone >= 0) {
+ switch (_zone) {
+ case 32:
+ lon0 = 0.1308996938996;
+ break;
+ case 31:
+ lon0 = 0.078539816339744;
+ break;
+ case 33:
+ lon0 = 0.261799387799149;
+ break;
+ case 35:
+ lon0 = 0.471238898038469;
+ break;
+ case 37:
+ lon0 = 0.654498469497874;
+ break;
+ default:
+ lon0 = G_PI / 180.0 * ((int(_zone) - 1)*6 - 180 + 3);
+ }
+ }
+
+ // special zone for Norway, lat 56 - 64 deg, lon 3 - 12 deg
+ if (lat >= 0.9773843811168 && lat < 1.1170107212764 &&
+ lon >= 0.0523598775598 && lon < 0.2094395102393) {
+ _zone = 32;
+ lon0 = 0.1308996938996;
+ } else
+ // special zones for Svalbard, lat 72 - 84
+ if( lat >= 1.2566370614359 && lat < 1.4660765716752) {
+ if (lon < 0.0) {
+ } else
+ if (lon < 0.157079632679490) { // 0 - 9 deg
+ _zone = 31;
+ lon0 = 0.078539816339744;
+ } else
+ if (lon < 0.366519142918809) { // 9 - 21 deg
+ _zone = 33;
+ lon0 = 0.261799387799149;
+ } else
+ if (lon < 0.575958653158129) { // 21 - 33 deg
+ _zone = 35;
+ lon0 = 0.471238898038469;
+ } else
+ if (lon < 0.733038285837618) { // 33 - 42 deg
+ _zone = 37;
+ lon0 = 0.654498469497874;
+ }
+ }
+
+ if (_zone == -1) {
+ _zone = char((lon / G_PI + 1.0) * 30.0) + 1;
+ lon0 = G_PI / 180.0 * ((int(_zone) - 1)*6 - 180 + 3);
+ }
+
+ S = sin(lat);
+ C = cos(lat);
+ T = S/C;
+ T2 = T * T;
+
+ nu = _ref.A/sqrt(1.0-_ref.e2*S*S);
+ CP = _ref.ep2*C*C;
+ A = C*(lon - lon0);
+ A2 = A * A;
+ A4 = A2 * A2;
+
+ // approximation for length of arc of a meridian from equator to lat
+ M = _ref.A*(_ref.m_0*lat + _ref.m_1*sin(2.0*lat) + _ref.m_2*sin(4.0*lat) - _ref.m_3*sin(6.0*lat));
+
+ double _easting, _northing;
+
+ _easting = k0 * nu * ( A +
+ (1.0 - T2 + CP) * A2 * A / 6 +
+ (5.0 + T2*(T2-18.0) + 72*CP - 58.0*_ref.ep2) * A4 *A / 120.0
+ ) + 500000.0;
+
+ _northing = k0 * ( M +
+ nu * T * ( 0.5*A2 +
+ (5.0 - T2 + CP*(9.0+4.0*CP))*A4/24.0 +
+ (61.0 + T2*(T2-58.0) + 600.0*CP - 330.0*_ref.ep2)*A4*A2/720.0
+ )
+ );
+
+ if (lat < 0.0) {
+ _northing += 10000000.0; //10000000 meter offset for southern hemisphere
+ }
+
+ char _designator = UTM::getDesignator(lat);
+ return UTM(_easting, _northing, _zone, _designator, lla.altitude());
+ }
+
+
+ void SurfaceDistance(LLA const &p, LLA const &q, double &distance, double &bearing, ReferenceEllipsoid const &_ref)
+ {
+ double U1 = atan2((1-_ref.f) * tan(p.latitude()), 1.0);
+ double U2 = atan2((1-_ref.f) * tan(q.latitude()), 1.0);
+ double s_U1 = sin(U1);
+ double c_U1 = cos(U1);
+ double s_U2 = sin(U2);
+ double c_U2 = cos(U2);
+ double psU = s_U1 * s_U2;
+ double pcU = c_U1 * c_U2;
+ double L = q.longitude() - p.longitude();
+ double lam = L;
+ double last = 100.0;
+ double s_lam;
+ double c_lam;
+ double t1;
+ double t2;
+ double s2_sig=0.0;
+ double c_sig=0.0;
+ double sig=0.0;
+ double s_sig;
+ double s_alp;
+ double c2_alp;
+ double c_2sigm=0.0;
+ double u;
+ double u2=0.0;
+ double c;
+ while (fabs(lam - last) > 0.00001) {
+ last = lam;
+ s_lam = sin(lam);
+ c_lam = cos(lam);
+ t1 = c_U2 * s_lam;
+ t2 = c_U1 * s_U2 - s_U1 * c_U2 * c_lam;
+ s2_sig = t1*t1 + t2*t2;
+ c_sig = s_U1 * s_U2 + c_U1 * c_U2 * c_lam;
+ sig = acos(c_sig);
+ s_sig = sqrt(s2_sig);
+ if (s2_sig == 0.0) {
+ if (pcU * s_lam > 0.0) {
+ s_alp = 1.0;
+ } else
+ if (pcU * s_lam < 0.0) {
+ s_alp = -1.0;
+ } else {
+ s_alp = 0.0;
+ }
+ } else {
+ s_alp = pcU * s_lam / s_sig;
+ s_alp = std::min(1.0, std::max(-1.0, s_alp));
+ }
+ c2_alp = 1.0 - s_alp*s_alp;
+ if (c2_alp == 0.0) {
+ if (psU > 0.0) {
+ c_2sigm = 1.0;
+ } else
+ if (psU < 0.0) {
+ c_2sigm = -1.0;
+ } else {
+ c_2sigm = 0.0;
+ }
+ } else {
+ c_2sigm = c_sig - 2.0 * psU / c2_alp;
+ c_2sigm = std::min(1.0, std::max(-1.0, c_2sigm));
+ }
+ u = cos(asin(s_alp));
+ u2 = u * u * (_ref.A2_B2 - 1);
+ c = _ref.f * c2_alp * (4.0 + _ref.f * (4.0 - 3.0 * c2_alp)) / 16.0;
+ lam = L + (1.0 - c) * _ref.f * s_alp * (sig + c * s_sig * (c_2sigm + c * c_sig * (-1.0 + 2.0 * c_2sigm * c_2sigm)));
+ }
+ double a = 1.0 + u2 * (64.0 + u2 * (-12.0 + 5.0 * u2)) / 256.0;
+ double b = u2 * (128.0 + u2 * (-64.0 + 37.0 * u2)) / 512.0;
+ double dsig = b * sqrt(s2_sig) * (c_2sigm + 0.25 * b * c_sig * (-1.0 + 2.0 * c_2sigm * c_2sigm));
+ distance = _ref.B * a * (sig - dsig);
+ bearing = atan2(c_U2 * sin(lam), c_U1 * s_U2 - s_U1 * c_U2 * cos(lam));
+ }
+
+
+ void ShellDistance(LLA const &p, LLA const &q, double &distance, double &bearing, ReferenceEllipsoid const &_ref)
+ {
+ double da = p.altitude() - q.altitude();
+ SurfaceDistance(p, q, distance, bearing, _ref);
+ distance = sqrt(distance*distance + da*da);
+ }
+
+
+
+
+ ////////////////////////////////////////////////////////////////////////////////
+ // GeoPos
+
GeoPos const &GeoPos::operator=(Vector3 const &v) {
x = v.x;
***************
*** 134,138 ****
} else {
s_alp = pcU * s_lam / s_sig;
! s_alp = min(1.0, max(-1.0, s_alp));
}
c2_alp = 1.0 - s_alp*s_alp;
--- 444,448 ----
} else {
s_alp = pcU * s_lam / s_sig;
! s_alp = std::min(1.0, std::max(-1.0, s_alp));
}
c2_alp = 1.0 - s_alp*s_alp;
***************
*** 148,152 ****
} else {
c_2sigm = c_sig - 2.0 * psU / c2_alp;
! c_2sigm = min(1.0, max(-1.0, c_2sigm));
}
u = cos(asin(s_alp));
--- 458,462 ----
} else {
c_2sigm = c_sig - 2.0 * psU / c2_alp;
! c_2sigm = std::min(1.0, std::max(-1.0, c_2sigm));
}
u = cos(asin(s_alp));
***************
*** 508,511 ****
--- 818,1051 ----
}
*/
+
+ /*
+ * TODO
+ *
+ * doxygen comments
+ * ECEF class
+ * specialized XML tags: LLA, UTM, ECEF
+ * keep GeoSet?
+ */
+
+
+
+
+ ////////////////////////////////////////////////////////////////////////////////////
+ // UTM
+
+ UTM::UTM(LLA const &lla, ReferenceEllipsoid const &ref, char zone_) {
+ *this = LLAtoUTM(lla, ref, zone_);
+ }
+
+ UTM::UTM(ECEF const &ecef, ReferenceEllipsoid const &ref) {
+ *this = ECEFtoUTM(ecef, ref);
+ }
+
+ UTM const &UTM::operator = (LLA const &lla) {
+ *this = LLAtoUTM(lla);
+ return *this;
+ }
+
+ UTM const &UTM::operator = (ECEF const &ecef) {
+ *this = ECEFtoUTM(ecef);
+ return *this;
+ }
+
+ /**
+ * Get the UTM designator for a given latitude, or 'Z' if outside
+ * the UTM limits (80S to 84N)
+ *
+ * @param lat latitude in radians
+ */
+ char UTM::getDesignator(double latitude)
+ {
+ static const char designator[] = "CDEFGHJKLMNPQRSTUVWXX";
+ latitude *= 180.0 / G_PI;
+ if (latitude < -80.0 || latitude > 84.0) return 'Z';
+ return designator[(int)(latitude + 80.0)>>3];
+ }
+
+ void UTM::set(double easting, double northing, const char *code, double alt)
+ {
+ _zone=0;
+ _designator='Z';
+ _E = easting;
+ _N = northing;
+ _alt = alt;
+ if (code) {
+ char c0 = code[0];
+ char c1 = code[1];
+ char c2 = code[2];
+ _zone = c0 - '0';
+ if (c2) {
+ _zone *= 10;
+ _zone += c1 - '0';
+ _designator = toupper(c2);
+ } else _designator = toupper(c1);
+ }
+ if (!valid()) {
+ // TODO
+ }
+ }
+
+ bool UTM::valid() const {
+ if (!strchr("CDEFGHJKLMNPQRSTUVWXX", _designator)) {
+ return false;
+ }
+ // check ZONE
+ return true;
+ }
+
+ std::string UTM::asString() const
+ {
+ char buff[128];
+ sprintf(buff, "[%.0lfE %.0lfN %d%c, %.3lf]", _E, _N, int(_zone), _designator, _alt);
+ return buff;
+ }
+
+ void UTM::parseXML(const char *cdata)
+ {
+ if (cdata) {
+ const char *c = cdata;
+ while (*c != 0 && (*c == ' ' || *c == '\t' || *c == '\r' || *c == '\n')) c++;
+ int zone;
+ char designator;
+ int n = sscanf(c, "%lf %lf %d%c %lf", &_E, &_N, &zone, &designator, &_alt);
+ if (n != 5) throw ParseException("SYNTAX ERROR: expecting 'easting northing zone altitude'");
+ _zone = zone;
+ _designator = toupper(designator);
+ if (!valid()) {
+ throw ParseException("SYNTAX ERROR: invalid UTM code");
+ }
+ } else throw ParseException("SYNTAX ERROR: empty vector");
+ }
+
+ /**
+ * Serialize to a data archive
+ */
+ void UTM::pack(Packer &p) const
+ {
+ p.pack(_E);
+ p.pack(_N);
+ p.pack(_zone);
+ p.pack(_designator);
+ p.pack(_alt);
+ }
+
+ /**
+ * Deserialize from a data archive
+ */
+ void UTM::unpack(UnPacker &p)
+ {
+ p.unpack(_E);
+ p.unpack(_N);
+ p.unpack(_zone);
+ p.unpack(_designator);
+ p.unpack(_alt);
+ }
+
+
+
+ ////////////////////////////////////////////////////////////////////////////////////
+ // LLA
+
+ LLA::LLA(UTM const &utm, ReferenceEllipsoid const &ref)
+ {
+ *this = UTMtoLLA(utm, ref);
+ }
+
+ LLA::LLA(ECEF const &ecef, ReferenceEllipsoid const &ref) {
+ *this = ECEFtoLLA(ecef, ref);
+ }
+
+ LLA const &LLA::operator = (UTM const &utm)
+ {
+ *this = UTMtoLLA(utm);
+ return *this;
+ }
+
+ LLA const &LLA::operator = (ECEF const &ecef)
+ {
+ *this = ECEFtoLLA(ecef);
+ return *this;
+ }
+
+ std::string LLA::asString() const
+ {
+ char buff[128];
+ sprintf(buff, "[%.3f %.3f, %.3f]", RadiansToDegrees(_lat), RadiansToDegrees(_lon), _alt);
+ return buff;
+ }
+
+ void LLA::parseXML(const char* cdata) {
+ // 37.91283 -120.12398 234.033
+ // 37'59"20 -120'4"43 234.033
+ if (cdata) {
+ const char *c = cdata;
+ while (*c != 0 && (*c == ' ' || *c == '\t' || *c == '\r' || *c == '\n')) c++;
+ double X, Y, Z;
+ if (strchr(c, '\'')) {
+ int lat, latm, lon, lonm;
+ int n = sscanf(c, "%d'%d\"%lf %d'%d\"%lf %lf", &lat, &latm, &X, &lon, &lonm, &Y, &Z);
+ if (n != 7) throw ParseException("SYNTAX ERROR: expecting 'lat'min\"sec lon'min\"sec altitude'");
+ _lat = DegreesToRadians(lat + latm / 60.0 + X / 3600.0);
+ _lon = DegreesToRadians(lon + lonm / 60.0 + Y / 3600.0);
+ _alt = Z;
+ } else {
+ int n = sscanf(c, "%lf %lf %lf", &X, &Y, &Z);
+ if (n != 3) throw ParseException("SYNTAX ERROR: expecting 'latitude longitude altitude'");
+ _lat = DegreesToRadians(X);
+ _lon = DegreesToRadians(Y);
+ _alt = Z;
+ }
+ return;
+ }
+ throw ParseException("SYNTAX ERROR: expecting 'latitude longitude altitude'");
+ }
+
+ void LLA::pack(Packer &p) const {
+ p.pack(_lat);
+ p.pack(_lon);
+ p.pack(_alt);
+ }
+
+ void LLA::unpack(UnPacker &p) {
+ p.unpack(_lat);
+ p.unpack(_lon);
+ p.unpack(_alt);
+ }
+
+ void LLA::setDegrees(double lat, double lon, double alt) {
+ _lat = DegreesToRadians(lat);
+ _lon = DegreesToRadians(lon);
+ _alt = alt;
+ }
+
+
+
+ ////////////////////////////////////////////////////////////////////////////////////
+ // ECEF
+
+ ECEF::ECEF(UTM const &utm, ReferenceEllipsoid const &ref)
+ {
+ *this = UTMtoECEF(utm, ref);
+ }
+
+ ECEF::ECEF(LLA const &lla, ReferenceEllipsoid const &ref)
+ {
+ *this = LLAtoECEF(lla, ref);
+ }
+
+ ECEF const &ECEF::operator = (UTM const &utm)
+ {
+ *this = UTMtoECEF(utm);
+ return *this;
+ }
+
+ ECEF const &ECEF::operator = (LLA const &lla)
+ {
+ *this = LLAtoECEF(lla);
+ return *this;
+ }
Index: LogStream.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/LogStream.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** LogStream.cpp 4 May 2003 07:23:23 -0000 1.2
--- LogStream.cpp 10 Jun 2003 23:31:32 -0000 1.3
***************
*** 32,37 ****
-
-
logbuf::logbuf()
{
--- 32,35 ----
***************
*** 75,79 ****
}
! int logbuf::get_log_priority ()
{
return logPriority;
--- 73,77 ----
}
! int logbuf::get_log_priority()
{
return logPriority;
***************
*** 82,86 ****
void logstream::setLogLevels(int c, int p)
{
! lbuf.set_log_level( c, p );
}
--- 80,89 ----
void logstream::setLogLevels(int c, int p)
{
! lbuf.set_log_level(c, p);
! }
!
! void logstream::setLogClasses(int c)
! {
! lbuf.set_log_classes(c);
}
|
