Skip to content

Conversation

@alexguirre
Copy link
Contributor

When a drawable hash was unknown, it kept the "filename.#dd" name so exporting to XML lost the hash and importing it back created a broken file.

Now if the hash is unknown, the name is set to hash_1234ABCD, and XML import checks for hash_.

When a drawable hash was unknown, it kept the "filename.#dd" name so
exporting to XML lost the hash and importing it back created a broken
file.

Now if the hash is unknown, the name is set to `hash_1234ABCD`, and XML
import checks for `hash_`.
@dexyfex
Copy link
Owner

dexyfex commented Jul 9, 2024

It's so crazy that I feel like I've fixed this same issue twice before in CodeWalker, but it always keeps appearing...
Anyway I think the safest approach to really solve the issue is to be consistent with CodeX, which is to have a separate property/field for the hash, which is only used when it's in a dictionary like this. Then the original ".#dd" name string can be naturally preserved in the XML, but the hash field can contain the actual hash.
I'll implement this approach over the coming days and then close this PR, assuming you don't see any issues with my proposal here. And I guess Sollumz will have to support this as well so as not to cause problems.

@alexguirre
Copy link
Contributor Author

The only concern I have is that there still are (unfortunately) plenty of people using older Sollumz versions, either because they prefer some old workflow, are trying to follow some old tutorial or can't update to Blender 4.0+ (they increased system requirements and already had a few people on Discord asking if Sollumz would have new updates for Blender 3.6).

With this PR, Sollumz doesn't need any changes. At this point, not sure if changing the CW XML format will just cause more confusion/people asking for help when CW/Sollumz versions don't match, without much gain. Kinda why I have avoided making PRs solving unknowns in drawables/fragments XMLs and only updated Sollumz UI.

Otherwise, having both fields in XML is probably safest, yeah.

@dexyfex
Copy link
Owner

dexyfex commented Jul 9, 2024

Hmm, I see the potential issue there, I had no idea about increased requirements for Blender 4.0 so I guess that does complicate matters slightly.. Although I guess users will have to move on from Blender 3 eventually,
There's also PR #232 which involves updating XML (but for fragments), which presumably would have the same issue... I guess the best way forward here might be to try and coordinate our next releases so users can update both CodeWalker and Sollumz at the same time, and at least the users stuck on old Blender can maybe still use an old CodeWalker.
I think these are the only two changes which could affect XML/Sollumz, but if any others come up I'll note them here. I'll also leave processing these updates until last, which will probably be early next week. Hopefully we can decide on the best course of action before then.

@dexyfex dexyfex merged commit 10ea57e into dexyfex:master Jul 25, 2024
HeadshotsOps added a commit to HeadshotsOps/CodeWalker that referenced this pull request Sep 14, 2024
commit c45ea83
Merge: 30873a2 36c20e8
Author: dexyfex <[email protected]>
Date:   Sat Aug 17 09:15:54 2024 +1000

    Merge pull request dexyfex#265 from niekschoemaker/patch-1

    Fix SetEdgeIndex in BoundBVH.BuildBVH

commit 36c20e8
Author: Niek <[email protected]>
Date:   Sat Aug 10 02:57:46 2024 +0200

    Update Bounds.cs

