Zane/obsidian-notes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2024.4.16

Browse Source
This commit is contained in:
zzz
2024-04-16 13:01:34 +08:00
parent 7ec2d49b73
commit 8e9e13563d
11 changed files with 2851 additions and 3074 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.obsidian/appearance.json vendored
View File

@@ -1,3 +1,4 @@
{
"accentColor": ""
"accentColor": "",
"theme": "obsidian"
}

10
.obsidian/community-plugins.json vendored
View File

@@ -1,7 +1,7 @@
<<<<<<< HEAD
[
"calendar",
"obsidian-kanban",
"obsidian-outliner",
"obsidian-version-history-diff",
"obsidian-git"
]
=======
[]
>>>>>>> origin/master
]

4
.obsidian/core-plugins-migration.json vendored
View File

@@ -25,5 +25,7 @@
"workspaces": false,
"file-recovery": true,
"publish": false,
"sync": false
"sync": false,
"properties": false,
"bookmarks": true
}

2
.obsidian/core-plugins.json vendored
View File

@@ -13,7 +13,7 @@
"note-composer",
"command-palette",
"editor-status",
"starred",
"bookmarks",
"outline",
"word-count",
"file-recovery"

2
.obsidian/graph.json vendored
View File

@@ -26,5 +26,5 @@
"linkStrength": 1,
"linkDistance": 250,
"scale": 0.7132754626224436,
"close": true
"close": false
}

40
.obsidian/plugins/obsidian-git/data.json vendored
View File

@@ -1,6 +1,5 @@
{
"commitMessage": "vault backup: {{date}}",
"autoCommitMessage": "vault backup: {{date}}",
"commitDateFormat": "YYYY-MM-DD HH:mm:ss",
"autoSaveInterval": 0,
"autoPushInterval": 0,
@@ -9,16 +8,51 @@
"disablePush": false,
"pullBeforePush": true,
"disablePopups": false,
"disablePopupsForNoChanges": false,
"listChangedFilesInMessageBody": false,
"showStatusBar": true,
"updateSubmodules": false,
"syncMethod": "merge",
"gitPath": "",
"customMessageOnAutoBackup": false,
"autoBackupAfterFileChange": false,
"treeStructure": false,
"refreshSourceControl": true,
"basePath": "",
"differentIntervalCommitAndPush": false,
"changedFilesInStatusBar": false
"changedFilesInStatusBar": false,
"showedMobileNotice": true,
"refreshSourceControlTimer": 7000,
"showBranchStatusBar": true,
"setLastSaveToLastCommit": false,
"submoduleRecurseCheckout": false,
"gitDir": "",
"showFileMenu": true,
"authorInHistoryView": "hide",
"dateInHistoryView": false,
"lineAuthor": {
"show": false,
"followMovement": "inactive",
"authorDisplay": "initials",
"showCommitHash": false,
"dateTimeFormatOptions": "date",
"dateTimeFormatCustomString": "YYYY-MM-DD HH:mm",
"dateTimeTimezone": "viewer-local",
"coloringMaxAge": "1y",
"colorNew": {
"r": 255,
"g": 150,
"b": 150
},
"colorOld": {
"r": 120,
"g": 160,
"b": 255
},
"textColorCss": "var(--text-muted)",
"ignoreWhitespace": false,
"gutterSpacingFallbackLength": 5,
"lastShownAuthorDisplay": "initials",
"lastShownDateTimeFormatOptions": "date"
},
"autoCommitMessage": "vault backup: {{date}}"
}

5679
.obsidian/plugins/obsidian-git/main.js vendored
View File

File diff suppressed because one or more lines are too long

13
.obsidian/plugins/obsidian-git/manifest.json vendored
View File

@@ -1,12 +1,9 @@
{
"id": "obsidian-git",
"name": "Obsidian Git",
"description": "Backup your vault with git.",
"isDesktopOnly": true,
"name": "Git",
"description": "Backup your vault with Git.",
"isDesktopOnly": false,
"fundingUrl": "https://ko-fi.com/vinzent",
"js": "main.js",
<<<<<<< HEAD
"version": "2.20.6"
=======
"version": "1.26.1"
>>>>>>> origin/master
"version": "2.24.1"
}

131
.obsidian/plugins/obsidian-git/styles.css vendored
View File

@@ -8,15 +8,20 @@
}
}
.workspace-leaf-content[data-type='git-view'] .view-content {
.workspace-leaf-content[data-type="git-view"] .button-border {
border: 2px solid var(--interactive-accent);
border-radius: var(--radius-s);
}
.workspace-leaf-content[data-type="git-view"] .view-content {
padding: 0;
}
.workspace-leaf-content[data-type='git-history-view'] .view-content {
.workspace-leaf-content[data-type="git-history-view"] .view-content {
padding: 0;
}
.loading>svg {
.loading > svg {
animation: 2s linear infinite loading;
transform-origin: 50% 50%;
display: inline-block;
@@ -46,21 +51,42 @@
.tooltip.mod-right {
overflow-wrap: break-word;
}
.obsidian-git-shortcuts {
margin: 10px;
}
.diff-err {
height: 100%;
.git-tools {
display: flex;
margin-left: auto;
}
.git-tools .type {
padding-left: var(--size-2-1);
display: flex;
justify-content: center;
flex-direction: column;
align-items: center;
justify-content: center;
width: 11px;
}
.diff-err-sign {
font-size: 2em;
.git-tools .type[data-type="M"] {
color: orange;
}
.git-tools .type[data-type="D"] {
color: red;
}
.git-tools .buttons {
display: flex;
}
.git-tools .buttons > * {
padding: 0 0;
height: auto;
}
.git-author {
color: var(--text-accent);
}
.git-date {
color: var(--text-accent);
}
.git-ref {
color: var(--text-accent);
}
.workspace-leaf-content[data-type="diff-view"] .d2h-d-none {
@@ -212,20 +238,23 @@
white-space: pre;
width: 100%;
}
.theme-light .workspace-leaf-content[data-type="diff-view"] .d2h-code-line del,
.theme-light
.workspace-leaf-content[data-type="diff-view"]
.d2h-code-side-line
del {
.workspace-leaf-content[data-type="diff-view"]
.d2h-code-side-line
del {
background-color: #ffb6ba;
}
.theme-dark .workspace-leaf-content[data-type="diff-view"] .d2h-code-line del,
.theme-dark
.workspace-leaf-content[data-type="diff-view"]
.d2h-code-side-line
del {
.workspace-leaf-content[data-type="diff-view"]
.d2h-code-side-line
del {
background-color: #8d232881;
}
.workspace-leaf-content[data-type="diff-view"] .d2h-code-line del,
.workspace-leaf-content[data-type="diff-view"] .d2h-code-line ins,
.workspace-leaf-content[data-type="diff-view"] .d2h-code-side-line del,
@@ -236,22 +265,25 @@
text-decoration: none;
vertical-align: middle;
}
.theme-light .workspace-leaf-content[data-type="diff-view"] .d2h-code-line ins,
.theme-light
.workspace-leaf-content[data-type="diff-view"]
.d2h-code-side-line
ins {
.workspace-leaf-content[data-type="diff-view"]
.d2h-code-side-line
ins {
background-color: #97f295;
text-align: left;
}
.theme-dark .workspace-leaf-content[data-type="diff-view"] .d2h-code-line ins,
.theme-dark
.workspace-leaf-content[data-type="diff-view"]
.d2h-code-side-line
ins {
.workspace-leaf-content[data-type="diff-view"]
.d2h-code-side-line
ins {
background-color: #1d921996;
text-align: left;
}
.workspace-leaf-content[data-type="diff-view"] .d2h-code-line-prefix {
word-wrap: normal;
background: none;
@@ -367,48 +399,58 @@
border-color: var(--background-modifier-border);
color: var(--text-normal);
}
.theme-light
.workspace-leaf-content[data-type="diff-view"]
.d2h-file-diff
.d2h-del.d2h-change {
.workspace-leaf-content[data-type="diff-view"]
.d2h-file-diff
.d2h-del.d2h-change {
background-color: #fdf2d0;
}
.theme-dark
.workspace-leaf-content[data-type="diff-view"]
.d2h-file-diff
.d2h-del.d2h-change {
.workspace-leaf-content[data-type="diff-view"]
.d2h-file-diff
.d2h-del.d2h-change {
background-color: #55492480;
}
.theme-light
.workspace-leaf-content[data-type="diff-view"]
.d2h-file-diff
.d2h-ins.d2h-change {
.workspace-leaf-content[data-type="diff-view"]
.d2h-file-diff
.d2h-ins.d2h-change {
background-color: #ded;
}
.theme-dark
.workspace-leaf-content[data-type="diff-view"]
.d2h-file-diff
.d2h-ins.d2h-change {
.workspace-leaf-content[data-type="diff-view"]
.d2h-file-diff
.d2h-ins.d2h-change {
background-color: rgba(37, 78, 37, 0.418);
}
.workspace-leaf-content[data-type="diff-view"] .d2h-file-list-wrapper {
margin-bottom: 10px;
}
.workspace-leaf-content[data-type="diff-view"] .d2h-file-list-wrapper a {
color: #3572b0;
text-decoration: none;
}
.workspace-leaf-content[data-type="diff-view"]
.d2h-file-list-wrapper
a:visited {
.d2h-file-list-wrapper
a:visited {
color: #3572b0;
}
.workspace-leaf-content[data-type="diff-view"] .d2h-file-list-header {
text-align: left;
}
.workspace-leaf-content[data-type="diff-view"] .d2h-file-list-title {
font-weight: 700;
}
.workspace-leaf-content[data-type="diff-view"] .d2h-file-list-line {
display: -webkit-box;
display: -ms-flexbox;
@@ -423,13 +465,13 @@
padding: 0;
}
.workspace-leaf-content[data-type="diff-view"] .d2h-file-list>li {
.workspace-leaf-content[data-type="diff-view"] .d2h-file-list > li {
border-bottom: 1px solid var(--background-modifier-border);
margin: 0;
padding: 5px 10px;
}
.workspace-leaf-content[data-type="diff-view"] .d2h-file-list>li:last-child {
.workspace-leaf-content[data-type="diff-view"] .d2h-file-list > li:last-child {
border-bottom: none;
}
@@ -497,9 +539,10 @@
background-color: var(--background-secondary);
}
.cm-gutterElement.obs-git-blame-gutter > div, .line-author-settings-preview {
.cm-gutterElement.obs-git-blame-gutter > div,
.line-author-settings-preview {
/* delegate text color to settings */
color: var(--obs-git-gutter-text);
color: var(--obs-git-gutter-text);
font-family: monospace;
height: 100%; /* ensure, that age-based background color occupies entire parent */
text-align: right;

40
.obsidian/workspace.json vendored
View File

@@ -18,24 +18,12 @@
}
},
{
"id": "9eb92d3d81ca81e4",
"id": "45882341e179f5f2",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "conflict-files-obsidian-git.md",
"mode": "source",
"source": false
}
}
},
{
"id": "6431c3ab63928f12",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "渲染/软渲染/冯 高光.md",
"file": "2024-04-10.md",
"mode": "source",
"source": false
}
@@ -87,6 +75,14 @@
"type": "starred",
"state": {}
}
},
{
"id": "8c8dfe109a7f116f",
"type": "leaf",
"state": {
"type": "bookmarks",
"state": {}
}
}
]
}
@@ -108,7 +104,7 @@
"state": {
"type": "backlink",
"state": {
"file": "conflict-files-obsidian-git.md",
"file": "2024-04-10.md",
"collapseAll": false,
"extraContext": false,
"sortOrder": "alphabetical",
@@ -133,7 +129,7 @@
"state": {
"type": "outgoing-link",
"state": {
"file": "conflict-files-obsidian-git.md",
"file": "2024-04-10.md",
"linksCollapsed": false,
"unlinkedCollapsed": true
}
@@ -156,7 +152,7 @@
"state": {
"type": "outline",
"state": {
"file": "conflict-files-obsidian-git.md"
"file": "2024-04-10.md"
}
}
},
@@ -194,16 +190,18 @@
"command-palette:打开命令面板": false
}
},
"active": "9eb92d3d81ca81e4",
"active": "45882341e179f5f2",
"lastOpenFiles": [
"Batch & DrawCall.md",
"程序集.md",
"2024-04-10.md",
"2024-03-19.md",
"网络同步.md",
"Batch & DrawCall.md",
"conflict-files-obsidian-git.md",
"渲染/软渲染/冯 高光.md",
"渲染/软渲染",
"渲染/软渲染/还未实现.md",
"待办事项/TODO.md",
"程序集.md",
"Mesh/Mesh Renderer 与 Skinned Mesh Renderer.md",
"Mesh/Mesh Baker.md",
"Mesh/图片/Pasted image 20221021171104.png",
@@ -226,12 +224,10 @@
"Issue/超出ScrollView的特效渲染层级不对.md",
"FairyGui/工作流.md",
"FairyGui",
"并行计算/GPU/Compute Shader.md",
"未命名.canvas",
"未命名 1.canvas",
"log_learn",
"渲染",
"并行计算/GPU/SIMT.md",
"渲染/GPU",
"并行计算/GPU",
"并行计算/GPU.canvas",

1
2024-04-10.md Normal file
View File

@@ -0,0 +1 @@
[原神渲染解析：分割视锥体以优化体积雾 - 知乎 (zhihu.com)](https://zhuanlan.zhihu.com/p/687122372)