Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

AddRef() - Fix for compailation failed case. #1989

Merged
merged 6 commits into from
Aug 9, 2019
Merged

AddRef() - Fix for compailation failed case. #1989

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f66cc26
AddRef() - Fix for compailation failed case.
FitzerIRL Aug 6, 2019
bddec99
Revert .shaders version 2 -> 1
FitzerIRL Aug 6, 2019
1a065eb
Quieter
FitzerIRL Aug 6, 2019
4f338d2
Fixes for Shader Compilation failures
FitzerIRL Aug 7, 2019
4b77827
Changes per PR review.
FitzerIRL Aug 8, 2019
2b03fdf
Fix for Data/File mix permutations
FitzerIRL Aug 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions examples/pxScene2d/src/pxResource.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -858,7 +858,7 @@ void pxResource::processDownloadedResource(rtFileDownloadRequest* fileDownloadRe
setLoadStatus("httpStatusCode",(uint32_t)fileDownloadRequest->httpStatusCode());
if (gUIThreadQueue)
{
gUIThreadQueue->addTask(pxResource::onDownloadCanceledUI, this, (void*)"reject");
gUIThreadQueue->addTask(onDownloadCanceledUI, this, (void*)"reject");
}
}
else if (fileDownloadRequest->downloadStatusCode() == 0 &&
Expand Down Expand Up @@ -901,7 +901,7 @@ void pxResource::processDownloadedResource(rtFileDownloadRequest* fileDownloadRe
// TODO review overall flow and organization
if (gUIThreadQueue)
{
gUIThreadQueue->addTask(pxResource::onDownloadCompleteUI, this, (void*)"reject");
gUIThreadQueue->addTask(onDownloadCompleteUI, this, (void*)"reject");
}
}
else if (result == PX_RESOURCE_LOAD_SUCCESS)
Expand All @@ -916,7 +916,7 @@ void pxResource::processDownloadedResource(rtFileDownloadRequest* fileDownloadRe
// TODO review overall flow and organization
if (gUIThreadQueue)
{
gUIThreadQueue->addTask(pxResource::onDownloadCompleteUI, this, (void*)"resolve");
gUIThreadQueue->addTask(onDownloadCompleteUI, this, (void*)"resolve");
}
}
}
Expand All @@ -933,7 +933,7 @@ void pxResource::processDownloadedResource(rtFileDownloadRequest* fileDownloadRe
// TODO review overall flow and organization
if (gUIThreadQueue)
{
gUIThreadQueue->addTask(pxResource::onDownloadCompleteUI, this, (void*)"reject");
gUIThreadQueue->addTask(onDownloadCompleteUI, this, (void*)"reject");
}
}
}
Expand Down
Loading