Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-16 18:58:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
13483 commits 25 branches 0 tags 1.1 GiB
Commit graph

7302 commits

Author SHA1 Message Date
ZappoMan
7e3ef34e6c CR feedback 2014-05-29 15:34:20 -07:00
Andrzej Kapolka
391902f79b Cascaded shadow maps for models. 2014-05-29 15:30:40 -07:00
Atlante45
0eb56000ef Merge branch 'master' of https://github.com/highfidelity/hifi into click_drag_attach 2014-05-29 15:02:21 -07:00
Clément Brisset
21d1a18bd5 Merge pull request #2949 from AndrewMeadows/inertia 
safe copy of JointState data
 2014-05-29 14:44:05 -07:00
Brad Hefta-Gaub
2c8da2bda7 Merge pull request #2950 from wangyix/flighttime_fix_pull 
Fix for unreasonable flight times
 2014-05-29 14:43:15 -07:00
Atlante45
9c38beb4bc Merge branch 'master' of https://github.com/highfidelity/hifi into click_drag_attach 2014-05-29 14:34:18 -07:00
Atlante45
b91fd19f39 snapped attachment to center and scale them to fit 2014-05-29 14:30:28 -07:00
Andrew Meadows
603333f634 add JointState::restoreRotation() 2014-05-29 14:11:17 -07:00
Andrew Meadows
2e99d316ac remove JointState::_translation 
(use corresponding data in FBXJoint instead)
 2014-05-29 12:52:05 -07:00
Andrzej Kapolka
09231f01f3 Retain "simple" shadows, supply cascaded as option. 2014-05-29 12:48:41 -07:00
ZappoMan
e6966c2155 add improved detailed rendering and FPS debugging stats 2014-05-29 12:12:23 -07:00
Andrew Meadows
a898fcbf75 move details of getJointRotation() into JointState 
also: remove unused getLeft/RightHandRotation() methods
 2014-05-29 11:43:25 -07:00
wangyix
c87c474877 removed debug info, cleaned code for pull req 2014-05-29 10:39:40 -07:00
Atlante45
37613f086b Merge branch 'master' of https://github.com/highfidelity/hifi into click_drag_attach 
Conflicts:
	interface/src/renderer/Model.cpp
 2014-05-29 10:28:09 -07:00
Mohammed Nafees
2c3784c7d5 Merge branch master of upstream 2014-05-29 22:31:32 +05:30
Andrew Meadows
4cf5628783 move applyRotationDelta() from Model to JointState 2014-05-29 10:00:55 -07:00
wangyix
a0f9d2c106 Merge remote-tracking branch 'upstream/master' 2014-05-29 09:20:30 -07:00
Andrew Meadows
29e093e2e0 fix float literals to agree with coding standard 2014-05-29 09:20:01 -07:00
AndrewMeadows
b849c07faf Merge pull request #2945 from huffman/19725 
Code Review for Job #19725
 2014-05-29 09:06:43 -07:00
AndrewMeadows
31237003db Merge pull request #2944 from Barnold1953/master 
Disable oculus overlay until it is curved.
 2014-05-29 09:01:52 -07:00
AndrewMeadows
21f045ebe0 Merge pull request #2939 from huffman/19648 
Code Review for Job #19648
 2014-05-29 08:53:31 -07:00
Ryan Huffman
425632e072 Add 'f' to end of const float to follow coding standard 2014-05-29 08:48:22 -07:00
Andrew Meadows
86d6fd45de safe copy of JointState data 2014-05-29 08:19:43 -07:00
Andrzej Kapolka
ff77644caa Progress on selecting cascades. 2014-05-28 18:35:30 -07:00
Andrew Meadows
ec25982a58 add JointState::updateWorldTransform() 2014-05-28 17:51:17 -07:00
wangyix
5d4b0df108 added flag,seq,st to EnvironmentData, untested 
removed/commented out debug prints
 2014-05-28 17:41:38 -07:00
Andrew Meadows
b15b0fd96c cleaner initialization of JointState 2014-05-28 17:31:07 -07:00
wangyix
c799077379 added flag,seq,ts to ParticleErase and ModelErase 
... this fixes unreasonable flight-time issue
 2014-05-28 17:20:10 -07:00
barnold1953
81ed0d99f7 Added prediction for Oculus rift to reduce apparent latency. 2014-05-28 17:13:59 -07:00
Andrew Meadows
9f2a4ae626 Make JointState a proper class 
JointState gets a pointer to its corresponding FBXJoint
 2014-05-28 16:49:39 -07:00
