Merge Master to Dev #19
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Update to ArcGIS CE
Minor edit
Minor edit
d-wasserman
added a commit
that referenced
this pull request
Dec 7, 2020
* Updated Stencils These are not used by the rule yet, but they will be. They are the first set, and are likely to be edited in the future to reduce code used to insert them (rotations etc). * Structure Established for Decal Based Stamps The use of simple inserted geometries or stencils is providing a method to enable cleaner material replacments in Unreal/TwinMotion/Unity. These changes are the starting point for high resolution edits to the rule. Everything works on Street Shapes in this commit (UV Flips, Traffic Direction, Reverse options). However, on sidewalk bike lanes, this is not work working (texture conflicts, no extrusion). Something about the sidewalk UVs is causing an issue. Reversing normals, scope alignments, adjusting insertAlongUV heights, extrusion direction, or adjusting comp settings is not fixing this. This has enough useful components, working on this from the development branch makes sense. * Slope Adjusting sharrowHeight Further testing of stencil shapes on highly sloped shapes suggests this can be useful. Every ~10 degrees of slope will increment a multiplier so that thickness doubles at 10 degrees, triples at 20 degrees, etc. This suggests it can generalize to other shapes. Still no answer on sidewalk shapes. * Bus Lane Stencil Draft Draft bus lane stencil added. * Stencil Scope Alignment Before an insert along UV operation occurs, the scope needed to be aligned to the Y axis. This fixes face collisions on sidewalkside bike lanes. A solution for sloped streets and sidewalks have been addressed for stencils. * HOV Lane Stencil Incorporated HOV Lane Stencil incorporated and tested. Works on steep angle inclines. Increase extrusion amount based on max angle encountered based on tests. Might change back in the future. * Carshare/Bus Stop Stencil & Minor Edits Minor edits include bug fix for bus land stencil, change our a random tree not appearing (need to revisit), add bus stop/car share stencils. Both require more work (bus lane can use context sensitive transitions per NACTO guidance). * Both & Through Arrows Add OBJs for Both & Through Arrow directions. * Modified Arrow Stencils Modified stencils for arrows. * Stencil Arrows Draft stencil arrows for high LOD. Refactor functions and parameters. More needs to be done to simplify geometry, and it is unclear how to replace ALL the options provided by other textures/lane options. * Missed Modification GitHub did not sync this change with the main rule. This could create a bug for medians with turn lanes. Fixed. * Refactor Asphalt Painted Stencil Adjust Rule to have color first like other asphalt painted rule, and add stencil color as a const (future param?). * Fix Information Passed- Curbside Curbside length is only used in one location, but is labeled parking length everywhere else. Found issue when carshare allocations got larger. Fixed. Might need a longer term fix for centering vehicles along UV insertions... * Add High LOD Stencil Based Center Turn lanes These are not perfect, but they work for now. Center turn lanes uses splits, inserted arrows, and transition shapes using the same transition the median with turn lane uses. Needs revisions, and potentially a dropping of the low LOD support. * Add High LOD Crossing/CPDO Options Curbside passenger drop offs and crossings now how high geometry splits for their patterns. Might change to drop low LOD code, but TBD. * Additional Stencils (Bike,Parking) Curbside Elements, and bike buffers. * Minor Edits Change texture sides, call appropriate rule post change. * Buffer Stencil & Refactor Minor refactors to parameters passed to stencils, add buffer stencil draft. * uw factor edit Change uw factor. Might require more changes in the future here. Not sure how PBR will work with the same coordinate system. * Add New Transition Center Turn Lane Transition stencil. * Center Turn Lane Edit The paint section just did not look right with the previous mode. This looks a little cleaner and has less code. * Set up Archive Folder Some textures are no longer used, and will eventually be deleted. This is the start of the archival process. * Move Archival Removal Centerlines. Not used. * Refactor Median/TWLTL Depths I need a better set of settings for this, but for now this simplifies the interacting constants and gets close to appropriate depths. * Draft Angled Parking Stencil Angle is not perfect, car postion could be shift, but this follows the same aspect ratios of the previous texture. Micromobility parking is the last component. * Enclosed Micromobility Spaces Use splits to create a box for scooter parking. This is sufficient for now. Might add gap later. * Draft PBR Asphalt Add asphalt textures with PBR support. * Bug Fix Sidewalk shapes were not calling their rule appropriately. Other typos. * Update Complete_Street_Scenarios_2020.cej Update scene. * Set PBR Shader Per email with Benjamin Neukom, adjusting the PBR settings to set the shader on export. * PBR Draft - Asphalt Asphalt has draft PBR support. * Update Asphalt003_2K_Roughness.jpg Unnecessary roughness. * PBR Textures Report Manager No reporting for stencils on PBR textures. PBR definitely increases the complexity of a general tiling system but the results are great. All asphalt painted road components now have PBR asphalt. Drainage at the side has been simplified. * Update Complete_Street_Scenarios_2020.cej Bad texture choice in Transit Scenario * Remove Archive Enough progress has been made that these are no longer required. They will be stored in other versions. * Delete Grate.jpg Delete bad old texture. * Draft PBR Sidewalks/Crosswalks (1) Change Textures. * Draft PBR Sidewalks/Crosswalks (2) Edit Rules to reflect changes, only sidewalks/crosswalks addressed. * Minor Edit (Rail Tex) Rail texture has an old texture. * Remove Nil, Alter Textures Bug fixes for low lod, change roughness. * Texture Edits - Sidewalk Switch out General Sidewalk Texture. Other minor edits. * Merge Master to Dev (#19) * Update README.md Update to ArcGIS CE * Update README.md Minor edit * Update README.md Minor edit * Update Complete_Street_Scenarios_2020.cej Update scene for minor edits in textures. * Soften Sidewalk Reduce roughness & lighten color map. * Update Readme (#20) * Update README.md Update to ArcGIS CE * Update README.md Minor edit * Update README.md Minor edit * Revert "Draft PBR Sidewalks/Crosswalks (1)" This reverts commit 88ad9a5. This change is for a few reasons, but the effort required to make median's support PBR and deal with UI issues is large. Users will benefit from an updated rule at this stage. * Read Me Update Include Previous read me update. * Scene Updates Minor scene updates. * Sync With Master (#21) * Update README.md Update to ArcGIS CE * Update README.md Minor edit * Update README.md Minor edit
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Taken in readme edits from master.