Brad Hefta-Gaub
4a34b142d1
remove render element proxies
2015-09-17 22:05:14 -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
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
8a60bba4eb
Merge branch 'master' of github.com:highfidelity/hifi into octree-shared-pointers
2015-09-08 15:28:46 -07:00
Brad Davis
5f1affaff9
Procedural skybox work
2015-09-08 14:31:16 -07:00
Seth Alves
31fcd55d47
octree uses shared pointers
2015-09-08 11:59:48 -07:00
ZappoMan
b7d9dc444b
more work on clicking focus
2015-08-17 13:06:32 -07:00
Brad Davis
19d31938d3
Merge remote-tracking branch 'upstream/master' into plugins
2015-08-10 21:25:35 -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
ericrius1
12770edbe1
Merge branch 'master' into polyLineInProgress
2015-08-03 15:52:26 -07:00
ericrius1
47bc8f50ab
cleaning
2015-08-03 08:45:14 -07:00
ZappoMan
c15161b71a
fix crash in Particle Entities and pendingChanges.updateItem()
2015-07-28 14:56:38 -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
Stephen Birarda
0177513285
resolve conflicts on merge with upstream/master
2015-07-20 12:29: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
ericrius1
a44e5f949c
Merge branch 'master' into polyLineInProgress
2015-07-17 15:01:40 -07:00
Stephen Birarda
e5722098f6
resolve conflicts on merge with upstream/master
2015-07-17 11:06:01 -07:00
ZappoMan
819fa852b8
first pass at GlowEctomy
2015-07-15 12:47:59 -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
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
Stephen Birarda
d990420565
repairs to octree packet receiving in interface
2015-07-13 13:10:57 -07:00
ericrius1
0ce6737b34
merged and normals flipping
2015-07-13 09:43:15 -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
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
ericrius1
ad54b4c0b0
changed quad entity to PolyLine
2015-07-01 17:18:36 -07:00
ericrius1
cf720f9e2e
merged master
2015-06-29 09:27:40 -07:00
ZappoMan
f61581d29d
possible fix for deadlock
2015-06-26 15:42:04 -07:00
David Rowe
1898c6bd55
Merge branch 'master' into 20547
...
Conflicts:
libraries/networking/src/PacketHeaders.cpp
libraries/networking/src/PacketHeaders.h
2015-06-26 13:05:51 -07:00
Niraj Venkat
6b14a64c8c
Formatting changes and teleport on click
2015-06-25 15:15:44 -07:00
ericrius1
9dc6846eba
rendering wad entity
2015-06-22 15:12:35 -07:00
Philip Rosedale
111b0f286d
Merge pull request #5160 from ctrlaltdavid/addressbar-tidy
...
Tidy address bar code
2015-06-22 12:08:33 -07:00
Howard Stearns
dc10e15e96
Put the common stuff on AudioInjector rather than AudioClient, so that assignment-client (which depends on script-engine) does not need to depend on audio-client.
2015-06-19 14:20:00 -07:00
David Rowe
1047703718
Tidy address bar code
...
Re-enable and reposition mouse drag areas
Remove unused graphics assets
Remove unused includes
2015-06-18 11:18:56 -07:00
Howard Stearns
fdf5860c4f
Refactor playSound.
2015-06-18 10:39:58 -07:00
David Rowe
6623d0c552
Add "Reload" button associated with entity editor's script URL field
...
The Reload button re-downloads the script for both the editor and for
everyone in the vicinity.
2015-06-17 16:11:32 -07:00
Niraj Venkat
428b80a50d
Removing old debug print code
2015-06-12 17:49:07 -07:00
Niraj Venkat
b9b8cfd60d
Starting the new address bar layout
2015-06-12 14:08:06 -07:00
Niraj Venkat
9a193acfa0
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-06-11 16:28:16 -07:00
Niraj Venkat
366be3c0c0
Check if entity looked at has valid hyperlink href attached
2015-06-11 16:27:50 -07:00
Seth Alves
b1a209b9db
pull some common code out of subclasses and into ObjectAction
2015-06-09 16:17:48 -07:00
Brad Hefta-Gaub
202e39799a
Merge pull request #5062 from ZappoMan/team-teaching
...
Team teaching - merge from master
2015-06-05 12:21:10 -07:00
Ryan Huffman
37d9394140
Fix entity payloads not being removed on delete
2015-06-05 10:26:09 -07:00
ZappoMan
807cc3db24
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
2015-06-05 09:37:39 -07:00
Howard Stearns
407d3b6a6e
Pitch is dependent on (largest dimension of) minimum bounding, not max.
...
Adjust sound range of full volume.
2015-06-04 14:23:51 -07:00
Atlante45
8e21d9c14b
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into lod
2015-06-04 18:11:17 +02:00
ZappoMan
4b389793ad
CR feedback
2015-06-04 08:42:10 -07:00
Atlante45
a4340b17e9
Remove deprecated render stats
2015-06-04 14:47:04 +02:00
ZappoMan
c6fb22b915
make sure all entities are rendering in pipeline part 1
2015-06-03 17:16:45 -07:00
Howard Stearns
407746b842
Fix (consistent) typo in non-magic-number constant's name.
2015-06-03 10:38:20 -07:00
Howard Stearns
c036b5fd4b
Actually commit the changes this time!
2015-06-03 10:19:28 -07:00
Atlante45
9df1b05184
Introduce outsideEngineDetails
2015-06-03 18:08:43 +02:00
Atlante45
bbf1837796
Introduced RenderDetails/Stats don't pull details
...
- Regrouped everything stat in a struct
- Details are set into the stats
2015-06-03 16:14:23 +02:00
ZappoMan
a7feca0727
more work on making avatar models (face included) use render payloads
2015-06-02 22:10:00 -07:00
Sam Gateau
3c7eb4de6d
merging with upstream
2015-06-02 14:48:53 -07:00
Sam Gateau
453fa87654
making sure the proj and view matrix are correctly assigned
2015-06-02 14:31:40 -07:00
ZappoMan
5459b8402c
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
2015-06-02 11:25:23 -07:00
Howard Stearns
0837c016c5
Update constant to use AudioConstants.h
2015-06-02 09:18:45 -07:00
Howard Stearns
622a1e3068
Pitch-shift collision sounds, and make entities-renderer depend on soxr.
2015-06-01 21:19:42 -07:00
ZappoMan
d4af454834
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
2015-06-01 14:42:35 -07:00
ZappoMan
1b8572640b
more hacking sams tweaks
2015-06-01 09:07:32 -07:00
Howard Stearns
9c56f6270e
Remove debug print.
2015-05-29 16:21:57 -07:00
Howard Stearns
6e2378e676
Sound parameter tweaks.
2015-05-29 16:19:41 -07:00
ZappoMan
eb19b93433
render models in scene checkpoint
2015-05-28 17:19:30 -07:00
Brad Hefta-Gaub
1c3398f27e
Merge pull request #4991 from ZappoMan/team-teaching
...
TEAM TEACHING - merge from master
2015-05-28 13:52:18 -07:00
ZappoMan
a0e51469d3
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
2015-05-28 12:36:34 -07:00
ZappoMan
2fba5a0928
more work on simple renderable
2015-05-28 12:19:43 -07:00
ZappoMan
806ee88f1f
place burden of adding/removing to/from scene on entity
2015-05-28 09:43:36 -07:00
Seth Alves
a91a7942a4
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-05-28 06:59:39 -07:00
ZappoMan
3f14a7a262
allow entities to have multiple items
2015-05-27 21:00:20 -07:00
ZappoMan
5ad9efbee4
allow entities to tell us if they support proper scene rendering
2015-05-27 20:42:53 -07:00
ZappoMan
b0cc536f53
debug cleanup
2015-05-27 16:55:02 -07:00
ZappoMan
37a291275d
more work on rendering in engine
2015-05-27 16:46:44 -07:00
Howard Stearns
4fffe05b63
Play still sound for still objects and those just created in a script.
2015-05-27 16:25:11 -07:00
ZappoMan
8c9cf480f3
more hacking
2015-05-27 13:23:59 -07:00
ZappoMan
007aed7a0a
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching-scene-api
2015-05-27 10:51:50 -07:00
ZappoMan
1a7c6eb316
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
2015-05-27 10:41:01 -07:00
Seth Alves
6fd38fabe4
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-05-27 10:06:53 -07:00
Brad Hefta-Gaub
afb09e81a6
Merge pull request #4962 from howard-stearns/entity-events-in-normal-scripts
...
Entity events in normal scripts
2015-05-27 09:24:50 -07:00
Seth Alves
c80f2970fd
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-05-27 07:37:51 -07:00
ZappoMan
25823bedd1
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching-scene-api
2015-05-26 15:51:46 -07:00
ZappoMan
20ceb72d92
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
2015-05-26 15:01:26 -07:00
samcake
84525aabec
Merge pull request #4959 from ZappoMan/team-teaching-entitysmartpointer
...
TEAM TEACHING BRANCH - Entity Smart Pointers
2015-05-26 13:56:47 -07:00
Howard Stearns
bbdf9f1d9f
Remove changingEntityID.
2015-05-26 11:14:23 -07:00
ZappoMan
c4f96b09a2
sam's feedback on shared pointers in master
2015-05-26 09:55:28 -07:00
ZappoMan
5f6978a517
sam's CR feedback, more use of share_ptr<>
2015-05-26 09:41:51 -07:00
Howard Stearns
1b134d60d5
Fix typo that messed up the otherEntity for collisions.
2015-05-25 15:46:55 -07:00
Seth Alves
9735174036
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-05-25 15:37:23 -07:00
Howard Stearns
1dd2b7275e
Simpler and more uniform version that handles all the standard entity-script events.
2015-05-23 18:11:05 -07:00
Howard Stearns
277f5ef3a4
Working experimental first version.
2015-05-23 13:35:35 -07:00
ZappoMan
9988f2d1cd
EnitityItem smart pointers
2015-05-22 22:38:02 -07:00
ZappoMan
8b78fc4190
EnitityItem smart pointers
2015-05-22 17:57:50 -07:00
Ryan Huffman
822ae800c5
Update Model::endScene to require RenderArgs
2015-05-22 16:17:01 -07:00
Ryan Huffman
d1a5662ca7
Merge branch 'team-teaching' of github.com:highfidelity/hifi into ctx
...
Conflicts:
libraries/entities-renderer/src/EntityTreeRenderer.cpp
2015-05-22 15:33:40 -07:00
Ryan Huffman
3f22b5f8b3
Add RenderArgs to more render methods
2015-05-22 15:25:53 -07:00
ZappoMan
160898ce96
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
2015-05-22 14:55:29 -07:00
ZappoMan
d9ed1e061c
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching-scene-api
2015-05-22 14:54:47 -07:00
ZappoMan
4bdeef7610
checkpoint
2015-05-22 14:54:30 -07:00
David Rowe
a01830f8f8
Fix some double to float conversion warnings in Windows builds
2015-05-22 12:32:02 -07:00
Atlante45
20ff43e29a
Don't sync by default
2015-05-22 20:29:25 +02:00
Ryan Huffman
4a4c9c75fc
Add gpu::context to RenderArgs and start using RenderArgs in place of the flags
2015-05-22 09:50:51 -07:00
ZappoMan
0d9f0f609b
first cut at RenderableEnitityItem payload
2015-05-21 16:22:23 -07:00
ZappoMan
c7fb8fab85
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching-scene-api
2015-05-21 10:36:22 -07:00
Seth Alves
72e227eefe
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-05-21 09:55:14 -07:00
ZappoMan
e1c5c5b12e
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching-scene-api
2015-05-20 18:42:54 -07:00
Seth Alves
d7ccd23b07
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-05-20 18:08:29 -07:00
Seth Alves
782402b4c8
Merge branch 'master' of github.com:highfidelity/hifi into no-id-swap-redux
2015-05-20 14:53:05 -07:00
Seth Alves
124ff68cee
make EntityItemID a subclass of QUuid
2015-05-20 14:22:08 -07:00
Seth Alves
f522334c99
sort out script interface changes
2015-05-20 12:30:06 -07:00
Howard Stearns
c5b8dd51d8
Fix https://app.asana.com/0/32622044445063/34195351184789
...
Handle collision events when we do other updates (and their entity scripts) rather than when we do the physic updates while the tree is locked.
Given that, remove the check that kept sound from playing (or scripts from running) when we would have deadlocked, because now we don't.
2015-05-20 11:07:03 -07:00
Seth Alves
a769cfdaf2
client decides on new entity-ids, keep EntityItemID class
2015-05-20 10:42:19 -07:00
Seth Alves
4b263cf5c8
derieve PolyVox Entity from Model Entity
2015-05-19 21:40:05 -07:00
Seth Alves
f9d46b0cb5
interface decides on entityIDs rather than bouncing a temporary id through the entity server
2015-05-19 14:25:23 -07:00
Atlante45
72bf160845
Proxies render in Batch
2015-05-18 16:36:16 +02:00
Atlante45
ede94e4248
Merge branch 'master' of https://github.com/highfidelity/hifi into remove_gl_transform
2015-05-18 11:39:17 +02:00
Atlante45
3436658e45
Add batch to RenderAgrs
2015-05-16 05:42:26 +02:00
Atlante45
4725d5e676
Merge branch 'primitives_batch' into remove_gl_transform
2015-05-16 05:22:12 +02:00
Atlante45
7ff973b94c
Merge branch 'master' of https://github.com/highfidelity/hifi into primitives_batch
2015-05-16 04:36:05 +02:00
Atlante45
feefcbf40f
Merge branch 'master' of https://github.com/highfidelity/hifi into remove_gl_transform
2015-05-15 20:30:45 +02:00
Sam Cake
97b18fcd52
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-05-15 11:29:43 -07:00
Sam Cake
765145b898
Moving the load of the texture and the generation of the cube map irradiance in the same thread
2015-05-15 11:28:59 -07:00
Howard Stearns
9f7a56e3e5
Ask audio injector to delete itself.
...
Put in null guards.
Tune parameters (including higher threshold).
2015-05-15 11:00:28 -07:00
Atlante45
c13ad83cc4
Rename getCenter by get CenterPosition
2015-05-15 18:34:28 +02:00
Atlante45
e0ae8597bc
Factor zone code in Model::render
2015-05-15 15:45:31 +02:00
Howard Stearns
5accb4d0d2
Remove debug logging.
2015-05-14 15:12:31 -07:00
Howard Stearns
b5a28730ea
Filter out low-penetration continuous contact from all entity collision activity including scripts:
...
We don't want sound for these.
This appears to avoid the Entities.getEntityProperties() deadlock within entity scripts.
Variable names:
energyPercentOfFull => energyFactorOfFull, because the range is 0-1, not 0-100.
COLLISION_SOUND_COMPRESSION => COLLISION_SOUND_COMPRESSION_RANGE (portion of full dynamic range)
Tune constants:
COLLISION_ENERGY_AT_FULL_VOLUME 10 => 1
COLLISION_MINIMUM_VOLUME 0.01 => 0.001
COLLISION_SOUND_COMPRESSION_RANGE 0.5 => 0.95
Refer to SoundCache later, after filtering for collision threshold.
2015-05-14 14:41:32 -07:00
Brad Davis
a77816617d
Make web entities interactive (via the mouse) if they're not locked.
2015-05-14 01:15:20 -07:00
Brad Hefta-Gaub
5da0a8d7a3
Merge pull request #4860 from howard-stearns/entity-sound
...
Entity sound.
2015-05-13 20:07:44 -07:00
Howard Stearns
6ebeb7a22e
Another constexpr.
2015-05-13 15:47:47 -07:00
Howard Stearns
76e39fc95b
constexpr => const for Windows compiler.
2015-05-13 13:56:10 -07:00
Howard Stearns
1a87ca04da
Entity sound.
2015-05-13 13:18:02 -07:00
Brad Davis
8c4f802dbf
Merge remote-tracking branch 'upstream/master' into web-entity
...
Conflicts:
libraries/entities/src/EntityItemProperties.h
libraries/entities/src/EntityTypes.h
2015-05-12 15:56:02 -07:00
Brad Davis
745182a963
Working on web entities
2015-05-12 14:39:54 -07:00
Seth Alves
4881b0c53c
copy box to make a new type of line entity item
2015-05-11 19:25:14 -07:00
Howard Stearns
51a29bdba6
Put back the script-fix that belongs in this branch.
2015-05-11 11:53:48 -07:00
ZappoMan
17c3c1a18d
add support for automatic hour/day calculations and backward compatibility on stage properties
2015-05-10 15:22:02 -07:00
ZappoMan
0b6a815a20
moved zone stage properties into a group
2015-05-08 20:17:01 -07:00
ZappoMan
1936f4c114
fix zone:nothing bug
2015-05-08 14:03:58 -07:00
Sam Gateau
deb303838d
Cleaning code
2015-05-07 17:15:45 -07: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
Atlante45
faabf29e84
Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones
2015-05-07 19:58:26 +02:00
ZappoMan
496da6fcd5
wire up the skybox color property to the new skybox renderer
2015-05-06 20:36:06 -07:00
Atlante45
6d2fe945af
Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones
2015-05-06 09:53:57 +02:00
ZappoMan
5fc5df7c55
change skyboxMode to backgroundMode
2015-05-05 12:38:44 -07:00
Atlante45
429c1e1231
Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones
2015-05-05 21:33:55 +02:00
Atlante45
46cd1f458b
Actually call render on zone entities from tree
2015-05-05 17:20:27 +02:00
ZappoMan
4b9c6728e7
fix issue with skyboxMode getting randomly set
2015-05-04 18:58:35 -07:00
ZappoMan
2c02bfdda5
fix build buster
2015-05-04 16:01:50 -07:00
ZappoMan
3827e961a7
hook sunBrightness to keyLightIntensity
2015-05-04 15:31:50 -07:00
ZappoMan
403ed6d77b
wire up sunlocation from keylight direction
2015-05-04 15:20:16 -07:00
ZappoMan
cfe717fe08
only override environment when skyboxMode is atmosphere
2015-05-04 13:53:29 -07:00
ZappoMan
4561c59203
wire up zone to environment atmosphere rendering
2015-05-04 13:49:43 -07:00
Atlante45
12fcb35717
Made RenderArgs a default ctor
2015-05-04 17:22:46 +02: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
Seth Alves
0fb1a83e3b
quiet compiler, remove some trailing control-Ms
2015-04-25 09:20:00 -07:00
Atlante45
a4f03f8b1c
Zones use avatar position not view frustum
2015-04-24 22:16:21 +02:00
Atlante45
b776ea8110
Make ::contains() back into a const
2015-04-23 19:15:06 +02:00
Atlante45
83490051d9
Move shape related contains() to ShapeInfo
2015-04-23 18:55:20 +02:00
Atlante45
d18229d52d
Merge branch 'master' of https://github.com/highfidelity/hifi into zones
2015-04-23 15:58:57 +02:00
Atlante45
3a0b5f9d22
Register RenderableZoneEntityItem in EntityTreeRenderer
2015-04-23 15:34:03 +02:00
ZappoMan
fb4e334c70
implement volume priority for zones
2015-04-22 12:38:34 -07:00
Atlante45
9cec256142
Rename collisionModelURL members/methods
2015-04-22 21:16:09 +02:00
ZappoMan
8366dd02a0
remove RenderableZoneEntityItem class since zones don't render like other entities
2015-04-21 15:03:04 -07:00
ZappoMan
4ce451f984
wire up zone rendering again
2015-04-21 14:55:45 -07:00
ZappoMan
e436c95212
first cut at reworking zones
2015-04-21 14:36:13 -07:00
ZappoMan
a9c2a6e048
another attempt at zones starting from box
2015-04-20 18:17: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
Seth Alves
074e476797
put entities-renderer logging into its own QLoggingCategory
2015-04-06 16:30:20 -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
00817ab64f
MErging with origin/orange, brinign the fix for shadows
2015-04-05 18:36:39 -07:00
ZappoMan
d87fe9efff
fix typo
2015-04-01 14:47:04 -07:00
ZappoMan
c66db5d8e4
another approach
2015-04-01 14:43:27 -07:00
ZappoMan
d7188bac0b
another approach
2015-04-01 14:38:01 -07:00
ZappoMan
aac824fb99
fix crash on shutdown
2015-04-01 13:47:25 -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
ZappoMan
df99c314aa
fix issue with preload not being called on import
2015-03-31 12:44:44 -07:00
ZappoMan
a88b3c02d2
quiet warning flood when scripts are bad
2015-03-30 18:24:34 -07:00
ZappoMan
31072b2b2e
only start one download per url even if still pending
2015-03-30 16:48:41 -07:00
ZappoMan
e2d8d82096
more script caching cleanup
2015-03-30 16:34:04 -07:00
ZappoMan
74d50a9250
more work on improving script caching
2015-03-30 16:21:47 -07:00
ZappoMan
36657c9473
first cut at script caching
2015-03-30 14:36:48 -07:00
ZappoMan
8e7ead2ead
fix locking issue in enter/leave entity scripts
2015-03-26 16:05:31 -07:00
Seth Alves
8eedab72b3
remove some unneeded asserts
2015-03-19 09:15:57 -07:00
Seth Alves
9161cc8b83
attempt to handle collision models in the same way as render models
2015-03-18 13:00:09 -07:00
Andrew Meadows
51d05cc43e
merge upstream/master into andrew/isentropic
...
Conflicts:
libraries/networking/src/PacketHeaders.cpp
2015-03-09 08:51:49 -07:00
Jason
0fd9540bc3
Sync to upstream
...
Did "fetch upstream", "merge upstream/master", and resolved one
conflict.
2015-03-07 21:40:06 -08:00
Jason
cfcc4679e1
Interview project updates (2).
...
Oops, I forgot to convert tabs-to-spaces on EntityTreeRenderer.
Committing it now.
2015-03-06 15:57:38 -08:00
Andrew Meadows
373be95297
entity cubes are in meters
2015-03-06 15:32:03 -08:00
Andrew Meadows
e4c68bf31c
committing some temp debug stuff to help git diff
...
(will remove this stuff later)
2015-03-05 18:06:08 -08:00
Andrew Meadows
49eee89c19
merge upstream/master into andrew/isentropic
...
Conflicts:
libraries/networking/src/PacketHeaders.cpp
libraries/networking/src/PacketHeaders.h
2015-03-05 08:22:02 -08:00
Jason
3522357c8c
High Fidelity interview project -- Jason Rickwald
...
For my project, I decided to add a new entity -- a Particle Effect.
This is really rudimentary to start out with, but you could see where
it's headed.
2015-03-04 16:06:06 -08:00
Andrew Meadows
b9cbd1ea6e
witch internal EntityItem data to use meters
2015-03-04 09:38:37 -08:00
Andrew Meadows
7210c7a88b
added EntityTree::findEntitiesInMeters()
...
progress toward conversion to meters
2015-02-26 15:16:59 -08:00
Sam Gateau
d8ebb0c5b9
Merge branch 'master' of https://github.com/highfidelity/hifi into temp0
2015-02-26 14:19:23 -08:00
Andrew Meadows
8d4ea143ce
easy conversions of: InDomainUnits --> InMeters
2015-02-25 14:48:06 -08:00
Andrew Meadows
2f749e3c51
merge upstream/master into andrew/isentropic
...
Conflicts:
libraries/entities/src/TextEntityItem.h
2015-02-25 14:40:32 -08:00
Andrew Meadows
2ffb19a0ed
getPosition() --> getPositionInDomainUnits()
...
and friends
2015-02-25 14:35:04 -08:00
ZappoMan
e87df0017a
code review feedback
2015-02-25 08:26:54 -08:00
ZappoMan
310654831c
clean up comments remove dead code
2015-02-24 17:34:19 -08:00
ZappoMan
fd93b99f03
more hacking on script shutdown behavior
2015-02-24 14:02:46 -08:00
ZappoMan
6be8f4c0ec
more work on improving shutdown behavior
2015-02-23 17:32:31 -08:00
ZappoMan
a8d48e592f
removing debug messages
2015-02-23 09:44:18 -08:00
ZappoMan
e5ef61e27e
simplifying the change
2015-02-23 09:23:15 -08:00
ZappoMan
d32fc645e8
remove some dead code, added a debugging notes comment
2015-02-23 09:10:15 -08:00
Sam Gateau
ffaea07130
trying to ge the shadow to render correctly
2015-02-23 07:04:14 -08:00
ZappoMan
e3de994c4a
more hacking
2015-02-20 18:42:02 -08:00
ZappoMan
0b607fa390
first cut at shutting down scripts ahead of other cleanup
2015-02-20 15:28:25 -08:00
David Rowe
5474c0634e
Merge branch 'master' into 20277
...
Conflicts:
libraries/script-engine/src/ScriptEngine.cpp
2015-01-30 13:49:45 -08:00
David Rowe
812fbc58fb
Use custom User-Agent string
2015-01-23 19:13:29 -08:00
ZappoMan
e6388a65b9
rough pass at adding color to geometry cache
2015-01-13 20:53:05 -08:00
Andrew Meadows
5309fb6a43
remove lock at EntityTreeRenderer::loadEntityScript
2015-01-11 10:44:36 -08:00
Andrew Meadows
99e1fdd46e
fix for EntityServer crash
...
adding EntityItem::_element backpointer for easier add/remove logic
2015-01-10 07:44:26 -08:00
Atlante45
be050b0469
Added missing deletes
2015-01-05 15:13:07 -08:00
ZappoMan
9630279459
Merge branch 'master' of https://github.com/highfidelity/hifi into voxelEctomy
...
Conflicts:
examples/editVoxels.js
examples/fallingSand.js
examples/growTrees.js
interface/src/Application.cpp
interface/src/Application.h
libraries/avatars/CMakeLists.txt
libraries/entities/src/EntityItem.h
2014-12-31 10:50:53 -08:00
ZappoMan
eb28efa648
evaluate entity scripts in a sandbox before constructing
2014-12-31 09:58:18 -08:00
ZappoMan
4ea9bbc309
first major pass at voxelEctomy
2014-12-30 18:08:58 -08:00
ZappoMan
32ea38b938
added leaveAllEntities support
2014-12-19 11:33:25 -08:00
ZappoMan
cfa5e5c61b
Merge branch 'master' of https://github.com/highfidelity/hifi into entityScriptsAndEvents
...
Conflicts:
libraries/entities-renderer/src/EntityTreeRenderer.cpp
libraries/entities-renderer/src/EntityTreeRenderer.h
2014-12-19 10:35:18 -08:00
ZappoMan
7db350eac2
remove calls to glut in entities
2014-12-17 14:07:26 -08:00
ZappoMan
9f9b8bcb68
move interface/entities to libraries/entities-renderer
2014-12-17 12:54:41 -08:00
