Commit graph

50 commits

Author SHA1 Message Date
Brad Davis
1b44c220a7 Prep work for procedural stars & stuff 2015-06-22 09:43:12 -07:00
Bradley Austin Davis
4ccdc78866 Fixing frustum perspective bug 2015-06-21 15:53:24 -07:00
Seth Alves
021dc64789 merge from upstream 2015-06-18 15:03:09 -07:00
Atlante45
a9d2bb1e1c Coding standard 2015-06-18 15:23:50 +02:00
Seth Alves
508ae276c6 enable -Wdouble-promotion 2015-06-16 18:23:10 -07:00
Brad Davis
09085f1cd9 Working towards display plugins 2015-05-26 18:42:38 -07:00
Brad Davis
41d587bd2e Revert "Revert "Fixing HMD asymmetrical projections (esp DK1) and santizing the transform stuff""
This reverts commit 6e8c067bcb.

Conflicts:
	interface/src/Camera.h
2015-05-12 14:47:44 -07:00
samcake
6e8c067bcb Revert "Fixing HMD asymmetrical projections (esp DK1) and santizing the transform stuff" 2015-05-12 14:34:43 -07:00
Brad Davis
666caf0d59 Working on fixing DK1 and santizing the transform stuff 2015-05-12 00:44:30 -07:00
Sam Gateau
dc81a3ecc2 Cube texture are working with the GL backend, useing it in SKybox successfullly 2015-05-06 09:53:36 -07:00
Stephen Birarda
94739cf8d3 move number constants out of SharedUtil to NumericalConstants 2015-05-01 10:26:53 -07:00
Seth Alves
91861e9e5a split out octree logging 2015-04-06 17:04:49 -07: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
Andrew Meadows
26bb677840 remove ViewFrustum::*VoxelScale() function calls
we do our math in meters now
2015-03-04 17:26:52 -08:00
Sam Gateau
687c76a6f8 trying to ge the shadow to render correctly 2015-02-23 13:12:29 -08:00
Sam Gateau
90bff36fd3 trying to ge the shadow to render correctly 2015-02-22 18:48:48 -08:00
Sam Gateau
23354da828 replacing the glTransform pipeline for model rendering 2015-02-16 22:08:21 -08:00
Sam Gateau
cc3cc4f96f replacing the glTransform pipeline for model rendering 2015-02-16 09:31:29 -08:00
Stephen Birarda
11f3161029 resolve conflicts on merge with upstream/master 2015-02-04 10:38:05 -08:00
Atlante45
7a03daa76f Inline setFieldOfView 2015-02-03 18:51:26 -08:00
Atlante45
27459ba861 Settings update 2015-02-03 12:27:30 -08:00
Atlante45
4ef87b9919 Merge branch 'master' of https://github.com/highfidelity/hifi into android
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/DatagramProcessor.cpp
	interface/src/Menu.cpp
	interface/src/ui/PreferencesDialog.cpp
	interface/src/ui/Stats.cpp
	libraries/audio-client/src/AudioClient.cpp
	libraries/audio-client/src/AudioClient.h
2015-01-28 13:13:32 -08:00
Atlante45
4eac6cd410 Moved IDENTITY_FRONT/UP/RIGHT to GLMHelpers 2015-01-23 13:19:03 -08:00
Atlante45
850f92eae3 Don't call Settings::set when you don't need too. 2015-01-20 17:54:11 -08:00
Atlante45
8d37f5ae00 More setting handles 2015-01-20 15:35:22 -08:00
Atlante45
bfceaf2838 Moved FieldOfView related members out of Menu
Moved them to ViewFrustum
2015-01-17 22:37:02 -08:00
Atlante45
eaaaa0687c spacing 2014-12-09 11:53:14 -08:00
Stephen Birarda
f53455ee55 use a ray from the near clip for action ray 2014-11-04 11:40:47 -08:00
ZappoMan
bf77adc4bc add support for LOD occulsion for too small meshes in Model::render() 2014-10-16 00:30:24 -07:00
ZappoMan
2148baae21 add boxInFrustum 2014-09-11 16:40:32 -07:00
Atlante45
72a31ec8fc Removed magic number to use DEFAULT_NEAR/FAR_CLIP 2014-07-25 10:56:44 -07:00
ZappoMan
39ed7f7b65 renaming of AABox to AACube, introduction of actual AABox 2014-05-23 10:45:04 -07:00
ZappoMan
2c02178802 Merge branch 'master' of https://github.com/worklist/hifi into shared_and_weak_pointers
Conflicts:
	assignment-client/src/AssignmentClient.cpp
	assignment-client/src/AssignmentClient.h
	libraries/shared/src/NodeList.cpp
