Skip to content
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.

Sign up for GitHub

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

Make compatible with 1.9.7 #15

Merged
merged 2 commits into from
Jan 16, 2025
Merged

Make compatible with 1.9.7 #15

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4bbbebb
Use new build-fn method
Jhonnyg Jan 15, 2025
748999a
Review changes
Jhonnyg Jan 16, 2025
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
10 changes: 5 additions & 5 deletions texturepacker/editor/src/texturepacker.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,12 +359,12 @@
(defn- make-gpu-texture [request-id page-image-content-generators texture-profile]
(let [buffered-images (mapv call-content-generator page-image-content-generators)]
(g/precluding-errors buffered-images
(let [texture-images
(let [texture-images+texture-bytes
(mapv #(tex-gen/make-preview-texture-image % texture-profile)
buffered-images)]
(texture/texture-images->gpu-texture
request-id
texture-images
texture-images+texture-bytes
{:min-filter gl/nearest
:mag-filter gl/nearest})))))

Expand Down Expand Up @@ -1044,10 +1044,10 @@
(let [{:keys [paged-atlas texture-profile compress]} user-data
path (resource/path resource)
texture-profile-pb (some->> texture-profile (protobuf/map->pb Graphics$TextureProfile))
^TextureGenerator$GenerateResult texture-generate-result (plugin-create-texture path paged-atlas buffered-images texture-profile-pb compress)
texture-image-bytes (TextureUtil/generateResultToByteArray texture-generate-result)]
texture-generate-result (plugin-create-texture path paged-atlas buffered-images texture-profile-pb compress)]
{:resource resource
:content texture-image-bytes}))))
:write-content-fn tex-gen/write-texturec-content-fn
:user-data {:texture-generator-result texture-generate-result}}))))

(defn- make-texture-build-target
[workspace node-id paged-atlas page-image-content-generators texture-profile compress]
Expand Down
Loading