8000 update by soxueren · Pull Request #1 · soxueren/3dtiles · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

update #1

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

Open
wants to merge 106 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
106 commits
Select commit Hold shift + click to select a range
3e955de
add b3dm to glb
fanvanzh Dec 13, 2018
6778990
Update README.md
fanvanzh Dec 13, 2018
3554dd7
kill some gltf warning..
fanvanzh Dec 18, 2018
59e564a
Merge branch 'master' of github.com:fanvanzh/3dtiles
fanvanzh Dec 18, 2018
6cddd8c
fix shapefile`s bug
fanvanzh Dec 26, 2018
de85b7e
change shapefile mesh to osg-mesh
fanvanzh Dec 26, 2018
f5a1e3c
shapefile mesh`s normal is still not correct
fanvanzh Dec 27, 2018
21d17ec
Every vertex belongs to only one triangle, then the normal look fine.
fanvanzh Dec 28, 2018
abb597c
nothing changed, but is seems solved a problem.
fanvanzh Dec 28, 2018
a212bd1
Update README.md
fanvanzh Jan 16, 2019
331bc2e
only support wgs-84 shapefile
fanvanzh Jan 25, 2019
eb499ea
Merge branch 'master' of github.com:fanvanzh/3dtiles
fanvanzh Jan 25, 2019
560fd0e
add png support
fanvanzh Feb 16, 2019
c541dae
Update README.md
fanvanzh Feb 28, 2019
d62eef7
Update README.md
fanvanzh Mar 7, 2019
e628870
#bug: shapefile geometry 为NULL 未判断。
fanvanzh Mar 11, 2019
b09fa1f
1、add test file
fanzhenhua0401 Apr 24, 2019
666670d
fix warning
fanzhenhua0401 Apr 25, 2019
5956385
fix warning
fanvanzh Apr 25, 2019
a4eba60
Update README.md
fanzhenhua0401 Apr 25, 2019
e9acc7a
Merge pull request #80 from fanzhenhua0401/patch-1
fanvanzh Apr 25, 2019
2f7cf86
Update README.md
fanvanzh May 17, 2019
3c87338
Update README.md
fanvanzh May 17, 2019
4eb3c2a
Update README.md
fanvanzh May 17, 2019
5d2d37e
change url to uri
fanvanzh May 17, 2019
70d9fe7
fixes idx order problem
May 20, 2019
f07d199
Merge pull request #85 from rainliang000/patch-1
fanvanzh May 23, 2019
278c706
Update README.md
fanvanzh May 31, 2019
b1e5aa2
shapefile 转3dtile增加高度等属性信息,支持实现 TileStyle
Jul 9, 2019
4be28b7
统一计算 offset 的地方
Jul 9, 2019
c4beaea
split shader material code
Jul 10, 2019
175c9e5
fix debug problem
Jul 10, 2019
dcbebf7
Update README.md
fanvanzh Jul 10, 2019
ca9dd37
Update README.md
fanvanzh Jul 19, 2019
896a6ee
update to cesium 1.50+ gltf format
Nov 16, 2019
33b6be4
test github workflow
fanvanzh Nov 21, 2019
dbce0f8
Update rust.yml
fanvanzh Nov 21, 2019
8c16544
copy target to bin
fanvanzh Nov 22, 2019
965d356
remove c# project
Dec 6, 2019
3c7561a
Merge branch 'master' of https://github.com/fanvanzh/3dtiles
Dec 6, 2019
29db774
Merge wkt support
Jan 15, 2020
5f15466
Update osgb23dtile.cpp
GitGaoXing Jun 9, 2020
64d3adb
Merge pull request #141 from GitGaoXing/master
fanvanzh Jun 9, 2020
00bf347
Update osgb23dtile.cpp
GitGaoXing Jun 11, 2020
677c71c
Update osgb23dtile.cpp
GitGaoXing Jun 11, 2020
62d2a01
Update Cargo.toml
fanvanzh Jun 13, 2020
76d1d1e
Update Cargo.toml
fanvanzh Jun 13, 2020
2539c61
Update main.rs
fanvanzh Jun 13, 2020
2075a42
Update rust.yml
fanvanzh Jun 13, 2020
94fa574
Update main.rs
fanvanzh Jun 13, 2020
efab1b0
Update build.rs
fanvanzh Jun 13, 2020
3e05c53
Update appveyor.yml
fanvanzh Jun 13, 2020
3e394d6
Update build.rs
fanvanzh Jun 13, 2020
c63e537
Merge pull request #142 from GitGaoXing/master
fanvanzh Jun 15, 2020
de7eb90
handle no normal case
Jun 17, 2020
35e1443
Merge pull request #144 from GitGaoXing/master
fanvanzh Jun 21, 2020
5395a39
Update tiny_gltf.h
fanvanzh Jun 28, 2020
351fafb
Update README.md
fanvanzh Jun 28, 2020
69621ac
test whether split will take owner of string?
fanvanzh Jul 11, 2020
8000 3d0c520
Update README.md
fanvanzh Oct 29, 2020
1e58593
shp支持解析z值
IKangXu Nov 9, 2020
c60d939
Merge pull request #159 from IKangXu/master
fanvanzh Dec 2, 2020
2f6d3bf
优化四叉树算法
super2013 Mar 4, 2021
382d0a6
Merge pull request #169 from super2013/master
fanvanzh Mar 22, 2021
61a67f8
Update README.md
fanvanzh Jun 16, 2021
b289fb0
Update external tileset generation code. Update README.md.
wewindy Jun 30, 2021
7f0f8af
Merge pull request #187 from onsummer/master
fanvanzh Jun 30, 2021
7873b99
fix multi-primitives osg
nicos-fan Jul 14, 2021
2e6e00f
support linux build
nicos-fan Jul 14, 2021
3cc694f
refactor multi-primitive osg process
nicos-fan Jul 16, 2021
f202e1e
update min/max error
nicos-fan Jul 16, 2021
8b90519
update github action
nicos-fan Jul 16, 2021
93a3ced
Update README.md
fanvanzh Jul 16, 2021
2d1fe22
1. gltf default value
nicos-fan Jul 17, 2021
bc0acc5
Merge branch 'master' of https://github.com/fanvanzh/3dtiles
nicos-fan Jul 17, 2021
af81292
add osgb/config/pbr json config
fanvanzh Jul 17, 2021
5a217f0
update README.md
fanvanzh Jul 17, 2021
9dde9df
update make_gltf
fanvanzh Jul 19, 2021
2278b78
ignore empty geometry
nicos-fan Jul 23, 2021
d540b5d
remove chinese comments
fanvanzh Jul 25, 2021
ad0ae2e
update download link
fanvanzh Jul 29, 2021
59f1591
add gl_triangle_strip/fan mode support
nicos-fan Dec 30, 2021
fe04fb5
KHR_materials_unlit support
nicos-fan Jan 4, 2022
0468bde
feature table binary must be aligned to an 8-byte boundary
wblong Jul 13, 2022
1fc5521
Merge pull request #233 from wblong/master
fanvanzh Jul 13, 2022
40d0f11
修复了当瓦片与原点距离过远时,可能会出现的坐标偏移问题。也许需要更多的测试数据。引入了glm和Eigen库
Steelwall2014 Apr 19, 2023
59dc2b2
修改了注释:最后并不是转换到原始osgb的投影坐标系,而是转换到原点的ENU坐标系中(当然也是投影坐标系)
Steelwall2014 Apr 22, 2023
f87d99e
Merge pull request #249 from Steelwall2014/master
fanvanzh May 31, 2023
405c2d0
add docker image
fanvanzh Aug 4, 2023
e9ce45b
Refer to public Docker image URL
pka Aug 18, 2023
a7c3000
Merge pull request #266 from pka/docker-url
fanvanzh Aug 30, 2023
af381be
Update osgb23dtile.cpp
longhuan2018 Oct 23, 2023
a844287
Update osgb23dtile.cpp
longhuan2018 Oct 23, 2023
1aebfb9
增加同时包含PagedLOD和非LOD节点数据的支持
longhuan2018 Oct 24, 2023
3589cd7
remove space difference
longhuan2018 Oct 24, 2023
6b78551
删除误上传的临时文件
longhuan2018 Oct 24, 2023
dd39111
Merge pull request #276 from longhuan2018/fix-empty-geometry
fanvanzh Nov 17, 2023
3e6ece2
Merge branch 'master' into support-nolod-geometry
fanvanzh Nov 17, 2023
6cbecbb
Merge pull request #275 from longhuan2018/fix-string-replace
fanvanzh Nov 17, 2023
b7f2154
Merge pull request #277 from longhuan2018/support-nolod-geometry
fanvanzh Nov 17, 2023
52d124c
Update root.box
fanvanzh May 17, 2024
e8b4b58
Update osgb.rs
fanvanzh May 21, 2024
14c5662
[CI] github workspace for rust (#305)
fanvanzh May 21, 2024
f3d6f9c
[CI] matrix-os build (#306)
fanvanzh May 23, 2024
2ccd70d
修复 GeoTransform.h 中的条件编译指令,添加 MacOS 支持,更新编译说明 (#330)
jas0n1ee Mar 31, 2025
0d1f5de
Update README.md, fix path errors in the Windows version, fix gihub u…
yuanrui Apr 16, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
19 changes: 19 additions & 0 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# 使用官方 Rust 镜像作为基础镜像
FROM rust:latest

# (可选)安装额外工具
RUN apt-get update && apt-get install -y \
git \
pkg-config \
libc6-dev \
m4 \
gcc \
libgdal-dev \
libopenscenegraph-dev \
&& rm -rf /var/lib/apt/lists/*

# 设置工作目录
WORKDIR /workspace

# (可选)设置环境变量,如果需要的话
ENV PATH="/root/.cargo/bin:${PATH}"
13 changes: 13 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"name": "Rust Environment",
"context": "..",
"build": {
"dockerfile": "Dockerfile"
},
"settings": {
"terminal.integrated.shell.linux": "/bin/bash"
},
"extensions": [
"rust-lang.rust-analyzer"
]
}
21 changes: 21 additions & 0 deletions .github/workflows/linux.yml
8000
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: Ubuntu

on: [push]
jobs:
build-and-test:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4

- name: Install dependencies on Ubuntu
if: runner.os == 'Linux'
run: |
sudo apt-get update
sudo apt-get install -y g++ libgdal-dev libopenscenegraph-dev

- name: Build
run: cargo build --verbose --release

- name: Test
run: cargo test --verbose
30 changes: 30 additions & 0 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: Windows

on: [push]
jobs:
build-and-test:
runs-on: windows-latest

steps:
- uses: actions/checkout@v4

- name: Cache dependencies
uses: actions/cache@v4
id: cache-vcpkg
with:
path: ./vcpkg
key: ${{ runner.os }}-vcpkg-${{ hashFiles('**/build.rs') }}
restore-keys: |
${{ runner.os }}-vcpkg-

- name: Install dependencies on Windows
if: steps.cache-vcpkg.outputs.cache-hit != 'true'
run: |
git clone https://github.com/microsoft/vcpkg.git
./vcpkg/bootstrap-vcpkg.bat
./vcpkg/vcpkg install gdal:x64-windows-release
./vcpkg/vcpkg install osg:x64-windows-release
tree ./vcpkg/installed /F /A

- name: Build
run: cargo build --verbose --release
21 changes: 0 additions & 21 deletions .travis.yml

This file was deleted.

11 changes: 6 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name = "3dtile"
name = "_3dtile"
version = "0.1.0"
authors = ["fanzhenhua <fanzhenhua@superengine.com.cn>"]

Expand All @@ -10,14 +10,15 @@ chrono = "0.4"
rayon = "1.0"

# serilaze
serde = "1.0"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
serde_derive = "1.0"
serde-xml-rs = "0.2.1"
serde-xml-rs = "0.4"

# log
log = "0.4"
env_logger = "0.5"
#

byteorder = "1.2"
[build-dependencies]
cc = "1.0.*"
cc = "1.0.*"
Loading
0