2014-04-18 14:28:54 -07:00
ZappoMan
7a993939bf Merge branch 'master' of https://github.com/worklist/hifi into moonshot
Conflicts:
	interface/interface_en.ts
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/Menu.h
	libraries/shared/src/SharedUtil.h
2014-04-14 09:43:29 -07:00
ZappoMan
a37921c1d5 move isNaN() to shared utils 2014-04-13 19:09:07 -07:00
Stephen Birarda
684c6b5372 run regex header replacement on all cpp files 2014-04-09 09:35:42 -07:00
ZappoMan
4bf7faba7b workaround for assert failures when bad view frustum input 2014-03-31 17:55:40 -07:00
Andrzej Kapolka
210af25396 When rendering avatar shadows, check bounds against shadow frustum. Closes 2014-03-24 14:52:02 -07:00
ZappoMan
f3bd8925d9 optimized OctreeElement::furthestDistanceToCamera() 2014-03-19 12:48:11 -07:00
ZappoMan
252bc3b3ee optimized ViewFrustum::getFurthestPointFromCamera() 2014-03-19 11:51:47 -07:00
ZappoMan
0d4066a347 added note 2014-03-14 10:07:26 -07:00
Andrew Meadows
aa8c2fc8cb use radians instead of degrees (almost) everywhere 2014-03-11 17:26:58 -07:00
Stephen Birarda
b78e723253 fix a NaN in ViewFrustum and BuckyBalls 2014-03-04 15:53:05 -08:00
ZappoMan
c5197b390e removed a bunch of cruft from VoxelSystem 2014-03-02 12:13:00 -08:00
ZappoMan
1e404404c3 next pass at seeing voxels 2014-02-26 13:35:59 -08:00
Brad Hefta-Gaub
170dbe6e85 Merge branch 'master' of git://github.com/worklist/hifi into windows_build
Conflicts:
	assignment-client/src/audio/AudioMixer.cpp
	domain-server/src/DomainServer.cpp
	interface/src/Audio.cpp
	interface/src/DataServerClient.cpp
	interface/src/Oscilloscope.cpp
	interface/src/PairingHandler.cpp
	interface/src/Util.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/devices/Faceshift.cpp
	interface/src/devices/SerialInterface.cpp
	interface/src/renderer/FBXReader.cpp
	libraries/avatars/src/AvatarData.h
	libraries/octree-server/src/OctreeServer.cpp
	libraries/octree-server/src/OctreeServer.h
	libraries/octree/src/ViewFrustum.cpp
	libraries/shared/src/Logging.cpp
	libraries/shared/src/Node.cpp
	libraries/shared/src/Node.h
	libraries/shared/src/NodeList.cpp
	libraries/shared/src/NodeList.h
	libraries/shared/src/PerfStat.cpp
	libraries/shared/src/SharedUtil.cpp
	libraries/voxels/src/VoxelTree.cpp
	voxel-edit/src/main.cpp
2014-01-15 10:20:21 -08:00
Stephen Birarda
987c639e36 initial newline removal from all QDebug calls 2014-01-14 13:09:22 -08:00
Brad Hefta-Gaub
55babbf7b6 windows type mismatch warning fixes 2014-01-13 00:30:23 -08:00
Brad Hefta-Gaub
e55e680e66 tweaks to some variable names since windows has a problem with them 2014-01-10 18:28:18 -08:00
ZappoMan
9faef65ccc first cut at splitting out octree base classes 2013-12-03 17:32:02 -08:00
Renamed from libraries/voxels/src/ViewFrustum.cpp (Browse further)