Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-04-07 04:53:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

code standards fixes

Browse source
This commit is contained in:
Eric Levin 2015-06-01 09:51:24 -07:00
parent 8a191a661d
commit 7b08537574
4 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/entities-renderer/src/RenderableLineEntityItem.cpp
View file

@ -41,7 +41,7 @@ void RenderableLineEntityItem::render(RenderArgs* args) {
glm::vec3 axis = glm::axis(rotation);
glRotatef(glm::degrees(glm::angle(rotation)), axis.x, axis.y, axis.z);
QVector<glm::vec3> points;
if(_pointsChanged){
if(_pointsChanged) {
geometryCache->updateVertices(_lineVerticesID, getLinePoints(), lineColor);
_pointsChanged = false;
}

13
libraries/entities/src/LineEntityItem.h
View file

@ -51,19 +51,12 @@ class LineEntityItem : public EntityItem {
_color[BLUE_INDEX] = value.blue;
}
void setLineWidth(float lineWidth){
_lineWidth = lineWidth;
}
float getLineWidth() const{
return _lineWidth;
}
void setLineWidth(float lineWidth){ _lineWidth = lineWidth; }
float getLineWidth() const{ return _lineWidth; }
void setLinePoints(const QVector<glm::vec3>& points);
const QVector<glm::vec3>& getLinePoints() const{
return _points;
}
const QVector<glm::vec3>& getLinePoints() const{ return _points; }
virtual ShapeType getShapeType() const { return SHAPE_TYPE_LINE; }

4
libraries/shared/src/RegisteredMetaTypes.cpp
View file

@ -73,7 +73,7 @@ void vec3FromScriptValue(const QScriptValue &object, glm::vec3 &vec3) {
vec3.z = object.property("z").toVariant().toFloat();
}
QScriptValue qVectorVec3ToScriptValue(QScriptEngine* engine, const QVector<glm::vec3> &vector){
QScriptValue qVectorVec3ToScriptValue(QScriptEngine* engine, const QVector<glm::vec3>& vector){
QScriptValue array = engine->newArray();
for(int i = 0; i < vector.size(); i++){
array.setProperty(i, vec3toScriptValue(engine, vector.at(i)));
@ -81,7 +81,7 @@ QScriptValue qVectorVec3ToScriptValue(QScriptEngine* engine, const QVector<glm::
return array;
}
QVector<glm::vec3> qVectorVec3FromScriptValue(const QScriptValue &array){
QVector<glm::vec3> qVectorVec3FromScriptValue(const QScriptValue& array){
QVector<glm::vec3> newVector(0);
int length = array.property("length").toInteger();

4
libraries/shared/src/RegisteredMetaTypes.h
View file

@ -56,8 +56,8 @@ void qColorFromScriptValue(const QScriptValue& object, QColor& color);
QScriptValue qURLToScriptValue(QScriptEngine* engine, const QUrl& url);
void qURLFromScriptValue(const QScriptValue& object, QUrl& url);
QScriptValue qVectorVec3ToScriptValue(QScriptEngine*, const QVector<glm::vec3>& vector);
QVector<glm::vec3> qVectorVec3FromScriptValue( const QScriptValue &array);
QScriptValue qVectorVec3ToScriptValue(QScriptEngine* engine, const QVector<glm::vec3>& vector);
QVector<glm::vec3> qVectorVec3FromScriptValue( const QScriptValue& array);
class PickRay {
public: