Skip to content
This repository has been archived by the owner on Apr 5, 2020. It is now read-only.

Commit

Permalink
18.0619
Browse files Browse the repository at this point in the history
18.0619
  • Loading branch information
Yethiel committed Jun 19, 2018
2 parents be807be + fd4c8d6 commit 7f7eed8
Show file tree
Hide file tree
Showing 13 changed files with 284 additions and 254 deletions.
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
# Changelog

## 2018-06-19

Version [`rva_18.0619`](https://github.com/Yethiel/re-volt-addon/releases/tag/rva_18.0619)

**Topics**: Bugfixes

- **Fixes**
- Support loading files with uppercase letters
- Throw an error message when exceeding polygon/vertex limits for meshes
- Activate NCP no-collision flag (reported by Kiwi)
- **Modifications**
- Inverted alpha vertex color layer: Black is translucent, white is opaque. I've done this to resemble the behavior of pure black on textures.

## 2018-04-30

Version [`rva_18.0430`](https://github.com/Yethiel/re-volt-addon/releases/tag/rva_18.0430)
Expand Down
109 changes: 60 additions & 49 deletions docs/html/index.html

Large diffs are not rendered by default.

4 changes: 1 addition & 3 deletions docs/src/01.introduction.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ title: Re-Volt Add-On Documentation
This is the documentation for Marv's Add-On for Re-Volt files.
It is intended to be used with [**Blender 2.79b**](https://www.blender.org/download/) or newer.

[**Download** (rva_18.0430)](https://github.com/Yethiel/re-volt-addon/releases/tag/rva_18.0430)
[**Download** (rva_18.0619)](https://github.com/Yethiel/re-volt-addon/releases/tag/rva_18.0619)


[Tutorial](http://learn.re-volt.io)
Expand All @@ -21,7 +21,5 @@ It is intended to be used with [**Blender 2.79b**](https://www.blender.org/downl

Please report Bugs and suggest features on [GitHub](https://github.com/Yethiel/re-volt-addon/issues).

**Only one BigCube**:
Only one BigCube is written around the entire level. This shouldn't impact performance too much, a fix should come eventually. WorldCut can be used to achieve better performance in-game.

---
13 changes: 13 additions & 0 deletions docs/src/04.properties.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

This panel is at the far bottom of the Object section of the object properties.
You may use the right top edge to drag it further up.
Some properties from Blender are used as well, such as vertex colors.
Vertex color layers can be found in the object data section (symbol with three dots).

**Big Cube Properties**:
This only shows when a big cube is selected.
Expand All @@ -22,4 +24,15 @@ You may use the right top edge to drag it further up.
**Texture Animations**:
Texture animation dictionaries for .w files saved as a string. This property can be edited with the texture animation panel in edit mode.


### Mesh Properties

#### Vertex Colors

Generally, meshes can have the following vertex color layers:

**Col**: The color/shade
**Alpha**: The translucency of the vertex/polygon. White is completely opaque (visible), black is completely transparent (invisible). This layer will only be used if the *translucent* flag is set in the face properties.
**Env**: The environment color (reflection). This layer is used for meshes and polygons of .w files. The env flag needs to be set in order for faces to use it.

---
4 changes: 1 addition & 3 deletions docs/src/footer.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
---

Copyright © Huki, Jigebren and Marv 2018
Webpage: [https://rvgl.re-volt.io](http://rvgl.re-volt.io)
Email: [email protected]
[https://re-volt.io](http://re-volt.io)
8 changes: 4 additions & 4 deletions io_revolt/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@
bl_info = {
"name": "Re-Volt",
"author": "Marvin Thiel",
"version": (18, 4, 30),
"blender": (2, 79, 2),
"version": (18, 6, 19),
"blender": (2, 79, 0),
"location": "File > Import-Export",
"description": "Import and export Re-Volt file formats.",
"wiki_url": "https://yethiel.github.io/re-volt-addon/",
Expand Down Expand Up @@ -127,7 +127,8 @@ def register():
bpy.types.INFO_MT_file_import.prepend(menu_func_import)
bpy.types.INFO_MT_file_export.prepend(menu_func_export)

bpy.app.handlers.scene_update_post.append(edit_object_change_handler)
bpy.app.handlers.scene_update_pre.append(edit_object_change_handler)
# bpy.app.handlers.scene_update_post.append(edit_object_change_handler)


def unregister():
Expand All @@ -145,4 +146,3 @@ def unregister():
register()

dprint("Re-Volt add-on registered.")

29 changes: 6 additions & 23 deletions io_revolt/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,33 +105,15 @@
]

MATERIALS = (
( # None
"-1",
"NONE",
"No material. Faces with this material will not be exported.",
"POTATO",
-1
),
("-1", "NONE", "No material. Faces with this material will not be exported.", "POTATO", -1),
("0", "DEFAULT", "Default material", "POTATO", 0),
("1", "MARBLE", "Marble material", "POTATO", 1),
("2", "STONE", "Stone material", "POTATO", 2),
("3", "WOOD", "Wood material", "POTATO", 3),
("4", "SAND", "Sand material", "POTATO", 4),
("5", "PLASTIC", "Plastic material", "POTATO", 5),
( # Carpet Tile
"6",
"CARPETTILE",
"Carpet Tile material",
"POTATO",
6
),
( # Carpet Shag
"7",
"CARPETSHAG",
"Carpet Shag material",
"POTATO",
7
),
("6", "CARPETTILE", "Carpet Tile material", "POTATO", 6),
("7", "CARPETSHAG", "Carpet Shag material", "POTATO", 7),
("8", "BOUNDARY", "Boundary material", "POTATO", 8),
("9", "GLASS", "Glass material", "POTATO", 9),
("10", "ICE1", "Most slippery ice material", "FREEZE", 10),
Expand Down Expand Up @@ -505,9 +487,9 @@ def queue_error(action, error_message):
def get_errors():
global ERRORS
if ERRORS:
errors = "The following errors have been encountered:\n"
errors = "The following errors have been encountered:\n\n"
for error in ERRORS:
errors += "Error while {}: {}\n".format(error, ERRORS[error])
errors += "~ ERROR while {}:\n {}\n\n".format(error, ERRORS[error])
errors += "Check the console for more information."
else:
errors = "Successfully completed."
Expand Down Expand Up @@ -665,6 +647,7 @@ def get_format(fstr):
"""
Gets the format by the ending and returns an int
"""
fstr = fstr.lower() # support uppercase letters
if os.sep in fstr:
fstr = fstr.split(os.sep)[-1]
try:
Expand Down
5 changes: 0 additions & 5 deletions io_revolt/hul_in.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,6 @@ def import_hull(filepath, scene):
import_chull(chull, scene, filepath.rsplit(os.sep, 1)[1])




def import_chull(chull, scene, filename):
dprint("Importing convex hull...")

Expand All @@ -67,11 +65,8 @@ def import_chull(chull, scene, filename):
print("FACE-----------------")
verts = []
for vert in chull.vertices:
# print(vert)
if face.contains_vertex(vert):
print(" FOUND FITTING VERTEX")
position = to_blender_coord(vert)

# Creates vertices
v = bm.verts.new(Vector((position[0], position[1], position[2])))
verts.append(v)
Expand Down
Loading

0 comments on commit 7f7eed8

Please sign in to comment.