Skip to content

Commit

Permalink
small refactoring
Browse files Browse the repository at this point in the history
  • Loading branch information
eyaler committed Jan 4, 2024
1 parent bed5e09 commit b3cdcb2
Show file tree
Hide file tree
Showing 15 changed files with 208 additions and 120 deletions.
5 changes: 2 additions & 3 deletions resen/cent/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,8 @@
"Cent visions de guerre"
<bdi>(1916)</bdi>.
</p>
<pre class="poem">

<div class="poem">
<pre>
1.

גּוּפוֹת סְבִיב שׁוּחוֹת
Expand Down Expand Up @@ -89,8 +88,8 @@
עִם הָאֲדָמָה
הַגְּוִיּוֹת חוֹגְגוֹת
אֵרוּסֵי דָּמִים

</pre>
</div>
<p dir="ltr">
Translated from French from "Cent visions de guerre" (1916).
</p>
Expand Down
Binary file added resen/exceeding/FiraCode-Light.ttf
Binary file not shown.
93 changes: 93 additions & 0 deletions resen/exceeding/FireCode_license.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
Copyright 2014-2020 The Fira Code Project Authors (https://github.com/tonsky/FiraCode)

This Font Software is licensed under the SIL Open Font License, Version 1.1.
This license is copied below, and is also available with a FAQ at:
http://scripts.sil.org/OFL


-----------------------------------------------------------
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-----------------------------------------------------------

PREAMBLE
The goals of the Open Font License (OFL) are to stimulate worldwide
development of collaborative font projects, to support the font creation
efforts of academic and linguistic communities, and to provide a free and
open framework in which fonts may be shared and improved in partnership
with others.

The OFL allows the licensed fonts to be used, studied, modified and
redistributed freely as long as they are not sold by themselves. The
fonts, including any derivative works, can be bundled, embedded,
redistributed and/or sold with any software provided that any reserved
names are not used by derivative works. The fonts and derivatives,
however, cannot be released under any other type of license. The
requirement for fonts to remain under this license does not apply
to any document created using the fonts or their derivatives.

DEFINITIONS
"Font Software" refers to the set of files released by the Copyright
Holder(s) under this license and clearly marked as such. This may
include source files, build scripts and documentation.

"Reserved Font Name" refers to any names specified as such after the
copyright statement(s).

"Original Version" refers to the collection of Font Software components as
distributed by the Copyright Holder(s).

"Modified Version" refers to any derivative made by adding to, deleting,
or substituting -- in part or in whole -- any of the components of the
Original Version, by changing formats or by porting the Font Software to a
new environment.

"Author" refers to any designer, engineer, programmer, technical
writer or other person who contributed to the Font Software.

PERMISSION & CONDITIONS
Permission is hereby granted, free of charge, to any person obtaining
a copy of the Font Software, to use, study, copy, merge, embed, modify,
redistribute, and sell modified and unmodified copies of the Font
Software, subject to the following conditions:

1) Neither the Font Software nor any of its individual components,
in Original or Modified Versions, may be sold by itself.

2) Original or Modified Versions of the Font Software may be bundled,
redistributed and/or sold with any software, provided that each copy
contains the above copyright notice and this license. These can be
included either as stand-alone text files, human-readable headers or
in the appropriate machine-readable metadata fields within text or
binary files as long as those fields can be easily viewed by the user.

3) No Modified Version of the Font Software may use the Reserved Font
Name(s) unless explicit written permission is granted by the corresponding
Copyright Holder. This restriction only applies to the primary font name as
presented to the users.

4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
Software shall not be used to promote, endorse or advertise any
Modified Version, except to acknowledge the contribution(s) of the
Copyright Holder(s) and the Author(s) or with their explicit written
permission.

5) The Font Software, modified or unmodified, in part or in whole,
must be distributed entirely under this license, and must not be
distributed under any other license. The requirement for fonts to
remain under this license does not apply to any document created
using the Font Software.

TERMINATION
This license becomes null and void if any of the above conditions are
not met.

DISCLAIMER
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
OTHER DEALINGS IN THE FONT SOFTWARE.
10 changes: 5 additions & 5 deletions resen/exceeding/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link rel="preload" as="style" href="https://fonts.googleapis.com/css2?family=Miriam+Libre:wght@400;700&family=Fira+Code:wght@300&display=block">
<link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Miriam+Libre:wght@400;700&family=Fira+Code:wght@300&display=block">
<link rel="preload" as="style" href="https://fonts.googleapis.com/css2?family=Miriam+Libre:wght@400;700&display=block">
<link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Miriam+Libre:wght@400;700&display=block">
<link rel="stylesheet" href="../style.css">
<link rel="stylesheet" href="style.css">
<script src="../pages.js"></script>
<script src="p5.min.js"></script>
<link rel="stylesheet" href="style.css">
<meta property="og:image" content="https://oulipoh.com/resen/exceeding/snippet">
<noscript><style>body {visibility: visible}</style></noscript>
</head>
<body onload="document.body.style.visibility = 'visible'">
<script>make_header()</script>
<div id="sketch"></div>
<div id="sketch" oncontextmenu="toggle_fullscreen(event)"></div>
<p>
על המסך מוצגים שלושה מונים הסופרים את השעות מאז נולדנו, שלושת בני המשפחה.
מספר המקומות המוקצה לספירת השעות הוא שישה בלבד, כך שהספירה מתאפשרת רק עד 999,999 שעות, שהן כ־114 שנים. כאשר תעבור שעה מעבר לכך, המונה כולו יתאפס והספירה תתחיל מחדש. המצב הזה של הגעה לגבול והתאפסות מעבר לו נקרא בצרפתית trop-plein, שמשמעותו המילולית "מעבר לשלם".
Expand All @@ -24,6 +24,6 @@
בפריכות הקיום הנוכחית, כל שנייה יכולה להפוך להרת גורל. "מעבר לשלם" מגלמת בתוכה את האיום שבסופניות כמו גם את הנחמה שבהמשכיות. השניות שעוברות במעין מקצב מדיטטיבי הן בה בעת אשליה מנחמת של סדירות והנכחה מתמדת של האִבחה הבלתי נמנעת של הקץ הקרב ובא.
</p>
<script>make_footer()</script>
<script src="sketch.js"></script>
<script src="script.js"></script>
</body>
</html>
28 changes: 10 additions & 18 deletions resen/exceeding/sketch.js → resen/exceeding/script.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// Exceeding the Entirety 2023 by Mika and Avi Milgrom
// let Fira;
let Fira;
let digitSize;
function preload() {
Fira = loadFont("FiraCode-Light.ttf");
}
const bg = getComputedStyle(document.documentElement).getPropertyValue('--bg');
const sketch = document.getElementById("sketch")
// function preload() {
// Fira = loadFont("FiraCode-Light.ttf");
// }

// Birthdays, Month is zero-based
let startDateAvi = new Date(1978, 10, 27, 22, 10, 10);
Expand All @@ -28,15 +28,10 @@ function drawDigit(digit, x, y) {
stroke(0);
strokeWeight(1);
fill(255);
// rect(x, y, digitSize, digitSize + 7);
rect(x, y, digitSize, digitSize * 1.1);
noStroke();
fill(40);
// textFont(Fira);
textSize(digitSize);
textAlign(CENTER, CENTER);
//text(digit, x + digitSize / 2, y + digitSize / 2);
text(digit, x + digitSize/2, y + digitSize*.63);
text(digit, x + digitSize/2, y + digitSize*.4);
}

