Brad Hefta-Gaub
f85cb2c888
first cut at cleaning up ScriptEngine class
2015-09-11 19:12:09 -07:00
Brad Davis
9b81842850
Merge branch 'master' into homer
...
Conflicts:
assignment-client/src/octree/OctreeSendThread.cpp
interface/src/Application.cpp
libraries/entities-renderer/src/EntityTreeRenderer.cpp
libraries/entities/src/EntityItem.cpp
libraries/entities/src/EntityTree.cpp
libraries/entities/src/EntityTreeElement.cpp
libraries/entities/src/EntityTreeElement.h
libraries/entities/src/EntityTreeHeadlessViewer.cpp
libraries/entities/src/RecurseOctreeToMapOperator.cpp
libraries/octree/src/Octree.h
libraries/physics/src/EntityMotionState.cpp
2015-09-11 16:31:18 -07:00
Brad Davis
e458eb7ae9
Merge pull request #5734 from sethalves/octree-shared-pointers
...
octree uses shared pointers
2015-09-11 16:00:04 -07:00
Brad Hefta-Gaub
5c6d8da97b
Revert "Make sure all entity script callbacks happen on the Entities script engine thread"
2015-09-11 11:55:36 -07:00
Brad Davis
244795b629
Merge branch 'homer' into temp
...
Conflicts:
interface/src/Application.cpp
2015-09-11 11:21:29 -07:00
Brad Hefta-Gaub
20a733b9f5
prevent sending signals in the entities script engine
2015-09-11 10:06:06 -07:00
Brad Hefta-Gaub
b9d5412aad
prevent sending signals in the entities script engine
2015-09-11 09:48:42 -07:00
Brad Davis
b7ffb96adf
Working on thread safety for the entity tree
2015-09-10 22:28:50 -07:00
Brad Davis
aa989c3687
Fixing some entity race condition crashes
2015-09-10 20:53:17 -07:00
Brad Hefta-Gaub
92a5a999c6
quiet some debug
2015-09-10 19:52:44 -07:00
Brad Hefta-Gaub
ee30fe4a56
quiet some debug
2015-09-10 19:48:41 -07:00
Brad Hefta-Gaub
8eacdbf1c4
first cut at making sure entity scripts are called on the entities script engine thread
2015-09-10 13:02:02 -07:00
Seth Alves
9c4fdfd653
merge from upstream
2015-09-08 18:01:07 -07:00
Seth Alves
8a60bba4eb
Merge branch 'master' of github.com:highfidelity/hifi into octree-shared-pointers
2015-09-08 15:28:46 -07:00
Stephen Birarda
a3959109f1
resolve conflicts on merge with upstream/master
2015-09-08 15:18:39 -07:00
Brad Hefta-Gaub
152a86b0e9
Merge pull request #5735 from hyperlogic/tony/no-particle-fix
...
Fix for RenderableParticleffectEntityItem assert.
2015-09-08 15:13:38 -07:00
Brad Hefta-Gaub
8185a8da7f
Merge pull request #5732 from jherico/selma
...
Procedural skyboxes
2015-09-08 15:12:59 -07:00
Stephen Birarda
e1c395f5ea
resolve conflicts on merge with upstream/master
2015-09-08 14:56:23 -07:00
Brad Davis
5f1affaff9
Procedural skybox work
2015-09-08 14:31:16 -07:00
David Rowe
2325cb8ee0
Merge branch 'master' into 20669
2015-09-08 13:26:20 -07:00
Anthony J. Thibault
c728cd4c4c
Fix for RenderableParticleffectEntityItem assert.
...
When a particle system had no living particles, PendingChanges::updateItem
would assert, due to the access to _vertices[0]. In release this might be
harmless as this memory is never accessed, but different implementations of
std::vector might do different things here. So, let's be safe and early
return when the number of particles is 0.
2015-09-08 12:03:41 -07:00
Seth Alves
31fcd55d47
octree uses shared pointers
2015-09-08 11:59:48 -07:00
Stephen Birarda
9878143661
repairs to ShaderCache for Resource changes
2015-09-08 08:58:35 -07:00
Stephen Birarda
25aeda2e18
Merge branch 'master' of https://github.com/highfidelity/hifi into protocol
2015-09-08 08:40:51 -07:00
Brad Davis
743d79335d
Procedural shaders V2
2015-09-07 17:37:45 -07:00
David Rowe
cb9468c311
Add colorSpread entity particle property
2015-09-07 16:27:42 -07:00
Brad Davis
c4b1e6ecd3
Reducing debug spam
2015-09-05 12:22:25 -07:00
Brad Davis
9289a46112
Guarding against frequent userdata calls with no change.
2015-09-05 12:20:28 -07:00
Brad Davis
e8435b6218
Procedural rendering for box entities
2015-09-05 12:10:45 -07:00
David Rowe
12b8a5a1d5
Add alpha property support to ParticleEffect entities
...
Add at same "level" as color so that it's available for other entity
types to use in the future.
2015-09-05 10:23:27 -07:00
David Rowe
18bc7befee
Merge branch 'master' into 20669
...
Conflicts:
libraries/networking/src/udt/PacketHeaders.cpp
libraries/networking/src/udt/PacketHeaders.h
2015-09-04 13:49:46 -07:00
David Rowe
c910da7179
Add radiusStart and radiusFinish entity particle properties
2015-09-04 12:27:18 -07:00
Stephen Birarda
ed19987b7d
resolve conflicts on merge with upstream/master
2015-09-04 12:31:46 -06:00
Seth Alves
1b92ae95d7
put glm:: before vec3
2015-09-04 09:41:53 -07:00
David Rowe
45ff118249
Add new radiusSpread entity particle property
2015-09-03 14:55:08 -07:00
Seth Alves
07b241c778
code review
2015-09-03 11:05:44 -07:00
Seth Alves
2fe6e9c317
use AABox's ray intersection code rather than the goofed-up version that was here
2015-09-02 16:30:11 -07:00
Seth Alves
16ee5199e8
change how polyvox neighbors are notified of updates
2015-09-02 09:30:32 -07:00
Seth Alves
8608e4f2b0
small bug-fixes
2015-09-01 16:51:55 -07:00
Seth Alves
9256917f15
rebake mesh when a neighbor changes
2015-09-01 16:21:12 -07:00
Seth Alves
264d39aa9b
have knitted polyvoxes keep track of low-axis neighbors as well as high
2015-09-01 14:49:17 -07:00
Stephen Birarda
33f6933544
Merge branch 'master' of https://github.com/highfidelity/hifi into protocol
2015-09-01 14:36:16 -06:00
Seth Alves
930c5cefc9
fix setSphere to create a world-space sphere rather than a voxel-space one
2015-09-01 11:10:21 -07:00
Seth Alves
7369ca19e9
allow setting cuboid voxel spaces. clean up some locking
2015-08-31 18:01:15 -07:00
Seth Alves
54ddcf2841
fix normals in shader
2015-08-31 15:24:30 -07:00
Seth Alves
4d06890d90
lock/unlock less
2015-08-31 15:24:15 -07:00
Seth Alves
376a6bbb21
don't reload textures if the url didn't change
2015-08-31 11:48:08 -07:00
Seth Alves
41a2ff2fff
working on stitching marching-cube polyvoxs together
2015-08-30 18:42:15 -07:00
Seth Alves
64d0ce47f3
attempting to stitch polyvox entites together
2015-08-30 09:59:33 -07:00
Seth Alves
7614cababb
adjust whitespace
2015-08-28 13:21:34 -07:00
Seth Alves
540af4afcb
remove unneeded call to computeShapeInfoWorker
2015-08-28 12:47:04 -07:00
Seth Alves
a5cd3ff046
release _threadRunning if decompressVolumeDataAsync exits early
2015-08-28 11:04:56 -07:00
Seth Alves
1ac5c19f44
if someone else changes a polyvox, we need to localy recompute the collision shape
2015-08-28 10:39:23 -07:00
Seth Alves
0bcd6b8ec5
remove no-longer-used #define
2015-08-28 10:30:56 -07:00
Stephen Birarda
8ee27bca2b
remove urlAsString from Model
2015-08-27 16:00:21 -07:00
Stephen Birarda
80cf7b6c76
resolve conflicts on merge with upstream/master
2015-08-27 14:50:04 -07:00
Seth Alves
e97e7de19c
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-08-27 13:19:15 -07:00
Brad Hefta-Gaub
7b2f944f48
Merge pull request #5561 from ericrius1/particleExtensions
...
Extended Particle entity to allow for more varied effects
2015-08-27 10:45:03 -07:00
Seth Alves
b09de4ff65
fix worldCoordsToVoxelCoords for non-edged voxels. voxel.js now adds/delete where you click rather than near to there.
2015-08-26 21:51:28 -07:00
Seth Alves
696e34b996
Merge branch 'linux-memory-debugger' of github.com:sethalves/hifi into polyvox
2015-08-26 11:11:41 -07:00
Seth Alves
695ffa29c7
call setup_memory_debugger from common macros rather than from every CMakeLists.txt file
2015-08-26 11:09:59 -07:00
Atlante45
179ee73e26
Merge branch 'master' of https://github.com/highfidelity/hifi into update_protocol
2015-08-26 16:50:33 +02:00
Seth Alves
6f46832069
clean up some commented code. attempt to fix ray-casting in non-edged polyvox -- still isn't correct
2015-08-25 21:30:38 -07:00
Seth Alves
da6a1c958b
clean up debugging prints
2015-08-25 16:40:58 -07:00
Seth Alves
3c35d90908
don't recompute meshes if nothing changed
2015-08-25 13:13:01 -07:00
Seth Alves
f6c440756c
do slow polyvox operations on a thread
2015-08-25 11:46:51 -07:00
Seth Alves
7cb9968864
more work on polyvox threading
2015-08-25 05:53:36 -07:00
Seth Alves
91254245e4
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-08-24 20:21:24 -07:00
ericrius1
13892db866
removed logging
2015-08-24 11:41:03 -07:00
Anthony J. Thibault
47b8ab373c
Fix for RenderableParticleEffectEntity crash.
...
The render item payload now keeps a shared_ptr to the entity.
2015-08-24 11:15:30 -07:00
ericrius1
5fa27a7cf1
added back computeAndUpdate mmethod for particles, and now handling parsing old streams
2015-08-24 10:59:38 -07:00
Seth Alves
dc31c7e233
back out previous attempt at theading polyvox code. lay groundwork for threading that can be reasoned about
2015-08-23 08:14:05 -07:00
Seth Alves
9937416729
attempt to move some time-consuming polyvox stuff off of the main thread
2015-08-21 11:23:13 -07:00
Seth Alves
105470bf26
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-08-21 11:02:16 -07:00
Brad Davis
c3991dbb8c
Merge pull request #5622 from hyperlogic/ajt/network-geometry-refactor
...
ResourceCache, NetworkGeometry and Model refactoring and optimizations.
2015-08-20 23:57:16 -07:00
Anthony J. Thibault
1b3d7fabc8
ResourceCache, NetworkGeometry and Model refactoring and optimizations.
...
* Removed validation logic from Resource class, Qt does this internally and is more
standards compliant. This should result in more accurate caching and faster resource
fetching when cache is stale and validation fails.
* Added loaded and failed slots to Resource class, so it does not have to be polled.
* NetworkGeometry now uses multiple Resource objects to download
the fst/mapping file and the fbx/obj models.
* NetworkGeometry is no longer a subclass of Resource
* NetworkGeometry now has signals for success and failure, you no longer
have to poll it to determine when loading is complete (except for textures *sigh*)
Some functionality was removed
* NetworkGeometry no longer has a fallback
* NetworkGeometry no longer loads LODs or has lod logic.
* The number of FBXGeometry copies is greatly reduced.
* Model::setURL no supports fallback URL, delayLoad or retainCurrent option.
This can result in a pop when switching avatars, and there's no longer a default
if avatar loading fails.
2015-08-20 18:59:51 -07:00
Seth Alves
f9fb65bb4b
Merge branch 'linux-memory-debugger' of github.com:sethalves/hifi into polyvox
2015-08-20 10:15:16 -07:00
Seth Alves
c25082d86f
use -fsanitize=address in all code rather than just the top-level links
2015-08-20 10:14:16 -07:00
Seth Alves
f563b2aeba
clean up debugging prints
2015-08-19 19:15:04 -07:00
Andrew Meadows
990dce6795
Merge pull request #5578 from sethalves/polyvox
...
Polyvox improvements
2015-08-19 10:31:13 -07:00
Seth Alves
2dc2757eca
code review
2015-08-18 13:03:54 -07:00
Stephen Birarda
0f77ab8611
resolve conflicts on merge with upstream/master
2015-08-18 11:45:55 -07:00
ZappoMan
ae9ccb79ed
cleanup debugging and dead code
2015-08-17 15:58:51 -07:00
ZappoMan
b7d9dc444b
more work on clicking focus
2015-08-17 13:06:32 -07:00
Seth Alves
1a71c3cc04
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-08-17 10:17:58 -07:00
Seth Alves
af11e97daa
fix broken optimisation for skipping internal voxels when making collision hull
2015-08-17 08:49:00 -07:00
Brad Davis
db4d98ccb5
Polyvox shader fix
2015-08-16 23:21:45 -07:00
Seth Alves
1ee773a532
don't include interrior voxels in cubic collision hull
2015-08-16 14:11:37 -07:00
Seth Alves
c60a8e7dfc
minecraft style voxel editing largely works
2015-08-16 12:52:55 -07:00
Seth Alves
a57278ba3c
ray-picks against cubic-voxels seem right, now
2015-08-16 11:51:04 -07:00
Seth Alves
0230d9397c
attempt to find exact ray intersection with cubic polyvox -- not working right, yet.
2015-08-16 11:04:52 -07:00
Seth Alves
b129c2a933
in edged mode, make sure border voxels are zeroed out. expose some more voxel matrix math to javascript
2015-08-16 09:36:54 -07:00
Seth Alves
c6530c4cec
fix newly created polyvox collision-hull bug
2015-08-15 16:16:27 -07:00
Seth Alves
5ecdbaa19d
have functions that change polyvox voxes return true if they changed anything, else false. added voxelCoordsToWorldCoords and worldCoordsToVoxelCoords
2015-08-15 15:18:25 -07:00
Seth Alves
09a9deabdb
compute polyvox collision hull differently for marching-cube surfaces
2015-08-15 12:55:24 -07:00
Seth Alves
79a7755cdb
add SURFACE_EDGED_MARCHING_CUBES polyvox surface extraction style
2015-08-15 12:18:36 -07:00
Seth Alves
27e5322cb4
compute polyvox collision hull differently for marching-cube surfaces
2015-08-15 11:25:27 -07:00
Brad Davis
208e41efd1
WebEntity keyboard input with mouse hover
2015-08-14 16:18:38 -07:00
ericrius1
b8a6105a03
Merge branch 'master' into particleExtensions
2015-08-14 08:56:59 -07:00
ericrius1
81844a82e8
fixed spacing issues and removed dead line
2015-08-12 16:25:56 -07:00
Brad Davis
0fa3044231
QML framerate improvments
2015-08-12 16:24:34 -07:00
ericrius1
36ca0c54fc
acceleration spread working properly
2015-08-12 16:13:00 -07:00
ericrius1
16279bd415
emitters trail particles now
2015-08-12 14:01:42 -07:00
Brad Davis
19d31938d3
Merge remote-tracking branch 'upstream/master' into plugins
2015-08-10 21:25:35 -07:00
Seth Alves
b26d6d2b9c
Merge pull request #5542 from ZappoMan/RenderableModelEntityItemOptimization
...
Renderable model entity item optimizations
2015-08-10 15:10:12 -07:00
ericrius1
8e7398ac7d
small comment change
2015-08-10 13:41:30 -07:00
ericrius1
0f7c21ddd7
rearranged entity props and added check in setNormals to avoid uninitialized binormal values
2015-08-10 11:55:47 -07:00
Brad Davis
59dc6c9cca
Merge remote-tracking branch 'upstream/master' into plugins
2015-08-10 11:47:54 -07:00
Andrew Meadows
5acd1e7d58
Merge pull request #5467 from sethalves/polyvox
...
Polyvox improvements (Warning: protocol change)
2015-08-10 11:12:10 -07:00
ericrius1
c299d77c92
fixed implicit double to float casting and incorrect header author attribution
2015-08-10 10:57:53 -07:00
ZappoMan
942958c4f1
only setJointState() if animation frame actually changed
2015-08-09 16:07:56 -07:00
ericrius1
19e645fc65
fixed the way colors are handled to work with new core profile changes
2015-08-07 16:26:52 -07:00
ericrius1
205a2d53b6
no longer returning early on NaN
2015-08-07 16:15:51 -07:00
Bradley Austin Davis
cd6667303e
Merge remote-tracking branch 'upstream/master' into plugins
2015-08-07 15:32:33 -07:00
Seth Alves
732f9ceca5
pass voxel dimensions from PolyVoxEntityItem to pixel-shader so that the textures line up with the edges
2015-08-07 14:21:20 -07:00
ZappoMan
cec0f8ed1d
optimize ModelEntityItem::getAnimationFrame()
2015-08-07 13:43:57 -07:00
Seth Alves
f9685efa4b
set payload bounds for polyvoxs
2015-08-07 13:43:34 -07:00
Seth Alves
fcb30dbbe7
hook textures up to polyvoxs
2015-08-07 13:33:00 -07:00
ZappoMan
f4c3c30f6a
quick optimization to RenderableModelEntityItem::render()
2015-08-07 12:49:48 -07:00
ericrius1
d735c85806
moving polyLineEntity over to core profile
2015-08-07 11:41:55 -07:00
ericrius1
3910cb0d69
Merge branch 'master' into polyLineInProgress
2015-08-07 10:12:02 -07:00
Seth Alves
19aec4a3e7
update polyvox shader
2015-08-07 09:07:54 -07:00
Seth Alves
c07119c30b
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-08-07 07:37:25 -07:00
Bradley Austin Davis
7e60aee1bf
Merge branch 'master' into plugins
...
Conflicts:
interface/src/Application.cpp
interface/src/Application.h
interface/src/avatar/Head.cpp
interface/src/avatar/MyAvatar.cpp
interface/src/avatar/MyAvatar.h
interface/src/avatar/SkeletonModel.cpp
interface/src/avatar/SkeletonModel.h
interface/src/devices/3DConnexionClient.cpp
interface/src/ui/overlays/Overlays.cpp
2015-08-06 11:03:37 -07:00
Stephen Birarda
052978898e
resolve conflicts on merge with upstream master
2015-08-05 11:16:20 -07:00
Seth Alves
80909b4531
work toward getting textures on polyvox entities
2015-08-04 17:53:47 -07:00
Seth Alves
56c0f9c814
work toward getting textures on polyvox entities
2015-08-04 17:37:15 -07:00
Seth Alves
419caccd8e
unmangle merge
2015-08-04 17:06:17 -07:00
Seth Alves
78091fd983
Merge branch 'master' of github.com:highfidelity/hifi into polyvox-render
2015-08-04 16:56:45 -07:00
Seth Alves
b318c1122c
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-08-04 16:00:27 -07:00
Sam Gateau
d07ab353fc
remove glLineWidth completely because it s not available anymore for wide lines in core
2015-08-04 11:57:20 -07:00
Seth Alves
dbda5ba40e
change polyvox rendering
2015-08-04 11:26:29 -07:00
Bradley Austin Davis
3c76c0d4b6
Merge remote-tracking branch 'upstream/master' into core
2015-08-04 10:23:54 -07:00
Bradley Austin Davis
53ccbfc4fa
Merge branch 'core' into plugins
2015-08-03 22:25:50 -07:00
ericrius1
12770edbe1
Merge branch 'master' into polyLineInProgress
2015-08-03 15:52:26 -07:00
ericrius1
94acb23f27
no longer redefining payloadRender method in effort to avoid linux build errors
2015-08-03 15:51:11 -07:00
ericrius1
b2753507dc
cleanup of comments and dead code
2015-08-03 09:35:47 -07:00
ericrius1
47bc8f50ab
cleaning
2015-08-03 08:45:14 -07:00
Bradley Austin Davis
f19653f3e2
Integrate glew
2015-08-01 20:08:19 -07:00
Brad Davis
b84eef93c9
Core profile shader work and test code
2015-08-01 14:43:52 -07:00
Seth Alves
dbca3fe2fb
attempt to give polyvox its own rendering bung
2015-08-01 05:58:22 -07:00
Seth Alves
443b9e1e78
attempt to give polyvox its own rendering bung
2015-07-31 21:58:43 -07:00
Seth Alves
299d834e0e
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-07-31 15:30:28 -07:00
Brad Davis
155f88e267
Merge remote-tracking branch 'upstream/master' into plugins
...
Conflicts:
interface/src/devices/OculusManager.cpp
interface/src/devices/TV3DManager.cpp
interface/src/devices/TV3DManager.h
libraries/gpu/src/gpu/GPUConfig.h
2015-07-31 10:28:06 -07:00
Howard Stearns
b685378ab0
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-31 10:08:30 -07:00
Seth Alves
3b88500735
Merge branch 'polyvox' of github.com:sethalves/hifi into polyvox
2015-07-30 21:22:52 -07:00
Seth Alves
f2fb156d66
merge from upstream
2015-07-30 21:21:13 -07:00
Seth Alves
8d2aacb46d
send X texture to renderer
2015-07-30 15:36:07 -07:00
Brad Davis
f7a2513f26
Merge remote-tracking branch 'upstream/master' into plugins
...
Conflicts:
interface/CMakeLists.txt
interface/src/Application.cpp
interface/src/Menu.cpp
interface/src/Menu.h
interface/src/avatar/MyAvatar.h
tests/ui/src/main.cpp
2015-07-30 12:55:22 -07:00
Sam Gateau
d84e2d31ea
Merge with master
2015-07-30 11:20:00 -07:00
Seth Alves
03456f1a06
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-07-30 10:13:44 -07:00
Howard Stearns
06aa107762
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-30 09:57:02 -07:00
Andrew Meadows
77a12eb50e
compile on linux with GLEW
2015-07-28 17:53:01 -07:00
ZappoMan
c15161b71a
fix crash in Particle Entities and pendingChanges.updateItem()
2015-07-28 14:56:38 -07:00
ericrius1
b4a9469dff
colors
2015-07-28 11:42:23 -07:00
Seth Alves
be39e5d6cf
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-07-27 19:13:48 -07:00
Sam Gateau
baf7873ce1
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
2015-07-27 17:40:19 -07:00
Sam Gateau
f525a8a245
Removing all the unecessary calls of Batch from the gl legacy time
2015-07-27 17:17:56 -07:00
Howard Stearns
80763b3fc5
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-27 13:45:25 -07:00
Anthony J. Thibault
5844b594dc
Converted magic numbers to constants.
2015-07-27 09:27:16 -07:00
Seth Alves
9631268710
don't double-call updateOnCount when RenderablePolyVoxEntityItem::setAll is called
2015-07-26 21:03:11 -07:00
Anthony J. Thibault
5cc0b45850
Improved ParticleEffectEntityItem rendering and updates
...
* Created custom pipelines and shaders for untextured and textured
particle rendering.
* Created custom render payload for particles
* Moved all particle updates into simulation rather then render.
* Uses pendingChanges.updateItem lambda to update the playload with
new data for rendering.
* ParticleEffectEntityItem now updates its dimensions properly,
based on emitter properties.
* Bug fix for dt not accumulating properly, during gaps between updates.
now we just update all the time. (super cheap tho, if there are no particles
animating)
2015-07-26 17:21:17 -07:00
Stephen Birarda
9e7fb9ae16
shuffle Packet headers, use static enum for PacketType
2015-07-23 13:56:47 -07:00
Seth Alves
ee334ff826
JointStates are owned by Rig objects. Model, FaceModel, SkeletonModel call into their Rig pointer to access JointStates.
2015-07-22 18:43:10 -07:00
ericrius1
b44193c2ad
catching end of texture
2015-07-22 17:25:33 -07:00
ericrius1
3379291b05
making uv mapping DRIER
2015-07-22 16:13:02 -07:00
ericrius1
352c42d8d4
head body tail
2015-07-22 15:40:29 -07:00
ericrius1
75220a32e7
tail dynamic
2015-07-22 14:49:48 -07:00
ericrius1
b452566d75
transparent textures and setting up 9-patch system for texture scaling
2015-07-22 10:57:03 -07:00
ericrius1
99856df112
tail strip
2015-07-21 11:43:10 -07:00
ericrius1
e1f8871ec9
drawing trails at end of stroke
2015-07-21 10:48:25 -07:00
ericrius1
b9affba93f
textures working
2015-07-21 09:56:09 -07:00
ericrius1
9fc54a6040
getting closer to texturing properly
2015-07-20 15:33:21 -07:00
Atlante45
8d6ff2d9f9
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
2015-07-20 14:50:44 -07:00
Atlante45
59acfc9f47
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
2015-07-20 13:51:51 -07:00
Stephen Birarda
0177513285
resolve conflicts on merge with upstream/master
2015-07-20 12:29:38 -07:00
ericrius1
1e34de1c51
adding in screen space effect for getting hit
2015-07-20 10:44:38 -07:00
Brad Davis
d68618e206
Removing GL headers from most files, and some naked GL from application.cpp
2015-07-18 00:46:09 -07:00
Atlante45
256c786e28
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
2015-07-17 17:59:19 -07:00
Stephen Birarda
f8c832e50b
resolve conflicts on merge with upstream master
2015-07-17 16:48:46 -07:00
ericrius1
bad6aa8f0a
adding textures to poly line"
2015-07-17 15:39:44 -07:00
ericrius1
a44e5f949c
Merge branch 'master' into polyLineInProgress
2015-07-17 15:01:40 -07:00
ericrius1
5e3e1e4567
adding texture
2015-07-17 15:00:10 -07:00
Brad Davis
89faf85ad9
Working on text rendering overlays
2015-07-16 15:56:01 -07:00
Stephen Birarda
05dde9d8f5
resolve conflicts on merge with upstream/master
2015-07-15 16:18:47 -07:00
ZappoMan
819fa852b8
first pass at GlowEctomy
2015-07-15 12:47:59 -07:00
Stephen Birarda
8b5026a817
cleanup some warnings
2015-07-15 11:20:55 -07:00
Atlante45
8fb69ecc96
Merge branch 'master' of https://github.com/highfidelity/hifi into clear_cache_and_restart
2015-07-14 13:50:58 -07:00
Clément Brisset
17c6f41db6
Merge pull request #5306 from ctrlaltdavid/20606
...
CR for 20606 - If an external texture isn't found, still display the model
2015-07-14 13:49:00 -07:00
Atlante45
7bf45308b6
Merge branch 'master' of https://github.com/highfidelity/hifi into clear_cache_and_restart
2015-07-14 12:31:37 -07:00
Ryan Huffman
0edc909818
Merge branch 'protocol' of github.com:birarda/hifi into receive_packets
...
Conflicts:
assignment-client/src/audio/AudioMixer.cpp
interface/src/Application.cpp
libraries/networking/src/Packet.cpp
2015-07-14 10:21:31 -07:00
Stephen Birarda
821c16cbc4
resolve conflicts on merge with uptream/master
2015-07-14 09:52:20 -07:00
ericrius1
c4194cd030
adding textures
2015-07-14 09:38:55 -07:00
Brad Davis
684d466b44
Merge pull request #5308 from venkatn93/avatar
...
Avatars rendered correctly based on Scene.shouldRenderAvatars
2015-07-14 09:06:49 -07:00
Niraj Venkat
ef3c6b25e0
More coding standard changes
2015-07-14 00:45:38 -07:00
ZappoMan
5676246d75
fix the lingering model parts sometimes left behind when switching domains
2015-07-13 15:26:52 -07:00
ericrius1
f54d1cf0f6
smoother line drawing over network
2015-07-13 14:24:26 -07:00
Stephen Birarda
d990420565
repairs to octree packet receiving in interface
2015-07-13 13:10:57 -07:00
Stephen Birarda
264f39fa59
resolve conflicts on merge with upstream/master
2015-07-13 11:25:24 -07:00
ericrius1
0ce6737b34
merged and normals flipping
2015-07-13 09:43:15 -07:00
ericrius1
b3b12bd2dc
adding custom shader for flipped normals
2015-07-13 08:54:53 -07:00
David Rowe
d44743563b
Merge branch 'master' into 20606
...
Conflicts:
libraries/render-utils/src/Model.cpp
2015-07-13 07:53:04 -07:00
Atlante45
80fe090a94
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
2015-07-10 20:20:03 -07:00
David Rowe
8ecefdfe39
If an external texture isn't found, still display the model
...
If the texture is present the next Interface is run then it will be used.
2015-07-10 16:03:27 -07:00
Atlante45
a3848f08d2
Conditionnal fixes.
2015-07-10 15:36:17 -07:00
Atlante45
49993695a5
Made geometry refresh safe
2015-07-10 15:20:19 -07:00
Sam Gateau
2c05349b06
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-07-10 11:10:07 -07:00
Sam Gateau
7fc9fd97ff
Replacing setUniformTexture by setResourceTexture in order to differenciate the 2 types of binding points for the BUffers.
2015-07-10 11:03:12 -07:00
Niraj Venkat
706f85e4ce
Fixes to comply with coding standard
2015-07-09 17:31:38 -07:00
Niraj Venkat
bd91daf712
Removing debug code
2015-07-09 16:27:23 -07:00
Niraj Venkat
1dce5f80cc
Entities are now added/removed from rendering based on Scene.shouldRenderEntities
2015-07-09 16:17:58 -07:00
Stephen Birarda
19c5f0b67c
resolve conflicts on merge with upstream/master
2015-07-08 22:54:36 -07:00
Atlante45
e2718d5c94
Merge branch 'protocol' of https://github.com/birarda/hifi into protocol
2015-07-08 18:26:36 -07:00
Sam Gateau
4c44eb63da
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-07-08 14:25:41 -07:00
Sam Gateau
f992e875b4
Adding intrsumentation for nsight and hiding the nsight specific code in cpp
2015-07-08 14:25:13 -07:00
Stephen Birarda
74940a2132
replace lingering PacketTypes in old format
2015-07-08 10:18:13 -07:00
Atlante45
687f9dda4a
Restore old offset behaviors
2015-07-06 18:21:17 -07:00
Atlante45
541d9ae431
Merge branch 'master' of https://github.com/highfidelity/hifi into fix_billboard
2015-07-06 18:05:43 -07:00
Sam Gateau
4d48b98364
For a fistfull of magic numbers
2015-07-06 14:22:09 -07:00
Sam Gateau
95f5b14d45
CLenaing the interface of Item::Status to be more explicit and removing magic numbers
2015-07-06 12:47:35 -07:00
Atlante45
c61bf34200
Use depth bias to avoid z-fighting on text entities
2015-07-04 18:35:00 -07:00
Atlante45
0eb89efb34
Fix text entity billboarding
2015-07-04 16:06:38 -07:00
Sam Gateau
76ca093e05
something working ?
2015-07-02 18:12:03 -07:00
samcake
0c55130548
maybe i have solved the passing of the status
2015-07-02 17:31:29 -07:00
Stephen Birarda
0d64e82fe2
replace PacketType declarations with PacketType::Value
2015-07-02 16:38:52 -07:00
Sam Gateau
79be37f78f
improvment ?
2015-07-02 16:00:56 -07:00
Sam Gateau
bf052162bb
improvment ?
2015-07-02 15:53:02 -07:00
Sam Gateau
8d8a902328
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-07-02 15:06:32 -07:00
Sam Gateau
be8fe25338
Trying to finalize the look and behavior of th estatus indicators
2015-07-02 15:06:07 -07:00
ericrius1
ad97b28734
fixed merge conflicts
2015-07-02 11:01:40 -07:00
samcake
faea97d3c7
Merge pull request #5221 from Atlante45/web
...
Fix Web entities
2015-07-02 10:45:20 -07:00
ericrius1
feeba2a029
testing for serialization
2015-07-01 23:03:03 -07:00
ericrius1
ff99f68f89
fix quad logic
2015-07-01 22:29:33 -07:00
Atlante45
7b5a5a339a
Use make_shared/create to make shared pointers
2015-07-01 19:46:06 -07:00
ericrius1
43b1751db3
fixed network bug for polylines
2015-07-01 18:33:42 -07:00
ericrius1
ad54b4c0b0
changed quad entity to PolyLine
2015-07-01 17:18:36 -07:00
Sam Gateau
dfa6b03a6b
Making the first statusGetter noitify
2015-07-01 14:20:35 -07:00
Sam Gateau
63e3d0e741
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-07-01 07:48:37 -07:00
Sam Gateau
2f04a9d3da
refining the shader pipeline and trying to pass a Status Getter from the model and fails
2015-07-01 07:47:46 -07:00
ericrius1
ff77c3e0d8
added stroke width entity
2015-06-30 18:38:40 -07:00
ericrius1
0131a502cc
adding locking to updateGeometry method to prevent race conditions
2015-06-30 15:01:19 -07:00
ericrius1
9fd30581d1
support for painting with quads, including per-vertex normals and colors
2015-06-29 15:56:40 -07:00
ericrius1
843ab6d5e3
line entities can now be properly rotated using rotation property
2015-06-29 11:08:09 -07:00
Seth Alves
4d2c9b39ce
swap out auto for the actual types
2015-06-29 09:44:20 -07:00
ericrius1
cf720f9e2e
merged master
2015-06-29 09:27:40 -07:00
Seth Alves
f8617bab2d
expand out SIMPLE_RENDERABLE macro
2015-06-27 16:47:11 -07:00
ericrius1
10cefe03b5
face colors
2015-06-26 17:58:04 -07:00
Brad Davis
84505c49c4
Merge pull request #5213 from birarda/hyperlink-photo
...
add photo replacement for hyperlinked places
2015-06-26 17:05:33 -07:00
Atlante45
d02c69111b
Fix compile error in text shader
2015-06-26 16:56:47 -07:00
Atlante45
27a1a55275
Don't cull text background/Text is emissive
2015-06-26 16:17:41 -07:00
