Skip to content

Commit

Permalink
Refactored some of the road textures.
Browse files Browse the repository at this point in the history
Fixed the batch files.
Added _pycache to git ignore.
  • Loading branch information
astrofra committed Nov 27, 2022
1 parent 44d71ff commit fba6971
Show file tree
Hide file tree
Showing 31 changed files with 75 additions and 23 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/app/assets
/app/__pycache__
/app/bin
/app/bin
/bin/harfang/__pycache__
2 changes: 1 addition & 1 deletion 1-build_assets.bat
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
app\bin\harfang\assetc\assetc.exe app\resources app\assets
bin\assetc\assetc.exe app\resources app\assets
pause
2 changes: 1 addition & 1 deletion 2-run.bat
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
cd app
python main.py
..\bin\python\python.exe main.py
pause
Empty file removed app/bin/harfang/.gitkeep
Empty file.
Empty file removed app/bin/harfang/assetc/.gitkeep
Empty file.
Original file line number Diff line number Diff line change
Expand Up @@ -150,12 +150,12 @@
"textures": [
{
"name": "uBaseOpacityMap",
"path": "road_blocks/block_highway_turn_in/diffuse_cement_dirty_03.png",
"path": "common_maps/diffuse_cement_dirty_03.png",
"stage": 0
},
{
"name": "uOcclusionRoughnessMetalnessMap",
"path": "road_blocks/block_highway_turn_in/spec_cement_dirty_03.png",
"path": "common_maps/spec_cement_dirty_03.png",
"stage": 1
}
],
Expand Down Expand Up @@ -211,7 +211,7 @@
},
{
"name": "uOcclusionRoughnessMetalnessMap",
"path": "road_blocks/block_highway_turn_in/spec_3ways_01.png",
"path": "common_maps/spec_3ways_01.png",
"stage": 1
}
],
Expand Down Expand Up @@ -267,7 +267,7 @@
},
{
"name": "uOcclusionRoughnessMetalnessMap",
"path": "road_blocks/block_highway_turn_in/spec_3ways_01.png",
"path": "common_maps/spec_3ways_01.png",
"stage": 1
}
],
Expand Down Expand Up @@ -318,12 +318,12 @@
"textures": [
{
"name": "uBaseOpacityMap",
"path": "road_blocks/block_highway_turn_in/diffuse_middle_wall.png",
"path": "common_maps/diffuse_middle_wall.png",
"stage": 0
},
{
"name": "uOcclusionRoughnessMetalnessMap",
"path": "road_blocks/block_highway_turn_in/spec_metal_red.png",
"path": "common_maps/spec_metal_red.png",
"stage": 1
}
],
Expand Down Expand Up @@ -374,12 +374,12 @@
"textures": [
{
"name": "uBaseOpacityMap",
"path": "road_blocks/block_highway_turn_in/diffuse_road_sides.png",
"path": "common_maps/diffuse_road_sides.png",
"stage": 0
},
{
"name": "uOcclusionRoughnessMetalnessMap",
"path": "road_blocks/block_highway_turn_in/spec_road_sides.png",
"path": "common_maps/spec_road_sides.png",
"stage": 1
}
],
Expand Down Expand Up @@ -430,12 +430,12 @@
"textures": [
{
"name": "uBaseOpacityMap",
"path": "road_blocks/block_highway_turn_in/diffuse_blank_field_tile.png",
"path": "common_maps/diffuse_blank_field_tile.png",
"stage": 0
},
{
"name": "uOcclusionRoughnessMetalnessMap",
"path": "road_blocks/block_highway_turn_in/spec_grass.png",
"path": "common_maps/spec_grass.png",
"stage": 1
}
],
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -150,12 +150,12 @@
"textures": [
{
"name": "uBaseOpacityMap",
"path": "road_blocks/block_highway_turn_out/diffuse_cement_dirty_03.png",
"path": "common_maps/diffuse_cement_dirty_03.png",
"stage": 0
},
{
"name": "uOcclusionRoughnessMetalnessMap",
"path": "road_blocks/block_highway_turn_out/spec_cement_dirty_03.png",
"path": "common_maps/spec_cement_dirty_03.png",
"stage": 1
}
],
Expand Down Expand Up @@ -211,7 +211,7 @@
},
{
"name": "uOcclusionRoughnessMetalnessMap",
"path": "road_blocks/block_highway_turn_out/spec_3ways_01.png",
"path": "common_maps/spec_3ways_01.png",
"stage": 1
}
],
Expand Down Expand Up @@ -267,7 +267,7 @@
},
{
"name": "uOcclusionRoughnessMetalnessMap",
"path": "road_blocks/block_highway_turn_out/spec_3ways_01.png",
"path": "common_maps/spec_3ways_01.png",
"stage": 1
}
],
Expand Down Expand Up @@ -318,12 +318,12 @@
"textures": [
{
"name": "uBaseOpacityMap",
"path": "road_blocks/block_highway_turn_out/diffuse_middle_wall.png",
"path": "common_maps/diffuse_middle_wall.png",
"stage": 0
},
{
"name": "uOcclusionRoughnessMetalnessMap",
"path": "road_blocks/block_highway_turn_out/spec_metal_red.png",
"path": "common_maps/spec_metal_red.png",
"stage": 1
}
],
Expand Down Expand Up @@ -374,12 +374,12 @@
"textures": [
{
"name": "uBaseOpacityMap",
"path": "road_blocks/block_highway_turn_out/diffuse_road_sides.png",
"path": "common_maps/diffuse_road_sides.png",
"stage": 0
},
{
"name": "uOcclusionRoughnessMetalnessMap",
"path": "road_blocks/block_highway_turn_out/spec_road_sides.png",
"path": "common_maps/spec_road_sides.png",
"stage": 1
}
],
Expand Down Expand Up @@ -430,12 +430,12 @@
"textures": [
{
"name": "uBaseOpacityMap",
"path": "road_blocks/block_highway_turn_out/diffuse_blank_field_tile.png",
"path": "common_maps/diffuse_blank_field_tile.png",
"stage": 0
},
{
"name": "uOcclusionRoughnessMetalnessMap",
"path": "road_blocks/block_highway_turn_out/spec_grass.png",
"path": "common_maps/spec_grass.png",
"stage": 1
}
],
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
File renamed without changes.
8 changes: 8 additions & 0 deletions bin/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Run in standalone mode

The `bin\` includes several external modules allowing this project to run as a standalone application (on Windows especially).

The `bin\`folder includes several other folders:
* `assetc\`, the [HARFANG asset compiler](https://www.harfang3d.com/releases).
* `harfang\`, the [HARFANG engine](https://www.harfang3d.com/releases) (unpacked wheel).
* `python\`, Python (3.8, 3.9, 3.10) [Windows embeddable package](https://www.python.org/downloads/release/python-383/).
23 changes: 23 additions & 0 deletions bin/assetc/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Run in standalone mode

## Content of bin\assetc

**On Windows**

```
toolchains\
assetc.exe
glfw3.dll
harfang.dll
lua.exe
lua53.dll
```

**On Linux**

```
toolchains\
assetc
libglfw3.so
liblua53.so
```
11 changes: 11 additions & 0 deletions bin/harfang/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Run in standalone mode

## Content of bin\harfang

```
glfw3.dll
harfang.pyd
lua53.dll
openvr_api.dll
__init__.py
```
9 changes: 9 additions & 0 deletions bin/python/python38._pth
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
python38.zip
.
..\
..\harfang\
..\..\app\

# Uncomment to run site.main() automatically
#import site

0 comments on commit fba6971

Please sign in to comment.