Merge branch 'master' of github.com:bkaradzic/bgfx

This commit is contained in:
Branimir Karadžić 2015-11-04 11:04:56 -08:00
Родитель 822caa88dd c0b62332d7
Коммит 574d831c80
6 изменённых файлов: 8 добавлений и 12 удалений

Просмотреть файл

@ -29,12 +29,12 @@ Supported platforms:
* asm.js/Emscripten (1.25.0)
* FreeBSD
* iOS (iPhone, iPad, AppleTV)
* Linux ![](https://tc27.draster.com/app/rest/builds/buildType:(id:Bgfx_Linux)/statusIcon)
* Linux
* MIPS Creator CI20
* Native Client (PPAPI 37+, ARM, x86, x64, PNaCl)
* OSX (10.9+)
* RaspberryPi
* Windows (XP, Vista, 7, 8, 10) ![](https://tc27.draster.com/app/rest/builds/buildType:(id:Bgfx_Windows)/statusIcon)
* Windows (XP, Vista, 7, 8, 10)
* WinRT (WinPhone 8.0+)
Supported compilers:
@ -51,11 +51,6 @@ Languages:
* [Go language API bindings](https://github.com/james4k/go-bgfx)
* [Java language API bindings](https://github.com/enleeten/twilight-bgfx)
Build status
------------
https://tc27.draster.com/guestAuth/overview.html
Who is using it?
----------------

Просмотреть файл

@ -1960,7 +1960,7 @@ int _main_(int _argc, char** _argv)
const float camNear = 0.1f;
const float camFar = 2000.0f;
const float projHeight = 1.0f/tanf(bx::toRad(camFovy)*0.5f);
const float projWidth = projHeight * 1.0f/camAspect;
const float projWidth = projHeight * camAspect;
bx::mtxProj(viewState.m_proj, camFovy, camAspect, camNear, camFar);
cameraGetViewMtx(viewState.m_view);

Просмотреть файл

@ -1550,9 +1550,10 @@ namespace bgfx
///
OcclusionQueryHandle createOcclusionQuery();
/// Retrieve occlusion query result.
/// Retrieve occlusion query result from previous frame.
///
/// @param[in] _handle Handle to occlusion query object.
/// @returns Occlusion query result.
///
/// @attention C99 equivalent is `bgfx_get_result`.
///

Просмотреть файл

@ -2732,7 +2732,7 @@ BX_PRAGMA_DIAGNOSTIC_POP();
bool isVisible(Frame* _render, OcclusionQueryHandle _handle, bool _visible)
{
m_occlusionQuery.resolve(_render);
return _visible == 0 != _render->m_occlusion[_handle.idx];
return _visible == (0 != _render->m_occlusion[_handle.idx]);
}
DXGI_FORMAT getBufferFormat()

Просмотреть файл

@ -1568,7 +1568,7 @@ namespace bgfx { namespace d3d9
bool isVisible(Frame* _render, OcclusionQueryHandle _handle, bool _visible)
{
m_occlusionQuery.resolve(_render);
return _visible == 0 != _render->m_occlusion[_handle.idx];
return _visible == (0 != _render->m_occlusion[_handle.idx]);
}
void capturePreReset()

Просмотреть файл

@ -2715,7 +2715,7 @@ namespace bgfx { namespace gl
bool isVisible(Frame* _render, OcclusionQueryHandle _handle, bool _visible)
{
m_occlusionQuery.resolve(_render);
return _visible == 0 != _render->m_occlusion[_handle.idx];
return _visible == (0 != _render->m_occlusion[_handle.idx]);
}
void ovrPostReset()