Atlante45
b4deed775e Added joints position and combined rotation to scripting interface 2014-05-28 15:59:42 -07:00
Andrzej Kapolka
698ecbf9c5 Fix for shadow map rendering. 2014-05-28 15:58:45 -07:00
Atlante45
8cd101ac57 Added getJointCombinedRotation to Models 2014-05-28 15:57:38 -07:00
barnold1953
e6d12bf239 Disabled overlay for oculus. We still have to call 
applicationOverlay.renderOverlay(true) or prioVR cant calibrate.
 2014-05-28 15:56:14 -07:00
Ryan Huffman
8f6ad2faab Add 'Load default scripts' button to preferences 2014-05-28 15:27:50 -07:00
Andrzej Kapolka
c3f6cab199 Working on cascading shadow maps. 2014-05-28 15:20:09 -07:00
Andrew Meadows
e74da5f2a0 merge upstream/master into andrew/inertia 2014-05-28 14:55:08 -07:00
Andrew Meadows
13f11e1056 Remove "fromBind" arg in Model::setJointRotation 
It was always set 'true'.
 2014-05-28 14:53:32 -07:00
barnold1953
9311eeb8f5 Fixed compiler warning 2014-05-28 14:41:30 -07:00
Andrzej Kapolka
4cbc550820 Fix arguments to applyRotationDelta. 2014-05-28 12:03:57 -07:00
Brad Hefta-Gaub
9546fe477c Merge pull request #2940 from AndrewMeadows/inertia 
fix for lack of neck rotations
 2014-05-28 11:00:55 -07:00
Mohammed Nafees
8b0212dc1e remove all key bindings from running scripts dialog 2014-05-28 23:19:15 +05:30
barnold1953
ebfb11c1ce Renamed OverlayRenderer to ApplicationOverlay and moved it up a directory 2014-05-28 10:46:46 -07:00
Andrew Meadows
676a8882fe fix for no neck motion 
FaceModel needs similar override to updateJointState() as SkeletonModel
 2014-05-28 10:43:21 -07:00
barnold1953
21fb18a92e Fixed SkeletonModel compilation errors with PrioVR 2014-05-28 10:24:50 -07:00
barnold1953
35e63757ed Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-28 09:25:55 -07:00
matsukaze
619db8ee93 Job #19694 - Add option for larger number of frames to the audio scope display 2014-05-27 23:24:28 -04:00
Andrzej Kapolka
62eeeaa1c6 Fix for Windows build failure. 2014-05-27 18:12:15 -07:00
wangyix
e89d33dc60 added if to not track ParticleErase packets 2014-05-27 18:02:49 -07:00
Andrzej Kapolka
222655d948 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-27 17:43:34 -07:00
Andrzej Kapolka
9796334160 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-27 17:26:56 -07:00
Andrzej Kapolka
7c12417653 Use multisampling on the shadow maps for the voxels, too. 2014-05-27 17:26:19 -07:00
barnold1953
216a73cf60 Fixed coding standard issues 2014-05-27 16:40:51 -07:00
Andrew Meadows
d1a8c18d10 simplified hand index constants 2014-05-27 16:32:29 -07:00
barnold1953
2570c55241 Touched up comments 2014-05-27 16:21:34 -07:00
barnold1953
5665e4d278 Merge branch 'master' of https://github.com/highfidelity/hifi 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
 2014-05-27 16:16:27 -07:00
barnold1953
75580cfd0f Made Overlay appear as flat image in front of camera in Oculus Rift. It 
needs to be a curved surface instead.
 2014-05-27 16:13:56 -07:00
Andrew Meadows
9f72d6ca3f fix bug -- negate logic around invalid joint index 2014-05-27 15:53:20 -07:00
Andrew Meadows
ae3b792a35 move face/head code from Model into SkeletonModel 2014-05-27 15:28:41 -07:00
Andrew Meadows
6efa417742 move hand/arm stuff from Model to SkeletonModel 2014-05-27 15:06:50 -07:00
Andrew Meadows
afc7660d74 merge upstream/master into andrew/inertia 2014-05-27 14:57:44 -07:00
Andrew Meadows
f7b8c4f0a0 remove unused Head::_gravity data memeber 2014-05-27 14:50:17 -07:00
Andrzej Kapolka
2b54d627c0 Try rounding to nearest texel unit to reduce shimmer. 2014-05-27 14:25:27 -07:00
Ryan Huffman
6ef8026215 Add console to script editor 2014-05-27 14:10:09 -07:00
Ryan Huffman
44c5e56a4b Update JSConsole colors 2014-05-27 14:09:53 -07:00
ZappoMan
c63c0c0ce3 Merge branch 'master' of https://github.com/worklist/hifi into aacube 2014-05-27 13:39:45 -07:00
ZappoMan
8ec14568fe support ray picking against the AABB for the rotated model extents 2014-05-27 13:39:32 -07:00
Andrew Meadows
07544c7b43 removal of unused getNeckRotation() 2014-05-27 12:52:44 -07:00
Andrzej Kapolka
3f478b1939 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-27 12:31:12 -07:00
Andrzej Kapolka
e22d239d4d What the heck; let's try using some multisampling on the shadow maps. 2014-05-27 12:30:45 -07:00
Andrzej Kapolka
ee00a86915 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-27 11:44:10 -07:00
Andrzej Kapolka
edaa251e5f Provide option to disable avatar shadowing. 2014-05-27 11:43:34 -07:00
Mohammed Nafees
5055b18a4b Merge branch master from upstream 2014-05-28 00:02:15 +05:30
barnold1953
d1a4192ac5 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-27 11:20:23 -07:00
barnold1953
d4f66a4a3d Added OverlayRenderer class and moved displayOverlay from Application to 
OverlayRenderer.
 2014-05-27 11:19:45 -07:00
