update

lmj01 · Jun 2, 2024 · 4b48484 · 4b48484
1 parent 04ef901
commit 4b48484
Show file tree

Hide file tree

Showing 18 changed files with 36 additions and 11 deletions.
diff --git a/articles/2024/geogebra.md b/articles/2024/geogebra.md
@@ -0,0 +1,5 @@
+# [GeoGebra Apps](https://github.com/lmj01/geogebra)
+
+```shell
+./gradelw :web:run
+```
diff --git a/cg/image/index.md b/cg/image/index.md
@@ -11,6 +11,8 @@
 
 - [ImageMagick](/cg/image/imageMagick.md)
 
+- [ToneMapping](/cg/tools/tone.mapping.md)
+
 ## 压缩
 
 - [Caesium is an image compression software that helps you store, send and share digital pictures, supporting JPG, PNG and WebP formats. You can quickly reduce the file size (and resolution, if you want) by preserving the overall quality of the image. ](https://github.com/Lymphatus/caesium-image-compressor)
diff --git a/cg/lighting/pbr.md b/cg/lighting/pbr.md
@@ -0,0 +1,4 @@
+# Physically Based Rendering
+
+[Monte Carlo Integration](https://64.github.io/monte-carlo/)
+
diff --git a/cg/tools/tone.mapping.md b/cg/tools/tone.mapping.md
@@ -0,0 +1,22 @@
+# Tone Mapping
+
+大多数显示器显示RGB在[0,255]的范围内，但现实生活中，多数是从无0到无穷大，这个跨越非常迅速，一下子就升上去了，也受环境影响。
+
+Reinhard's formulas actually operate on a thing called luminance rather than operating on RGB-triples as I implied. Luminance is a single scalar value which measures how bright we view something. It may not be obvious, but for example we perceive green as much brighter than blue
+
+Don't confuse luminance with luma - luma is the equivalent of the luminance computed from an sRGB pixel (i.e gamma-corrected). The coefficients used to convert to luma are the same as luminance, they just operate on sRGB components instead
+
+电影的播放是不同的channel，三束激光混合在一点形成的颜色，但现在数字电影也流行起来了，不知道这种技术上的差异是什么了，毕竟不同于显示器这种通用的设备。
+
+讨论的大多数都是global的tone mapping，还有local的，不过不适用于实时图像中，在数字图象中广泛使用，不要求实时性。
+
+[@64ToneMapping](https://64.github.io/tonemapping/)
+[Reinhard is proposing](https://www.cs.utah.edu/docs/techreports/2002/pdf/UUCS-02-001.pdf)
+[Color Correction for Tone Mapping](https://www.cl.cam.ac.uk/%7Erkm38/pdfs/mantiuk09cctm.pdf)
+[Filmic Tonemapping with Piecewise Power Curves John Hable bio photo](http://filmicworlds.com/blog/filmic-tonemapping-with-piecewise-power-curves/)
+[ACES (Academy Color Encoding System)](https://github.com/TheRealMJP/BakingLab/blob/master/BakingLab/ACES.hlsl)
+[aces-filmic-tone-mapping-curve](https://knarkowicz.wordpress.com/2016/01/06/aces-filmic-tone-mapping-curve/)
+[High Dynamic Range Imaging Book, R. Mantiuk et al](https://www.cl.cam.ac.uk/%7Erkm38/pdfs/mantiuk15hdri.pdf)
+[Filmic Worlds Blog - John Hable](http://filmicworlds.com/blog/)
+[Tone Mapping (slides) - R. Mantiuk](https://www.cl.cam.ac.uk/%7Erkm38/pdfs/tone_mapping.pdf)
+[Dynamic Range, Exposure and Tone Mapping - Seena Burns](https://seenaburns.com/dynamic-range/)
diff --git a/dia/Cultural-Capital.dia → cs/dia/Cultural-Capital.dia b/dia/Cultural-Capital.dia → cs/dia/Cultural-Capital.dia
diff --git a/dia/Cultural-Capital.png → cs/dia/Cultural-Capital.png b/dia/Cultural-Capital.png → cs/dia/Cultural-Capital.png
diff --git a/dia/ShaderSpace.png → cs/dia/ShaderSpace.png b/dia/ShaderSpace.png → cs/dia/ShaderSpace.png
diff --git a/dia/blender.dia → cs/dia/blender.dia b/dia/blender.dia → cs/dia/blender.dia
diff --git a/dia/gram-schmidt.png → cs/dia/gram-schmidt.png b/dia/gram-schmidt.png → cs/dia/gram-schmidt.png
diff --git a/dia/lua-parser.dia → cs/dia/lua-parser.dia b/dia/lua-parser.dia → cs/dia/lua-parser.dia
diff --git a/dia/shader.dia → cs/dia/shader.dia b/dia/shader.dia → cs/dia/shader.dia
diff --git a/dia/skills.dia → cs/dia/skills.dia b/dia/skills.dia → cs/dia/skills.dia
diff --git a/dia/skynet.dia → cs/dia/skynet.dia b/dia/skynet.dia → cs/dia/skynet.dia
diff --git a/dia/token.dia → cs/dia/token.dia b/dia/token.dia → cs/dia/token.dia
diff --git a/dia/token.png → cs/dia/token.png b/dia/token.png → cs/dia/token.png
diff --git a/index/article.md b/index/article.md
@@ -39,6 +39,7 @@
 - [2024趋势](/articles/2024/trend.md)
 - [umi企业级框架](/articles/2024/umi.md)
 - [nocobase开源项目](/articles/2024/nocobase.md)
+- [GeoGebra开源项目](/articles/2024/geogebra.md)
 - [vfs虚拟文件系统](/articles/2024/vfs.md)
 - [三维网格](/articles/notes/mesh.md)
 

diff --git a/index/computerScience.md b/index/computerScience.md
@@ -60,6 +60,7 @@
 ### Engine
 
 - [引擎技术](/cg/engines.md)
+- [PBR基于物理的渲染](/cg/lighting/pbr.md)
 - [Bgfx](/cg/bgfx.md)
 - [UI](/cg/ui.md)
 - [threejs 笔记](/cg/threejs/index.md)

diff --git a/index/online.md b/index/online.md
@@ -1,21 +1,12 @@
 # 线上文章
 
-## 数学
-
 - [数学家记录史MacTutor is a free online resource containing biographies of more than 3000 mathematicians and over 2000 pages of essays and supporting materials. ](https://mathshistory.st-andrews.ac.uk/)
 
-## 计算机
-
-### 可视化
-
 - [Visual Information Theory可视化信息理论](https://colah.github.io/posts/2015-09-Visual-Information/)
 
-### 图形学
 - [Let's remove Quaternions from every 3D Engine](https://marctenbosch.com/quaternions/)
 - [Hexagonal Grids -- from Red Blob Games](https://www.redblobgames.com/grids/hexagons/)
 
-### 软件工程与架构
-
 - [Front-End-Basics，这是一个从前端基础慢慢汇总成体系，再扩展到全栈的技术文档同时也是一个普通人想成长为更好的自己的探索文档](https://docs.chenfangxu.com/)
 - [Game Programming Pattern游戏编程模式，笔记全面得资料](http://gameprogrammingpatterns.com/)
     - [ Source repo for the book gameprogrammingpatterns.com ](https://github.com/munificent/game-programming-patterns)
@@ -45,11 +36,10 @@
 - [Agner Fog Research, 涉及很多编程知识，很好的文档几何，作者自己更新自己的理解与文档](https://www.agner.org/?e=0#0)
 - [Bjarne StroustrupC++之父的网站](https://www.stroustrup.com/)
 - [ ISO C++ 标准委员会主席, 已经订阅其博客working at the intersection of programming language design/UX, people, and high performance code.](https://herbsutter.com/)
+- [关于图形编程的一个资源网站Graphics Programming is an online community of graphics programmers of all backgrounds and experience levels.](http://graphics-programming.org/)
 
 ## 工具
 
-### playground
-
 - [Javascript Playground--邮箱[email protected]](https://playcode.io/)
 
 ### 在线工具