Permalink
Browse files

updates and fixes

fixed a bug in ISFGLScene that would cause IMG_SIZE to evaluate incorrectly under some circumstances :: updated the MGSFragaria.framework to fix a bug that would result in a crash under some circumstances :: this is vsn 2.9.2 of the ISF Editor
  • Loading branch information...
1 parent ebe44ec commit 3802cee200982c1956976be5f5e57dffc513e120 @mrRay committed Sep 9, 2016
@@ -1,6 +1,7 @@
/*{
"DESCRIPTION": "draws the passed image over a checkerboard such that the alpha channel in the image is visible. the passed image is automatically scaled to always fit within the GL context.",
"CREDIT": "by zoidberg WOOP WOOP WOOP WOOP WOOP",
+ "ISFVSN": "2",
"CATEGORIES": [
],
"INPUTS": [
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleGetInfoString</key>
- <string>2.9</string>
+ <string>2.9.2</string>
<key>CFBundleIconFile</key>
<string></string>
<key>CFBundleIdentifier</key>
@@ -19,7 +19,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>2.9</string>
+ <string>2.9.2</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Binary file not shown.
@@ -552,6 +552,8 @@ - (VVBuffer *) allocBufferForDescriptor:(VVBufferDescriptor *)d sized:(VVSIZE)s
glTexParameteri(newBufferDesc.target, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
glTexParameteri(newBufferDesc.target, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+ //glTexParameteri(newBufferDesc.target, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+ //glTexParameteri(newBufferDesc.target, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glTexParameteri(newBufferDesc.target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
glTexParameteri(newBufferDesc.target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
//glTexParameteri(newBufferDesc.target, GL_TEXTURE_WRAP_S, GL_REPEAT);
@@ -1581,7 +1581,8 @@ - (void) _assembleShaderSource {
else {
NSString *newFuncString = nil;
NSString *samplerName = [varArray objectAtIndex:0];
- newFuncString = VVFMTSTRING(@"(_%@_imgRect.zw)",samplerName);
+ //newFuncString = VVFMTSTRING(@"(_%@_imgRect.zw)",samplerName);
+ newFuncString = VVFMTSTRING(@"(_%@_imgSize.xy)",samplerName);
[modSrcString replaceCharactersInRange:fullFuncRangeToReplace withString:newFuncString];
tmpRange.location = fullFuncRangeToReplace.location + [newFuncString length];
tmpRange.length = [modSrcString length] - tmpRange.location;
@@ -1800,7 +1801,8 @@ - (void) _assembleShaderSource {
else {
NSString *newFuncString = nil;
NSString *samplerName = [varArray objectAtIndex:0];
- newFuncString = VVFMTSTRING(@"(_%@_imgRect.zw)",samplerName);
+ //newFuncString = VVFMTSTRING(@"(_%@_imgRect.zw)",samplerName);
+ newFuncString = VVFMTSTRING(@"(_%@_imgSize.xy)",samplerName);
[modSrcString replaceCharactersInRange:fullFuncRangeToReplace withString:newFuncString];
tmpRange.location = fullFuncRangeToReplace.location + [newFuncString length];
tmpRange.length = [modSrcString length] - tmpRange.location;
@@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>BuildMachineOSBuild</key>
- <string>14C109</string>
+ <string>15G1004</string>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
@@ -18,21 +18,25 @@
<string>1.0.1</string>
<key>CFBundleSignature</key>
<string>????</string>
+ <key>CFBundleSupportedPlatforms</key>
+ <array>
+ <string>MacOSX</string>
+ </array>
<key>CFBundleVersion</key>
<string>1</string>
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
- <string>6A2008a</string>
+ <string>7D1014</string>
<key>DTPlatformVersion</key>
<string>GM</string>
<key>DTSDKBuild</key>
- <string>14A382</string>
+ <string>15E60</string>
<key>DTSDKName</key>
- <string>macosx10.10</string>
+ <string>macosx10.11</string>
<key>DTXcode</key>
- <string>0611</string>
+ <string>0731</string>
<key>DTXcodeBuild</key>
- <string>6A2008a</string>
+ <string>7D1014</string>
</dict>
</plist>
@@ -44,10 +44,15 @@
<string>IMG_NORM_PIXEL</string>
<string>IMG_THIS_PIXEL</string>
<string>IMG_THIS_NORM_PIXEL</string>
+ <string>IMG_SIZE</string>
<string>PASSINDEX</string>
<string>RENDERSIZE</string>
+ <string>isf_vertexShaderInit</string>
<string>isf_FragNormCoord</string>
<string>TIME</string>
+ <string>TIMEDELTA</string>
+ <string>DATE</string>
+ <string>FRAMEINDEX</string>
<string>attribute</string>
<string>varying</string>
<string>const</string>

0 comments on commit 3802cee

Please sign in to comment.