From efda1216195a41c4596126fe011ee7f44c60e0d3 Mon Sep 17 00:00:00 2001 From: Brad Hefta-Gaub Date: Tue, 22 Sep 2015 16:37:54 -0700 Subject: [PATCH 01/11] fix a bunch of warnings on windows --- examples/edit.js | 2 +- examples/html/entityProperties.html | 219 +++++++++--------- .../src/model-networking/ModelCache.cpp | 4 +- .../src/model-networking/ModelCache.h | 2 +- .../networking/src/udt/ConnectionStats.cpp | 12 +- libraries/render-utils/src/GeometryCache.cpp | 2 +- libraries/render-utils/src/Model.h | 4 +- 7 files changed, 123 insertions(+), 122 deletions(-) diff --git a/examples/edit.js b/examples/edit.js index d28d51df9d..0d1164685a 100644 --- a/examples/edit.js +++ b/examples/edit.js @@ -1320,7 +1320,7 @@ PropertiesTool = function(opts) { if (data.action == "moveSelectionToGrid") { if (selectionManager.hasSelection()) { selectionManager.saveProperties(); - var dY = grid.getOrigin().y - (selectionManager.worldPosition.y - selectionManager.worldDimensions.y / 2), + var dY = grid.getOrigin().y - (selectionManager.worldPosition.y - selectionManager.worldDimensions.y / 2); var diff = { x: 0, y: dY, z: 0 }; for (var i = 0; i < selectionManager.selections.length; i++) { var properties = selectionManager.savedProperties[selectionManager.selections[i]]; diff --git a/examples/html/entityProperties.html b/examples/html/entityProperties.html index ad489afddf..268a2fb7f2 100644 --- a/examples/html/entityProperties.html +++ b/examples/html/entityProperties.html @@ -1,5 +1,6 @@ + Properties @@ -961,7 +962,7 @@
-
@@ -970,7 +971,7 @@
Name
- +
@@ -1003,13 +1004,13 @@
Href
- +
Description
- +
@@ -1021,9 +1022,9 @@
Position
-
X
-
Y
-
Z
+
X
+
Y
+
Z
@@ -1034,26 +1035,26 @@
Registration
-
X
-
Y
-
Z
+
X
+
Y
+
Z
Dimensions
-
X
-
Y
-
Z
+
X
+
Y
+
Z
- % + %
- +
@@ -1061,9 +1062,9 @@
Voxel Volume Size
-
X
-
Y
-
Z
+
X
+
Y
+
Z
Surface Extractor
@@ -1078,26 +1079,26 @@
X-axis Texture URL
- +
Y-axis Texture URL
- +
Z-axis Texture URL
- +
Rotation
-
Pitch
-
Yaw
-
Roll
+
Pitch
+
Yaw
+
Roll
@@ -1109,66 +1110,66 @@
Linear Velocity
-
X
-
Y
-
Z
+
X
+
Y
+
Z
Linear Damping
- +
Angular Velocity
-
Pitch
-
Yaw
-
Roll
+
Pitch
+
Yaw
+
Roll
Angular Damping
- +
Restitution
- +
Friction
- +
Gravity
-
X
-
Y
-
Z
+
X
+
Y
+
Z
Acceleration
-
X
-
Y
-
Z
+
X
+
Y
+
Z
Density
- +
@@ -1176,9 +1177,9 @@
Color
-
R
-
G
-
B
+
R
+
G
+
B
@@ -1190,38 +1191,38 @@
Ignore For Collisions - +
Collisions Will Move - +
Collision Sound URL
- +
Lifetime
- +
Script URL - - + +
- +
@@ -1233,14 +1234,14 @@
Model URL
- +
Shape Type
- @@ -1251,13 +1252,13 @@
Compound Shape URL
- +
Animation URL
- +
@@ -1269,13 +1270,13 @@
Animation FPS
- +
Animation Frame
- +
@@ -1305,7 +1306,7 @@
Source URL
- +
@@ -1317,45 +1318,45 @@
Max Particles
- +
Particle Life Span
- +
Particle Emission Rate
- +
Particle Emission Direction
-
X
-
Y
-
Z
+
X
+
Y
+
Z
Particle Emission Strength
- +
Particle Local Gravity
- +
Particle Radius
- +
@@ -1367,31 +1368,31 @@
Text Content
- +
Line Height
- +
Text Color
-
R
-
G
-
B
+
R
+
G
+
B
Background Color
-
R
-
G
-
B
+
R
+
G
+
B
@@ -1410,27 +1411,27 @@
Color
-
R
-
G
-
B
+
R
+
G
+
B
Intensity
- +
Spot Light Exponent
- +
Spot Light Cutoff (degrees)
- +
@@ -1450,48 +1451,48 @@
Key Light Color
-
R
-
G
-
B
+
R
+
G
+
B
Key Light Intensity
- +
Key Light Ambient Intensity
- +
Key Light Direction
-
Pitch
-
Yaw
-
Roll
+
Pitch
+
Yaw
+
Roll
Stage Latitude
- +
Stage Longitude
- +
Stage Altitude
- +
@@ -1505,20 +1506,20 @@
Stage Day
- +
Stage Hour
- +
Background Mode
- @@ -1535,15 +1536,15 @@
Skybox Color
-
R
-
G
-
B
+
R
+
G
+
B
Skybox URL
- +
@@ -1555,9 +1556,9 @@
Atmosphere Center
-
X
-
Y
-
Z
+
X
+
Y
+
Z
@@ -1566,33 +1567,33 @@
Atmosphere Inner Radius
- +
Atmosphere Outer Radius
- +
Atmosphere Mie Scattering
- +
Atmosphere Rayleigh Scattering
- +
Atmosphere Scattering Wavelenghts
-
X
-
Y
-
Z
+
X
+
Y
+
Z