ericrius1
c561a53f7c
Going to change additive blending to world position prop
2015-12-15 09:56:28 -08:00
ericrius1
3d782f1307
fixed merge conflicts
2015-12-14 10:11:49 -08:00
Seth Alves
008065ba38
Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting
2015-12-14 09:15:56 -08:00
Seth Alves
c74f8bca49
location getters also return a success boolean so that callers can know if the value they are receiving is bad due to lack of information about an object's parent
2015-12-14 09:13:36 -08:00
Brad Hefta-Gaub
63c3f7c1a7
Merge pull request #6637 from Atlante45/warnings-win
...
Warning cleanup
2015-12-12 13:00:55 -08:00
Seth Alves
1492fd6090
merge from upstream
2015-12-12 12:37:57 -08:00
Atlante45
eb8fc2e156
Fix last of the windows warnings
2015-12-11 17:37:36 -08:00
Seth Alves
8ec84bdde8
don't simulate model until it has geometry
2015-12-11 17:35:18 -08:00
Atlante45
ce51350b65
Fix warnings on windows 64bit
2015-12-11 15:42:15 -08:00
Atlante45
a07d7494f0
More OS X warning cleanup
2015-12-11 14:20:36 -08:00
Seth Alves
6c033d9603
call locationChanged when receiving changing avatar joints over the network. RenderableModelEntityItem uses locationChanged to relay updates to _model
2015-12-11 11:35:42 -08:00
Howard Stearns
585911fe98
Merge pull request #6612 from sethalves/no-physics-until-ready
...
No physics until ready
2015-12-10 16:09:49 -08:00
Atlante45
03ee07c8b7
Merge branch 'master' of https://github.com/highfidelity/hifi into particle
2015-12-10 13:37:20 -08:00
Seth Alves
3a35df191a
remove an off-brand change
2015-12-10 11:19:26 -08:00
Seth Alves
1467a9d2eb
handle initial simulation of _model
2015-12-10 11:17:40 -08:00
Seth Alves
2dd40beed5
formatting
2015-12-10 10:42:25 -08:00
Seth Alves
a59af2c1b2
Merge branch 'master' of github.com:highfidelity/hifi into no-physics-until-ready
2015-12-10 09:03:57 -08:00
Seth Alves
d09f70239c
make entity-tree a global. change how network-requests to load model geometry are triggered
2015-12-10 09:03:53 -08:00
James B. Pollack
4e93f3ae81
respect visibility yay
2015-12-09 18:26:13 -08:00
James B. Pollack
b4c272aaa1
sam just left
2015-12-09 17:28:45 -08:00
Atlante45
1d513cfbba
Merge branch 'master' of https://github.com/highfidelity/hifi into particle
2015-12-09 15:09:19 -08:00
Seth Alves
47df744552
Merge branch 'update-model-during-simulate' of github.com:sethalves/hifi into no-physics-until-ready
2015-12-09 12:40:18 -08:00
Seth Alves
4d60c7bbc0
update model location with SpatiallyNestable's locationChanged call
2015-12-09 10:42:32 -08:00
Brad Hefta-Gaub
1356fb15aa
Merge pull request #6591 from jherico/zaan
...
Add sphere and cube triangle counts to displayed stats
2015-12-08 13:27:37 -08:00
Bradley Austin Davis
011a43d5f2
Add sphere and cube triangle counts to displayed stats
2015-12-08 11:08:22 -08:00
Seth Alves
f99812a903
adjust method names to fit convention
2015-12-07 14:31:08 -08:00
Clément Brisset
390836b64e
Merge pull request #6431 from huffman/proto-received-message
...
Combine Packet and PacketList into ReceivedMessage on receiving end
2015-12-07 09:58:52 -08:00
Atlante45
18198cb6fb
Fix missing override
2015-12-07 08:36:49 -08:00
Seth Alves
96e9580473
change some more parameters back to being pass-by-reference, where it's safe
2015-12-07 05:30:19 -08:00
Seth Alves
a948ae5f19
children of avatar joints might be right, now
2015-12-06 10:48:00 -08:00
Ryan Huffman
89c412c324
Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message
2015-12-04 11:38:28 -08:00
Brad Hefta-Gaub
d07629489c
Merge pull request #6543 from Atlante45/pointer
...
gpu::Shader::create* return shared_ptr
2015-12-04 11:17:02 -08:00
Brad Hefta-Gaub
d9a1563396
Merge pull request #6152 from sethalves/parents
...
Parents
2015-12-04 10:26:57 -08:00
Atlante45
cb758ca6b4
Fix override warnings on XCode 7
2015-12-04 08:55:43 -08:00
Atlante45
180ffcc456
Typo (English is weird)
2015-12-03 15:01:18 -08:00
Atlante45
591025850b
Fix particle shader
2015-12-03 15:01:18 -08:00
Atlante45
bd23a4137e
Move toGlm to GLMHelpers
2015-12-03 15:01:17 -08:00
Atlante45
9c5486fb4b
More particle work
2015-12-03 15:01:17 -08:00
Atlante45
3da80f5861
gpu::Shader::create* return shared_ptr
2015-12-03 14:56:07 -08:00
ericrius1
5f881e7650
polylines now take color as a uniform
2015-12-03 13:46:29 -08:00
ericrius1
07430fb75a
Merge branch 'master' into polylineOptimizations
2015-12-02 15:59:32 -08:00
ericrius1
191f7f2c22
no audio for now
2015-12-01 16:22:11 -08:00
ericrius1
71d361ed3b
fixed hydra paint, adding more interactive brushes
2015-11-30 17:06:35 -08:00
Seth Alves
b7ebe5b92b
merge from upstream
2015-11-30 16:59:52 -08:00
Ryan Huffman
99dd9646bc
Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message
2015-11-30 10:20:13 -08:00
Seth Alves
cf39cac7fc
attempt to make SpatiallyNestable data access thread-safe
2015-11-29 12:50:33 -08:00
Seth Alves
4b5fec4b00
clean up, minimize diff
2015-11-26 08:36:41 -08:00
Seth Alves
4ab2bfa854
clean up, minimize diff
2015-11-26 08:35:28 -08:00
Seth Alves
c96a09976e
Merge branch 'master' of github.com:highfidelity/hifi into update-model-during-simulate
2015-11-26 08:32:17 -08:00
Seth Alves
ca75802b9c
unmangle merge
2015-11-26 06:43:28 -08:00
Anthony J. Thibault
23def8d173
Merge branch 'master' into tony/remove-joint-states
2015-11-25 13:55:23 -08:00
Clément Brisset
5ff482071e
Merge pull request #6465 from ericrius1/polyLineFix
...
moved logic to build vertex buffer to renderable polyline class, recalculati…
2015-11-25 11:02:02 -08:00
Anthony J. Thibault
f120e10ff4
Merge branch 'master' into tony/remove-joint-states
2015-11-24 15:00:05 -08:00
Atlante45
2dd494b5df
Remove additive blending option (force it)
2015-11-24 11:51:56 -08:00
Atlante45
4827a96bfa
Fix vertex shader (nested struct unsupported)
2015-11-24 11:51:56 -08:00
Atlante45
d08a4d77dc
Shader cleanup
2015-11-24 11:51:56 -08:00
Atlante45
28c8cf26f5
Fix shader transform errors
2015-11-24 11:51:56 -08:00
Atlante45
9adc437553
Make Particle's Payload/PendingChanges *almost* pointer free
2015-11-24 11:51:56 -08:00
Atlante45
0f316e6ae1
Remove particles emiter bounds compute
2015-11-24 11:51:56 -08:00
Atlante45
2cb2ca29e6
More particle shader work
2015-11-24 11:51:56 -08:00
Atlante45
74278cad40
Fix particle texturing
2015-11-24 11:51:56 -08:00
Atlante45
e25ea122d8
Start moving update to shader
2015-11-24 11:51:56 -08:00
Atlante45
61511d57bb
Rename struct/Add type aliases
2015-11-24 11:51:56 -08:00
Atlante45
ca17c75631
Save one array traversal
2015-11-24 11:51:56 -08:00
Atlante45
cb14fbf4a1
Instance particle draw calls
2015-11-24 11:51:56 -08:00
Atlante45
230a413ec1
First pass at new particle shader
2015-11-24 11:51:56 -08:00
Atlante45
964ac5bad6
More cleanup
2015-11-24 11:51:56 -08:00
Atlante45
c33b6205a8
Some cleanup
2015-11-24 11:51:56 -08:00
Atlante45
40e802bae7
Get rid of global variable for sort
...
Fix rhs/lhs
2015-11-24 11:51:56 -08:00
Atlante45
395822c6cd
Use make_shared
2015-11-24 11:51:56 -08:00
Atlante45
a71ed7b166
Implement particle bounds with Extents
2015-11-24 11:51:56 -08:00
Brad Hefta-Gaub
fd7a704753
Merge pull request #6471 from birarda/url-cmp
...
fix unnecessary model URL updating thanks to URL encoding
2015-11-24 10:56:21 -08:00
Ryan Huffman
dac491ef41
Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message
2015-11-24 09:59:22 -08:00
Stephen Birarda
5a7b0dd1ad
put the parsed model URL in ModelEntityItem
2015-11-24 11:46:51 -06:00
Stephen Birarda
0d6b919448
cleanup printing of updated model URL
2015-11-24 11:22:30 -06:00
Stephen Birarda
0e19e50047
cleaner handling for QString/QUrl conversion/comparison
2015-11-24 11:17:46 -06:00
Seth Alves
09f14bc9a5
guard against nullptr deferenece
2015-11-23 16:51:17 -08:00
Seth Alves
5cd047da15
move some more code over
2015-11-23 16:49:36 -08:00
Seth Alves
cfcff42004
missed a line
2015-11-23 16:41:16 -08:00
Seth Alves
283ad7ffd9
try, try again
2015-11-23 16:39:19 -08:00
Brad Hefta-Gaub
ce46c30647
change the ScriptEngine::waitTillDoneRunning() to wait for the script thread to complete
2015-11-23 16:27:06 -08:00
Seth Alves
89e5b11f9e
do this from update rather than simulate
2015-11-23 16:17:22 -08:00
Seth Alves
7b70562a1b
update RenderableModelEntityItem::_model during simulate rather than during render
2015-11-23 15:51:43 -08:00
Stephen Birarda
6339c2c48f
fix for unnecessary model URL updating
2015-11-23 17:25:31 -06:00
Seth Alves
ba30e01664
include global position in avatar-mixer protocol so server knows where avatars are in world-space
2015-11-23 14:12:49 -08:00
Seth Alves
a08bad8cbd
for models, relay getJointRotation and getJointTranslation to the model
2015-11-23 13:46:32 -08:00
ericrius1
1409ed2d18
moved logic to build vertices buffer to renderable class, recalculating vertices anytime any of the normals, point, or strokeWidths data changes
2015-11-23 12:28:44 -08:00
Anthony J. Thibault
821264a031
Merge branch 'master' of github.com:highfidelity/hifi into tony/remove-joint-states
2015-11-22 16:15:03 -08:00
Seth Alves
4646c0c103
unmangle merge
2015-11-21 10:49:31 -08:00
Seth Alves
f013f95e9b
merge from upstream
2015-11-21 08:43:00 -08:00
Anthony J. Thibault
cb89f09635
Removed EntityRig and AvatarRig. One Rig to rule them all.
2015-11-20 14:27:01 -08:00
Anthony J. Thibault
a77ea8da43
Removed JointStates! You won't be missed.
2015-11-20 14:15:37 -08:00
Ryan Huffman
2a416ebc61
Merge branch 'master' of https://github.com/highfidelity/hifi into received-message
2015-11-18 16:52:23 -08:00
Ryan Huffman
2fe9af54d4
Add textures property to polyline
2015-11-18 13:59:32 -08:00
Seth Alves
715a46ee82
show actions in status icons
2015-11-11 16:35:04 -08:00
Seth Alves
f07d5d9d3f
show network and physics status on boxes and spheres
2015-11-11 11:32:12 -08:00
Seth Alves
c2b0ccd6b3
show simulation ownership with status icons
2015-11-11 08:30:04 -08:00
Seth Alves
4cf84a4e5b
use makeEntityItemStatusGetters from more entity types
2015-11-10 17:14:09 -08:00
Seth Alves
7b4dd9a908
Merge branch 'rework-visual-physics-debug' of github.com:sethalves/hifi into rework-visual-physics-debug
2015-11-10 17:06:16 -08:00
Seth Alves
39b92d2b52
terse log when ownership changes
2015-11-10 17:06:12 -08:00
Seth Alves
66387c4530
use icons to show network and physics status
2015-11-10 17:02:57 -08:00
Seth Alves
b9ca509f07
Merge branch 'master' of github.com:highfidelity/hifi into render-debug-fixup
2015-11-10 09:50:12 -08:00
Seth Alves
d535109caf
attempt to fix render-collision hull feature
2015-11-10 09:49:31 -08:00
Brad Hefta-Gaub
0ea901fd72
fix various warnings
2015-11-10 08:34:58 -08:00
Seth Alves
bc516c0b86
use render-item status getters to display physics debugging information
2015-11-06 11:32:56 -08:00
ericrius1
af0c0e6a1b
spacing fix
2015-11-03 17:32:22 -08:00
ericrius1
31fe5fa953
Bump version num, use different shader for additive blending effect
2015-11-03 17:15:10 -08:00
ericrius1
470f814776
Fixed glitches with large particles being sorted along wrong axis
2015-11-03 16:39:16 -08:00
ericrius1
60f35ce8c7
discarding pixel if alpha is below threshold
2015-11-03 15:46:58 -08:00
ericrius1
0c8a712935
removed comment
2015-11-03 15:36:11 -08:00
ericrius1
0ed868077d
Added additive blending as option for particle effect
2015-11-03 10:02:51 -08:00
ericrius1
f57f3c1138
Disabled writing to depth buffer for particles and no longer sorting the,
2015-11-02 15:25:42 -08:00
Seth Alves
3ac0fef1ea
merge from upstream
2015-11-01 15:22:57 -08:00
Brad Davis
036ae62dd3
Merge remote-tracking branch 'upstream/master' into HEAD
2015-10-29 14:00:52 -07:00
Andrew Meadows
0c5b4115ed
Merge pull request #6221 from huffman/physics-substep-fix
...
Physics substep fix
2015-10-29 12:39:15 -07:00
Brad Hefta-Gaub
1f53e425eb
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-10-29 12:28:28 -07:00
samcake
e4aab4bd97
Merge branch 'master' of https://github.com/highfidelity/hifi into color
2015-10-28 15:32:13 -07:00
Brad Davis
3c1a0930da
Merge remote-tracking branch 'upstream/master' into HEAD
...
Conflicts:
interface/src/avatar/MyAvatar.h
libraries/script-engine/src/ScriptEngine.cpp
libraries/script-engine/src/ScriptEngine.h
2015-10-28 13:38:22 -07:00
Brad Davis
5cbb2562cd
Move GL utilities out to their own library
2015-10-27 15:53:42 -07:00
Ryan Huffman
913026280c
Fix EntityTreeRenderer dropping contact end events
2015-10-26 13:02:39 -07:00
samcake
ff57b73bd6
Creating the COlorUTils in shared to deal with all the standard color conversions
2015-10-26 10:53:21 -07:00
samcake
bc7ad9d3f7
Move the keyLIght properties in their own group and add the ambientURL in
2015-10-26 09:27:06 -07:00
Seth Alves
61269c3ce8
fix up entity constructors so that setProperties isn't called during the constructor
2015-10-23 13:52:50 -07:00
Seth Alves
d86d69aeba
keep track of children. use local position and orientation on the wire.
2015-10-22 15:36:03 -07:00
Brad Davis
21a3079a39
Merge remote-tracking branch 'upstream/master' into HEAD
2015-10-21 10:05:32 -07:00
Brad Hefta-Gaub
954afe45d3
Merge pull request #6112 from ericrius1/rayPickAdditions
...
Moved whitelist and raypicking code out of octree, fixed small bug with polylines
2015-10-21 09:08:56 -07:00
Brad Davis
0e419e3fbb
Merge remote-tracking branch 'upstream/master' into HEAD
2015-10-20 17:47:37 -07:00
Stephen Birarda
14aab4871d
Merge pull request #6119 from Atlante45/baseball
...
Fix autoresizing log spam
2015-10-20 13:45:50 -07:00
Brad Davis
8d0148a1ca
Merge remote-tracking branch 'upstream/master' into HEAD
2015-10-20 10:13:31 -07:00
ericrius1
0373a481f8
Using EntityItemIDs instead of QUuids
2015-10-20 09:22:16 -07:00
Atlante45
1c46f2aa75
Fix autoresizing log spam
2015-10-19 18:22:44 -07:00
Seth Alves
113321184d
if model RegistrationPoint doesn't match entityItem's, update it
2015-10-19 12:21:26 -07:00
Seth Alves
742e48b0c8
try another way of fixing held object snagging at slow velocity
2015-10-19 09:48:34 -07:00
Seth Alves
1f3b92577d
update _model's location anytime it doesn't match the entity's location
2015-10-17 20:08:25 -07:00
Brad Davis
57be59935d
Move controller test to app
2015-10-17 19:13:38 -07:00
Seth Alves
8338491c3b
Merge pull request #6095 from Atlante45/master
...
Fix export bug
2015-10-16 07:32:56 -07:00
Seth Alves
b18bb1e076
Merge pull request #6084 from AndrewMeadows/physics-cleanup
...
move DIRTY_FLAGS out of EntityItem namespace
2015-10-16 07:22:40 -07:00
Atlante45
a84fdecec9
Fix export bug
2015-10-15 18:43:32 -07:00
Ryan Huffman
7682ab00e3
Add ReceivedMessage and receive progress
2015-10-15 14:09:53 -07:00
Andrew Meadows
fa17b77d70
move DIRTY_FLAGS out of EntityItem namespace
2015-10-15 09:34:09 -07:00
ericrius1
8d39f9c760
Syntax fixes
2015-10-12 15:02:03 -07:00
Brad Davis
e5fc2e5525
Low level support for URL overrides when loading content
2015-10-10 23:00:15 -07:00
Atlante45
ae83dfe041
Move auto-resize to update
2015-10-09 12:23:19 -07:00
Atlante45
75f0a6442f
ModelEntities spawned with no dimension autoresize
2015-10-09 12:23:19 -07:00
Brad Hefta-Gaub
57cc7adbfe
standardize somethingChanged - CR feedback
2015-10-07 12:27:12 -07:00
Brad Hefta-Gaub
016bf4011d
cleanup
2015-10-06 16:07:36 -07:00
Brad Hefta-Gaub
be79101a93
Merge branch 'master' of https://github.com/highfidelity/hifi into animationGroupSettings
2015-10-06 15:20:37 -07:00
Brad Hefta-Gaub
d5663ed773
Merge pull request #5946 from jherico/nelson
...
Improved procedural surfaces, textures and additional standard uniforms
2015-10-05 17:12:32 -07:00
Stephen Birarda
5989cad054
add override qualifier to suppress warnings in entities-renderer
2015-10-05 15:55:05 -07:00
Brad Hefta-Gaub
f30a94064f
make animation start/stop work
2015-10-05 15:50:55 -07:00
Howard Stearns
8153ad7f44
Merge pull request #5967 from AndrewMeadows/collision-group-hack
...
allow physical objects to be set collisionless
2015-10-02 16:08:52 -07:00
Brad Davis
de5e95f7dc
Improved procedural surfaces, textures and more standard uniforms
2015-10-02 11:57:13 -07:00
Anthony J. Thibault
fa864d29f9
Merge branch 'master' into transmit-joint-translation
2015-10-01 16:55:24 -07:00
Andrew Meadows
22b6607760
add polyvox entities to physics engine
2015-10-01 08:56:05 -07:00
ericrius1
1760720b2b
added check for normals and vertices
2015-09-29 17:42:20 -07:00
ericrius1
d1b016b483
untabbified lines
2015-09-29 16:38:21 -07:00
Eric Levin
36be35a836
Update RenderablePolyLineEntityItem.cpp
2015-09-29 16:30:42 -07:00
ericrius1
e7834365f5
Made polyline painting experience smoother- no more flickering
2015-09-29 15:33:39 -07:00
Seth Alves
d0a1e206ca
Merge branch 'master' of github.com:highfidelity/hifi into transmit-joint-translation
2015-09-29 13:55:13 -07:00
Brad Hefta-Gaub
2040fb4507
fix skybox not always loading when you haven't moved or if the texture is slow in loading
2015-09-29 09:32:34 -07:00
Brad Hefta-Gaub
bd52b17861
Merge pull request #5914 from jherico/homer
...
Remove duplicate DeferredBufferWrite.slh
2015-09-28 17:29:33 -07:00
Brad Davis
e284cbe355
Remove duplicate DeferredBufferWrite.slh
2015-09-28 13:24:47 -07:00
Brad Hefta-Gaub
430cbcca7e
first cut at adding surface normals to ray intersection
2015-09-27 21:57:50 -07:00
Seth Alves
50dd8eba45
Relay joint translations across network. Apply animation's root-joint translation to avatar.
2015-09-26 11:40:39 -07:00
David Rowe
a2c7b3bcc9
Orient particles to face camera but not roll with it
2015-09-23 17:00:07 -07:00
Brad Hefta-Gaub
5b00783f18
more warnings fixes
2015-09-22 20:54:36 -07:00
samcake
910038cf82
Merging
2015-09-21 17:47:23 -07:00
Bradley Austin Davis
b3aeaba5f4
CR feedback
2015-09-21 15:44:47 -07:00
Bradley Austin Davis
84cea1ffd4
More CR comments
2015-09-21 14:33:32 -07:00
samcake
fa9b0930d2
Bring back the procedural skybox
2015-09-21 14:25:32 -07:00
Bradley Austin Davis
0c0af812c2
CR comments
2015-09-21 14:16:56 -07:00
Bradley Austin Davis
e12e4ece34
Fixing lighting and atmosphere
2015-09-21 13:51:08 -07:00
Bradley Austin Davis
e024d23366
Instancing work, second pass
2015-09-21 13:27:02 -07:00
samcake
c9cb768945
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2015-09-19 09:00:19 -07:00
Brad Hefta-Gaub
ec87502f49
Merge pull request #5840 from jherico/bart
...
Instanced rendering for Box entities
2015-09-18 18:06:25 -07:00
Brad Davis
8a703d0363
Instanced rendering, first pass
2015-09-18 16:29:29 -07:00
Andrew Meadows
269e3d7f23
Merge pull request #5836 from ZappoMan/getEntityPropertiesPerformance
...
Entities.getEntityProperty() performance improvements
2015-09-18 15:19:06 -07:00
Brad Davis
2f0ba40347
Merge pull request #5844 from ZappoMan/cruftRemovalMachine
...
Cruft removal machine
2015-09-18 14:59:16 -07:00
Brad Hefta-Gaub
020fb25ace
CR feedback
2015-09-18 14:24:01 -07:00
Brad Hefta-Gaub
0d37511071
add support for scripts to call methods on entity scripts
2015-09-18 14:06:38 -07:00
Brad Hefta-Gaub
416acb1d4a
remove call to _entities.render() in displaySide()
2015-09-18 12:03:58 -07:00
Brad Hefta-Gaub
6edc817bf2
move the best zone logic out of EntityTreeRenderer::render()
2015-09-18 11:35:50 -07:00
Sam Gateau
d0f7ddd3a6
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2015-09-18 00:03:19 -07:00
Brad Hefta-Gaub
4a34b142d1
remove render element proxies
2015-09-17 22:05:14 -07:00
Brad Hefta-Gaub
d0a4622427
removed some debug code
2015-09-17 21:01:56 -07:00
Brad Hefta-Gaub
4e2cb00ec3
first cut at only returning type specific properties in getEntityProperties
2015-09-17 17:33:53 -07:00
Brad Hefta-Gaub
6fac447b97
Merge branch 'master' of https://github.com/highfidelity/hifi into getEntityPropertiesPerformance
...
Conflicts:
libraries/entities-renderer/src/EntityTreeRenderer.cpp
libraries/entities-renderer/src/EntityTreeRenderer.h
libraries/script-engine/src/ScriptCache.cpp
libraries/script-engine/src/ScriptCache.h
2015-09-16 17:16:57 -07:00
Brad Hefta-Gaub
2021a15527
fix white space
2015-09-16 16:54:21 -07:00
Brad Hefta-Gaub
fa6396bbfa
fix white space
2015-09-16 16:53:20 -07:00
Brad Hefta-Gaub
7840f122dc
add reload all support for entity scripts
2015-09-16 16:46:46 -07:00
Brad Hefta-Gaub
248107c468
add reload all support for entity scripts
2015-09-16 16:45:26 -07:00
Brad Hefta-Gaub
e1cb041576
first cut at adding desiredProperties to getProperties
2015-09-16 15:00:42 -07:00
Sam Gateau
d45547aa1a
Merge and update
2015-09-16 13:46:07 -07:00
Brad Hefta-Gaub
70d2288407
CR feedback
2015-09-15 08:04:26 -07:00
Brad Hefta-Gaub
54a45f3173
Merge branch 'master' of https://github.com/highfidelity/hifi into scriptEngineCleanup
...
Conflicts:
libraries/entities-renderer/src/EntityTreeRenderer.cpp
libraries/script-engine/src/ScriptEngine.cpp
libraries/script-engine/src/ScriptEngine.h
2015-09-14 21:13:08 -07:00
Brad Hefta-Gaub
94b273a029
more work on script engine
2015-09-14 20:59:10 -07:00
Brad Hefta-Gaub
a3c0288eae
more work on proper threading of ScriptEngine
2015-09-14 20:26:04 -07:00
Brad Hefta-Gaub
18fbf896f1
first cut at moving entity scripts into ScriptEngine
2015-09-14 15:13:43 -07:00
Sam Gateau
3f2609e52a
merging
2015-09-14 09:59:04 -07:00
Sam Gateau
9074d0d6e1
very first version of the TextureStorage working
2015-09-14 09:29:46 -07:00
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
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
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
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
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