commit 30873a2
Author: ook3D <[email protected]>
Date:   Tue Aug 6 20:52:27 2024 -0400

    add hashed vfx ymt names (dexyfex#263)

    Add missing MetaNames

commit 0b1c59d
Author: dexy <[email protected]>
Date:   Wed Aug 7 10:48:13 2024 +1000

    Support PSO string arrays in XML

commit a8dc98f
Author: dexy <[email protected]>
Date:   Mon Aug 5 20:24:59 2024 +1000

    Save startup position and time of day options, Reset settings button

commit 07756e4
Merge: 2ced29a 43c3567
Author: dexyfex <[email protected]>
Date:   Mon Aug 5 16:12:43 2024 +1000

    Merge pull request dexyfex#262 from alexguirre/fix-dec3n-to-rgba8-snorm

    Replace Dec3N vertex format with RGBA8 SNorm

commit 2ced29a
Author: dexy <[email protected]>
Date:   Mon Aug 5 16:04:56 2024 +1000

    Fix updating entity position/rotation from project window

commit 43c3567
Author: alexguirre <[email protected]>
Date:   Sat Aug 3 15:07:41 2024 +0200

    Replace Dec3N vertex format with RGBA8 SNorm

    The game uses DXGI_FORMAT_R8G8B8A8_SNORM when building the D3D11
    input-layout for what CW called Dec3N.

    Updated XML import/export to correctly read these values.

commit 3d22e9b
Author: dexy <[email protected]>
Date:   Sat Jul 27 13:40:12 2024 +1000

    Fix up/down arrow select in project window, Fix selecting project audio placements

commit 76d0ac2
Author: dexy <[email protected]>
Date:   Sat Jul 27 10:36:31 2024 +1000

    Don't generate VerticesShrunk and Octants for BoundBVH

commit 09d7cf6
Author: dexy <[email protected]>
Date:   Fri Jul 26 20:48:42 2024 +1000

    Add better error message for AWC encrypting stream of wrong length

commit d5ac5e8
Author: dexy <[email protected]>
Date:   Fri Jul 26 12:52:19 2024 +1000

    Support AWC encryption

commit 10ea57e
Merge: 4b65af9 d136c55
Author: dexyfex <[email protected]>
Date:   Thu Jul 25 19:50:17 2024 +1000

    Merge pull request dexyfex#258 from alexguirre/fix-hashed-ydd

    Fix .ydd export/import with unsolved hashes

commit 4b65af9
Author: dexy <[email protected]>
Date:   Thu Jul 25 18:09:37 2024 +1000

    Fix for BoundVertex going out of range on XML import

commit 05bd42f
Author: dexy <[email protected]>
Date:   Wed Jul 24 16:29:58 2024 +1000

    Audio Ambient Rule Panel clean-up

commit d0cdb1b
Author: dexy <[email protected]>
Date:   Wed Jul 24 13:31:04 2024 +1000

    Updated Dec3N XML conversion. Ported BoundGeometry.VerticesShrunk code from rageAm. Added Track2AnimUV shader param name

commit b62162c
Author: dexy <[email protected]>
Date:   Mon Jul 22 22:44:38 2024 +1000

    Fixed loading cache_y.dat files

commit 97c2471
Author: dexy <[email protected]>
Date:   Mon Jul 22 21:06:18 2024 +1000

    Fixed YED/XML conversion

commit 5d3849b
Author: dexy <[email protected]>
Date:   Fri Jul 19 15:24:02 2024 +1000

    Improved resource packing, possibly

commit 5fe554f
Merge: 591bef0 880f880
Author: dexyfex <[email protected]>
Date:   Thu Jul 18 17:27:06 2024 +1000

    Merge pull request dexyfex#260 from ook3D/master

    fix rel reading / writing

commit 591bef0
Author: dexy <[email protected]>
Date:   Thu Jul 18 17:00:48 2024 +1000

    PR dexyfex#256 but with IsProportional and TracksPointDir fixes

commit bc48e0e
Author: dexy <[email protected]>
Date:   Thu Jul 18 15:23:29 2024 +1000

    PR dexyfex#251 with additional fix

commit e316115
Author: dexy <[email protected]>
Date:   Thu Jul 18 14:51:35 2024 +1000

    Improved EditYmapEntityPanel layout

commit 880f880
Author: ook3d <[email protected]>
Date:   Thu Jul 18 00:20:40 2024 -0400

    fix rel reading / writing

commit d049e3a
Author: dexy <[email protected]>
Date:   Thu Jul 18 14:05:49 2024 +1000

    PR dexyfex#235 also enable light culling plane by flag

commit 29530a0
Author: dexy <[email protected]>
Date:   Thu Jul 18 06:13:45 2024 +1000

    Fix anchoring on edit audio panels, fix line endings on RelFile.cs

commit f5a6375
Author: dexy <[email protected]>
Date:   Wed Jul 17 18:00:55 2024 +1000

    PR dexyfex#230 and dexyfex#248 with extra audio editing improvements

commit 124180c
Author: dexy <[email protected]>
Date:   Tue Jul 16 08:55:24 2024 +1000

    Add TimeArchetype flag name and adjust edit entity and archetype panels to better fit hash labels

commit c67adfd
Author: dexy <[email protected]>
Date:   Tue Jul 16 08:16:51 2024 +1000

    Adjust ScenarioChainEdge combo boxes and ScenarioCluster checkbox to fit updated items

commit c7a9438
Merge: 58ef636 7167194
Author: dexyfex <[email protected]>
Date:   Tue Jul 16 08:06:31 2024 +1000

    Merge pull request dexyfex#254 from ook3D/merge-8

    update scenario chain NavSpeed, Cluster point unknowns

commit 58ef636
Author: dexy <[email protected]>
Date:   Tue Jul 16 07:59:23 2024 +1000

    Adjust TrainNodeTypeComboBox width to fit updated items

commit a92ce59
Merge: 5e3dfff 58cf06e
Author: dexyfex <[email protected]>
Date:   Tue Jul 16 07:43:24 2024 +1000

    Merge pull request dexyfex#253 from ook3D/merge-6

    Update ymap entity flags

commit 5e3dfff
Merge: f01644a 3462cc3
Author: dexyfex <[email protected]>
Date:   Tue Jul 16 07:42:34 2024 +1000

    Merge pull request dexyfex#250 from ook3D/merge-3

    Update train node types

commit f01644a
Author: dexy <[email protected]>
Date:   Fri Jul 12 14:55:53 2024 +1000

    PR dexyfex#249 but only for Release build

commit d83135d
Author: dexy <[email protected]>
Date:   Fri Jul 12 13:48:43 2024 +1000

    PR dexyfex#236 but with minor improvements

commit 6d24603
Author: dexy <[email protected]>
Date:   Fri Jul 12 12:36:32 2024 +1000

    PR dexyfex#241 but maybe slightly optimized

commit e5dc63f
Author: dexy <[email protected]>
Date:   Fri Jul 12 11:39:52 2024 +1000

    PR dexyfex#51 but updated, also PR dexyfex#252

commit 6cf72c4
Author: dexy <[email protected]>
Date:   Fri Jul 12 09:43:53 2024 +1000

    PR dexyfex#221 changes

commit 2524352
Author: dexy <[email protected]>
Date:   Fri Jul 12 09:14:56 2024 +1000

    PR dexyfex#85 but ported ColourPicker from CodeX instead

commit bad84d7
Author: dexy <[email protected]>
Date:   Thu Jul 11 10:51:17 2024 +1000

    PR dexyfex#219 but neater and allowing debugging in VS

commit 86044e2
Author: dexy <[email protected]>
Date:   Thu Jul 11 10:00:27 2024 +1000

    PR dexyfex#187 but not dexyfex#238 fix for English expert

commit 92bdf65
Author: dexy <[email protected]>
Date:   Thu Jul 11 09:53:09 2024 +1000

    PR dexyfex#182 but slightly nicer

commit 27a0746
Author: dexy <[email protected]>
Date:   Thu Jul 11 09:25:01 2024 +1000

    PR dexyfex#223 but slightly nicer

commit 9b8331e
Author: dexy <[email protected]>
Date:   Wed Jul 10 22:31:16 2024 +1000

    PR dexyfex#84 changes

commit d136c55
Author: alexguirre <[email protected]>
Date:   Sat Jul 6 23:28:23 2024 +0200

    Fix .ydd export/import with unsolved hashes

    When a drawable hash was unknown, it kept the "filename.#dd" name so
    exporting to XML lost the hash and importing it back created a broken
    file.

    Now if the hash is unknown, the name is set to `hash_1234ABCD`, and XML
    import checks for `hash_`.

commit 7167194
Author: ook3d <[email protected]>
Date:   Tue Jul 2 21:18:10 2024 -0400

    Update Scenario Point Cluster Unknowns

commit 21242cf
Author: ook3d <[email protected]>
Date:   Mon May 20 16:29:57 2024 -0400

    update scenario chain NavSpeed

commit 58cf06e
Author: ook3d <[email protected]>
Date:   Sun May 19 17:45:23 2024 -0400

    Update ymap entity flags

commit 3462cc3
Author: ook3d <[email protected]>
Date:   Sun May 19 17:28:11 2024 -0400

    Update train node types

    correct names and add missing 6th train node type

commit f9a3559
Merge: 332b751 dc449b0
Author: dexyfex <[email protected]>
Date:   Wed Dec 13 09:24:38 2023 +1100

    Merge pull request dexyfex#225 from nikez/master

    fix: type06 data types

commit 332b751
Merge: d04d11c 370de41
Author: dexyfex <[email protected]>
Date:   Wed Dec 13 09:24:00 2023 +1100

    Merge pull request dexyfex#226 from ook3D/master

    Update Unknown Values And Flags

commit d04d11c
Author: dexy <[email protected]>
Date:   Wed Dec 13 09:19:28 2023 +1100

    Expressions research from alexguirre

commit f473fb6
Author: dexy <[email protected]>
Date:   Wed Dec 13 09:17:43 2023 +1100

    Fix for GTAV exe update

commit 370de41
Author: ook3d <[email protected]>
Date:   Sat Nov 25 22:53:37 2023 -0500

    Update Unknown Flags and Values

commit dc449b0
Author: Nikez <[email protected]>
Date:   Thu Nov 23 11:14:15 2023 +0100

    fix: type06 data types

    Co-authored-by: z3t4s <[email protected]>
    Co-authored-by: okqut <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants