Skip to content

Fixed moving in Blender UI and refresh for relative paths #18

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

Merged
merged 32 commits into from
May 12, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
25216ea
Added Enable/Disable All and the option to select a root directory fo…
Dec 7, 2022
2344d8e
Added first version of bin file format
justo46 Mar 7, 2023
0f575de
Added bin.py
justo46 Mar 9, 2023
cf201a8
Fixed byte errors and store the rest of the bytes in an (unused) list
justo46 Mar 13, 2023
66a2180
Added 1 main commit
justo46 Mar 13, 2023
7cb6fe1
Added main commit
justo46 Mar 13, 2023
f410be3
Merge commit
justo46 Mar 13, 2023
5f8be5a
Added a button to select multiple sequences
justo46 Mar 15, 2023
30cd9b4
Added the functionality to import multiple sequences (in top menu and…
justo46 Mar 27, 2023
ea852b9
Added object property for initial transformation matrix, made for mul…
justo46 Mar 27, 2023
341cbad
Added install script
justo46 Mar 29, 2023
fb9f982
Fixed keyframe animation system to work with other transformations
justo46 Mar 29, 2023
f6c5ac2
Optimized adding meshio objects and added a button to refresh the seq…
justo46 Mar 29, 2023
c8d12e2
Fixed keyframe system for multiple files
justo46 Mar 31, 2023
31fc32b
Merge remote-tracking branch 'upstream/main'
justo46 Mar 31, 2023
7c276a0
Deleted install file from repo, since this is a local file.
justo46 Mar 31, 2023
53d9cfd
Resolved further changes
justo46 Mar 31, 2023
f38ae77
Updated version + test to import MeshIO Objects
justo46 Mar 31, 2023
1903ce3
Updated version
justo46 Mar 31, 2023
a7d5e99
Deleted some comments and made the code easier to read
justo46 Mar 31, 2023
d9bebfa
Further code improvements
justo46 Mar 31, 2023
785d229
Removed bin.py
justo46 Mar 31, 2023
7f70202
Deleted import of bin.py and corrected version
justo46 Mar 31, 2023
c120f7d
Fixed transforming via viewport (except for .bin)
justo46 Apr 7, 2023
d9d5c78
This breaks the bin format but enables in-view transformations again
justo46 Apr 17, 2023
784954a
Merge branch 'main' of https://github.com/justo46/blender-sequence-lo…
justo46 Apr 17, 2023
7ac8423
Deleted property & Fix refresh for relative paths
justo46 May 4, 2023
5d962fc
Deleted old comment
justo46 May 4, 2023
0b984c3
Added set to timeline button
justo46 May 4, 2023
c799519
Set timeline button is atm working on select obj!
justo46 May 4, 2023
1b8c070
Better set timeline button
justo46 May 10, 2023
2fcf0a7
Fixed start and end frames
justo46 May 10, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Further code improvements
  • Loading branch information
justo46 committed Mar 31, 2023
commit d9bebfa9df227db26c6f5ec683d5a83718e45c51
1 change: 0 additions & 1 deletion additional_file_formats/bin.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@ def readBIN_to_meshio(filepath):

i += 1


mesh.field_data = field_datas[0]

return mesh
Expand Down
4 changes: 0 additions & 4 deletions bseq/importer.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,6 @@ def has_keyframe(obj, attr):

def apply_transformation(meshio_mesh, obj, depsgraph):
# evaluate the keyframe animation system
eval_transform_matrix = mathutils.Matrix.Identity(4)

eval_location = obj.evaluated_get(depsgraph).location if has_keyframe(obj, "location") else None
eval_scale = obj.evaluated_get(depsgraph).scale if has_keyframe(obj, "scale") else None

Expand Down Expand Up @@ -94,10 +92,8 @@ def update_mesh(meshio_mesh, mesh):
n_poly = 0
n_loop = 0
n_verts = len(mesh_vertices)

if n_verts == 0:
return

faces_loop_start = np.array([], dtype=np.uint64)
faces_loop_total = np.array([], dtype=np.uint64)
loops_vert_idx = np.array([], dtype=np.uint64)
Expand Down
5 changes: 2 additions & 3 deletions bseq/operators.py
Original file line number Diff line number Diff line change
Expand Up @@ -343,11 +343,10 @@ def execute(self, context):
matching_seqs = [s for s in seqs if fp in list(s) and s not in used_seqs]

if matching_seqs:
s = matching_seqs[0]
transform_matrix = (Matrix.LocRotScale(importer_prop.custom_location, importer_prop.custom_rotation, importer_prop.custom_scale)
if importer_prop.use_custom_transform else Matrix.Identity(4))
create_obj(s, False, importer_prop.root_path, transform_matrix=transform_matrix)
used_seqs.add(s)
create_obj(matching_seqs[0], False, importer_prop.root_path, transform_matrix=transform_matrix)
used_seqs.add(matching_seqs[0])
return {'FINISHED'}

class WM_OT_MeshioObject(bpy.types.Operator, ImportHelper):
Expand Down