Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 22:51:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

also changes case/naming to agreed conventions in the utility components

Browse source
This commit is contained in:
tosh 2013-03-29 11:54:09 +01:00
parent 2d997a9a8d
commit 1eb904ca59
7 changed files with 69 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/starfield/renderer/Renderer.h
View file

@ -349,7 +349,7 @@ namespace starfield {
float slice = _objTiling.getSliceAngle(); float slice = _objTiling.getSliceAngle();
unsigned stride = _objTiling.getAzimuthalTiles(); unsigned stride = _objTiling.getAzimuthalTiles();
float azimuth = (i % stride) * slice; float azimuth = (i % stride) * slice;
float altitude = (i / stride) * slice - Radians::half_pi(); float altitude = (i / stride) * slice - Radians::halfPi();
float gx = sin(azimuth); float gx = sin(azimuth);
float gz = -cos(azimuth); float gz = -cos(azimuth);
float exz = cos(altitude); float exz = cos(altitude);

4
interface/src/starfield/renderer/Tiling.h
View file

@ -27,7 +27,7 @@ namespace starfield {
Tiling(unsigned k) : Tiling(unsigned k) :
_valK(k), _valK(k),
_valRcpSlice(k / Radians::twice_pi()) { _valRcpSlice(k / Radians::twicePi()) {
_valBits = ceil(log2(getTileCount())); _valBits = ceil(log2(getTileCount()));
} }
@ -60,7 +60,7 @@ namespace starfield {
unsigned discreteAltitude(float a) const { unsigned discreteAltitude(float a) const {
return min(getAltitudinalTiles() - 1, return min(getAltitudinalTiles() - 1,
discreteAngle(a + Radians::half_pi()) ); discreteAngle(a + Radians::halfPi()) );
} }
}; };

26
shared/src/AngleUtils.h
View file

@ -13,23 +13,23 @@
struct Degrees struct Degrees
{ {
static float pi() { return 180.0f; } static float pi() { return 180.0f; }
static float twice_pi() { return 360.0f; } static float twicePi() { return 360.0f; }
static float half_pi() { return 90.0f; } static float halfPi() { return 90.0f; }
}; };
struct Radians struct Radians
{ {
static float pi() { return 3.141592653589793f; } static float pi() { return 3.141592653589793f; }
static float twice_pi() { return 6.283185307179586f; } static float twicePi() { return 6.283185307179586f; }
static float half_pi() { return 1.5707963267948966; } static float halfPi() { return 1.5707963267948966; }
}; };
struct Rotations struct Rotations
{ {
static float pi() { return 0.5f; } static float pi() { return 0.5f; }
static float twice_pi() { return 1.0f; } static float twicePi() { return 1.0f; }
static float half_pi() { return 0.25f; } static float halfPi() { return 0.25f; }
}; };
/** /**
@ -38,7 +38,7 @@ struct Rotations
template< class UnitFrom, class UnitTo > template< class UnitFrom, class UnitTo >
float angleConvert(float a) float angleConvert(float a)
{ {
return a * (UnitTo::half_pi() / UnitFrom::half_pi()); return a * (UnitTo::halfPi() / UnitFrom::halfPi());
} }
@ -48,7 +48,7 @@ float angleConvert(float a)
template< class Unit > template< class Unit >
float angleSignedNormal(float a) float angleSignedNormal(float a)
{ {
float result = remainder(a, Unit::twice_pi()); float result = remainder(a, Unit::twicePi());
if (result == Unit::pi()) if (result == Unit::pi())
result = -Unit::pi(); result = -Unit::pi();
return result; return result;
@ -75,12 +75,12 @@ template< class Unit >
void angleHorizontalPolar(float& azimuth, float& altitude) void angleHorizontalPolar(float& azimuth, float& altitude)
{ {
altitude = angleSignedNormal<Unit>(altitude); altitude = angleSignedNormal<Unit>(altitude);
if (altitude > Unit::half_pi()) if (altitude > Unit::halfPi())
{ {
altitude = Unit::pi() - altitude; altitude = Unit::pi() - altitude;
azimuth += Unit::pi(); azimuth += Unit::pi();
} }
else if (altitude < -Unit::half_pi()) else if (altitude < -Unit::halfPi())
{ {
altitude = -Unit::pi() - altitude; altitude = -Unit::pi() - altitude;
azimuth += Unit::pi(); azimuth += Unit::pi();

14
shared/src/FloodFill.h
View file

@ -36,7 +36,7 @@ struct floodFill_impl : Strategy
void go(Cursor position) void go(Cursor position)
{ {
Cursor higher, lower, h,l, i; Cursor higher, lower, h,l, i;
bool higher_found, lower_found, hf, lf; bool higherFound, lowerFound, hf, lf;
do do
{ {
if (! select(position)) if (! select(position))
@ -44,18 +44,18 @@ struct floodFill_impl : Strategy
process(position); process(position);
higher = position; higher_found = false; higher = position; higherFound = false;
up(higher); yTest(higher, higher_found); up(higher); yTest(higher, higherFound);
lower = position; lower_found = false; lower = position; lowerFound = false;
down(lower); yTest(lower, lower_found); down(lower); yTest(lower, lowerFound);
i = position, h = higher, l = lower; i = position, h = higher, l = lower;
hf = higher_found, lf = lower_found; hf = higherFound, lf = lowerFound;
do { right(i), right(h), right(l); yTest(h,hf); yTest(l,lf); } do { right(i), right(h), right(l); yTest(h,hf); yTest(l,lf); }
while (selectAndProcess(i)); while (selectAndProcess(i));
i = position, h = higher, l = lower; i = position, h = higher, l = lower;
hf = higher_found, lf = lower_found; hf = higherFound, lf = lowerFound;
do { left(i); left(h); left(l); yTest(h,hf); yTest(l,lf); } do { left(i); left(h); left(l); yTest(h,hf); yTest(l,lf); }
while (selectAndProcess(i)); while (selectAndProcess(i));
} }

19
shared/src/Radix2IntegerScanner.h
View file

@ -41,20 +41,20 @@ class Radix2IntegerScanner;
template< typename UInt > template< typename UInt >
class Radix2IntegerScanner< UInt, false > class Radix2IntegerScanner< UInt, false >
{ {
UInt msb; UInt valMsb;
public: public:
Radix2IntegerScanner() Radix2IntegerScanner()
: msb(~UInt(0) &~ (~UInt(0) >> 1)) { } : valMsb(~UInt(0) &~ (~UInt(0) >> 1)) { }
explicit Radix2IntegerScanner(int bits) explicit Radix2IntegerScanner(int bits)
: msb(UInt(1u) << (bits - 1)) : valMsb(UInt(1u) << (bits - 1))
{ } { }
typedef UInt state_type; typedef UInt state_type;
state_type initial_state() const { return msb; } state_type initial_state() const { return valMsb; }
bool advance(state_type& s) const { return (s >>= 1) != 0u; } bool advance(state_type& s) const { return (s >>= 1) != 0u; }
bool bit(UInt const& v, state_type const& s) const { return !!(v & s); } bool bit(UInt const& v, state_type const& s) const { return !!(v & s); }
@ -63,25 +63,24 @@ class Radix2IntegerScanner< UInt, false >
template< typename Int > template< typename Int >
class Radix2IntegerScanner< Int, true > class Radix2IntegerScanner< Int, true >
{ {
typename type_traits::make_unsigned<Int>::type msb; typename type_traits::make_unsigned<Int>::type valMsb;
public: public:
Radix2IntegerScanner() Radix2IntegerScanner()
: msb(~state_type(0u) &~ (~state_type(0u) >> 1)) : valMsb(~state_type(0u) &~ (~state_type(0u) >> 1))
{ } { }
explicit Radix2IntegerScanner(int bits) explicit Radix2IntegerScanner(int bits)
: msb(state_type(1u) << (bits - 1)) : valMsb(state_type(1u) << (bits - 1))
{ } { }
typedef typename type_traits::make_unsigned<Int>::type state_type; typedef typename type_traits::make_unsigned<Int>::type state_type;
state_type initial_state() const { return msb; } state_type initial_state() const { return valMsb; }
bool advance(state_type& s) const { return (s >>= 1) != 0u; } bool advance(state_type& s) const { return (s >>= 1) != 0u; }
bool bit(Int const& v, state_type const& s) const bool bit(Int const& v, state_type const& s) const { return !!((v-valMsb) & s); }
{ return !!((v-msb) & s); }
}; };
#endif /* defined(__hifi__Radix2IntegerScanner__) */ #endif /* defined(__hifi__Radix2IntegerScanner__) */

20
shared/src/UrlReader.cpp
View file

@ -20,15 +20,15 @@ char const* const UrlReader::error_aborted = "UrlReader: Processing err
char const* const UrlReader::error_buffer_overflow = "UrlReader: Buffer overflow."; char const* const UrlReader::error_buffer_overflow = "UrlReader: Buffer overflow.";
char const* const UrlReader::error_leftover_input = "UrlReader: Incomplete processing."; char const* const UrlReader::error_leftover_input = "UrlReader: Incomplete processing.";
#define hnd_curl static_cast<CURL*>(ptr_impl) #define hnd_curl static_cast<CURL*>(_ptrImpl)
UrlReader::UrlReader() UrlReader::UrlReader()
: ptr_impl(0l), arr_xtra(0l), str_error(0l) : _ptrImpl(0l), _arrXtra(0l), _strError(0l)
{ {
arr_xtra = new(std::nothrow) char[max_read_ahead]; _arrXtra = new(std::nothrow) char[max_read_ahead];
if (! arr_xtra) { str_error = error_init_failed; return; } if (! _arrXtra) { _strError = error_init_failed; return; }
ptr_impl = curl_easy_init(); _ptrImpl = curl_easy_init();
if (! ptr_impl) { str_error = error_init_failed; return; } if (! _ptrImpl) { _strError = error_init_failed; return; }
curl_easy_setopt(hnd_curl, CURLOPT_NOSIGNAL, 1l); curl_easy_setopt(hnd_curl, CURLOPT_NOSIGNAL, 1l);
curl_easy_setopt(hnd_curl, CURLOPT_FAILONERROR, 1l); curl_easy_setopt(hnd_curl, CURLOPT_FAILONERROR, 1l);
curl_easy_setopt(hnd_curl, CURLOPT_FILETIME, 1l); curl_easy_setopt(hnd_curl, CURLOPT_FILETIME, 1l);
@ -36,7 +36,7 @@ UrlReader::UrlReader()
UrlReader::~UrlReader() UrlReader::~UrlReader()
{ {
delete arr_xtra; delete _arrXtra;
if (! hnd_curl) return; if (! hnd_curl) return;
curl_easy_cleanup(hnd_curl); curl_easy_cleanup(hnd_curl);
} }
@ -51,11 +51,11 @@ bool UrlReader::perform(char const* url, transfer_callback* cb)
if (rc == CURLE_OK) if (rc == CURLE_OK)
{ {
while (val_xtra_size_size > 0 && str_error == success) while (_valXtraSize > 0 && _strError == success)
cb(0l, 0, 0, this); cb(0l, 0, 0, this);
} }
else if (str_error == success) else if (_strError == success)
str_error = curl_easy_strerror(rc); _strError = curl_easy_strerror(rc);
return rc == CURLE_OK; return rc == CURLE_OK;
} }

54
shared/src/UrlReader.h
View file

@ -19,11 +19,11 @@
*/ */
class UrlReader class UrlReader
{ {
void* ptr_impl; void* _ptrImpl;
char* arr_xtra; char* _arrXtra;
char const* str_error; char const* _strError;
void* ptr_stream; void* _ptrStream;
size_t val_xtra_size_size; size_t _valXtraSize;
public: public:
@ -151,21 +151,21 @@ class UrlReader
template< class ContentStream > template< class ContentStream >
bool UrlReader::readUrl(char const* url, ContentStream& s) bool UrlReader::readUrl(char const* url, ContentStream& s)
{ {
if (! ptr_impl) return false; if (! _ptrImpl) return false;
str_error = success; _strError = success;
ptr_stream = & s; _ptrStream = & s;
val_xtra_size_size = ~size_t(0); _valXtraSize = ~size_t(0);
this->perform(url, & callback_template<ContentStream>); this->perform(url, & callback_template<ContentStream>);
s.end(str_error == success); s.end(_strError == success);
return str_error == success; return _strError == success;
} }
inline char const* UrlReader::getError() const { return this->str_error; } inline char const* UrlReader::getError() const { return this->_strError; }
inline void UrlReader::setError(char const* static_c_string) inline void UrlReader::setError(char const* static_c_string)
{ {
if (this->str_error == success) if (this->_strError == success)
this->str_error = static_c_string; this->_strError = static_c_string;
} }
template< class Stream > template< class Stream >
@ -175,12 +175,12 @@ size_t UrlReader::callback_template(
size *= nmemb; size *= nmemb;
UrlReader* me = static_cast<UrlReader*>(thiz); UrlReader* me = static_cast<UrlReader*>(thiz);
Stream* stream = static_cast<Stream*>(me->ptr_stream); Stream* stream = static_cast<Stream*>(me->_ptrStream);
// first call? // first call?
if (me->val_xtra_size_size == ~size_t(0)) if (me->_valXtraSize == ~size_t(0))
{ {
me->val_xtra_size_size = 0u; me->_valXtraSize = 0u;
// extract meta information and call 'begin' // extract meta information and call 'begin'
char const* url, * type; char const* url, * type;
int64_t length, stardate; int64_t length, stardate;
@ -196,15 +196,15 @@ size_t UrlReader::callback_template(
size_t bytes = size - input_offset; size_t bytes = size - input_offset;
// data in extra buffer? // data in extra buffer?
if (me->val_xtra_size_size > 0) if (me->_valXtraSize > 0)
{ {
// fill extra buffer with beginning of input // fill extra buffer with beginning of input
size_t fill = max_read_ahead - me->val_xtra_size_size; size_t fill = max_read_ahead - me->_valXtraSize;
if (bytes < fill) fill = bytes; if (bytes < fill) fill = bytes;
memcpy(me->arr_xtra + me->val_xtra_size_size, buffer, fill); memcpy(me->_arrXtra + me->_valXtraSize, buffer, fill);
// use extra buffer for next transfer // use extra buffer for next transfer
buffer = me->arr_xtra; buffer = me->_arrXtra;
bytes = me->val_xtra_size_size + fill; bytes = me->_valXtraSize + fill;
input_offset += fill; input_offset += fill;
} }
@ -223,9 +223,9 @@ size_t UrlReader::callback_template(
size_t unprocessed = bytes - processed; size_t unprocessed = bytes - processed;
// can switch to input buffer, now? // can switch to input buffer, now?
if (buffer == me->arr_xtra && unprocessed <= input_offset) if (buffer == me->_arrXtra && unprocessed <= input_offset)
{ {
me->val_xtra_size_size = 0u; me->_valXtraSize = 0u;
input_offset -= unprocessed; input_offset -= unprocessed;
} }
else // no? unprocessed data -> extra buffer else // no? unprocessed data -> extra buffer
@ -235,10 +235,10 @@ size_t UrlReader::callback_template(
me->setError(error_buffer_overflow); me->setError(error_buffer_overflow);
return 0; return 0;
} }
me->val_xtra_size_size = unprocessed; me->_valXtraSize = unprocessed;
memmove(me->arr_xtra, buffer + processed, unprocessed); memmove(me->_arrXtra, buffer + processed, unprocessed);
if (input_offset == size || buffer != me->arr_xtra) if (input_offset == size || buffer != me->_arrXtra)
{ {
return size; return size;
} }