mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-08 12:39:49 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix for linux

Browse Source
This commit is contained in:
Michael Nilsson
2016-03-28 11:25:04 -04:00
parent d7e4a8b8e9
commit 2ca5d52fa3
6 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ext/ghoul

Submodule ext/ghoul updated: 3f18f3180a...f31ddda5d7

2
modules/kameleon/ext/kameleon

Submodule modules/kameleon/ext/kameleon updated: 95eee93aab...f9ba0caae4

4
modules/toyvolume/rendering/renderabletoyvolume.cpp
View File

@@ -118,12 +118,12 @@ bool RenderableToyVolume::isReady() const {
void RenderableToyVolume::update(const UpdateData& data) {
if (_raycaster) {
glm::mat4 transform = glm::translate(glm::mat4(1.0), static_cast<glm::vec3>(_translation) * std::powf(10.0, static_cast<float>(_scalingExponent)));
glm::mat4 transform = glm::translate(glm::mat4(1.0), static_cast<glm::vec3>(_translation) * std::pow(10.0f, static_cast<float>(_scalingExponent)));
glm::vec3 eulerRotation = static_cast<glm::vec3>(_rotation);
transform = glm::rotate(transform, eulerRotation.x, glm::vec3(1, 0, 0));
transform = glm::rotate(transform, eulerRotation.y, glm::vec3(0, 1, 0));
transform = glm::rotate(transform, eulerRotation.z, glm::vec3(0, 0, 1));
transform = glm::scale(transform, static_cast<glm::vec3>(_scaling) * std::powf(10.0, static_cast<float>(_scalingExponent)));
transform = glm::scale(transform, static_cast<glm::vec3>(_scaling) * std::pow(10.0f, static_cast<float>(_scalingExponent)));
_raycaster->setColor(_color);
_raycaster->setStepSize(_stepSize);

2
shaders/abuffer/resolveabuffer.frag
View File

@@ -27,7 +27,7 @@
#include "abufferfragment.glsl"
#include "abufferresources.glsl"
#include "fragment.glsl"
#include "PowerScaling/PowerScalingMath.hglsl"
#include "PowerScaling/powerScalingMath.hglsl"
#include "blending.glsl"
#include "rand.glsl"

2
src/network/parallelconnection.cpp
View File

@@ -27,9 +27,7 @@
#define _ERRNO WSAGetLastError()
#endif
#else //Use BSD sockets
#ifdef _XCODE
#include <unistd.h>
#endif
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>

2
src/rendering/abufferrenderer.cpp
View File

@@ -352,7 +352,7 @@ void ABufferRenderer::updateResolveDictionary() {
dict.setValue("helperPaths", helperPathsDict);
dict.setValue("rendererData", _rendererData);
dict.setValue("raycastingEnabled", _raycastData.size() > 0);
dict.setValue("nRaycasters", _raycastData.size());
dict.setValue("nRaycasters", static_cast<unsigned long long>(_raycastData.size()));
_resolveDictionary = dict;
_dirtyResolveDictionary = false;