Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New Config #84

Merged
merged 9 commits into from
Jan 4, 2024
Merged

New Config #84

merged 9 commits into from
Jan 4, 2024

Conversation

bb1950328
Copy link
Owner

@bb1950328 bb1950328 commented Jan 2, 2024

New JSON Property Default Value Old C++ Key Old SQLite Key
⚙️ldraw.libraryLocation ~/ldraw LDRAW_PARTS_LIBRARY ldrawPartsLibrary
⚙️ldraw.shadowLibraryLocation ~/LDCadShadowLibrary SHADOW_LIBRARY_PATH shadowLibraryPath
🗄️windowWidth 1280 SCREEN_WIDTH screenWidth
🗄️windowHeight 720 SCREEN_HEIGHT screenHeight
🗑️ 6000 INSTANCED_MIN_COMPLEXITY instancedMinComplexity
⚙️graphics.msaaSamples 16 MSAA_SAMPLES msaaSamples
⚙️gui.scale 1.5 GUI_SCALE guiScale
⚙️gui.style "BrickSim" GUI_STYLE guiStyle
⚙️graphics.background #363636 BACKGROUND_COLOR backgroundColor
⚙️graphics.showNormals false SHOW_NORMALS showNormals
⚙️graphics.displaySelectionBuffer false DISPLAY_SELECTION_BUFFER displaySelectionBuffer
⚙️graphics.jpgScreenshotQuality 90 JPG_SCREENSHOT_QUALITY jpgScreenshotQuality
🗑️ #00ffff COLOR_MULTI_PART_DOCUMENT colorMultiPartDocument
🗑️ #00ff00 COLOR_MPD_SUBFILE colorMpdSubfile
⚙️elementTree.nodeColors.modelInstance #ffff00 COLOR_MPD_SUBFILE_INSTANCE colorMpdSubfileInstance
⚙️elementTree.nodeColors.part #ffffff COLOR_OFFICAL_PART colorOfficalPart
🗑️ #ffffff COLOR_UNOFFICAL_PART colorUnofficalPart
⚙️partPalette.thumbnailSize 256 THUMBNAIL_SIZE thumbnailSize
🗑 1073741824 THUMBNAIL_CACHE_SIZE_BYTES thumbnailCacheSizeBytes
⚙️graphics.drawMinimalEnclosingBallLines false DRAW_MINIMAL_ENCLOSING_BALL_LINES drawMinimalEnclosingBallLines
⚙️bricklinkIntegration.currencyCode CHF BRICKLINK_CURRENCY_CODE bricklinkCurrencyCode
⚙️gui.enableImGuiViewports false ENABLE_VIEWPORTS enableViewports
⚙️gui.font Roboto FONT font
⚙️log.notImportantLogMessageKeepCount 10 NOT_IMPORTANT_LOG_MESSAGE_KEEP_COUNT notImportantLogMessageKeepCount
⚙️system.enableGlDebugOutput false ENABLE_GL_DEBUG_OUTPUT enableGlDebugOutput
⚙️view3d.sensitivity.rotate 1 MOUSE_3DVIEW_ROTATE_SENSITIVITY mouse3dViewRotateSensitivity
⚙️view3d.sensitivity.pan 1 MOUSE_3DVIEW_PAN_SENSITIVITY mouse3dViewPanSensitivity
⚙️view3d.sensitivity.zoom 1 MOUSE_3DVIEW_ZOOM_SENSITIVITY mouse3dViewZoomSensitivity
⚙️graphics.vsync true ENABLE_VSYNC enableVsync
🗑️ 1.0 TRANSFORM_GIZMO_SIZE transformGizmoSize
⚙️graphics.faceCulling true FACE_CULLING_ENABLED faceCullingEnabled
⚙️system.enableThreading true THREADING_ENABLED threadingEnabled
⚙️elementProperties.angleMode true USE_EULER_ANGLES useEulerAngles
⚙️graphics.deleteVertexDataAfterUploading true DELETE_VERTEX_DATA_AFTER_UPLOADING deleteVertexDataAfterUploading
⚙️ldraw.enableTexmapSupport true ENABLE_TEXMAP_SUPPORT enableTexmapSupport
⚙️graphics.displayConnectorDataIn3DView false DISPLAY_CONNECTOR_DATA_IN_3D_VIEW displayConnectorDataIn3DView
⚙️editor.newFileLocation ~ NEW_FILE_LOCATION newFileLocation
🗄️snapping.linearStepXZ 20 LINEAR_SNAP_STEP_XZ linearSnapStepXZ
🗄️snapping.linearStepY 20 LINEAR_SNAP_STEP_Y linearSnapStepY
⚙️snapping.linearPresets snap::DEFAULT_LINEAR_SNAP_DISTANCE_PRESETS LINEAR_SNAP_PRESETS linearSnapPresets
🗄️snapping.enabled true SNAP_ENABLED snapEnabled
⚙️snapping.rotationalPresets snap::DEFAULT_ROTATIONAL_SNAP_PRESETS ROTATIONAL_SNAP_PRESETS rotationalSnapPresets
🗄️snapping.rotationalStep 90 ROTATIONAL_SNAP_STEP rotationalSnapStep
⚙️keyboardShortcuts.defaultCount 0 DEFAULT_KEYBOARD_SHORTCUT_COUNT defaultKeyboardShortcutCount
⚙️system.renderingTmpDirectory {tmp}/BrickSimRenderingTmp RENDERING_TMP_DIRECTORY renderingTmpDirectory
⚙️system.clearRenderingTmpDirectoryOnExit true CLEAR_RENDERING_TMP_DIRECTORY_ON_EXIT clearRenderingTmpDirectoryOnExit

⚙️=Config, 🗄️=Persisted State, 🗑=Obsolete

@bb1950328
Copy link
Owner Author

bb1950328 commented Jan 3, 2024

ToDo:

  • Remove old config code (config.h and config.cpp as well as parts of db)
  • Add validations to struct and check them when loading json
  • Write new Settings GUI
  • Load/Store persisted_state

Copy link

github-actions bot commented Jan 3, 2024

Catch2 Test Results

       3 files  ±0         3 suites  ±0   0s ⏱️ ±0s
   266 tests ±0     266 ✔️ ±0  0 💤 ±0  0 ±0 
5 532 runs  ±0  5 532 ✔️ ±0  0 💤 ±0  0 ±0 

Results for commit 4922ade. ± Comparison against base commit 38fef56.

♻️ This comment has been updated with latest results.

@bb1950328 bb1950328 marked this pull request as ready for review January 4, 2024 22:43
@bb1950328 bb1950328 merged commit 22d95a2 into master Jan 4, 2024
13 checks passed
@bb1950328 bb1950328 deleted the new-config branch January 4, 2024 22:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant