22edf673cf
merge
2010-10-15 19:51:28 -05:00
12bd7a40d6
Update llconvexdecomp
2010-10-15 19:51:00 -05:00
f670360d45
SH-329 WIP get branch ready for open source release
...
updated build config to strip havok debug symbols
also added mac convex decomp stub lib.
2010-10-15 19:29:31 -04:00
75c8a1c995
SH-331 SH-332 FIX SH-329 WIP fix: colladadom for mac/linux wip: decompstub
...
updating install.xml with the new packages for colladadom for mac & linux
updating install.xml with decomposition stub for linux (mac and win will come later)
2010-10-15 18:48:22 -04:00
997d66d348
Fix for various crashes on exit and leaks when using convex decomposition.
...
Make rendering of convex hullified prims work in physics shape display.
Reviewed by Falcon.
2010-10-15 16:33:22 -05:00
70a98095c0
CTS-265 Fix for spinners having a scale limit of 10m
2010-10-15 14:12:52 -05:00
dcb43490a5
Proper loading of hull indices, bad use of initThread
2010-10-15 14:04:26 -05:00
2357233ab6
SH-338 Fix for crash when setting medium LOD to none.
2010-10-15 14:04:13 -05:00
8163cd9e6f
merge
2010-10-14 15:38:02 -05:00
e5943ac8d1
SH-324 Clamp models to 64m on upload.
2010-10-14 15:36:49 -05:00
0c551bd3c8
SH-329 WIP merging in oz's fix for license issues in the mesh branch
2010-10-14 14:53:28 -04:00
bd0a4d87f5
Fix for debug build (copy correct collada dll).
2010-10-14 11:57:11 -05:00
ea2fa54635
Make radius on viewer match radius on simulator for streaming cost estimation.
2010-10-14 11:27:19 -05:00
c0d882fbff
Updated colladadom.
2010-10-14 11:26:59 -05:00
a5619d16f7
correct licenses (fix problem with license change merge)
2010-10-13 07:24:37 -04:00
1259e05edc
SH-157 Make RenderShaderLightingMaxLevel automatically reload shaders.
2010-10-12 17:06:07 -05:00
6cbe04a1fb
SH-320 Make "scale" spinner actually work and show dimensions of current model.
2010-10-12 17:05:33 -05:00
4fc7a221e1
Disable uniform map checking for now (breaks on several valid edge cases).
2010-10-12 17:04:41 -05:00
e7fcc897ac
Make viewer mesh cost scaler match current sim mesh cost scaler.
2010-10-12 15:28:34 -05:00
83f7f37d8a
SH-264 Fix for lowest lod defaulting to a huge number of triangles when choosing "Triangle Limit"
2010-10-12 15:28:09 -05:00
894971c7b3
SH-302 Fix for crash when uploading models with hundreds of meshes.
2010-10-12 15:08:01 -05:00
93dc8f09ea
Fix for bad labels on physics shape in importer.
...
Fix for crash due to race condition when uploading meshes.
2010-10-08 00:11:22 -05:00
b6e0648af7
merge
2010-10-07 23:11:31 -05:00
0ff0dd72d6
Prep loves to type static const int
2010-10-07 23:11:08 -05:00
26fc1c1755
SH-64 WIP update GLOD on mac
...
Trying again, this time adding SDK versions to GLOD's linker commands
as well as its compile command. Ugh.
2010-10-07 22:02:59 -04:00
07a0b92877
Automated merge with ssh://hg.lindenlab.com/davep/viewer-mesh/
2010-10-07 21:16:04 -04:00
1fc2b09b45
SH-64 WIP update GLOD on mac
...
Trying this again, attempting one more update to fix the issues of not
being able to run with GLOD on 10.5.
2010-10-07 21:15:41 -04:00
cf6ccc9f1c
merge
2010-10-07 18:00:07 -05:00
141f886d49
Fix for crash when convex decomposition fails.
2010-10-07 17:59:27 -05:00
fbef8b9387
Automated merge with ssh://hg.lindenlab.com/davep/viewer-mesh/
2010-10-07 18:50:20 -04:00
aa401a3056
BUILDFIX: viewer-mesh mac build
...
xcode didn't like the way we were defining inner classes and assuming that if the outer class
was a friend that the inner class would be too. Couldn't forward-declare the inner class
so had to re-arrange the order of class declaration.
Between re-ordering the class declarations, and explicitly making the inner class a friend,
this un-sticks the mac build, and makes it happy.
Code reviewed by davep.
2010-10-07 18:49:07 -04:00
578389ce23
Fix for crash when attempting to render single hull rep when no such rep is available.
2010-10-07 16:48:13 -05:00
fecf1883ef
Increase default scale limit to 64m
2010-10-07 15:58:01 -05:00
1b7b05eeb9
merge
2010-10-07 16:57:18 -04:00
b102719c53
SH-65 WIP update convex decomp on mac
...
Pushing in the cmake change that will make the mac build use the non-stub version of the convex decomp lib.
2010-10-07 16:51:29 -04:00
ca1f7828b2
Update convex decomp and physics shape display to include convex hulls for prims where appropriate.
2010-10-07 15:37:07 -05:00
b70ccfe8e3
Add pure physics cost to UI
2010-10-07 14:00:43 -05:00
e83b815c0f
merge
2010-10-06 20:35:17 -05:00
99f3db16e9
Fix for double uploads of non models
2010-10-06 13:52:23 -07:00
9fa00ed52d
merge
2010-10-06 12:55:22 -05:00
adc73f4847
Merge
2010-10-06 12:54:21 -05:00
21b1b91c44
ATI compatibility pass
2010-10-06 12:53:26 -05:00
24e0d62a5e
Added mandatory single hull simplification to mesh upload.
2010-10-06 01:17:12 -05:00
98d622551d
merge
2010-10-05 16:55:41 -05:00
1f00747cd2
Post review cleanup.
2010-10-05 16:55:19 -05:00
87a9f47575
Rewrite LLPhysicsDecomp to have a more generic callback system.
...
Reviewed by prep.
2010-10-05 16:49:05 -05:00
70b2ace131
Reset joint positions after detaching a rigged model
2010-10-05 14:14:37 -04:00
7be98bc20f
Automated merge with ssh://hg.lindenlab.com/davep/viewer-mesh/
2010-10-04 17:56:09 -04:00
4fd10e4238
SH-79 FIX upload window shows status "loading" if file selection canceled
...
Extended the current filename checking to handle the case where we
have a user cancel a selection of an LOD file beyond the first.
mLoading is made false in either case, but the dialog is closed
if a file has not been chosen for the highest LOD.
2010-10-04 17:56:00 -04:00
478e0927c8
Interface/state for rendering convex hull physics shapes. Still need to implement gMeshRepo.buildHull
2010-10-04 09:48:05 -05:00
Dave Parks