Seth Alves
38caed00ca
Attempt to draw line entity item
2015-05-12 10:25:50 -07:00
Brad Hefta-Gaub
cbaa503934
Merge pull request #4838 from Atlante45/quiet_compiler
...
Quiet compiler
2015-05-12 08:57:57 -07:00
Atlante45
00864afe53
Quiet compiler
2015-05-12 17:06:40 +02:00
Anthony Thibault
e1cbfcd901
Merge branch 'master' into ajt/particle-system-improvements
...
Conflicts:
libraries/networking/src/PacketHeaders.cpp
libraries/networking/src/PacketHeaders.h
2015-05-11 19:24:13 -07:00
samcake
67b9dd248d
Fix glsl failed compilation on Mac
2015-05-11 14:25:05 -07:00
Sam Gateau
f2c4e04a5a
clean up for pr
2015-05-11 14:06:10 -07:00
Sam Gateau
45e70c98f8
Fixed the cube map loading issue
2015-05-11 13:43:15 -07:00
Brad Davis
abab54aed8
Working on display plugins
2015-05-11 13:08:53 -07:00
Brad Davis
6a5c7b8b42
Merge remote-tracking branch 'upstream/master' into plugins_pt2
...
Conflicts:
libraries/script-engine/src/MenuItemProperties.cpp
2015-05-11 12:40:17 -07:00
Sam Gateau
72c3270ec6
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2015-05-11 10:48:29 -07:00
Sam Gateau
f1fcce3ea0
refactoring th ecube texure loading to support 2 different layouts
2015-05-11 10:47:45 -07:00
Atlante45
e51040db53
CR
2015-05-11 14:31:22 +02:00
Atlante45
f941ca9601
Merge branch 'master' of https://github.com/highfidelity/hifi into fix_wireframe
2015-05-11 14:20:16 +02:00
Anthony J. Thibault
ede42285b1
Improvements to particle entity.
...
* Changed particle geometry to billboarded quads
* Added texture support
* Added ajt-test.js particle test script.
* GeometryCache support for batched quads with texCoords.
* Bug fix for infinite loop if _lifetime was very large.
* Don't reset the simulation on animation loop.
* stop emitting particles on animation stop, but keep simulating until there are no more living particles.
* Removed some trailing whitespace
2015-05-10 17:13:46 -07:00
Sam Gateau
d51904b7b3
fixing file
2015-05-09 11:43:21 -07:00
Sam Gateau
5a11143a5d
Using the skybox cubemap for ambient lighting
2015-05-09 11:40:46 -07:00
Brad Hefta-Gaub
bfb2b278ee
Merge pull request #4791 from jherico/scale
...
Fixing scale resolution issues
2015-05-08 15:54:24 -07:00
Bradley Austin Davis
03bd17ed49
Rebasing onto scale changes
2015-05-08 15:09:46 -07:00
Bradley Austin Davis
0751443a01
Merge branch 'master' into scale
2015-05-08 15:03:24 -07:00
Atlante45
52397bf87a
Fix wireframe render for meshes with special properties
2015-05-08 15:59:39 +02:00
Sam Gateau
ce5295a55f
THese is not final but we have a basic working framework so let's try to share
2015-05-07 17:06:15 -07:00
Bradley Austin Davis
c31d36be59
Fixing scale resolution issues
2015-05-07 12:01:56 -07:00
Sam Gateau
54c47fe3f9
merging
2015-05-07 11:35:58 -07:00
Sam Gateau
653d2e72b1
Skybox kind of working
2015-05-07 11:23:11 -07:00
Atlante45
591548dc38
Missing comma
2015-05-07 20:15:40 +02:00
Atlante45
00571dad00
Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones
2015-05-07 10:13:59 +02:00
Bradley Austin Davis
3b8108e887
Fix inverted icons
2015-05-06 16:09:17 -07:00
Brad Hefta-Gaub
5551997cdc
Merge pull request #4780 from samcake/blue
...
Add support for Skybox and rendering path of background according to Zones
2015-05-06 14:41:06 -07:00
Seth Alves
719747ee2d
Merge pull request #4725 from howard-stearns/objReader
...
Textures for .obj reader:
2015-05-06 14:30:29 -07:00
Sam Gateau
1b5185abeb
fix the conditional on the texture pointer which was wrong and bring back atmosphere sky dome
2015-05-06 12:19:19 -07:00
samcake
06e1330e42
Clean up the includes in gpu, make the skybox shader works
2015-05-06 12:12:54 -07:00
Bradley Austin Davis
fc73676b4d
Merge branch 'master' into plugins_pt1
2015-05-06 11:43:25 -07:00
Howard Stearns
4090f892b2
Merge remote-tracking branch 'upstream/master' into objReader
2015-05-05 14:58:18 -07:00
Atlante45
8b2442ce6e
clear list after loop
2015-05-05 22:56:37 +02:00
Atlante45
863280300e
Fix pickMeshList incorrect arguments
2015-05-05 22:37:00 +02:00
Atlante45
73b7530ec6
Add wireframe pipelines
2015-05-05 21:50:06 +02:00
Atlante45
429c1e1231
Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones
2015-05-05 21:33:55 +02:00
Sam Gateau
13482575d2
merge
2015-05-05 12:03:45 -07:00
Atlante45
e0f3a8212f
Add wireframe arg to render fct
2015-05-05 17:23:10 +02:00
Atlante45
bc04685dbf
Add isWireframe to RenderKey
2015-05-05 15:15:18 +02:00
Atlante45
0e3061f052
Add isWireframe to model class
2015-05-05 15:14:29 +02:00
ZappoMan
77232e35f8
Merge branch 'master' of https://github.com/highfidelity/hifi into atmosphereInZones
2015-05-04 17:16:33 -07:00
Sam Gateau
73177cd81d
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2015-05-04 14:07:59 -07:00
ZappoMan
4561c59203
wire up zone to environment atmosphere rendering
2015-05-04 13:49:43 -07:00
Sam Gateau
ade404a74d
getting rid of QSHaredPointer in favor of std::shared_ptr
2015-05-04 13:43:30 -07:00
Stephen Birarda
6cff75f7c1
resolve conflicts on merge with upstream/master
2015-05-04 10:05:44 -07:00
Atlante45
fc1519c078
Quiet compiler
2015-05-04 16:49:33 +02:00
Brad Davis
e72756ab99
Merge remote-tracking branch 'upstream/master' into plugins_pt1
...
Conflicts:
libraries/render-utils/src/TextureCache.cpp
2015-05-02 00:51:50 -07:00
Brad Davis
302aa9db47
Removing access to the gl widget and display managers
2015-05-02 00:49:52 -07:00
Howard Stearns
e1d47413cc
Material library handling.
...
This is now functionally complete, but it needs testing, and the some tidying up.
2015-05-01 20:54:25 -07:00
Stephen Birarda
b9c9ff6a14
clean up various warnings
2015-05-01 16:49:13 -07:00
Sam Gateau
f9802a1072
IMprove the message
2015-05-01 16:39:25 -07:00
Stephen Birarda
edade7baba
resolve conflicts on merge with upstream master
2015-05-01 16:24:16 -07:00
Sam Gateau
2382183075
FIxed the bug about the tga not loading by recognizing the file format type from the filename extension and passing the info to the QImage::fromData()
2015-05-01 16:09:41 -07:00
Sam Gateau
1b558e7390
investigating the semi transparent textured bug
2015-05-01 13:37:04 -07:00
Howard Stearns
e0a4909b22
Merge branch 'master' of https://github.com/highfidelity/hifi into objReader
2015-05-01 13:32:05 -07:00
Stephen Birarda
94739cf8d3
move number constants out of SharedUtil to NumericalConstants
2015-05-01 10:26:53 -07:00
samcake
2b631efb5d
shader not compiling properly have been fixed
2015-05-01 00:21:58 -07:00
samcake
e560687371
fixing the shader not compiling
2015-05-01 00:14:23 -07:00
Howard Stearns
2da8e1ab30
Pick up an upstream/master change that didn't get picked up in a merge of my fork/branch.
2015-04-30 08:53:19 -07:00
Howard Stearns
1255d46140
coding standard: type formatting and variable names
2015-04-29 15:19:40 -07:00
Howard Stearns
59ed63027b
coding standard: magic numbers
2015-04-29 14:22:31 -07:00
Howard Stearns
bd5272d677
Textures for .obj reader:
...
Refactor so that uv coordinates can be associated with vertices that might otherwise be on different materials.
Defer the assignment vertex/normal/uv assignment until later so that it could potentially be moved directly to model geometry instead of fbx geometry.
Handle the actual uv coordinates.
This version does not handle explicit .mtl files, but it does handle those .obj files that follow the convention that there is a .jpg with the same name as the .obj file.
2015-04-29 13:35:21 -07:00
Brad Hefta-Gaub
50eecb15b3
Merge pull request #4712 from Atlante45/compound_zones_fix
...
Compound zones fix
2015-04-28 09:48:05 -07:00
Atlante45
ab9d81b5e2
Correct comments
2015-04-28 18:09:09 +02:00
Atlante45
b7263eeacf
Added a more efficient convexHullContains to Model
...
New version computes each submesh's bounding box once and checks against it
before checking against triangles.
2015-04-28 17:05:38 +02:00
Atlante45
4911aa58bc
Fix Model setURL with delayload
...
Without this condition the model stays in a state where the geometry
is downloaded but not referenced
That way, another call to setURL with update the geometry reference
instead of returning.
2015-04-28 17:02:32 +02:00
Andrew Meadows
72deb2e49b
merge upstream/master into andrew/thermonuclear
...
Conflicts:
libraries/entities/src/EntityItem.h
libraries/physics/src/EntityMotionState.cpp
2015-04-27 12:54:21 -07:00
Seth Alves
bdc6bb3c2d
Merge branch 'master' of github.com:highfidelity/hifi into detect-ballistic
2015-04-27 12:20:58 -07:00
Brad Davis
a12bfd95f4
Merge remote-tracking branch 'upstream/master' into ui-refactor
...
Conflicts:
libraries/render-utils/src/MatrixStack.h
2015-04-27 10:59:57 -07:00
Seth Alves
2cdbe8bf7b
merge from upstream
2015-04-27 09:57:36 -07:00
Seth Alves
e007617112
hook up menu-items to control debug rendering of collision hulls and owned simulations
2015-04-27 09:56:24 -07:00
Brad Davis
3071be162a
Coding standards
2015-04-26 20:11:27 -07:00
Brad Davis
7c16fd05c1
Merge branch 'master' into ui-refactor
2015-04-25 16:35:43 -07:00
Seth Alves
2eebfb9cf1
merge from upstream
2015-04-25 12:50:16 -07:00
Seth Alves
d1d4b0f0ee
merge from upstream
2015-04-25 12:50:00 -07:00
Seth Alves
b69cba1aba
respond to code-review
2015-04-25 10:50:18 -07:00
Seth Alves
0fb1a83e3b
quiet compiler, remove some trailing control-Ms
2015-04-25 09:20:00 -07:00
Atlante45
ba507cef98
Fix a few warnings
2015-04-25 11:01:02 +02:00
Andrew Meadows
79cb55eabc
rename setJointStates() --> initJointStates()
2015-04-24 13:26:26 -07:00
Brad Davis
0a9398808f
CR comments
2015-04-24 13:25:30 -07:00
Brad Davis
99a6e1f86c
Breaking up offscreen UI work
2015-04-24 13:21:21 -07:00
Brad Davis
ae804357d8
Attempting to fix backspace issue in new UI
2015-04-23 14:10:54 -07:00
Brad Davis
d0af5580c8
Fix mouse wheel and clickthrough bugs in offscreen UI
2015-04-23 10:28:03 -07:00
Brad Davis
de179256d3
Kill all the whitespace
2015-04-22 20:19:19 -07:00
Brad Davis
eab4ad9ea9
More coding standard stuff
2015-04-22 20:16:41 -07:00
Brad Davis
44efcdf82a
More coding standard
2015-04-22 20:08:49 -07:00
Brad Davis
c4d2bd2cda
More coding standard fixes
2015-04-22 19:18:09 -07:00
Brad Davis
8d8c4babba
Coding standard fixes
2015-04-22 19:06:22 -07:00
Brad Davis
7a33474245
Merge remote-tracking branch 'upstream/master' into offscreen
...
Conflicts:
interface/src/Menu.cpp
2015-04-21 13:02:38 -07:00
Sam Gateau
58c1827f69
bring back the glPushPop in transform legacy mode
2015-04-20 15:56:44 -07:00
Brad Davis
16efa2a46f
Improving toggle visibility and loading behavior
2015-04-17 16:59:04 -07:00
Sam Gateau
11879f6142
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2015-04-17 13:04:00 -07:00
Sam Gateau
edb388ed83
Fixing the function with no implementation
2015-04-17 11:32:05 -07:00
Bradley Austin Davis
4b73481604
Respond to changes in the device pixel ratio in the test window
2015-04-17 10:19:31 -07:00
Brad Davis
fd0c130dc2
Working on simplifying new dialog creation
2015-04-16 22:20:49 -07:00
Bradley Austin Davis
759acfa175
Working on getting the offscreen UI working on retina
2015-04-16 19:30:31 -07:00
Sam Gateau
b5b146b81b
Training Team: improving the sun lighting interface to javascript to enable / disable the earthSkyModel, assign explicitely the SUnDirection and getter, and expose a AmbientINtensity to control the amount of the ambient lighting contribution
...
Expose these to javascript
2015-04-16 17:35:37 -07:00
Sam Gateau
3872c01340
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-04-16 14:38:18 -07:00
Sam Gateau
f06556ba12
migrate the various list to sort the rendering from explicit names to a more generic key based map
2015-04-16 14:37:39 -07:00
Brad Davis
ce6b7e7aec
Merge branch 'master' into offscreen
...
Conflicts:
interface/src/Menu.cpp
2015-04-16 14:02:40 -07:00
Brad Davis
d72bb71030
Merge pull request #4636 from samcake/orange
...
Introduce the gpu::Framebuffer and its sidekick the gpu::Swapchain
2015-04-16 13:39:04 -07:00
Andrew Meadows
83d54eb46b
merge upstream/master into andrew/bispinor
2015-04-16 12:07:22 -07:00
Bradley Austin Davis
36ca9132cc
More build failure fixes
2015-04-16 01:02:13 -07:00
Bradley Austin Davis
f700607a65
Working on OSX functionality
2015-04-15 23:08:55 -07:00
Brad Davis
aba2b395a6
Working on testing the QML ui
2015-04-15 12:35:30 -07:00
Sam Gateau
cd1bbb2855
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2015-04-15 10:16:28 -07:00
Brad Davis
d14d5f3d29
Working on new-UI implementations of address bar and login
2015-04-15 00:36:04 -07:00
Sam Gateau
fec52f6b10
Removing almost all the QFramebufferObject (instead in overlay layer) in favor of gpu::Framebuffer, eveyrthing seems to work properly
2015-04-14 18:27:24 -07:00
David Rowe
85e5216fc1
Condense logic
2015-04-14 16:54:29 -07:00
David Rowe
2c5201f116
Fix animation not automatically starting at start-up
2015-04-14 16:54:14 -07:00
Sam Gateau
87030236cb
working version with the gpu::SAmpler and the gpu::Framebuffer
2015-04-14 15:53:24 -07:00
Andrew Meadows
9388ae4212
fix warning about unused variable
2015-04-14 14:52:21 -07:00
Sam Gateau
c34c5f6075
adding the Fremabuffer to be used for shadows and main rendering
2015-04-14 08:47:52 -07:00
Clément Brisset
36631dd3a3
Merge pull request #4608 from ctrlaltdavid/fix-animation-not-starting
...
CR for Animation fixes
2015-04-09 11:39:13 +02:00
Sam Gateau
ad9129b552
Fixing all the shaders for entities to work correctly with the now supported color attribute field
2015-04-07 14:26:45 -07:00
David Rowe
43a130dabe
Fix Stop button not working at the end of a non-looped animation
2015-04-07 14:02:42 -07:00
Sam Gateau
f0efade06d
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2015-04-07 12:56:21 -07:00
Andrew Meadows
a47170b02c
Merge pull request #4601 from samcake/temp1
...
Introducing gpu::State and using it in the Model rendering path and more...
2015-04-07 12:48:42 -07:00
Sam Gateau
9d6839e6a1
Merge branch 'temp1' of https://github.com/samcake/hifi into orange
2015-04-07 11:45:57 -07:00
Sam Gateau
25643479c9
Fixed the memory leak, due to the location pointer in the Model::RenderPipelineLib which was not smart pointed correctly
2015-04-07 11:20:55 -07:00
Sam Gateau
88afb3cedc
solution to the color attribute case
2015-04-07 10:04:51 -07:00
Seth Alves
ef5dffecf6
fix filenames in comments
2015-04-07 10:03:14 -07:00
Sam Gateau
dee651069c
adding support for color attribute in FBX, and displaying it correctly
2015-04-06 23:33:13 -07:00
Seth Alves
cd5245d0d6
logging group for render-utils
2015-04-06 18:16:01 -07:00
Sam Gateau
7f46736bb4
playing with the shadwos
2015-04-06 17:17:25 -07:00
Sam Gateau
07e7f6ea1d
FIx review comments
2015-04-06 15:40:29 -07:00
Sam Gateau
4aa695d5f3
fixed an issue with skinned normaled map models not doing the correct transformation
2015-04-06 12:24:01 -07:00
Sam Gateau
7de54917b8
Merge branch 'master' of https://github.com/highfidelity/hifi into temp1
2015-04-06 10:20:23 -07:00
Sam Gateau
ecdffadcb7
trying to debug the indirect sh lighting going wrong, the noraml on avatar is not correct
2015-04-06 10:17:31 -07:00
Sam Gateau
a85daaee41
COmmented the review questions in code
2015-04-06 10:03:47 -07:00
Sam Gateau
00817ab64f
MErging with origin/orange, brinign the fix for shadows
2015-04-05 18:36:39 -07:00
Sam Gateau
17743c6013
FIxed the broken shadows
2015-04-03 17:58:21 -07:00
Sam Gateau
38d1e29a1d
getting ready for pr for a few syntax issues
2015-04-03 17:16:18 -07:00
Sam Gateau
2dcabb97b4
getting ready for pr for a few syntax issues
2015-04-03 17:10:51 -07:00
Sam Gateau
b8db0ff2d7
getting ready for pr for a few syntax issues
2015-04-03 17:05:08 -07:00
Sam Gateau
423434af10
FInd one of the issue with shadows for avatars
2015-04-03 12:34:30 -07:00
Sam Gateau
3f581d03d2
mirror means we render the Closkwise side
2015-04-03 10:45:30 -07:00
Sam Gateau
6f5c411a46
Fixing a few issues and syntax, trying to understand why the shadows are not rendering correctly
2015-04-03 10:32:20 -07:00
Seth Alves
57a4f3abe3
clear _saveNonCollisionGeometry when it's not needed, remove some debug prints
2015-04-02 06:57:27 -07:00
Seth Alves
eb78fa0f85
if switching to the mode where collision hulls are drawn, updateGeometry and simulate
2015-04-01 18:24:25 -07:00
Seth Alves
78af7f900e
don't need _collisionGeometryScale
2015-04-01 18:23:25 -07:00
Seth Alves
8940ba0c2a
new member variables related to rendering collision hulls
2015-04-01 17:52:18 -07:00
Sam Gateau
0d721ec1e9
merging
2015-03-31 17:47:05 -07:00
Sam Gateau
9b63739a72
Trying to clen up the REnderMode usage in connection with the needed gpu::State for all the different variations
2015-03-31 17:35:34 -07:00
Stephen Birarda
86174d6a29
Merge pull request #4551 from ZappoMan/neverCullAvatarParts
...
never cull mesh parts for avatars
2015-03-31 16:29:01 -07:00
Brad Hefta-Gaub
b43761a6c1
Merge pull request #4545 from samcake/orange
...
No more FLat global lighting, always use one of the SPherical harmonics presets
2015-03-31 15:52:49 -07:00
Sam Gateau
74f04c0c84
remove useless comment
2015-03-31 14:57:51 -07:00
ZappoMan
a889191916
never cull mesh parts for avatars
2015-03-31 14:27:34 -07:00
Seth Alves
ea2c5ff622
formatting
2015-03-31 14:04:33 -07:00