Andrzej Kapolka
70ab33b65b Some tricks to avoid shadow artifacts: render back faces to shadow buffer, 
use polygon offset.
 2014-05-27 10:54:18 -07:00
Brad Hefta-Gaub
13366d9ba1 Merge pull request #2926 from ctrlaltdavid/chat_window 
Fix chat window scrolling
 2014-05-27 10:07:34 -07:00
Brad Hefta-Gaub
d63374f656 Merge pull request #2927 from AndrewMeadows/inertia 
Improved detection of floor surfaces
 2014-05-27 09:33:50 -07:00
Ryan Huffman
4a0a9f8a36 Update console style 2014-05-27 08:57:29 -07:00
Ryan Huffman
9af0269151 Update console style 2014-05-27 08:05:56 -07:00
Ryan Huffman
b9248e0bbf Update JSConsole to QWidget 2014-05-27 08:03:46 -07:00
Ryan Huffman
422c2eac67 Update showConsole -> toggleConsole and change shortcut 2014-05-27 07:29:48 -07:00
Andrew Meadows
9175ae20d6 Merge upstream/master into andrew/inertia 2014-05-26 16:26:15 -07:00
Andrew Meadows
51850076e4 more correct detection of floor surfaces 2014-05-26 16:24:47 -07:00
Ryan Huffman
1d7272cbbf Add console.ui interface file 2014-05-26 10:18:04 -07:00
Ryan Huffman
099777ef8c Merge branch 'master' of git://github.com/highfidelity/hifi into 19648 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
 2014-05-26 10:01:44 -07:00
Ryan Huffman
5a5d5b4983 Add JSConsole 2014-05-26 09:59:28 -07:00
Ryan Huffman
3d28cff9df Add console to menu 2014-05-26 09:58:06 -07:00
Ryan Huffman
c362731226 Add support to load script engines not based on a file 2014-05-26 09:57:37 -07:00
David Rowe
7c3d3976ee Fix chat window scrolling to stay at bottom 
Stay at bottom window when:
- There is new chat.
- People come and go from online list.
- Chat window hides and restores when application focus changes.
- Interface is minimized and restored.
 2014-05-25 16:42:36 -07:00
David Rowe
97e5c928a4 Fix chat scroll bar widget jumping 
Hovering over the chat window's scroll bar was causing it to jump
around. Replaced the 12px style spacing that was causing the problem
with a widget-based solution.
 2014-05-25 16:41:01 -07:00
Kai Ludwig
78e311f885 separate style handling for chat area and its context menu. 2014-05-25 20:24:15 +02:00
Clément Brisset
6bb933996f Merge pull request #2920 from ZappoMan/aacube 
Add RayPick support for models
 2014-05-24 17:03:59 -07:00
ZappoMan
a98ac0782a CR feedback 2014-05-24 16:37:32 -07:00
Kai Ludwig
587f60631f missed a tab 2014-05-24 21:28:03 +02:00
Kai Ludwig
c832df0783 added missing locking against crashing in Overlays::~Overlays() 2014-05-24 21:22:34 +02:00
ZappoMan
9d9600aad5 fix max dimension 2014-05-23 22:08:31 -07:00
Clément Brisset
3e671c1968 Merge pull request #2922 from birarda/master 
fix credit amount in window title
 2014-05-23 17:43:04 -07:00
Stephen Birarda
fe05beb88d remove an unneeded debug 2014-05-23 17:41:58 -07:00
Stephen Birarda
9df0f2c1e5 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-23 17:38:28 -07:00