Brad Davis
94c414e4e8
Add unit quad, commonly used in compositing the overlays
2015-06-10 08:12:58 -07:00
ZappoMan
7c40b666e8
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching-scene-api
2015-06-03 09:52:40 -07:00
Eric Levin
533148f26d
line being sent as array
2015-05-28 15:48:31 -07:00
Atlante45
c0725813b6
typo
2015-05-25 12:11:24 +02:00
Atlante45
4bbc5de39d
Remove "raw" gl calls
...
Removed calls to batch._gl*
Added init/killInput in glBackend ctor/dtor
This will disable client states and set buffers to 0
2015-05-17 11:58:39 +02:00
Atlante45
b11525debf
Add missing batch args
2015-05-16 04:03:46 +02:00
Atlante45
c220435364
Restore gl* calls but record them with batch
2015-05-16 04:01:08 +02:00
Ryan Huffman
776955b040
Move GeometryCache gl* calls to non-batch methods
2015-05-15 15:21:02 -07:00
Ryan Huffman
5abd4bb08e
Update GeometryCache to accept gpu::Batch
2015-05-15 15:20:50 -07: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
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
samcake
06e1330e42
Clean up the includes in gpu, make the skybox shader works
2015-05-06 12:12:54 -07:00
Howard Stearns
4090f892b2
Merge remote-tracking branch 'upstream/master' into objReader
2015-05-05 14:58:18 -07:00
Sam Gateau
73177cd81d
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2015-05-04 14:07:59 -07:00
Sam Gateau
ade404a74d
getting rid of QSHaredPointer in favor of std::shared_ptr
2015-05-04 13:43:30 -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
94739cf8d3
move number constants out of SharedUtil to NumericalConstants
2015-05-01 10:26:53 -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
Seth Alves
0fb1a83e3b
quiet compiler, remove some trailing control-Ms
2015-04-25 09:20:00 -07:00
Seth Alves
cd5245d0d6
logging group for render-utils
2015-04-06 18:16:01 -07:00
Seth Alves
ea2c5ff622
formatting
2015-03-31 14:04:33 -07:00
Philip Rosedale
5325478940
Merge pull request #4528 from ZappoMan/avatarUI
...
Support for Auto-detecting FST type, and adding type hint to FST files when packaged
2015-03-30 21:31:22 -07:00
ZappoMan
baa2f947e5
classifying FSTReader and moving ModelType into that class
2015-03-27 16:30:00 -07:00
Seth Alves
fd69a54f10
Merge branch 'master' of github.com:highfidelity/hifi into multi-hull-collisions
2015-03-27 15:55:20 -07:00
Seth Alves
7da87d6e15
set up a way to request ResourceCache downloads from a non-networking thread.
2015-03-26 18:37:55 -07:00
Atlante45
716e9bfe4f
Hint order for FST files
2015-03-26 15:40:48 +01:00
Seth Alves
069c358aa3
Work around a deadlock:
...
thread 15 locks Octree
thread 1 blocks waiting for Octree lock
thread 15 tries to pass a message to thread 1 with QMetaObject::invokeMethod, and hangs
thread 15 is blocked on qt message passing to thread 1
ResourceCache::getResource libraries/networking/src/ResourceCache.cpp:57
GeometryCache::getGeometry libraries/render-utils/src/GeometryCache.cpp:1774
ModelEntityItem::isReadyToComputeShape libraries/entities/src/ModelEntityItem.cpp:431
PhysicsEngine::addEntityInternal libraries/physics/src/PhysicsEngine.cpp:67
EntitySimulation::addEntity libraries/entities/src/EntitySimulation.cpp:129
EntityTree::postAddEntity libraries/entities/src/EntityTree.cpp:91
^ locks simulation
EntityTreeElement::readElementDataFromBuffer libraries/entities/src/EntityTreeElement.cpp:773
Octree::readElementData libraries/octree/src/Octree.cpp:301
Octree::readElementData libraries/octree/src/Octree.cpp:354
...
Octree::readBitstreamToTree libraries/octree/src/Octree.cpp:439
OctreeRenderer::processDatagram libraries/octree/src/OctreeRenderer.cpp:136
^ lockForWrite Octree::_lock
OctreePacketProcessor::processPacket interface/src/octree/OctreePacketProcessor.cpp:91
ReceivedPacketProcessor::process libraries/networking/src/ReceivedPacketProcessor.cpp:51
thread 1 is blocked on lockForWrite of Octree::_lock
Octree::lockForWrite libraries/octree/src/Octree.h:292
EntityTree::update libraries/entities/src/EntityTree.cpp:668
^ lockForWrite on Octree:_lock
EntityTreeRenderer::update libraries/entities-renderer/src/EntityTreeRenderer.cpp:258
Application::update interface/src/Application.cpp:2189
^ calls _physicsEngine.stepSimulation() before this
Application::idle interface/src/Application.cpp:1535
timer
2015-03-17 11:38:42 -07:00
Seth Alves
4a7dd2b3e6
allow downloading of obj files
2015-03-07 07:53:25 -08:00
Seth Alves
858d15d0ba
obj reader sort-of works
2015-03-06 13:15:53 -08:00
David Rowe
4c959e8d82
More parentheses to address Xcode compiler warnings
2015-03-04 09:17:19 -08:00
David Rowe
21f12c1d6c
Use cache ID when rendering talk bubble sphere
2015-02-26 13:50:43 -08:00
Brad Hefta-Gaub
1827d9f3cd
Merge pull request #4256 from samcake/temp1
...
Getting rid of glLIghts and replacing by the model::Light
2015-02-13 10:49:53 -08:00
Brad Hefta-Gaub
9a7ed8055f
Merge pull request #4267 from samcake/master
...
Fix performance bug for NetworkGeometry::isLoadedWithTextures() and glTransform removal
2015-02-11 09:45:29 -08:00
Sam Gateau
b9fd116dbf
Introduce a cache bit in networkGemometry to capture the status of texture LOaded and avoid requiring everything once everything is loaded and get rid of the Transform stack calls on gl from gpu
2015-02-10 18:38:48 -08:00
ZappoMan
8016fb5e0d
fix color issues with quads
2015-02-10 17:35:27 -08:00
Sam Gateau
5719e277dd
FIx the lightmap not displaying when using the texcoord0
2015-02-03 16:10:31 -08:00
Sam Gateau
d8d0a28d0f
FInd a solution for lightmap without 2nd uvset
2015-02-03 14:34:11 -08:00
Sam Gateau
c3e1311ed1
avoid recreating lights every frame, just have a pool of lights edited each frames
2015-01-30 17:03:28 -08:00
ZappoMan
66567fd89d
CR feedback
2015-01-29 17:24:56 -08:00
ZappoMan
c1bb03e9a8
CR feedback
2015-01-29 17:23:48 -08:00
ZappoMan
534575fd10
fix a couple bugs in 3d textured version of renderQuad
2015-01-29 13:16:14 -08:00
ZappoMan
418b97a648
attempt to get color working for 3d textured quads
2015-01-29 12:04:34 -08:00
ZappoMan
87e91a5a94
Revert "attempt to get color working for 3d textured quads"
...
This reverts commit 0f390a98b8
2015-01-29 11:44:36 -08:00
ZappoMan
0f390a98b8
attempt to get color working for 3d textured quads
2015-01-29 10:50:13 -08:00
ZappoMan
4abb2481d6
removed old comment
2015-01-29 10:10:53 -08:00
ZappoMan
5d2df7b03f
implement color for dashed lines
2015-01-28 18:51:23 -08:00
ZappoMan
efb044ea5e
change renderDashedLine() to take a color paramter
2015-01-28 15:08:59 -08:00
