From 6077e3f8191da986dbd106e9f4a1ec2ac002e019 Mon Sep 17 00:00:00 2001 From: lmj01 Date: Fri, 7 Jul 2023 17:36:28 +0800 Subject: [PATCH] update --- articles/2023/daily.md | 4 ++++ cg/cornerstonejs.md | 17 +++++++++++++++++ cg/ct.md | 11 +---------- cpl/python.md | 7 +++++-- dev-note/git.md | 1 + index/article.md | 13 +++++++++++++ index/community.md | 3 +++ index/computerScience.md | 6 ++++++ math/pbr3ed.html | 5 +++++ nodejs/index.md | 7 ++++++- web/nginx/9950.conf | 2 +- web/nginx/nginx.md | 3 +++ web/nginx/update.ps1 | 4 ++-- web/nginx/win/nginx.conf | 8 ++++++++ 14 files changed, 75 insertions(+), 16 deletions(-) create mode 100644 cg/cornerstonejs.md diff --git a/articles/2023/daily.md b/articles/2023/daily.md index 5f8c7b1..8c5451b 100644 --- a/articles/2023/daily.md +++ b/articles/2023/daily.md @@ -1,3 +1,7 @@ +## 2023-7-7 + +给一个STL模型，对其数据进行连通区域的分割，分割成多个模型 + ## 2023-6-16 **布什内尔定律**，是游戏公司Atari的创始人，他提出，游戏的操作应该简单，一看就会，但是玩法应该保持挑战性，后人总结为“易于学习，难以精通” diff --git a/cg/cornerstonejs.md b/cg/cornerstonejs.md new file mode 100644 index 0000000..f7489ad --- /dev/null +++ b/cg/cornerstonejs.md @@ -0,0 +1,17 @@ +# CornerstoneJS + +## dev +```js +yarn install +yarn run example tutorialName +yarn run serve-static-examples +``` + +- [3D Volume Rendering](https://www.cornerstonejs.org/live-examples/volumeviewport3d) + +## 概念 + +#### ImageId +就是一个url, url scheme决定某个ImageLoader插件真实的加载图像，Cornerstone3D委托注册的ImageLoader去加载，这样Cornerstone3D就可以同时显示多张图像，来自不同服务上的各种协议 + +![image id](../images/cg/ct/image-id-format.png) diff --git a/cg/ct.md b/cg/ct.md index 70c4bee..066c30a 100644 --- a/cg/ct.md +++ b/cg/ct.md @@ -1,16 +1,7 @@ # CT - [vtk-js doc](https://kitware.github.io/vtk-js/docs/) - -## CornerstoneJS - -### 概念 - -#### ImageId -就是一个url, url scheme决定某个ImageLoader插件真实的加载图像，Cornerstone3D委托注册的ImageLoader去加载，这样Cornerstone3D就可以同时显示多张图像，来自不同服务上的各种协议 - -![image id](../images/cg/ct/image-id-format.png) - +- [CornerstoneJS](./cornerstonejs.md) ## DICOM diff --git a/cpl/python.md b/cpl/python.md index 70c9ce7..7364720 100644 --- a/cpl/python.md +++ b/cpl/python.md @@ -47,6 +47,7 @@ pip install pyopengl - pip install pillow // - pip install redis - pip install matplotlib // matplotlib是一个python 2D绘图库，利用它可以画出许多高质量的图像 +- pip install openmesh // openmesh ## python anaconda @@ -55,8 +56,10 @@ pip install pyopengl _conda.exe --version _conda.exe env list Scripts\activate 进入当前环境中base -condabin\conda create -p d:\anaconda3\envs\realSR // 新建一个环境 -Scripts\activate realSR // 进入当前环境 +condabin\conda create --prefix d:\anaconda3\envs\realSR // 新建一个环境 +condabin\conda create --name conda2 // 新建一个环境 +condabin\conda info --envs // 新建一个环境 +Scripts\activate conda2 // 进入当前环境 ## 概念 diff --git a/dev-note/git.md b/dev-note/git.md index 2b1c3fa..37520cc 100644 --- a/dev-note/git.md +++ b/dev-note/git.md @@ -23,6 +23,7 @@ - git rm --cached file.ext 删除file.ext的跟踪， 并保留本地的 - git rm -f file.ext 删除跟踪，并删除本地文件 - git reset --hard xxxx // 退回到那个版本 +- git pull origin main --allow-unrelated-histories //历史记录不一样 ### submodule - git submodule add 添加子模块 path是相对根目录的路径 diff --git a/index/article.md b/index/article.md index d83db05..e07e58d 100644 --- a/index/article.md +++ b/index/article.md @@ -23,3 +23,16 @@ - [用户 角色 权限的通用设计](../articles/2023/userRolePermission.md) - [Markdown 例子](../articles/markdown.md) - [Mathjax](../articles/mathjax.md) + +## 工作中遇到的 +- [mobile-detect.js](https://github.com/hgoebl/mobile-detect.js) +- [openCTM模型文件格式](https://openctm.sourceforge.net/) + - [OpenCTM Code ](https://sourceforge.net/p/openctm/code/HEAD/tree/branches/pre-2.x/) + - [github openCTM](https://github.com/Danny02/OpenCTM) + - [This is the home of development of the OpenCTM project](https://github.com/mbitsnbites/openctm) + - [js-openctm is a JavaScript library for reading OpenCTM files](https://github.com/jcmellado/js-openctm) + - [three, ctm](https://alteredqualia.com/three/examples/webgl_loader_ctm_materials.html) +- [Bezier.js, for doing Bezier curve things](https://pomax.github.io/bezierjs/) + - [github](https://github.com/Pomax/bezierjs) + +### [openmesh](https://www.graphics.rwth-aachen.de/software/openmesh/) \ No newline at end of file diff --git a/index/community.md b/index/community.md index ecf5ce9..acbf99d 100644 --- a/index/community.md +++ b/index/community.md @@ -17,6 +17,9 @@ ## 协议 +### [mqtt](https://mqtt.org/) +MQTT（Message Queuing Telemetry Transport，消息队列遥测传输协议），是一种基于发布/订阅（publish/subscribe）模式的“轻量级”通讯协议，该协议构建于TCP/IP协议上，由IBM在1999年发布。 + ### Fair-code - [Fair-code, is not a software license, it describes a software model where software:一种旨在使开发人员获得报酬的开源替代方案](https://faircode.io/) diff --git a/index/computerScience.md b/index/computerScience.md index 7c48916..20693fa 100644 --- a/index/computerScience.md +++ b/index/computerScience.md @@ -27,6 +27,11 @@ - [点至三角形的最近点](https://zhuanlan.zhihu.com/p/458837573) - [smallpt: Global Illumination in 99 lines of C++](http://www.kevinbeason.com/smallpt/) - [多边形网格算法](http://paulbourke.net/geometry/polygonmesh/) +- [manifold,Manifold is a geometry library dedicated to creating and operating on manifold triangle meshes. A manifold mesh is a mesh that represents a solid object, and so is very important in manufacturing, CAD, structural analysis, etc. Further information can be found on the wiki.](https://github.com/elalish/manifold) + - [manifold-3d npm](https://www.npmjs.com/package/manifold-3d) +- [3D打印模型文件](https://www.thingiverse.com/) +- [bezierjs ](https://pomax.github.io/bezierjs/) + - [github](https://github.com/Pomax/bezierjs) ### Engine @@ -40,6 +45,7 @@ - [Beispiele webGL mit three.js ](https://hofk.de/main/threejs/) - [3D Grafik - WebGL mit three.js](https://xprofan.net/intl/de/php,html,js/3d-grafik-webgl-mit-three-js/) - [use your mouse to control the camera and build an andorid](https://hofk.de/main/threejs/raycaster/raycaster.html) +- [webgl examples](https://alteredqualia.com/) ### Tool diff --git a/math/pbr3ed.html b/math/pbr3ed.html index 89cf64a..5476537 100644 --- a/math/pbr3ed.html +++ b/math/pbr3ed.html @@ -38,6 +38,11 @@
5.4 Radiometry辐射度学