// Present time on the screen
Expand Down Expand Up @@ -64,10 +59,11 @@ function drawTime(index, PersonDate) {
// Split time into digits
let digits = formattedTime.split("");

digitSize = height / 6;
textSize(digitSize)

// Calculate starting positions for each clock
//let startX = width / 2 - (digits.length * digitSize + digitSize) / 2;
let startX = width / 2 - (digits.length * digitSize) / 2;
// let startY = height / 6 + (index * height) / 6;
let startY = height/2 - (digitSize*1.1)*(2.5-index*2);

// Draw each digit with a square
Expand All @@ -77,12 +73,10 @@ function drawTime(index, PersonDate) {
}

function setup() {
// const myCanvas = createCanvas(windowWidth, windowHeight);
const myCanvas = createCanvas(sketch.clientWidth, sketch.clientWidth * 5 / 12);
myCanvas.parent("sketch");
// digitSize = min(width, height) / 20;
digitSize = height / 6;
textFont("Fira Code");
textFont(Fira);
textAlign(CENTER, CENTER);
}

function draw() {
Expand All @@ -93,7 +87,5 @@ function draw() {
}

function windowResized() {
// resizeCanvas(windowWidth, windowWidth)
resizeCanvas(sketch.clientWidth, sketch.clientWidth * 5 / 12);
digitSize = height / 6;
}
2 changes: 1 addition & 1 deletion resen/exceeding/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
aspect-ratio: 12 / 5;
margin-inline: auto;
max-height: 45vh;
margin-bottom: 4rem;
margin-block: 10rem;
}
2 changes: 1 addition & 1 deletion resen/imagine/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<body onload="document.body.style.visibility = 'visible'">
<script>make_header()</script>
<p>
אוסף בקשות ליצירת תמונה שנשלחו על ידי אנשים לא ידועים לתוכנת Midjourney בתקופת מלחמת חרבות ברזל:
אוסף בקשות ליצירת תמונה שנשלחו על ידי אנשים לא ידועים לתוכנת Midjourney בתקופת מלחמת חרבות ברזל (מתורגם לעברית):
</p>
<blockquote>נערה פלסטינית צעירה עומדת בביטחון בגבול ישראל-עזה שהשתנה, דומה כעת לכניסה לקניון יוקרתי. היא לובשת תלבושת בסגנון בריטי של שנות ה־60, כולל שמלה עד הברך, מעיל מסוגנן וכובע מעוטר בסרט, משלימים ארנק קטן. השיער שלה מעוצב בקפידה, משדר חן. הגבול שמסביב נוצץ עם עיטורים מפוארים, שטיח אדום המוביל אל הכניסה, תחת שמיים שלווים ובהירים. האווירה סוריאליסטית אך אלגנטית. איור, אומנות דיגיטלית, <span dir="ltr">--ar 16:9 --v 5.0</span></blockquote>
<blockquote>אימא אוחזת בזרועותיה ילד שאוחז בידו של חייל ישראלי שאוחז ביד של גבר חרדי אוחז ביד של אישה וכלב הולכים יד ביד כולם עם הגב אלינו הולכים לכיוון אופק, שקיעה יפה בשמיים עם כמה ענני סתיו ולראות רק את פני הילד על ידיה של האם מוארות באותו אור כמו השמש השוקעת</blockquote>
Expand Down
2 changes: 1 addition & 1 deletion resen/journal.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
של יצירות מן העולם וכן מאמרים ומסות בנושאי יצירה אילוצית וחישובית.
</p>
<p>כתב העת רֶסֶן הופק בסיוע <a href="https://culture.pais.co.il/Pages/default.aspx">מועצת הפיס לתרבות ולאומנות</a> (20,000 ש"ח), ובסיוע מענק מיוחד מטעם <a href="https://www.rabinovichfoundation.org.il/">קרן יהושע רבינוביץ לאומנויות תל-אביב</a> (8,000 ש"ח).</p>
<div class="images" style="height: 500px">
<div class="images" style="--max_height: 500px; --min_width: 200px">
<img src="media/pais.png" alt="לוגו מפעל הפיס">
<img src="media/rabinovich.png" alt="לוגו קרן רבינוביץ">
</div>
Expand Down
Binary file modified resen/media/rabinovich.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit b3cdcb2

Please sign in to comment.