overte-HifiExperiments

mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-12 13:27:23 +02:00

Author	SHA1	Message	Date
samcake	3554f54e17	Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster	2015-12-14 17:38:56 -08:00
Anthony J. Thibault	3f0cdb3c02	Merge branch 'master' into tony/js-avatar-default-pose	2015-12-14 11:19:24 -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	1492fd6090	merge from upstream	2015-12-12 12:37:57 -08:00
samcake	b3acde4462	Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster	2015-12-11 17:49:00 -08:00
Atlante45	146581714a	More warning fixes	2015-12-11 16:17:41 -08:00
Atlante45	f308ef7aa9	Move QOpenGL wrappers to the gl lib	2015-12-11 16:17:17 -08:00
Atlante45	d3224bfde3	More warning fixes	2015-12-11 16:03:44 -08:00
Atlante45	ce51350b65	Fix warnings on windows 64bit	2015-12-11 15:42:15 -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
samcake	94b6ca4450	FIxing the bad lambda capture for local variables	2015-12-11 10:48:58 -08:00
samcake	5d395ae54f	Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster	2015-12-10 18:06:43 -08:00
samcake	c74bbda663	Nothing fancy	2015-12-10 18:02:02 -08:00
samcake	20f3d6abe1	REmoving comments	2015-12-10 16:52:03 -08:00
samcake	dffb83a488	Potentially working correctly	2015-12-10 16:31:00 -08:00
samcake	5805cc8f2b	Adding the AABox transform features (from Extents) adn introducing a simple MeshPartPayload to render simple geometry	2015-12-10 14:59:04 -08:00
Anthony J. Thibault	652ce5501f	Expose Avatar default pose to JavaScript New JavaScript API to get the avatar's default pose. MyAvatar.getDefaultJointRotation(index); MyAvatar.getDefaultJointTranslation(index); See `examples/tPose.js` for example usage	2015-12-10 13:57:31 -08:00
samcake	f9269523a1	Merge branch 'master' of https://github.com/highfidelity/hifi into controllers	2015-12-09 16:58:56 -08:00
samcake	9eb40bcd65	Trying to redner the collision geometry correctly but still an issue with the bounding box i get	2015-12-09 16:58:14 -08:00
samcake	1adf2cc8ba	Repesenting the collision meshes of a Model correctly	2015-12-08 16:45:12 -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
samcake	ede375a889	Merge branch 'graphics' of https://github.com/highfidelity/hifi into hdr	2015-12-08 12:28:16 -08:00
Bradley Austin Davis	011a43d5f2	Add sphere and cube triangle counts to displayed stats	2015-12-08 11:08:22 -08:00
samcake	83279489f3	Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster	2015-12-08 09:46:29 -08:00
Seth Alves	dffa37c0e7	Merge branch 'master' of github.com:highfidelity/hifi into parents	2015-12-08 09:44:50 -08:00
Sam Cake	9faec326da	CHanging the lighting BUffer format and adding tone mapping	2015-12-08 08:34:42 -08:00
samcake	b24af06589	Fixing the display of the collision hull mesh	2015-12-07 18:26:55 -08:00
samcake	d12fdb9726	Merge pull request #6584 from birarda/pref-no-auto fix for avatar URL text editing, assert in Model.cpp	2015-12-07 18:11:49 -08:00
Stephen Birarda	6dbff93bbd	fix assert on model URL change from _renderItemsSet	2015-12-07 16:24:26 -08:00
Seth Alves	f99812a903	adjust method names to fit convention	2015-12-07 14:31:08 -08:00
samcake	9ddc3c27bf	compilation errors fixed	2015-12-07 13:25:55 -08:00
samcake	5d207d0c9c	INtroducing the tonemapping job in its separate file and clean DeferredLightingEffect	2015-12-07 13:19:43 -08:00
Atlante45	f8ee377f01	Fix QOpenGL warning	2015-12-07 08:37:07 -08:00
Sam Cake	3595d0d719	less commented stuff	2015-12-07 01:15:10 -08:00
Sam Cake	01d48b29aa	cleaning code and removing cruft	2015-12-07 01:03:14 -08:00
Sam Cake	a018c51945	Drawing background first in the Lighting buffer then lighting passes with stencil test	2015-12-06 23:51:29 -08:00
Sam Cake	dc4b6909bc	Merge branch 'graphics' of https://github.com/highfidelity/hifi into hdr	2015-12-06 18:58:11 -08:00
Seth Alves	a948ae5f19	children of avatar joints might be right, now	2015-12-06 10:48:00 -08:00
Atlante45	acb9e2774e	Basic implementation of debug zone resizing	2015-12-04 21:01:53 -08:00
Atlante45	41af377878	More g-buffer debugging options	2015-12-04 21:01:53 -08:00
samcake	dfd26bebae	Merge branch 'graphics' of https://github.com/highfidelity/hifi into hdr	2015-12-04 17:53:37 -08:00
samcake	b28e3d0045	Merging MAster and Graphics	2015-12-04 17:51:30 -08:00
Atlante45	b45b1cc513	More work on live g-buffer debug	2015-12-04 17:43:00 -08:00
samcake	119cc733b5	Merging with master	2015-12-04 17:17:33 -08:00
samcake	cfd7373585	Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster	2015-12-04 16:52:50 -08:00
samcake	ef7ddce2b6	Trying to fix the problem of the background not showing correctly	2015-12-04 16:52:14 -08:00
samcake	a12188877a	Merge branch 'graphics' of https://github.com/highfidelity/hifi into hdr	2015-12-04 11:50:26 -08:00
samcake	3c18664c57	Cleaning all the deferred buffers in the Prepare call	2015-12-04 11:47:57 -08:00
Brad Hefta-Gaub	15c4dbfb11	Merge pull request #6554 from Atlante45/warnings Last of the OpenGL warnings on OS X	2015-12-04 11:24: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
Atlante45	ba2e7e1f29	Debug diffuse buffer	2015-12-04 11:15:06 -08:00
Atlante45	c27944ae28	Simple normal map debug	2015-12-04 10:44:23 -08:00
Atlante45	baf93e8a08	Add basic DebugDeferredBuffer job	2015-12-04 10:44:23 -08:00
Atlante45	528a17422d	Last of the OpenGL warnings on OS X	2015-12-04 10:33:10 -08:00
Brad Hefta-Gaub	d9a1563396	Merge pull request #6152 from sethalves/parents Parents	2015-12-04 10:26:57 -08:00
Atlante45	07387ab8c0	Fix most OpenGL warnings	2015-12-04 10:01:43 -08:00
samcake	d593b824e9	Introducing a true Primary Framebuffer and a different Deferred Framebuffer	2015-12-03 17:26:54 -08:00
samcake	72d393905b	Introducing the Lighting Buffer where all the lighting is beeing accumulated, apply a manual gamma correction when copying back into the main color buffer	2015-12-03 16:03:32 -08:00
Atlante45	3da80f5861	gpu::Shader::create* return shared_ptr	2015-12-03 14:56:07 -08:00
Seth Alves	4e74c98ae7	Merge branch 'master' of github.com:highfidelity/hifi into parents	2015-12-03 11:00:13 -08:00
samcake	a5475ed14d	Early try fixing the lighting	2015-12-03 10:41:32 -08:00
Anthony J. Thibault	9c0b4bc2a2	Fix for model entities with non-uniform scaled mesh Logic which extracted rotations from a non-uniformly scaled matrices was sometimes incorrect. This should fix the roads in Qbit as well as the blocks in toybox.	2015-12-02 14:09:47 -08:00
Seth Alves	b7ebe5b92b	merge from upstream	2015-11-30 16:59:52 -08:00
Seth Alves	5c327edd5a	keep AvatarHashMap::findAvatar from creating bogus avatar entries. remove some more stray consts	2015-11-30 14:08:07 -08:00
Seth Alves	cf39cac7fc	attempt to make SpatiallyNestable data access thread-safe	2015-11-29 12:50:33 -08:00
Anthony J. Thibault	e2f031e77f	AnimDebugDraw Removed unused drawing code.	2015-11-21 10:57:39 -08:00
Anthony J. Thibault	fe683edb66	Avatar Debug Draw Default Pose now works	2015-11-21 10:53:24 -08:00
Seth Alves	f013f95e9b	merge from upstream	2015-11-21 08:43:00 -08:00
Anthony J. Thibault	2f37335d77	Warning fixes	2015-11-20 14:50:42 -08:00
Anthony J. Thibault	a77ea8da43	Removed JointStates! You won't be missed.	2015-11-20 14:15:37 -08:00
Anthony J. Thibault	982e2c06a9	Rig: Switched over to use AnimPoses instead of JointStates * fixed debug rendering * improved jointState/animPose diff detection code.	2015-11-19 12:14:04 -08:00
Anthony J. Thibault	721da29432	WIP checkpoint * No longer normalizing scale in AnimSkeleton and AnimClip This means graph is animating in 'geometry' coordinates before unit scale is even applied. This is necessary to properly work with both Avatar based models and ModelEntity based models Many things are broken. * debug rendering (translations are x100) * IK hand targets * follow cam * I did not even dare to try HMD mode	2015-11-18 18:47:33 -08:00
Anthony J. Thibault	55adedcec8	Merge branch 'master' into tony/remove-joint-states	2015-11-16 11:22:44 -08:00
Seth Alves	89ed3751ae	Merge branch 'master' of github.com:highfidelity/hifi into rework-visual-physics-debug	2015-11-14 14:00:20 -08:00
Stephen Birarda	429a4d51d5	Merge pull request #6375 from Atlante45/resize Fix models resizing	2015-11-13 10:23:05 -08:00
Seth Alves	3519dd248b	Merge branch 'master' of github.com:highfidelity/hifi into rework-visual-physics-debug	2015-11-12 09:53:11 -08:00
Brad Hefta-Gaub	eefe26d96a	fix crash in Model::deleteGeometry when _rig is not initialized	2015-11-12 09:24:49 -08:00
Atlante45	954391ae3e	Fix models resizing When models are MUCH bigger one one axis than the others and we modify the scale only of one of those small axis, it wouldn't propagate because the change was relatively too small conpared to the size of the model	2015-11-11 18:33:26 -08:00
Anthony J. Thibault	e698d3c1e8	Isolate JointStates within the Rig class Except for SkeletalModel::computeBounds() JointStates are now completly encapsulated by the Rig. Now we can start using AnimPoses instead and in parallel with the JointState implementation. Then we can assert that they are identical, before removing JointStates. This check in has many comments with the AJT tag. Each one of these cases will need to be revisitied and fixed. In particular // AJT: LEGACY will be used to enclose all code in the Rig which manipulates the _jointState QVector.	2015-11-11 18:23:58 -08:00
Anthony J. Thibault	11440f92f4	Removed rig animations * Deleted AnimationHandle class * Removed enableAnimGraph and anableRigAnimations from Menu. * Removed some references to old IK system. But it is still used when computing collision bounding volumes	2015-11-11 15:32:57 -08:00
Seth Alves	66387c4530	use icons to show network and physics status	2015-11-10 17:02:57 -08:00
Seth Alves	d043011a11	Merge branch 'render-debug-fixup' of github.com:sethalves/hifi into rework-visual-physics-debug	2015-11-10 10:16:02 -08:00
Seth Alves	8e466190e0	working toward display icons for debug/status display	2015-11-10 10:15:58 -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	021a6e689d	added some asserts to test future mistakes that would cause render item leaks	2015-11-09 17:09:17 -08:00
Brad Hefta-Gaub	e47b049200	fix render item leak on Model::reset()	2015-11-09 16:41:40 -08:00
Seth Alves	f3d26e163d	turn _drawItemStatus into a bitfield, split out bounding boxes and network/physics-sim-ownership. hook Display-Simulation-Ownership menu item to this system	2015-11-07 07:19:27 -08:00
Seth Alves	3ac0fef1ea	merge from upstream	2015-11-01 15:22:57 -08:00
Howard Stearns	8c395209e8	Fix Developer->Avatar->Draw Mesh MyAvatar::setEnableMeshVisible -> Model::setVisibleInScene sets a flag that no one was looking at any more.	2015-10-28 21:23:35 -07:00
Brad Davis	5cbb2562cd	Move GL utilities out to their own library	2015-10-27 15:53:42 -07:00
Seth Alves	7f6ac0207d	Merge branch 'master' of github.com:highfidelity/hifi into parents	2015-10-22 19:35:27 -07:00
samcake	b2461a8e4e	Merge branch 'master' of https://github.com/highfidelity/hifi into color	2015-10-22 12:06:20 -07:00
samcake	a44ac4cbfd	Fiing the dark colors for surfaces without texture	2015-10-22 11:40:56 -07:00
Stephen Birarda	a8d591166e	Merge branch 'master' of https://github.com/highfidelity/hifi into qt-5.5	2015-10-22 11:13:28 -07:00
Stephen Birarda	695f0a75b0	fixes for builds with qt 5.5	2015-10-22 11:12:51 -07:00
Seth Alves	6cb195b335	Merge branch 'master' of github.com:highfidelity/hifi into parents	2015-10-20 15:53:56 -07:00
Seth Alves	bc99ef778c	change how render engine is told about model position changes	2015-10-20 12:04:29 -07:00
Andrew Meadows	7fa069cf30	fix line endings grumble gruble	2015-10-20 09:38:25 -07:00
Andrew Meadows	341bc3666f	Merge pull request #6093 from sethalves/hold-action-changes Hold action changes	2015-10-20 09:19:48 -07:00
Brad Hefta-Gaub	110adc5c22	fix model LOD behavior	2015-10-19 15:21:25 -07:00
Brad Davis	282cdadf63	Fixing line endings	2015-10-18 22:55:14 -07:00
Seth Alves	4903db45b1	give other avatars an anim-skeleton	2015-10-15 14:21:06 -07:00
Seth Alves	a70ba4cd5a	add some accessors	2015-10-15 11:42:53 -07:00
samcake	3897716ff5	Simplifying the DrawOpaqueStencil Pixel shader	2015-10-08 17:49:55 -07:00
samcake	bad5ea7d53	grouping the depth and stencil buffer into a single buffer	2015-10-08 16:47:33 -07:00
samcake	c7049bad39	Backing up on any changes regarding shading, focus on the rearr view mirror and stencil bug	2015-10-08 09:32:05 -07:00
samcake	a2ca1c033d	FIxing the rear view mirror issue with background and fooling around with Lighting equations	2015-10-07 19:04:03 -07:00
samcake	0a351a8a0c	FIx the problem with cauterizedClusterMatrices in the case rear view mirror is used. Clean the way to define the depth stencil format for texture	2015-10-07 14:26:33 -07:00
Brad Hefta-Gaub	b06d17d45a	Merge pull request #6000 from samcake/hobbes Migrate FBXReader to use model::Mesh and clean Model Part rendering	2015-10-07 01:31:21 -07:00
Brad Davis	eff5a4c395	Picking fixes in the HMD	2015-10-06 22:56:48 -07:00
samcake	83a0091e47	Merge branch 'master' of https://github.com/highfidelity/hifi into hobbes	2015-10-06 22:03:07 -07:00
samcake	c75c31ddc8	Fixing the index Offset issue with instanced shapes from Geometry cache	2015-10-06 18:04:08 -07:00
Atlante45	9c7a480fda	Remove shadowMatrices/Distances	2015-10-06 13:56:23 -07:00
Atlante45	765608d0ff	More unused	2015-10-06 13:56:21 -07:00
samcake	2b5742b277	Some code got overwritten when merging to my office mahcine this morning, that i know got back...	2015-10-06 11:13:35 -07:00
samcake	cf3828629e	Fix build on mac and linux	2015-10-06 11:00:21 -07:00
samcake	c92a6d58ab	Dispatch classes in their properly named files to appease the coding standard gods	2015-10-06 09:46:32 -07:00
samcake	59afbf1a04	Remove the renderPart call from model.cpp and put the code path in the MeshPartPayload::render()	2015-10-06 01:15:53 -07:00
samcake	fc7f0c77a5	Rename ModelRenderPayload files to ModelRenderItem	2015-10-06 00:20:51 -07:00
samcake	4270b83c0f	Uniform buffer for skeleton joint bind pose	2015-10-05 23:33:58 -07:00
samcake	12fedb6ff0	Move skinning shader features in its own slh and get ready for moving cluster matrices to uniform buffer	2015-10-05 18:31:05 -07:00
samcake	9e393ced46	MOving rednering code of Model into ModelRenderPayload.h/cpp	2015-10-05 09:17:16 -07:00
samcake	fd232b7d32	ONe more file to deal with the Model rendering	2015-10-04 22:27:48 -07:00
samcake	1799322c67	Fix typos introduce in previous commit about the Quad to triangle indexing and remove dead code in model.cpp	2015-10-04 18:46:35 -07:00
samcake	55f5ab3732	Merge branch 'master' of https://github.com/highfidelity/hifi into hobbes	2015-10-04 18:31:56 -07:00
samcake	48416262a1	Migrated the FBXReader mesh code to use excusively the Model::mesh and use them directly for rendering in the ModelPartPayload, fixed a bug in the indexBUffer offset value used in drawIndexed and drawIndexedInstanced	2015-10-04 18:31:19 -07:00
samcake	edaa8f998a	Migrating to the new mesh for rendering and having problems with multi part mesh	2015-10-02 18:12:16 -07:00
Howard Stearns	f6665a4ac6	Merge pull request #5839 from sethalves/transmit-joint-translation WARNING protocol change: Transmit joint translation	2015-10-02 13:37:56 -07:00
samcake	a22ee03732	Merge branch 'master' of https://github.com/highfidelity/hifi into hobbes	2015-10-02 12:25:09 -07:00
samcake	edb485cb0f	working on getting the Model payload to use model::Mesh	2015-10-02 12:24:41 -07:00
Anthony J. Thibault	fc7b6dee84	Merge branch 'master' into transmit-joint-translation	2015-10-02 11:40:33 -07:00
Brad Hefta-Gaub	4c556dd43a	Merge pull request #5962 from samcake/calvin Rendering the background elements after opaque and only work on the far pixels	2015-10-02 11:38:45 -07:00
Brad Hefta-Gaub	c6c430ca76	Merge pull request #5977 from jherico/marge Fixing 2D overlay mouse interaction	2015-10-02 11:11:04 -07:00
Brad Davis	aa8979570c	Working on 2D overlay mouse interaction	2015-10-02 00:35:37 -07:00
samcake	b8ea83099a	Debuggging	2015-10-01 21:13:22 -07:00
samcake	4478ca79ca	Merge branch 'master' of https://github.com/highfidelity/hifi into hobbes	2015-10-01 19:55:14 -07:00
samcake	71ad6195f2	Merge branch 'master' of https://github.com/highfidelity/hifi into calvin	2015-10-01 19:25:25 -07:00
samcake	690620d74d	Cleaning code	2015-10-01 19:23:32 -07:00
samcake	3490e08521	Little improvments on the performance side to get the Stencil pass and the masking of the background under reasonable performances	2015-10-01 18:42:09 -07:00
Anthony J. Thibault	fa864d29f9	Merge branch 'master' into transmit-joint-translation	2015-10-01 16:55:24 -07:00
Andrew Meadows	09ac01a5e7	remove cruft from old verlet avatar simulation	2015-10-01 13:44:50 -07:00
samcake	0398f9429e	fix the coo/texel blender mode for the case when color is black and the stereo issue	2015-09-30 18:39:13 -07:00
samcake	75e858cd13	Putting together the stencil buffer for opaque vs background and using it for the backgroud render items	2015-09-30 15:54:03 -07:00
Sam Gateau	e78f1521ab	getting the stencil buffer in place	2015-09-30 09:24:36 -07:00
samcake	dc3c9b48ea	MOving forward on the background beeing drawn last	2015-09-29 18:28:20 -07:00
Brad Hefta-Gaub	04115052b3	Merge pull request #5938 from samcake/calvin Fixing the lighting view matrix for stereo again	2015-09-29 15:08:41 -07:00
samcake	1bd07b58c3	Fixing the lighting view matrix for stereo again	2015-09-29 14:40:37 -07:00
Brad Hefta-Gaub	00c32fc7cd	Merge pull request #5924 from jherico/marge Support for accessing IPD in scripts	2015-09-29 14:24:53 -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
samcake	840f92bd06	Merge branch 'master' of https://github.com/highfidelity/hifi into hobbes	2015-09-29 10:54:09 -07:00
samcake	a9f6c93a2c	merging	2015-09-29 10:53:56 -07:00
samcake	202d2944ab	Merge branch 'master' of https://github.com/highfidelity/hifi into calvin	2015-09-28 17:24:59 -07:00
Brad Davis	7b1c04512a	Adding support for accessing IPD in scripts	2015-09-28 16:24:38 -07:00
samcake	95ea874d43	Minor fixes to the way the specular color is interpreted	2015-09-28 12:43:15 -07:00
Brad Hefta-Gaub	ce3da099f6	normalize the surface normal from the triangle, coding standard fix, update example	2015-09-28 08:30:49 -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
Brad Hefta-Gaub	85b2322acc	more work on batch optimzation	2015-09-24 17:11:14 -07:00
Brad Hefta-Gaub	5e82b9c433	more warning fixes	2015-09-24 08:26:56 -07:00
samcake	46e9c463fc	Merge pull request #5885 from ZappoMan/batchOptimizations Batch optimizations	2015-09-23 19:30:51 -07:00
Brad Hefta-Gaub	5a80c4d0e7	Merge pull request #5886 from samcake/calvin Expose multi Draw Indirect in Batch (Hijack Austin's work...)	2015-09-23 19:13:28 -07:00
Brad Hefta-Gaub	9a0e5b9870	address Sam's concerns	2015-09-23 17:37:48 -07:00
samcake	8bdfc853d9	Merge branch 'orange' of https://github.com/samcake/hifi into hobbes	2015-09-23 17:31:04 -07:00
ZappoMan	65a079cb53	fix mac build	2015-09-23 16:48:34 -07:00
Brad Hefta-Gaub	ef25876c9a	implement vector caching for gpu::Batch	2015-09-23 14:46:47 -07:00
samcake	8735aa8003	Merging Austin pr that adds the multi draw indirect and also fix the seprate vertex format feature for windows and linux	2015-09-23 12:19:17 -07:00
Anthony J. Thibault	90a551214e	Fix for AnimDebugDraw crash on shutdown.	2015-09-23 11:09:43 -07:00
Anthony J. Thibault	a9848cd157	Merge branch 'master' into tony/lean-threshold	2015-09-23 10:54:12 -07:00
samcake	7f8450f77b	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-09-23 10:30:51 -07:00
samcake	d7d332acd4	Merge branch 'master' of https://github.com/highfidelity/hifi into orange t :wq	2015-09-23 09:51:31 -07:00
Brad Hefta-Gaub	387c4fbd92	fix bad oglplus pragma warnings	2015-09-22 21:52:16 -07:00
Brad Hefta-Gaub	17a3fd159a	apparently unix doesn't like the generic type version of sqrt()	2015-09-22 21:43:09 -07:00
Brad Hefta-Gaub	02e1de3ba3	more warnings fixes	2015-09-22 21:35:13 -07:00
Brad Hefta-Gaub	cd9aad4f41	more warnings fixes	2015-09-22 21:28:45 -07:00
Brad Hefta-Gaub	9436d2922f	more warnings fixes	2015-09-22 21:18:04 -07:00
Brad Hefta-Gaub	5b00783f18	more warnings fixes	2015-09-22 20:54:36 -07:00
Brad Hefta-Gaub	8d8035a418	Merge branch 'master' of https://github.com/highfidelity/hifi into fixWarning Conflicts: libraries/render-utils/src/Model.cpp libraries/render-utils/src/Model.h	2015-09-22 20:54:25 -07:00
Brad Hefta-Gaub	52842cb287	more warnings fixes	2015-09-22 20:34:40 -07:00
Anthony J. Thibault	d04f4d4b2b	Added shared DebugDraw singleton.	2015-09-22 19:57:23 -07:00
samcake	518f5fe17c	Starting to clean the mesh part of the RenderItem....	2015-09-22 18:21:36 -07:00
Brad Hefta-Gaub	6f7e13b3c1	more warning fixes	2015-09-22 17:26:45 -07:00
Andrew Meadows	2edffaf91a	remove unused variables	2015-09-22 17:20:13 -07:00
Andrew Meadows	11fee94459	remove warning about signed/unsigned comparison	2015-09-22 17:19:47 -07:00
Brad Hefta-Gaub	efda121619	fix a bunch of warnings on windows	2015-09-22 16:40:17 -07:00
Brad Davis	deaa4a747b	Batch side implementation of multi-draw indirect	2015-09-22 15:56:58 -07:00
Brad Hefta-Gaub	5bcce50b98	Merge pull request #5846 from bob-long/master Display the face blend coefficients and update the value in real time.	2015-09-22 14:56:56 -07:00
samcake	80e5581639	fixing review comments	2015-09-21 22:51:14 -07:00
samcake	4513b64b00	fixing review comments	2015-09-21 22:42:24 -07:00
BOB LONG	a23a90bf5f	Code simplification Simplify the code a bit as suggested: 1) Use unsigned int instead of signed int, so we can avoid checking the negative case 2) Merge two lines into a single line so we can inline the implementation Correct the js sample file header. testing done: - Build locally - Pass -1 as index from js and the code still can correctly handle the input.	2015-09-21 19:11:13 -07:00
samcake	91b9940fe9	Merging and a fix for the diffuse map floating around	2015-09-21 18:09:25 -07:00
samcake	910038cf82	Merging	2015-09-21 17:47:23 -07:00
samcake	21f53f1bbd	debugging the lighting issue on the craps table	2015-09-21 16:57:55 -07:00
Brad Hefta-Gaub	ea141aae92	Merge pull request #5865 from jherico/bart Instancing work, second pass	2015-09-21 16:51:08 -07:00
Bradley Austin Davis	0401672c82	Fixing lighting again	2015-09-21 16:24:55 -07:00
Bradley Austin Davis	b3aeaba5f4	CR feedback	2015-09-21 15:44:47 -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	d3b1bcb86d	Redistributing the files to create the model-networking lib and separate that from the redner-utils	2015-09-21 13:21:35 -07:00
Brad Hefta-Gaub	dc9c774eb5	merge model part quads and triangles together to reduce the number of draw calls	2015-09-21 13:09:43 -07:00
samcake	6a714f405c	Integrate the PR from ALessandro through a different Texture Type and a different TextureLoader to transform a bump map into a normal map	2015-09-21 00:53:48 -07:00
samcake	3614812681	MOving the actual creation of the texture and the pixel manipulation required from TextureCache to TextureSOurce	2015-09-20 23:31:59 -07:00
samcake	c9cb768945	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2015-09-19 09:00:19 -07:00
samcake	9a8dc6ca5d	Fix compilation issues on mac	2015-09-19 08:59:47 -07:00
samcake	8941741508	Migrating the rendering code to the Material Maps and adding the simplae variables to the the TextutreMap	2015-09-18 18:47:18 -07:00
Brad Davis	8a703d0363	Instanced rendering, first pass	2015-09-18 16:29:29 -07:00
samcake	64cf8590eb	fix typos	2015-09-18 11:51:58 -07:00
samcake	5f5cc3dbaf	fix typos	2015-09-18 11:51:28 -07:00
samcake	767407af9c	Merging and cleaning shaders	2015-09-18 11:46:44 -07:00
samcake	d4fd2ea4c6	merging	2015-09-18 11:31:53 -07:00
Sam Gateau	d0f7ddd3a6	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2015-09-18 00:03:19 -07:00
Sam Gateau	b207d97f72	Fix the lighting when the rear view mirror is showing up	2015-09-17 12:28:17 -07:00
Sam Gateau	882ca5d6c0	Fix the lights not rendering roperly	2015-09-16 15:57:35 -07:00
Sam Gateau	d45547aa1a	Merge and update	2015-09-16 13:46:07 -07:00
BOB LONG	efc321bc10	Display face blend coefficients Display the face blend coefficients and update the value in real time.	2015-09-16 00:40:26 -07:00
Brad Davis	f35ffd2ab7	Merge pull request #5814 from samcake/HMDLightingBug Fixing HMD and stereo lighting bug	2015-09-15 18:10:26 -07:00
Sam Gateau	08546fcc08	Merge branch 'master' of https://github.com/highfidelity/hifi into HMDLightingBug	2015-09-15 18:07:26 -07:00
Sam Gateau	80d25a68b6	Bringing back the eyeView per side to the deferred transform stack	2015-09-15 18:05:15 -07:00
Sam Gateau	5410bc0945	FIx the review comment and trying to fix the simple stereo display plugin projection and eye view matrix	2015-09-15 17:48:55 -07:00
Sam Gateau	f00e3829f1	Cleaning for PR	2015-09-15 16:54:04 -07:00
Sam Gateau	7b8e11e01c	Debugging, looking good, no ready for final lighting	2015-09-15 15:22:45 -07:00
Sam Gateau	dc8756e465	Need to pull master, just updated all the deferred shaders to use scribe func declare blocks to avoid long shaders... didn;t validate the current clip to eye position evaluation	2015-09-15 14:40:23 -07:00
Sam Gateau	400f90aea4	Introducing a stereo loop that should do the right thing but doesn't yet	2015-09-15 08:34:46 -07:00
Brad Davis	f4818c17cf	Fix avatar and other model animations	2015-09-15 08:04:17 -07:00
Brad Davis	3f688f92d3	Don't do an O(N^2) operation on cluster matrices	2015-09-15 08:04:17 -07:00
Brad Hefta-Gaub	70fcdbf2fd	Revert "Fix over-calculation of cluster matrices"	2015-09-14 21:20:11 -07:00
Sam Gateau	45dc5be53d	DeferredTransform buffer working for the deferred rendering in mono	2015-09-14 17:48:15 -07:00
Brad Davis	35e4440c4f	Don't do an O(N^2) operation on cluster matrices	2015-09-14 16:09:13 -07:00
Sam Gateau	00688172dd	work in progress, gathering th eindvidual parameters of the deferred pass into a single UBO that is bound once for all the deferred lighting passes	2015-09-14 15:49:05 -07:00
Sam Gateau	3690d5a4c2	Merge branch 'master' of https://github.com/highfidelity/hifi into HMDLightingBug	2015-09-14 12:28:59 -07:00
Sam Gateau	6c63dc0444	work in progress	2015-09-14 12:28:33 -07:00
Brad Davis	1bb15e28d6	Fixing differing highlights between left and right eyes in stereo modes	2015-09-14 11:24:28 -07:00
Sam Gateau	0fcfacdd72	Merge branch 'master' of https://github.com/highfidelity/hifi into HMDLightingBug	2015-09-14 10:18:42 -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
Seth Alves	49ee251238	quiet compiler	2015-09-12 09:59:25 -07:00
Sam Gateau	cf1f5b8771	Work in progress	2015-09-11 15:25:33 -07:00
Sam Gateau	5cc5609e87	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2015-09-11 12:05:02 -07:00
Anthony J. Thibault	7996a02bd8	Added head target to AnimGraph IK node. * In HMD mode head orientation and position is set. * When not in HMD only orientation is set, position should default to the underlying pose position.	2015-09-11 09:48:48 -07:00
Sam Gateau	c37cdce750	Merging back with master	2015-09-10 17:53:50 -07:00
Howard Stearns	73a5714d66	Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates	2015-09-09 10:37:11 -07:00
Seth Alves	e06461ea15	Merge pull request #5724 from hyperlogic/tony/anim-debug-draw-improvements AnimDebugDraw Improvements	2015-09-08 17:07:51 -07:00
Howard Stearns	eb67254e54	Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates	2015-09-08 16:54:14 -07:00
Howard Stearns	26f63a44fc	Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates	2015-09-08 15:30:22 -07:00
Stephen Birarda	a3959109f1	resolve conflicts on merge with upstream/master	2015-09-08 15:18:39 -07:00
Stephen Birarda	b8bf9a1104	fix OBJReader loading with URL	2015-09-08 14:51:51 -07:00
Howard Stearns	27f4bca0a4	Cleanup: This appears to be complete and working -- EXCEPT for loading animations on the update thread! Until I figure that out, the answer is to turn off Developer->Avatar->"Enable Avatar Update Threading", run through forward/back/left/right/strafeLeft/strafeRight, and then turn "Enable Avatar Update Threading" back on.	2015-09-08 14:49:58 -07:00
Brad Davis	5f1affaff9	Procedural skybox work	2015-09-08 14:31:16 -07:00
Anthony J. Thibault	6d5927c0c9	Now with less copies. * AnimSkeleton now returns AnimPoses by const ref. * AnimDebugDraw: uses references to Poses on the stack instead of copies within inner loops. * AnimDebugDraw: Removed unnecessary universal refs in range based for loops.	2015-09-08 10:51:23 -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
Howard Stearns	efeaf21305	Checkpoint smoother.	2015-09-07 16:32:51 -07:00
Howard Stearns	0065c64b31	Snapshot of no-judder, before cleanup.	2015-09-07 09:57:05 -07:00
Brad Davis	e8435b6218	Procedural rendering for box entities	2015-09-05 12:10:45 -07:00
Anthony J. Thibault	69e463bbfd	AnimDebugDraw Improvements * Now always works, regardless of whether or not Rig or AnimGraph animations are enabled. * Changed joint radius to 1 cm. * Changed xyz axis length to 4 cm.	2015-09-04 16:01:05 -07:00
Howard Stearns	d3106de7c1	Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates	2015-09-04 14:32:58 -07:00
Stephen Birarda	ed19987b7d	resolve conflicts on merge with upstream/master	2015-09-04 12:31:46 -06:00
Anthony J. Thibault	3f258c89b4	Fix transition from AG+Rig to AG only.	2015-09-04 11:03:59 -07:00
Anthony J. Thibault	df28c7bf1a	Merge branch 'master' into ajt/new-anim-system	2015-09-04 09:27:02 -07:00
Brad Hefta-Gaub	20bd14c8db	Merge pull request #5684 from rabedik/fxaa Post-process anti-aliasing effect	2015-09-04 09:01:39 -07:00
Raffi Bedikian	6b2897ca8f	Fix AA bugs with display plugins and mini-mirror	2015-09-03 23:11:53 -07:00
Brad Davis	c8069ba73c	Working on magballs polish	2015-09-03 20:09:54 -07:00
Anthony J. Thibault	30264e9c3d	Added animation debug draw items to menu. * Debug Draw Bind Pose - used to display the current avatar's bind pose * Debug Draw Animation - used to display the current avatar's AnimGraph animation. Currently does not work with old animation so it's only valid when Enable Anim Graph is true. * Draw Mesh - used to hide or display the avatar mesh.	2015-09-02 21:04:29 -07:00
Raffi Bedikian	2d95d1c236	Fix various whitespace issues	2015-09-02 13:49:21 -07:00
Anthony J. Thibault	d151474446	Merge branch 'master' into ajt/new-anim-system	2015-09-02 10:00:36 -07:00
Raffi Bedikian	9318661bc3	Add algorithm comments to FXAA shader	2015-09-01 23:54:48 -07:00
Howard Stearns	8cf71f285d	Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates	2015-09-01 16:03:40 -07:00
Stephen Birarda	33f6933544	Merge branch 'master' of https://github.com/highfidelity/hifi into protocol	2015-09-01 14:36:16 -06:00
Andrew Meadows	fe2d03fd37	merge Conflicts: libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp libraries/display-plugins/src/display-plugins/stereo/StereoDisplayPlugin.cpp libraries/shared/src/GLMHelpers.cpp	2015-09-01 11:17:08 -07:00
Anthony J. Thibault	2401e6cc4b	Merge branch 'master' into ajt/new-anim-system	2015-09-01 10:58:38 -07:00
Seth Alves	7b6d267c06	Merge pull request #5675 from AndrewMeadows/darmstadtium remove PhysicsEntity class	2015-09-01 10:06:01 -07:00
Stephen Birarda	fa0abe2972	resolve conflicts on merge with upstream/master	2015-08-31 10:51:12 -07:00
Anthony J. Thibault	54aa0677f6	Merge branch 'master' into ajt/new-anim-system	2015-08-31 10:47:50 -07:00
Raffi Bedikian	ff2a58b3eb	Add FXAA effect class, modeled after AO effect	2015-08-30 20:49:03 -07:00
Raffi Bedikian	1001cf9000	Add shader files for FXAA	2015-08-30 20:48:06 -07:00
Sam Gateau	4e944645fe	more cleaning for showing a cleaner pr	2015-08-28 16:58:36 -07:00
Sam Gateau	b845fcaff9	Cleanup	2015-08-28 16:38:07 -07:00
Sam Gateau	e2fce12713	Splitting the FBXREader.cpp file into sub files	2015-08-28 09:51:03 -07:00
Sam Gateau	8ea8eea08d	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2015-08-28 08:13:10 -07:00
Sam Gateau	85f230bf17	Getting rid of the NetworkMEshPart and simplifying the thinking around the MOdel regarding its RenderItems	2015-08-28 08:12:50 -07:00
Andrew Meadows	614fad0811	remove warnings from linux build	2015-08-27 19:12:25 -07:00
Stephen Birarda	8ea20b5e5e	fix warning on string literal call to qFatal	2015-08-27 18:26:55 -07:00
Andrew Meadows	d3f06af892	remove PhysicsEntity class	2015-08-27 18:22:12 -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
Ryan Huffman	755c33e551	Remove unused variable	2015-08-27 14:11:40 -07:00
Ryan Huffman	24eef654e0	Remove unnecessary debug	2015-08-27 14:11:29 -07:00
Ryan Huffman	750080fe66	Remove early return in Model::restoreJointPosition	2015-08-27 12:52:01 -07:00
Anthony J. Thibault	778521f664	Improvement to bone link rendering when bones are large.	2015-08-27 10:21:23 -07:00
Sam Gateau	4f7b857130	Merge	2015-08-27 10:01:39 -07:00
Sam Gateau	f6953f8e02	REfining th eTextureMap design but still with the issue of the lightmapped model	2015-08-27 09:52:07 -07:00
Anthony J. Thibault	b7a9b54628	Better AnimDebugDraw rendering	2015-08-26 16:42:08 -07:00
Howard Stearns	475331a97d	Sprinkle locks everywhere.	2015-08-26 16:08:07 -07:00
Ryan Huffman	269d5bb6da	Resolve bugs with *Cache changes	2015-08-26 14:04:55 -07:00
Ryan Huffman	aa7d8678e1	Merge branch 'protocol' of github.com:birarda/hifi into atp-server	2015-08-26 12:26:11 -07:00
Anthony J. Thibault	46c1e008bc	Merge branch 'master' into ajt/new-anim-system	2015-08-26 10:37:39 -07:00
Sam Gateau	84d0be134e	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2015-08-25 22:13:22 -07:00
Sam Gateau	1e9fce2a61	Drafting the materials for FBXReader	2015-08-25 22:12:51 -07:00
Brad Davis	d311e4f2ea	Fixing problems reported by static analysis tool	2015-08-25 19:18:55 -07:00
Anthony J. Thibault	bde75e9e51	AnimDebugDraw rendering works again. I had to port AnimDebugDraw shader to GLSL 4.1.	2015-08-24 17:36:21 -07:00
Brad Davis	380b0cb23c	Removing tabs from our javascript and C++	2015-08-24 15:26:46 -07:00
Anthony J. Thibault	fa5256eefd	Merge branch 'master' into ajt/new-anim-system	2015-08-24 14:32:28 -07:00
Sam Gateau	e06e50cb5c	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2015-08-24 14:01:29 -07:00
Sam Gateau	a6db88f257	converting material and mesh from srgb to linear in pipeline	2015-08-24 14:00:48 -07:00
Brad Davis	78a08ed7c7	Merge pull request #5641 from thoys/20660 CR for Job #20660 - Render the world Axis markers into negative space, add view option	2015-08-24 10:16:56 -07:00
Howard Stearns	bb91b17314	Merge pull request #5634 from hyperlogic/tony/animation-resource-fix Fix for animation resources	2015-08-24 08:13:33 -07:00
Nex Pro	8d8a9535a0	Merge branch '20660' of github.com:thoys/hifi into 20660	2015-08-24 16:07:38 +01:00
Nex Pro	3f4323e084	Added overload for renderDashedLine	2015-08-24 16:07:07 +01:00
Thijs Wenker	0f8cf80d45	Merge branch 'master' of https://github.com/worklist/hifi into 20660	2015-08-23 19:53:50 +02:00
Nex Pro	ad315cf68a	Merge branch '20660' of github.com:thoys/hifi into 20660 Conflicts: interface/src/Util.cpp	2015-08-23 16:30:46 +01:00
Nex Pro	1f08444369	Modified the world box to render axes in negative space Also Modified renderDashedLine to accept params for dash len and gap len so we can display negative axes as dashed lines with 500mm dashes and gaps.	2015-08-23 16:21:20 +01:00
Brad Hefta-Gaub	fe44442ffe	Merge pull request #5577 from vastcharade/horizAmbOcclPerf Horiz amb occl performance updates	2015-08-22 12:39:51 -07:00
Anthony J. Thibault	04e7084743	Resource fix for textures in FBX files. The baseTexturePath url for textures in FBXGeometry should default to the same base url as the fbx file itself. This error was introduced in my recent refactoring. Textures embedded in FBXGeometries should be un-affected by this change.	2015-08-21 21:44:15 -07:00
Sam Gateau	01f4807239	Merging and getting back original files	2015-08-21 16:51:57 -07:00
Sam Gateau	4fabc25b3e	Fixing conflicts in shaders	2015-08-21 16:49:01 -07:00
Sam Gateau	a388ba7b00	fix conflicts	2015-08-21 16:45:52 -07:00
Sam Gateau	5a8e20ec77	merging	2015-08-21 16:34:13 -07:00
Anthony J. Thibault	b7009b4631	Fix for animation resources The problem was that the invokeMethod between the AnimationReader thread and the main thread was failing, because FBXGeometry* wasn't a registered meta type. So, I ended up normalizing the AnimationReader class to be more like GeometryReader, in that it uses singles and slots to communicate success and failure, rather then invokeMethod.	2015-08-21 16:09:06 -07:00
ZappoMan	75aff2f281	fix atmosphere rendering	2015-08-21 00:29:28 -07:00
Brad Davis	76f236adf6	New stereo rendering implementation	2015-08-21 00:29:24 -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
Ryan Huffman	5884fcb17b	Merge branch 'ordered-sending' into atp-server	2015-08-19 12:23:31 -07:00
Ryan Huffman	330a6bb279	Update TextureCache to work with ResourceCache updates	2015-08-19 12:17:36 -07:00
Ryan Huffman	e1f8b6700c	Update GeometryCache to work with ResourceCache updates	2015-08-19 12:17:19 -07:00
Howard Stearns	0a8c1846e9	This assert causes dev builds to fail when starting interface.	2015-08-19 10:24:31 -07:00
Andrew Meadows	9ee49c3e1e	Merge pull request #5551 from sethalves/quiet-compiler Quiet compiler	2015-08-18 09:54:29 -07:00
Seth Alves	1c8030472a	back out the more controversial changes	2015-08-17 12:40:56 -07:00
Christopher Root	21dc58eb85	Improving readability in shader	2015-08-15 14:40:34 -07:00
Christopher Root	8ea6048ec7	Removing commented out code	2015-08-15 14:31:03 -07:00
Christopher Root	81ea8e8874	Updating some comments and removing unnecessary code	2015-08-15 14:27:08 -07:00
Christopher Root	708190bfd6	horiz amb occl performance upgrades	2015-08-15 14:10:25 -07:00
Brad Davis	82310bb499	Attempting to fix rendering issues on 2015 Macs	2015-08-14 23:57:10 -07:00
Brad Davis	208e41efd1	WebEntity keyboard input with mouse hover	2015-08-14 16:18:38 -07:00
Brad Davis	0fa3044231	QML framerate improvments	2015-08-12 16:24:34 -07:00
Seth Alves	d6322903a2	quiet compiler	2015-08-11 10:12:46 -07:00
Brad Davis	19d31938d3	Merge remote-tracking branch 'upstream/master' into plugins	2015-08-10 21:25:35 -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	caf93d1aff	Merge branch 'master' into plugins Conflicts: interface/src/Application.cpp interface/src/Menu.h	2015-08-08 13:18:13 -07:00
Andrew Meadows	48c5a227a7	Merge pull request #5528 from ZappoMan/removeBrokenShadows remove shadow menu items	2015-08-07 16:09:00 -07:00
Bradley Austin Davis	cd6667303e	Merge remote-tracking branch 'upstream/master' into plugins	2015-08-07 15:32:33 -07:00
Brad Davis	64fcd2da96	Merge pull request #5530 from ZappoMan/RenderableModelEntityItemOptimization optimizations to RenderableModelEntityItem::render()	2015-08-07 15:32:07 -07:00
Bradley Austin Davis	fb2c84484e	Merge remote-tracking branch 'upstream/master' into plugins	2015-08-07 15:26:43 -07:00
Seth Alves	b1e69537f3	Merge pull request #5524 from howard-stearns/cleanup-jointstate Clean Up JointState	2015-08-07 13:50:02 -07:00
ZappoMan	f4c3c30f6a	quick optimization to RenderableModelEntityItem::render()	2015-08-07 12:49:48 -07:00
Howard Stearns	145b730f80	Clean up instantiation.	2015-08-07 12:27:26 -07:00
ZappoMan	87f609b9af	remove shadow menu items, left in the dead code for now, until we have a plan for replacing shadows	2015-08-07 11:26:07 -07:00
Sam Gateau	fdb370e798	cleaning th ecode	2015-08-07 10:59:56 -07:00
Sam Gateau	30900cb802	SImple fix to the case of multiple material in a mesh with different opacity	2015-08-07 10:59:55 -07:00
samcake	6864c7bcb4	Ready for release	2015-08-07 10:59:51 -07:00
Sam Gateau	0e3e0d05f1	Introducing the Normal fitting algorithm for better normal in the deferred buffer	2015-08-07 10:59:51 -07:00
ericrius1	3910cb0d69	Merge branch 'master' into polyLineInProgress	2015-08-07 10:12:02 -07:00
Sam Gateau	e4ce1002ea	cleaning th ecode	2015-08-06 18:54:58 -07:00
Sam Gateau	f0f141a2b4	SImple fix to the case of multiple material in a mesh with different opacity	2015-08-06 18:51:44 -07:00
Brad Hefta-Gaub	0947bf2cd0	Merge pull request #5517 from samcake/punk Improving the quality of the normal encoding in the Deferred Buffer	2015-08-06 15:13:08 -07:00
Sam Gateau	3c9eed6e01	merging	2015-08-06 11:38:50 -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
samcake	07a9dd3404	Ready for release	2015-08-05 17:41:23 -07:00
Sam Gateau	95682e6270	Introducing the Normal fitting algorithm for better normal in the deferred buffer	2015-08-05 17:17:00 -07:00
Atlante45	3dc8bd47ae	Fix warning and remove unused headers	2015-08-05 16:46:44 -07:00
Sam Gondelman	513c652ab3	merge from master and attempt to fix connexion conflicts	2015-08-05 12:42:39 -07:00
samcake	6783ec300a	Merge pull request #5499 from jherico/homer CORE PROFILE: Fix star point smoothing... sort of	2015-08-04 20:15:09 -07:00
Anthony J. Thibault	5d83976e2a	Added AnimBlendLinear + tests. MyAvatar now does a sine wave blend between a walk and a walk animation.	2015-08-04 18:14:50 -07:00
Anthony J. Thibault	559367db4a	Got to the bottom of the bind pose question. When TRUST_BIND_TRANSFORM is defined in AnimSkeleton, the bind pose is taken from the FBXJoint::bindTransform field, which is correct for all joints bound to actual geometry. Basically it's not trust worthy for bones NOT bound to anything. When TRUST_BIND_TRANSFORM is not defined, the bind pose is taken from the other FBXJoint fields. Unfortunatly these poses are NOT the bind pose, but instead are taken from the FBX files 'resting' pose. i.e. frame 0.	2015-08-04 18:14:49 -07:00
Anthony J. Thibault	d8a20340a0	Found and fix source of memory corruption. std::vector.reserve() and raw access do not mix. raw access will only work if you push_back elements onto the vector first. However this worked fine on MacOSX, probably due to differences in STL implementations. Some code clean up and some commented out debugging lines. Debug rendering of animaions of fight club model is not working. Not sure what frame these transformations are in.	2015-08-04 18:14:49 -07:00
Anthony J. Thibault	69cc270802	removed scale for fight club model	2015-08-04 18:14:48 -07:00
Anthony J. Thibault	55da34f713	Better debug rendering of animations. * added mat4 cast and mat4 ctors to AnimPose.	2015-08-04 18:14:48 -07:00
Anthony J. Thibault	df79463750	WIP, animNode rendering	2015-08-04 18:14:48 -07:00
Anthony J. Thibault	d1fdbe32d2	optimizations for debug rendering of AnimSkeleton	2015-08-04 18:14:47 -07:00
Anthony J. Thibault	b8bae7cc3f	Debug rendering of MyAvatar’s skeletonModel skeleton	2015-08-04 18:14:47 -07:00
Anthony J. Thibault	91ca13c66d	Added AnimDebugDraw to render-utils	2015-08-04 18:14:46 -07:00
Bradley Austin Davis	fc5ec22810	Fix diagonal slashes in text	2015-08-04 17:28:42 -07:00
Sam Gateau	730ad2da2f	removing dead code	2015-08-04 16:37:01 -07:00
Sam Gateau	d2360d1406	Merge branch 'core' of https://github.com/highfidelity/hifi into punk	2015-08-04 16:31:33 -07:00
Sam Gateau	fc0ee28b84	FIx the mirror rendering bugs by replacing the prvious technique by a simple true mirror during the final blit for both rear view mirror and full screen mirror, not working for HMD	2015-08-04 16:31:20 -07:00
Bradley Austin Davis	2221c839c3	Fix star point smoothing... sort of	2015-08-04 16:29:07 -07:00
Bradley Austin Davis	4f759ee46a	Merge remote-tracking branch 'upstream/master' into core	2015-08-04 16:26:16 -07:00
Seth Alves	9171033f21	Merge branch 'master' of github.com:highfidelity/hifi into rig	2015-08-04 16:06:38 -07:00
Bradley Austin Davis	c454bc96a0	Fix bug in lightmap and specular map fragment shaders	2015-08-04 14:36:42 -07:00
Bradley Austin Davis	89aa596717	Fix white rendering of many primitives	2015-08-04 14:05:05 -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	7593a134db	Moving oglplus to rely on glew on all platforms	2015-08-04 00:57:55 -07:00
Bradley Austin Davis	29c9e6e45e	Updating plugins to core profile	2015-08-04 00:33:03 -07:00
Bradley Austin Davis	53ccbfc4fa	Merge branch 'core' into plugins	2015-08-03 22:25:50 -07:00
Bradley Austin Davis	1a589160f4	Fixing the skinning shaders sizing problems	2015-08-03 18:44:51 -07:00
Ryan Huffman	027adf73bb	Merge branch 'master' of github.com:highfidelity/hifi into asset-server	2015-08-03 16:41:24 -07:00
Ryan Huffman	3a2ef35a3b	Update Geometry and Texture caches to use updated ResourceCache	2015-08-03 16:26:51 -07:00
Sam Gateau	44e7223547	Fixing the skinning by simply reverting the change to the format for the inSkinIndex	2015-08-03 16:05:04 -07:00
ericrius1	12770edbe1	Merge branch 'master' into polyLineInProgress	2015-08-03 15:52:26 -07:00
ericrius1	98a5d1e759	fixed merge conflics in hit effect	2015-08-03 11:25:18 -07:00
Andrew Meadows	b00d47d62e	merge master into cleanup of legacy shapes	2015-08-03 11:19:29 -07:00
samcake	d3fc05e99f	FIxed a few shaders varyings, problem identified on MAC to be solved	2015-08-03 11:18:08 -07:00
Andrew Meadows	acfc907704	Merge pull request #5438 from howard-stearns/rig Rig: Bottleneck animation management through a Rig class	2015-08-03 11:14:21 -07:00
ericrius1	f50c482451	Merge branch 'master' into polyLineInProgress	2015-08-03 08:46:01 -07:00
ericrius1	47bc8f50ab	cleaning	2015-08-03 08:45:14 -07:00
Brad Davis	5c07a7d85b	Merge remote-tracking branch 'upstream/master' into plugins	2015-08-01 21:58:05 -07:00
Brad Davis	53feaf2ab6	More shader fixes	2015-08-01 20:17:57 -07:00
Brad Davis	180f912924	Merge remote-tracking branch 'upstream/master' into core Conflicts: interface/src/ui/overlays/Circle3DOverlay.cpp libraries/gpu/src/gpu/Format.h libraries/render-utils/src/GeometryCache.cpp libraries/render-utils/src/Model.cpp libraries/render-utils/src/text/Font.cpp	2015-08-01 20:01:59 -07:00
ZappoMan	b02f751830	diff redux	2015-08-01 16:53:35 -07:00
ZappoMan	b138c16c7f	use Austins QUAD to TRIANGLE_STRIP approach	2015-08-01 16:50:36 -07:00
Brad Davis	b84eef93c9	Core profile shader work and test code	2015-08-01 14:43:52 -07:00
ZappoMan	05a4a6aa9b	implement on-the-fly conversion of FBXMeshParts that are quads, into their triangle equivalents	2015-08-01 13:07:56 -07:00
ZappoMan	452225ddaf	removed QUADS from Font::drawString()	2015-08-01 11:51:07 -07:00
ZappoMan	1dd6c1117d	change GeometryCache::renderQuad() to use TRIANGLES as lower level render primitive	2015-08-01 11:29:28 -07:00
Howard Stearns	0dad1adf7d	Speculative guard against crashing.	2015-07-31 18:05:14 -07:00
Sam Gateau	ca4dbdb996	Merging with upstream and compiling on windows	2015-07-31 16:14:53 -07:00
Brad Davis	aea07fe671	Merge branch 'master' into gl4_1 Conflicts: libraries/gpu/src/gpu/Config.slh libraries/render-utils/src/deferred_light_limited.slv libraries/render-utils/src/simple.slf libraries/render-utils/src/simple_textured.slf tests/render-utils/src/main.cpp tools/scribe/src/main.cpp	2015-07-31 15:08:37 -07:00
Andrew Meadows	661a916ebd	merge rig into cleanup (removal of legacy shapes) Conflicts: interface/src/avatar/Avatar.h tests/physics/src/ShapeColliderTests.cpp tests/physics/src/ShapeColliderTests.h	2015-07-31 13:40:51 -07:00
samcake	1dba28860a	Merge master	2015-07-31 10:29:51 -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	c1f777e18f	move setHandPosition from SkeletonModel to AvatarRig. Tell Rig::initJointStates joint-indexes for hands and elbows and shoulders	2015-07-30 18:39:01 -07:00
samcake	fbf21cb089	FIxed the problem on Mac, by removing all of the gpuConfig includesgit status q :q wq	2015-07-30 18:27:47 -07:00
Anthony J. Thibault	e52bf2e12d	Fix for head cauterization. When rendering rigidly bound mesh clusters were not properly using the cauterization matrix set.	2015-07-30 15:51:34 -07:00
Sam Gateau	14f4c9c6c0	REmove more of the unnecessary GLBacken .h and GPUCOnfig.h include, The gpu::Context is now completely agnostic of the True Backend	2015-07-30 15:07:36 -07:00
Anthony J. Thibault	7a10b31dd9	Clear translation on root joint. Also, delete/rename all instances of updateJointState except for the one in Rig and derived classes.	2015-07-30 15:04:27 -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
Howard Stearns	06aa107762	Merge branch 'master' of https://github.com/highfidelity/hifi into rig	2015-07-30 09:57:02 -07:00
Brad Hefta-Gaub	96fdb32edc	Merge pull request #5461 from venkatn93/avatar HBAO implementation	2015-07-30 08:46:55 -07:00
Brad Hefta-Gaub	b95e4e1e93	Merge pull request #5323 from MarcelEdward/20605 Removed the line where the directory is stripped off the RelativeFile	2015-07-30 07:30:01 -07:00
Niraj Venkat	291e0e21ae	HBAO final implementation	2015-07-29 18:47:27 -07:00
Sam Gateau	ab4b940d83	merge with upstream	2015-07-29 17:11:13 -07:00
Niraj Venkat	4f2630c561	Merge branch 'master' of https://github.com/highfidelity/hifi into avatar	2015-07-29 16:54:37 -07:00
Howard Stearns	d73f133daa	Merge branch 'master' of https://github.com/highfidelity/hifi into rig	2015-07-29 15:45:00 -07:00
Sam Gateau	8c96096a67	Merge branch 'master' of https://github.com/highfidelity/hifi into yellow	2015-07-29 14:04:20 -07:00
ericrius1	65e04337bf	removed synccache line	2015-07-29 11:15:20 -07:00
Niraj Venkat	d76cda396f	HBAO implementation ported from NVidia HLSL	2015-07-29 11:05:19 -07:00
Howard Stearns	a9f76324b5	Merge branch 'rig' of https://github.com/sethalves/hifi into sethalves-rig2	2015-07-29 10:49:27 -07:00
ericrius1	697cb4c9d0	fixed merge conflicts and refactored hit effect to catch up with refactored rendering engine	2015-07-29 10:02:06 -07:00
Andrew Meadows	2c66af67e9	Merge howard/rig into andrew/caesium	2015-07-29 09:04:32 -07:00
Andrew Meadows	0a5ada3c09	remove legacy shapes	2015-07-29 09:02:24 -07:00
Brad Davis	3fa7c7b516	Fixing GL window header	2015-07-28 23:22:28 -07:00
Brad Davis	e109bd42d2	Fixing cleanup of glwindow	2015-07-28 23:14:33 -07:00
Anthony J. Thibault	22d63b7697	Compilation fix for GLWindow	2015-07-28 18:10:59 -07:00
Andrew Meadows	77a12eb50e	compile on linux with GLEW	2015-07-28 17:53:01 -07:00
Anthony J. Thibault	b06485c266	Remove cauterize code from Rig and move it back into Model. * cauterize code is used as at render time and is not dependent on the jointStates. * MyAvatar now initialize the bone set used for cauterization and makes the decision to perform cauterization or not in preRender.	2015-07-28 17:45:33 -07:00
Brad Davis	8202862750	Working on display plugins stability	2015-07-28 16:22:22 -07:00
ericrius1	469bace7ca	removed unnessary computations from hit effect fragment shader	2015-07-28 15:15:34 -07:00
Howard Stearns	4754615159	Fix NPC animations.	2015-07-28 12:34:10 -07:00
Howard Stearns	e7516aab02	Merge branch 'master' of https://github.com/highfidelity/hifi into rig	2015-07-28 11:17:35 -07:00
Sam Gateau	22e70ee691	merged master	2015-07-28 10:13:05 -07:00
Brad Davis	a049b14d13	Merge remote-tracking branch 'upstream/master' into plugins	2015-07-28 10:04:19 -07:00
Sam Gateau	baf7873ce1	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2015-07-27 17:40:19 -07:00
Seth Alves	6e5aca6da4	merge from upstream	2015-07-27 16:52:36 -07:00
Seth Alves	5ae15d46b4	add some javascript callable stuff back to MyAvatar	2015-07-27 16:42:54 -07:00
Howard Stearns	1bb734aec0	Kill warnings.	2015-07-27 15:26:03 -07:00
Sam Gateau	a5ad40bee9	INtroduce the resetStage command to clear up all cache and state in the gpu::Conference and make sure no more resource are linked	2015-07-27 14:07:28 -07:00
Howard Stearns	ef52c0703f	Merge pull request #8 from AndrewMeadows/cadmium remove unused legacy Shapes from Model and friends	2015-07-27 13:20:41 -07:00
Howard Stearns	990f0d6d07	Pass correct position/velocity/orientation to Rig simulation.	2015-07-27 12:57:39 -07:00
Niraj Venkat	d2ee74f7c7	Shader code indentation	2015-07-27 12:20:41 -07:00
Niraj Venkat	1193b89918	Coding standard and tab fixes	2015-07-27 12:14:29 -07:00
Niraj Venkat	92595583ec	Coding standard and building	2015-07-27 11:55:17 -07:00
Andrew Meadows	73ac941230	remove unused legacy Shapes from Model and friends	2015-07-27 11:15:33 -07:00
Howard Stearns	dac6667ee6	Start of state.	2015-07-27 09:21:24 -07:00
Howard Stearns	1ec0518d05	Merge branch 'master' of https://github.com/highfidelity/hifi into rig	2015-07-27 09:20:30 -07:00
Niraj Venkat	83e0856279	Merge branch 'master' of https://github.com/highfidelity/hifi into avatar	2015-07-27 09:20:19 -07:00
Bradley Austin Davis	0cbc12af8b	Merge remote-tracking branch 'upstream/master' into plugins	2015-07-27 10:15:10 -04:00
Bradley Austin Davis	7be33dcb58	Limit the amount of time consumed by rendering QML	2015-07-25 11:40:58 -04:00
Niraj Venkat	6bc3d65bf4	Fixing build errors	2015-07-24 16:16:18 -07:00
Niraj Venkat	5dd16d9f80	Blend function applied to reduce one FBO	2015-07-24 16:07:30 -07:00
Howard Stearns	1663d095a1	Merge branch 'master' of https://github.com/highfidelity/hifi into rig	2015-07-24 14:08:51 -07:00
Niraj Venkat	fc612ab8cd	Merge conflict fix	2015-07-24 11:29:52 -07:00
Niraj Venkat	e036602726	Fixing merge conflicts	2015-07-24 11:08:40 -07:00
Howard Stearns	f9f8b0ffc1	Merge branch 'rig' of https://github.com/howard-stearns/hifi into rig	2015-07-24 10:40:19 -07:00
Bradley Austin Davis	a60e669d3d	Merge branch 'master' into plugins	2015-07-24 13:38:18 -04:00
Andrew Meadows	1bf49d72f1	Merge branch 'rig' of github.com:howard-stearns/hifi into bromine Conflicts: interface/src/avatar/SkeletonModel.cpp	2015-07-24 10:06:02 -07:00
samcake	52ac5b3ef6	On mac cannot get ther erendering to properly display the overlay if the rear view mirror is active on resize	2015-07-24 03:38:21 -07:00
Sam Gateau	cb375e8ece	FIund a nasty bug with the scissor which was the reason for many issues, tried to integrate the framebuffer setup and clear as part of the enginepipeline so calling display side is simpler	2015-07-24 02:15:50 -07:00
Sam Gateau	66cd17ec66	REmove the crappy solution for drawing transparent texture into overlay by a proper shader	2015-07-23 23:09:40 -07:00
Niraj Venkat	216c499d14	HAO (Horrendous Ambient Occlusion)	2015-07-23 18:53:43 -07:00
Sam Gateau	a002560003	Merge branch 'master' of https://github.com/highfidelity/hifi into yellow	2015-07-23 16:32:00 -07:00
Howard Stearns	05fae0e977	Merge branch 'master' of https://github.com/highfidelity/hifi into rig	2015-07-23 16:12:42 -07:00
ZappoMan	8007fba909	add type to shader include	2015-07-23 15:37:56 -07:00
Andrew Meadows	f40feba36d	Merge remote-tracking branch 'andrew/boron' into bromine Conflicts: interface/src/avatar/Hand.cpp interface/src/avatar/Hand.h interface/src/avatar/SkeletonModel.cpp	2015-07-23 15:29:53 -07:00
Seth Alves	1e19e46aa6	Merge branch 'master' of github.com:highfidelity/hifi into rig	2015-07-23 15:14:19 -07:00
Seth Alves	33c97a1833	get rid of _firstPersonSkeletonModel in MyAvatar. add flag in Rig for joints being dirty so Model knows when to recompute meshes	2015-07-23 15:14:10 -07:00
Bradley Austin Davis	901dd77f05	Merge remote-tracking branch 'upstream/master' into plugins	2015-07-23 18:11:25 -04:00
Sam Gateau	dc10f30d3d	Merged	2015-07-23 15:10:42 -07:00
ZappoMan	e6262de864	CR feedback	2015-07-23 14:56:52 -07:00
Sam Gateau	a561874ce3	Render the rear view mirror in a separate target and then display it during overlay pass	2015-07-23 14:56:14 -07:00
ZappoMan	1177ffd439	more hacking	2015-07-23 14:12:52 -07:00
ZappoMan	96e83e3ed4	remove gl_FrontMaterial	2015-07-23 14:11:28 -07:00
ZappoMan	9496b6c024	more hacking	2015-07-23 13:56:59 -07:00
ZappoMan	5774af0856	more hacking	2015-07-23 13:38:08 -07:00
ZappoMan	a0666d5e99	testing windows render bug	2015-07-23 13:17:12 -07:00
Seth Alves	4566d16402	move Model's AnimationHandles to Rig. Move a bunch of Model methods from public to protected	2015-07-23 13:03:38 -07:00
ZappoMan	91d317f964	testing windows render bug	2015-07-23 12:42:55 -07:00
samcake	fecb0e3675	Merge pull request #5398 from ZappoMan/removeTextureRescale remove rescaling of textures	2015-07-23 11:22:38 -07:00
samcake	805e7326e0	Merge pull request #5396 from ZappoMan/deadCodeRemoval remove non-batch versions of GeometryCache renderXYZ() methods	2015-07-23 11:11:35 -07:00
Bradley Austin Davis	1db4162371	Merge branch 'master' into plugins	2015-07-23 13:42:03 -04:00
Niraj Venkat	9ccf316513	Merge branch 'master' of https://github.com/highfidelity/hifi into avatar	2015-07-23 10:36:46 -07:00
Bradley Austin Davis	f19800f0de	Don't overwrite the normals buffer when copying the resolved lighting back to the primary FBO	2015-07-23 12:37:58 -04:00
ZappoMan	06b6c49b9a	remove rescaling of textures	2015-07-23 08:56:59 -07:00
Andrew Meadows	6657026a12	remove cruft: legacy shapes for skeleton bones	2015-07-23 08:34:44 -07:00
ZappoMan	c2113ea96b	remove non-batch versions of GeometryCache renderXYZ() methods	2015-07-23 07:42:58 -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
Seth Alves	47965bc39c	merge from upstream	2015-07-22 13:48:19 -07:00
Seth Alves	7c8d52cbd1	back out some changes to Model.cpp, change how rig pointer is delivered to model initilizer	2015-07-22 13:41:31 -07:00
Marcel Verhagen	8f0893ba21	Added fileOnUrl to check if a texture exist at the location. It return the correct filename of where the texture lives. Added the url of the fix file to extractFBXGeometry and readFBX and updated the calls to readFBX to include the url of the fix file. So it now does not break existing content. Found a second place in the FBXReader.cpp where the RelativeFileName stripped out the dir location.	2015-07-22 22:34:45 +02:00
Howard Stearns	a6395a2351	Merge branch 'master' of https://github.com/highfidelity/hifi into rig	2015-07-22 12:29:27 -07:00
Howard Stearns	dbb4a8b767	Merge branch 'master' of https://github.com/highfidelity/hifi into rig	2015-07-22 11:40:25 -07:00
Sam Gateau	f70553ec95	Fixing merge	2015-07-22 11:31:46 -07:00
Sam Gateau	837ff45763	Removing code aroung the selfie fremebuffer	2015-07-22 10:57:08 -07:00
Sam Gateau	7ac2030862	Preparing for first pr	2015-07-22 10:43:50 -07:00
Niraj Venkat	adf7a1098d	Merge branch 'master' of https://github.com/highfidelity/hifi into avatar	2015-07-22 10:27:39 -07:00
Bradley Austin Davis	408bb082d7	Merge fixes, OSX compile fixes	2015-07-22 13:24:47 -04:00
Bradley Austin Davis	114ab9e47f	Merge branch 'master' into plugins	2015-07-22 11:47:56 -04:00
Bradley Austin Davis	2f13488f11	Fixing FBO bug on resizing windows	2015-07-22 11:28:36 -04:00
Bradley Austin Davis	65732d874c	Merge branch 'maggie' into marge	2015-07-22 09:07:50 -04:00
Bradley Austin Davis	9596452c32	Trying to fix oculus rendering	2015-07-22 08:07:44 -04:00
Bradley Austin Davis	d6994c6dfd	Restoring star size and color variation	2015-07-21 19:22:10 -04:00
Niraj Venkat	e0634de403	Turn on/off debug AO from menu item	2015-07-21 12:14:09 -07:00
Seth Alves	fecdc08720	merge from upstream	2015-07-21 09:53:51 -07:00
Seth Alves	cdc26526b4	merge from upstream	2015-07-21 09:51:16 -07:00
Bradley Austin Davis	fda1cb6f7b	Merge remote-tracking branch 'upstream/master' into marge	2015-07-21 08:59:29 -07:00
Brad Davis	9016f437a8	Merge pull request #5371 from Atlante45/smart_pointers Smart pointers fixes	2015-07-21 08:52:29 -07:00
Brad Davis	6d4c7cd4f2	Merge pull request #5374 from ZappoMan/warningFixes Warning fixes and removing dead code	2015-07-21 07:23:40 -07:00
Brad Davis	5744200f64	Merge remote-tracking branch 'upstream/master' into plugins Conflicts: interface/CMakeLists.txt interface/src/Application.cpp interface/src/Application.h interface/src/avatar/MyAvatar.h	2015-07-20 19:21:02 -07:00
Seth Alves	abfe60aa20	whenever Model class uses _jointState, use the Rig version if there is a Rig.	2015-07-20 18:31:42 -07:00
Brad Davis	c3a2b72c13	Breaking framebuffer ops out of texture cache	2015-07-20 17:26:26 -07:00
Niraj Venkat	075c9f05de	Introducing blend stage in the AO pipeline	2015-07-20 16:34:02 -07:00
Sam Gateau	b5090883a0	merge with latest network pr	2015-07-20 15:49:10 -07:00
Sam Gateau	59666f664a	merging my changes to remove cruff from application to AUstin;s latest	2015-07-20 15:37:17 -07:00
ericrius1	9fc54a6040	getting closer to texturing properly	2015-07-20 15:33:21 -07:00
ZappoMan	648d0f6d43	fix a bunch of warnings	2015-07-20 15:12:27 -07:00
Niraj Venkat	eaf75c01b9	Merge branch 'master' of https://github.com/highfidelity/hifi into avatar Conflicts: libraries/render-utils/src/AmbientOcclusionEffect.cpp libraries/render-utils/src/AmbientOcclusionEffect.h	2015-07-20 14:55:27 -07:00
Niraj Venkat	85c9ee0feb	Merge branch 'master' of https://github.com/highfidelity/hifi into avatar Conflicts: libraries/render-utils/src/AmbientOcclusionEffect.cpp	2015-07-20 14:53:19 -07:00
Atlante45	8d6ff2d9f9	Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers	2015-07-20 14:50:44 -07:00
ZappoMan	d41d86c33c	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-07-20 14:31:58 -07:00
Andrew Meadows	7578a70c4c	Merge pull request #5359 from birarda/protocol Network Protocol Refactor	2015-07-20 14:30:58 -07:00
Brad Davis	9fafc920ee	Merge branch 'homer' into plugins Conflicts: interface/src/Application.cpp libraries/render-utils/src/AmbientOcclusionEffect.cpp	2015-07-20 13:53:15 -07:00
Atlante45	59acfc9f47	Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers	2015-07-20 13:51:51 -07:00
Brad Davis	359abd6474	Merge branch 'master' into plugins Conflicts: interface/CMakeLists.txt interface/src/Application.cpp interface/src/Application.h interface/src/GLCanvas.cpp interface/src/GLCanvas.h interface/src/devices/OculusManager.cpp interface/src/devices/OculusManager.h interface/src/devices/TV3DManager.cpp interface/src/ui/overlays/LocalModelsOverlay.cpp libraries/render-utils/src/OffscreenGlCanvas.cpp libraries/render-utils/src/OffscreenGlCanvas.h libraries/render-utils/src/text/EffectType.h	2015-07-20 13:33:24 -07:00
Stephen Birarda	0177513285	resolve conflicts on merge with upstream/master	2015-07-20 12:29:38 -07:00
Sam Gateau	1a9f6e12a5	something not compiling but just before merge with upstream	2015-07-20 12:20:04 -07:00
Brad Davis	3d09e772f9	Merge branch 'marge' into homer	2015-07-20 12:09:51 -07:00
ericrius1	dcb2012070	can toggle hit effect on and off from a script	2015-07-20 12:02:01 -07:00
ericrius1	e75a6feafe	can toggle hit effect on and off from a script	2015-07-20 11:58:26 -07:00
Brad Davis	23b058e4eb	Removing starfield tilt and reducing grid alpha	2015-07-20 11:40:12 -07:00
ericrius1	3439d45e0e	adding hit effect logic	2015-07-20 11:02:15 -07:00
Brad Davis	dcaaeec593	Removing AO effect (temporarily) and wireframe mode	2015-07-20 10:55:11 -07:00
ericrius1	1e34de1c51	adding in screen space effect for getting hit	2015-07-20 10:44:38 -07:00
Atlante45	fc2956342e	Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers	2015-07-20 10:39:16 -07:00
Brad Davis	cd677ccb18	Removing animation from star grid	2015-07-20 10:18:14 -07:00
Seth Alves	9af104f745	Merge branch 'master' of github.com:highfidelity/hifi into rig	2015-07-20 09:47:23 -07:00
Stephen Birarda	6b11495a20	resolve conflicts on merge with upstream master	2015-07-20 08:51:48 -07:00
Brad Davis	4c3cfe1e82	Starfield jazz hands	2015-07-19 20:53:50 -07:00
Brad Davis	35f7307f30	More header cleanup	2015-07-18 22:15:50 -07:00
Bradley Austin Davis	5e0a0409bf	Removing setupWorldLight from viewstateinterface	2015-07-18 12:16:51 -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	1c965736e8	Remove merge error	2015-07-17 18:15:11 -07:00
Atlante45	052c3c987b	Fix some more smart pointer	2015-07-17 18:10:34 -07:00
Atlante45	256c786e28	Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers	2015-07-17 17:59:19 -07:00
ZappoMan	816fd41624	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-07-17 17:10:52 -07:00
Brad Hefta-Gaub	2423d25839	Merge pull request #5355 from ctrlaltdavid/20620 QA for #20620 - Make renderGrid handle changing position and dimensions	2015-07-17 17:10:43 -07:00
ZappoMan	9c52f28ff4	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-07-17 17:05:13 -07:00
Stephen Birarda	f8c832e50b	resolve conflicts on merge with upstream master	2015-07-17 16:48:46 -07:00
ZappoMan	26e8090ec1	Merge branch 'master' of https://github.com/highfidelity/hifi into removeNakeGL	2015-07-17 16:48:42 -07:00
Niraj Venkat	0580c8477e	3-step groundwork for AO in the pipeline	2015-07-17 16:42:03 -07:00
ericrius1	a44e5f949c	Merge branch 'master' into polyLineInProgress	2015-07-17 15:01:40 -07:00
Seth Alves	d287817829	give SkeletonModel created by MyAvatar a Rig pointer	2015-07-17 14:52:37 -07:00
Seth Alves	bcd6b30ec3	move AnimationHandle from render-utils to animation. give Rig some jointstates and animation lists	2015-07-17 13:31:48 -07:00
Brad Davis	ea74aac1d6	Working on cleaning up diff	2015-07-17 11:02:32 -07:00
ZappoMan	efa2001325	Merge branch 'master' of https://github.com/highfidelity/hifi into removeNakeGL	2015-07-17 09:25:37 -07:00
David Rowe	c46533d9a6	Make renderGrid handle changing position and dimensions So that audio scope grid moves when Interface window is resized.	2015-07-16 21:05:14 -07:00
Brad Davis	ae10d58142	Fixing font class	2015-07-16 16:42:29 -07:00
Brad Davis	ae882c8347	Merge remote-tracking branch 'upstream/master' into plugins Conflicts: interface/src/Application.cpp interface/src/Application.h interface/src/Menu.cpp interface/src/Menu.h interface/src/avatar/SkeletonModel.cpp interface/src/devices/OculusManager.cpp interface/src/devices/TV3DManager.cpp interface/src/ui/ApplicationCompositor.cpp interface/src/ui/overlays/LocalModelsOverlay.cpp	2015-07-16 16:37:55 -07:00
ZappoMan	398075e45a	hacking on more naked GL	2015-07-16 16:26:28 -07:00
Stephen Birarda	6d7b659dff	remove the environment data process from header	2015-07-16 16:24:26 -07:00
Stephen Birarda	eb0ed438ec	remove environment data packet	2015-07-16 16:23:57 -07:00
Brad Davis	89faf85ad9	Working on text rendering overlays	2015-07-16 15:56:01 -07:00
Stephen Birarda	61f23f6a5e	Merge branch 'master' of https://github.com/highfidelity/hifi into atp	2015-07-16 11:56:26 -07:00
Niraj Venkat	022529f03f	Render depth buffer to quad Useful for graphics debugging	2015-07-16 09:46:28 -07:00
samcake	b7ac84e174	Merge pull request #5342 from ZappoMan/removeNakeGL remove some more dead code and naked gl	2015-07-15 17:07:55 -07:00
Stephen Birarda	05dde9d8f5	resolve conflicts on merge with upstream/master	2015-07-15 16:18:47 -07:00
Sam Gateau	9657d146f7	Clearing Model.cpp from naked gl call references	2015-07-15 16:09:53 -07:00
ZappoMan	d1e511efcb	more naked gl cleanup, deleting dead code, tweaking comments so they don't give false positives in searching for more naked gl	2015-07-15 15:52:12 -07:00
ZappoMan	2ad2c4d554	remove some dead code	2015-07-15 15:33:28 -07:00
ZappoMan	293ccc1713	remove some dead code	2015-07-15 15:32:02 -07:00
samcake	de7aed1abc	Merge pull request #5338 from ZappoMan/removeGlowEffect Remove the glow effect.	2015-07-15 14:50:15 -07:00
Niraj Venkat	0ee916fb6f	Merge branch 'master' of https://github.com/highfidelity/hifi into avatar	2015-07-15 14:10:42 -07:00
Niraj Venkat	1b13f837bd	Porting AO to new pipeline	2015-07-15 14:10:17 -07:00
ZappoMan	c17794849d	more GlowEctomy	2015-07-15 12:58:15 -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
Ryan Huffman	44c99ef89a	Replace bytesAvailable with bytesLefToRead	2015-07-15 10:44:51 -07:00
samcake	9df26c8488	removing naked glViewport from DeferredLightingEffect by adding the current viewport in renderArgs	2015-07-15 00:24:43 -07:00
samcake	a6148ab73d	Remove naked gl call	2015-07-14 22:59:55 -07:00
ZappoMan	47dad82d50	removed dead code	2015-07-14 18:09:58 -07:00
ZappoMan	d19c7125da	remove naked gl calls	2015-07-14 16:49:43 -07:00
Atlante45	fbb6a94579	Merge branch 'receive_packets' of https://github.com/huffman/hifi into protocol	2015-07-14 16:36:28 -07:00
Atlante45	bbb00b9d3a	Merge branch 'protocol' of https://github.com/birarda/hifi into protocol	2015-07-14 14:11:41 -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
Brad Davis	f8144e4ee2	Merge branch 'master' into plugins	2015-07-13 19:52:53 -07:00
David Rowe	2bab7d1c03	Add parentheses	2015-07-13 16:38:51 -07:00
Sam Gateau	5555ccd225	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2015-07-13 16:19:09 -07:00
Sam Gateau	4743bbad80	Adding shaders to the lib for rendering simple textured quad and solve the ImageOverlay issue for edit.js	2015-07-13 16:18:39 -07:00
Clément Brisset	24eb4c8263	Merge pull request #5309 from sethalves/quiet-compiler quiet compiler	2015-07-13 15:55:35 -07:00
Atlante45	c80df94b06	Update includes for moved files	2015-07-13 15:28:55 -07:00
Stephen Birarda	d990420565	repairs to octree packet receiving in interface	2015-07-13 13:10:57 -07:00
Brad Davis	9eb15d3d55	Merge remote-tracking branch 'upstream/master' into plugins Conflicts: interface/src/Application.cpp interface/src/GLCanvas.cpp interface/src/devices/OculusManager.cpp interface/src/devices/OculusManager.h libraries/render-utils/src/DeferredLightingEffect.cpp	2015-07-13 12:54:19 -07:00
ericrius1	0ce6737b34	merged and normals flipping	2015-07-13 09:43:15 -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
Seth Alves	fb23eb0faf	Merge pull request #5301 from samcake/yellow Rename gpu::Batch::setUniformTexture into gpu::Batch::setResourceTexture	2015-07-12 11:36:03 -07:00
Seth Alves	c17c9f1818	quiet compiler	2015-07-12 10:29:43 -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	c11864acf3	Merge branch 'master' of https://github.com/highfidelity/hifi into clear_cache_and_restart	2015-07-10 15:57:40 -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
Atlante45	5cfa1605df	Made Texture safe with resource refresh	2015-07-10 12:28:06 -07:00
Atlante45	6c591131ba	Made Animations safe for resource reload	2015-07-10 12:01:51 -07:00
Sam Gateau	6c04e6d382	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2015-07-10 11:59:31 -07:00
samcake	014802fd45	Merge pull request #5277 from venkatn93/gpuquery GPU Query infrastructure	2015-07-10 11:59:08 -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
Brad Davis	6c5d7b8789	Performance optimizations in transform buffers and geometry cache	2015-07-09 17:53:26 -07:00
Sam Gateau	11f2d74030	Simple cleaning to remove dependancies on the viewStateInterface in the deferredLightingEffect	2015-07-09 17:33:25 -07:00
Brad Hefta-Gaub	f0a1bc15a9	Merge pull request #5286 from samcake/daft Migrating the rendering openGL calls from DeferredLightingEffect to gpu::Batch	2015-07-09 15:23:45 -07:00
Sam Gateau	8c178d03df	Merge branch 'master' of https://github.com/highfidelity/hifi into daft	2015-07-09 15:16:52 -07:00
samcake	1f13106f51	FIxed the issue on mac due to the abs function not correctly executing	2015-07-09 15:05:03 -07:00
Brad Davis	06563264e2	Improve batched font rendering smoothing	2015-07-09 14:34:33 -07:00
Sam Gateau	2968286779	Merge branch 'master' of https://github.com/highfidelity/hifi into daft	2015-07-09 11:19:45 -07:00
Sam Gateau	110b009aa4	Less magic in this world	2015-07-09 09:55:25 -07:00
Sam Gateau	8f4a108441	Dead code and disable debug info	2015-07-09 09:37:35 -07:00
Sam Gateau	fb37af3e04	Removing dead code	2015-07-09 09:25:07 -07:00
Sam Gateau	e901d5cad0	Uncommented a block left behind...	2015-07-09 09:21:53 -07:00
Brad Hefta-Gaub	fb07956689	Merge pull request #5284 from hyperlogic/ajt/mirror-view-fix fix for mirror rendering on windows	2015-07-09 08:38:55 -07:00
Sam Gateau	6b229d8d2d	Merge branch 'master' of https://github.com/highfidelity/hifi into daft	2015-07-09 03:45:55 -07:00
Sam Gateau	8314fe8c7f	FInally getting a nice spot light volume working for all angles	2015-07-09 03:45:19 -07:00
Anthony J. Thibault	1be0e7ebc3	fix for mirror rendering on windows * added preScale to Transform class. * preScale by -1 about the xAxis instead of post scale. I think this was working on Mac due to the different code paths in GLBackendTransform::updateTransform for core vs legacy gl profile.	2015-07-08 21:33:27 -07:00
Niraj Venkat	1894b42773	Added EXT support for Mac GL Query calls	2015-07-08 16:11: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
Niraj Venkat	7e59be6196	First take oon the query for the gpu	2015-07-08 10:00:58 -07:00
Brad Davis	a04921e74b	Merge branch 'master' into plugins	2015-07-07 11:10:51 -07:00
samcake	5557dc4da2	clean and release the new deferredLIghtingEffect	2015-07-07 10:00:05 -07:00
Atlante45	541d9ae431	Merge branch 'master' of https://github.com/highfidelity/hifi into fix_billboard	2015-07-06 18:05:43 -07:00
Brad Davis	95000eec3c	Merge remote-tracking branch 'upstream/master' into plugins Conflicts: interface/src/ui/overlays/LocalModelsOverlay.cpp	2015-07-06 16:22:03 -07:00
Sam Gateau	fe633cd545	Merge branch 'master' of https://github.com/highfidelity/hifi into yellow	2015-07-06 15:04:02 -07:00
samcake	a2f6693bd7	getting the deferred lighting to work	2015-07-06 14:40:10 -07:00
samcake	76e661f88d	Merge branch 'master' of https://github.com/highfidelity/hifi into daft	2015-07-05 12:08:56 -07:00
Atlante45	0093403bba	Add depth bias option to simple programs Simple programs are now lazily generated and stored in a hash	2015-07-04 18:33:03 -07:00
samcake	84b70fbaca	Mergin yellow with the Status bar rendering into Daft cwith the switch to batch for deferred pass	2015-07-03 11:36:19 -07:00
ZappoMan	29a7584ee6	remove dead code	2015-07-03 11:29:59 -07:00
Brad Davis	b529901b1a	Attempting to protect against infinite recursion	2015-07-03 07:09:57 -07:00
Brad Davis	2a1776303d	Merge remote-tracking branch 'upstream/master' into plugins Conflicts: interface/src/Application.cpp interface/src/avatar/SkeletonModel.cpp interface/src/devices/OculusManager.cpp interface/src/devices/TV3DManager.cpp	2015-07-03 06:17:35 -07:00
Bradley Austin Davis	0034a14fc1	Working on mac functionality	2015-07-02 18:14:12 -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
Brad Hefta-Gaub	2a03f62bf2	Merge pull request #5232 from sethalves/actions-over-wire-and-sim-ownership Actions over wire and improved simulation ownership	2015-07-02 14:57:27 -07:00
ericrius1	c4b780d922	added accessors for deferred lighting shaders	2015-07-02 11:14:06 -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
Atlante45	7b5a5a339a	Use make_shared/create to make shared pointers	2015-07-01 19:46:06 -07:00
Sam Gateau	e8b11f1198	Exposing the display Item Status to js to turn it on/off	2015-07-01 17:27:41 -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
Sam Gateau	20cb519c14	first draft at using the status of the item for representing stats and current data about it in the DrawStatus phase	2015-06-30 08:19:00 -07:00
Brad Davis	196a92c1b4	A little bit of display plugin API cleanup	2015-06-29 10:55:13 -07:00
ericrius1	cf720f9e2e	merged master	2015-06-29 09:27:40 -07:00
samcake	fefe34e558	Merge branch 'master' of https://github.com/highfidelity/hifi into daft	2015-06-27 06:48:55 -07:00
samcake	1b69b38835	fix shader issue on mac	2015-06-27 06:34:58 -07:00
Seth Alves	5ecc39b811	Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire	2015-06-26 20:06:10 -07:00
Brad Davis	5ce79d6800	Merge remote-tracking branch 'upstream/master' into plugins	2015-06-26 17:14:45 -07:00
Brad Davis	4417c00ae4	Merge remote-tracking branch 'upstream/master' into plugins Conflicts: interface/src/Application.h interface/src/Menu.h	2015-06-26 17:02:16 -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
Atlante45	efd805bea7	Introduce new emissive simple program Also fixes the shading on web entities using that program	2015-06-26 16:17:41 -07:00
Sam Gateau	51eab1bd39	Merge branch 'master' of https://github.com/highfidelity/hifi into daft	2015-06-26 15:45:47 -07:00
Sam Gateau	c41ebcae78	Covering all the case for rendering the light passes	2015-06-26 15:40:08 -07:00
ericrius1	0a7c787109	created a custom pipeline that is a static class variable for renderable quad entity item	2015-06-26 13:44:54 -07:00
Stephen Birarda	c6df573933	fix some OS X warnings, add description to tooltip	2015-06-26 10:50:31 -07:00
Brad Davis	230cafe21b	GL 4	2015-06-25 18:52:34 -07:00
Brad Davis	1d79e42dbb	Merge branch 'master' into gl4_1	2015-06-25 17:46:24 -07:00
Seth Alves	7c26641560	Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire	2015-06-25 17:40:27 -07:00
Anthony J. Thibault	3853395298	Bug fixes for switching between head/body and full body avatars The head model visibility is now updated in preRender() Moved the near clip plane in a bit more Invalidate head bone vector on LOD switching. Removed _currentSkeletonModel pointer, instead use _prevShouldDrawHead to detect when we should flip the visibility bit.	2015-06-24 16:10:47 -07:00
Anthony J. Thibault	99a03bac21	Render a different model when in first person view. Currently this model is identical to the third person model, except that the head bones have been 'cauterized' by applying a zero scale transform. This allows us to set the near clip back to a reasonable value.	2015-06-24 16:10:47 -07:00
Clément Brisset	6db4184748	Merge pull request #5171 from huffman/fix-edit-rotate Fix edit.js rotation display	2015-06-24 15:35:15 -07:00
Brad Davis	8f8bda327c	Merge remote-tracking branch 'upstream/master' into plugins Conflicts: interface/src/Application.cpp interface/src/devices/OculusManager.cpp interface/src/devices/OculusManager.h	2015-06-23 16:54:32 -07:00
Brad Davis	d4b9a739f5	Still working on GL update	2015-06-23 09:49:10 -07:00
Brad Davis	fbf3a0cbe6	Working on GL 4	2015-06-23 09:48:16 -07:00
Bradley Austin Davis	0000b5a8c8	Working on GL 4.1 core	2015-06-23 09:48:15 -07:00
Brad Davis	f51c43f90d	Working on GL 4.1	2015-06-23 09:47:18 -07:00
Sam Gateau	2fb4ed06c0	Merge branch 'master' of https://github.com/highfidelity/hifi into daft	2015-06-23 10:18:56 +02:00
Seth Alves	20f173a474	Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire	2015-06-22 19:36:09 -07:00
Brad Hefta-Gaub	a3e1987078	Merge pull request #5176 from huffman/fix-raypicking-crash DO NOT MERGE - Fix recalculateMeshBoxes being called outside of mutex	2015-06-22 19:03:31 -07:00
Seth Alves	f75506bf1b	Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire	2015-06-22 15:37:10 -07:00
Brad Davis	9f98547390	Merge branch 'master' into plugins	2015-06-22 13:35:40 -07:00
Sam Gateau	9994cb7540	Merge branch 'master' of https://github.com/highfidelity/hifi into daft	2015-06-22 20:00:48 +02:00
Brad Davis	1b44c220a7	Prep work for procedural stars & stuff	2015-06-22 09:43:12 -07:00
Seth Alves	f284e9d070	quiet compiler	2015-06-22 07:18:30 -07:00
Sam Gateau	f7ca1f608f	Migrating the deferred lighting effect to Batch and in doing so, introducing the StandardShaderLib to gpu and the first 2 shaders	2015-06-22 14:06:14 +02:00
Ryan Huffman	1371f775ee	Add mutex lock around access to Model::_calculatedMeshPartOffset	2015-06-19 16:51:13 -07:00
Ryan Huffman	a7f291154b	Add lock around recalculateMeshPartOffsets call	2015-06-19 16:28:58 -07:00
Seth Alves	5381e6e9bb	entity server has its own version of actions which simply remember the encoded arguments. Entities with actions don't experience simulateKinematicMotion	2015-06-19 16:20:07 -07:00
Ryan Huffman	1734d5e584	Fix recalculateMeshBoxes being called outside of mutex	2015-06-19 15:05:55 -07:00

... 12 13 14 15 16 ...

2096 commits