author | Wuzzy <Wuzzy2@mail.ru> |
Thu, 19 Jul 2018 19:35:28 +0200 (2018-07-19) | |
changeset 13518 | d8462cc9d42d |
parent 11046 | 47a8c19ecb60 |
permissions | -rw-r--r-- |
351 | 1 |
(* |
1066 | 2 |
* Hedgewars, a free turn based strategy game |
11046 | 3 |
* Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com> |
351 | 4 |
* |
5 |
* This program is free software; you can redistribute it and/or modify |
|
6 |
* it under the terms of the GNU General Public License as published by |
|
7 |
* the Free Software Foundation; version 2 of the License |
|
8 |
* |
|
9 |
* This program is distributed in the hope that it will be useful, |
|
10 |
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
11 |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
12 |
* GNU General Public License for more details. |
|
13 |
* |
|
14 |
* You should have received a copy of the GNU General Public License |
|
15 |
* along with this program; if not, write to the Free Software |
|
10108
c68cf030eded
update FSF address. note: two sdl include files (by Sam Lantinga) still have the old FSF address in their copyright - but I ain't gonna touch their copyright headers
sheepluva
parents:
10015
diff
changeset
|
16 |
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
351 | 17 |
*) |
18 |
||
2630 | 19 |
{$INCLUDE "options.inc"} |
20 |
||
351 | 21 |
unit uFloat; |
5122 | 22 |
(* |
23 |
* This unit provides a custom data type, hwFloat. |
|
24 |
* |
|
25 |
* hwFloat represents a floating point number - the value and operations |
|
26 |
* of this numbers are independent from the hardware architecture |
|
27 |
* the game runs on. |
|
28 |
* |
|
29 |
* This is important for calculations that affect the course of the game |
|
30 |
* and would lead to different results if based on a hardware dependent |
|
31 |
* data type. |
|
32 |
* |
|
33 |
* Note: Not all comparisons are implemented. |
|
34 |
* |
|
35 |
* Note: Below you'll find a list of hwFloat constants: |
|
36 |
* E.g. _1 is an hwFloat with value 1.0, and -_0_9 is -0.9 |
|
5124 | 37 |
* Use and extend the list if needed, rather than using int2hwFloat() |
38 |
* with integer constants. |
|
5122 | 39 |
*) |
351 | 40 |
interface |
41 |
||
2599 | 42 |
{$IFDEF ENDIAN_LITTLE} |
351 | 43 |
type hwFloat = record |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6498
diff
changeset
|
44 |
isNegative: boolean; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6498
diff
changeset
|
45 |
case byte of |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6498
diff
changeset
|
46 |
0: (Frac, Round: Longword); |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6498
diff
changeset
|
47 |
1: (QWordValue : QWord); |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6498
diff
changeset
|
48 |
end; |
2599 | 49 |
{$ELSE} |
351 | 50 |
type hwFloat = record |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6498
diff
changeset
|
51 |
isNegative: boolean; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6498
diff
changeset
|
52 |
case byte of |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6498
diff
changeset
|
53 |
0: (Round, Frac: Longword); |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6498
diff
changeset
|
54 |
1: (QWordValue : QWord); |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6498
diff
changeset
|
55 |
end; |
2599 | 56 |
{$ENDIF} |
351 | 57 |
|
5122 | 58 |
// Returns an hwFloat that represents the value of integer parameter i |
3599 | 59 |
function int2hwFloat (const i: LongInt) : hwFloat; inline; |
5151
cbadb9fa52fc
An experiment - make bazooka AI use float instead of hwFloat - should be as accurate, but faster.
nemo
parents:
5124
diff
changeset
|
60 |
function hwFloat2Float (const i: hwFloat) : extended; inline; |
351 | 61 |
|
5122 | 62 |
// The implemented operators |
63 |
||
6415 | 64 |
operator = (const z1, z2: hwFloat) z : boolean; inline; |
7043
7c080e5ac8d0
Some work to make more units compile after conversion to c
unc0rr
parents:
7042
diff
changeset
|
65 |
{$IFDEF PAS2C} |
7042
de20086a6bcc
Support overloaded operators on (hwFloat op hwFloat) calls
unc0rr
parents:
6879
diff
changeset
|
66 |
operator <> (const z1, z2: hwFloat) z : boolean; inline; |
7043
7c080e5ac8d0
Some work to make more units compile after conversion to c
unc0rr
parents:
7042
diff
changeset
|
67 |
{$ENDIF} |
3599 | 68 |
operator + (const z1, z2: hwFloat) z : hwFloat; inline; |
69 |
operator - (const z1, z2: hwFloat) z : hwFloat; inline; |
|
3929
9a4bbc1f67a2
Inline most of uFloat (saves ~7.5% opcount on a test game), inline a few very short candidates in uMisc, comment out some unused functions in uMisc
nemo
parents:
3599
diff
changeset
|
70 |
operator - (const z1: hwFloat) z : hwFloat; inline; |
351 | 71 |
|
3929
9a4bbc1f67a2
Inline most of uFloat (saves ~7.5% opcount on a test game), inline a few very short candidates in uMisc, comment out some unused functions in uMisc
nemo
parents:
3599
diff
changeset
|
72 |
operator * (const z1, z2: hwFloat) z : hwFloat; inline; |
3599 | 73 |
operator * (const z1: hwFloat; const z2: LongInt) z : hwFloat; inline; |
3929
9a4bbc1f67a2
Inline most of uFloat (saves ~7.5% opcount on a test game), inline a few very short candidates in uMisc, comment out some unused functions in uMisc
nemo
parents:
3599
diff
changeset
|
74 |
operator / (const z1: hwFloat; z2: hwFloat) z : hwFloat; inline; |
9a4bbc1f67a2
Inline most of uFloat (saves ~7.5% opcount on a test game), inline a few very short candidates in uMisc, comment out some unused functions in uMisc
nemo
parents:
3599
diff
changeset
|
75 |
operator / (const z1: hwFloat; const z2: LongInt) z : hwFloat; inline; |
351 | 76 |
|
3929
9a4bbc1f67a2
Inline most of uFloat (saves ~7.5% opcount on a test game), inline a few very short candidates in uMisc, comment out some unused functions in uMisc
nemo
parents:
3599
diff
changeset
|
77 |
operator < (const z1, z2: hwFloat) b : boolean; inline; |
9a4bbc1f67a2
Inline most of uFloat (saves ~7.5% opcount on a test game), inline a few very short candidates in uMisc, comment out some unused functions in uMisc
nemo
parents:
3599
diff
changeset
|
78 |
operator > (const z1, z2: hwFloat) b : boolean; inline; |
351 | 79 |
|
5122 | 80 |
|
81 |
// Various functions for hwFloat (some are inlined in the resulting code for better performance) |
|
82 |
||
83 |
function cstr(const z: hwFloat): shortstring; // Returns a shortstring representations of the hwFloat. |
|
84 |
function hwRound(const t: hwFloat): LongInt; inline; // Does NOT really round but returns the integer representation of the hwFloat without fractional digits. (-_0_9 -> -0, _1_5 -> _1) |
|
85 |
function hwAbs(const t: hwFloat): hwFloat; inline; // Returns the value of t with positive sign. |
|
86 |
function hwSqr(const t: hwFloat): hwFloat; inline; // Returns the square value of parameter t. |
|
8905
82b1400f4a08
New hwSqrt implementation which is 46/19 times faster than the old one!
unc0rr
parents:
8838
diff
changeset
|
87 |
function hwSqrt1(const t: hwFloat): hwFloat; inline; // Returns the the positive square root of parameter t. |
82b1400f4a08
New hwSqrt implementation which is 46/19 times faster than the old one!
unc0rr
parents:
8838
diff
changeset
|
88 |
function hwSqrt(const x: hwFloat): hwFloat; inline; // Returns the the positive square root of parameter t. |
5122 | 89 |
function Distance(const dx, dy: hwFloat): hwFloat; // Returns the distance between two points in 2-dimensional space, of which the parameters are the horizontal and vertical distance. |
90 |
function DistanceI(const dx, dy: LongInt): hwFloat; // Same as above for integer parameters. |
|
515 | 91 |
function AngleSin(const Angle: Longword): hwFloat; |
92 |
function AngleCos(const Angle: Longword): hwFloat; |
|
7714
981001b84f0b
vector2Angle function which converts vector to angle from -2048 to 2048
unc0rr
parents:
7688
diff
changeset
|
93 |
function vector2Angle(const x, y: hwFloat): LongInt; |
5122 | 94 |
function SignAs(const num, signum: hwFloat): hwFloat; inline; // Returns an hwFloat with the value of parameter num and the sign of signum. |
95 |
function hwSign(r: hwFloat): LongInt; inline; // Returns an integer with value 1 and sign of parameter r. |
|
6879 | 96 |
function hwSignf(r: real): LongInt; inline; // Returns an integer with value 1 and sign of parameter r. |
5599
2e4b90f33a83
aiming fixed, inverted cursor on ammo menu, added equal and isZero function to uFloat, changed the way ammo menu opens, you must now click on the hog rather than anywhere on the screen
Xeli
parents:
5319
diff
changeset
|
97 |
function isZero(const z: hwFloat): boolean; inline; |
10015 | 98 |
|
611 | 99 |
{$WARNINGS OFF} |
5122 | 100 |
// some hwFloat constants |
351 | 101 |
const _1div1024: hwFloat = (isNegative: false; QWordValue: 4194304); |
102 |
_1div10000: hwFloat = (isNegative: false; QWordValue: 429496); |
|
103 |
_1div50000: hwFloat = (isNegative: false; QWordValue: 85899); |
|
104 |
_1div100000: hwFloat = (isNegative: false; QWordValue: 42950); |
|
105 |
_1div3: hwFloat = (isNegative: false; QWordValue: 1431655766); |
|
106 |
hwPi: hwFloat = (isNegative: false; QWordValue: 13493037704); |
|
107 |
_0_000004: hwFloat = (isNegative: false; QWordValue: 17179); |
|
3591 | 108 |
_0_000064: hwFloat = (isNegative: false; QWordValue: 274878); |
351 | 109 |
_0_0002: hwFloat = (isNegative: false; QWordValue: 858993); |
1586 | 110 |
_0_0005: hwFloat = (isNegative: false; QWordValue: 2147484); |
351 | 111 |
_0_001: hwFloat = (isNegative: false; QWordValue: 4294967); |
112 |
_0_003: hwFloat = (isNegative: false; QWordValue: 12884902); |
|
7663 | 113 |
_0_0032: hwFloat = (isNegative: false; QWordValue: 13743895); |
351 | 114 |
_0_004: hwFloat = (isNegative: false; QWordValue: 17179869); |
115 |
_0_005: hwFloat = (isNegative: false; QWordValue: 21474836); |
|
3428 | 116 |
_0_008: hwFloat = (isNegative: false; QWordValue: 34359738); |
351 | 117 |
_0_01: hwFloat = (isNegative: false; QWordValue: 42949673); |
7593
b966e2d833f2
An attempt to run main rope code only every 8th tick:
unc0rr
parents:
7515
diff
changeset
|
118 |
_0_0128: hwFloat = (isNegative: false; QWordValue: 54975581); |
351 | 119 |
_0_02: hwFloat = (isNegative: false; QWordValue: 85899345); |
120 |
_0_03: hwFloat = (isNegative: false; QWordValue: 128849018); |
|
6295
5b2b304a91ec
Due to the small values and friction, halve the step in low gravity, instead of the value
nemo
parents:
5843
diff
changeset
|
121 |
_0_07: hwFloat = (isNegative: false; QWordValue: 300647710); |
351 | 122 |
_0_08: hwFloat = (isNegative: false; QWordValue: 343597383); |
365 | 123 |
_0_1: hwFloat = (isNegative: false; QWordValue: 429496730); |
351 | 124 |
_0_15: hwFloat = (isNegative: false; QWordValue: 644245094); |
125 |
_0_2: hwFloat = (isNegative: false; QWordValue: 858993459); |
|
126 |
_0_25: hwFloat = (isNegative: false; QWordValue: 1073741824); |
|
127 |
_0_3: hwFloat = (isNegative: false; QWordValue: 1288490189); |
|
128 |
_0_35: hwFloat = (isNegative: false; QWordValue: 1503238553); |
|
2784 | 129 |
_0_375: hwFloat = (isNegative: false; QWordValue: 4294967296 * 3 div 8); |
835
6f567934cc44
Automatically use parachute when vertical speed is high enough
unc0rr
parents:
745
diff
changeset
|
130 |
_0_39: hwFloat = (isNegative: false; QWordValue: 1675037245); |
351 | 131 |
_0_4: hwFloat = (isNegative: false; QWordValue: 1717986918); |
132 |
_0_45: hwFloat = (isNegative: false; QWordValue: 1932735283); |
|
133 |
_0_5: hwFloat = (isNegative: false; QWordValue: 2147483648); |
|
134 |
_0_55: hwFloat = (isNegative: false; QWordValue: 2362232012); |
|
135 |
_0_6: hwFloat = (isNegative: false; QWordValue: 2576980377); |
|
3583 | 136 |
_0_64: hwFloat = (isNegative: false; QWordValue: 2748779064); |
358 | 137 |
_0_7: hwFloat = (isNegative: false; QWordValue: 3006477107); |
351 | 138 |
_0_8: hwFloat = (isNegative: false; QWordValue: 3435973837); |
139 |
_0_84: hwFloat = (isNegative: false; QWordValue: 3607772528); |
|
140 |
_0_87: hwFloat = (isNegative: false; QWordValue: 3736621547); |
|
141 |
_0_9: hwFloat = (isNegative: false; QWordValue: 3865470566); |
|
142 |
_0_93: hwFloat = (isNegative: false; QWordValue: 3994319585); |
|
143 |
_0_96: hwFloat = (isNegative: false; QWordValue: 4123168604); |
|
144 |
_0_995: hwFloat = (isNegative: false; QWordValue: 4273492459); |
|
145 |
_0_999: hwFloat = (isNegative: false; QWordValue: 4290672328); |
|
498 | 146 |
_0: hwFloat = (isNegative: false; QWordValue: 0); |
147 |
_1: hwFloat = (isNegative: false; QWordValue: 4294967296); |
|
9968 | 148 |
_1_2: hwFloat = (isNegative: false; QWordValue: 4294967296 * 6 div 5 + 1); |
513
69e06d710d46
Moving hedgehog could get another hedgehog moving forward
unc0rr
parents:
498
diff
changeset
|
149 |
_1_5: hwFloat = (isNegative: false; QWordValue: 4294967296 * 3 div 2); |
7593
b966e2d833f2
An attempt to run main rope code only every 8th tick:
unc0rr
parents:
7515
diff
changeset
|
150 |
_1_6: hwFloat = (isNegative: false; QWordValue: 4294967296 * 8 div 5); |
3584 | 151 |
_1_9: hwFloat = (isNegative: false; QWordValue: 8160437862); |
498 | 152 |
_2: hwFloat = (isNegative: false; QWordValue: 4294967296 * 2); |
7593
b966e2d833f2
An attempt to run main rope code only every 8th tick:
unc0rr
parents:
7515
diff
changeset
|
153 |
_2_4: hwFloat = (isNegative: false; QWordValue: 4294967296 * 12 div 5); |
498 | 154 |
_3: hwFloat = (isNegative: false; QWordValue: 4294967296 * 3); |
9970 | 155 |
_3_2: hwFloat = (isNegative: false; QWordValue: 4294967296 * 16 div 5); |
6785 | 156 |
_PI: hwFloat = (isNegative: false; QWordValue: 13493037704); |
498 | 157 |
_4: hwFloat = (isNegative: false; QWordValue: 4294967296 * 4); |
6498 | 158 |
_4_5: hwFloat = (isNegative: false; QWordValue: 4294967296 * 9 div 2); |
498 | 159 |
_5: hwFloat = (isNegative: false; QWordValue: 4294967296 * 5); |
160 |
_6: hwFloat = (isNegative: false; QWordValue: 4294967296 * 6); |
|
9970 | 161 |
_6_4: hwFloat = (isNegative: false; QWordValue: 4294967296 * 32 div 5); |
7593
b966e2d833f2
An attempt to run main rope code only every 8th tick:
unc0rr
parents:
7515
diff
changeset
|
162 |
_7: hwFloat = (isNegative: false; QWordValue: 4294967296 * 7); |
498 | 163 |
_10: hwFloat = (isNegative: false; QWordValue: 4294967296 * 10); |
3422
41ae3c48faa0
* some changes/cleanups to portal, still much to do :/ * reverted nemo's temporary loop fix * notice: small loops possible again, so take care :P, bigger onces should be interrupted
sheepluva
parents:
3407
diff
changeset
|
164 |
_12: hwFloat = (isNegative: false; QWordValue: 4294967296 * 12); |
498 | 165 |
_16: hwFloat = (isNegative: false; QWordValue: 4294967296 * 16); |
166 |
_19: hwFloat = (isNegative: false; QWordValue: 4294967296 * 19); |
|
167 |
_20: hwFloat = (isNegative: false; QWordValue: 4294967296 * 20); |
|
168 |
_25: hwFloat = (isNegative: false; QWordValue: 4294967296 * 25); |
|
169 |
_30: hwFloat = (isNegative: false; QWordValue: 4294967296 * 30); |
|
2955
fb361d137524
Tweak to joke in french locale (everyone always fixes the spelling) updated explosive frames from Palewolf, increase explosive fall damage from 30 to 40
nemo
parents:
2948
diff
changeset
|
170 |
_40: hwFloat = (isNegative: false; QWordValue: 4294967296 * 40); |
7594 | 171 |
_41: hwFloat = (isNegative: false; QWordValue: 4294967296 * 41); |
7593
b966e2d833f2
An attempt to run main rope code only every 8th tick:
unc0rr
parents:
7515
diff
changeset
|
172 |
_49: hwFloat = (isNegative: false; QWordValue: 4294967296 * 49); |
3036
c6ba6531cb4b
Make barrels a little more likely to blow up. 25% more damage in fall
nemo
parents:
2955
diff
changeset
|
173 |
_50: hwFloat = (isNegative: false; QWordValue: 4294967296 * 50); |
2933 | 174 |
_70: hwFloat = (isNegative: false; QWordValue: 4294967296 * 70); |
5599
2e4b90f33a83
aiming fixed, inverted cursor on ammo menu, added equal and isZero function to uFloat, changed the way ammo menu opens, you must now click on the hog rather than anywhere on the screen
Xeli
parents:
5319
diff
changeset
|
175 |
_90: hwFloat = (isNegative: false; QWordValue: 4294967296 * 90); |
498 | 176 |
_128: hwFloat = (isNegative: false; QWordValue: 4294967296 * 128); |
5599
2e4b90f33a83
aiming fixed, inverted cursor on ammo menu, added equal and isZero function to uFloat, changed the way ammo menu opens, you must now click on the hog rather than anywhere on the screen
Xeli
parents:
5319
diff
changeset
|
177 |
_180: hwFloat = (isNegative: false; QWordValue: 4294967296 * 180); |
5319
51d8e4747876
bounce. tweak of values, remove friction modifier, move to weapon, to match timer behaviour
nemo
parents:
5192
diff
changeset
|
178 |
_250: hwFloat = (isNegative: false; QWordValue: 4294967296 * 250); |
1915 | 179 |
_256: hwFloat = (isNegative: false; QWordValue: 4294967296 * 256); |
1124 | 180 |
_300: hwFloat = (isNegative: false; QWordValue: 4294967296 * 300); |
5599
2e4b90f33a83
aiming fixed, inverted cursor on ammo menu, added equal and isZero function to uFloat, changed the way ammo menu opens, you must now click on the hog rather than anywhere on the screen
Xeli
parents:
5319
diff
changeset
|
181 |
_360: hwFloat = (isNegative: false; QWordValue: 4294967296 * 360); |
498 | 182 |
_450: hwFloat = (isNegative: false; QWordValue: 4294967296 * 450); |
5319
51d8e4747876
bounce. tweak of values, remove friction modifier, move to weapon, to match timer behaviour
nemo
parents:
5192
diff
changeset
|
183 |
_1000: hwFloat = (isNegative: false; QWordValue: 4294967296 * 1000); |
611 | 184 |
_1024: hwFloat = (isNegative: false; QWordValue: 4294967296 * 1024); |
185 |
_2048: hwFloat = (isNegative: false; QWordValue: 4294967296 * 2048); |
|
1753 | 186 |
_4096: hwFloat = (isNegative: false; QWordValue: 4294967296 * 4096); |
498 | 187 |
_10000: hwFloat = (isNegative: false; QWordValue: 4294967296 * 10000); |
351 | 188 |
|
189 |
cLittle: hwFloat = (isNegative: false; QWordValue: 1); |
|
967 | 190 |
cHHKick: hwFloat = (isNegative: false; QWordValue: 42949673); // _0_01 |
611 | 191 |
{$WARNINGS ON} |
351 | 192 |
|
193 |
implementation |
|
4415 | 194 |
uses uSinTable; |
351 | 195 |
|
3599 | 196 |
|
7624
03d662ff9c41
A few more operators. Committing in case unc0rr wants to fiddle.
nemo
parents:
7623
diff
changeset
|
197 |
function int2hwFloat (const i: LongInt) : hwFloat; inline; |
351 | 198 |
begin |
498 | 199 |
int2hwFloat.isNegative:= i < 0; |
200 |
int2hwFloat.Round:= abs(i); |
|
201 |
int2hwFloat.Frac:= 0 |
|
351 | 202 |
end; |
203 |
||
7624
03d662ff9c41
A few more operators. Committing in case unc0rr wants to fiddle.
nemo
parents:
7623
diff
changeset
|
204 |
function hwFloat2Float (const i: hwFloat) : extended; inline; |
5151
cbadb9fa52fc
An experiment - make bazooka AI use float instead of hwFloat - should be as accurate, but faster.
nemo
parents:
5124
diff
changeset
|
205 |
begin |
7614
3ae60c8a15f2
Starting to rewrite uFloat routines to avoid QWordValue - in the interests of JS which may get uint64/int64 in the spec in the future but does not have it now.
nemo
parents:
7594
diff
changeset
|
206 |
hwFloat2Float:= i.Frac / $100000000 + i.Round; |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6498
diff
changeset
|
207 |
if i.isNegative then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6498
diff
changeset
|
208 |
hwFloat2Float:= -hwFloat2Float; |
5151
cbadb9fa52fc
An experiment - make bazooka AI use float instead of hwFloat - should be as accurate, but faster.
nemo
parents:
5124
diff
changeset
|
209 |
end; |
cbadb9fa52fc
An experiment - make bazooka AI use float instead of hwFloat - should be as accurate, but faster.
nemo
parents:
5124
diff
changeset
|
210 |
|
6415 | 211 |
operator = (const z1, z2: hwFloat) z : boolean; inline; |
5599
2e4b90f33a83
aiming fixed, inverted cursor on ammo menu, added equal and isZero function to uFloat, changed the way ammo menu opens, you must now click on the hog rather than anywhere on the screen
Xeli
parents:
5319
diff
changeset
|
212 |
begin |
5665 | 213 |
z:= (z1.isNegative = z2.isNegative) and (z1.QWordValue = z2.QWordValue); |
5599
2e4b90f33a83
aiming fixed, inverted cursor on ammo menu, added equal and isZero function to uFloat, changed the way ammo menu opens, you must now click on the hog rather than anywhere on the screen
Xeli
parents:
5319
diff
changeset
|
214 |
end; |
2e4b90f33a83
aiming fixed, inverted cursor on ammo menu, added equal and isZero function to uFloat, changed the way ammo menu opens, you must now click on the hog rather than anywhere on the screen
Xeli
parents:
5319
diff
changeset
|
215 |
|
7043
7c080e5ac8d0
Some work to make more units compile after conversion to c
unc0rr
parents:
7042
diff
changeset
|
216 |
{$IFDEF PAS2C} |
7042
de20086a6bcc
Support overloaded operators on (hwFloat op hwFloat) calls
unc0rr
parents:
6879
diff
changeset
|
217 |
operator <> (const z1, z2: hwFloat) z : boolean; inline; |
de20086a6bcc
Support overloaded operators on (hwFloat op hwFloat) calls
unc0rr
parents:
6879
diff
changeset
|
218 |
begin |
de20086a6bcc
Support overloaded operators on (hwFloat op hwFloat) calls
unc0rr
parents:
6879
diff
changeset
|
219 |
z:= (z1.isNegative <> z2.isNegative) or (z1.QWordValue <> z2.QWordValue); |
de20086a6bcc
Support overloaded operators on (hwFloat op hwFloat) calls
unc0rr
parents:
6879
diff
changeset
|
220 |
end; |
7043
7c080e5ac8d0
Some work to make more units compile after conversion to c
unc0rr
parents:
7042
diff
changeset
|
221 |
{$ENDIF} |
7042
de20086a6bcc
Support overloaded operators on (hwFloat op hwFloat) calls
unc0rr
parents:
6879
diff
changeset
|
222 |
|
7624
03d662ff9c41
A few more operators. Committing in case unc0rr wants to fiddle.
nemo
parents:
7623
diff
changeset
|
223 |
operator + (const z1, z2: hwFloat) z : hwFloat; inline; |
351 | 224 |
begin |
225 |
if z1.isNegative = z2.isNegative then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6498
diff
changeset
|
226 |
begin |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6498
diff
changeset
|
227 |
z.isNegative:= z1.isNegative; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6498
diff
changeset
|
228 |
z.QWordValue:= z1.QWordValue + z2.QWordValue |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6498
diff
changeset
|
229 |
end |
351 | 230 |
else |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6498
diff
changeset
|
231 |
if z1.QWordValue > z2.QWordValue then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6498
diff
changeset
|
232 |
begin |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6498
diff
changeset
|
233 |
z.isNegative:= z1.isNegative; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6498
diff
changeset
|
234 |
z.QWordValue:= z1.QWordValue - z2.QWordValue |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6498
diff
changeset
|
235 |
end |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6498
diff
changeset
|
236 |
else |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6498
diff
changeset
|
237 |
begin |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6498
diff
changeset
|
238 |
z.isNegative:= z2.isNegative; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6498
diff
changeset
|
239 |
z.QWordValue:= z2.QWordValue - z1.QWordValue |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6498
diff
changeset
|
240 |
end |
351 | 241 |
end; |
242 |
||
7624
03d662ff9c41
A few more operators. Committing in case unc0rr wants to fiddle.
nemo
parents:
7623
diff
changeset
|
243 |
operator - (const z1, z2: hwFloat) z : hwFloat; inline; |
351 | 244 |
begin |
245 |
if z1.isNegative = z2.isNegative then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6498
diff
changeset
|
246 |
if z1.QWordValue > z2.QWordValue then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6498
diff
changeset
|
247 |
begin |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6498
diff
changeset
|
248 |
z.isNegative:= z1.isNegative; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6498
diff
changeset
|
249 |
z.QWordValue:= z1.QWordValue - z2.QWordValue |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6498
diff
changeset
|
250 |
end |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6498
diff
changeset
|
251 |
else |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6498
diff
changeset
|
252 |
begin |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6498
diff
changeset
|
253 |
z.isNegative:= not z2.isNegative; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6498
diff
changeset
|
254 |
z.QWordValue:= z2.QWordValue - z1.QWordValue |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6498
diff
changeset
|
255 |
end |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6498
diff
changeset
|
256 |
else |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6498
diff
changeset
|
257 |
begin |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6498
diff
changeset
|
258 |
z.isNegative:= z1.isNegative; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6498
diff
changeset
|
259 |
z.QWordValue:= z1.QWordValue + z2.QWordValue |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6498
diff
changeset
|
260 |
end |
351 | 261 |
end; |
7623
addc5b262617
isZero appears to be never used. Use it in a few obvious cases and add web variant.
nemo
parents:
7614
diff
changeset
|
262 |
|
8924 | 263 |
function isZero(const z: hwFloat): boolean; inline; |
7623
addc5b262617
isZero appears to be never used. Use it in a few obvious cases and add web variant.
nemo
parents:
7614
diff
changeset
|
264 |
begin |
addc5b262617
isZero appears to be never used. Use it in a few obvious cases and add web variant.
nemo
parents:
7614
diff
changeset
|
265 |
isZero := z.QWordValue = 0; |
addc5b262617
isZero appears to be never used. Use it in a few obvious cases and add web variant.
nemo
parents:
7614
diff
changeset
|
266 |
end; |
7624
03d662ff9c41
A few more operators. Committing in case unc0rr wants to fiddle.
nemo
parents:
7623
diff
changeset
|
267 |
|
03d662ff9c41
A few more operators. Committing in case unc0rr wants to fiddle.
nemo
parents:
7623
diff
changeset
|
268 |
operator < (const z1, z2: hwFloat) b : boolean; inline; |
03d662ff9c41
A few more operators. Committing in case unc0rr wants to fiddle.
nemo
parents:
7623
diff
changeset
|
269 |
begin |
03d662ff9c41
A few more operators. Committing in case unc0rr wants to fiddle.
nemo
parents:
7623
diff
changeset
|
270 |
if z1.isNegative xor z2.isNegative then |
03d662ff9c41
A few more operators. Committing in case unc0rr wants to fiddle.
nemo
parents:
7623
diff
changeset
|
271 |
b:= z1.isNegative |
03d662ff9c41
A few more operators. Committing in case unc0rr wants to fiddle.
nemo
parents:
7623
diff
changeset
|
272 |
else |
03d662ff9c41
A few more operators. Committing in case unc0rr wants to fiddle.
nemo
parents:
7623
diff
changeset
|
273 |
if z1.QWordValue = z2.QWordValue then |
03d662ff9c41
A few more operators. Committing in case unc0rr wants to fiddle.
nemo
parents:
7623
diff
changeset
|
274 |
b:= false |
03d662ff9c41
A few more operators. Committing in case unc0rr wants to fiddle.
nemo
parents:
7623
diff
changeset
|
275 |
else |
8915
36e1574e989d
Trivial optimization. Wonder if compiler was smart enough about it.
unc0rr
parents:
8905
diff
changeset
|
276 |
b:= (z2.QWordValue < z1.QWordValue) = z1.isNegative |
7624
03d662ff9c41
A few more operators. Committing in case unc0rr wants to fiddle.
nemo
parents:
7623
diff
changeset
|
277 |
end; |
03d662ff9c41
A few more operators. Committing in case unc0rr wants to fiddle.
nemo
parents:
7623
diff
changeset
|
278 |
|
03d662ff9c41
A few more operators. Committing in case unc0rr wants to fiddle.
nemo
parents:
7623
diff
changeset
|
279 |
operator > (const z1, z2: hwFloat) b : boolean; inline; |
03d662ff9c41
A few more operators. Committing in case unc0rr wants to fiddle.
nemo
parents:
7623
diff
changeset
|
280 |
begin |
03d662ff9c41
A few more operators. Committing in case unc0rr wants to fiddle.
nemo
parents:
7623
diff
changeset
|
281 |
if z1.isNegative xor z2.isNegative then |
03d662ff9c41
A few more operators. Committing in case unc0rr wants to fiddle.
nemo
parents:
7623
diff
changeset
|
282 |
b:= z2.isNegative |
03d662ff9c41
A few more operators. Committing in case unc0rr wants to fiddle.
nemo
parents:
7623
diff
changeset
|
283 |
else |
03d662ff9c41
A few more operators. Committing in case unc0rr wants to fiddle.
nemo
parents:
7623
diff
changeset
|
284 |
if z1.QWordValue = z2.QWordValue then |
03d662ff9c41
A few more operators. Committing in case unc0rr wants to fiddle.
nemo
parents:
7623
diff
changeset
|
285 |
b:= false |
03d662ff9c41
A few more operators. Committing in case unc0rr wants to fiddle.
nemo
parents:
7623
diff
changeset
|
286 |
else |
03d662ff9c41
A few more operators. Committing in case unc0rr wants to fiddle.
nemo
parents:
7623
diff
changeset
|
287 |
b:= (z1.QWordValue > z2.QWordValue) <> z2.isNegative |
03d662ff9c41
A few more operators. Committing in case unc0rr wants to fiddle.
nemo
parents:
7623
diff
changeset
|
288 |
end; |
351 | 289 |
|
7624
03d662ff9c41
A few more operators. Committing in case unc0rr wants to fiddle.
nemo
parents:
7623
diff
changeset
|
290 |
operator - (const z1: hwFloat) z : hwFloat; inline; |
351 | 291 |
begin |
10015 | 292 |
z:= z1; |
293 |
z.isNegative:= not z.isNegative |
|
351 | 294 |
end; |
295 |
||
296 |
||
7624
03d662ff9c41
A few more operators. Committing in case unc0rr wants to fiddle.
nemo
parents:
7623
diff
changeset
|
297 |
operator * (const z1, z2: hwFloat) z : hwFloat; inline; |
351 | 298 |
begin |
10015 | 299 |
z.isNegative:= z1.isNegative xor z2.isNegative; |
300 |
z.QWordValue:= QWord(z1.Round) * z2.Frac + QWord(z1.Frac) * z2.Round + ((QWord(z1.Frac) * z2.Frac) shr 32); |
|
301 |
z.Round:= z.Round + QWord(z1.Round) * z2.Round; |
|
351 | 302 |
end; |
303 |
||
7624
03d662ff9c41
A few more operators. Committing in case unc0rr wants to fiddle.
nemo
parents:
7623
diff
changeset
|
304 |
operator * (const z1: hwFloat; const z2: LongInt) z : hwFloat; inline; |
351 | 305 |
begin |
10015 | 306 |
z.isNegative:= z1.isNegative xor (z2 < 0); |
307 |
z.QWordValue:= z1.QWordValue * abs(z2) |
|
351 | 308 |
end; |
309 |
||
7624
03d662ff9c41
A few more operators. Committing in case unc0rr wants to fiddle.
nemo
parents:
7623
diff
changeset
|
310 |
operator / (const z1: hwFloat; z2: hwFloat) z : hwFloat; inline; |
8919
67214340fa53
lol, how did it manage to work for years? (z1 - z2 * z.Round) shouldn't respect signs of z1 and z2. It turns out we often had arbitrary .Frac value in division result. Also fixes issue 613.
unc0rr
parents:
8917
diff
changeset
|
311 |
var t: QWord; |
351 | 312 |
begin |
10015 | 313 |
z.isNegative:= z1.isNegative xor z2.isNegative; |
314 |
z.Round:= z1.QWordValue div z2.QWordValue; |
|
315 |
t:= z1.QWordValue - z2.QWordValue * z.Round; |
|
316 |
z.Frac:= 0; |
|
8916 | 317 |
|
10015 | 318 |
if t <> 0 then |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6498
diff
changeset
|
319 |
begin |
10015 | 320 |
while ((t and $FF00000000000000) = 0) and ((z2.QWordValue and $FF00000000000000) = 0) do |
321 |
begin |
|
322 |
t:= t shl 8; |
|
323 |
z2.QWordValue:= z2.QWordValue shl 8 |
|
324 |
end; |
|
8921 | 325 |
|
10015 | 326 |
if z2.Round > 0 then |
327 |
inc(z.QWordValue, t div z2.Round); |
|
328 |
end |
|
351 | 329 |
end; |
330 |
||
7624
03d662ff9c41
A few more operators. Committing in case unc0rr wants to fiddle.
nemo
parents:
7623
diff
changeset
|
331 |
operator / (const z1: hwFloat; const z2: LongInt) z : hwFloat; inline; |
498 | 332 |
begin |
10015 | 333 |
z.isNegative:= z1.isNegative xor (z2 < 0); |
334 |
z.QWordValue:= z1.QWordValue div abs(z2) |
|
498 | 335 |
end; |
336 |
||
2905 | 337 |
function cstr(const z: hwFloat): shortstring; |
338 |
var tmpstr: shortstring; |
|
351 | 339 |
begin |
10015 | 340 |
str(z.Round, cstr); |
341 |
if z.Frac <> 0 then |
|
342 |
begin |
|
343 |
str(z.Frac / $100000000, tmpstr); |
|
344 |
delete(tmpstr, 1, 2); |
|
345 |
cstr:= cstr + '.' + copy(tmpstr, 1, 10) |
|
346 |
end; |
|
347 |
if z.isNegative then |
|
348 |
cstr:= '-' + cstr |
|
351 | 349 |
end; |
350 |
||
515 | 351 |
function hwRound(const t: hwFloat): LongInt; |
351 | 352 |
begin |
10015 | 353 |
if t.isNegative then |
354 |
hwRound:= -(t.Round and $7FFFFFFF) |
|
355 |
else |
|
356 |
hwRound:= t.Round and $7FFFFFFF |
|
351 | 357 |
end; |
358 |
||
515 | 359 |
function hwAbs(const t: hwFloat): hwFloat; |
351 | 360 |
begin |
10015 | 361 |
hwAbs:= t; |
362 |
hwAbs.isNegative:= false |
|
351 | 363 |
end; |
364 |
||
7624
03d662ff9c41
A few more operators. Committing in case unc0rr wants to fiddle.
nemo
parents:
7623
diff
changeset
|
365 |
function hwSqr(const t: hwFloat): hwFloat; inline; |
351 | 366 |
begin |
10015 | 367 |
hwSqr.isNegative:= false; |
368 |
hwSqr.QWordValue:= ((QWord(t.Round) * t.Round) shl 32) + QWord(t.Round) * t.Frac * 2 + ((QWord(t.Frac) * t.Frac) shr 32); |
|
351 | 369 |
end; |
370 |
||
8905
82b1400f4a08
New hwSqrt implementation which is 46/19 times faster than the old one!
unc0rr
parents:
8838
diff
changeset
|
371 |
function hwSqrt1(const t: hwFloat): hwFloat; |
7688
9daa06188551
New hwSqrt which is up to 8.7% more efficient than old one on synthetic tests
unc0rr
parents:
7663
diff
changeset
|
372 |
const pwr = 8; // even value, feel free to adjust |
10562 | 373 |
rThreshold: QWord = 1 shl (pwr + 32); |
374 |
lThreshold: QWord = 1 shl (pwr div 2 + 32); |
|
738 | 375 |
var l, r: QWord; |
376 |
c: hwFloat; |
|
357 | 377 |
begin |
10015 | 378 |
hwSqrt1.isNegative:= false; |
744 | 379 |
|
10015 | 380 |
if t.Round = 0 then |
381 |
begin |
|
382 |
l:= t.QWordValue; |
|
383 |
r:= $100000000 |
|
384 |
end |
|
385 |
else |
|
7688
9daa06188551
New hwSqrt which is up to 8.7% more efficient than old one on synthetic tests
unc0rr
parents:
7663
diff
changeset
|
386 |
begin |
10015 | 387 |
if t.QWordValue > $FFFFFFFFFFFF then // t.Round > 65535.9999 |
7688
9daa06188551
New hwSqrt which is up to 8.7% more efficient than old one on synthetic tests
unc0rr
parents:
7663
diff
changeset
|
388 |
begin |
10015 | 389 |
l:= $10000000000; // 256 |
390 |
r:= $FFFFFFFFFFFF; // 65535.9999 |
|
391 |
end |
|
392 |
else |
|
393 |
if t.QWordValue >= rThreshold then |
|
394 |
begin |
|
395 |
l:= lThreshold; |
|
396 |
r:= $10000000000; // 256 |
|
397 |
end |
|
398 |
else |
|
399 |
begin |
|
400 |
l:= $100000000; |
|
401 |
r:= lThreshold; |
|
402 |
end; |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6498
diff
changeset
|
403 |
end; |
744 | 404 |
|
10015 | 405 |
repeat |
406 |
c.QWordValue:= (l + r) shr 1; |
|
407 |
if hwSqr(c).QWordValue > t.QWordValue then |
|
408 |
r:= c.QWordValue |
|
409 |
else |
|
410 |
l:= c.QWordValue |
|
411 |
until r - l <= 1; |
|
744 | 412 |
|
10015 | 413 |
hwSqrt1.QWordValue:= l |
357 | 414 |
end; |
415 |
||
8905
82b1400f4a08
New hwSqrt implementation which is 46/19 times faster than the old one!
unc0rr
parents:
8838
diff
changeset
|
416 |
function hwSqrt(const x: hwFloat): hwFloat; |
82b1400f4a08
New hwSqrt implementation which is 46/19 times faster than the old one!
unc0rr
parents:
8838
diff
changeset
|
417 |
var r, t, s, q: QWord; |
82b1400f4a08
New hwSqrt implementation which is 46/19 times faster than the old one!
unc0rr
parents:
8838
diff
changeset
|
418 |
i: integer; |
82b1400f4a08
New hwSqrt implementation which is 46/19 times faster than the old one!
unc0rr
parents:
8838
diff
changeset
|
419 |
begin |
10015 | 420 |
hwSqrt.isNegative:= false; |
8905
82b1400f4a08
New hwSqrt implementation which is 46/19 times faster than the old one!
unc0rr
parents:
8838
diff
changeset
|
421 |
|
10015 | 422 |
t:= $4000000000000000; |
423 |
r:= 0; |
|
424 |
q:= x.QWordValue; |
|
8905
82b1400f4a08
New hwSqrt implementation which is 46/19 times faster than the old one!
unc0rr
parents:
8838
diff
changeset
|
425 |
|
10015 | 426 |
for i:= 0 to 31 do |
8905
82b1400f4a08
New hwSqrt implementation which is 46/19 times faster than the old one!
unc0rr
parents:
8838
diff
changeset
|
427 |
begin |
10015 | 428 |
s:= r + t; |
429 |
r:= r shr 1; |
|
430 |
if s <= q then |
|
431 |
begin |
|
432 |
dec(q, s); |
|
433 |
inc(r, t); |
|
434 |
end; |
|
435 |
t:= t shr 2; |
|
8905
82b1400f4a08
New hwSqrt implementation which is 46/19 times faster than the old one!
unc0rr
parents:
8838
diff
changeset
|
436 |
end; |
82b1400f4a08
New hwSqrt implementation which is 46/19 times faster than the old one!
unc0rr
parents:
8838
diff
changeset
|
437 |
|
10015 | 438 |
hwSqrt.QWordValue:= r shl 16 |
8905
82b1400f4a08
New hwSqrt implementation which is 46/19 times faster than the old one!
unc0rr
parents:
8838
diff
changeset
|
439 |
end; |
82b1400f4a08
New hwSqrt implementation which is 46/19 times faster than the old one!
unc0rr
parents:
8838
diff
changeset
|
440 |
|
82b1400f4a08
New hwSqrt implementation which is 46/19 times faster than the old one!
unc0rr
parents:
8838
diff
changeset
|
441 |
|
82b1400f4a08
New hwSqrt implementation which is 46/19 times faster than the old one!
unc0rr
parents:
8838
diff
changeset
|
442 |
|
515 | 443 |
function Distance(const dx, dy: hwFloat): hwFloat; |
8921 | 444 |
var r: QWord; |
351 | 445 |
begin |
10015 | 446 |
r:= dx.QWordValue or dy.QWordValue; |
8921 | 447 |
|
10015 | 448 |
if r < $10000 then |
449 |
begin |
|
450 |
Distance.QWordValue:= r; |
|
451 |
Distance.isNegative:= false |
|
452 |
end |
|
453 |
else |
|
454 |
Distance:= hwSqrt(hwSqr(dx) + hwSqr(dy)) |
|
351 | 455 |
end; |
456 |
||
515 | 457 |
function DistanceI(const dx, dy: LongInt): hwFloat; |
498 | 458 |
begin |
10015 | 459 |
DistanceI:= hwSqrt(int2hwFloat(sqr(dx) + sqr(dy))) |
498 | 460 |
end; |
461 |
||
515 | 462 |
function SignAs(const num, signum: hwFloat): hwFloat; |
498 | 463 |
begin |
10015 | 464 |
SignAs.QWordValue:= num.QWordValue; |
465 |
SignAs.isNegative:= signum.isNegative |
|
498 | 466 |
end; |
467 |
||
4374 | 468 |
function hwSign(r: hwFloat): LongInt; |
469 |
begin |
|
470 |
// yes, we have negative zero for a reason |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6498
diff
changeset
|
471 |
if r.isNegative then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6498
diff
changeset
|
472 |
hwSign:= -1 |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6498
diff
changeset
|
473 |
else |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6498
diff
changeset
|
474 |
hwSign:= 1 |
4374 | 475 |
end; |
476 |
||
6879 | 477 |
function hwSignf(r: real): LongInt; |
6775 | 478 |
begin |
479 |
if r < 0 then |
|
6879 | 480 |
hwSignf:= -1 |
6775 | 481 |
else |
6879 | 482 |
hwSignf:= 1 |
6775 | 483 |
end; |
484 |
||
357 | 485 |
|
515 | 486 |
function AngleSin(const Angle: Longword): hwFloat; |
351 | 487 |
begin |
3929
9a4bbc1f67a2
Inline most of uFloat (saves ~7.5% opcount on a test game), inline a few very short candidates in uMisc, comment out some unused functions in uMisc
nemo
parents:
3599
diff
changeset
|
488 |
//TryDo((Angle >= 0) and (Angle <= 2048), 'Sin param exceeds limits', true); |
351 | 489 |
AngleSin.isNegative:= false; |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6498
diff
changeset
|
490 |
if Angle < 1024 then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6498
diff
changeset
|
491 |
AngleSin.QWordValue:= SinTable[Angle] |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6498
diff
changeset
|
492 |
else |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6498
diff
changeset
|
493 |
AngleSin.QWordValue:= SinTable[2048 - Angle] |
351 | 494 |
end; |
495 |
||
515 | 496 |
function AngleCos(const Angle: Longword): hwFloat; |
351 | 497 |
begin |
3929
9a4bbc1f67a2
Inline most of uFloat (saves ~7.5% opcount on a test game), inline a few very short candidates in uMisc, comment out some unused functions in uMisc
nemo
parents:
3599
diff
changeset
|
498 |
//TryDo((Angle >= 0) and (Angle <= 2048), 'Cos param exceeds limits', true); |
357 | 499 |
AngleCos.isNegative:= Angle > 1024; |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6498
diff
changeset
|
500 |
if Angle < 1024 then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6498
diff
changeset
|
501 |
AngleCos.QWordValue:= SinTable[1024 - Angle] |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6498
diff
changeset
|
502 |
else |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6498
diff
changeset
|
503 |
AngleCos.QWordValue:= SinTable[Angle - 1024] |
351 | 504 |
end; |
7714
981001b84f0b
vector2Angle function which converts vector to angle from -2048 to 2048
unc0rr
parents:
7688
diff
changeset
|
505 |
|
981001b84f0b
vector2Angle function which converts vector to angle from -2048 to 2048
unc0rr
parents:
7688
diff
changeset
|
506 |
function vector2Angle(const x, y: hwFloat): LongInt; |
7715 | 507 |
var d, nf: hwFloat; |
7714
981001b84f0b
vector2Angle function which converts vector to angle from -2048 to 2048
unc0rr
parents:
7688
diff
changeset
|
508 |
l, r, c, oc: Longword; |
981001b84f0b
vector2Angle function which converts vector to angle from -2048 to 2048
unc0rr
parents:
7688
diff
changeset
|
509 |
n: QWord; |
981001b84f0b
vector2Angle function which converts vector to angle from -2048 to 2048
unc0rr
parents:
7688
diff
changeset
|
510 |
begin |
981001b84f0b
vector2Angle function which converts vector to angle from -2048 to 2048
unc0rr
parents:
7688
diff
changeset
|
511 |
d:= _1 / Distance(x, y); |
981001b84f0b
vector2Angle function which converts vector to angle from -2048 to 2048
unc0rr
parents:
7688
diff
changeset
|
512 |
|
7715 | 513 |
nf:= y * d; |
514 |
n:= nf.QWordValue; |
|
7714
981001b84f0b
vector2Angle function which converts vector to angle from -2048 to 2048
unc0rr
parents:
7688
diff
changeset
|
515 |
|
981001b84f0b
vector2Angle function which converts vector to angle from -2048 to 2048
unc0rr
parents:
7688
diff
changeset
|
516 |
l:= 0; |
981001b84f0b
vector2Angle function which converts vector to angle from -2048 to 2048
unc0rr
parents:
7688
diff
changeset
|
517 |
r:= 1024; |
981001b84f0b
vector2Angle function which converts vector to angle from -2048 to 2048
unc0rr
parents:
7688
diff
changeset
|
518 |
c:= 0; |
981001b84f0b
vector2Angle function which converts vector to angle from -2048 to 2048
unc0rr
parents:
7688
diff
changeset
|
519 |
|
981001b84f0b
vector2Angle function which converts vector to angle from -2048 to 2048
unc0rr
parents:
7688
diff
changeset
|
520 |
repeat |
981001b84f0b
vector2Angle function which converts vector to angle from -2048 to 2048
unc0rr
parents:
7688
diff
changeset
|
521 |
oc:= c; |
981001b84f0b
vector2Angle function which converts vector to angle from -2048 to 2048
unc0rr
parents:
7688
diff
changeset
|
522 |
|
981001b84f0b
vector2Angle function which converts vector to angle from -2048 to 2048
unc0rr
parents:
7688
diff
changeset
|
523 |
c:= (l + r) shr 1; |
981001b84f0b
vector2Angle function which converts vector to angle from -2048 to 2048
unc0rr
parents:
7688
diff
changeset
|
524 |
|
981001b84f0b
vector2Angle function which converts vector to angle from -2048 to 2048
unc0rr
parents:
7688
diff
changeset
|
525 |
if n >= SinTable[c] then |
981001b84f0b
vector2Angle function which converts vector to angle from -2048 to 2048
unc0rr
parents:
7688
diff
changeset
|
526 |
l:= c |
981001b84f0b
vector2Angle function which converts vector to angle from -2048 to 2048
unc0rr
parents:
7688
diff
changeset
|
527 |
else |
981001b84f0b
vector2Angle function which converts vector to angle from -2048 to 2048
unc0rr
parents:
7688
diff
changeset
|
528 |
r:= c; |
981001b84f0b
vector2Angle function which converts vector to angle from -2048 to 2048
unc0rr
parents:
7688
diff
changeset
|
529 |
|
981001b84f0b
vector2Angle function which converts vector to angle from -2048 to 2048
unc0rr
parents:
7688
diff
changeset
|
530 |
until (oc = c); |
981001b84f0b
vector2Angle function which converts vector to angle from -2048 to 2048
unc0rr
parents:
7688
diff
changeset
|
531 |
|
981001b84f0b
vector2Angle function which converts vector to angle from -2048 to 2048
unc0rr
parents:
7688
diff
changeset
|
532 |
if x.isNegative then c:= 2048 - c; |
981001b84f0b
vector2Angle function which converts vector to angle from -2048 to 2048
unc0rr
parents:
7688
diff
changeset
|
533 |
if y.isNegative then c:= - c; |
981001b84f0b
vector2Angle function which converts vector to angle from -2048 to 2048
unc0rr
parents:
7688
diff
changeset
|
534 |
|
981001b84f0b
vector2Angle function which converts vector to angle from -2048 to 2048
unc0rr
parents:
7688
diff
changeset
|
535 |
vector2Angle:= c |
981001b84f0b
vector2Angle function which converts vector to angle from -2048 to 2048
unc0rr
parents:
7688
diff
changeset
|
536 |
end; |
981001b84f0b
vector2Angle function which converts vector to angle from -2048 to 2048
unc0rr
parents:
7688
diff
changeset
|
537 |
|
351 | 538 |
end. |