Commit Graph

585 Commits (98dfd7ddd2083c380aabbb686ca99dfd3bf033e9)

Author SHA1 Message Date
prep dc6b871db8 merge 2012-01-19 14:39:06 -05:00
prep e2ef5a5edc Path-196 : vbo cleanup, visual fixes (path-222) 2012-01-19 14:38:16 -05:00
Todd Stinson 8cf6b9cb92 Pull and merge from https://bitbucket.org/lindenlab/viewer-development. 2012-01-17 10:19:27 -08:00
prep b2c024cd79 Some gl state cleanup for physic shapes vbos.' 2012-01-05 18:00:41 -05:00
prep 1e45d1ae4c vbos for physics shapes are rendering correctly 2012-01-05 17:43:36 -05:00
prep e31a0a7f08 Remove already enabled depth test 2012-01-05 17:10:13 -05:00
prep 22b877e70a WIP: Navmesh vbos rendering fixes (added normal and color maps). 2012-01-05 17:02:22 -05:00
prep e2fd0266ca path-149 overlay of navmesh on onto renderables 2012-01-05 10:20:18 -05:00
Brad Payne (Vir Linden) a3e30250e8 merge 2012-01-04 09:59:57 -05:00
Todd Stinson 3fd7752f12 Pull and merge from https://bitbucket.org/lindenlab/viewer-development. 2012-01-03 10:38:06 -08:00
prep e9058099d0 Allow for the overlaying of an unblended navmesh ontop of the scenes normal renderables 2011-12-20 12:57:32 -05:00
Alissa Sabre a94a923240 storm-1723: fix character display when a lot of different characters are used 2011-12-15 15:19:50 -05:00
Dave Parks 9fa68f0da3 SH-2743 Fix for shader compiler error on some GL 3.x implementations. 2011-12-14 17:55:36 -06:00
prep 35b6450d10 Enabled fix function when in navmesh rendering mode 2011-12-14 15:38:15 -05:00
Todd Stinson 28b298c4c7 Pull and merge from ssh://hg@bitbucket.org/prep/viewer-development-havokai. 2011-12-14 11:34:20 -08:00
prep 6c9b332867 Make shapes a little bit transparent 2011-12-14 11:59:36 -05:00
prep 10599b5e8c merge 2011-12-14 11:25:30 -05:00
prep 9fd7475e5c merge 2011-12-14 11:19:20 -05:00
prep b022048f87 Cleanup 2011-12-14 11:13:55 -05:00
prep 6fd6815dac WIP: VBO fixes - still an issue where the physics shape inherit the navmehs color. 2011-12-13 18:13:23 -05:00
Dave Parks 2dc7df91ad SH-2743 Fix for shader compiler error on some GL 3.x implementations. 2011-12-13 15:23:55 -06:00
Todd Stinson 9d1db4f19a Pull and merge from https://bitbucket.org/lindenlab/viewer-development. 2011-12-13 11:15:18 -08:00
Todd Stinson df6b11f098 comparing with ssh://hg@bitbucket.org/prep/viewer-development-havokai
searching for changes
changeset:   21247:08315c2b1a89
user:        Todd Stinson <stinson@lindenlab.com>
date:        Wed Dec 07 12:21:58 2011 -0800
summary:     Adding additional source files to the project builds.
2011-12-12 09:51:04 -08:00
Brad Payne (Vir Linden) e907a2fba4 merge 2011-12-12 10:45:56 -05:00
Oz Linden f1a4593e47 merge changes for vmrg-204 2011-12-12 09:04:33 -05:00
prep 4c60c59610 added vbo support for physics shapes & fixed navmesh/shape menu toggle 2011-12-09 15:56:12 -05:00
prep a5e2dad53d Turning on navmesh rendering toggles normal renderables 2011-12-07 18:09:16 -05:00
prep 8974278746 Turning on navmesh rendering toggles normal renderables 2011-12-07 17:56:02 -05:00
Dave Parks f9f247c5a6 SH-2084 Don't error out on framebuffer mismatch -- probably causing a crash when some post-snapshot or minimize/restore operation gets out of phase. 2011-12-07 16:36:26 -06:00
prep 0b99da8ba5 WIP: Implementing VB manager for complex physics shapes 2011-12-05 17:20:54 -05:00
prep 0539b08370 Renamed segment rendering class into RenderNavPrim 2011-12-01 11:38:16 -05:00
prep 0538dcf62e New navmesh viewer options, rendering improvements, etc. 2011-12-01 10:54:21 -05:00
Richard Linden c191f523a9 Automated merge with http://hg.secondlife.com/viewer-development 2011-11-30 17:57:09 -08:00
Richard Linden ff32ef773b fix for crash on startup (font system not initialized when first creating fonts) 2011-11-29 23:53:28 -08:00
Dave Parks 45d3e147ac SH-1912 Add environment map back into shiny when lighting and shadows enabled. 2011-11-29 17:13:11 -06:00
Richard Linden d089e6c264 bumped up MSVC warning level to 3 to catch more stuff that gcc catches 2011-11-28 19:16:49 -08:00
Leslie Linden 06a2d4eb27 SH-2038 PROGRESS -- Hacked the code to not render alpha using VBO's on OS X since everything renders faster using VBO's except alpha for some mysterious reason. 2011-11-28 17:13:42 -08:00
Dave Parks 5c690db63f SH-2700 Fix for random black textures due to texture index out of bounds. Also change shader to show bright pink on index out of bounds and add assertions to help prevent this sort of bug in the future. 2011-11-18 15:04:26 -06:00
prep 38b7f033b2 navmeshdata is now parsed as binary 2011-11-17 17:33:49 -05:00
prep 378c076d1d WIP: navmesh station posts to a url, responder receives llsd and then has the llpathing library extract and render the navmesh (if desired). 2011-11-17 13:32:04 -05:00
Dave Parks b2824aa21d SH-2690 Add comments per Vir's review feedback 2011-11-16 15:25:09 -06:00
Dave Parks 986dccbeaf SH-2690 Fix for spammy triangle death on GeForce 7800 Go when selecting flexi attachments. 2011-11-16 15:08:17 -06:00
Dave Parks 38853ffdda merge 2011-11-16 12:41:15 -06:00
Dave Parks dbef1616dc SH-2240 Make alpha mask cutoff even less aggressive (fix for eyes on Curious Ringtail avatar) 2011-11-16 12:40:51 -06:00
Leslie Linden 6343c769ce SH-1865 FIX -- removed some old non-deferred rendering code that was preventing anti-aliasing from working when GL_ARB_texture_multisample is unsupported 2011-11-16 10:00:41 -08:00
Dave Parks bbac7e9aec SH-2681 Fix for shader compiler error on GLSL 1.30 and later 2011-11-15 13:01:23 -06:00
Dave Parks 73d70b5d45 SH-2240 Make alpha mask cutoff a little less aggressive (err on the side of not creating an alpha mask) 2011-11-15 12:19:05 -06:00
Dave Parks df546bfba9 SH-2666 Tweak depth of field optimizations based on resident feedback. 2011-11-10 16:12:50 -06:00
Dave Parks c8f558f677 SH-2240 Better fix for red moon -- stop special casing "highlight_color" as a parameter. 2011-11-10 11:39:08 -06:00
Dave Parks 367d6212ae SH-2652 Better DoF combine foo 2011-11-04 17:07:40 -05:00