radiometry提供了一系列的主意和数学工具来描述light的传播和反射，它是形成渲染算法的基础，radiometry首先引入图形学不是因为物理光的原则，而是作为空间粒子的抽象光属性。

Radiative transfer辐射传输是radiant energy辐射能量传输的现象研究。辐射传输基于辐射原理和几何光学水平的操作，光的微波属性用来描述光与物体交互时比光的波长要长的。辐射度学与Maxwell经典方程描述了电子场域

在pbrt中，假设几何光学最需要

+

Energy能量，以joules\((\mathcal{J})\)焦耳为单位。光源发射光子photons，每个光子以特定波长并携带一定的能量。辐射量学就是以不同方式测量光子。一个光子在特定波长\(\lambda\)携带的能量是

+

$$\mathcal{Q}=\frac{hc}{\lambda}$$

+

其中的c是光速，h是普朗克常数

+

Flux通量，Radiant flux，是穿过表面surface或区域region of space的单位时间内的总能量

+

$$\Phi=\lim\limits_{{\Delta}t \to 0}\frac{{\Delta}Q}{{\Delta}t}=\frac{dQ}{dt}$$

diff --git a/nodejs/index.md b/nodejs/index.md index 1f0db22..dbbc79b 100644 --- a/nodejs/index.md +++ b/nodejs/index.md @@ -9,4 +9,9 @@ Parcel is a zero configuration build tool for the web -- [Parcel](https://parceljs.org/docs/) \ No newline at end of file +- [Parcel](https://parceljs.org/docs/) + +## 使用的库 + +- [jspdf](https://github.com/parallax/jsPDF) + - [npmjs](https://www.npmjs.com/package/jspdf) \ No newline at end of file diff --git a/web/nginx/9950.conf b/web/nginx/9950.conf index 65cdc7d..c0bec7c 100644 --- a/web/nginx/9950.conf +++ b/web/nginx/9950.conf @@ -1,5 +1,5 @@ server { - listen 9930; + listen 9950; server_name localhost; # charset utf-8; diff --git a/web/nginx/nginx.md b/web/nginx/nginx.md index 1e151d3..ac9839d 100644 --- a/web/nginx/nginx.md +++ b/web/nginx/nginx.md @@ -10,6 +10,9 @@ sudo apt-get update sudo apt-get install -y nginx sudo service nginx start 启动服务 sudo service nginx stop +nginx -s signal // stop quit reload reopen +nginx -h +nginx -t 测试配置 ``` ### 配置 diff --git a/web/nginx/update.ps1 b/web/nginx/update.ps1 index 15bd918..902b94a 100644 --- a/web/nginx/update.ps1 +++ b/web/nginx/update.ps1 @@ -10,10 +10,10 @@ xcopy /s /e /i /y win\nginx.conf e:\tools\nginx-1.25.0\conf\nginx.conf (Get-Content f:\meijie\lmj01.github.io\web\nginx\lmj01.conf) -Replace '/mnt/f/meijie/lmj01.github.io', 'f:/meijie/lmj01.github.io' | Set-Content e:\tools\nginx-1.25.0\conf\conf.d\lmj01.conf -# (Get-Content f:\meijie\lmj01.github.io\web\nginx\9930.conf) -Replace '/mnt/f/fullstack/mjdemo', 'f:/fullstack/mjdemo' | Set-Content e:\tools\nginx-1.25.0\conf\conf.d\9930.conf +(Get-Content f:\meijie\lmj01.github.io\web\nginx\9930.conf) -Replace '/mnt/f/fullstack/mjdemo', 'f:/fullstack/mjdemo' | Set-Content e:\tools\nginx-1.25.0\conf\conf.d\9930.conf # 临时的 -# (Get-Content f:\meijie\lmj01.github.io\web\nginx\9950.conf) -Replace '/mnt/f/fullstack/mjdemo', 'f:/fullstack/mjdemo' | Set-Content e:\tools\nginx-1.25.0\conf\conf.d\9950.conf +(Get-Content f:\meijie\lmj01.github.io\web\nginx\9950.conf) -Replace '/mnt/f/fullstack/mjdemo', 'F:\masteralign\vite-clinic\dist_ebrace' | Set-Content e:\tools\nginx-1.25.0\conf\conf.d\9950.conf # netstat -ano | findstr $str 查看端口占用 diff --git a/web/nginx/win/nginx.conf b/web/nginx/win/nginx.conf index 3e82fea..8aea39b 100644 --- a/web/nginx/win/nginx.conf +++ b/web/nginx/win/nginx.conf @@ -159,6 +159,10 @@ http { autoindex on; } + location ^~ /mjdemo { + return 301 http://127.0.0.1:9930/; + } + # 反向代理 # 前缀匹配 location ^~ /lmj01 { @@ -183,5 +187,9 @@ http { proxy_buffers 4 32k; proxy_busy_buffers_size 64k; } + + location ^~ /vue { + return 301 http://127.0.0.1:9950/; + } } }