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

quint64 -> uint64_t

Browse source
This commit is contained in:
SamGondelman 2019-03-25 10:33:32 -07:00
parent 4fd2c4449d
commit de5643b5b9
4 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/procedural/src/procedural/Procedural.cpp
View file

@ -225,7 +225,7 @@ void Procedural::prepare(gpu::Batch& batch,
const glm::vec3& position, const glm::vec3& position,
const glm::vec3& size, const glm::vec3& size,
const glm::quat& orientation, const glm::quat& orientation,
const quint64& created, const uint64_t& created,
const ProceduralProgramKey key) { const ProceduralProgramKey key) {
std::lock_guard<std::mutex> lock(_mutex); std::lock_guard<std::mutex> lock(_mutex);
_entityDimensions = size; _entityDimensions = size;
@ -233,7 +233,7 @@ void Procedural::prepare(gpu::Batch& batch,
_entityOrientation = glm::mat3_cast(orientation); _entityOrientation = glm::mat3_cast(orientation);
_entityCreated = created; _entityCreated = created;
if (!_shaderPath.isEmpty()) { if (!_shaderPath.isEmpty()) {
auto lastModified = (quint64)QFileInfo(_shaderPath).lastModified().toMSecsSinceEpoch(); auto lastModified = (uint64_t)QFileInfo(_shaderPath).lastModified().toMSecsSinceEpoch();
if (lastModified > _shaderModified) { if (lastModified > _shaderModified) {
QFile file(_shaderPath); QFile file(_shaderPath);
file.open(QIODevice::ReadOnly); file.open(QIODevice::ReadOnly);

10
libraries/procedural/src/procedural/Procedural.h
View file

@ -83,10 +83,10 @@ public:
bool isReady() const; bool isReady() const;
bool isEnabled() const { return _enabled; } bool isEnabled() const { return _enabled; }
void prepare(gpu::Batch& batch, const glm::vec3& position, const glm::vec3& size, const glm::quat& orientation, void prepare(gpu::Batch& batch, const glm::vec3& position, const glm::vec3& size, const glm::quat& orientation,
const quint64& created, const ProceduralProgramKey key = ProceduralProgramKey()); const uint64_t& created, const ProceduralProgramKey key = ProceduralProgramKey());
glm::vec4 getColor(const glm::vec4& entityColor) const; glm::vec4 getColor(const glm::vec4& entityColor) const;
quint64 getFadeStartTime() const { return _fadeStartTime; } uint64_t getFadeStartTime() const { return _fadeStartTime; }
bool isFading() const { return _doesFade && _isFading; } bool isFading() const { return _doesFade && _isFading; }
void setIsFading(bool isFading) { _isFading = isFading; } void setIsFading(bool isFading) { _isFading = isFading; }
void setDoesFade(bool doesFade) { _doesFade = doesFade; } void setDoesFade(bool doesFade) { _doesFade = doesFade; }
@ -136,7 +136,7 @@ protected:
// Rendering object descriptions, from userData // Rendering object descriptions, from userData
QString _shaderSource; QString _shaderSource;
QString _shaderPath; QString _shaderPath;
quint64 _shaderModified { 0 }; uint64_t _shaderModified { 0 };
NetworkShaderPointer _networkShader; NetworkShaderPointer _networkShader;
bool _shaderDirty { true }; bool _shaderDirty { true };
bool _uniformsDirty { true }; bool _uniformsDirty { true };
@ -156,12 +156,12 @@ protected:
glm::vec3 _entityDimensions; glm::vec3 _entityDimensions;
glm::vec3 _entityPosition; glm::vec3 _entityPosition;
glm::mat3 _entityOrientation; glm::mat3 _entityOrientation;
quint64 _entityCreated; uint64_t _entityCreated;
private: private:
void setupUniforms(); void setupUniforms();
mutable quint64 _fadeStartTime { 0 }; mutable uint64_t _fadeStartTime { 0 };
mutable bool _hasStartedFade { false }; mutable bool _hasStartedFade { false };
mutable bool _isFading { false }; mutable bool _isFading { false };
bool _doesFade { true }; bool _doesFade { true };

2
libraries/procedural/src/procedural/ProceduralSkybox.cpp
View file

@ -17,7 +17,7 @@
#include <ViewFrustum.h> #include <ViewFrustum.h>
#include <shaders/Shaders.h> #include <shaders/Shaders.h>
ProceduralSkybox::ProceduralSkybox(quint64 created) : graphics::Skybox(), _created(created) { ProceduralSkybox::ProceduralSkybox(uint64_t created) : graphics::Skybox(), _created(created) {
_procedural._vertexSource = gpu::Shader::createVertex(shader::graphics::vertex::skybox)->getSource(); _procedural._vertexSource = gpu::Shader::createVertex(shader::graphics::vertex::skybox)->getSource();
_procedural._opaqueFragmentSource = shader::Source::get(shader::procedural::fragment::proceduralSkybox); _procedural._opaqueFragmentSource = shader::Source::get(shader::procedural::fragment::proceduralSkybox);
// Adjust the pipeline state for background using the stencil test // Adjust the pipeline state for background using the stencil test

6
libraries/procedural/src/procedural/ProceduralSkybox.h
View file

@ -19,7 +19,7 @@
class ProceduralSkybox: public graphics::Skybox { class ProceduralSkybox: public graphics::Skybox {
public: public:
ProceduralSkybox(quint64 created = 0); ProceduralSkybox(uint64_t created = 0);
void parse(const QString& userData) { _procedural.setProceduralData(ProceduralData::parse(userData)); } void parse(const QString& userData) { _procedural.setProceduralData(ProceduralData::parse(userData)); }
@ -29,11 +29,11 @@ public:
void render(gpu::Batch& batch, const ViewFrustum& frustum) const override; void render(gpu::Batch& batch, const ViewFrustum& frustum) const override;
static void render(gpu::Batch& batch, const ViewFrustum& frustum, const ProceduralSkybox& skybox); static void render(gpu::Batch& batch, const ViewFrustum& frustum, const ProceduralSkybox& skybox);
quint64 getCreated() const { return _created; } uint64_t getCreated() const { return _created; }
protected: protected:
mutable Procedural _procedural; mutable Procedural _procedural;
quint64 _created; uint64_t _created;
}; };
typedef std::shared_ptr< ProceduralSkybox > ProceduralSkyboxPointer; typedef std::shared_ptr< ProceduralSkybox > ProceduralSkyboxPointer;