Changeset 12078 in josm
Legend:
 Unmodified
 Added
 Removed

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
r12058 r12078 112 112 113 113 order <<= 24; 114 order = floatToFixed(this.style.majorZIndex, 24 , 8);114 order = floatToFixed(this.style.majorZIndex, 24); 115 115 116 116 // selected on top of member of selected on top of unselected … … 120 120 121 121 order <<= 24; 122 order = floatToFixed(this.style.zIndex, 24 , 8);122 order = floatToFixed(this.style.zIndex, 24); 123 123 124 124 order <<= 1; … … 132 132 133 133 /** 134 * Converts a float to a fixed point decimal so that the order stays the same.134 * Converts a float to a fixed point decimal so that the order stays the same. 135 135 * 136 136 * @param number The float to convert 137 137 * @param totalBits 138 * Total number of bits. 1 sign bit, then the bits before the 139 * decimal point, then those after. 140 * @param afterDecimalBits 141 * Number of fixed bits after the decimal point. 138 * Total number of bits. 1 sign bit. There should be at least 15 bits. 142 139 * @return The float converted to an integer. 143 140 */ 144 private static long floatToFixed(double number, int totalBits, int afterDecimalBits) { 145 long value = (long) (number * (1L << afterDecimalBits)); 146 long highestBitMask = 1L << totalBits  1; 147 long valueMask = highestBitMask  1; 148 long signBit = number < 0 ? 0 : highestBitMask; 149 return signBit  value & valueMask; 141 protected static long floatToFixed(float number, int totalBits) { 142 long value = Float.floatToIntBits(number) & 0xffffffffL; 143 144 boolean negative = (value & 0x80000000L) != 0; 145 // Invert the sign bit, so that negative numbers are lower 146 value ^= 0x80000000L; 147 // Now do the shift. Do it before accounting for negative numbers (symetry) 148 if (totalBits < 32) { 149 value >>= (32  totalBits); 150 } 151 // positive numbers are sorted now. Negative ones the wrong way. 152 if (negative) { 153 // Negative number: remap it 154 value = (1L << (totalBits  1))  value; 155 } 156 return value; 150 157 } 151 158
Note: See TracChangeset
for help on using the changeset viewer.