admin/convoar
1
0
Fork 0
mirror of https://github.com/Misterblue/convoar.git synced 2026-08-14 09:02:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
123 Commits 4 Branches 1 Tag
SimpleJSON
Commit Graph
123 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Adams 2b2576dc1c Complete conversion to single JSON output routine. Now the JSON 
formatting logic is not spread around the GLTF code.
 2018-05-25 05:54:12 -07:00
Robert Adams 76bc24eebf SimpleJSON changes. Writer routine and now compiles, at least. 2018-05-23 21:25:17 -07:00
Robert Adams c47f888a1c In GltfClasses, replace toJSON with AsJSON routines as first step 
im simplifying and centralizing JSON generation.
 2018-05-23 06:59:13 -07:00
Robert Adams 81798de3c6 Add some error checks to run.sh. 
Fix line endings.
 2018-05-20 20:21:48 -07:00
Robert Adams 41a7283780 Change material GLTF to use pbrMetallicRoughness for output. 
Update run.sh to have multiple subdirs for different forms (unoptimized, ...).
Update run.sh to copy things to files.misterblue.com.
Capture current state of optimization. It's not all working yet.
 2018-05-20 16:12:11 -07:00
Robert Adams 6ee3c0e61a More attempts to properly rebuild the whole scene when some meshes 
are reassigned to rebuilt meshes.
 2018-05-14 20:03:39 -07:00
Robert Adams 1fbceee5da Refactoring and organizing scene optimization code. 2018-05-01 18:51:09 -07:00
Robert Adams 302e7da0c2 Part way through refactor of scene analysis and optimization. 2018-04-30 15:56:51 -07:00
Robert Adams 463d583fd2 Much code to do scene optimizations: 
Code to merge meshes if sharing materials.
    Initial version of making separate instances for duplicated meshes.
 2018-04-29 10:28:50 -07:00
Robert Adams 4f1823c947 Start addition of BScene optimization: 
Add BSceneManipulation.cs
    Add parameter to enable merging of material sharing meshes.
 2018-04-28 16:03:37 -07:00
Robert Adams 714e26496f Fix problem with JSON output generating NaN and infinities. 
Seems that TexCoords are sometimes odd values
Properly escape double quotes in output JSON strings.
Rewrite run.sh text script to be easier to add/remove test OARs.
 2018-04-28 12:51:33 -07:00
Robert Adams a157a99b2c Update OpenSim to httptests branch, PrimMesher to latest and greatest 
repo version, and the other misc libraries.
 2018-04-26 22:06:32 -07:00
Robert Adams 05d314d9aa Remove unused references to the nuget libraries. 2018-04-26 22:06:10 -07:00
Robert Adams deb0c0a390 Fix problems with mesh hash values -- there were collisions using 
standard GetHashCode() vs now using BHash.
Many comments improved.
 2018-04-26 22:04:57 -07:00
Robert Adams 4581647625 Rip out all the Assimp and AssimpNet stuff. 
Never got it to work so will just output GLTF and use other
tools to convert to other formats (like command line assimp).
 2018-04-26 12:08:41 -07:00
Robert Adams fb7f285f53 Remove logic to resize all images and only resize used images. 
Have GltfClasses just get reduced form of needed images.
    Remove parameter 'ReducedTextureSizes'.
    Logic was wrong anyway.
 2018-04-26 11:56:02 -07:00
Robert Adams e5ac20deb4 Update Assimp and AssimpNet libraries. 2018-04-06 09:14:48 -07:00
Robert Adams d5a0e5d39f Don't copy zlib and assimp64 dlls with build script but as part of the 
convoar project.
 2018-04-04 15:03:00 -07:00
Robert Adams e4503e0b84 Add the zlib DLL to library collection as it's required by assimp. 2018-04-04 14:43:15 -07:00
Robert Adams 63cd3af465 Update versions of Assimp64.dll and AssimpNet.dll. 2018-04-04 14:42:04 -07:00
Robert Adams 0d16fcf77a Update project files. 2018-04-04 14:41:55 -07:00
Robert Adams ca789e70cc Update gather, build, and test/run.sh files to latest versions. 2018-04-04 14:41:01 -07:00
Robert Adams cd9b7d5904 Pass unused terrain parameter block which is now required. 2018-04-04 14:40:10 -07:00
Robert Adams bc71edcc01 Fix logic for boolean parameters so they properly handle cases where 
the 'no' predendation is used.
Correct comments.
 2018-04-04 14:35:09 -07:00
Robert Adams 1ab1baeb9a Return complete stack error information when loading the OpenSImulator 
dll's. Have been finding that dependencies get added and it's hard to
find why loading failes. This makes it a little easier.
 2018-04-04 14:33:23 -07:00
Robert Adams c97d0529b8 Update OpenSimulator dll's to a recenter version. 2018-04-04 14:30:52 -07:00
Robert Adams d5f23a89c3 Update the target .NET framework to the latest (so .NetStandard2 works). 
Fix the script that builds AssimpNet on Windows development box.
Update Assimp and AssimpNet DLLs.
 2018-03-20 17:13:38 -07:00
Robert Adams 35824b57cc SOme updates for trying assimp-net as the interface library. 2018-02-11 12:46:08 -08:00
Robert Adams b6deba7c12 Update to latest Assimp.dll and AssimpNet.dll 2018-02-10 16:42:45 -08:00
Robert Adams 24591b2b1f Some debug'ish tweeking to the run.sh file. 2018-02-10 16:42:14 -08:00
Robert Adams 367b7e7654 Debug local GLTF2 output routine to output validatable files. 2018-02-10 16:41:19 -08:00
Robert Adams f534c548e3 Change logic for selecting Assimp and local Gltf'er. 
Will use local GLTF output unless Assimp is forced.
Also forces GLTF version 2 since the world is changing over to that.
 2018-02-10 16:39:44 -08:00
Robert Adams 30bf9e9899 Update RSG.Promise to latest version. Seems to change call format a little. 2018-02-10 16:38:19 -08:00
Robert Adams 74bffd97d2 Remove unused CMake parameters from Assimp build. 2018-01-15 13:28:20 -08:00
Robert Adams a62f9d3da7 Update Assimp and AssimpNet libraries 
buildAssimpNet.sh changed to assume Assimp was build RelWithDebInfo
Enabled checking to see if output image exists before regenerating resized image
Add Assimp conversion parameters to run.sh
 2018-01-15 13:26:31 -08:00
Robert Adams cabeddb64c Remove old, unused code. 2018-01-01 08:57:11 -08:00
Robert Adams ff578da829 Build updates to Dockerfile 2017-12-31 09:57:08 -08:00
Robert Adams 660d99de18 Fix problem when terrain mesh was not output with the scene. 
Add all assimp scene optimization parameters in parameter list.
Add listing of all possible parameters in command line invocation errors.
 2017-12-31 09:54:32 -08:00
Robert Adams 519d4bf16c Redo parameter definition so parameters are specified only in one place. 
Add parameters for Assimp post-processing.
 2017-12-29 11:11:18 -08:00
Robert Adams 1f27de58bb Fix problem with images not inheriting UUID name from OpenSim texture. 
Add GetUUID() to EntityHandle. Deal with non-UUID handles later.
Add code for 'SubRegion' parameter.
Correct runtime error for mis-defintion of 'SubRegion' parameter.
Remove old code in PrimToMesh.cs.
 2017-12-29 09:26:30 -08:00
Robert Adams b00b82cceb Merge branch 'master' of github.com:Misterblue/convoar 2017-12-28 19:01:09 -08:00
Robert Adams c37c96e415 Update Assimp and AssimpNet libraries. 2017-12-28 19:00:35 -08:00
Robert Adams 8f4c023d52 Fix directory selection in buildAssimpNet.sh 2017-12-28 18:59:51 -08:00
Robert Adams 707476878a Parameterize the run.sh script. 2017-12-28 18:56:37 -08:00
Robert Adams baff259251 Copy 'baseDirectory' when cloning a persist object. 2017-12-28 18:55:04 -08:00
Robert Adams 0a39716c3b Correct spelling of 'SubRegion' parameter. 2017-12-28 18:54:39 -08:00
Robert Adams fed5206610 Add script for building AssimpNet since it requires library 
copying and renaming.
 2017-12-28 18:53:43 -08:00
Robert Adams a493c62515 Dockerfile for building convoar. 2017-12-21 07:01:09 -08:00
Robert Adams e84f93c7bb Some changes for specifying the output format. 
Update the Assimp and AssimpNet binary files.
 2017-12-17 21:10:59 -08:00
Robert Adams ff80b3b10e Many tweeks to get the GLTF export working. 2017-12-12 16:56:48 -08:00